Start of a rought attempt at adding ride boost and ride sound

commit 9497175627
Author: JacksonB <78700961+jackowes@users.noreply.github.com>
Date:   Thu Feb 13 00:05:03 2025 -0600

    mk2 bird flight controller

commit 0defd2614f
Author: JacksonB <78700961+jackowes@users.noreply.github.com>
Date:   Wed Feb 12 20:01:57 2025 -0600

    Initial bird controller changes and refactoring of how riding controllers control rotation mouse+rotVel

commit 181af6847d
Author: JacksonB <78700961+jackowes@users.noreply.github.com>
Date:   Wed Feb 12 12:29:35 2025 -0600

    Add updated version of Helicopter ride controller. Tie in some static pokemonentity functions to be riding configurable. Modify the cameramixins, currently there is a temp change to them on this branch.

commit ac1cdb0ba6
Author: JacksonB <78700961+jackowes@users.noreply.github.com>
Date:   Sat Feb 8 03:02:35 2025 -0600

    Add angular velocity constant modifier (roll can now influence yaw so the dolphin can turn). Spruce up dolphin swim controller.

commit 59190209a2
Author: JacksonB <78700961+jackowes@users.noreply.github.com>
Date:   Wed Feb 5 19:30:21 2025 -0600

    initial commit with a bunch of poking around code

CHANGELOG.md

@@ -58,9 +58,6 @@
   - Note: This will break mods that used our observable functionality there or in MoveSet, IVs, EVs, or BenchedMoves. 
   - Using `Pokemon#onChange()` is now the way to mark a Pokémon as needing a save.
   - Using `[Pokemon].changeObservable` is now the way to get an `Observable` for any save-worthy changes.
-- Updated NPCEntity beam positioning to properly account for the baseScale property.
-- Updated NPCEntity pokeball throw positioning to properly account for the baseScale property.
-- Fixed `[Pokemon].copyFrom` error causing forms, IVs, and EVs to not be applied properly when using `[Pokemon].loadFromJSON` or `[Pokemon].loadFromNBT`
 
 ### MoLang & Datapacks
 - The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)

common/config/cobblemon/main.json

@@ -0,0 +1,82 @@
+{
+  "lastSavedVersion": "1.7.0",
+  "maxPokemonLevel": 100,
+  "maxPokemonFriendship": 255,
+  "announceDropItems": true,
+  "defaultDropItemMethod": "on-entity",
+  "ambientPokemonCryTicks": 1080,
+  "defaultBoxCount": 30,
+  "pokemonSaveIntervalSeconds": 30,
+  "storageFormat": "nbt",
+  "preventCompletePartyDeposit": false,
+  "mongoDBConnectionString": "mongodb://localhost:27017",
+  "mongoDBDatabaseName": "cobblemon",
+  "maxVerticalCorrectionBlocks": 64,
+  "minimumLevelRangeMax": 10,
+  "enableSpawning": true,
+  "minimumDistanceBetweenEntities": 8.0,
+  "maxNearbyBlocksHorizontalRange": 4,
+  "maxNearbyBlocksVerticalRange": 2,
+  "maxVerticalSpace": 8,
+  "worldSliceDiameter": 8,
+  "worldSliceHeight": 16,
+  "ticksBetweenSpawnAttempts": 20.0,
+  "minimumSliceDistanceFromPlayer": 16.0,
+  "maximumSliceDistanceFromPlayer": 64.0,
+  "exportSpawnConfig": false,
+  "savePokemonToWorld": true,
+  "exportStarterConfig": false,
+  "autoUpdateShowdown": true,
+  "defaultFleeDistance": 32.0,
+  "allowExperienceFromPvP": true,
+  "experienceShareMultiplier": 0.5,
+  "luckyEggMultiplier": 1.5,
+  "allowSpectating": true,
+  "experienceMultiplier": 2.0,
+  "pokemonPerChunk": 1.0,
+  "passiveStatuses": {
+    "cobblemon:poison": "180-300",
+    "cobblemon:poisonbadly": "180-300",
+    "cobblemon:paralysis": "180-300",
+    "cobblemon:frozen": "180-300",
+    "cobblemon:sleep": "180-300",
+    "cobblemon:burn": "180-300"
+  },
+  "infiniteHealerCharge": false,
+  "maxHealerCharge": 6.0,
+  "secondsToChargeHealingMachine": 900.0,
+  "defaultFaintTimer": 300,
+  "faintAwakenHealthPercent": 0.2,
+  "healPercent": 0.05,
+  "healTimer": 60,
+  "baseApricornTreeGenerationChance": 0.1,
+  "displayEntityLevelLabel": true,
+  "displayEntityNameLabel": true,
+  "displayNameForUnknownPokemon": false,
+  "displayEntityLabelsWhenCrouchingOnly": false,
+  "shinyRate": 8192.0,
+  "shinyNoticeParticlesDistance": 24.0,
+  "captureCalculator": "cobblemon",
+  "playerDamagePokemon": true,
+  "appleLeftoversChance": 0.025,
+  "maxRootsInArea": 5,
+  "bigRootPropagationChance": 0.1,
+  "energyRootChance": 0.25,
+  "maxDynamaxLevel": 10,
+  "teraTypeRate": 20.0,
+  "defaultPasturedPokemonLimit": 16,
+  "pastureBlockUpdateTicks": 40,
+  "pastureMaxWanderDistance": 64,
+  "pastureMaxPerChunk": 4.0,
+  "maxInsertedFossilItems": 2,
+  "walkingInBattleAnimations": false,
+  "battleWildMaxDistance": 12.0,
+  "tradeMaxDistance": 12.0,
+  "battlePvPMaxDistance": 32.0,
+  "battleSpectateMaxDistance": 64.0,
+  "maxPokedexScanningDetectionRange": 10.0,
+  "hideUnimplementedPokemonInThePokedex": false,
+  "summaryPokemonFollowCursor": true,
+  "partyPortraitAnimations": "NEVER_ANIMATE",
+  "enableDebugKeys": false
+}

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

@@ -788,7 +788,6 @@ object MoLangFunctions {
             map.put("is_flying") { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
             map.put("has_aspect") { DoubleValue(it.getString(0) in pokemonEntity.aspects) }
             map.put("is_pokemon") { DoubleValue.ONE }
-            map.put("is_holding_item") { DoubleValue(!pokemonEntity.entityData.get(PokemonEntity.SHOWN_HELD_ITEM).isEmpty) }
             map
         }
     )

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

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.riding
+
+import net.minecraft.client.player.LocalPlayer
+import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance
+import net.minecraft.client.resources.sounds.SoundInstance
+import net.minecraft.sounds.SoundEvent
+import net.minecraft.sounds.SoundSource
+
+/**
+ * put what it is here
+ *
+ * @author Jackowes
+ * @since March 4th, 2025
+ */
+class RidingOnPlayerSoundEventInstance(
+    private val player: LocalPlayer,
+    soundEvent: SoundEvent
+) : AbstractTickableSoundInstance(soundEvent, SoundSource.PLAYERS, SoundInstance.createUnseededRandom()) {
+
+
+    init {
+        this.looping = true
+        this.delay = 0
+        this.volume = 0.1f
+    }
+
+    fun setPitch( pitch: Float ){
+        this.pitch = pitch
+    }
+
+    fun setVolume( volume: Float){
+        this.volume = volume
+    }
+
+    override fun tick() {
+        //TODO: implement effectively
+        //For now it should just play the sound?
+        setPitch(1.0f)
+        println("ticking")
+    }
+
+}

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

@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.battles.interpreter.instructions
 
 import com.bedrockk.molang.runtime.MoLangRuntime
 import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
-import com.cobblemon.mod.common.api.battles.interpreter.Effect
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
@@ -24,13 +23,11 @@ import com.cobblemon.mod.common.battles.dispatch.GO
 import com.cobblemon.mod.common.battles.dispatch.InstructionSet
 import com.cobblemon.mod.common.battles.dispatch.UntilDispatch
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.animation.PlayPosableAnimationPacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket
 import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
 import com.cobblemon.mod.common.pokemon.evolution.progress.DamageTakenEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.RecoilEvolutionProgress
-import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonBadlyStatus
 import com.cobblemon.mod.common.pokemon.status.statuses.persistent.PoisonStatus
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.battleLang
@@ -70,40 +67,49 @@ class DamageInstruction(
                 }
             }
         }
+        val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return
         val effect = privateMessage.effect()
         val source = privateMessage.battlePokemonFromOptional(battle)
-        if (source != null) {
-            ShowdownInterpreter.broadcastOptionalAbility(battle, effect, source)
+        source?.let { ShowdownInterpreter.broadcastOptionalAbility(battle, effect, it) }
+    }
+
+    private fun doRecoilEvoChecks(battlePokemon: BattlePokemon) {
+        battlePokemon.effectedPokemon.let { pokemon ->
+            if (RecoilEvolutionProgress.supports(pokemon)) {
+                val healthStr = privateMessage.argumentAt(1) ?: throw UnsupportedOperationException(
+                    "Cant get recoil string"
+                )
+                val newHealth =
+                    "([0-9]+).*".toRegex().find(healthStr)?.groups?.get(1)?.value?.toIntOrNull()
+                        ?: throw UnsupportedOperationException("Cant get recoil string")
+                val difference = pokemon.currentHealth - newHealth
+                if (difference > 0) {
+                    val progress = pokemon.evolutionProxy.current()
+                        .progressFirstOrCreate({ it is RecoilEvolutionProgress }) { RecoilEvolutionProgress() }
+                    progress.updateProgress(RecoilEvolutionProgress.Progress(progress.currentProgress().recoil + difference))
+                }
+            }
         }
     }
 
-
     override fun runActionEffect(battle: PokemonBattle, runtime: MoLangRuntime) {
         val effect = privateMessage.effect()
-        val publicPokemon = publicMessage.battlePokemon(0, actor.battle) ?: return
+        val battlePokemon = publicMessage.battlePokemon(0, actor.battle) ?: return
         var status = effect?.id?.let { Statuses.getStatus(it) }
         battle.dispatch {
+            val pokemon = privateMessage.battlePokemon(0, battle) ?: return@dispatch GO
             //Showdown doesnt tell us on damage if its poison or toxic so we gotta consult the entity
-            val isToxic = publicPokemon.effectedPokemon.status?.status is PoisonBadlyStatus
-            val realStatus = if (isToxic) PoisonBadlyStatus() else status
-            // Damage effects without a action effect receive the generic damage effect
-            val actionEffect = if (realStatus != null) {
-                realStatus.getActionEffect()
-            } else if (effect != null) {
-                ActionEffects.actionEffects[cobblemonResource("generic_damage")]
-            } else {
-                null
+            if (status is PoisonStatus) {
+                status = pokemon.effectedPokemon.status?.status ?: status
             }
 
-            if (actionEffect == null) {
-                return@dispatch GO
-            }
+            // Damage effects without a action effect receive the generic damage effect
+            val actionEffect = status?.getActionEffect() ?: effect?.let {
+                ActionEffects.actionEffects["generic_damage".asIdentifierDefaultingNamespace()]
+            } ?: return@dispatch GO
 
             val providers = mutableListOf<Any>(battle)
-            val pokemonEntity = publicPokemon.effectedPokemon.entity
-            if (pokemonEntity != null) {
-                providers.add(UsersProvider(pokemonEntity))
-            }
+            battlePokemon.effectedPokemon.entity?.let { UsersProvider(it) }?.let(providers::add)
 
             val context = ActionEffectContext(
                 actionEffect = actionEffect,
@@ -119,24 +125,72 @@ class DamageInstruction(
     }
 
     override fun postActionEffect(battle: PokemonBattle) {
-        val hpStatus = privateMessage.argumentAt(1)?.split(" ")?.get(0)!!
-        var causedFaint = hpStatus == "0"
-        val remainingHealth = hpStatus.split("/")[0].toFloat()
-        val maxHealth = hpStatus.split("/").getOrNull(1)?.toFloat()
+        val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return
         val battlePokemon = publicMessage.battlePokemon(0, actor.battle) ?: return
+        var causedFaint = newHealth == "0"
         val effect = privateMessage.effect()
         val source = privateMessage.battlePokemonFromOptional(battle)
         val lastCauser  = instructionSet.getMostRecentCauser(comparedTo = this)
-        val pokemonName = battlePokemon.getName()
-        val pokemonEntity = battlePokemon.entity
-
         battle.dispatch {
-            playRecoilAnim(pokemonEntity, causedFaint)
-            if (effect != null) {
-                sendStatusMessage(battle, effect, pokemonName, source)
+            val pokemonName = battlePokemon.getName()
+            val pokemonEntity = battlePokemon.entity
+            //Play recoil animation if the pokemon recoiling isnt dead
+            if (!causedFaint && pokemonEntity != null) {
+                val pkt = PlayPosableAnimationPacket(pokemonEntity.id, setOf("recoil"), emptyList())
+                pkt.sendToPlayersAround(
+                    x = pokemonEntity.x,
+                    y = pokemonEntity.y,
+                    z = pokemonEntity.z,
+                    worldKey = pokemonEntity.level().dimension(),
+                    distance = 50.0
+                )
             }
 
-            updateHealth(battle, battlePokemon, remainingHealth, maxHealth)
+            val newHealthRatio: Float
+            val remainingHealth = newHealth.split("/")[0].toInt()
+
+            if (effect != null) {
+                val lang = when (effect.id) {
+                    "blacksludge", "stickybarb", "jabocaberry", "rowapberry" -> battleLang("damage.item", pokemonName, effect.typelessData)
+                    "brn", "psn", "tox" -> {
+                        val status = Statuses.getStatus(effect.id)?.name?.path ?: return@dispatch GO
+                        lang("status.$status.hurt", pokemonName)
+                    }
+                    "aftermath", "innardsout" -> battleLang("damage.generic", pokemonName)
+                    "chloroblast", "steelbeam" -> battleLang("damage.mindblown", pokemonName)
+                    "jumpkick" -> battleLang("damage.highjumpkick", pokemonName)
+                    else -> battleLang("damage.${effect.id}", pokemonName, source?.getName() ?: Component.literal("UNKOWN"))
+                }
+                battle.broadcastChatMessage(lang.red())
+            }
+
+            if (causedFaint) {
+                newHealthRatio = 0F
+                battle.dispatch {
+                    battlePokemon.effectedPokemon.currentHealth = 0
+                    battlePokemon.sendUpdate()
+                    GO
+                }
+                causedFaint = true
+            } else {
+                val maxHealth = newHealth.split("/")[1].toInt()
+                val difference = maxHealth - remainingHealth
+                newHealthRatio = remainingHealth.toFloat() / maxHealth
+                battle.dispatchToFront {
+                    battlePokemon.effectedPokemon.currentHealth = remainingHealth
+                    if (difference > 0) {
+                        battlePokemon.effectedPokemon.let { pokemon ->
+                            if (DamageTakenEvolutionProgress.supports(pokemon)) {
+                                val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DamageTakenEvolutionProgress }) { DamageTakenEvolutionProgress() }
+                                progress.updateProgress(DamageTakenEvolutionProgress.Progress(progress.currentProgress().amount + difference))
+                            }
+                        }
+                    }
+                    battlePokemon.sendUpdate()
+                    GO
+                }
+            }
+            privateMessage.pnxAndUuid(0)?.let { (pnx, _) -> battle.sendSidedUpdate(actor, BattleHealthChangePacket(pnx, remainingHealth.toFloat()), BattleHealthChangePacket(pnx, newHealthRatio)) }
 
             battle.minorBattleActions[battlePokemon.uuid] = privateMessage
             if (lastCauser is MoveInstruction) {
@@ -161,82 +215,4 @@ class DamageInstruction(
         }
     }
 
-    private fun updateHealth(battle: PokemonBattle, battlePokemon: BattlePokemon, remainingHealth: Float, maxHealth: Float?) {
-        val causedFaint = maxHealth == null
-        val newHealthRatio = if (maxHealth == null) 0F else remainingHealth / maxHealth
-        if (causedFaint) {
-            battle.dispatch {
-                battlePokemon.effectedPokemon.currentHealth = 0
-                battlePokemon.sendUpdate()
-                GO
-            }
-        }
-        else {
-            val difference = maxHealth - remainingHealth
-            battle.dispatchToFront {
-                battlePokemon.effectedPokemon.currentHealth = remainingHealth.toInt()
-                updateDamageTakenEvo(battlePokemon, difference.toInt())
-                battlePokemon.sendUpdate()
-                GO
-            }
-        }
-        privateMessage.pnxAndUuid(0)?.let { (pnx, _ ) ->
-            battle.sendSidedUpdate(actor, BattleHealthChangePacket(pnx, remainingHealth), BattleHealthChangePacket(pnx, newHealthRatio))
-        }
-
-    }
-
-    private fun doRecoilEvoChecks(battlePokemon: BattlePokemon) {
-        battlePokemon.effectedPokemon.let { pokemon ->
-            if (RecoilEvolutionProgress.supports(pokemon)) {
-                val healthStr = privateMessage.argumentAt(1) ?: throw UnsupportedOperationException("Cant get recoil string")
-                val newHealth =
-                    "([0-9]+).*".toRegex().find(healthStr)?.groups?.get(1)?.value?.toIntOrNull()
-                        ?: throw UnsupportedOperationException("Cant get recoil string")
-                val difference = pokemon.currentHealth - newHealth
-                if (difference > 0) {
-                    val progress = pokemon.evolutionProxy.current()
-                        .progressFirstOrCreate({ it is RecoilEvolutionProgress }) { RecoilEvolutionProgress() }
-                    progress.updateProgress(RecoilEvolutionProgress.Progress(progress.currentProgress().recoil + difference))
-                }
-            }
-        }
-    }
-
-    private fun sendStatusMessage(battle: PokemonBattle, effect: Effect, pokemonName: Component, source: BattlePokemon?) {
-        val lang = when (effect.id) {
-            "blacksludge", "stickybarb", "jabocaberry", "rowapberry" -> battleLang("damage.item", pokemonName, effect.typelessData)
-            "brn", "psn", "tox" -> {
-                val status = Statuses.getStatus(effect.id)?.name?.path
-                lang("status.$status.hurt", pokemonName)
-            }
-            "aftermath", "innardsout" -> battleLang("damage.generic", pokemonName)
-            "chloroblast", "steelbeam" -> battleLang("damage.mindblown", pokemonName)
-            "jumpkick" -> battleLang("damage.highjumpkick", pokemonName)
-            else -> battleLang("damage.${effect.id}", pokemonName, source?.getName() ?: Component.literal("UNKOWN"))
-        }
-        battle.broadcastChatMessage(lang.red())
-    }
-
-    private fun playRecoilAnim(pokemonEntity: PokemonEntity?, causedFaint: Boolean) {
-        if (!causedFaint && pokemonEntity != null) {
-            val pkt = PlayPosableAnimationPacket(pokemonEntity.id, setOf("recoil"), emptyList())
-            pkt.sendToPlayersAround(
-                x = pokemonEntity.x,
-                y = pokemonEntity.y,
-                z = pokemonEntity.z,
-                worldKey = pokemonEntity.level().dimension(),
-                distance = 50.0
-            )
-        }
-    }
-
-    private fun updateDamageTakenEvo(battlePokemon: BattlePokemon, damageTaken: Int) {
-        battlePokemon.effectedPokemon.let { pokemon ->
-            if (DamageTakenEvolutionProgress.supports(pokemon)) {
-                val progress = pokemon.evolutionProxy.current().progressFirstOrCreate({ it is DamageTakenEvolutionProgress }) { DamageTakenEvolutionProgress() }
-                progress.updateProgress(DamageTakenEvolutionProgress.Progress(progress.currentProgress().amount + damageTaken))
-            }
-        }
-    }
 }

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

@@ -222,14 +222,8 @@ class PokemonRenderer(
 
         val phaseTarget = clientDelegate.phaseTarget ?: return
         poseMatrix.pushPose()
-        var beamSourcePosition = if (phaseTarget is NPCEntity) {
-                val npcDelegate = phaseTarget.delegate as NPCClientDelegate
-                val baseScale = phaseTarget.baseScale?.toDouble() ?: 1.0
-
-                (npcDelegate.locatorStates["beam"]?.getOrigin()?.scale(baseScale))
-                    ?: phaseTarget.position().add(0.0, (phaseTarget.bbHeight / 2.0) * baseScale, 0.0)
-                } else if (phaseTarget is PosableEntity) {
-                    (phaseTarget.delegate as PosableState).locatorStates["beam"]?.getOrigin() ?: phaseTarget.position()
+        var beamSourcePosition = if (phaseTarget is PosableEntity) {
+            (phaseTarget.delegate as PosableState).locatorStates["beam"]?.getOrigin() ?: phaseTarget.position()
         } else {
             if (phaseTarget.uuid == Minecraft.getInstance().player?.uuid) {
                 val lookVec = phaseTarget.lookAngle.yRot((PI / 2).toFloat()).multiply(1.0, 0.0, 1.0).normalize()
@@ -309,11 +303,7 @@ class PokemonRenderer(
                 val lookVec = beamTarget.lookAngle.yRot((PI / 2).toFloat()).multiply(1.0, 0.0, 1.0).normalize()
                 beamTarget.getEyePosition(partialTicks).subtract(0.0, 0.4, 0.0).subtract(lookVec.scale(0.3))
             } else if (beamTarget is NPCEntity) {
-                val npcDelegate = beamTarget.delegate as NPCClientDelegate
-                val baseScale = beamTarget.baseScale?.toDouble() ?: 1.0
-
-                (npcDelegate.locatorStates["beam"]?.getOrigin()?.scale(baseScale))
-                    ?: beamTarget.position().add(0.0, (beamTarget.bbHeight / 2.0) * baseScale, 0.0)
+                (beamTarget.delegate as NPCClientDelegate).locatorStates["beam"]?.getOrigin() ?: beamTarget.position()
             } else {
                 val lookVec = beamTarget.lookAngle.yRot((PI / 2 - (beamTarget.visualRotationYInDegrees - beamTarget.xRot).toRadians()).toFloat()).multiply(1.0, 0.0, 1.0).normalize()
                 beamTarget.getEyePosition(partialTicks).subtract(0.0, 0.7, 0.0).subtract(lookVec.scale(0.4))

common/src/main/kotlin/com/cobblemon/mod/common/command/argument/SetRideBoost.kt

@@ -0,0 +1,48 @@
+/*
+ * 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.command.argument
+
+import com.cobblemon.mod.common.api.permission.CobblemonPermissions
+import com.cobblemon.mod.common.command.argument.SpeciesArgumentType
+import com.cobblemon.mod.common.pokemon.FormData
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.permission
+import com.mojang.brigadier.Command
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.arguments.FloatArgumentType
+import com.mojang.brigadier.context.CommandContext
+import net.minecraft.commands.CommandSourceStack
+import net.minecraft.commands.Commands
+
+object SetRideBoost {
+
+    fun register(dispatcher: CommandDispatcher<CommandSourceStack>) {
+        val command = Commands.literal("changewalkspeed")
+            .permission(CobblemonPermissions.CHANGE_WALK_SPEED)
+            .then(
+                Commands.argument("pokemon", SpeciesArgumentType.species())
+                    .then(Commands.argument("walkSpeed", FloatArgumentType.floatArg()).executes(::execute))
+            )
+
+            .executes(::execute)
+        dispatcher.register(command)
+    }
+
+
+
+    private fun execute(context: CommandContext<CommandSourceStack>) : Int {
+        val pkm = SpeciesArgumentType.getPokemon(context, "pokemon")
+        val walkSpeed = FloatArgumentType.getFloat(context, "walkSpeed")
+
+        pkm.behaviour.moving.walk.walkSpeed = walkSpeed.toString().asExpressionLike()
+        pkm.forms.clear()
+        pkm.forms.add(FormData().also { it.initialize(pkm)})
+        return Command.SINGLE_SUCCESS
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/pokemon/update/RideBoostUpdatePacket.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.net.messages.client.pokemon.update
+
+import com.cobblemon.mod.common.api.riding.RidingStyle
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
+import com.cobblemon.mod.common.net.IntSize
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readEnumConstant
+import com.cobblemon.mod.common.util.readSizedInt
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class RideBoostUpdatePacket(pokemon: () -> Pokemon, rideStyle: RidingStyle, rideStat: RidingStat, value: Int)
+    : IntUpdatePacket<RideBoostUpdatePacket>(pokemon, value) {
+    override val id = ID
+    override fun getSize() = IntSize.U_BYTE
+    private val rideStyle = rideStyle
+    private val rideStat = rideStat
+
+    override fun set(pokemon: Pokemon, value: Int) {
+        pokemon.setRideBoost(rideStyle, rideStat, value)
+    }
+
+    companion object {
+        val ID = cobblemonResource("ride_boost_update")
+
+        fun decode(buffer: RegistryFriendlyByteBuf): RideBoostUpdatePacket {
+            val pokemon = decodePokemon(buffer)
+            val rideStyle = buffer.readEnumConstant(RidingStyle::class.java)
+            val rideStat = buffer.readEnumConstant(RidingStat::class.java)
+            val value = buffer.readSizedInt(IntSize.U_SHORT)
+            return RideBoostUpdatePacket(pokemon, rideStyle, rideStat, value)
+        }
+    }
+}

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

@@ -58,6 +58,8 @@ import com.cobblemon.mod.common.api.reactive.Observable
 import com.cobblemon.mod.common.api.reactive.SettableObservable
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.riding.RidingProperties
+import com.cobblemon.mod.common.api.riding.RidingStyle
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.scheduling.afterOnServer
 import com.cobblemon.mod.common.api.storage.StoreCoordinates
 import com.cobblemon.mod.common.api.storage.party.NPCPartyStore
@@ -332,6 +334,25 @@ open class Pokemon : ShowdownIdentifiable {
             }
         }
 
+    /**
+     * TODO: Give a description and move the set and get to te appropriate place
+     */
+    /*
+    var rideBoost: MutableMap<RidingStyle, MutableMap<RidingStat, Int>> = mutableMapOf()
+        private set(value) {
+            field = value
+            onChange(RideBoostUpdatePacket({ this }, value))
+        }
+
+    fun setRideBoost(rideStyle: RidingStyle, rideStat: RidingStat, value: Int) {
+        rideBoost.getOrPut(rideStyle) { mutableMapOf() }[rideStat] = value
+    }
+
+    fun getRideBoost(rideStyle: RidingStyle, rideStat: RidingStat): Int {
+        return rideBoost[rideStyle]?.get(rideStat) ?: 0 // Default to 0 if missing
+    }
+     */
+
     var state: PokemonState = InactivePokemonState()
         set(value) {
             if (field != value) {
@@ -1069,14 +1090,14 @@ open class Pokemon : ShowdownIdentifiable {
         this.experience = other.experience
         this.setFriendship(other.friendship)
         // Applied before current health for calcs to take place
-        this.ivs.doWithoutEmitting {
-            other.ivs.forEach {
-                this.ivs[it.key] = it.value
+        other.ivs.doWithoutEmitting {
+            this.ivs.forEach {
+                other.ivs[it.key] = it.value
             }
         }
-        this.evs.doWithoutEmitting {
-            other.evs.forEach {
-                this.evs[it.key] = it.value
+        other.evs.doWithoutEmitting {
+            this.evs.forEach {
+                other.evs[it.key] = it.value
             }
         }
         this.currentHealth = other.currentHealth
@@ -1105,9 +1126,7 @@ open class Pokemon : ShowdownIdentifiable {
         this.originalTrainerType = other.originalTrainerType
         this.originalTrainer = other.originalTrainer
         this.forcedAspects = other.forcedAspects
-        this.features = other.features
         this.cosmeticItem = other.cosmeticItem
-        this.updateAspects()
         this.refreshOriginalTrainer()
         this.initialize()
         return this

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/BirdAirController.kt

@@ -9,7 +9,7 @@
 package com.cobblemon.mod.common.pokemon.riding.controllers
 
 import com.bedrockk.molang.Expression
-import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.MoLangMath.lerp
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Rollable
 import com.cobblemon.mod.common.api.riding.controller.RideController
@@ -19,7 +19,9 @@ import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.riding.states.BirdAirState
 import com.cobblemon.mod.common.util.*
+import net.minecraft.client.Minecraft
 import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.util.Mth
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
@@ -32,81 +34,38 @@ class BirdAirController : RideController {
     override val poseProvider = PoseProvider(PoseType.HOVER)
         .with(PoseOption(PoseType.FLY) {
             val player = it.passengers.firstOrNull() as? Player ?: return@PoseOption false
-            it.deltaMovement.length() > 0.3 })
-        /*
-        .with(PoseOption(PoseType.FLY) {
-            val player = it.passengers.firstOrNull() as? Player ?: return@PoseOption false
-            player.zza > 0.0f // Checks if the player is actively attempting to move forward
-        })
-         */
+            it.deltaMovement.length() > 0.5 })
 
     override val condition: (PokemonEntity) -> Boolean = { true }
 
-    var jumpVector = listOf("0".asExpression(), "0.3".asExpression(), "0".asExpression())
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 135.0, 45.0)".asExpression()
         private set
-    var gravity: Expression = "0".asExpression()
+    var topSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.35)".asExpression()
         private set
-    var horizontalAcceleration: Expression = "0.1".asExpression()
+    var glideTopSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 2.0, 1.0)".asExpression()
         private set
-    var verticalAcceleration: Expression = "0.1".asExpression()
+    // Max accel is a whole 1.0 in 3 seconds. The conversion in the function below is to convert seconds to ticks
+    var accelExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 3.0)), (1.0 / (20.0 * 8.0)))".asExpression()
+        private set
+    //Seconds self propelled flight (glide is not self propelled in this case)
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 120.0, 20.0)".asExpression()
+        private set
+    //max y level for the ride
+    var altitudeExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 200.0, 128.0)".asExpression()
         private set
 
-    // Where 90 is the width of the range and 45 is the offset.
-    // So the handling interpolates between 135 and 45
-    var handlingExpr: Expression = "(q.get_ride_stats('SKILL', 'AIR') / 100) * 90 + 45".asExpression()
+    var infiniteStamina: Expression = "false".asExpression()
         private set
-    var topSpeedExpr: Expression = "(q.get_ride_stats('SPEED', 'AIR') / 100) * (1.0 - 0.35) + 0.35".asExpression()
-        private set
-    //Reaches max top speed from a standstill at minimum 8 seconds and max 3 seconds.
-    //This is a bit of a confusing expression and likely should be cleaned up to be more readable
-    var accelExpr: Expression = "(q.get_ride_stats('ACCELERATION', 'AIR') / 100) * (0.01666666666 - 0.00625) + 0.00625".asExpression()
+    var infiniteAltitude: Expression = "false".asExpression()
         private set
 
     override fun speed(entity: PokemonEntity, driver: Player): Float {
 
-        //Retrieve the current bird controller state
-        //val state = entity.riding.getState(KEY) { e -> BirdAirControllerState(e) }
+        //Retrieve the current bird controller state and stats
         val state = getState(entity, ::BirdAirState)
 
-        //retrieve stats
-        val topSpeed = getRuntime(entity).resolveDouble(topSpeedExpr)
-        val accel = getRuntime(entity).resolveDouble(accelExpr)
 
-        val maxGlideSpeed = topSpeed * 2
-        var glideSpeedChange = 0.00
-
-        //speed up and slow down based on input
-        if (driver.zza > 0.0 && state.currSpeed < topSpeed) {
-            state.currSpeed = min(state.currSpeed + accel , topSpeed)
-        } else if (driver.zza < 0.0 && state.currSpeed > 0.0) {
-            //Decelerate is currently always a constant half of max acceleration.
-            state.currSpeed = max(state.currSpeed - (0.0166 / 2), 0.0)
-        }
-
-        val rollable = driver as? Rollable
-        if (rollable != null) {
-            glideSpeedChange = sin(Math.toRadians(rollable.pitch.toDouble()))
-            glideSpeedChange = glideSpeedChange.pow(3)
-
-            //TODO: Possibly create a deadzone around parallel where speed isn't taken away from?
-            if (glideSpeedChange <= 0.0) {
-                //Ensures that a propelling force is still able to be applied when
-                //climbing in height
-                if (driver.zza <= 0) {
-                    //speed decrease should be 2x speed increase?
-                    state.currSpeed = max(state.currSpeed + (0.0166) * glideSpeedChange, 0.0 )
-                }
-            } else {
-                // only add to the speed if it hasn't exceeded the current
-                //glide angles maximum amount of speed that it can give.
-                state.currSpeed = min(state.currSpeed + ((0.0166 * 2) * glideSpeedChange), maxGlideSpeed)
-            }
-        }
-
-        //air resistance
-        state.currSpeed = max(state.currSpeed - 0.005, 0.0)
-
-        return state.currSpeed.toFloat()
+        return state.rideVel.length().toFloat()
     }
 
     override fun rotation(entity: PokemonEntity, driver: LivingEntity): Vec2 {
@@ -118,62 +77,76 @@ class BirdAirController : RideController {
         var leftForce = 0.0
         var upForce = 0.0
         var forwardForce = 0.0
+        val state = getState(entity, ::BirdAirState)
+
+        //Perform ride velocity update
+        calculateRideSpaceVel(entity, driver, state)
+
+        //Translate ride space velocity to world space velocity.
         val rollable = driver as? Rollable
         if (rollable != null) {
             //Need to deadzone this when straight up or down
-            // test with and without strafing added. May be wanted while moving
-            leftForce = -1.0 * sin(Math.toRadians(rollable.roll.toDouble()))
 
-            upForce = -1.0 * sin(Math.toRadians(rollable.pitch.toDouble()))
+            upForce += -1.0 * sin(Math.toRadians(rollable.pitch.toDouble())) * state.rideVel.z
+            forwardForce += cos(Math.toRadians(rollable.pitch.toDouble())) * state.rideVel.z
 
-            forwardForce = cos(Math.toRadians(rollable.pitch.toDouble()))
+            upForce += cos(Math.toRadians(rollable.pitch.toDouble())) * state.rideVel.y
+            forwardForce += sin(Math.toRadians(rollable.pitch.toDouble())) * state.rideVel.y
         }
 
-        //TODO: Add in an upwards and downwards force when pressing space maybe?
 
-        //Leave out tap to flap right now
-        /*
-        var jumpVector = Vec3.ZERO
-        if (entity.jumpInputStrength > 0) {
-            val runtime = getRuntime(entity)
-            runtime.environment.query.addFunction("jump_strength") { DoubleValue(entity.jumpInputStrength.toDouble()) }
-            val jumpForces = this.jumpVector.map { runtime.resolveFloat(it) }
-            jumpVector = Vec3(jumpForces[0].toDouble(), jumpForces[1].toDouble(), jumpForces[2].toDouble())
-            jumpVector = jumpVector.toVector3f().mul((driver as Rollable).orientation).toVec3d()
-            entity.jumpInputStrength = 0
-            entity.addDeltaMovement(jumpVector)
+        //Bring the ride out of the sky when stamina is depleted.
+        if  (state.stamina <= 0.0) {
+            upForce -= 0.3
         }
-        */
-        //Retrieve the current composite controller state
-        val state = getState(entity, ::BirdAirState)
 
-        val velocity = Vec3(0.0 , upForce * state.currSpeed, forwardForce * state.currSpeed)
+        val altitudeLimit = getRuntime(entity).resolveDouble(altitudeExpr)
 
+        //Only limit altitude if altitude is not infinite
+        if (!getRuntime(entity).resolveBoolean(infiniteAltitude)) {
+            //Provide a hard limit on altitude
+            upForce = if (entity.y >= altitudeLimit && upForce > 0) 0.0 else upForce
+        }
+
+        val velocity = Vec3(state.rideVel.x , upForce, forwardForce)
         return velocity
     }
 
     override fun angRollVel(entity: PokemonEntity, driver: Player, deltaTime: Double): Vec3 {
 
         val rollable = driver as? Rollable
+        val state = getState(entity, ::BirdAirState)
 
         //TODO: Tie in handling
         val handling = getRuntime(entity).resolveDouble(handlingExpr)
+        val topSpeed = getRuntime(entity).resolveDouble(topSpeedExpr)
         val rotationChangeRate = 10.0
 
         if (rollable != null) {
             var yawForce =  rotationChangeRate * sin(Math.toRadians(rollable.roll.toDouble()))
             //for a bit of correction on the rolls limit it to a quarter the amount
-            var pitchForce = -0.25 * rotationChangeRate * abs(sin(Math.toRadians(rollable.roll.toDouble())))
+            var pitchForce = -0.35 * rotationChangeRate * abs(sin(Math.toRadians(rollable.roll.toDouble())))
 
             //limit rotation modulation when pitched up heavily or pitched down heavily
             yawForce *= abs(cos(Math.toRadians(rollable.pitch.toDouble())))
             pitchForce *= abs(cos(Math.toRadians(rollable.pitch.toDouble()))) * 1.5
 
-            //Create a deadzone for easier leveling out
+            //Fully ignore roll influenced angle changes when looking a certain amount up or down
+            if( abs(cos(Math.toRadians(rollable.pitch.toDouble()))) <= 0.25 )
+            {
+                yawForce =  0.0
+                pitchForce = 0.0
+            }
+
+
+            //TODO: is the deadzone needed?
+            /*
             if (rollable.roll <= 0.0 && rollable.roll >= -0.0) {
                 yawForce = 0.0
                 pitchForce = 0.0
             }
+             */
+
             return Vec3(yawForce, pitchForce, 0.0)
         }
 
@@ -191,42 +164,56 @@ class BirdAirController : RideController {
         deltaTime: Double
     ): Vec3 {
         if (driver !is Rollable) return Vec3.ZERO
-
         val rollable = driver as Rollable
 
+        val state = getState(entity, ::BirdAirState)
         val handling = getRuntime(entity).resolveDouble(handlingExpr)
+        val topSpeed = getRuntime(entity).resolveDouble(topSpeedExpr)
 
         //Smooth out mouse input.
         val smoothingSpeed = 4
         val invertRoll = if (Cobblemon.config.invertRoll) -1 else 1
         val invertPitch = if (Cobblemon.config.invertPitch) -1 else 1
-        var xInput = xMouseSmoother.getNewDeltaValue(xMouse * 0.1 * invertRoll, deltaTime * smoothingSpeed);
-        val YInput = yMouseSmoother.getNewDeltaValue(yMouse * 0.1 * invertPitch, deltaTime * smoothingSpeed);
+        val xInput = xMouseSmoother.getNewDeltaValue(xMouse * 0.1 * invertRoll, deltaTime * smoothingSpeed);
+        val yInput = yMouseSmoother.getNewDeltaValue(yMouse * 0.1 * invertPitch, deltaTime * smoothingSpeed);
 
-        //limit rolling based on healing
-        val rotLimit = handling
+        //limit rolling based on handling and current speed.
+        //modulated by speed so that when flapping idle in air you are ont wobbling around to look around
+        val rotMin = 15.0
+        var rollForce = xInput
+        val rotLimit = max(handling * normalizeVal(state.rideVel.length(), 0.0, topSpeed).pow(3), rotMin)
 
         //Limit roll by non linearly decreasing inputs towards
         // a rotation limit based on the current distance from
         // that rotation limit
-        if (abs(rollable.roll + xInput) < rotLimit) {
-            if (sign(xInput) == sign(rollable.roll).toDouble()) {
+        if (abs(rollable.roll + rollForce) < rotLimit) {
+            if (sign(rollForce) == sign(rollable.roll).toDouble()) {
                 val d = abs(abs(rollable.roll) - rotLimit)
-                xInput *= (d.pow(2)) / (rotLimit.pow(2))
+                rollForce *= (d.pow(2)) / (rotLimit.pow(2))
             }
-        } else if (sign(xInput) == sign(rollable.roll).toDouble()) {
-            xInput = 0.0
+        } else if (sign(rollForce) == sign(rollable.roll).toDouble()) {
+            rollForce = 0.0
         }
 
+        //Give the ability to yaw with x mouse input when at low speeds.
+        val yawForce = xInput * ( 1.0 - normalizeVal(state.rideVel.length(), 0.0, topSpeed).pow(3))
+
         //yaw, pitch, roll
-        return Vec3(0.0, YInput, xInput)
+        return Vec3(yawForce, yInput, rollForce)
     }
 
     override fun canJump(
         entity: PokemonEntity,
         driver: Player
     ): Boolean {
-        return true
+        return false
+    }
+
+    override fun setRideBar(entity: PokemonEntity, driver: Player): Float {
+        //Retrieve stamina from state
+        val state = getState(entity, ::BirdAirState)
+
+        return (state.stamina / 1.0f)
     }
 
     override fun jumpForce(
@@ -243,29 +230,181 @@ class BirdAirController : RideController {
 
     override fun shouldRoll(entity: PokemonEntity) = true
 
+    override fun rideFovMult(entity: PokemonEntity, driver: Player): Float {
+        val topSpeed = getRuntime(entity).resolveDouble(topSpeedExpr)
+        val glideTopSpeed = getRuntime(entity).resolveDouble(glideTopSpeedExpr)
+        val state = getState(entity, ::BirdAirState)
+
+        //Must I ensure that topspeed is greater than minimum?
+        val normalizedGlideSpeed = normalizeVal(state.rideVel.length(), topSpeed, glideTopSpeed)
+
+        //Only ever want the fov change to be a max of 0.2 and for it to have non linear scaling.
+        return 1.0f + normalizedGlideSpeed.pow(2).toFloat() * 0.2f
+
+    }
+
     override fun useAngVelSmoothing(entity: PokemonEntity): Boolean = false
 
     override fun encode(buffer: RegistryFriendlyByteBuf) {
         super.encode(buffer)
-        buffer.writeString(gravity.toString())
-        buffer.writeString(horizontalAcceleration.toString())
-        buffer.writeString(verticalAcceleration.toString())
         buffer.writeString(topSpeedExpr.toString())
+        buffer.writeString(glideTopSpeedExpr.toString())
+        buffer.writeString(accelExpr.toString())
         buffer.writeString(accelExpr.toString())
         buffer.writeString(handlingExpr.toString())
+        buffer.writeString(altitudeExpr.toString())
+        buffer.writeString(infiniteStamina.toString())
+        buffer.writeString(infiniteAltitude.toString())
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
-        gravity = buffer.readString().asExpression()
-        horizontalAcceleration = buffer.readString().asExpression()
-        verticalAcceleration = buffer.readString().asExpression()
         topSpeedExpr = buffer.readString().asExpression()
+        glideTopSpeedExpr = buffer.readString().asExpression()
+        accelExpr = buffer.readString().asExpression()
         accelExpr = buffer.readString().asExpression()
         handlingExpr = buffer.readString().asExpression()
+        altitudeExpr = buffer.readString().asExpression()
+        infiniteStamina = buffer.readString().asExpression()
+        infiniteAltitude = buffer.readString().asExpression()
     }
 
 
     companion object {
         val KEY = cobblemonResource("air/bird")
     }
+
+    /*
+    *  Normalizes the given value between a min and a max.
+    *  The result is clamped between 0.0 and 1.0, where 0.0 represents x is at or below min
+    *  and 1.0 represents x is at or above it.
+    */
+    fun normalizeVal(x: Double, min: Double, max: Double): Double {
+        require(max > min) { "max must be greater than min" }
+        return ((x - min) / (max - min)).coerceIn(0.0, 1.0)
+    }
+
+    /*
+    *  Calculates the change in the ride space vector due to player input and ride state
+    */
+    fun calculateRideSpaceVel( entity: PokemonEntity, driver: Player, state: BirdAirState){
+
+
+        //retrieve stats
+        val topSpeed = getRuntime(entity).resolveDouble(topSpeedExpr)
+        val glideTopSpeed = getRuntime(entity).resolveDouble(glideTopSpeedExpr)
+        val accel = getRuntime(entity).resolveDouble(accelExpr)
+        val staminaStat = getRuntime(entity).resolveDouble(staminaExpr)
+
+        var glideSpeedChange = 0.00
+
+        val currSpeed = state.rideVel.length()
+
+        //Flag for determining if stamina should be lost
+        var loseStamina = false
+
+        //speed up and slow down based on input
+        if (driver.zza != 0.0f && state.stamina > 0.0) {
+            //make sure it can't exceed top speed
+            val forwardInput = when {
+                driver.zza > 0 && state.rideVel.z > topSpeed -> 0.0
+                driver.zza < 0 && state.rideVel.z < (-topSpeed / 3.0) -> 0.0
+                else -> driver.zza.sign
+            }
+
+            state.rideVel = Vec3(
+                state.rideVel.x,
+                state.rideVel.y,
+                (state.rideVel.z + (accel * forwardInput.toDouble())))
+
+            loseStamina = true
+        }
+
+        val rollable = driver as? Rollable
+        if (rollable != null) {
+            //Base glide speed change on current pitch of the ride.
+            glideSpeedChange = sin(Math.toRadians(rollable.pitch.toDouble()))
+            glideSpeedChange = glideSpeedChange.pow(3) * 0.5
+
+            //TODO: Possibly create a deadzone around parallel where glide doesn't affect speed?
+            if (glideSpeedChange <= 0.0) {
+                //Ensures that a propelling force is still able to be applied when
+                //climbing in height
+                if (driver.zza <= 0) {
+                    //speed decrease should be 2x speed increase?
+                    //state.currSpeed = max(state.currSpeed + (0.0166) * glideSpeedChange, 0.0 )
+                    state.rideVel = Vec3(
+                        state.rideVel.x,
+                        state.rideVel.y,
+                        lerp( state.rideVel.z, 0.0,glideSpeedChange * -0.0166 * 2 ))
+                }
+            } else {
+                // only add to the speed if it hasn't exceeded the current
+                //glide angles maximum amount of speed that it can give.
+                //state.currSpeed = min(state.currSpeed + ((0.0166 * 2) * glideSpeedChange), maxGlideSpeed)
+                state.rideVel = Vec3(
+                    state.rideVel.x,
+                    state.rideVel.y,
+                    min(state.rideVel.z + ((0.0166 * 2) * glideSpeedChange), glideTopSpeed))
+            }
+        }
+
+        //Lateral movement based on driver input.
+        val latTopSpeed = topSpeed / 2.0
+        if (driver.xxa != 0.0f && state.stamina > 0.0) {
+            state.rideVel = Vec3(
+                (state.rideVel.x + (accel * driver.xxa)).coerceIn(-latTopSpeed, latTopSpeed),
+                state.rideVel.y,
+                state.rideVel.z)
+            loseStamina = true
+        }
+        else {
+            state.rideVel = Vec3(
+                lerp(state.rideVel.x, 0.0, latTopSpeed / 20.0),
+                state.rideVel.y,
+                state.rideVel.z)
+        }
+
+        //Vertical movement based on driver input.
+        val vertTopSpeed = topSpeed / 2.0
+        val vertInput = when {
+            Minecraft.getInstance().options.keyJump.isDown() -> 1.0
+            Minecraft.getInstance().options.keyShift.isDown() -> -1.0
+            else -> 0.0
+        }
+
+        if (vertInput != 0.0 && state.stamina > 0.0) {
+            state.rideVel = Vec3(
+                state.rideVel.x,
+                (state.rideVel.y + (accel * vertInput)).coerceIn(-vertTopSpeed, vertTopSpeed),
+                state.rideVel.z)
+            loseStamina = true
+        }
+        else {
+            state.rideVel = Vec3(
+                state.rideVel.x,
+                lerp(state.rideVel.y, 0.0, vertTopSpeed / 20.0),
+                state.rideVel.z)
+        }
+
+        //Only perform stamina logic if the ride does not have infinite stamina
+        if (getRuntime(entity).resolveBoolean(infiniteStamina)) {
+            if (loseStamina) {
+                state.stamina -= (0.05 / staminaStat).toFloat()
+            }
+
+            //Lose a base amount of stamina just for being airborne
+            state.stamina -= (0.01 / staminaStat).toFloat()
+        }
+        else
+        {
+            state.stamina = 1.0f
+        }
+
+        //air resistance
+        //TODO: This method is very unrefined and will need to be an active point of testing
+        state.rideVel = Vec3(
+            state.rideVel.x,
+            state.rideVel.y,
+            lerp( state.rideVel.z,0.0, topSpeed / ( 20.0 * 30.0)))
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/JetAirController.kt

@@ -49,9 +49,9 @@ class JetAirController : RideController {
     var accelExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 1.0)), (1.0 / (20.0 * 5.0)))".asExpression()
         private set
     // Between 60 seconds and 10 seconds at the lowest when at full speed.
-    var staminaExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 60.0, 10.0)".asExpression()
+    var staminaExpr: Expression = "q.get_ride_stats('STAMINA', 'AIR', 60.0, 10.0)".asExpression()
         private set
-    var jumpExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 300.0, 128.0)".asExpression()
+    var jumpExpr: Expression = "q.get_ride_stats('JUMP', 'AIR', 300.0, 128.0)".asExpression()
         private set
 
     // Make configurable by json
@@ -123,14 +123,12 @@ class JetAirController : RideController {
         upForce = if(state.stamina > 0.0) upForce else -0.7
 
         val altitudeLimit = getRuntime(entity).resolveDouble(jumpExpr)
-        val pushingHeightLimit = if(getRuntime(entity).resolveBoolean(infiniteAltitude)) false
-                                 else (entity.y >= 128 && entity.xRot <= 0)
 
-
-        //Incorporate the altitude limiter.
-        //Apply downwards force if limit is reached. Resist upwards force on a buffer of 30 blocks past the limit.
-        upForce = if(pushingHeightLimit)  upForce - upForce * ((entity.y - altitudeLimit) / 30) - 0.5
-                  else upForce
+        //Only limit altitude if altitude is not infinite
+        if (!getRuntime(entity).resolveBoolean(infiniteAltitude)) {
+            //Provide a hard limit on altitude
+            upForce = if (entity.y >= altitudeLimit && upForce > 0) 0.0 else upForce
+        }
 
         val velocity = Vec3(0.0 , upForce, forwardForce )
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/RunUpToFlightCompositeController.kt

@@ -23,6 +23,7 @@ import com.cobblemon.mod.common.util.getString
 import com.cobblemon.mod.common.util.readString
 import com.cobblemon.mod.common.util.resolveInt
 import com.cobblemon.mod.common.util.writeString
+import net.minecraft.client.Minecraft
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.util.SmoothDouble
 import net.minecraft.world.entity.LivingEntity
@@ -74,12 +75,32 @@ class RunUpToFlightCompositeController : RideController {
         if (state.activeController == flightController && entity.onGround() && state.timeTransitioned + 20 < entity.level().gameTime) {
 
             //Pass the speed to the next state
-            val flightState = flightController.getState(entity, ::BirdAirState)
-            val groundState = landController.getState(entity, ::GenericLandState)
+            val flightState = flightController.getState( entity, ::BirdAirState )
+            val groundState = landController.getState( entity, ::GenericLandState )
             groundState.currSpeed = flightState.currSpeed
+            groundState.rideVel = flightState.rideVel
+            groundState.stamina = flightState.stamina
 
-            getState(entity, ::RunUpToFlightCompositeState).activeController = landController
-            entity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+            getState(entity, ::RunUpToFlightCompositeState).let {
+                it.activeController = landController
+                entity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false)
+                it.timeTransitioned = entity.level().gameTime
+            }
+        }
+        else if (state.activeController == landController && Minecraft.getInstance().options.keyJump.isDown && state.timeTransitioned + 20 < entity.level().gameTime) {
+
+            //Pass the speed to the next state
+            val flightState = flightController.getState( entity, ::BirdAirState )
+            val groundState = landController.getState( entity, ::GenericLandState )
+            flightState.currSpeed = groundState.currSpeed
+            flightState.rideVel = groundState.rideVel
+            flightState.stamina = groundState.stamina
+
+            getState(entity, ::RunUpToFlightCompositeState).let {
+                it.activeController = flightController
+                entity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
+                it.timeTransitioned = entity.level().gameTime
+            }
         }
 
         return getActiveController(entity).speed(entity, driver)
@@ -101,6 +122,14 @@ class RunUpToFlightCompositeController : RideController {
         return getActiveController(entity).angRollVel(entity, driver, deltaTime)
     }
 
+    override fun rideFovMult(entity: PokemonEntity, driver: Player): Float {
+        return getActiveController(entity).rideFovMult(entity, driver)
+    }
+
+    override fun setRideBar(entity: PokemonEntity, driver: Player): Float {
+        return getActiveController(entity).setRideBar(entity, driver)
+    }
+
     override fun canJump(entity: PokemonEntity, driver: Player): Boolean {
         return getActiveController(entity).canJump(entity, driver)
     }
@@ -111,19 +140,9 @@ class RunUpToFlightCompositeController : RideController {
         jumpStrength: Int
     ): Vec3 {
         val controller = getActiveController(entity)
-        if (controller == landController && jumpStrength >= getRuntime(entity).resolveInt(minimumJump)) {
+        val state = getState(entity, ::CompositeState)
+        val isJumping = Minecraft.getInstance().options.keyJump.isDown
 
-            //Pass the speed to the next state
-            val flightState = flightController.getState(entity, ::BirdAirState )
-            val groundState = landController.getState(entity, ::GenericLandState)
-            flightState.currSpeed = groundState.currSpeed
-
-            getState(entity, ::RunUpToFlightCompositeState).let {
-                it.activeController = flightController
-                entity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true)
-                it.timeTransitioned = entity.level().gameTime
-            }
-        }
         return controller.jumpForce(entity, driver, jumpStrength)
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/RunUpToJetFlightCompositeController.kt

@@ -84,6 +84,7 @@ class RunUpToJetFlightCompositeController : RideController {
             val groundState = landController.getState(entity, ::GenericLandState)
             groundState.currSpeed = flightState.currSpeed
             groundState.stamina = flightState.stamina
+            groundState.rideVel = flightState.rideVel
 
             //Clear accumulated rotation input when transferring to ground input
             flightState.currMouseXForce = 0.0
@@ -108,6 +109,7 @@ class RunUpToJetFlightCompositeController : RideController {
             val groundState = landController.getState(entity, ::GenericLandState)
             flightState.currSpeed = groundState.currSpeed
             flightState.stamina = groundState.stamina
+            flightState.rideVel = groundState.rideVel
 
             getState(entity, ::RunUpToFlightCompositeState).let {
                 it.activeController = flightController

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/controllers/VehicleLandController.kt

@@ -8,54 +8,35 @@
 
 package com.cobblemon.mod.common.pokemon.riding.controllers
 
+import com.bedrockk.molang.Expression
 import com.bedrockk.molang.runtime.value.DoubleValue
-import com.cobblemon.mod.common.api.riding.RidingStyle
 import com.cobblemon.mod.common.api.riding.controller.RideController
 import com.cobblemon.mod.common.api.riding.controller.posing.PoseOption
 import com.cobblemon.mod.common.api.riding.controller.posing.PoseProvider
-import com.cobblemon.mod.common.api.riding.stats.RidingStat
+import com.cobblemon.mod.common.api.riding.RidingOnPlayerSoundEventInstance
 import com.cobblemon.mod.common.entity.PoseType
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.pokemon.riding.controllers.BirdAirController.Companion
-import com.cobblemon.mod.common.util.asExpression
-import com.cobblemon.mod.common.util.blockPositionsAsListRounded
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.getString
-import com.cobblemon.mod.common.util.readString
-import com.cobblemon.mod.common.util.resolveBoolean
-import com.cobblemon.mod.common.util.resolveFloat
-import com.cobblemon.mod.common.util.writeString
-import kotlin.math.absoluteValue
+import com.cobblemon.mod.common.pokemon.riding.states.LandVehicleState
+import com.cobblemon.mod.common.util.*
+import net.minecraft.client.Minecraft
+import net.minecraft.client.player.LocalPlayer
+import net.minecraft.client.resources.sounds.Sound
+import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.sounds.SoundEvent
+import net.minecraft.sounds.SoundEvents
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.phys.Vec2
 import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.Shapes
-import kotlin.math.max
-import kotlin.math.min
+import kotlin.math.*
 
 class VehicleLandController : RideController {
     companion object {
         val KEY: ResourceLocation = cobblemonResource("land/vehicle")
-
-        val MAXTOPSPEED = 1.0 // 20 bl/s
-        val MINTOPSPEED = 0.35 // 7 bl/s
-        //val MINSPEED = 0.25 // 5 bl/s
-
-        //Accel will lie between 1.0 second and 5.0 seconds
-        val MAXACCEL = (MAXTOPSPEED ) / (20*3) //3.0 second to max speed
-        val MINACCEL = (MAXTOPSPEED ) / (20*8) // 8 seconds to max speed
-
-        //Can rotate 90 degrees
-        val MAXHANDLING = 90.0
-        val MINHANDLING = 30.0
-
-
-        val MAXYAWHANDLING = 16.0
-        val MINYAWHANDLING = 8.0
     }
 
     var canJump = "true".asExpression()
@@ -69,6 +50,9 @@ class VehicleLandController : RideController {
     var reverseDriveFactor = "0.25".asExpression()
         private set
 
+    var sound = "minecraft:item.elytra.flying".asExpression()
+        private set
+
     var minimumSpeedToTurn = "0.1".asExpression()
         private set
     var rotationSpeed = "45/20".asExpression()
@@ -76,8 +60,20 @@ class VehicleLandController : RideController {
     var lookYawLimit = "101".asExpression()
         private set
 
-    var currSpeed = 0.0
+    // TODO: Tweak these stats to a workable state.
+    var handlingExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 140.0, 20.0)".asExpression()
         private set
+    var topSpeedExpr: Expression = "q.get_ride_stats('SPEED', 'AIR', 1.0, 0.5)".asExpression()
+        private set
+    // Max accel is a whole 1.0 in 2 seconds. The conversion in the function below is to convert seconds to ticks
+    var accelExpr: Expression = "q.get_ride_stats('ACCELERATION', 'AIR', (1.0 / (20.0 * 2.0)), (1.0 / (20.0 * 6.0)))".asExpression()
+        private set
+    // Between 60 seconds and 10 seconds at the lowest when at full speed.
+    var staminaExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 60.0, 10.0)".asExpression()
+        private set
+    var jumpExpr: Expression = "q.get_ride_stats('SKILL', 'AIR', 300.0, 128.0)".asExpression()
+        private set
+
 
     @Transient
     override val key: ResourceLocation = KEY
@@ -93,47 +89,132 @@ class VehicleLandController : RideController {
             if (entity.isInWater || entity.isUnderWater) {
                 return@any false
             }
+            /*
             //This might not actually work, depending on what the yPos actually is. yPos of the middle of the entity? the feet?
             if (it.y.toDouble() == (entity.position().y)) {
                 val blockState = entity.level().getBlockState(it.below())
-                return@any !(!blockState.isAir && blockState.fluidState.isEmpty)
+                return@any (!blockState.isAir && blockState.fluidState.isEmpty)
             }
+            */
             true
         }
     }
 
     override fun speed(entity: PokemonEntity, driver: Player): Float {
 
-        val topSpeed = entity.getRideStat(RidingStat.SPEED, RidingStyle.AIR, MINTOPSPEED, MAXTOPSPEED)
-        val accel = entity.getRideStat(RidingStat.ACCELERATION, RidingStyle.AIR, MINACCEL, MAXACCEL)
+        //Retrieve Vehicle state
+        val state = getState(entity, ::LandVehicleState)
+
+        //retrieve stats
+        val topSpeed = getRuntime(entity).resolveDouble(topSpeedExpr) * 2
+        val accel = getRuntime(entity).resolveDouble(accelExpr) * 2
 
         //speed up and slow down based on input
-        if (driver.zza > 0.0 && currSpeed < topSpeed) {
-            currSpeed = min(currSpeed + accel , topSpeed)
-        } else if (driver.zza < 0.0 && currSpeed > 0.0) {
-            //Decelerate is now always a constant half of max acceleration.
-            currSpeed = max(currSpeed - (MAXACCEL / 2), 0.0)
+        if( driver.zza > 0.0 && state.currSpeed < topSpeed)
+        {
+            state.currSpeed = min( state.currSpeed + accel , topSpeed)
+        }
+        else if ( driver.zza < 0.0 && state.currSpeed > 0.0)
+        {
+            //Decelerate is currently always half of accel
+            state.currSpeed = max( state.currSpeed - (accel * 2) , 0.0)
+        }
+        else{
+            state.currSpeed = max( state.currSpeed - (accel / 2.0) , 0.0)
         }
 
-        return currSpeed.toFloat()
+        return state.currSpeed.toFloat()
     }
 
     override fun rotation(entity: PokemonEntity, driver: LivingEntity): Vec2 {
+        //Retrieve Vehicle state
+        val state = getState(entity, ::LandVehicleState)
+
         val rotationDegrees = driver.xxa * getRuntime(entity).resolveFloat(this.rotationSpeed)
-        return Vec2(driver.xRot, entity.yRot - rotationDegrees)
+
+        if( Minecraft.getInstance().options.keyJump.isDown() ){
+            //If the current drift has not been set and the car is rotating then set drift
+            if( state.currDrift == 0.0 && rotationDegrees != 0.0f) {
+                //Set to base value which will be half.
+                state.currDrift = sign(rotationDegrees) * 2.5
+                state.turnSmoother.reset()
+            }
+
+            //Calculate any changes to drift
+            val driftChangeRate = (1.0 / (20.0 * 0.15))
+
+            //If Drift is negative already
+            if(state.currDrift < 0) {
+                state.currDrift = (state.currDrift + (sign(rotationDegrees) * driftChangeRate)).coerceIn(-5.0, -1.0)
+            }else{
+                state.currDrift = (state.currDrift + (sign(rotationDegrees) * driftChangeRate)).coerceIn(1.0, 5.0)
+            }
+            return Vec2(driver.xRot, entity.yRot - state.currDrift.toFloat())
+        }
+        //If the drift key is not held then reset the curr drift to 0 and use normal rotation
+        else{
+            //If the drift key has just been released perform boost addition and drift reset
+            if( state.currDrift != 0.0){
+                state.turnSmoother.reset()
+                state.currDrift = 0.0
+                state.driftBoost = min(state.driftBoost + 1.0, 2.0)
+                driver.level().playSound(
+                    null as Player?,
+                    driver.getX(),
+                    driver.getY(),
+                    driver.getZ(), SoundEvents.PLAYER_ATTACK_WEAK,
+                    driver.getSoundSource(), 1.0f, 0.2f
+                )
+
+
+                val lp = driver as? LocalPlayer
+                lp?.let {
+                    //val resourceLocation = ResourceLocation.tryParse(getRuntime(entity).resolveString(sound))
+                    //val soundEvent = BuiltInRegistries.SOUND_EVENT.getOptional(resourceLocation).orElse(null)
+                    val soundInstance = RidingOnPlayerSoundEventInstance(it, SoundEvents.AMBIENT_UNDERWATER_LOOP)
+                    Minecraft.getInstance().soundManager.play(soundInstance)
+                }
+
+            }
+
+            //Restrict turning while boost is active
+            val boostRotDebuff = if( state.driftBoost != 0.0 ) 0.5f else 1.0f
+
+            return Vec2(driver.xRot, entity.yRot - (rotationDegrees * boostRotDebuff) )
+            //return Vec2(driver.xRot, state.turnSmoother.getNewDeltaValue((entity.yRot - rotationDegrees).toDouble(), 1.0).toFloat())
+        }
+
     }
 
     override fun velocity(entity: PokemonEntity, driver: Player, input: Vec3): Vec3 {
+        //Retrieve Vehicle state
+        val state = getState(entity, ::LandVehicleState)
+
         val runtime = getRuntime(entity)
         val driveFactor = runtime.resolveFloat(this.driveFactor)
         var g = driver.zza * driveFactor
         if (g <= 0.0f) {
             g *= runtime.resolveFloat(this.reverseDriveFactor)
         }
-        if (driver.xxa != 0F && g.absoluteValue < runtime.resolveFloat(this.minimumSpeedToTurn)) {
-            driver.xxa = 0F
+        val grav = -1.0
+        var velocity = Vec3(0.0,0.0,0.0)
+
+        //If the vehicle is currently drifting then do a "poor mans" rotation of the velocity vector to offset it
+        //from the front of the vehicle. This likely needs cleaned up to be
+        if( state.currDrift != 0.0){
+            //Drift speed should be slower the higher the drift is
+            //normalize the drift speed
+            val driftSpeed =  (1.0 - ((abs(state.currDrift) - 1.0) / (5.0 - 1.0))) * 0.5 + 0.3
+
+            velocity = Vec3((1.0 * state.currSpeed) * (driftSpeed / 2.0) * -sign(state.currDrift) + min(state.driftBoost, 0.5) * 1.25,
+                            grav,
+                         (1.0 * state.currSpeed) * driftSpeed + min(state.driftBoost, 0.5) * 1.25)
+        }else{
+            velocity = Vec3(0.0 , grav, state.currSpeed + min(state.driftBoost, 0.5) * 1.25)
         }
-        val velocity = Vec3(0.0 /* Maybe do drifting here later */, 0.0, g.toDouble() * currSpeed)
+
+        //tick down boost
+        state.driftBoost = max( state.driftBoost - (1.0 / (20.0 * 2)), 0.0)
 
         return velocity
     }
@@ -146,7 +227,7 @@ class VehicleLandController : RideController {
     override fun clampPassengerRotation(entity: PokemonEntity, driver: LivingEntity) {
         val f = Mth.wrapDegrees(driver.yRot - entity.yRot)
         val runtime = getRuntime(entity)
-        val lookYawLimit = runtime.resolveFloat(this.lookYawLimit)
+        val lookYawLimit = 120.0f
         val g = Mth.clamp(f, -lookYawLimit, lookYawLimit)
         driver.yRotO += g - f
         driver.yRot = driver.yRot + g - f
@@ -162,6 +243,27 @@ class VehicleLandController : RideController {
         return Vec3(jumpVector[0].toDouble(), jumpVector[1].toDouble(), jumpVector[2].toDouble())
     }
 
+    override fun inertia(entity: PokemonEntity ) : Double {
+        val state = getState(entity, ::LandVehicleState)
+
+        //val inertia = if(Minecraft.getInstance().options.keyJump.isDown()) 0.1 else 0.5
+
+        return 0.1
+    }
+
+    override fun rideFovMult(entity: PokemonEntity, driver: Player): Float {
+        val state = getState(entity, ::LandVehicleState)
+
+        //Only increase fov when actively using the boost.
+        val fovIncrease = (min( state.driftBoost, 0.5 ) * 0.3).toFloat()
+        return 1.0f + fovIncrease
+
+    }
+
+    override fun shouldRoll(entity: PokemonEntity): Boolean {
+        return false
+    }
+
     override fun encode(buffer: RegistryFriendlyByteBuf) {
         super.encode(buffer)
         buffer.writeString(this.speed.getString())
@@ -174,6 +276,11 @@ class VehicleLandController : RideController {
         buffer.writeString(this.minimumSpeedToTurn.getString())
         buffer.writeString(this.rotationSpeed.getString())
         buffer.writeString(this.lookYawLimit.getString())
+        buffer.writeString(this.handlingExpr.getString())
+        buffer.writeString(this.staminaExpr.getString())
+        buffer.writeString(this.jumpExpr.getString())
+        buffer.writeString(this.topSpeedExpr.getString())
+        buffer.writeString(this.accelExpr.getString())
     }
 
     override fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -189,6 +296,11 @@ class VehicleLandController : RideController {
         this.minimumSpeedToTurn = buffer.readString().asExpression()
         this.rotationSpeed = buffer.readString().asExpression()
         this.lookYawLimit = buffer.readString().asExpression()
+        this.handlingExpr = buffer.readString().asExpression()
+        this.staminaExpr = buffer.readString().asExpression()
+        this.jumpExpr = buffer.readString().asExpression()
+        this.topSpeedExpr = buffer.readString().asExpression()
+        this.accelExpr = buffer.readString().asExpression()
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/states/BirdAirState.kt

@@ -14,5 +14,6 @@ import net.minecraft.world.phys.Vec3
 
 data class BirdAirState(val entity: PokemonEntity) : RidingState {
     var currSpeed: Double = 0.0
-    var lastVelocity: Vec3 = Vec3(0.0, 0.0, 0.0)
+    var stamina: Float = 1.0f
+    var rideVel: Vec3 = Vec3.ZERO
 }

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/states/DolphinState.kt

@@ -0,0 +1,16 @@
+/*
+ * 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.pokemon.riding.states
+
+import com.cobblemon.mod.common.api.riding.RidingState
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+
+data class DolphinState(val entity: PokemonEntity) : RidingState {
+    var currSpeed: Double = 0.0
+}

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/riding/states/LandVehicleState.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.pokemon.riding.states
+
+import com.cobblemon.mod.common.api.riding.RidingState
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.util.SmoothDouble
+import net.minecraft.world.phys.Vec3
+
+data class LandVehicleState(val entity: PokemonEntity) : RidingState {
+    var currSpeed: Double = 0.0
+    var stamina: Float = 1.0f
+    var currMouseXForce: Double = 0.0
+    var currMouseYForce: Double = 0.0
+    //I am thinking this will either be a ranging from -1.0 to 1.0
+    //When drift is first activated while a turn is initiated it will go to (the sign of the turn)*0.5.
+    //Then you are able to change it between +-1.0 and 0.25 which will determine how much forced rotation
+    //The drift gives you. The second component is the offset of the velocity vector. Might simply be able
+    //to add an equal amount of x velocity as the current z velocity? Or maybe just a transformation to turn
+    //it to the right?? This will be the hardest part actually... Because if you add a similar one then the
+    //magnitude willbe increased? Maybe just half both and then that effectively slows it? idk.
+    var currDrift: Double = 0.0
+    //Determines how much boost is left.
+    var driftBoost: Double = 0.0
+    var turnSmoother: SmoothDouble = SmoothDouble()
+
+}

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/SoundEventAdapter.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.util.adapters
+
+import com.google.gson.*
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.sounds.SoundEvent
+import java.lang.reflect.Type
+
+/**
+ * Adapter for deserializing SoundEvent types.
+ *
+ * @author Jackowes
+ * @since March 5th, 2025
+ */
+
+object SoundEventAdapter : JsonDeserializer<SoundEvent> {
+    override fun deserialize(json: JsonElement, type: Type, context: JsonDeserializationContext): SoundEvent {
+        val soundId = json.asString
+
+        // Attempt to grab the sound resource location. If incorrect then return null
+        val resourceLocation = ResourceLocation.read(soundId).result().orElse(null)
+            ?: throw JsonParseException("Invalid sound event resource location: $soundId")
+
+        // Attempt to retrieve the SoundEvent from the registry
+        return BuiltInRegistries.SOUND_EVENT.getOptional(resourceLocation)
+            .orElseThrow { JsonParseException("Unknown sound event: $soundId") }
+    }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0511_pansage/pansage.animation.json

@@ -1,332 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.pansage.ground_idle": {
-			"loop": true,
-			"bones": {
-				"leg_right": {
-					"rotation": [-67.5, 35, 0]
-				},
-				"waist": {
-					"rotation": [5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-40, 30, 0]
-				},
-				"tail2": {
-					"rotation": [40, 30, 0]
-				},
-				"tail3": {
-					"rotation": [32.5, 37.5, 0]
-				},
-				"tail4": {
-					"rotation": [-22.5, 22.5, 0]
-				},
-				"tail5": {
-					"rotation": [-32.5, 42.5, 0]
-				},
-				"torso": {
-					"rotation": [10, 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 12.5, 45]
-				},
-				"arm_left2": {
-					"rotation": [0, 27.5, 25]
-				},
-				"thumb_left": {
-					"rotation": [35, -27.5, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 20]
-				},
-				"arm_right": {
-					"rotation": [0, -12.5, -45]
-				},
-				"arm_right2": {
-					"rotation": [0, -27.5, -25]
-				},
-				"thumb_right": {
-					"rotation": [35, 27.5, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -20]
-				},
-				"head_angle": {
-					"rotation": [-10, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -10]
-				},
-				"body": {
-					"position": [0, -2, 0]
-				},
-				"leg_right2": {
-					"rotation": [67.5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-67.5, -35, 0]
-				},
-				"leg_left2": {
-					"rotation": [67.5, 0, 0]
-				}
-			}
-		},
-		"animation.pansage.pose": {
-			"loop": true,
-			"bones": {
-				"leg_right": {
-					"rotation": [-65, 35, 0]
-				},
-				"tail": {
-					"rotation": [-40, 45, 0]
-				},
-				"tail2": {
-					"rotation": [10, 30, 0]
-				},
-				"tail3": {
-					"rotation": [22.5, 27.5, 0]
-				},
-				"tail4": {
-					"rotation": [32.5, 0, 0]
-				},
-				"tail5": {
-					"rotation": [0, -35, 95]
-				},
-				"arm_left": {
-					"rotation": [0, 17.5, 45]
-				},
-				"arm_left2": {
-					"rotation": [-67.5, 0, -62.5]
-				},
-				"thumb_left": {
-					"rotation": [0, -35, 0]
-				},
-				"arm_right": {
-					"rotation": [0, -17.5, -45]
-				},
-				"arm_right2": {
-					"rotation": [-67.5, 0, 62.5]
-				},
-				"thumb_right": {
-					"rotation": [0, 35, 0]
-				},
-				"head_angle": {
-					"rotation": [-5, 0, 5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 15]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -15]
-				},
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"body": {
-					"position": [0, -2, 0]
-				},
-				"leg_right2": {
-					"rotation": [65, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-65, -35, 0]
-				},
-				"leg_left2": {
-					"rotation": [65, 0, 0]
-				},
-				"torso": {
-					"rotation": [10, 0, 0],
-					"position": [0, -0.25, 0]
-				}
-			}
-		},
-		"animation.pansage.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansage.angry": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_angry": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansage.sad": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_sad": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansage.happy": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"blush_right": {
-					"position": [0, 0, -0.1]
-				},
-				"blush_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansage.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansage.smile": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansage.recoil": {
-			"loop": true
-		},
-		"animation.pansage.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0512_simisage/simisage.animation.json

@@ -1,512 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.simisage.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -2, 0]
-				},
-				"leg_left": {
-					"rotation": [-22.5, 0, -12.5],
-					"position": [0, 0, -0.5]
-				},
-				"leg_left2": {
-					"rotation": [42.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-35, 22.5, 15],
-					"position": [0, 0, 0.5]
-				},
-				"leg_right2": {
-					"rotation": [52.5, 0, 0]
-				},
-				"waist": {
-					"rotation": [0, 10, 0]
-				},
-				"torso2": {
-					"rotation": [12.5, 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"arm_left": {
-					"rotation": [-47.5, 0, 25]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, 57.5]
-				},
-				"hand_left": {
-					"rotation": [-15, 0, 10]
-				},
-				"thumb_left": {
-					"rotation": [0, -55, 0]
-				},
-				"thumb_left_tip": {
-					"rotation": [27.5, 0, 0]
-				},
-				"hand_left_finger": {
-					"rotation": [0, 0, 57.5]
-				},
-				"hand_left_finger_tip": {
-					"rotation": [0, 0, 45]
-				},
-				"hand_left_finger2": {
-					"rotation": [0, 0, 60]
-				},
-				"hand_left_finger_tip2": {
-					"rotation": [0, 0, 50]
-				},
-				"hand_left_finger3": {
-					"rotation": [0, 0, 62.5]
-				},
-				"hand_left_finger_tip3": {
-					"rotation": [0, 0, 47.5]
-				},
-				"hand_left_finger4": {
-					"rotation": [0, 0, 65]
-				},
-				"hand_left_finger_tip4": {
-					"rotation": [0, 0, 60]
-				},
-				"arm_right": {
-					"rotation": [-57.5, 0, -32.5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, -57.5]
-				},
-				"hand_right": {
-					"rotation": [-15, 0, -10]
-				},
-				"thumb_right": {
-					"rotation": [0, 55, 0]
-				},
-				"thumb_right_tip": {
-					"rotation": [27.5, 0, 0]
-				},
-				"hand_right_finger": {
-					"rotation": [0, 0, -57.5]
-				},
-				"hand_right_finger_tip": {
-					"rotation": [0, 0, -45]
-				},
-				"hand_right_finger2": {
-					"rotation": [0, 0, -60]
-				},
-				"hand_right_finger_tip2": {
-					"rotation": [0, 0, -55]
-				},
-				"hand_right_finger3": {
-					"rotation": [0, 0, -62.5]
-				},
-				"hand_right_finger_tip3": {
-					"rotation": [0, 0, -45]
-				},
-				"hand_right_finger4": {
-					"rotation": [0, 0, -65]
-				},
-				"hand_right_finger_tip4": {
-					"rotation": [0, 0, -60]
-				},
-				"head_angle": {
-					"rotation": [-5, 0, -2.5]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 10]
-				},
-				"tail": {
-					"rotation": [-25, -30, 0]
-				},
-				"tail2": {
-					"rotation": [31, -15, 0]
-				},
-				"tail3": {
-					"rotation": [20, -5, 0]
-				},
-				"tail4": {
-					"rotation": [25, 0, 0]
-				},
-				"tail6": {
-					"rotation": [20, -25, 0]
-				},
-				"tail5": {
-					"rotation": [22.5, -25, 0]
-				},
-				"foot_right": {
-					"rotation": [0, 0, -15]
-				},
-				"foot_left": {
-					"rotation": [-20, 0, 12.5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -10]
-				},
-				"toes_right": {
-					"rotation": [-10, 0, 0]
-				},
-				"hand_left_fingers": {
-					"position": [0.25, 0, 0]
-				},
-				"hand_right_fingers": {
-					"position": [-0.25, 0, 0]
-				},
-				"eyebrow_left": {
-					"rotation": [7.5, 0, 0]
-				},
-				"wrist_left": {
-					"rotation": [112.5, 0, 0]
-				},
-				"wrist_right": {
-					"rotation": [112.5, 0, 0]
-				},
-				"leg_left_fur": {
-					"rotation": [-12.5, 0, 0],
-					"position": [0, 0.5, 0]
-				},
-				"collar_back": {
-					"rotation": [15, 0, 0]
-				},
-				"waist_fur_front": {
-					"rotation": [15, 0, 0]
-				},
-				"waist_fur_back": {
-					"rotation": [-15, 0, 0]
-				},
-				"waist_fur_left": {
-					"rotation": [0, 0, 12.5]
-				},
-				"waist_fur_right": {
-					"rotation": [0, 0, -12.5]
-				},
-				"eyebrow_right": {
-					"rotation": [7.5, 0, 0]
-				}
-			}
-		},
-		"animation.simisage.pose": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -1.75, 0]
-				},
-				"leg_left": {
-					"rotation": [-42.5, -45, 0],
-					"position": [0, 0, -1]
-				},
-				"leg_left2": {
-					"rotation": [45, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 17.5]
-				},
-				"head_angle": {
-					"rotation": [0, 15, -5]
-				},
-				"leg_right": {
-					"rotation": [0, 0, 27.5],
-					"position": [0, 0.5, 1.25]
-				},
-				"leg_right2": {
-					"rotation": [20, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 15]
-				},
-				"hand_left_finger": {
-					"rotation": [0, 12.5, -20]
-				},
-				"hand_left_finger_tip": {
-					"rotation": [0, 0, -2.5]
-				},
-				"hand_left_finger2": {
-					"rotation": [0, 5, 0]
-				},
-				"hand_left_finger3": {
-					"rotation": [0, -5, 15]
-				},
-				"hand_left_finger4": {
-					"rotation": [-5, -15, 30]
-				},
-				"thumb_left": {
-					"rotation": [25, -17.5, 0]
-				},
-				"arm_right": {
-					"rotation": [-90, 0, -35]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, -62.5]
-				},
-				"hand_right": {
-					"rotation": [25, 30, -72.5]
-				},
-				"thumb_right": {
-					"rotation": [0, 15, 0]
-				},
-				"thumb_right_tip": {
-					"rotation": [0, -10, 0]
-				},
-				"hand_right_finger": {
-					"rotation": [0, 0, -75]
-				},
-				"hand_right_finger_tip": {
-					"rotation": [0, 0, -45]
-				},
-				"hand_right_finger2": {
-					"rotation": [0, 0, -72.5]
-				},
-				"hand_right_finger_tip2": {
-					"rotation": [0, 0, -40]
-				},
-				"hand_right_finger3": {
-					"rotation": [0, 0, -67.5]
-				},
-				"hand_right_finger_tip3": {
-					"rotation": [0, 0, -52.5]
-				},
-				"hand_right_finger4": {
-					"rotation": [0, 0, -65]
-				},
-				"hand_right_finger_tip4": {
-					"rotation": [0, 0, -42.5]
-				},
-				"hand_right_fingers": {
-					"position": [-0.25, 0, 0]
-				},
-				"tail": {
-					"rotation": [-47.81374, 17.38772, -18.2489]
-				},
-				"tail2": {
-					"rotation": [0, 30, 0]
-				},
-				"tail3": {
-					"rotation": [0, 37.5, 0]
-				},
-				"tail4": {
-					"rotation": [30, 40, 0]
-				},
-				"tail6": {
-					"rotation": [27.5, 0, 0]
-				},
-				"tail5": {
-					"rotation": [0, 27.5, 0]
-				},
-				"foot_right": {
-					"rotation": [-18.84359, 21.40584, -37.09999],
-					"position": [0.75, 0, 0]
-				},
-				"foot_left": {
-					"position": [0, -0.25, 0]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -15]
-				},
-				"tail_tips": {
-					"rotation": [0, 0, 37.5]
-				},
-				"eyebrow_left": {
-					"rotation": [7.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [5, 0, 0]
-				},
-				"collar_back": {
-					"rotation": [12.5, 0, 0]
-				},
-				"waist_fur_front": {
-					"rotation": [12.5, 0, 0]
-				},
-				"waist_fur_back": {
-					"rotation": [-15, 0, 0]
-				},
-				"waist_fur_left": {
-					"rotation": [0, 0, 12.5]
-				},
-				"waist_fur_right": {
-					"rotation": [0, 0, -12.5]
-				},
-				"waist": {
-					"rotation": [0, 17.5, 0]
-				},
-				"eyebrow_right": {
-					"rotation": [7.5, 0, 0]
-				}
-			}
-		},
-		"animation.simisage.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_shocked": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simisage.angry": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"rotation": [0, 0, -10]
-				},
-				"pupil_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"rotation": [0, 0, 10]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisage.sad": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"rotation": [0, 0, 10]
-				},
-				"pupil_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"rotation": [0, 0, -10]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisage.happy": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"blush": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0.25, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_happy": {
-					"position": [-0.25, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisage.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simisage.smile": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simisage.recoil": {
-			"loop": true
-		},
-		"animation.simisage.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_left_happy": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0513_pansear/pansear.animation.json

@@ -1,373 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.pansear.ground_idle": {
-			"loop": true,
-			"bones": {
-				"waist": {
-					"rotation": [7.5, 0, 0]
-				},
-				"torso": {
-					"rotation": [7.5, 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 17.5, 25]
-				},
-				"arm_left2": {
-					"rotation": [70, 25, 60]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 20]
-				},
-				"thumb_left": {
-					"rotation": [0, -32.5, 0]
-				},
-				"arm_right": {
-					"rotation": [0, -17.5, -25]
-				},
-				"arm_right2": {
-					"rotation": [70, -25, -60]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -20]
-				},
-				"thumb_right": {
-					"rotation": [0, 32.5, 0]
-				},
-				"head_angle": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [15, -22.5, 0]
-				},
-				"tail2": {
-					"rotation": [30, 0, 0]
-				},
-				"tail3": {
-					"rotation": [45, 37.5, 0]
-				},
-				"tail4": {
-					"rotation": [30, 25, 0]
-				},
-				"tail_tip": {
-					"rotation": [-25, 0, 0]
-				},
-				"tail5": {
-					"rotation": [-40, -37.5, 0]
-				},
-				"leg_right": {
-					"rotation": [-60, 30, 0]
-				},
-				"hair_left_tip2": {
-					"rotation": [0, 0, -20]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -10]
-				},
-				"body": {
-					"position": [0, -1.75, 0]
-				},
-				"leg_right2": {
-					"rotation": [60, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-60, -30, 0]
-				},
-				"leg_left2": {
-					"rotation": [60, 0, 0]
-				}
-			}
-		},
-		"animation.pansear.pose": {
-			"loop": true,
-			"bones": {
-				"waist": {
-					"rotation": [7.5, 15, 0]
-				},
-				"torso": {
-					"rotation": [12.5, 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 10, 15],
-					"position": [1, 0, 0]
-				},
-				"arm_left2": {
-					"rotation": [-87.5, 0, -67.5]
-				},
-				"thumb_left": {
-					"rotation": [0, -27.5, 0]
-				},
-				"arm_right": {
-					"rotation": [-52.5, 0, -15]
-				},
-				"arm_right2": {
-					"rotation": [87.5, 0, -60]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -22.5]
-				},
-				"thumb_right": {
-					"rotation": [47.5, 0, 0]
-				},
-				"head_angle": {
-					"rotation": [-7.5, 0, 7.5]
-				},
-				"pupil_right": {
-					"position": [0.25, 0, 0]
-				},
-				"pupil_left": {
-					"position": [0.75, 0, 0]
-				},
-				"tail": {
-					"rotation": [-37.68944, 20.25437, -14.97401]
-				},
-				"tail2": {
-					"rotation": [20, 0, 0]
-				},
-				"tail3": {
-					"rotation": [17.5, 0, 0]
-				},
-				"tail4": {
-					"rotation": [32.5, 0, 0]
-				},
-				"tail_tip": {
-					"rotation": [0, 35, 0]
-				},
-				"tail5": {
-					"rotation": [22.5, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-60, 30, 0],
-					"position": [-0.5, 0, 0]
-				},
-				"body": {
-					"position": [0, -1.75, 0]
-				},
-				"leg_right2": {
-					"rotation": [60, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, -12.5, 10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -10]
-				},
-				"leg_left": {
-					"rotation": [-60, -30, 0]
-				},
-				"leg_left2": {
-					"rotation": [60, 0, 0]
-				}
-			}
-		},
-		"animation.pansear.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.pansear.angry": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_annoyed": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_annoyed": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_angry": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansear.sad": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_sad": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansear.happy": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"blush_right": {
-					"position": [0, 0, -0.1]
-				},
-				"blush_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_happy": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansear.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansear.smile": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.pansear.recoil": {
-			"loop": true
-		},
-		"animation.pansear.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0514_simisear/simisear.animation.json

@@ -1,478 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.simisear.pose": {
-			"loop": true,
-			"bones": {
-				"arm_left": {
-					"rotation": [0, 25, 35]
-				},
-				"arm_left2": {
-					"rotation": [0, 45, -55]
-				},
-				"hand_left": {
-					"rotation": [15, 0, 35]
-				},
-				"thumb_left": {
-					"rotation": [0, -25, 0]
-				},
-				"body": {
-					"rotation": [0, 17.5, 0],
-					"position": [0, -1.5, 0]
-				},
-				"leg_left": {
-					"rotation": [-35, -22.5, 0]
-				},
-				"leg_left2": {
-					"rotation": [57.5, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [15, 0, 0]
-				},
-				"toes_left": {
-					"rotation": [-35, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-25, 35, 0]
-				},
-				"leg_right2": {
-					"rotation": [40, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-12.5, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [0, -15, -35]
-				},
-				"arm_right2": {
-					"rotation": [0, -55, 57.5]
-				},
-				"hand_right": {
-					"rotation": [-5, 0, -35]
-				},
-				"thumb_right": {
-					"rotation": [0, 25, 0]
-				},
-				"hand_right_finger": {
-					"rotation": [0, -15, -20]
-				},
-				"hand_right_finger2": {
-					"rotation": [0, -2.5, -15]
-				},
-				"hand_right_finger3": {
-					"rotation": [0, 10, -17.5]
-				},
-				"hand_right_finger4": {
-					"rotation": [-6, 16, -20]
-				},
-				"head_angle": {
-					"rotation": [5, 0, -5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 10]
-				},
-				"hair_left_tip": {
-					"rotation": [0, 0, -20]
-				},
-				"hair_front": {
-					"rotation": [0, 0, 10]
-				},
-				"hair_right": {
-					"rotation": [-10, 0, 0]
-				},
-				"tail": {
-					"rotation": [-25, 32.5, 0]
-				},
-				"tail_fluff": {
-					"rotation": [-10, 30, 0],
-					"position": [-2, 0, -4]
-				},
-				"tail_fluff2": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tail_tip": {
-					"rotation": [-40, 0, 0]
-				},
-				"blush_left": {
-					"position": [0, 0, 0.2]
-				},
-				"blush_right": {
-					"position": [0, 0, 0.2]
-				},
-				"hand_left_finger": {
-					"rotation": [0, 12.5, 20]
-				},
-				"hand_left_finger2": {
-					"rotation": [0, 5, 20]
-				},
-				"hand_left_finger3": {
-					"rotation": [0, -5, 20]
-				},
-				"hand_left_finger4": {
-					"rotation": [-6, -16, 20]
-				}
-			}
-		},
-		"animation.simisear.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_shocked": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisear.angry": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisear.sad": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_happy": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisear.happy": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"blush": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisear.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left": {
-					"position": [0, 0, 0.1]
-				}
-			}
-		},
-		"animation.simisear.smile": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simisear.recoil": {
-			"animation_length": 0.0417
-		},
-		"animation.simisear.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.simisear.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -2, 0]
-				},
-				"leg_left": {
-					"rotation": [-30, -20, 0],
-					"position": [0, -0.25, -0.5]
-				},
-				"leg_left2": {
-					"rotation": [50, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-20, 10, -5]
-				},
-				"leg_right": {
-					"rotation": [-30, 35, 0],
-					"position": [0, 0, 1.5]
-				},
-				"leg_right2": {
-					"rotation": [45, 0, 0]
-				},
-				"waist": {
-					"rotation": [0, 10, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 20, 40]
-				},
-				"arm_left2": {
-					"rotation": [0, 37.5, 0]
-				},
-				"hand_left": {
-					"rotation": [10, 0, 0]
-				},
-				"thumb_left": {
-					"rotation": [0, -45, 0]
-				},
-				"thumb_left_tip": {
-					"rotation": [25, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [0, -20, -40]
-				},
-				"arm_right2": {
-					"rotation": [0, -30, 0]
-				},
-				"hand_right": {
-					"rotation": [22.5, -27.5, 0]
-				},
-				"thumb_right": {
-					"rotation": [0, 45, 0]
-				},
-				"thumb_right_tip": {
-					"rotation": [25, 0, 0]
-				},
-				"hand_right_finger": {
-					"rotation": [1.75378, -9.84655, -10.15108]
-				},
-				"hand_right_finger_tip": {
-					"rotation": [0, 0, -20]
-				},
-				"hand_right_finger2": {
-					"rotation": [0.21803, -2.49048, -5.00474]
-				},
-				"hand_right_finger_tip2": {
-					"rotation": [0, 0, -25]
-				},
-				"hand_right_finger3": {
-					"rotation": [0, 5, 0]
-				},
-				"hand_right_finger_tip3": {
-					"rotation": [0, 0, -22.5]
-				},
-				"hand_right_finger4": {
-					"rotation": [-2.20462, 12.3071, -10.23772]
-				},
-				"hand_right_finger_tip4": {
-					"rotation": [0, 0, -12.5]
-				},
-				"head_angle": {
-					"rotation": [5, 0, 2.5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 10]
-				},
-				"foot_right": {
-					"rotation": [-15, 0, 0]
-				},
-				"hand_right_fingers": {
-					"position": [0.25, 0, 0]
-				},
-				"torso": {
-					"rotation": [5, 0, 0]
-				},
-				"hair_front": {
-					"rotation": [0, 0, 10]
-				},
-				"tail": {
-					"rotation": [-50, 0, 0]
-				},
-				"tail_fluff": {
-					"rotation": [0, -17.5, 0]
-				},
-				"tail_tip": {
-					"rotation": [-42.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [35, 0, 0]
-				},
-				"hand_left_finger": {
-					"rotation": [1.75378, 9.84655, 10.15108]
-				},
-				"hand_left_finger_tip": {
-					"rotation": [0, 0, 20]
-				},
-				"hand_left_finger2": {
-					"rotation": [0.21803, 2.49048, 5.00474]
-				},
-				"hand_left_finger_tip2": {
-					"rotation": [0, 0, 25]
-				},
-				"hand_left_finger3": {
-					"rotation": [0, -5, 0]
-				},
-				"hand_left_finger_tip3": {
-					"rotation": [0, 0, 22.5]
-				},
-				"hand_left_finger4": {
-					"rotation": [-2.20462, -12.3071, 10.23772]
-				},
-				"hand_left_finger_tip4": {
-					"rotation": [0, 0, 12.5]
-				},
-				"hand_left_fingers": {
-					"position": [-0.25, 0, 0]
-				},
-				"simisear": {
-					"scale": 1
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0515_panpour/panpour.animation.json

@@ -1,309 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.panpour.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -1.7, 0]
-				},
-				"leg_right": {
-					"rotation": [-60, 45, 0]
-				},
-				"leg_right2": {
-					"rotation": [60, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-60, -45, 0]
-				},
-				"leg_left2": {
-					"rotation": [60, 0, 0]
-				},
-				"waist": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [10, 25, 0]
-				},
-				"tail2": {
-					"rotation": [27.5, 0, 0]
-				},
-				"tail3": {
-					"rotation": [40, 35, 0]
-				},
-				"tail4": {
-					"rotation": [-15, -42.5, 0]
-				},
-				"tail5": {
-					"rotation": [-35, 0, 0]
-				},
-				"torso": {
-					"rotation": [-2.5, 0, 0],
-					"position": [0, -0.1, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 7.5, 42.5]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, -7.5]
-				},
-				"thumb_left": {
-					"rotation": [42.5, 0, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 20]
-				},
-				"arm_right": {
-					"rotation": [0, -12.5, -42.5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 7.5]
-				},
-				"thumb_right": {
-					"rotation": [42.5, 0, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -20]
-				},
-				"head_angle": {
-					"rotation": [-5, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -10]
-				}
-			}
-		},
-		"animation.panpour.pose": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"rotation": [0, -10, 0],
-					"position": [0, -1.75, 0]
-				},
-				"leg_right": {
-					"rotation": [-60, 45, 0]
-				},
-				"leg_right2": {
-					"rotation": [62.5, 0, 0]
-				},
-				"leg_left": {
-					"rotation": [-60, -45, 0]
-				},
-				"leg_left2": {
-					"rotation": [62.5, 0, 0]
-				},
-				"waist": {
-					"rotation": [7.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-57.60064, -14.02846, 20.9057]
-				},
-				"tail2": {
-					"rotation": [40, 0, 0]
-				},
-				"tail3": {
-					"rotation": [11.50839, -29.4987, -5.72511]
-				},
-				"tail5": {
-					"rotation": [1.19215, 24.94918, -84.61501]
-				},
-				"torso": {
-					"rotation": [7.5, 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 45]
-				},
-				"arm_left2": {
-					"rotation": [0, 0, -35]
-				},
-				"thumb_left": {
-					"rotation": [35, -20, 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 20]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -45]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, 35]
-				},
-				"thumb_right": {
-					"rotation": [35, 20, 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -20]
-				},
-				"head_angle": {
-					"rotation": [-20, 0, 0]
-				},
-				"ear_left": {
-					"rotation": [0, 0, 10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, -10]
-				}
-			}
-		},
-		"animation.panpour.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.panpour.angry": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_annoyed": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_angry": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.panpour.sad": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_sad": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.panpour.happy": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, 0.1]
-				},
-				"blush_right": {
-					"position": [0, 0, -0.1]
-				},
-				"blush_left": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.panpour.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.panpour.smile": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.panpour.recoil": {
-			"loop": true
-		},
-		"animation.panpour.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0516_simipour/simipour.animation.json

@@ -1,460 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.simipour.ground_idle": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.5, 0]
-				},
-				"leg_left": {
-					"rotation": [-5, 0, -12.5],
-					"position": [0, 0, -0.5]
-				},
-				"leg_left2": {
-					"rotation": [15, 0, 0]
-				},
-				"leg_right": {
-					"rotation": [-5.3191, 19.92066, 10.68307],
-					"position": [0, 0, 0.5]
-				},
-				"leg_right2": {
-					"rotation": [15, 0, 0]
-				},
-				"waist": {
-					"rotation": [0, 10, 0]
-				},
-				"dress_front2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"torso2": {
-					"rotation": [7.5, 0, 0],
-					"position": [0, -0.25, 0]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 60]
-				},
-				"arm_left2": {
-					"rotation": [0, 15, 7.5]
-				},
-				"hand_left": {
-					"rotation": [0, 10, 12.5]
-				},
-				"thumb_left": {
-					"rotation": [0, -45, 0]
-				},
-				"thumb_left_tip": {
-					"rotation": [27.5, 0, 0]
-				},
-				"hand_left_finger": {
-					"rotation": [0, 0, 15]
-				},
-				"hand_left_finger_tip": {
-					"rotation": [0, 0, 45]
-				},
-				"hand_left_finger2": {
-					"rotation": [0, 0, 12.5]
-				},
-				"hand_left_finger_tip2": {
-					"rotation": [0, 0, 25]
-				},
-				"hand_left_finger3": {
-					"rotation": [0, 0, 10]
-				},
-				"hand_left_finger_tip3": {
-					"rotation": [0, 0, 20]
-				},
-				"hand_left_finger4": {
-					"rotation": [0, 0, 10]
-				},
-				"hand_left_finger_tip4": {
-					"rotation": [0, 0, 22.5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -65]
-				},
-				"arm_right2": {
-					"rotation": [0, -20, 7.5]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -10]
-				},
-				"thumb_right": {
-					"rotation": [0, 45, 0]
-				},
-				"thumb_right_tip": {
-					"rotation": [27.5, 0, 0]
-				},
-				"hand_right_finger": {
-					"rotation": [0, 0, -15]
-				},
-				"hand_right_finger_tip": {
-					"rotation": [0, 0, -45]
-				},
-				"hand_right_finger2": {
-					"rotation": [0, 0, -12.5]
-				},
-				"hand_right_finger_tip2": {
-					"rotation": [0, 0, -25]
-				},
-				"hand_right_finger3": {
-					"rotation": [0, 0, -10]
-				},
-				"hand_right_finger_tip3": {
-					"rotation": [0, 0, -20]
-				},
-				"hand_right_finger4": {
-					"rotation": [0, 0, -10]
-				},
-				"hand_right_finger_tip4": {
-					"rotation": [0, 0, -22.5]
-				},
-				"head_angle": {
-					"rotation": [-5, 0, -2.5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -10]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 10]
-				},
-				"tail": {
-					"rotation": [-60, 0, 0]
-				},
-				"tail2": {
-					"rotation": [27.5, 17.5, 0]
-				},
-				"tail3": {
-					"rotation": [20, 5, 0]
-				},
-				"tail4": {
-					"rotation": [42.5, 0, 0]
-				},
-				"tail_tip": {
-					"rotation": [-22.5, 0, 0]
-				},
-				"tail5": {
-					"rotation": [22.5, 25, 0]
-				},
-				"dress_back_tip": {
-					"rotation": [12.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-5, 15, -12.5]
-				},
-				"foot_left": {
-					"rotation": [-10, 0, 12.5]
-				},
-				"hair_right_tip": {
-					"rotation": [0, 0, -22.5]
-				},
-				"hair_left_tip": {
-					"rotation": [0, 0, 22.5]
-				},
-				"hair_back_left_tip": {
-					"rotation": [0, 0, 22.5]
-				},
-				"hair_back_right_tip": {
-					"rotation": [0, 0, -22.5]
-				},
-				"hair_front_left_tip": {
-					"rotation": [0, 0, 22.5]
-				},
-				"hair_front_right_tip": {
-					"rotation": [0, 0, -22.5]
-				}
-			}
-		},
-		"animation.simipour.pose": {
-			"loop": true,
-			"bones": {
-				"body": {
-					"position": [0, -0.75, 0]
-				},
-				"leg_left": {
-					"rotation": [-10, 0, -7.5],
-					"position": [0, 0.25, 0]
-				},
-				"leg_left2": {
-					"rotation": [20, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [-65.75231, 6.27967, 33.85027]
-				},
-				"arm_left2": {
-					"rotation": [-55, 62.5, -55]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 22.5]
-				},
-				"head_angle": {
-					"rotation": [0, 0, -7.5]
-				},
-				"ear_left": {
-					"rotation": [0, 0, -15]
-				},
-				"leg_right": {
-					"rotation": [-7.5, 0, 17.5]
-				},
-				"leg_right2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"ear_right": {
-					"rotation": [0, 0, 15]
-				},
-				"hand_left_finger": {
-					"rotation": [5, 15, 5]
-				},
-				"hand_left_finger_tip": {
-					"rotation": [0, 0, 10]
-				},
-				"hand_left_finger2": {
-					"rotation": [0, 2.5, 0]
-				},
-				"hand_left_finger_tip2": {
-					"rotation": [0, 0, 25]
-				},
-				"hand_left_finger3": {
-					"rotation": [0, -5, 0]
-				},
-				"hand_left_finger_tip3": {
-					"rotation": [0, 0, 15]
-				},
-				"hand_left_finger4": {
-					"rotation": [0, -10, 0]
-				},
-				"hand_left_finger_tip4": {
-					"rotation": [0, 0, 5]
-				},
-				"thumb_left": {
-					"rotation": [0, -17.5, 0]
-				},
-				"thumb_left_tip": {
-					"rotation": [17.5, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [-2.35666, 17.34551, -32.85952]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, -80],
-					"position": [0, 1, 0]
-				},
-				"hand_right": {
-					"rotation": [120, 27, -6]
-				},
-				"thumb_right": {
-					"rotation": [0, 35, 0]
-				},
-				"thumb_right_tip": {
-					"rotation": [45, 0, 0]
-				},
-				"hand_right_finger": {
-					"rotation": [0, 0, -42.5]
-				},
-				"hand_right_finger_tip": {
-					"rotation": [0, 0, -42.5]
-				},
-				"hand_right_finger2": {
-					"rotation": [0, 0, -42.5]
-				},
-				"hand_right_finger_tip2": {
-					"rotation": [0, 0, -62.5]
-				},
-				"hand_right_finger3": {
-					"rotation": [0, 0, -45]
-				},
-				"hand_right_finger_tip3": {
-					"rotation": [0, 0, -45]
-				},
-				"hand_right_finger4": {
-					"rotation": [0, 0, -35]
-				},
-				"hand_right_finger_tip4": {
-					"rotation": [0, 0, -17.5]
-				},
-				"hand_right_fingers": {
-					"position": [0, 0, 0]
-				},
-				"dress_front2": {
-					"rotation": [-5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-52.5, 0, 0]
-				},
-				"tail2": {
-					"rotation": [0, -17.5, 0]
-				},
-				"tail3": {
-					"rotation": [20, -42.5, 0]
-				},
-				"tail4": {
-					"rotation": [0, -30, 0]
-				},
-				"tail_tip": {
-					"rotation": [20, -27.5, 0]
-				},
-				"tail5": {
-					"rotation": [0, -25, 0]
-				},
-				"dress_back_tip": {
-					"rotation": [7.5, 0, 0]
-				},
-				"foot_right": {
-					"rotation": [-5.48747, 25.87634, -17.37997],
-					"position": [0.25, 0, 0]
-				},
-				"foot_left": {
-					"rotation": [-10, -12.5, 7.5],
-					"position": [0, -0.25, 0]
-				}
-			}
-		},
-		"animation.simipour.shocked": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_tall": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simipour.angry": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_open_small": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_angry": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_angry": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simipour.sad": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_left_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"pupil_right": {
-					"position": [0, 0, 0.1]
-				},
-				"pupil_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_frown": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_sad": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_left_sad": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simipour.happy": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_happy": {
-					"position": [0, 0, -0.1]
-				},
-				"blush": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simipour.unamused": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"eyebrow_left_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"eyebrow_right_straight": {
-					"position": [0, 0, -0.1]
-				},
-				"mouth_straight": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simipour.smile": {
-			"loop": true,
-			"bones": {
-				"mouth": {
-					"position": [0, 0, 0.1]
-				},
-				"mouth_open_smile": {
-					"position": [0, 0, -0.1]
-				}
-			}
-		},
-		"animation.simipour.recoil": {
-			"animation_length": 0.0417
-		},
-		"animation.simipour.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"pupil_left": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_left_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.125": [0, 0, 0.1],
-						"0.1667": [0, 0, 0]
-					}
-				},
-				"pupil_right_blink": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.125": [0, 0, -0.1],
-						"0.1667": [0, 0, 0]
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0935_charcadet/charcadet.animation.json

@@ -424,11 +424,6 @@
 						"1.25": [0, 0, 0]
 					}
 				}
-			},
-			"sound_effects": {
-				"0.2917": {
-					"effect": "pokemon.charcadet.cry"
-				}
 			}
 		},
 		"animation.charcadet.faint": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0130_gyarados/gyarados_female.geo.json

@@ -6,7 +6,7 @@
 				"identifier": "geometry.gyarados_female",
 				"texture_width": 256,
 				"texture_height": 256,
-				"visible_bounds_width": 6,
+				"visible_bounds_width": 12,
 				"visible_bounds_height": 12,
 				"visible_bounds_offset": [0, -1, 0]
 			},
@@ -15,43 +15,11 @@
 					"name": "gyarados",
 					"pivot": [0, 0, 0]
 				},
-				{
-					"name": "locator_root",
-					"parent": "gyarados",
-					"pivot": [0, 0, 0],
-					"locators": {
-						"root": [0, 0, 0]
-					}
-				},
-				{
-					"name": "locator_top",
-					"parent": "gyarados",
-					"pivot": [0, 55, 0],
-					"locators": {
-						"top": [0, 55, 0]
-					}
-				},
 				{
 					"name": "body",
 					"parent": "gyarados",
 					"pivot": [0, 28, 0]
 				},
-				{
-					"name": "locator_target",
-					"parent": "body",
-					"pivot": [0, 0, -7],
-					"locators": {
-						"target": [0, 0, -7]
-					}
-				},
-				{
-					"name": "locator_middle",
-					"parent": "body",
-					"pivot": [0, 0, 0],
-					"locators": {
-						"middle": [0, 0, 0]
-					}
-				},
 				{
 					"name": "neck1",
 					"parent": "body",
@@ -138,46 +106,6 @@
 						{"origin": [-6, 41, -20], "size": [12, 14, 12], "uv": [28, 122]}
 					]
 				},
-				{
-					"name": "locator_head",
-					"parent": "head",
-					"pivot": [0, 55, -17],
-					"locators": {
-						"head": [0, 55, -17]
-					}
-				},
-				{
-					"name": "locator_seat_1",
-					"parent": "head",
-					"pivot": [0, 55, -8],
-					"locators": {
-						"seat_1": [0, 55, -8]
-					}
-				},
-				{
-					"name": "locator_item_face",
-					"parent": "head",
-					"pivot": [0, 49, -23],
-					"locators": {
-						"item_face": [0, 49, -23]
-					}
-				},
-				{
-					"name": "locator_face",
-					"parent": "head",
-					"pivot": [0, 47.5, -27],
-					"locators": {
-						"face": [0, 47.5, -27]
-					}
-				},
-				{
-					"name": "locator_item_hat",
-					"parent": "head",
-					"pivot": [0, 55, -14],
-					"locators": {
-						"item_hat": [0, 55, -14]
-					}
-				},
 				{
 					"name": "blush",
 					"parent": "head",
@@ -392,20 +320,12 @@
 						{"origin": [-4.5, 45, -25], "size": [9, 3, 6], "inflate": 0.01, "uv": [70, 144]}
 					]
 				},
-				{
-					"name": "locator_jaw_upper",
-					"parent": "muzzle",
-					"pivot": [0, 45, -25],
-					"locators": {
-						"jaw1": [0, 45, -25]
-					}
-				},
 				{
 					"name": "upper_left_tooth",
 					"parent": "muzzle",
 					"pivot": [2.75, 44.9, -25],
 					"cubes": [
-						{"origin": [3.26, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 13]}
+						{"origin": [3.25, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 13]}
 					]
 				},
 				{
@@ -413,7 +333,7 @@
 					"parent": "muzzle",
 					"pivot": [-3.25, 44.9, -25],
 					"cubes": [
-						{"origin": [-3.26, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 15]}
+						{"origin": [-3.25, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 15]}
 					]
 				},
 				{
@@ -436,29 +356,6 @@
 						{"origin": [-4.5, 41, -20.5], "size": [9, 5, 8], "inflate": 0.01, "uv": [50, 0]}
 					]
 				},
-				{
-					"name": "locator_mouth",
-					"parent": "jaw",
-					"pivot": [0, 46.75, -23],
-					"locators": {
-						"mouth": {
-							"offset": [0, 46.75, -23],
-							"rotation": [-40, 0, 0]
-						},
-						"special": {
-							"offset": [0, 46.75, -23],
-							"rotation": [-40, 0, 0]
-						}
-					}
-				},
-				{
-					"name": "locator_item",
-					"parent": "jaw",
-					"pivot": [0, 48.1, -24.4],
-					"locators": {
-						"item": [0, 48.1, -24.4]
-					}
-				},
 				{
 					"name": "jaw2",
 					"parent": "jaw",
@@ -468,14 +365,6 @@
 						{"origin": [-4.5, 41, -28.5], "size": [9, 2, 8], "uv": [0, 140]}
 					]
 				},
-				{
-					"name": "locator_jaw_lower",
-					"parent": "jaw2",
-					"pivot": [0, 43, -28],
-					"locators": {
-						"jaw2": [0, 43, -28]
-					}
-				},
 				{
 					"name": "jaw_right_tooth",
 					"parent": "jaw2",
@@ -526,14 +415,6 @@
 						{"origin": [-6, 47.5, -20], "size": [5, 3, 2], "inflate": 0.01, "uv": [56, 75]}
 					]
 				},
-				{
-					"name": "locator_eye_right",
-					"parent": "right_eye",
-					"pivot": [-3.75, 49, -20],
-					"locators": {
-						"eye1": [-3.75, 49, -20]
-					}
-				},
 				{
 					"name": "tear_right",
 					"parent": "right_eye",
@@ -614,14 +495,6 @@
 						{"origin": [1, 47.5, -20], "size": [5, 3, 2], "inflate": 0.01, "uv": [56, 70]}
 					]
 				},
-				{
-					"name": "locator_eye_left",
-					"parent": "left_eye",
-					"pivot": [3.75, 49, -20],
-					"locators": {
-						"eye2": [3.75, 49, -20]
-					}
-				},
 				{
 					"name": "tear_left",
 					"parent": "left_eye",
@@ -872,15 +745,6 @@
 						{"origin": [-2, -85, -1.75], "size": [4, 8, 4], "uv": [0, 0]}
 					]
 				},
-				{
-					"name": "locator_tail",
-					"parent": "segment9",
-					"pivot": [0, -81, 0.25],
-					"locators": {
-						"tail": [0, -81, 0.25],
-						"physical": [0, -81, 0.25]
-					}
-				},
 				{
 					"name": "tail1",
 					"parent": "segment9",
@@ -904,15 +768,6 @@
 					"cubes": [
 						{"origin": [-11.5, -107, 0.25], "size": [23, 12, 0], "uv": [112, 81]}
 					]
-				},
-				{
-					"name": "locator_tail_tip",
-					"parent": "tail3",
-					"pivot": [0, -107, 0.25],
-					"locators": {
-						"tail_tip1": [-11.5, -107, 0.25],
-						"tail_tip2": [11.5, -107, 0.25]
-					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0130_gyarados/gyarados_male.geo.json

@@ -7,51 +7,19 @@
 				"texture_width": 256,
 				"texture_height": 256,
 				"visible_bounds_width": 12,
-				"visible_bounds_height": 12,
-				"visible_bounds_offset": [0, -1, 0]
+				"visible_bounds_height": 5.5,
+				"visible_bounds_offset": [0, 2.25, 0]
 			},
 			"bones": [
 				{
 					"name": "gyarados",
 					"pivot": [0, 0, 0]
 				},
-				{
-					"name": "locator_root",
-					"parent": "gyarados",
-					"pivot": [0, 0, 0],
-					"locators": {
-						"root": [0, 0, 0]
-					}
-				},
-				{
-					"name": "locator_top",
-					"parent": "gyarados",
-					"pivot": [0, 55, 0],
-					"locators": {
-						"top": [0, 55, 0]
-					}
-				},
 				{
 					"name": "body",
 					"parent": "gyarados",
 					"pivot": [0, 28, 0]
 				},
-				{
-					"name": "locator_target",
-					"parent": "body",
-					"pivot": [0, 0, -7],
-					"locators": {
-						"target": [0, 0, -7]
-					}
-				},
-				{
-					"name": "locator_middle",
-					"parent": "body",
-					"pivot": [0, 0, 0],
-					"locators": {
-						"middle": [0, 0, 0]
-					}
-				},
 				{
 					"name": "neck1",
 					"parent": "body",
@@ -138,46 +106,6 @@
 						{"origin": [-6, 41, -20], "size": [12, 14, 12], "uv": [28, 122]}
 					]
 				},
-				{
-					"name": "locator_head",
-					"parent": "head",
-					"pivot": [0, 55, -17],
-					"locators": {
-						"head": [0, 55, -17]
-					}
-				},
-				{
-					"name": "locator_item_hat",
-					"parent": "head",
-					"pivot": [0, 55, -14],
-					"locators": {
-						"item_hat": [0, 55, -14]
-					}
-				},
-				{
-					"name": "locator_face",
-					"parent": "head",
-					"pivot": [0, 47.5, -27],
-					"locators": {
-						"face": [0, 47.5, -27]
-					}
-				},
-				{
-					"name": "locator_item_face",
-					"parent": "head",
-					"pivot": [0, 49, -23],
-					"locators": {
-						"item_face": [0, 49, -23]
-					}
-				},
-				{
-					"name": "locator_seat_1",
-					"parent": "head",
-					"pivot": [0, 55, -8],
-					"locators": {
-						"seat_1": [0, 55, -8]
-					}
-				},
 				{
 					"name": "blush",
 					"parent": "head",
@@ -392,20 +320,12 @@
 						{"origin": [-4.5, 45, -25], "size": [9, 3, 6], "inflate": 0.01, "uv": [70, 144]}
 					]
 				},
-				{
-					"name": "locator_jaw_upper",
-					"parent": "muzzle",
-					"pivot": [0, 45, -25],
-					"locators": {
-						"jaw1": [0, 45, -25]
-					}
-				},
 				{
 					"name": "upper_left_tooth",
 					"parent": "muzzle",
 					"pivot": [2.75, 44.9, -25],
 					"cubes": [
-						{"origin": [3.26, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 13]}
+						{"origin": [3.25, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 13]}
 					]
 				},
 				{
@@ -413,7 +333,7 @@
 					"parent": "muzzle",
 					"pivot": [-3.25, 44.9, -25],
 					"cubes": [
-						{"origin": [-3.26, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 15]}
+						{"origin": [-3.25, 43.4, -25.5], "size": [0, 2, 1], "uv": [18, 15]}
 					]
 				},
 				{
@@ -436,29 +356,6 @@
 						{"origin": [-4.5, 41, -20.5], "size": [9, 5, 8], "inflate": 0.01, "uv": [50, 0]}
 					]
 				},
-				{
-					"name": "locator_mouth",
-					"parent": "jaw",
-					"pivot": [0, 48, -24],
-					"locators": {
-						"mouth": {
-							"offset": [0, 46.75, -23],
-							"rotation": [-40, 0, 0]
-						},
-						"special": {
-							"offset": [0, 46.75, -23],
-							"rotation": [-40, 0, 0]
-						}
-					}
-				},
-				{
-					"name": "locator_item",
-					"parent": "jaw",
-					"pivot": [0, 48, -24],
-					"locators": {
-						"item": [0, 48.1, -24.4]
-					}
-				},
 				{
 					"name": "jaw2",
 					"parent": "jaw",
@@ -468,14 +365,6 @@
 						{"origin": [-4.5, 41, -28.5], "size": [9, 2, 8], "uv": [0, 140]}
 					]
 				},
-				{
-					"name": "locator_jaw_lower",
-					"parent": "jaw2",
-					"pivot": [0, 43, -28],
-					"locators": {
-						"jaw2": [0, 43, -28]
-					}
-				},
 				{
 					"name": "jaw_right_tooth",
 					"parent": "jaw2",
@@ -526,14 +415,6 @@
 						{"origin": [-6, 47.5, -20], "size": [5, 3, 2], "inflate": 0.01, "uv": [56, 75]}
 					]
 				},
-				{
-					"name": "locator_eye_right",
-					"parent": "right_eye",
-					"pivot": [-3.75, 49, -20],
-					"locators": {
-						"eye1": [-3.75, 49, -20]
-					}
-				},
 				{
 					"name": "tear_right",
 					"parent": "right_eye",
@@ -614,14 +495,6 @@
 						{"origin": [1, 47.5, -20], "size": [5, 3, 2], "inflate": 0.01, "uv": [56, 70]}
 					]
 				},
-				{
-					"name": "locator_eye_left",
-					"parent": "left_eye",
-					"pivot": [3.75, 49, -20],
-					"locators": {
-						"eye2": [3.75, 49, -20]
-					}
-				},
 				{
 					"name": "tear_left",
 					"parent": "left_eye",
@@ -872,15 +745,6 @@
 						{"origin": [-2, -85, -1.75], "size": [4, 8, 4], "uv": [0, 0]}
 					]
 				},
-				{
-					"name": "locator_tail",
-					"parent": "segment9",
-					"pivot": [0, -81, 0.25],
-					"locators": {
-						"tail": [0, -81, 0.25],
-						"physical": [0, -81, 0.25]
-					}
-				},
 				{
 					"name": "tail1",
 					"parent": "segment9",
@@ -904,15 +768,6 @@
 					"cubes": [
 						{"origin": [-11.5, -107, 0.25], "size": [23, 12, 0], "uv": [112, 81]}
 					]
-				},
-				{
-					"name": "locator_tail_tip",
-					"parent": "tail3",
-					"pivot": [0, -95, 0.25],
-					"locators": {
-						"tail_tip1": [-11.5, -107, 0.25],
-						"tail_tip2": [11.5, -107, 0.25]
-					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0149_dragonite/dragonite.geo.json

@@ -6,7 +6,7 @@
 				"identifier": "geometry.dragonite",
 				"texture_width": 256,
 				"texture_height": 128,
-				"visible_bounds_width": 9,
+				"visible_bounds_width": 8,
 				"visible_bounds_height": 5.5,
 				"visible_bounds_offset": [0, 2.25, 0]
 			},
@@ -15,43 +15,11 @@
 					"name": "dragonite",
 					"pivot": [0, 0, 0]
 				},
-				{
-					"name": "locator_root",
-					"parent": "dragonite",
-					"pivot": [0, 0, 0],
-					"locators": {
-						"root": [0, 0, 0]
-					}
-				},
-				{
-					"name": "locator_top",
-					"parent": "dragonite",
-					"pivot": [0, 55, 0],
-					"locators": {
-						"top": [0, 55, 0]
-					}
-				},
 				{
 					"name": "body",
 					"parent": "dragonite",
 					"pivot": [0, 7, -0.5]
 				},
-				{
-					"name": "locator_target",
-					"parent": "body",
-					"pivot": [0, 25, -9],
-					"locators": {
-						"target": [0, 25, -9]
-					}
-				},
-				{
-					"name": "locator_middle",
-					"parent": "body",
-					"pivot": [0, 25, 0],
-					"locators": {
-						"middle": [0, 25, 0]
-					}
-				},
 				{
 					"name": "torso",
 					"parent": "body",
@@ -65,25 +33,7 @@
 					"parent": "torso",
 					"pivot": [0, 21, -0.5],
 					"cubes": [
-						{"origin": [-8, 19.5, -8], "size": [16, 9, 15], "inflate": 0.01, "uv": [33, 35]},
-						{"origin": [-8, 19.5, -8], "size": [16, 9, 15], "inflate": 0.25, "uv": [193, 85]}
-					]
-				},
-				{
-					"name": "locator_seat2",
-					"parent": "chest",
-					"pivot": [0, 21, 6],
-					"locators": {
-						"seat2": [0, 21, 6]
-					}
-				},
-				{
-					"name": "mailbag",
-					"parent": "chest",
-					"pivot": [8.5, 24, -0.5],
-					"rotation": [0, 0, -15],
-					"cubes": [
-						{"origin": [7.5, 18.5, -5.5], "size": [3, 7, 10], "inflate": 0.01, "uv": [229, 110]}
+						{"origin": [-8, 19.5, -8], "size": [16, 9, 15], "inflate": 0.01, "uv": [33, 35]}
 					]
 				},
 				{
@@ -91,18 +41,9 @@
 					"parent": "chest",
 					"pivot": [0, 28.5, 0],
 					"cubes": [
-						{"origin": [-6, 27, -6], "size": [12, 9, 12], "uv": [0, 29]},
-						{"origin": [-6, 27, -6], "size": [12, 9, 12], "inflate": 0.25, "uv": [207, 63]}
+						{"origin": [-6, 27, -6], "size": [12, 9, 12], "uv": [0, 29]}
 					]
 				},
-				{
-					"name": "locator_seat1",
-					"parent": "chest2",
-					"pivot": [0, 32, 6],
-					"locators": {
-						"seat1": [0, 32, 6]
-					}
-				},
 				{
 					"name": "arms",
 					"parent": "chest2",
@@ -132,14 +73,6 @@
 						{"origin": [17, 30, -3], "size": [4, 5, 6], "inflate": 0.02, "uv": [122, 96]}
 					]
 				},
-				{
-					"name": "locator_hand_secondary",
-					"parent": "hand_left",
-					"pivot": [21, 32.5, 0],
-					"locators": {
-						"hand_secondary": [21, 32.5, 0]
-					}
-				},
 				{
 					"name": "finger_back_left",
 					"parent": "hand_left",
@@ -188,23 +121,6 @@
 						{"origin": [-21, 30, -3], "size": [4, 5, 6], "inflate": 0.02, "uv": [136, 101], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_hand_primary",
-					"parent": "hand_right",
-					"pivot": [-21, 32.5, 0],
-					"locators": {
-						"hand_primary": [-21, 32.5, 0],
-						"physical": [-21, 32.5, 0]
-					}
-				},
-				{
-					"name": "locator_item",
-					"parent": "hand_right",
-					"pivot": [-21, 32.5, 0],
-					"locators": {
-						"item": [-21, 32.5, 0]
-					}
-				},
 				{
 					"name": "finger_back_right",
 					"parent": "hand_right",
@@ -251,14 +167,6 @@
 						{"origin": [13.5, 23, 6], "size": [11, 22, 0], "uv": [120, 29]}
 					]
 				},
-				{
-					"name": "locator_wing_secondary",
-					"parent": "wing_left2",
-					"pivot": [16, 44, 6],
-					"locators": {
-						"wing2": [16, 44, 6]
-					}
-				},
 				{
 					"name": "wing_right",
 					"parent": "wings",
@@ -276,14 +184,6 @@
 						{"origin": [-24.5, 23, 6], "size": [11, 22, 0], "uv": [142, 18], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_wing_primary",
-					"parent": "wing_right2",
-					"pivot": [-16, 44, 6],
-					"locators": {
-						"wing1": [-16, 44, 6]
-					}
-				},
 				{
 					"name": "neck",
 					"parent": "chest2",
@@ -296,51 +196,11 @@
 					"name": "head",
 					"parent": "neck",
 					"pivot": [0, 46, 1],
+					"rotation": [0, 0, 0],
 					"cubes": [
 						{"origin": [-5, 41, -6], "size": [10, 11, 11], "inflate": 0.01, "uv": [0, 0]}
 					]
 				},
-				{
-					"name": "locator_item_hat",
-					"parent": "head",
-					"pivot": [0, 55, 0],
-					"locators": {
-						"item_hat": [0, 55, 0]
-					}
-				},
-				{
-					"name": "locator_head",
-					"parent": "head",
-					"pivot": [0, 52, -4],
-					"locators": {
-						"head": [0, 52, -4]
-					}
-				},
-				{
-					"name": "locator_face",
-					"parent": "head",
-					"pivot": [0, 47, -11],
-					"locators": {
-						"face": [0, 47, -11]
-					}
-				},
-				{
-					"name": "locator_mouth",
-					"parent": "head",
-					"pivot": [0, 42, -6],
-					"locators": {
-						"mouth": [0, 42, -6],
-						"special": [0, 42, -6]
-					}
-				},
-				{
-					"name": "locator_item_face",
-					"parent": "head",
-					"pivot": [0, 48, -6],
-					"locators": {
-						"item_face": [0, 48, -6]
-					}
-				},
 				{
 					"name": "eyes",
 					"parent": "head",
@@ -354,39 +214,12 @@
 						{"origin": [3.02, 46, -6.02], "size": [2, 4, 3], "uv": [0, 0]}
 					]
 				},
-				{
-					"name": "locator_eye_left",
-					"parent": "eye_left",
-					"pivot": [4, 48, 0],
-					"locators": {
-						"eye_left": [4, 48, 0]
-					}
-				},
-				{
-					"name": "eye_angry_left",
-					"parent": "eye_left",
-					"pivot": [3.92, 49, -5.94],
-					"cubes": [
-						{"origin": [2.92, 48, -5.94], "size": [1, 2, 0], "inflate": 0.01, "uv": [0, 7]},
-						{"origin": [3.92, 48.5, -5.94], "size": [1, 2, 1], "inflate": 0.01, "uv": [2, 7]},
-						{"origin": [4.92, 49, -4.94], "size": [0, 1, 1], "inflate": 0.01, "uv": [2, 9]}
-					]
-				},
-				{
-					"name": "eye_sad_left",
-					"parent": "eye_left",
-					"pivot": [3.92, 49, -5.94],
-					"cubes": [
-						{"origin": [3.92, 49, -5.94], "size": [1, 1, 1], "inflate": 0.01, "uv": [1, 22]},
-						{"origin": [4.92, 48.5, -4.94], "size": [0, 2, 2], "inflate": 0.01, "uv": [28, 20]}
-					]
-				},
 				{
 					"name": "pupil_left",
 					"parent": "eye_left",
-					"pivot": [4.02, 48, -6.03],
+					"pivot": [4.02, 47.75, -6.03],
 					"cubes": [
-						{"origin": [3.52, 46.5, -6.03], "size": [1, 3, 0], "uv": [0, 0]}
+						{"origin": [3.52, 46.25, -6.03], "size": [1, 3, 0], "uv": [0, 0]}
 					]
 				},
 				{
@@ -405,30 +238,6 @@
 						{"origin": [2.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [61, 0]}
 					]
 				},
-				{
-					"name": "eyelid_happy_left",
-					"parent": "eye_left",
-					"pivot": [3.92, 48, -4.44],
-					"cubes": [
-						{"origin": [2.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [36, 27]}
-					]
-				},
-				{
-					"name": "eyelid_recoil_left",
-					"parent": "eye_left",
-					"pivot": [3.92, 48, -4.44],
-					"cubes": [
-						{"origin": [2.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [39, 20]}
-					]
-				},
-				{
-					"name": "eye_shocked_left",
-					"parent": "eye_left",
-					"pivot": [4.02, 48, -4.52],
-					"cubes": [
-						{"origin": [2.77, 46, -5.77], "size": [2, 4, 3], "inflate": 0.01, "uv": [0, 50]}
-					]
-				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",
@@ -437,39 +246,12 @@
 						{"origin": [-5.02, 46, -6.02], "size": [2, 4, 3], "uv": [0, 28], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_eye_right",
-					"parent": "eye_right",
-					"pivot": [-4, 48, 0],
-					"locators": {
-						"eye_right": [-4, 48, 0]
-					}
-				},
-				{
-					"name": "eye_angry_right",
-					"parent": "eye_right",
-					"pivot": [-3.92, 49, -5.94],
-					"cubes": [
-						{"origin": [-3.92, 48, -5.94], "size": [1, 2, 0], "inflate": 0.01, "uv": [0, 9], "mirror": true},
-						{"origin": [-4.92, 48.5, -5.94], "size": [1, 2, 1], "inflate": 0.01, "uv": [6, 7], "mirror": true},
-						{"origin": [-4.92, 49, -4.94], "size": [0, 1, 1], "inflate": 0.01, "uv": [6, 9], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_sad_right",
-					"parent": "eye_right",
-					"pivot": [-3.92, 49, -5.94],
-					"cubes": [
-						{"origin": [-4.92, 49, -5.94], "size": [1, 1, 1], "inflate": 0.01, "uv": [1, 24], "mirror": true},
-						{"origin": [-4.92, 48.5, -4.94], "size": [0, 2, 2], "inflate": 0.01, "uv": [32, 20], "mirror": true}
-					]
-				},
 				{
 					"name": "pupil_right",
 					"parent": "eye_right",
-					"pivot": [-4.02, 48, -6.03],
+					"pivot": [-4.02, 47.75, -6.03],
 					"cubes": [
-						{"origin": [-4.52, 46.5, -6.03], "size": [1, 3, 0], "uv": [0, 28], "mirror": true}
+						{"origin": [-4.52, 46.25, -6.03], "size": [1, 3, 0], "uv": [0, 28], "mirror": true}
 					]
 				},
 				{
@@ -485,31 +267,7 @@
 					"parent": "eye_right",
 					"pivot": [-3.92, 48, -4.44],
 					"cubes": [
-						{"origin": [-4.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [36, 34], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_happy_right",
-					"parent": "eye_right",
-					"pivot": [-3.92, 48, -4.44],
-					"cubes": [
-						{"origin": [-4.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [46, 28], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_recoil_right",
-					"parent": "eye_right",
-					"pivot": [-3.92, 48, -4.44],
-					"cubes": [
-						{"origin": [-4.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [49, 21], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_shocked_right",
-					"parent": "eye_right",
-					"pivot": [-3.98, 48, -4.57],
-					"cubes": [
-						{"origin": [-4.805, 46, -5.77], "size": [2, 4, 3], "inflate": 0.1, "uv": [0, 57]}
+						{"origin": [-4.92, 46, -5.94], "size": [2, 4, 3], "inflate": 0.01, "uv": [36, 29], "mirror": true}
 					]
 				},
 				{
@@ -518,17 +276,11 @@
 					"pivot": [0, 47, -6],
 					"cubes": [
 						{"origin": [-4, 42, -11], "size": [8, 5, 5], "inflate": 0.01, "uv": [31, 1]},
+						{"origin": [0.5, 44, -11.02], "size": [2, 1, 0], "pivot": [1.5, 44.5, -11.02], "rotation": [0, 0, -25], "uv": [31, 0]},
+						{"origin": [-2.5, 44, -11.02], "size": [2, 1, 0], "pivot": [-1.5, 44.5, -11.02], "rotation": [0, 0, 25], "uv": [31, 1], "mirror": true},
 						{"origin": [-3.5, 41.98, -11], "size": [7, 0, 5], "uv": [64, 22]}
 					]
 				},
-				{
-					"name": "locator_jaw_upper",
-					"parent": "muzzle",
-					"pivot": [0, 42, -11],
-					"locators": {
-						"jaw1": [0, 42, -11]
-					}
-				},
 				{
 					"name": "jaw",
 					"parent": "head",
@@ -537,14 +289,6 @@
 						{"origin": [-3.5, 41, -11], "size": [7, 1, 5], "uv": [0, 22]}
 					]
 				},
-				{
-					"name": "locator_jaw_lower",
-					"parent": "jaw",
-					"pivot": [0, 42, -11],
-					"locators": {
-						"jaw2": [0, 42, -11]
-					}
-				},
 				{
 					"name": "spike",
 					"parent": "head",
@@ -555,14 +299,6 @@
 						{"origin": [-1, 53, -1], "size": [2, 2, 2], "uv": [57, 8]}
 					]
 				},
-				{
-					"name": "locator_horn",
-					"parent": "spike",
-					"pivot": [0, 55, 0],
-					"locators": {
-						"horn": [0, 55, 0]
-					}
-				},
 				{
 					"name": "antennae",
 					"parent": "head",
@@ -698,14 +434,6 @@
 						{"origin": [-2, 11, 44], "size": [4, 4, 11], "uv": [84, 49]}
 					]
 				},
-				{
-					"name": "locator_tail",
-					"parent": "tail5",
-					"pivot": [0, 13, 50],
-					"locators": {
-						"tail": [0, 13, 50]
-					}
-				},
 				{
 					"name": "tail6",
 					"parent": "tail5",
@@ -714,14 +442,6 @@
 						{"origin": [-1.5, 11.5, 54], "size": [3, 3, 9], "uv": [69, 59]}
 					]
 				},
-				{
-					"name": "locator_tail_tip",
-					"parent": "tail6",
-					"pivot": [0, 13, 63],
-					"locators": {
-						"tail_tip": [0, 13, 63]
-					}
-				},
 				{
 					"name": "legs",
 					"parent": "body",
@@ -759,14 +479,6 @@
 						{"origin": [7, 0, -3.75], "size": [5, 3, 9], "inflate": 0.01, "uv": [72, 74]}
 					]
 				},
-				{
-					"name": "locator_foot_secondary",
-					"parent": "foot_left",
-					"pivot": [9.5, 1.5, -3],
-					"locators": {
-						"foot_secondary": [9.5, 1.5, -3]
-					}
-				},
 				{
 					"name": "foot_left2",
 					"parent": "foot_left",
@@ -831,14 +543,6 @@
 						{"origin": [-12, 0, -3.75], "size": [5, 3, 9], "inflate": 0.01, "uv": [100, 74], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_foot_primary",
-					"parent": "foot_right",
-					"pivot": [-9.5, 1.5, -3],
-					"locators": {
-						"foot_primary": [-9.5, 1.5, -3]
-					}
-				},
 				{
 					"name": "foot_right2",
 					"parent": "foot_right",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0511_pansage/pansage.geo.json

@@ -1,586 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.pansage",
-				"texture_width": 64,
-				"texture_height": 64,
-				"visible_bounds_width": 4,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
-			},
-			"bones": [
-				{
-					"name": "pansage",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "pansage",
-					"pivot": [0, 9.5, 0]
-				},
-				{
-					"name": "legs",
-					"parent": "body",
-					"pivot": [0, 5.5, 0.5]
-				},
-				{
-					"name": "leg_right",
-					"parent": "legs",
-					"pivot": [-1.5, 5.4, -0.25],
-					"cubes": [
-						{"origin": [-2.5, 3.4, -1.25], "size": [2, 3, 2], "inflate": 0.02, "uv": [12, 43]}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right",
-					"pivot": [-1.5, 3.4, -1.25],
-					"cubes": [
-						{"origin": [-2.5, 0.4, -1.25], "size": [2, 3, 2], "uv": [20, 43]}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-1.5, 0.9, -0.25],
-					"cubes": [
-						{"origin": [-2.5, -0.1, -2.25], "size": [2, 1, 3], "inflate": 0.02, "uv": [36, 41]}
-					]
-				},
-				{
-					"name": "leg_left",
-					"parent": "legs",
-					"pivot": [1.5, 5.4, -0.25],
-					"cubes": [
-						{"origin": [0.5, 3.4, -1.25], "size": [2, 3, 2], "inflate": 0.02, "uv": [0, 44]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left",
-					"pivot": [1.5, 3.4, -1.25],
-					"cubes": [
-						{"origin": [0.5, 0.4, -1.25], "size": [2, 3, 2], "uv": [36, 45]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [1.5, 0.9, -0.25],
-					"cubes": [
-						{"origin": [0.5, -0.1, -2.25], "size": [2, 1, 3], "inflate": 0.02, "uv": [42, 34]}
-					]
-				},
-				{
-					"name": "waist",
-					"parent": "body",
-					"pivot": [0, 4.5, 0],
-					"cubes": [
-						{"origin": [-2, 4.5, -1.5], "size": [4, 4, 3], "inflate": 0.02, "uv": [28, 34]}
-					]
-				},
-				{
-					"name": "tail",
-					"parent": "waist",
-					"pivot": [0, 5.5, 1.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 0.5], "size": [1, 1, 4], "inflate": 0.02, "uv": [40, 27]}
-					]
-				},
-				{
-					"name": "tail2",
-					"parent": "tail",
-					"pivot": [0, 5.5, 4.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 4.5], "size": [1, 1, 3], "uv": [48, 6]}
-					]
-				},
-				{
-					"name": "tail3",
-					"parent": "tail2",
-					"pivot": [0, 5.5, 7.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 7.5], "size": [1, 1, 2], "inflate": 0.02, "uv": [0, 49]}
-					]
-				},
-				{
-					"name": "tail4",
-					"parent": "tail3",
-					"pivot": [0, 5.5, 9.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 9.5], "size": [1, 1, 3], "uv": [8, 48]}
-					]
-				},
-				{
-					"name": "tail5",
-					"parent": "tail4",
-					"pivot": [0, 5.5, 12.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 12.5], "size": [1, 1, 3], "inflate": 0.02, "uv": [16, 48]}
-					]
-				},
-				{
-					"name": "tail_tip",
-					"parent": "tail5",
-					"pivot": [0, 5.5, 14.5]
-				},
-				{
-					"name": "tail_tip_left",
-					"parent": "tail_tip",
-					"pivot": [0, 5.25, 14.5],
-					"rotation": [0, 10, 0],
-					"cubes": [
-						{"origin": [-0.5, 4.25, 14.5], "size": [2, 2, 4], "uv": [36, 6]}
-					]
-				},
-				{
-					"name": "tail_tip2",
-					"parent": "tail_tip_left",
-					"pivot": [0, 5.25, 18.5],
-					"cubes": [
-						{"origin": [-0.5, 5.25, 18.5], "size": [2, 0, 1], "uv": [50, 3]}
-					]
-				},
-				{
-					"name": "tail_tip_right",
-					"parent": "tail_tip",
-					"pivot": [0, 5.75, 14.5],
-					"rotation": [0, -10, 0],
-					"cubes": [
-						{"origin": [-1.5, 4.75, 14.5], "size": [2, 2, 4], "uv": [0, 38]}
-					]
-				},
-				{
-					"name": "tail_tip3",
-					"parent": "tail_tip_right",
-					"pivot": [0, 5.75, 18.5],
-					"cubes": [
-						{"origin": [-1.5, 5.75, 18.5], "size": [2, 0, 1], "uv": [50, 4]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "waist",
-					"pivot": [0, 8.5, 0],
-					"cubes": [
-						{"origin": [-2, 8.5, -1.5], "size": [4, 3, 3], "uv": [36, 0]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso",
-					"pivot": [0, 10.75, 0]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [1.5, 10.75, 0],
-					"cubes": [
-						{"origin": [1, 10.25, -0.5], "size": [4, 1, 1], "uv": [41, 32]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [5, 10.75, 0],
-					"cubes": [
-						{"origin": [5, 9.75, -1], "size": [2, 2, 2], "uv": [44, 45]},
-						{"origin": [7, 9.75, -1.5], "size": [3, 2, 3], "uv": [12, 38]}
-					]
-				},
-				{
-					"name": "thumb_left",
-					"parent": "arm_left2",
-					"pivot": [9, 10.75, -1.5],
-					"cubes": [
-						{"origin": [9, 9.75, -3], "size": [1, 1, 2], "inflate": -0.02, "uv": [24, 48]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [10, 11.75, 0],
-					"cubes": [
-						{"origin": [10, 9.75, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [40, 17]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-1.5, 10.75, 0],
-					"cubes": [
-						{"origin": [-5, 10.25, -0.5], "size": [4, 1, 1], "uv": [24, 41]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-5, 10.75, 0],
-					"cubes": [
-						{"origin": [-7, 9.75, -1], "size": [2, 2, 2], "uv": [46, 38]},
-						{"origin": [-10, 9.75, -1.5], "size": [3, 2, 3], "uv": [40, 12]}
-					]
-				},
-				{
-					"name": "thumb_right",
-					"parent": "arm_right2",
-					"pivot": [-9, 10.75, -1.5],
-					"cubes": [
-						{"origin": [-10, 9.75, -3], "size": [1, 1, 2], "inflate": -0.02, "uv": [30, 48]}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-10, 11.75, 0],
-					"cubes": [
-						{"origin": [-12, 9.75, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [40, 22]}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso",
-					"pivot": [0, 12.5, 0]
-				},
-				{
-					"name": "head_correction",
-					"parent": "head",
-					"pivot": [0, 12.5, 0]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head_correction",
-					"pivot": [0, 12.5, 0]
-				},
-				{
-					"name": "head_angle",
-					"parent": "head_ai",
-					"pivot": [0, 12.5, 0],
-					"cubes": [
-						{"origin": [-5, 11.5, -4], "size": [10, 8, 8], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "hair",
-					"parent": "head_angle",
-					"pivot": [0, 19.5, 0],
-					"cubes": [
-						{"origin": [-1, 18.5, -1], "size": [2, 3, 2], "uv": [28, 43]}
-					]
-				},
-				{
-					"name": "hair2",
-					"parent": "hair",
-					"pivot": [0, 20.5, 0],
-					"cubes": [
-						{"origin": [-4, 20.5, -3], "size": [8, 5, 6], "uv": [0, 16]},
-						{"origin": [-4, 20.5, -3], "size": [8, 5, 6], "inflate": 0.25, "uv": [0, 27]},
-						{"origin": [-0.5, 23.25, -3.27], "size": [1, 1, 0], "uv": [38, 50]},
-						{"origin": [-2, 21.75, -3.27], "size": [4, 1, 0], "uv": [48, 11]}
-					]
-				},
-				{
-					"name": "ear_left",
-					"parent": "head_angle",
-					"pivot": [5, 16, 0],
-					"cubes": [
-						{"origin": [4, 12.5, 0], "size": [6, 9, 0], "uv": [28, 16]}
-					]
-				},
-				{
-					"name": "ear_right",
-					"parent": "head_angle",
-					"pivot": [-5, 16, 0],
-					"cubes": [
-						{"origin": [-10, 12.5, 0], "size": [6, 9, 0], "uv": [28, 25]}
-					]
-				},
-				{
-					"name": "nose",
-					"parent": "head_angle",
-					"pivot": [0, 13.25, -4.03],
-					"cubes": [
-						{"origin": [-0.5, 13.25, -4.02], "size": [1, 1, 0], "uv": [50, 27]},
-						{"origin": [-1, 12.75, -4.04], "size": [2, 1, 0], "uv": [36, 15]}
-					]
-				},
-				{
-					"name": "expressions",
-					"parent": "head_angle",
-					"pivot": [0, 12.75, -4.06]
-				},
-				{
-					"name": "mouths",
-					"parent": "expressions",
-					"pivot": [0, 12.75, -4.06]
-				},
-				{
-					"name": "mouth",
-					"parent": "mouths",
-					"pivot": [0, 12.75, -4.06],
-					"cubes": [
-						{"origin": [-2.5, 12, -4.06], "size": [5, 1, 0], "uv": [44, 49]},
-						{"origin": [-0.5, 12.5, -4.06], "size": [1, 1, 0], "uv": [48, 44]},
-						{"origin": [-3, 12.5, -4.06], "size": [1, 1, 0], "uv": [46, 44]},
-						{"origin": [2, 12.5, -4.06], "size": [1, 1, 0], "uv": [50, 44], "mirror": true}
-					]
-				},
-				{
-					"name": "mouth_frown",
-					"parent": "mouths",
-					"pivot": [0, 12.75, -3.96],
-					"cubes": [
-						{"origin": [-1.5, 12, -3.96], "size": [3, 1, 0], "uv": [50, 2]},
-						{"origin": [-0.5, 12.5, -3.96], "size": [1, 1, 0], "uv": [50, 30]}
-					]
-				},
-				{
-					"name": "mouth_open_tall",
-					"parent": "mouths",
-					"pivot": [0, 12.5, -3.96],
-					"cubes": [
-						{"origin": [-0.5, 11.5, -3.96], "size": [1, 2, 0], "uv": [50, 25]}
-					]
-				},
-				{
-					"name": "mouth_open_happy",
-					"parent": "mouths",
-					"pivot": [0, 12.75, -3.97],
-					"cubes": [
-						{"origin": [-2.5, 11.5, -3.96], "size": [5, 2, 0], "uv": [46, 42]}
-					]
-				},
-				{
-					"name": "mouth_open_smile",
-					"parent": "mouths",
-					"pivot": [0, 12.5, -4.07],
-					"cubes": [
-						{"origin": [-1.5, 12.5, -3.96], "size": [3, 1, 0], "uv": [50, 5]},
-						{"origin": [-1, 11.5, -3.98], "size": [2, 1, 0], "uv": [50, 22]}
-					]
-				},
-				{
-					"name": "mouth_straight",
-					"parent": "mouths",
-					"pivot": [0, 13, -3.96],
-					"cubes": [
-						{"origin": [-2.5, 12.5, -3.96], "size": [5, 1, 0], "uv": [48, 10]}
-					]
-				},
-				{
-					"name": "mouth_open_small",
-					"parent": "mouths",
-					"pivot": [0, 12.5, -3.96],
-					"cubes": [
-						{"origin": [-1, 11.5, -3.96], "size": [2, 2, 0], "uv": [42, 38]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "expressions",
-					"pivot": [0, 15.5, -4.02]
-				},
-				{
-					"name": "eyes_left",
-					"parent": "eyes",
-					"pivot": [2.75, 15.5, -4.02]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes_left",
-					"pivot": [2.75, 15.5, -4.02],
-					"cubes": [
-						{"origin": [1.75, 14, -4.02], "size": [2, 3, 0], "uv": [24, 38]}
-					]
-				},
-				{
-					"name": "eyebrow_left_straight",
-					"parent": "eye_left",
-					"pivot": [2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [1.25, 16.5, -3.96], "size": [3, 1, 0], "uv": [50, 0]}
-					]
-				},
-				{
-					"name": "eyebrow_left_sad",
-					"parent": "eye_left",
-					"pivot": [2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [2.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [56, 0], "mirror": true},
-						{"origin": [1.25, 17, -3.96], "size": [1, 1, 0], "uv": [47, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_left_angry",
-					"parent": "eye_left",
-					"pivot": [2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [1.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [56, 1], "mirror": true},
-						{"origin": [3.25, 17, -3.96], "size": [1, 1, 0], "uv": [47, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [2.5, 15.75, -4.04],
-					"cubes": [
-						{"origin": [2, 14.75, -4.04], "size": [1, 2, 0], "uv": [50, 23]}
-					]
-				},
-				{
-					"name": "pupil_left_blink",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.5, -3.92],
-					"cubes": [
-						{"origin": [1.75, 15, -3.94], "size": [2, 1, 0], "uv": [42, 40]}
-					]
-				},
-				{
-					"name": "pupil_left_shocked",
-					"parent": "eye_left",
-					"pivot": [2.5, 15.5, -3.94],
-					"cubes": [
-						{"origin": [2, 15, -3.94], "size": [1, 1, 0], "uv": [50, 29]}
-					]
-				},
-				{
-					"name": "pupil_left_happy",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.66667, -4.04667],
-					"cubes": [
-						{"origin": [3.25, 15, -3.94], "size": [1, 1, 0], "uv": [50, 20], "mirror": true},
-						{"origin": [1.25, 15, -3.94], "size": [1, 1, 0], "uv": [50, 20], "mirror": true},
-						{"origin": [2.25, 15.5, -3.96], "size": [1, 1, 0], "uv": [50, 31], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_left_angry",
-					"parent": "eyes_left",
-					"pivot": [2.75, 15.5, -3.94],
-					"cubes": [
-						{"origin": [1.75, 14.75, -3.94], "size": [1, 1, 0], "uv": [8, 47]},
-						{"origin": [2.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [9, 46]}
-					]
-				},
-				{
-					"name": "pupil_left_sad",
-					"parent": "eyes_left",
-					"pivot": [2.75, 15.5, -3.94],
-					"cubes": [
-						{"origin": [1.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [8, 47]},
-						{"origin": [2.75, 14.75, -3.94], "size": [1, 1, 0], "uv": [9, 46]}
-					]
-				},
-				{
-					"name": "eyes_right",
-					"parent": "eyes",
-					"pivot": [-2.75, 15.5, -4.02]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes_right",
-					"pivot": [-2.75, 15.5, -4.02],
-					"cubes": [
-						{"origin": [-3.75, 14, -4.02], "size": [2, 3, 0], "uv": [36, 12]}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-2.5, 15.75, -4.04],
-					"cubes": [
-						{"origin": [-3, 14.75, -4.04], "size": [1, 2, 0], "uv": [6, 49]}
-					]
-				},
-				{
-					"name": "pupil_right_shocked",
-					"parent": "eye_right",
-					"pivot": [-2.5, 15.5, -3.94],
-					"cubes": [
-						{"origin": [-3, 15, -3.94], "size": [1, 1, 0], "uv": [50, 28]}
-					]
-				},
-				{
-					"name": "pupil_right_blink",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.5, -3.92],
-					"cubes": [
-						{"origin": [-3.75, 15, -3.94], "size": [2, 1, 0], "uv": [50, 17]}
-					]
-				},
-				{
-					"name": "pupil_right_happy",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.66667, -4.04667],
-					"cubes": [
-						{"origin": [-4.25, 15, -3.94], "size": [1, 1, 0], "uv": [50, 20]},
-						{"origin": [-2.25, 15, -3.94], "size": [1, 1, 0], "uv": [50, 20]},
-						{"origin": [-3.25, 15.5, -3.96], "size": [1, 1, 0], "uv": [50, 31]}
-					]
-				},
-				{
-					"name": "pupil_right_angry",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.5, -4.04],
-					"cubes": [
-						{"origin": [-2.75, 14.75, -3.94], "size": [1, 1, 0], "uv": [9, 45]},
-						{"origin": [-3.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [8, 44]}
-					]
-				},
-				{
-					"name": "eyebrow_right_straight",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [-4.25, 16.5, -3.96], "size": [3, 1, 0], "uv": [50, 1]}
-					]
-				},
-				{
-					"name": "eyebrow_right_sad",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [-4.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [56, 0]},
-						{"origin": [-2.25, 17, -3.96], "size": [1, 1, 0], "uv": [47, 0]}
-					]
-				},
-				{
-					"name": "pupil_right_sad",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.5, -3.94],
-					"cubes": [
-						{"origin": [-2.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [8, 47], "mirror": true},
-						{"origin": [-3.75, 14.75, -3.94], "size": [1, 1, 0], "uv": [9, 46], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_right_angry",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [-3.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [56, 1]},
-						{"origin": [-4.25, 17, -3.96], "size": [1, 1, 0], "uv": [47, 0]}
-					]
-				},
-				{
-					"name": "blush_left",
-					"parent": "expressions",
-					"pivot": [4, 13.5, -3.96],
-					"cubes": [
-						{"origin": [3, 13, -3.96], "size": [2, 1, 0], "uv": [50, 18]}
-					]
-				},
-				{
-					"name": "blush_right",
-					"parent": "expressions",
-					"pivot": [-4, 13.5, -3.96],
-					"cubes": [
-						{"origin": [-5, 13, -3.96], "size": [2, 1, 0], "uv": [50, 19]}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0512_simisage/simisage.geo.json

@@ -1,827 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.simisage",
-				"texture_width": 128,
-				"texture_height": 128,
-				"visible_bounds_width": 6,
-				"visible_bounds_height": 4.5,
-				"visible_bounds_offset": [0, 1.75, 0]
-			},
-			"bones": [
-				{
-					"name": "simisage",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "simisage",
-					"pivot": [0, 15.25, 1]
-				},
-				{
-					"name": "legs",
-					"parent": "body",
-					"pivot": [0, 8.75, 1]
-				},
-				{
-					"name": "leg_left",
-					"parent": "legs",
-					"pivot": [3, 9, 1],
-					"cubes": [
-						{"origin": [1.5, 5, -0.5], "size": [3, 5, 3], "inflate": 0.02, "uv": [74, 26]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left",
-					"pivot": [3, 5, -0.5],
-					"cubes": [
-						{"origin": [1.5, 1, -0.5], "size": [3, 4, 3], "uv": [50, 78]}
-					]
-				},
-				{
-					"name": "leg_left_fur",
-					"parent": "leg_left2",
-					"pivot": [3, 3, 1],
-					"cubes": [
-						{"origin": [0.5, 3, -1.5], "size": [5, 0, 5], "pivot": [3, 3, 1], "rotation": [22.5, 0, 0], "uv": [56, 49]},
-						{"origin": [0.5, 3, -1.5], "size": [5, 0, 5], "pivot": [3, 3, 1], "rotation": [-22.5, 0, 0], "uv": [56, 54]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [3, 1, 1.5],
-					"cubes": [
-						{"origin": [1, 0, -1], "size": [4, 2, 4], "uv": [68, 70]}
-					]
-				},
-				{
-					"name": "toes_left",
-					"parent": "foot_left",
-					"pivot": [3, 0, -1],
-					"cubes": [
-						{"origin": [1, 0, -3], "size": [4, 2, 2], "inflate": 0.02, "uv": [84, 68]},
-						{"origin": [1.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [4, 87]},
-						{"origin": [3.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [8, 87]}
-					]
-				},
-				{
-					"name": "leg_right",
-					"parent": "legs",
-					"pivot": [-3, 9, 1],
-					"cubes": [
-						{"origin": [-4.5, 5, -0.5], "size": [3, 5, 3], "inflate": 0.02, "uv": [76, 34]}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right",
-					"pivot": [-3, 5, -0.5],
-					"cubes": [
-						{"origin": [-4.5, 1, -0.5], "size": [3, 4, 3], "uv": [80, 18]}
-					]
-				},
-				{
-					"name": "leg_right_fur",
-					"parent": "leg_right2",
-					"pivot": [-3, 3, 1],
-					"cubes": [
-						{"origin": [-5.5, 3, -1.5], "size": [5, 0, 5], "pivot": [-3, 3, 1], "rotation": [22.5, 0, 0], "uv": [56, 59]},
-						{"origin": [-5.5, 3, -1.5], "size": [5, 0, 5], "pivot": [-3, 3, 1], "rotation": [-22.5, 0, 0], "uv": [24, 61]}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-3, 1, 1.5],
-					"cubes": [
-						{"origin": [-5, 0, -1], "size": [4, 2, 4], "uv": [68, 64]}
-					]
-				},
-				{
-					"name": "toes_right",
-					"parent": "foot_right",
-					"pivot": [-3, 0, -1],
-					"cubes": [
-						{"origin": [-5, 0, -3], "size": [4, 2, 2], "inflate": 0.02, "uv": [84, 64]},
-						{"origin": [-2.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [74, 86]},
-						{"origin": [-4.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [0, 87]}
-					]
-				},
-				{
-					"name": "waist",
-					"parent": "body",
-					"pivot": [0, 8, 1],
-					"cubes": [
-						{"origin": [-4.5, 8, -2], "size": [9, 4, 6], "uv": [32, 18]}
-					]
-				},
-				{
-					"name": "waist_fur",
-					"parent": "waist",
-					"pivot": [0, 11, 1]
-				},
-				{
-					"name": "waist_fur_front",
-					"parent": "waist_fur",
-					"pivot": [0, 12, -2.02],
-					"cubes": [
-						{"origin": [-4.5, 12, -2.02], "size": [9, 2, 0], "uv": [76, 48]}
-					]
-				},
-				{
-					"name": "waist_fur_back",
-					"parent": "waist_fur",
-					"pivot": [0, 12, 4.02],
-					"cubes": [
-						{"origin": [-4.5, 12, 4.02], "size": [9, 2, 0], "uv": [50, 76]}
-					]
-				},
-				{
-					"name": "waist_fur_left",
-					"parent": "waist_fur",
-					"pivot": [4.52, 12, 1.5],
-					"cubes": [
-						{"origin": [4.52, 12, -2], "size": [0, 2, 6], "uv": [76, 50]}
-					]
-				},
-				{
-					"name": "waist_fur_right",
-					"parent": "waist_fur",
-					"pivot": [-4.52, 12, 1.5],
-					"cubes": [
-						{"origin": [-4.52, 12, -2], "size": [0, 2, 6], "uv": [68, 76]}
-					]
-				},
-				{
-					"name": "tail",
-					"parent": "waist",
-					"pivot": [0, 9.5, 4],
-					"cubes": [
-						{"origin": [-1, 8.5, 3], "size": [2, 2, 5], "inflate": 0.02, "uv": [0, 74]}
-					]
-				},
-				{
-					"name": "tail2",
-					"parent": "tail",
-					"pivot": [0, 9.5, 8],
-					"cubes": [
-						{"origin": [-1, 8.5, 8], "size": [2, 2, 4], "uv": [76, 58]}
-					]
-				},
-				{
-					"name": "tail3",
-					"parent": "tail2",
-					"pivot": [0, 9.5, 12],
-					"cubes": [
-						{"origin": [-1, 8.5, 12], "size": [2, 2, 4], "inflate": 0.02, "uv": [0, 81]}
-					]
-				},
-				{
-					"name": "tail4",
-					"parent": "tail3",
-					"pivot": [0, 9.5, 16],
-					"cubes": [
-						{"origin": [-1, 8.5, 16], "size": [2, 2, 4], "uv": [36, 81]}
-					]
-				},
-				{
-					"name": "tail5",
-					"parent": "tail4",
-					"pivot": [0, 9.5, 20],
-					"cubes": [
-						{"origin": [-1, 8.5, 20], "size": [2, 2, 4], "inflate": 0.02, "uv": [12, 82]}
-					]
-				},
-				{
-					"name": "tail6",
-					"parent": "tail5",
-					"pivot": [0, 9.5, 24],
-					"cubes": [
-						{"origin": [-1, 8.5, 24], "size": [2, 2, 3], "uv": [48, 85]}
-					]
-				},
-				{
-					"name": "tail_tips",
-					"parent": "tail6",
-					"pivot": [0, 9.5, 27]
-				},
-				{
-					"name": "tail_tip_left",
-					"parent": "tail_tips",
-					"pivot": [0, 9.5, 27],
-					"rotation": [0, 22.5, 0],
-					"cubes": [
-						{"origin": [0, 7.5, 27], "size": [0, 4, 6], "inflate": 0.01, "uv": [24, 66]},
-						{"origin": [0, 6, 27], "size": [0, 7, 4], "uv": [28, 76]}
-					]
-				},
-				{
-					"name": "tail_tip_right",
-					"parent": "tail_tips",
-					"pivot": [0, 9.5, 27],
-					"rotation": [0, -22.5, 0],
-					"cubes": [
-						{"origin": [-0.01704, 7.5, 26.87059], "size": [0, 4, 6], "inflate": 0.01, "uv": [72, 8]},
-						{"origin": [-0.01704, 6, 27.37059], "size": [0, 7, 4], "uv": [80, 76]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "waist",
-					"pivot": [0, 12, 1],
-					"cubes": [
-						{"origin": [-3.5, 12, -1.5], "size": [7, 4, 5], "uv": [32, 28]}
-					]
-				},
-				{
-					"name": "torso2",
-					"parent": "torso",
-					"pivot": [0, 15.5, 1],
-					"cubes": [
-						{"origin": [-2.5, 15.5, -1], "size": [5, 5, 4], "uv": [56, 28]}
-					]
-				},
-				{
-					"name": "collar",
-					"parent": "torso2",
-					"pivot": [5.5, 10, 1]
-				},
-				{
-					"name": "collar_left",
-					"parent": "collar",
-					"pivot": [2.5, 18.5, 1],
-					"cubes": [
-						{"origin": [1.5, 16.5, -1], "size": [3, 4, 4], "inflate": 0.02, "uv": [72, 0]},
-						{"origin": [1.5, 18.5, -3], "size": [4, 0, 8], "pivot": [4.5, 18.5, 1], "rotation": [22.5, 0, 0], "uv": [32, 37]},
-						{"origin": [1.5, 18.5, -3], "size": [4, 0, 8], "pivot": [4.5, 18.5, 1], "rotation": [-22.5, 0, 0], "uv": [32, 45]}
-					]
-				},
-				{
-					"name": "collar_right",
-					"parent": "collar",
-					"pivot": [-2.5, 18.5, 1],
-					"cubes": [
-						{"origin": [-4.5, 16.5, -1], "size": [3, 4, 4], "inflate": 0.02, "uv": [36, 73]},
-						{"origin": [-5.5, 18.5, -3], "size": [4, 0, 8], "pivot": [-3.5, 18.5, 1], "rotation": [22.5, 0, 0], "uv": [32, 53]},
-						{"origin": [-5.5, 18.5, -3], "size": [4, 0, 8], "pivot": [-3.5, 18.5, 1], "rotation": [-22.5, 0, 0], "uv": [0, 54]}
-					]
-				},
-				{
-					"name": "collar_back",
-					"parent": "collar",
-					"pivot": [0, 20.5, 3],
-					"cubes": [
-						{"origin": [-1.5, 15.5, 3], "size": [3, 5, 0], "uv": [62, 78]},
-						{"origin": [0, 15.5, 2], "size": [0, 5, 2], "uv": [24, 82]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso2",
-					"pivot": [0, 17.5, 1]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [2, 18.5, 1],
-					"cubes": [
-						{"origin": [1.5, 17.5, 0], "size": [7, 2, 2], "uv": [62, 18]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [8.5, 19.5, 2],
-					"cubes": [
-						{"origin": [8.5, 17.5, 0], "size": [2, 2, 2], "inflate": 0.02, "uv": [24, 54]}
-					]
-				},
-				{
-					"name": "wrist_left",
-					"parent": "arm_left2",
-					"pivot": [11.5, 18.5, 1],
-					"cubes": [
-						{"origin": [10.5, 17, -0.5], "size": [3, 3, 3], "inflate": 0.02, "uv": [84, 10]},
-						{"origin": [12, 15.5, -2], "size": [0, 6, 6], "pivot": [12, 17, 1], "rotation": [0, -33, 0], "uv": [44, 61]},
-						{"origin": [12, 15.5, -2], "size": [0, 6, 6], "pivot": [12, 17, 1], "rotation": [0, 33, 0], "uv": [0, 62]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "wrist_left",
-					"pivot": [13.5, 18.5, 1],
-					"cubes": [
-						{"origin": [13.5, 17.5, -1], "size": [3, 2, 4], "inflate": 0.02, "uv": [14, 76]}
-					]
-				},
-				{
-					"name": "thumb_left",
-					"parent": "hand_left",
-					"pivot": [15, 18, -0.5],
-					"cubes": [
-						{"origin": [14.5, 17.5, -2], "size": [1, 1, 2], "uv": [50, 73]}
-					]
-				},
-				{
-					"name": "thumb_left_tip",
-					"parent": "thumb_left",
-					"pivot": [15, 18.5, -2],
-					"cubes": [
-						{"origin": [14.5, 17.5, -3], "size": [1, 1, 1], "inflate": 0.01, "uv": [44, 87]}
-					]
-				},
-				{
-					"name": "hand_left_fingers",
-					"parent": "hand_left",
-					"pivot": [16.25, 19.5, 1]
-				},
-				{
-					"name": "hand_left_finger",
-					"parent": "hand_left_fingers",
-					"pivot": [16.25, 19.5, -0.5],
-					"cubes": [
-						{"origin": [16.25, 18.5, -1], "size": [2, 1, 1], "uv": [74, 84]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip",
-					"parent": "hand_left_finger",
-					"pivot": [18.225, 19.5, -0.5],
-					"cubes": [
-						{"origin": [18.225, 18.5, -1], "size": [1, 1, 1], "inflate": 0.01, "uv": [86, 32]}
-					]
-				},
-				{
-					"name": "hand_left_finger2",
-					"parent": "hand_left_fingers",
-					"pivot": [16.25, 19.5, 0.5],
-					"cubes": [
-						{"origin": [16.25, 18.5, 0], "size": [2, 1, 1], "uv": [86, 0]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip2",
-					"parent": "hand_left_finger2",
-					"pivot": [18.225, 19.5, 0.5],
-					"cubes": [
-						{"origin": [18.225, 18.5, 0], "size": [1, 1, 1], "inflate": 0.01, "uv": [32, 87]}
-					]
-				},
-				{
-					"name": "hand_left_finger3",
-					"parent": "hand_left_fingers",
-					"pivot": [16.25, 19.5, 1.5],
-					"cubes": [
-						{"origin": [16.25, 18.5, 1], "size": [2, 1, 1], "uv": [86, 2]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip3",
-					"parent": "hand_left_finger3",
-					"pivot": [18.225, 19.5, 1.5],
-					"cubes": [
-						{"origin": [18.225, 18.5, 1], "size": [1, 1, 1], "inflate": 0.01, "uv": [36, 87]}
-					]
-				},
-				{
-					"name": "hand_left_finger4",
-					"parent": "hand_left_fingers",
-					"pivot": [16.25, 19.5, 2.5],
-					"cubes": [
-						{"origin": [16.25, 18.5, 2], "size": [2, 1, 1], "uv": [86, 4]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip4",
-					"parent": "hand_left_finger4",
-					"pivot": [18.225, 19.5, 2.5],
-					"cubes": [
-						{"origin": [18.225, 18.5, 2], "size": [1, 1, 1], "inflate": 0.01, "uv": [40, 87]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-2, 18.5, 1],
-					"cubes": [
-						{"origin": [-8.5, 17.5, 0], "size": [7, 2, 2], "uv": [62, 22]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-8.5, 19.5, 2],
-					"cubes": [
-						{"origin": [-10.5, 17.5, 0], "size": [2, 2, 2], "inflate": 0.02, "uv": [36, 66]}
-					]
-				},
-				{
-					"name": "wrist_right",
-					"parent": "arm_right2",
-					"pivot": [-11.5, 18.5, 1],
-					"cubes": [
-						{"origin": [-13.5, 17, -0.5], "size": [3, 3, 3], "inflate": 0.02, "uv": [62, 84]},
-						{"origin": [-12, 15.5, -2], "size": [0, 6, 6], "pivot": [-12, 17, 1], "rotation": [0, -33, 0], "uv": [56, 64]},
-						{"origin": [-12, 15.5, -2], "size": [0, 6, 6], "pivot": [-12, 17, 1], "rotation": [0, 33, 0], "uv": [12, 62]}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "wrist_right",
-					"pivot": [-13.5, 18.5, 1],
-					"cubes": [
-						{"origin": [-16.5, 17.5, -1], "size": [3, 2, 4], "inflate": 0.02, "uv": [76, 42]}
-					]
-				},
-				{
-					"name": "thumb_right",
-					"parent": "hand_right",
-					"pivot": [-15, 18, -0.5],
-					"cubes": [
-						{"origin": [-15.5, 17.5, -2], "size": [1, 1, 2], "uv": [84, 72]}
-					]
-				},
-				{
-					"name": "thumb_right_tip",
-					"parent": "thumb_right",
-					"pivot": [-15, 18.5, -2],
-					"cubes": [
-						{"origin": [-15.5, 17.5, -3], "size": [1, 1, 1], "inflate": 0.01, "uv": [78, 87]}
-					]
-				},
-				{
-					"name": "hand_right_fingers",
-					"parent": "hand_right",
-					"pivot": [-16.25, 19.5, 1]
-				},
-				{
-					"name": "hand_right_finger",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.25, 19.5, -0.5],
-					"cubes": [
-						{"origin": [-18.25, 18.5, -1], "size": [2, 1, 1], "uv": [86, 6]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip",
-					"parent": "hand_right_finger",
-					"pivot": [-18.275, 19.5, -0.5],
-					"cubes": [
-						{"origin": [-19.25, 18.5, -1], "size": [1, 1, 1], "inflate": 0.01, "uv": [82, 87]}
-					]
-				},
-				{
-					"name": "hand_right_finger2",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.25, 19.5, 0.5],
-					"cubes": [
-						{"origin": [-18.25, 18.5, 0], "size": [2, 1, 1], "uv": [86, 26]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip2",
-					"parent": "hand_right_finger2",
-					"pivot": [-18.275, 19.5, 0.5],
-					"cubes": [
-						{"origin": [-19.25, 18.5, 0], "size": [1, 1, 1], "inflate": 0.01, "uv": [86, 87]}
-					]
-				},
-				{
-					"name": "hand_right_finger3",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.25, 19.5, 1.5],
-					"cubes": [
-						{"origin": [-18.25, 18.5, 1], "size": [2, 1, 1], "uv": [86, 28]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip3",
-					"parent": "hand_right_finger3",
-					"pivot": [-18.275, 19.5, 1.5],
-					"cubes": [
-						{"origin": [-19.25, 18.5, 1], "size": [1, 1, 1], "inflate": 0.01, "uv": [12, 88]}
-					]
-				},
-				{
-					"name": "hand_right_finger4",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.25, 19.5, 2.5],
-					"cubes": [
-						{"origin": [-18.25, 18.5, 2], "size": [2, 1, 1], "uv": [86, 30]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip4",
-					"parent": "hand_right_finger4",
-					"pivot": [-18.275, 19.5, 2.5],
-					"cubes": [
-						{"origin": [-19.25, 18.5, 2], "size": [1, 1, 1], "inflate": 0.01, "uv": [16, 88]}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso2",
-					"pivot": [0, 20.5, 1]
-				},
-				{
-					"name": "head_correction",
-					"parent": "head",
-					"pivot": [0, 20.5, 1]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head_correction",
-					"pivot": [0, 20.5, 1]
-				},
-				{
-					"name": "head_angle",
-					"parent": "head_ai",
-					"pivot": [0, 20.75, 1],
-					"cubes": [
-						{"origin": [-5, 19.5, -4], "size": [10, 8, 10], "uv": [32, 0]}
-					]
-				},
-				{
-					"name": "hair",
-					"parent": "head_angle",
-					"pivot": [0, 25, 1.25],
-					"rotation": [10, 0, 0],
-					"cubes": [
-						{"origin": [-3.5, 25, -3.75], "size": [7, 18, 9], "uv": [0, 0]},
-						{"origin": [-3.5, 25, -3.75], "size": [7, 18, 9], "inflate": 0.25, "uv": [0, 27]}
-					]
-				},
-				{
-					"name": "ear_right",
-					"parent": "head_angle",
-					"pivot": [-5, 24, 0.75],
-					"cubes": [
-						{"origin": [-14.5, 21, 0.75], "size": [10, 6, 0], "uv": [56, 37]}
-					]
-				},
-				{
-					"name": "ear_left",
-					"parent": "head_angle",
-					"pivot": [5, 24, 0.75],
-					"cubes": [
-						{"origin": [4.5, 21, 0.75], "size": [10, 6, 0], "uv": [56, 43]}
-					]
-				},
-				{
-					"name": "nose",
-					"parent": "head_angle",
-					"pivot": [1, 21.25, 0],
-					"cubes": [
-						{"origin": [-1, 22, -4.02], "size": [2, 1, 0], "uv": [62, 83]}
-					]
-				},
-				{
-					"name": "expressions",
-					"parent": "head_angle",
-					"pivot": [0, 20.75, -4.02]
-				},
-				{
-					"name": "mouths",
-					"parent": "expressions",
-					"pivot": [0, 20.75, -4.02]
-				},
-				{
-					"name": "mouth",
-					"parent": "mouths",
-					"pivot": [0, 20.75, -4.02],
-					"cubes": [
-						{"origin": [-3, 20, -4.02], "size": [6, 1, 0], "uv": [62, 26]},
-						{"origin": [-4, 20.5, -4.02], "size": [8, 1, 0], "uv": [80, 25]}
-					]
-				},
-				{
-					"name": "mouth_open_happy",
-					"parent": "mouths",
-					"pivot": [0, 20.5, -3.92],
-					"cubes": [
-						{"origin": [-4, 19.5, -3.92], "size": [8, 2, 0], "uv": [84, 8]}
-					]
-				},
-				{
-					"name": "mouth_open_tall",
-					"parent": "mouths",
-					"pivot": [0, 20.5, -3.92],
-					"cubes": [
-						{"origin": [-0.5, 19.5, -3.92], "size": [1, 2, 0], "uv": [22, 74]}
-					]
-				},
-				{
-					"name": "mouth_open_small",
-					"parent": "mouths",
-					"pivot": [0, 20.5, -3.92],
-					"cubes": [
-						{"origin": [-1, 19.5, -3.92], "size": [2, 2, 0], "uv": [20, 88]}
-					]
-				},
-				{
-					"name": "mouth_frown",
-					"parent": "mouths",
-					"pivot": [0, 20.75, -3.92],
-					"cubes": [
-						{"origin": [-1, 20.5, -3.92], "size": [2, 1, 0], "uv": [84, 75]},
-						{"origin": [-3, 20, -3.92], "size": [6, 1, 0], "uv": [62, 27]}
-					]
-				},
-				{
-					"name": "mouth_straight",
-					"parent": "mouths",
-					"pivot": [0, 20.75, -3.92],
-					"cubes": [
-						{"origin": [-4, 20.25, -3.92], "size": [8, 1, 0], "uv": [84, 16]}
-					]
-				},
-				{
-					"name": "mouth_open_smile",
-					"parent": "mouths",
-					"pivot": [0, 20.5, -3.92],
-					"cubes": [
-						{"origin": [-2, 19.5, -3.92], "size": [4, 2, 0], "uv": [14, 74]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "expressions",
-					"pivot": [0, 24.5, -4.02]
-				},
-				{
-					"name": "eyes_left",
-					"parent": "eyes",
-					"pivot": [3, 24.5, -4.02]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes_left",
-					"pivot": [3, 24.25, -4.02],
-					"cubes": [
-						{"origin": [2, 22.25, -4.02], "size": [2, 3, 0], "uv": [58, 85]}
-					]
-				},
-				{
-					"name": "pupil_left_happy",
-					"parent": "eye_left",
-					"pivot": [2.75, 23.66667, -3.94],
-					"cubes": [
-						{"origin": [3.25, 23, -3.94], "size": [1, 1, 0], "uv": [12, 81]},
-						{"origin": [1.25, 23, -3.94], "size": [1, 1, 0], "uv": [48, 83]},
-						{"origin": [2.25, 23.5, -3.94], "size": [1, 1, 0], "uv": [74, 36]}
-					]
-				},
-				{
-					"name": "pupil_left_sad",
-					"parent": "eye_left",
-					"pivot": [3, 23.75, -3.94],
-					"cubes": [
-						{"origin": [2, 23.5, -3.94], "size": [1, 1, 0], "uv": [48, 84]},
-						{"origin": [3, 23, -3.94], "size": [1, 1, 0], "uv": [66, 83]}
-					]
-				},
-				{
-					"name": "pupil_left_angry",
-					"parent": "eye_left",
-					"pivot": [3, 23.75, -3.94],
-					"cubes": [
-						{"origin": [2, 23, -3.94], "size": [1, 1, 0], "uv": [78, 86]},
-						{"origin": [3, 23.5, -3.94], "size": [1, 1, 0], "uv": [88, 36]}
-					]
-				},
-				{
-					"name": "pupil_left_blink",
-					"parent": "eye_left",
-					"pivot": [3, 23.75, -4.04],
-					"cubes": [
-						{"origin": [2, 23.25, -3.94], "size": [2, 1, 0], "uv": [84, 17]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [2.75, 24, -4.04],
-					"cubes": [
-						{"origin": [2.3, 23, -3.94], "size": [1, 2, 0], "inflate": 0.1, "uv": [74, 34]}
-					]
-				},
-				{
-					"name": "eyebrow_left",
-					"parent": "eye_left",
-					"pivot": [2, 24.5, -4.02],
-					"rotation": [0, 0, -5],
-					"cubes": [
-						{"origin": [2, 24.5, -4.06], "size": [4, 3, 0], "uv": [24, 58]}
-					]
-				},
-				{
-					"name": "pupil_left_shocked",
-					"parent": "eye_left",
-					"pivot": [2.75, 23.75, -3.94],
-					"cubes": [
-						{"origin": [2.25, 23.25, -3.94], "size": [1, 1, 0], "uv": [88, 37]}
-					]
-				},
-				{
-					"name": "eyes_right",
-					"parent": "eyes",
-					"pivot": [-3, 24.5, -4.02]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes_right",
-					"pivot": [-3, 24.25, -4.02],
-					"cubes": [
-						{"origin": [-4, 22.25, -4.02], "size": [2, 3, 0], "uv": [28, 87]}
-					]
-				},
-				{
-					"name": "pupil_right_happy",
-					"parent": "eye_right",
-					"pivot": [-2.75, 23.66667, -3.94],
-					"cubes": [
-						{"origin": [-4.25, 23, -3.94], "size": [1, 1, 0], "uv": [88, 38]},
-						{"origin": [-2.25, 23, -3.94], "size": [1, 1, 0], "uv": [88, 39]},
-						{"origin": [-3.25, 23.5, -3.94], "size": [1, 1, 0], "uv": [88, 40]}
-					]
-				},
-				{
-					"name": "pupil_right_angry",
-					"parent": "eye_right",
-					"pivot": [-3, 23.75, -3.94],
-					"cubes": [
-						{"origin": [-3, 23, -3.94], "size": [1, 1, 0], "uv": [88, 41]},
-						{"origin": [-4, 23.5, -3.94], "size": [1, 1, 0], "uv": [88, 50]}
-					]
-				},
-				{
-					"name": "pupil_right_sad",
-					"parent": "eye_right",
-					"pivot": [-3, 23.75, -3.94],
-					"cubes": [
-						{"origin": [-3, 23.5, -3.94], "size": [1, 1, 0], "uv": [88, 51]},
-						{"origin": [-4, 23, -3.94], "size": [1, 1, 0], "uv": [88, 52]}
-					]
-				},
-				{
-					"name": "eyebrow_right",
-					"parent": "eye_right",
-					"pivot": [-2, 24.5, -4.02],
-					"rotation": [0, 0, 5],
-					"cubes": [
-						{"origin": [-6, 24.5, -4.06], "size": [4, 3, 0], "uv": [36, 70]}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-2.75, 24, -4.04],
-					"cubes": [
-						{"origin": [-3.3, 23, -3.94], "size": [1, 2, 0], "inflate": 0.1, "uv": [48, 81]}
-					]
-				},
-				{
-					"name": "pupil_right_blink",
-					"parent": "eye_right",
-					"pivot": [-3, 23.75, -3.94],
-					"cubes": [
-						{"origin": [-4, 23.25, -3.94], "size": [2, 1, 0], "uv": [88, 35]}
-					]
-				},
-				{
-					"name": "pupil_right_shocked",
-					"parent": "eye_right",
-					"pivot": [-2.75, 23.75, -3.94],
-					"cubes": [
-						{"origin": [-3.25, 23.25, -3.94], "size": [1, 1, 0], "uv": [88, 53]}
-					]
-				},
-				{
-					"name": "blush",
-					"parent": "expressions",
-					"pivot": [0, 22.25, -3.94]
-				},
-				{
-					"name": "blush_left",
-					"parent": "blush",
-					"pivot": [4, 22.25, -3.94],
-					"cubes": [
-						{"origin": [3, 21.75, -3.94], "size": [2, 1, 0], "uv": [88, 17]}
-					]
-				},
-				{
-					"name": "blush_right",
-					"parent": "blush",
-					"pivot": [-4, 22.25, -3.94],
-					"cubes": [
-						{"origin": [-5, 21.75, -3.94], "size": [2, 1, 0], "uv": [88, 34]}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0513_pansear/pansear.geo.json

@@ -1,599 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.pansear",
-				"texture_width": 64,
-				"texture_height": 64,
-				"visible_bounds_width": 4,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
-			},
-			"bones": [
-				{
-					"name": "pansear",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "pansear",
-					"pivot": [0, 9, 0]
-				},
-				{
-					"name": "legs",
-					"parent": "body",
-					"pivot": [0, 5.1, 0.5]
-				},
-				{
-					"name": "leg_right",
-					"parent": "legs",
-					"pivot": [-1.5, 5.1, -0.25],
-					"cubes": [
-						{"origin": [-2.5, 3, -1.25], "size": [2, 3, 2], "inflate": 0.02, "uv": [41, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right",
-					"pivot": [-1.5, 3, -1.25],
-					"cubes": [
-						{"origin": [-2.5, 0, -1.25], "size": [2, 3, 2], "uv": [10, 44]}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-1.5, 1, -0.25],
-					"cubes": [
-						{"origin": [-2.5, 0, -2.25], "size": [2, 1, 3], "inflate": 0.02, "uv": [42, 26]}
-					]
-				},
-				{
-					"name": "leg_left",
-					"parent": "legs",
-					"pivot": [1.5, 5.1, -0.25],
-					"cubes": [
-						{"origin": [0.5, 3, -1.25], "size": [2, 3, 2], "inflate": 0.02, "uv": [0, 40]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left",
-					"pivot": [1.5, 3, -1.25],
-					"cubes": [
-						{"origin": [0.5, 0, -1.25], "size": [2, 3, 2], "uv": [34, 33], "mirror": true}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [1.5, 1, -0.25],
-					"cubes": [
-						{"origin": [0.5, 0, -2.25], "size": [2, 1, 3], "inflate": 0.02, "uv": [40, 19]}
-					]
-				},
-				{
-					"name": "waist",
-					"parent": "body",
-					"pivot": [0, 4.1, 0],
-					"cubes": [
-						{"origin": [-2, 4.1, -1.5], "size": [4, 4, 3], "inflate": 0.02, "uv": [26, 16]},
-						{"origin": [-0.5, 7.08, -1.54], "size": [1, 1, 0], "uv": [10, 42]},
-						{"origin": [-0.5, 7.08, 1.54], "size": [1, 1, 0], "uv": [10, 43]}
-					]
-				},
-				{
-					"name": "tail",
-					"parent": "waist",
-					"pivot": [0, 5.1, 1.5],
-					"cubes": [
-						{"origin": [-0.5, 4.6, 0.5], "size": [1, 1, 4], "inflate": 0.02, "uv": [22, 39]}
-					]
-				},
-				{
-					"name": "tail2",
-					"parent": "tail",
-					"pivot": [0, 5.1, 4.5],
-					"cubes": [
-						{"origin": [-0.5, 4.6, 4.5], "size": [1, 1, 3], "uv": [34, 23]}
-					]
-				},
-				{
-					"name": "tail3",
-					"parent": "tail2",
-					"pivot": [0, 5.1, 7.5],
-					"cubes": [
-						{"origin": [-0.5, 4.6, 7.5], "size": [1, 1, 2], "inflate": 0.02, "uv": [39, 23]}
-					]
-				},
-				{
-					"name": "tail4",
-					"parent": "tail3",
-					"pivot": [0, 5.1, 9.5],
-					"cubes": [
-						{"origin": [-0.5, 4.6, 9.5], "size": [1, 1, 3], "uv": [34, 27]}
-					]
-				},
-				{
-					"name": "tail5",
-					"parent": "tail4",
-					"pivot": [0, 5.1, 12.5],
-					"cubes": [
-						{"origin": [-0.5, 4.6, 12.5], "size": [1, 1, 3], "inflate": 0.02, "uv": [0, 45]}
-					]
-				},
-				{
-					"name": "tail_tip",
-					"parent": "tail5",
-					"pivot": [0, 5.1, 14.5],
-					"cubes": [
-						{"origin": [-1.5, 3.6, 14.5], "size": [3, 3, 4], "uv": [20, 26]}
-					]
-				},
-				{
-					"name": "tail_tip2",
-					"parent": "tail_tip",
-					"pivot": [0, 5.1, 18.5],
-					"cubes": [
-						{"origin": [-1.5, 5.1, 18.5], "size": [3, 0, 2], "uv": [23, 58]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "waist",
-					"pivot": [0, 8.1, 0],
-					"cubes": [
-						{"origin": [-2, 8.1, -1.5], "size": [4, 3, 3], "uv": [20, 33]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso",
-					"pivot": [0, 10.35, 0]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [1.5, 10.35, 0],
-					"cubes": [
-						{"origin": [1, 9.85, -0.5], "size": [4, 1, 1], "uv": [37, 5]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [5, 10.35, 0],
-					"cubes": [
-						{"origin": [5, 9.35, -1], "size": [2, 2, 2], "uv": [12, 35]},
-						{"origin": [7, 9.35, -1.5], "size": [3, 2, 3], "uv": [0, 35]}
-					]
-				},
-				{
-					"name": "thumb_left",
-					"parent": "arm_left2",
-					"pivot": [9, 10.35, -1.5],
-					"cubes": [
-						{"origin": [9, 9.35, -3], "size": [1, 1, 2], "inflate": -0.02, "uv": [26, 23]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [10, 11.35, 0],
-					"cubes": [
-						{"origin": [10, 9.35, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [36, 9]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-1.5, 10.35, 0],
-					"cubes": [
-						{"origin": [-5, 9.85, -0.5], "size": [4, 1, 1], "uv": [37, 7]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-5, 10.35, 0],
-					"cubes": [
-						{"origin": [-7, 9.35, -1], "size": [2, 2, 2], "uv": [18, 44]},
-						{"origin": [-10, 9.35, -1.5], "size": [3, 2, 3], "uv": [36, 0]}
-					]
-				},
-				{
-					"name": "thumb_right",
-					"parent": "arm_right2",
-					"pivot": [-9, 10.35, -1.5],
-					"cubes": [
-						{"origin": [-10, 9.35, -3], "size": [1, 1, 2], "inflate": -0.02, "uv": [46, 9]}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-10, 11.35, 0],
-					"cubes": [
-						{"origin": [-12, 9.35, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [12, 39]}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso",
-					"pivot": [0, 12.1, 0]
-				},
-				{
-					"name": "head_correction",
-					"parent": "head",
-					"pivot": [0, 12.1, 0]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head_correction",
-					"pivot": [0, 12.1, 0]
-				},
-				{
-					"name": "head_angle",
-					"parent": "head_ai",
-					"pivot": [0, 12.1, 0],
-					"cubes": [
-						{"origin": [-5, 11.1, -4], "size": [10, 8, 8], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "hair",
-					"parent": "head_angle",
-					"pivot": [0, 19.1, -2.5],
-					"rotation": [25, 0, 0],
-					"cubes": [
-						{"origin": [-4.5, 18.1, -5], "size": [7, 4, 6], "uv": [0, 16]}
-					]
-				},
-				{
-					"name": "hair_left",
-					"parent": "hair",
-					"pivot": [2.5, 19.6, -3],
-					"rotation": [0, 10, 0],
-					"cubes": [
-						{"origin": [0, 18.1, -4], "size": [4, 3, 6], "inflate": 0.02, "uv": [0, 26]}
-					]
-				},
-				{
-					"name": "hair_left_tip",
-					"parent": "hair_left",
-					"pivot": [2, 20.6, 2],
-					"rotation": [0, -30, 0],
-					"cubes": [
-						{"origin": [2, 19.1, 2], "size": [0, 3, 3], "uv": [25, 58]}
-					]
-				},
-				{
-					"name": "hair_left_tip2",
-					"parent": "hair_left_tip",
-					"pivot": [2, 22.1, 5],
-					"cubes": [
-						{"origin": [2, 22.1, 2], "size": [0, 3, 3], "uv": [32, 58]}
-					]
-				},
-				{
-					"name": "ear_left",
-					"parent": "head_angle",
-					"pivot": [5, 15.6, 0],
-					"cubes": [
-						{"origin": [4, 12.1, 0], "size": [6, 9, 0], "uv": [52, 55]}
-					]
-				},
-				{
-					"name": "ear_right",
-					"parent": "head_angle",
-					"pivot": [-5, 15.6, 0],
-					"cubes": [
-						{"origin": [-10, 12.1, 0], "size": [6, 9, 0], "uv": [39, 55]}
-					]
-				},
-				{
-					"name": "nose",
-					"parent": "head_angle",
-					"pivot": [0, 13.1, -4.03],
-					"cubes": [
-						{"origin": [-0.5, 12.85, -4.02], "size": [1, 1, 0], "uv": [32, 25]},
-						{"origin": [-1, 12.35, -4.04], "size": [2, 1, 0], "uv": [18, 48]}
-					]
-				},
-				{
-					"name": "expressions",
-					"parent": "head_angle",
-					"pivot": [0, 12.35, -4.06]
-				},
-				{
-					"name": "mouths",
-					"parent": "expressions",
-					"pivot": [0, 12.35, -4.06]
-				},
-				{
-					"name": "mouth",
-					"parent": "mouths",
-					"pivot": [0, 12.35, -4.06],
-					"cubes": [
-						{"origin": [-2.5, 11.6, -4.06], "size": [5, 1, 0], "uv": [46, 12]},
-						{"origin": [-0.5, 12.1, -4.06], "size": [1, 1, 0], "uv": [36, 31]},
-						{"origin": [2, 12.1, -4.06], "size": [1, 1, 0], "uv": [38, 31]},
-						{"origin": [-3, 12.1, -4.06], "size": [1, 1, 0], "uv": [34, 31]}
-					]
-				},
-				{
-					"name": "mouth_frown",
-					"parent": "mouths",
-					"pivot": [0, 12.35, -3.96],
-					"cubes": [
-						{"origin": [-1.5, 11.6, -3.96], "size": [3, 1, 0], "uv": [17, 27]},
-						{"origin": [-0.5, 12.1, -3.96], "size": [1, 1, 0], "uv": [8, 47]}
-					]
-				},
-				{
-					"name": "mouth_open_tall",
-					"parent": "mouths",
-					"pivot": [0, 12.1, -3.96],
-					"cubes": [
-						{"origin": [-0.5, 11.1, -3.96], "size": [1, 2, 0], "uv": [10, 40]}
-					]
-				},
-				{
-					"name": "mouth_open_happy",
-					"parent": "mouths",
-					"pivot": [0, 12.35, -3.97],
-					"cubes": [
-						{"origin": [-2.5, 11.1, -3.96], "size": [5, 2, 0], "uv": [54, 0]}
-					]
-				},
-				{
-					"name": "mouth_open_smile",
-					"parent": "mouths",
-					"pivot": [0, 12.6, -4.06],
-					"cubes": [
-						{"origin": [-1.5, 12.1, -3.96], "size": [3, 1, 0], "uv": [51, 2]},
-						{"origin": [-1, 11.1, -3.96], "size": [2, 1, 0], "uv": [51, 3]}
-					]
-				},
-				{
-					"name": "mouth_straight",
-					"parent": "mouths",
-					"pivot": [0, 12.6, -3.96],
-					"cubes": [
-						{"origin": [-2.5, 12.1, -3.96], "size": [5, 1, 0], "uv": [42, 30]}
-					]
-				},
-				{
-					"name": "mouth_open_small",
-					"parent": "mouths",
-					"pivot": [0, 12.1, -3.96],
-					"cubes": [
-						{"origin": [-1, 11.1, -3.96], "size": [2, 2, 0], "uv": [36, 14]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "expressions",
-					"pivot": [0, 15.1, -4.02]
-				},
-				{
-					"name": "eyes_left",
-					"parent": "eyes",
-					"pivot": [2.75, 15.1, -4.02]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes_left",
-					"pivot": [2.75, 15.1, -4.02],
-					"cubes": [
-						{"origin": [1.75, 13.6, -4.02], "size": [2, 3, 0], "uv": [49, 23]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [2.5, 15.35, -4.04],
-					"cubes": [
-						{"origin": [2, 14.35, -4.04], "size": [1, 2, 0], "uv": [32, 39]}
-					]
-				},
-				{
-					"name": "pupil_left_blink",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.1, -3.92],
-					"cubes": [
-						{"origin": [1.75, 14.6, -3.94], "size": [2, 1, 0], "uv": [22, 48]}
-					]
-				},
-				{
-					"name": "pupil_left_shocked",
-					"parent": "eye_left",
-					"pivot": [2.5, 15.1, -3.94],
-					"cubes": [
-						{"origin": [2, 14.6, -3.94], "size": [1, 1, 0], "uv": [8, 46]}
-					]
-				},
-				{
-					"name": "pupil_left_annoyed",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.1, -3.94],
-					"cubes": [
-						{"origin": [1.75, 14.35, -3.94], "size": [1, 1, 0], "uv": [49, 2]},
-						{"origin": [2.75, 14.85, -3.94], "size": [1, 1, 0], "uv": [49, 3]}
-					]
-				},
-				{
-					"name": "pupil_left_sad",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.1, -3.94],
-					"cubes": [
-						{"origin": [1.75, 14.85, -3.94], "size": [1, 1, 0], "uv": [49, 2]},
-						{"origin": [2.75, 14.35, -3.94], "size": [1, 1, 0], "uv": [49, 3]}
-					]
-				},
-				{
-					"name": "eyebrow_left",
-					"parent": "eye_left",
-					"pivot": [2.75, 16.6, -4.06],
-					"cubes": [
-						{"origin": [2.25, 15.85, -4.06], "size": [2, 1, 0], "uv": [17, 26], "mirror": true},
-						{"origin": [1.25, 16.1, -4.06], "size": [1, 1, 0], "uv": [21, 26], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_left_straight",
-					"parent": "eye_left",
-					"pivot": [2.75, 16.6, -3.96],
-					"cubes": [
-						{"origin": [1.25, 16.1, -3.96], "size": [3, 1, 0], "uv": [14, 30], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_left_angry",
-					"parent": "eye_left",
-					"pivot": [2.75, 17.1, -3.96],
-					"cubes": [
-						{"origin": [1.25, 16.1, -3.96], "size": [2, 1, 0], "uv": [17, 29], "mirror": true},
-						{"origin": [3.25, 16.6, -3.96], "size": [1, 1, 0], "uv": [21, 29], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_left_sad",
-					"parent": "eye_left",
-					"pivot": [2.5, 16.85, -3.96],
-					"cubes": [
-						{"origin": [2.25, 16.1, -3.96], "size": [2, 1, 0], "uv": [17, 26], "mirror": true},
-						{"origin": [1.25, 16.6, -3.96], "size": [1, 1, 0], "uv": [21, 26], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_left_happy",
-					"parent": "eyes_left",
-					"pivot": [2.75, 14.85, -3.95],
-					"cubes": [
-						{"origin": [1.25, 14.6, -3.94], "size": [1, 1, 0], "uv": [12, 49]},
-						{"origin": [3.25, 14.6, -3.94], "size": [1, 1, 0], "uv": [12, 49]},
-						{"origin": [2.25, 15.1, -3.96], "size": [1, 1, 0], "uv": [16, 49]}
-					]
-				},
-				{
-					"name": "pupil_right_happy",
-					"parent": "eyes_left",
-					"pivot": [-2.75, 14.85, -3.95],
-					"cubes": [
-						{"origin": [-2.25, 14.6, -3.94], "size": [1, 1, 0], "uv": [12, 49], "mirror": true},
-						{"origin": [-4.25, 14.6, -3.94], "size": [1, 1, 0], "uv": [12, 49], "mirror": true},
-						{"origin": [-3.25, 15.1, -3.96], "size": [1, 1, 0], "uv": [16, 49], "mirror": true}
-					]
-				},
-				{
-					"name": "eyes_right",
-					"parent": "eyes",
-					"pivot": [-2.75, 15.1, -4.02]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes_right",
-					"pivot": [-2.75, 15.1, -4.02],
-					"cubes": [
-						{"origin": [-3.75, 13.6, -4.02], "size": [2, 3, 0], "uv": [45, 23]}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-2.5, 15.35, -4.04],
-					"cubes": [
-						{"origin": [-3, 14.35, -4.04], "size": [1, 2, 0], "uv": [32, 23]}
-					]
-				},
-				{
-					"name": "pupil_right_shocked",
-					"parent": "eye_right",
-					"pivot": [-2.5, 15.1, -3.94],
-					"cubes": [
-						{"origin": [-3, 14.6, -3.94], "size": [1, 1, 0], "uv": [8, 45]}
-					]
-				},
-				{
-					"name": "pupil_right_blink",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.1, -3.92],
-					"cubes": [
-						{"origin": [-3.75, 14.6, -3.94], "size": [2, 1, 0], "uv": [17, 28]}
-					]
-				},
-				{
-					"name": "pupil_right_annoyed",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.1, -4.04],
-					"cubes": [
-						{"origin": [-2.75, 14.35, -3.94], "size": [1, 1, 0], "uv": [48, 4]},
-						{"origin": [-3.75, 14.85, -3.94], "size": [1, 1, 0], "uv": [48, 1]}
-					]
-				},
-				{
-					"name": "eyebrow_right_sad",
-					"parent": "eye_right",
-					"pivot": [-2.5, 16.85, -3.96],
-					"cubes": [
-						{"origin": [-4.25, 16.1, -3.96], "size": [2, 1, 0], "uv": [17, 26]},
-						{"origin": [-2.25, 16.6, -3.96], "size": [1, 1, 0], "uv": [21, 26]}
-					]
-				},
-				{
-					"name": "eyebrow_right_angry",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17.1, -3.96],
-					"cubes": [
-						{"origin": [-3.25, 16.1, -3.96], "size": [2, 1, 0], "uv": [17, 29]},
-						{"origin": [-4.25, 16.6, -3.96], "size": [1, 1, 0], "uv": [21, 29]}
-					]
-				},
-				{
-					"name": "eyebrow_right",
-					"parent": "eye_right",
-					"pivot": [-2.75, 16.6, -4.06],
-					"cubes": [
-						{"origin": [-4.25, 15.85, -4.06], "size": [2, 1, 0], "uv": [17, 26]},
-						{"origin": [-2.25, 16.1, -4.06], "size": [1, 1, 0], "uv": [21, 26]}
-					]
-				},
-				{
-					"name": "pupil_right_sad",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.1, -3.94],
-					"cubes": [
-						{"origin": [-2.75, 14.85, -3.94], "size": [1, 1, 0], "uv": [49, 2], "mirror": true},
-						{"origin": [-3.75, 14.35, -3.94], "size": [1, 1, 0], "uv": [49, 3], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_right_straight",
-					"parent": "eyes_right",
-					"pivot": [-2.75, 16.6, -3.96],
-					"cubes": [
-						{"origin": [-4.25, 16.1, -3.96], "size": [3, 1, 0], "uv": [14, 30]}
-					]
-				},
-				{
-					"name": "blush_left",
-					"parent": "expressions",
-					"pivot": [4, 13.1, -3.96],
-					"cubes": [
-						{"origin": [3, 12.6, -3.96], "size": [2, 1, 0], "uv": [0, 49]}
-					]
-				},
-				{
-					"name": "blush_right",
-					"parent": "expressions",
-					"pivot": [-4, 13.1, -3.96],
-					"cubes": [
-						{"origin": [-5, 12.6, -3.96], "size": [2, 1, 0], "uv": [4, 49]}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0514_simisear/simisear.geo.json

@@ -1,837 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.simisear",
-				"texture_width": 128,
-				"texture_height": 128,
-				"visible_bounds_width": 5,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
-			},
-			"bones": [
-				{
-					"name": "simisear",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "simisear",
-					"pivot": [0, 17.25, 1]
-				},
-				{
-					"name": "legs",
-					"parent": "body",
-					"pivot": [0, 8.75, 1]
-				},
-				{
-					"name": "leg_left",
-					"parent": "legs",
-					"pivot": [4, 9, 1],
-					"cubes": [
-						{"origin": [2.5, 5, -0.5], "size": [3, 5, 3], "inflate": 0.02, "uv": [72, 49]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left",
-					"pivot": [4, 5, -0.5],
-					"cubes": [
-						{"origin": [2.5, 1, -0.5], "size": [3, 4, 3], "uv": [70, 75]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [4, 2, 1.5],
-					"cubes": [
-						{"origin": [2, 0, -1], "size": [4, 2, 4], "uv": [0, 71]}
-					]
-				},
-				{
-					"name": "toes_left",
-					"parent": "foot_left",
-					"pivot": [4, 0, -1],
-					"cubes": [
-						{"origin": [2, 0, -3], "size": [4, 2, 2], "inflate": 0.02, "uv": [78, 71]},
-						{"origin": [2.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [12, 77]},
-						{"origin": [4.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [36, 82]}
-					]
-				},
-				{
-					"name": "leg_right",
-					"parent": "legs",
-					"pivot": [-4, 9, 1],
-					"cubes": [
-						{"origin": [-5.5, 5, -0.5], "size": [3, 5, 3], "inflate": 0.02, "uv": [44, 73]}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right",
-					"pivot": [-4, 5, -0.5],
-					"cubes": [
-						{"origin": [-5.5, 1, -0.5], "size": [3, 4, 3], "uv": [0, 77]}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-4, 2, 1.5],
-					"cubes": [
-						{"origin": [-6, 0, -1], "size": [4, 2, 4], "uv": [72, 33]}
-					]
-				},
-				{
-					"name": "toes_right",
-					"parent": "foot_right",
-					"pivot": [-4, 0, -1],
-					"cubes": [
-						{"origin": [-6, 0, -3], "size": [4, 2, 2], "inflate": 0.02, "uv": [80, 57]},
-						{"origin": [-3.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [70, 82]},
-						{"origin": [-5.5, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [74, 82]}
-					]
-				},
-				{
-					"name": "waist",
-					"parent": "body",
-					"pivot": [0, 8, 1],
-					"cubes": [
-						{"origin": [-5.5, 8, -3], "size": [11, 7, 8], "uv": [0, 38]}
-					]
-				},
-				{
-					"name": "tail",
-					"parent": "waist",
-					"pivot": [0, 9.5, 5],
-					"cubes": [
-						{"origin": [-1, 8.5, 4], "size": [2, 2, 4], "uv": [24, 80]}
-					]
-				},
-				{
-					"name": "tail2",
-					"parent": "tail",
-					"pivot": [0, 9.5, 8],
-					"cubes": [
-						{"origin": [-1, 8.5, 8], "size": [2, 2, 3], "inflate": 0.02, "uv": [80, 61]}
-					]
-				},
-				{
-					"name": "tail_fluff",
-					"parent": "tail2",
-					"pivot": [0, 9.5, 11],
-					"cubes": [
-						{"origin": [-5, 8.5, 11], "size": [10, 10, 10], "uv": [0, 18]}
-					]
-				},
-				{
-					"name": "tail_fluff2",
-					"parent": "tail_fluff",
-					"pivot": [0, 18.5, 21.5],
-					"rotation": [60, 0, 0],
-					"cubes": [
-						{"origin": [-4, 13.5, 16], "size": [8, 10, 9], "uv": [38, 38]}
-					]
-				},
-				{
-					"name": "tail_fluff3",
-					"parent": "tail_fluff2",
-					"pivot": [0, 23.5, 25],
-					"rotation": [45, 0, 0],
-					"cubes": [
-						{"origin": [-3.5, 15.5, 19], "size": [7, 8, 6], "uv": [40, 18]}
-					]
-				},
-				{
-					"name": "tail_tip",
-					"parent": "tail_fluff3",
-					"pivot": [0, 17.5, 25],
-					"cubes": [
-						{"origin": [0, 15.5, 24], "size": [0, 4, 6], "uv": [72, 39]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "waist",
-					"pivot": [0, 15, 1],
-					"cubes": [
-						{"origin": [-3.5, 14.5, -1.5], "size": [7, 6, 5], "inflate": -0.02, "uv": [0, 60]}
-					]
-				},
-				{
-					"name": "collar",
-					"parent": "torso",
-					"pivot": [0, 18.5, 2],
-					"cubes": [
-						{"origin": [2, 16.5, -2.5], "size": [4, 4, 6], "uv": [24, 64]},
-						{"origin": [-6, 16.5, -2.5], "size": [4, 4, 6], "uv": [60, 57]},
-						{"origin": [-6, 16.5, 3.5], "size": [12, 4, 3], "uv": [30, 57]},
-						{"origin": [2, 16.5, -2.5], "size": [4, 4, 6], "inflate": 0.2, "uv": [66, 13]},
-						{"origin": [-6, 16.5, -2.5], "size": [4, 4, 6], "inflate": 0.2, "uv": [66, 23]},
-						{"origin": [-6, 16.5, 3.5], "size": [12, 4, 3], "inflate": 0.22, "uv": [0, 53]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso",
-					"pivot": [0, 18.5, 1]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [3, 18.5, 1],
-					"cubes": [
-						{"origin": [2, 17.5, 0], "size": [7, 2, 2], "uv": [42, 13]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [9, 18.5, 2],
-					"cubes": [
-						{"origin": [9, 17.5, 0], "size": [5, 2, 2], "inflate": 0.02, "uv": [58, 33]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [14, 18.5, 1],
-					"cubes": [
-						{"origin": [14, 17.5, -1], "size": [3, 2, 4], "inflate": 0.02, "uv": [16, 74]}
-					]
-				},
-				{
-					"name": "thumb_left",
-					"parent": "hand_left",
-					"pivot": [16, 18, -1],
-					"cubes": [
-						{"origin": [15.5, 17.5, -2], "size": [1, 1, 2], "uv": [60, 13]}
-					]
-				},
-				{
-					"name": "thumb_left_tip",
-					"parent": "thumb_left",
-					"pivot": [16, 18.5, -2],
-					"cubes": [
-						{"origin": [15.5, 17.5, -3], "size": [1, 1, 1], "inflate": 0.02, "uv": [82, 81]}
-					]
-				},
-				{
-					"name": "hand_left_fingers",
-					"parent": "hand_left",
-					"pivot": [16.75, 19.5, 1]
-				},
-				{
-					"name": "hand_left_finger",
-					"parent": "hand_left_fingers",
-					"pivot": [16.75, 19.5, -0.5],
-					"cubes": [
-						{"origin": [16.75, 18.5, -1], "size": [2, 1, 1], "uv": [46, 81]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip",
-					"parent": "hand_left_finger",
-					"pivot": [18.75, 19.5, -0.5],
-					"cubes": [
-						{"origin": [18.75, 18.5, -1], "size": [1, 1, 1], "inflate": 0.02, "uv": [82, 83]}
-					]
-				},
-				{
-					"name": "hand_left_finger2",
-					"parent": "hand_left_fingers",
-					"pivot": [16.75, 19.5, 0.5],
-					"cubes": [
-						{"origin": [16.75, 18.5, 0], "size": [2, 1, 1], "uv": [52, 81]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip2",
-					"parent": "hand_left_finger2",
-					"pivot": [18.75, 19.5, 0.5],
-					"cubes": [
-						{"origin": [18.75, 18.5, 0], "size": [1, 1, 1], "inflate": 0.02, "uv": [0, 84]}
-					]
-				},
-				{
-					"name": "hand_left_finger3",
-					"parent": "hand_left_fingers",
-					"pivot": [16.75, 19.5, 1.5],
-					"cubes": [
-						{"origin": [16.75, 18.5, 1], "size": [2, 1, 1], "uv": [58, 81]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip3",
-					"parent": "hand_left_finger3",
-					"pivot": [18.75, 19.5, 1.5],
-					"cubes": [
-						{"origin": [18.75, 18.5, 1], "size": [1, 1, 1], "inflate": 0.02, "uv": [84, 0]}
-					]
-				},
-				{
-					"name": "hand_left_finger4",
-					"parent": "hand_left_fingers",
-					"pivot": [16.75, 19.5, 2.5],
-					"cubes": [
-						{"origin": [16.75, 18.5, 2], "size": [2, 1, 1], "uv": [64, 81]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip4",
-					"parent": "hand_left_finger4",
-					"pivot": [18.75, 19.5, 2.5],
-					"cubes": [
-						{"origin": [18.75, 18.5, 2], "size": [1, 1, 1], "inflate": 0.02, "uv": [84, 2]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-3, 18.5, 1],
-					"cubes": [
-						{"origin": [-9, 17.5, 0], "size": [7, 2, 2], "uv": [68, 8]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-9, 18.5, 2],
-					"cubes": [
-						{"origin": [-14, 17.5, 0], "size": [5, 2, 2], "inflate": 0.02, "uv": [78, 67]}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-14, 18.5, 1],
-					"cubes": [
-						{"origin": [-17, 17.5, -1], "size": [3, 2, 4], "inflate": 0.02, "uv": [30, 74]}
-					]
-				},
-				{
-					"name": "thumb_right",
-					"parent": "hand_right",
-					"pivot": [-16, 18, -1],
-					"cubes": [
-						{"origin": [-16.5, 17.5, -2], "size": [1, 1, 2], "uv": [24, 60]}
-					]
-				},
-				{
-					"name": "thumb_right_tip",
-					"parent": "thumb_right",
-					"pivot": [-16, 18.5, -2],
-					"cubes": [
-						{"origin": [-16.5, 17.5, -3], "size": [1, 1, 1], "inflate": 0.02, "uv": [46, 83]}
-					]
-				},
-				{
-					"name": "hand_right_fingers",
-					"parent": "hand_right",
-					"pivot": [-16.75, 19.5, 1]
-				},
-				{
-					"name": "hand_right_finger",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.75, 19.5, -0.5],
-					"cubes": [
-						{"origin": [-18.75, 18.5, -1], "size": [2, 1, 1], "uv": [30, 55]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip",
-					"parent": "hand_right_finger",
-					"pivot": [-18.75, 19.5, -0.5],
-					"cubes": [
-						{"origin": [-19.75, 18.5, -1], "size": [1, 1, 1], "inflate": 0.02, "uv": [50, 83]}
-					]
-				},
-				{
-					"name": "hand_right_finger2",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.75, 19.5, 0.5],
-					"cubes": [
-						{"origin": [-18.75, 18.5, 0], "size": [2, 1, 1], "uv": [60, 16]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip2",
-					"parent": "hand_right_finger2",
-					"pivot": [-18.75, 19.5, 0.5],
-					"cubes": [
-						{"origin": [-19.75, 18.5, 0], "size": [1, 1, 1], "inflate": 0.02, "uv": [54, 83]}
-					]
-				},
-				{
-					"name": "hand_right_finger3",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.75, 19.5, 1.5],
-					"cubes": [
-						{"origin": [-18.75, 18.5, 1], "size": [2, 1, 1], "uv": [56, 73]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip3",
-					"parent": "hand_right_finger3",
-					"pivot": [-18.75, 19.5, 1.5],
-					"cubes": [
-						{"origin": [-19.75, 18.5, 1], "size": [1, 1, 1], "inflate": 0.02, "uv": [58, 83]}
-					]
-				},
-				{
-					"name": "hand_right_finger4",
-					"parent": "hand_right_fingers",
-					"pivot": [-16.75, 19.5, 2.5],
-					"cubes": [
-						{"origin": [-18.75, 18.5, 2], "size": [2, 1, 1], "uv": [36, 80]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip4",
-					"parent": "hand_right_finger4",
-					"pivot": [-18.75, 19.5, 2.5],
-					"cubes": [
-						{"origin": [-19.75, 18.5, 2], "size": [1, 1, 1], "inflate": 0.02, "uv": [62, 83]}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso",
-					"pivot": [0, 21.25, 1]
-				},
-				{
-					"name": "head_correction",
-					"parent": "head",
-					"pivot": [0, 21.25, 1]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head_correction",
-					"pivot": [0, 21.25, 1]
-				},
-				{
-					"name": "head_angle",
-					"parent": "head_ai",
-					"pivot": [0, 21.25, 1],
-					"cubes": [
-						{"origin": [-5.5, 20, -4], "size": [11, 8, 10], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "hair",
-					"parent": "head_angle",
-					"pivot": [0, 28, -1]
-				},
-				{
-					"name": "hair_front",
-					"parent": "hair",
-					"pivot": [-1, 28.5, -2.5],
-					"cubes": [
-						{"origin": [-3, 26.5, -4.5], "size": [4, 4, 4], "uv": [62, 67]}
-					]
-				},
-				{
-					"name": "hair_right",
-					"parent": "hair",
-					"pivot": [-4.25, 27.75, 1],
-					"rotation": [0, 0, -40],
-					"cubes": [
-						{"origin": [-5.75, 26.75, -1], "size": [4, 4, 4], "uv": [68, 0]}
-					]
-				},
-				{
-					"name": "hair_right_tip",
-					"parent": "hair_right",
-					"pivot": [-3.5, 30.75, 1],
-					"rotation": [0, 0, 30],
-					"cubes": [
-						{"origin": [-4.5, 29.25, 1], "size": [2, 4, 0], "uv": [42, 81]}
-					]
-				},
-				{
-					"name": "hair_left",
-					"parent": "hair",
-					"pivot": [4.5, 28.5, 1],
-					"rotation": [0, 0, 50],
-					"cubes": [
-						{"origin": [3, 27, -0.5], "size": [4, 3, 3], "uv": [56, 75]}
-					]
-				},
-				{
-					"name": "hair_left_tip",
-					"parent": "hair_left",
-					"pivot": [4.5, 29.5, 1],
-					"cubes": [
-						{"origin": [3.5, 29.75, 1], "size": [2, 3, 0], "uv": [82, 78]}
-					]
-				},
-				{
-					"name": "hair_center",
-					"parent": "hair",
-					"pivot": [0.25, 28, 1],
-					"rotation": [0, 0, 15],
-					"cubes": [
-						{"origin": [-2.75, 26, -2.5], "size": [6, 6, 7], "uv": [42, 0]}
-					]
-				},
-				{
-					"name": "hair_center2",
-					"parent": "hair_center",
-					"pivot": [-2, 32, 1],
-					"rotation": [0, 0, -45],
-					"cubes": [
-						{"origin": [-3.5, 29.75, -0.5], "size": [3, 3, 3], "uv": [12, 80]}
-					]
-				},
-				{
-					"name": "hair_center_tip",
-					"parent": "hair_center2",
-					"pivot": [-1.5, 32.75, 1],
-					"rotation": [0, 0, 45],
-					"cubes": [
-						{"origin": [-2.5, 31.75, 1], "size": [3, 3, 0], "uv": [16, 71]}
-					]
-				},
-				{
-					"name": "ear_left",
-					"parent": "head_angle",
-					"pivot": [5.5, 24, 0.75],
-					"cubes": [
-						{"origin": [5, 21, 0.75], "size": [9, 6, 0], "uv": [40, 32]}
-					]
-				},
-				{
-					"name": "ear_right",
-					"parent": "head_angle",
-					"pivot": [-5.5, 24, 0.75],
-					"cubes": [
-						{"origin": [-14, 21, 0.75], "size": [9, 6, 0], "uv": [44, 67]}
-					]
-				},
-				{
-					"name": "nose",
-					"parent": "head_angle",
-					"pivot": [0, 23, -4.02],
-					"cubes": [
-						{"origin": [-1, 22.5, -4.02], "size": [2, 1, 0], "uv": [80, 12]}
-					]
-				},
-				{
-					"name": "expressions",
-					"parent": "head_angle",
-					"pivot": [0, 21.25, -4.02]
-				},
-				{
-					"name": "mouths",
-					"parent": "expressions",
-					"pivot": [0, 21.25, -4.02]
-				},
-				{
-					"name": "mouth",
-					"parent": "mouths",
-					"pivot": [0, 21.25, -4.02],
-					"cubes": [
-						{"origin": [-3, 20.5, -4.02], "size": [6, 1, 0], "uv": [58, 37]},
-						{"origin": [-4, 21, -4.02], "size": [8, 1, 0], "uv": [42, 17]}
-					]
-				},
-				{
-					"name": "mouth_open_happy",
-					"parent": "mouths",
-					"pivot": [0, 21, -3.92],
-					"cubes": [
-						{"origin": [-4, 20, -3.92], "size": [8, 2, 0], "uv": [44, 64]}
-					]
-				},
-				{
-					"name": "mouth_open_tall",
-					"parent": "mouths",
-					"pivot": [0, 21, -3.92],
-					"cubes": [
-						{"origin": [-0.5, 20, -3.92], "size": [1, 2, 0], "uv": [36, 55]}
-					]
-				},
-				{
-					"name": "mouth_open_small",
-					"parent": "mouths",
-					"pivot": [0, 21, -3.92],
-					"cubes": [
-						{"origin": [-1, 20, -3.92], "size": [2, 2, 0], "uv": [66, 83]}
-					]
-				},
-				{
-					"name": "mouth_frown",
-					"parent": "mouths",
-					"pivot": [0, 21.25, -3.92],
-					"cubes": [
-						{"origin": [-1, 21, -3.92], "size": [2, 1, 0], "uv": [80, 66]},
-						{"origin": [-3, 20.5, -3.92], "size": [6, 1, 0], "uv": [68, 12]}
-					]
-				},
-				{
-					"name": "mouth_straight",
-					"parent": "mouths",
-					"pivot": [0, 21.25, -3.92],
-					"cubes": [
-						{"origin": [-4, 20.75, -3.92], "size": [8, 1, 0], "uv": [44, 66]}
-					]
-				},
-				{
-					"name": "mouth_open_smile",
-					"parent": "mouths",
-					"pivot": [0, 21, -3.92],
-					"cubes": [
-						{"origin": [-2, 20, -3.92], "size": [4, 2, 0], "uv": [30, 53]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "expressions",
-					"pivot": [0, 25, -4.02]
-				},
-				{
-					"name": "eyes_left",
-					"parent": "eyes",
-					"pivot": [3, 25, -4.02]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes_left",
-					"pivot": [3, 24.75, -4.02],
-					"cubes": [
-						{"origin": [2, 22.75, -4.02], "size": [2, 3, 0], "uv": [82, 75]}
-					]
-				},
-				{
-					"name": "pupil_left_happy",
-					"parent": "eye_left",
-					"pivot": [3, 24.16667, -3.94],
-					"cubes": [
-						{"origin": [3.5, 23.5, -3.94], "size": [1, 1, 0], "uv": [58, 17]},
-						{"origin": [1.5, 23.5, -3.94], "size": [1, 1, 0], "uv": [64, 32]},
-						{"origin": [2.5, 24, -3.94], "size": [1, 1, 0], "uv": [70, 37]}
-					]
-				},
-				{
-					"name": "pupil_left_down",
-					"parent": "eye_left",
-					"pivot": [3, 24.66667, -3.94],
-					"cubes": [
-						{"origin": [3.5, 24.5, -3.94], "size": [1, 1, 0], "uv": [22, 73]},
-						{"origin": [1.5, 24.5, -3.94], "size": [1, 1, 0], "uv": [42, 80]},
-						{"origin": [2.5, 24, -3.94], "size": [1, 1, 0], "uv": [40, 84]}
-					]
-				},
-				{
-					"name": "pupil_left_sad",
-					"parent": "eye_left",
-					"pivot": [3, 24.25, -3.94],
-					"cubes": [
-						{"origin": [2, 24, -3.94], "size": [1, 1, 0], "uv": [84, 42]},
-						{"origin": [3, 23.5, -3.94], "size": [1, 1, 0], "uv": [84, 43]}
-					]
-				},
-				{
-					"name": "pupil_left_angry",
-					"parent": "eye_left",
-					"pivot": [3, 24.25, -3.94],
-					"cubes": [
-						{"origin": [2, 23.5, -3.94], "size": [1, 1, 0], "uv": [84, 44]},
-						{"origin": [3, 24, -3.94], "size": [1, 1, 0], "uv": [84, 45]}
-					]
-				},
-				{
-					"name": "pupil_left_blink",
-					"parent": "eye_left",
-					"pivot": [3, 24.25, -4.04],
-					"cubes": [
-						{"origin": [2, 23.75, -3.94], "size": [2, 1, 0], "uv": [4, 84]}
-					]
-				},
-				{
-					"name": "eyebrow_left_straight",
-					"parent": "eye_left",
-					"pivot": [3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [1.5, 25.25, -3.96], "size": [3, 1, 0], "uv": [58, 32]}
-					]
-				},
-				{
-					"name": "eyebrow_left_sad",
-					"parent": "eye_left",
-					"pivot": [3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [2.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [84, 4]},
-						{"origin": [1.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [84, 46]}
-					]
-				},
-				{
-					"name": "eyebrow_left_angry",
-					"parent": "eye_left",
-					"pivot": [3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [1.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [84, 5]},
-						{"origin": [3.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [84, 47]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [2.75, 24.25, -4.04],
-					"cubes": [
-						{"origin": [2.25, 23.25, -4.04], "size": [1, 2, 0], "uv": [22, 71]}
-					]
-				},
-				{
-					"name": "eyebrow_left",
-					"parent": "eye_left",
-					"pivot": [3, 26, -4.02],
-					"cubes": [
-						{"origin": [2.5, 25.5, -4.06], "size": [2, 1, 0], "uv": [84, 6]},
-						{"origin": [1.5, 25.75, -4.06], "size": [1, 1, 0], "uv": [84, 48]}
-					]
-				},
-				{
-					"name": "pupil_left_shocked",
-					"parent": "eye_left",
-					"pivot": [2.75, 24.5, -3.94],
-					"cubes": [
-						{"origin": [2.25, 24, -3.94], "size": [1, 1, 0], "uv": [36, 85]}
-					]
-				},
-				{
-					"name": "eyes_right",
-					"parent": "eyes",
-					"pivot": [-3, 25, -4.02]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes_right",
-					"pivot": [-3, 24.75, -4.02],
-					"cubes": [
-						{"origin": [-4, 22.75, -4.02], "size": [2, 3, 0], "uv": [78, 82]}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-2.75, 24.25, -4.04],
-					"cubes": [
-						{"origin": [-3.25, 23.25, -4.04], "size": [1, 2, 0], "uv": [40, 82]}
-					]
-				},
-				{
-					"name": "pupil_right_happy",
-					"parent": "eye_right",
-					"pivot": [-3, 24.16667, -3.94],
-					"cubes": [
-						{"origin": [-4.5, 23.5, -3.94], "size": [1, 1, 0], "uv": [84, 49]},
-						{"origin": [-2.5, 23.5, -3.94], "size": [1, 1, 0], "uv": [84, 50]},
-						{"origin": [-3.5, 24, -3.94], "size": [1, 1, 0], "uv": [84, 51]}
-					]
-				},
-				{
-					"name": "pupil_right_angry",
-					"parent": "eye_right",
-					"pivot": [-3, 24.25, -3.94],
-					"cubes": [
-						{"origin": [-3, 23.5, -3.94], "size": [1, 1, 0], "uv": [84, 52]},
-						{"origin": [-4, 24, -3.94], "size": [1, 1, 0], "uv": [84, 53]}
-					]
-				},
-				{
-					"name": "pupil_right_sad",
-					"parent": "eye_right",
-					"pivot": [-3, 24.25, -3.94],
-					"cubes": [
-						{"origin": [-3, 24, -3.94], "size": [1, 1, 0], "uv": [84, 54]},
-						{"origin": [-4, 23.5, -3.94], "size": [1, 1, 0], "uv": [84, 55]}
-					]
-				},
-				{
-					"name": "pupil_right_down",
-					"parent": "eye_right",
-					"pivot": [-3, 24.66667, -3.94],
-					"cubes": [
-						{"origin": [-4.5, 24.5, -3.94], "size": [1, 1, 0], "uv": [84, 56]},
-						{"origin": [-2.5, 24.5, -3.94], "size": [1, 1, 0], "uv": [84, 66]},
-						{"origin": [-3.5, 24, -3.94], "size": [1, 1, 0], "uv": [4, 85]}
-					]
-				},
-				{
-					"name": "eyebrow_right_straight",
-					"parent": "eye_right",
-					"pivot": [-3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [-4.5, 25.25, -3.96], "size": [3, 1, 0], "uv": [24, 63]}
-					]
-				},
-				{
-					"name": "eyebrow_right_sad",
-					"parent": "eye_right",
-					"pivot": [-3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [-4.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [84, 7]},
-						{"origin": [-2.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [6, 85]}
-					]
-				},
-				{
-					"name": "eyebrow_right",
-					"parent": "eye_right",
-					"pivot": [-3, 26, -4.02],
-					"cubes": [
-						{"origin": [-4.5, 25.5, -4.06], "size": [2, 1, 0], "uv": [8, 84]},
-						{"origin": [-2.5, 25.75, -4.06], "size": [1, 1, 0], "uv": [8, 85]}
-					]
-				},
-				{
-					"name": "eyebrow_right_angry",
-					"parent": "eye_right",
-					"pivot": [-3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [-3.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [84, 12]},
-						{"origin": [-4.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [10, 85]}
-					]
-				},
-				{
-					"name": "pupil_right_blink",
-					"parent": "eye_right",
-					"pivot": [-3, 24.25, -3.94],
-					"cubes": [
-						{"origin": [-4, 23.75, -3.94], "size": [2, 1, 0], "uv": [84, 39]}
-					]
-				},
-				{
-					"name": "pupil_right_shocked",
-					"parent": "eye_right",
-					"pivot": [-2.75, 24.5, -3.94],
-					"cubes": [
-						{"origin": [-3.25, 24, -3.94], "size": [1, 1, 0], "uv": [38, 85]}
-					]
-				},
-				{
-					"name": "blush",
-					"parent": "expressions",
-					"pivot": [0, 22.75, -3.94]
-				},
-				{
-					"name": "blush_left",
-					"parent": "blush",
-					"pivot": [4.5, 22.75, -3.94],
-					"cubes": [
-						{"origin": [3.5, 22.25, -3.94], "size": [2, 1, 0], "uv": [84, 40]}
-					]
-				},
-				{
-					"name": "blush_right",
-					"parent": "blush",
-					"pivot": [-4.5, 22.75, -3.94],
-					"cubes": [
-						{"origin": [-5.5, 22.25, -3.94], "size": [2, 1, 0], "uv": [84, 41]}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0515_panpour/panpour.geo.json

@@ -1,545 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.panpour",
-				"texture_width": 64,
-				"texture_height": 64,
-				"visible_bounds_width": 4,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
-			},
-			"bones": [
-				{
-					"name": "panpour",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "panpour",
-					"pivot": [0, 9.5, 0]
-				},
-				{
-					"name": "legs",
-					"parent": "body",
-					"pivot": [0, 5.5, 0.5]
-				},
-				{
-					"name": "leg_right",
-					"parent": "legs",
-					"pivot": [-1.5, 5.4, -0.25],
-					"cubes": [
-						{"origin": [-2.5, 3.4, -1.25], "size": [2, 3, 2], "inflate": 0.02, "uv": [36, 48]}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right",
-					"pivot": [-1.5, 3.4, -1.25],
-					"cubes": [
-						{"origin": [-2.5, 0.4, -1.25], "size": [2, 3, 2], "uv": [44, 48]}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-1.5, 0.9, -0.25],
-					"cubes": [
-						{"origin": [-2.5, -0.1, -2.25], "size": [2, 1, 3], "inflate": 0.02, "uv": [48, 16]}
-					]
-				},
-				{
-					"name": "leg_left",
-					"parent": "legs",
-					"pivot": [1.5, 5.4, -0.25],
-					"cubes": [
-						{"origin": [0.5, 3.4, -1.25], "size": [2, 3, 2], "inflate": 0.02, "uv": [0, 49]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left",
-					"pivot": [1.5, 3.4, -1.25],
-					"cubes": [
-						{"origin": [0.5, 0.4, -1.25], "size": [2, 3, 2], "uv": [22, 49]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [1.5, 0.9, -0.25],
-					"cubes": [
-						{"origin": [0.5, -0.1, -2.25], "size": [2, 1, 3], "inflate": 0.02, "uv": [48, 20]}
-					]
-				},
-				{
-					"name": "waist",
-					"parent": "body",
-					"pivot": [0, 4.5, 0],
-					"cubes": [
-						{"origin": [-2, 4.5, -1.5], "size": [4, 4, 3], "inflate": 0.02, "uv": [12, 38]}
-					]
-				},
-				{
-					"name": "tail",
-					"parent": "waist",
-					"pivot": [0, 5.5, 1.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 0.5], "size": [1, 1, 4], "inflate": 0.02, "uv": [26, 44]}
-					]
-				},
-				{
-					"name": "tail2",
-					"parent": "tail",
-					"pivot": [0, 5.5, 4.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 4.5], "size": [1, 1, 3], "uv": [8, 50]}
-					]
-				},
-				{
-					"name": "tail3",
-					"parent": "tail2",
-					"pivot": [0, 5.5, 7.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 7.5], "size": [1, 1, 2], "inflate": 0.02, "uv": [16, 50]}
-					]
-				},
-				{
-					"name": "tail4",
-					"parent": "tail3",
-					"pivot": [0, 5.5, 9.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 9.5], "size": [1, 1, 3], "uv": [50, 8]}
-					]
-				},
-				{
-					"name": "tail5",
-					"parent": "tail4",
-					"pivot": [0, 5.5, 12.5],
-					"cubes": [
-						{"origin": [-0.5, 5, 12.5], "size": [1, 1, 4], "inflate": 0.02, "uv": [12, 45]}
-					]
-				},
-				{
-					"name": "tail_tip",
-					"parent": "tail5",
-					"pivot": [0, 5.5, 14.5]
-				},
-				{
-					"name": "tail_tip_right",
-					"parent": "tail_tip",
-					"pivot": [-0.5, 5.5, 15.25],
-					"cubes": [
-						{"origin": [-2.5, 4.5, 14.25], "size": [2, 2, 2], "uv": [50, 43]}
-					]
-				},
-				{
-					"name": "tail_tip_left",
-					"parent": "tail_tip",
-					"pivot": [0.5, 5.5, 15.25],
-					"cubes": [
-						{"origin": [0.5, 4.5, 14.25], "size": [2, 2, 2], "uv": [52, 30]}
-					]
-				},
-				{
-					"name": "tail_tip_center",
-					"parent": "tail_tip",
-					"pivot": [0, 5.5, 16.5],
-					"cubes": [
-						{"origin": [-1, 4.5, 16.5], "size": [2, 2, 2], "uv": [52, 37]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "waist",
-					"pivot": [0, 8.5, 0],
-					"cubes": [
-						{"origin": [-2, 8.5, -1.5], "size": [4, 3, 3], "uv": [26, 38]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso",
-					"pivot": [0, 10.75, 0]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [1.5, 10.75, 0],
-					"cubes": [
-						{"origin": [1, 10.25, -0.5], "size": [4, 1, 1], "uv": [43, 35]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [5, 10.75, 0],
-					"cubes": [
-						{"origin": [5, 9.75, -1], "size": [2, 2, 2], "uv": [50, 0]},
-						{"origin": [7, 9.75, -1.5], "size": [3, 2, 3], "uv": [40, 38]}
-					]
-				},
-				{
-					"name": "thumb_left",
-					"parent": "arm_left2",
-					"pivot": [9, 10.75, -1.5],
-					"cubes": [
-						{"origin": [9, 9.75, -3], "size": [1, 1, 2], "inflate": -0.02, "uv": [36, 25]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [10, 11.75, 0],
-					"cubes": [
-						{"origin": [10, 9.75, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [42, 30]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-1.5, 10.75, 0],
-					"cubes": [
-						{"origin": [-5, 10.25, -0.5], "size": [4, 1, 1], "uv": [0, 47]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-5, 10.75, 0],
-					"cubes": [
-						{"origin": [-7, 9.75, -1], "size": [2, 2, 2], "uv": [50, 4]},
-						{"origin": [-10, 9.75, -1.5], "size": [3, 2, 3], "uv": [42, 25]}
-					]
-				},
-				{
-					"name": "thumb_right",
-					"parent": "arm_right2",
-					"pivot": [-9, 10.75, -1.5],
-					"cubes": [
-						{"origin": [-10, 9.75, -3], "size": [1, 1, 2], "inflate": -0.02, "uv": [30, 49]}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-10, 11.75, 0],
-					"cubes": [
-						{"origin": [-12, 9.75, -1.5], "size": [2, 2, 3], "inflate": 0.02, "uv": [40, 43]}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso",
-					"pivot": [0, 12.5, 0]
-				},
-				{
-					"name": "head_correction",
-					"parent": "head",
-					"pivot": [0, 12.5, 0]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head_correction",
-					"pivot": [0, 12.5, 0]
-				},
-				{
-					"name": "head_angle",
-					"parent": "head_ai",
-					"pivot": [0, 13.5, 0],
-					"cubes": [
-						{"origin": [-5, 11.5, -4], "size": [10, 8, 8], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "hair",
-					"parent": "head_angle",
-					"pivot": [0, 19.5, 0],
-					"cubes": [
-						{"origin": [-2.5, 18.5, -2.5], "size": [5, 5, 5], "uv": [0, 28]}
-					]
-				},
-				{
-					"name": "hair_big",
-					"parent": "hair",
-					"pivot": [0, 21.5, 0],
-					"cubes": [
-						{"origin": [2.5, 21.5, -2.5], "size": [2, 3, 5], "uv": [36, 0]},
-						{"origin": [-4.5, 21.5, -2.5], "size": [2, 3, 5], "uv": [36, 8]},
-						{"origin": [-4.5, 21.5, 2.5], "size": [9, 3, 2], "uv": [20, 28]},
-						{"origin": [-4.5, 21.5, -4.5], "size": [9, 3, 2], "uv": [20, 33]},
-						{"origin": [-4.5, 21.5, -4.5], "size": [9, 3, 9], "inflate": 0.25, "uv": [0, 16]}
-					]
-				},
-				{
-					"name": "ear_left",
-					"parent": "head_angle",
-					"pivot": [5, 16, 0],
-					"cubes": [
-						{"origin": [4, 12.5, 0], "size": [6, 9, 0], "uv": [36, 16]}
-					]
-				},
-				{
-					"name": "ear_right",
-					"parent": "head_angle",
-					"pivot": [-5, 16, 0],
-					"cubes": [
-						{"origin": [-10, 12.5, 0], "size": [6, 9, 0], "uv": [0, 38]}
-					]
-				},
-				{
-					"name": "nose",
-					"parent": "head_angle",
-					"pivot": [0, 13.25, -4.03],
-					"cubes": [
-						{"origin": [-0.5, 13.25, -4.02], "size": [1, 1, 0], "uv": [18, 53]},
-						{"origin": [-1, 12.75, -4.04], "size": [2, 1, 0], "uv": [36, 47]}
-					]
-				},
-				{
-					"name": "expressions",
-					"parent": "head_angle",
-					"pivot": [0, 12.75, -4.06]
-				},
-				{
-					"name": "mouths",
-					"parent": "expressions",
-					"pivot": [0, 12.75, -4.06]
-				},
-				{
-					"name": "mouth",
-					"parent": "mouths",
-					"pivot": [0, 12.75, -4.06],
-					"cubes": [
-						{"origin": [-2.5, 12, -4.06], "size": [5, 1, 0], "uv": [42, 37]},
-						{"origin": [-3, 12.5, -4.06], "size": [1, 1, 0], "uv": [20, 53]},
-						{"origin": [2, 12.5, -4.06], "size": [1, 1, 0], "uv": [46, 53]},
-						{"origin": [-0.5, 12.5, -4.06], "size": [1, 1, 0], "uv": [44, 53]}
-					]
-				},
-				{
-					"name": "mouth_frown",
-					"parent": "mouths",
-					"pivot": [0, 12.75, -3.96],
-					"cubes": [
-						{"origin": [-1.5, 12, -3.96], "size": [3, 1, 0], "uv": [50, 47]},
-						{"origin": [-0.5, 12.5, -3.96], "size": [1, 1, 0], "uv": [30, 53]}
-					]
-				},
-				{
-					"name": "mouth_open_tall",
-					"parent": "mouths",
-					"pivot": [0, 12.5, -3.96],
-					"cubes": [
-						{"origin": [-0.5, 11.5, -3.96], "size": [1, 2, 0], "uv": [52, 50]}
-					]
-				},
-				{
-					"name": "mouth_open_happy",
-					"parent": "mouths",
-					"pivot": [0, 12.75, -3.97],
-					"cubes": [
-						{"origin": [-2.5, 11.5, -3.96], "size": [5, 2, 0], "uv": [50, 12]}
-					]
-				},
-				{
-					"name": "mouth_open_smile",
-					"parent": "mouths",
-					"pivot": [0, 12.5, -4.07],
-					"cubes": [
-						{"origin": [-1.5, 12.5, -3.96], "size": [3, 1, 0], "uv": [30, 52]},
-						{"origin": [-1, 11.5, -3.98], "size": [2, 1, 0], "uv": [52, 49]}
-					]
-				},
-				{
-					"name": "mouth_straight",
-					"parent": "mouths",
-					"pivot": [0, 13, -3.96],
-					"cubes": [
-						{"origin": [-2.5, 12.5, -3.96], "size": [5, 1, 0], "uv": [48, 24]}
-					]
-				},
-				{
-					"name": "mouth_open_small",
-					"parent": "mouths",
-					"pivot": [0, 12.5, -3.96],
-					"cubes": [
-						{"origin": [-1, 11.5, -3.96], "size": [2, 2, 0], "uv": [52, 41]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "expressions",
-					"pivot": [0, 15.5, -4.02]
-				},
-				{
-					"name": "eyes_left",
-					"parent": "eyes",
-					"pivot": [2.75, 15.5, -4.02]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes_left",
-					"pivot": [2.75, 15.5, -4.02],
-					"cubes": [
-						{"origin": [1.75, 14, -4.02], "size": [2, 3, 0], "uv": [22, 45]}
-					]
-				},
-				{
-					"name": "eyebrow_left_straight",
-					"parent": "eye_left",
-					"pivot": [2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [1.25, 16.5, -3.96], "size": [3, 1, 0], "uv": [50, 14]}
-					]
-				},
-				{
-					"name": "eyebrow_left_sad",
-					"parent": "eye_left",
-					"pivot": [2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [1.25, 17, -3.96], "size": [1, 1, 0], "uv": [50, 14]},
-						{"origin": [2.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [51, 14]}
-					]
-				},
-				{
-					"name": "eyebrow_left_angry",
-					"parent": "eye_left",
-					"pivot": [2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [3.25, 17, -3.96], "size": [1, 1, 0], "uv": [45, 9]},
-						{"origin": [1.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [45, 8]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.41667, -4.04667],
-					"cubes": [
-						{"origin": [1.25, 14.75, -4.04], "size": [1, 1, 0], "uv": [52, 52], "mirror": true},
-						{"origin": [3.25, 14.75, -4.06], "size": [1, 1, 0], "uv": [34, 53]},
-						{"origin": [2.25, 15.25, -4.04], "size": [1, 1, 0], "uv": [16, 53]}
-					]
-				},
-				{
-					"name": "pupil_left_blink",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.5, -3.92],
-					"cubes": [
-						{"origin": [1.75, 15, -3.94], "size": [2, 1, 0], "uv": [22, 48]}
-					]
-				},
-				{
-					"name": "pupil_left_sad",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.5, -3.95],
-					"cubes": [
-						{"origin": [1.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [16, 53]},
-						{"origin": [2.75, 14.75, -3.96], "size": [1, 1, 0], "uv": [34, 53]}
-					]
-				},
-				{
-					"name": "pupil_left_angry",
-					"parent": "eye_left",
-					"pivot": [2.75, 15.5, -3.94],
-					"cubes": [
-						{"origin": [1.75, 14.75, -3.94], "size": [1, 1, 0], "uv": [38, 53]},
-						{"origin": [2.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [36, 53]}
-					]
-				},
-				{
-					"name": "eyes_right",
-					"parent": "eyes",
-					"pivot": [-2.75, 15.5, -4.02]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes_right",
-					"pivot": [-2.75, 15.5, -4.02],
-					"cubes": [
-						{"origin": [-3.75, 14, -4.02], "size": [2, 3, 0], "uv": [36, 44]}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.41667, -4.04667],
-					"cubes": [
-						{"origin": [-3.25, 15.25, -4.04], "size": [1, 1, 0], "uv": [52, 52]},
-						{"origin": [-2.25, 14.75, -4.04], "size": [1, 1, 0], "uv": [52, 52]},
-						{"origin": [-4.25, 14.75, -4.06], "size": [1, 1, 0], "uv": [32, 53]}
-					]
-				},
-				{
-					"name": "pupil_right_blink",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.5, -3.92],
-					"cubes": [
-						{"origin": [-3.75, 15, -3.94], "size": [2, 1, 0], "uv": [8, 49]}
-					]
-				},
-				{
-					"name": "pupil_right_sad",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.5, -4.05],
-					"cubes": [
-						{"origin": [-2.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [16, 53], "mirror": true},
-						{"origin": [-3.75, 14.75, -3.96], "size": [1, 1, 0], "uv": [34, 53], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_right_sad",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [-2.25, 17, -3.96], "size": [1, 1, 0], "uv": [50, 14], "mirror": true},
-						{"origin": [-4.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [51, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right_annoyed",
-					"parent": "eye_right",
-					"pivot": [-2.75, 15.5, -3.94],
-					"cubes": [
-						{"origin": [-2.75, 14.75, -3.94], "size": [1, 1, 0], "uv": [48, 53]},
-						{"origin": [-3.75, 15.25, -3.94], "size": [1, 1, 0], "uv": [50, 53]}
-					]
-				},
-				{
-					"name": "eyebrow_right_angry",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [-4.25, 17, -3.96], "size": [1, 1, 0], "uv": [45, 9], "mirror": true},
-						{"origin": [-3.25, 16.5, -3.96], "size": [2, 1, 0], "uv": [45, 8], "mirror": true}
-					]
-				},
-				{
-					"name": "eyebrow_right_straight",
-					"parent": "eye_right",
-					"pivot": [-2.75, 17, -3.96],
-					"cubes": [
-						{"origin": [-4.25, 16.5, -3.96], "size": [3, 1, 0], "uv": [50, 15]}
-					]
-				},
-				{
-					"name": "blush_left",
-					"parent": "expressions",
-					"pivot": [4, 13.5, -3.96],
-					"cubes": [
-						{"origin": [3, 13, -3.96], "size": [2, 1, 0], "uv": [52, 34]}
-					]
-				},
-				{
-					"name": "blush_right",
-					"parent": "expressions",
-					"pivot": [-4, 13.5, -3.96],
-					"cubes": [
-						{"origin": [-5, 13, -3.96], "size": [2, 1, 0], "uv": [52, 48]}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0516_simipour/simipour.geo.json

@@ -1,951 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.simipour",
-				"texture_width": 128,
-				"texture_height": 128,
-				"visible_bounds_width": 5,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
-			},
-			"bones": [
-				{
-					"name": "simipour",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "simipour",
-					"pivot": [0, 15.25, 1]
-				},
-				{
-					"name": "legs",
-					"parent": "body",
-					"pivot": [0, 9, 1]
-				},
-				{
-					"name": "leg_left",
-					"parent": "legs",
-					"pivot": [2.5, 9, 1],
-					"cubes": [
-						{"origin": [1, 5, -0.5], "size": [3, 5, 3], "inflate": 0.02, "uv": [62, 0]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left",
-					"pivot": [2.5, 5, -0.5],
-					"cubes": [
-						{"origin": [1, 1, -0.5], "size": [3, 4, 3], "uv": [44, 68]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [2.5, 2, 1.5],
-					"cubes": [
-						{"origin": [0.5, 0, -1], "size": [4, 2, 4], "uv": [60, 10]}
-					]
-				},
-				{
-					"name": "toes_left",
-					"parent": "foot_left",
-					"pivot": [2.5, 0, -1],
-					"cubes": [
-						{"origin": [0.5, 0, -3], "size": [4, 2, 2], "inflate": 0.02, "uv": [76, 10]},
-						{"origin": [1, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [4, 79]},
-						{"origin": [3, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [8, 79]}
-					]
-				},
-				{
-					"name": "leg_right",
-					"parent": "legs",
-					"pivot": [-2.5, 9, 1],
-					"cubes": [
-						{"origin": [-4, 5, -0.5], "size": [3, 5, 3], "inflate": 0.02, "uv": [64, 36]}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right",
-					"pivot": [-2.5, 5, -0.5],
-					"cubes": [
-						{"origin": [-4, 1, -0.5], "size": [3, 4, 3], "uv": [68, 54]}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-2.5, 2, 1.5],
-					"cubes": [
-						{"origin": [-4.5, 0, -1], "size": [4, 2, 4], "uv": [52, 24]}
-					]
-				},
-				{
-					"name": "toes_right",
-					"parent": "foot_right",
-					"pivot": [-2.5, 0, -1],
-					"cubes": [
-						{"origin": [-4.5, 0, -3], "size": [4, 2, 2], "inflate": 0.02, "uv": [38, 75]},
-						{"origin": [-2, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [44, 65]},
-						{"origin": [-4, 0, -3], "size": [1, 2, 1], "inflate": 0.04, "uv": [0, 79]}
-					]
-				},
-				{
-					"name": "waist",
-					"parent": "body",
-					"pivot": [0, 8, 1],
-					"cubes": [
-						{"origin": [-3.5, 8, -1.5], "size": [7, 5, 5], "uv": [0, 30]}
-					]
-				},
-				{
-					"name": "tail",
-					"parent": "waist",
-					"pivot": [0, 9.5, 3.5],
-					"cubes": [
-						{"origin": [-1, 8.5, 2.5], "size": [2, 2, 5], "uv": [0, 62]}
-					]
-				},
-				{
-					"name": "tail2",
-					"parent": "tail",
-					"pivot": [0, 9.5, 7.5],
-					"cubes": [
-						{"origin": [-1, 8.5, 7.5], "size": [2, 2, 4], "uv": [70, 65]}
-					]
-				},
-				{
-					"name": "tail3",
-					"parent": "tail2",
-					"pivot": [0, 9.5, 11.5],
-					"cubes": [
-						{"origin": [-1, 8.5, 11.5], "size": [2, 2, 4], "uv": [14, 72]}
-					]
-				},
-				{
-					"name": "tail4",
-					"parent": "tail3",
-					"pivot": [0, 9.5, 15.5],
-					"cubes": [
-						{"origin": [-1, 8.5, 15.5], "size": [2, 2, 4], "uv": [26, 72]}
-					]
-				},
-				{
-					"name": "tail5",
-					"parent": "tail4",
-					"pivot": [0, 9.5, 19.5],
-					"cubes": [
-						{"origin": [-1, 8.5, 19.5], "size": [2, 2, 4], "uv": [0, 73]}
-					]
-				},
-				{
-					"name": "tail_tip",
-					"parent": "tail5",
-					"pivot": [0, 9.5, 23.5],
-					"cubes": [
-						{"origin": [-1.5, 8, 23.5], "size": [3, 3, 3], "uv": [70, 71]},
-						{"origin": [-1.5, 11, 25.5], "size": [3, 2, 3], "uv": [56, 73]},
-						{"origin": [-1.5, 6, 25.5], "size": [3, 2, 3], "uv": [74, 1]},
-						{"origin": [-3.5, 6, 25.5], "size": [2, 7, 3], "uv": [14, 62]},
-						{"origin": [1.5, 6, 25.5], "size": [2, 7, 3], "uv": [68, 16]},
-						{"origin": [-3.5, 6, 25.5], "size": [7, 7, 3], "inflate": 0.25, "uv": [44, 40]}
-					]
-				},
-				{
-					"name": "torso",
-					"parent": "waist",
-					"pivot": [0, 13, 1],
-					"cubes": [
-						{"origin": [-3, 13, -1], "size": [6, 4, 4], "uv": [40, 10]}
-					]
-				},
-				{
-					"name": "dress",
-					"parent": "torso",
-					"pivot": [0, 17, 1]
-				},
-				{
-					"name": "dress_front",
-					"parent": "dress",
-					"pivot": [0, 17, -1],
-					"rotation": [-7.5, 0, 0],
-					"cubes": [
-						{"origin": [-3.5, 12, -1], "size": [7, 5, 0], "uv": [56, 68]}
-					]
-				},
-				{
-					"name": "dress_front2",
-					"parent": "dress_front",
-					"pivot": [0, 12, -1],
-					"cubes": [
-						{"origin": [-2.5, 9, -1], "size": [5, 3, 0], "uv": [76, 40]}
-					]
-				},
-				{
-					"name": "dress_front_tip",
-					"parent": "dress_front2",
-					"pivot": [0, 9, -1],
-					"cubes": [
-						{"origin": [-1.5, 7, -1], "size": [3, 2, 0], "uv": [62, 78]}
-					]
-				},
-				{
-					"name": "dress_left",
-					"parent": "dress",
-					"pivot": [3, 17, 1],
-					"rotation": [0, 0, -10],
-					"cubes": [
-						{"origin": [3, 11, -1.5], "size": [0, 6, 5], "uv": [24, 61]}
-					]
-				},
-				{
-					"name": "dress_back",
-					"parent": "dress",
-					"pivot": [0, 17, 3],
-					"rotation": [7.5, 0, 0],
-					"cubes": [
-						{"origin": [-3.5, 13, 3], "size": [7, 4, 0], "uv": [68, 61]}
-					]
-				},
-				{
-					"name": "dress_back_tip",
-					"parent": "dress_back",
-					"pivot": [0, 13, 3],
-					"cubes": [
-						{"origin": [-2.5, 10, 3], "size": [5, 3, 0], "uv": [78, 7]}
-					]
-				},
-				{
-					"name": "dress_right",
-					"parent": "dress",
-					"pivot": [-3, 17, 1],
-					"rotation": [0, 0, 10],
-					"cubes": [
-						{"origin": [-3, 11, -1.5], "size": [0, 6, 5], "uv": [34, 61]}
-					]
-				},
-				{
-					"name": "torso2",
-					"parent": "torso",
-					"pivot": [0, 17, 1],
-					"cubes": [
-						{"origin": [-2.5, 16.5, -0.5], "size": [5, 3, 3], "uv": [48, 50]}
-					]
-				},
-				{
-					"name": "arms",
-					"parent": "torso2",
-					"pivot": [0, 17.5, 1]
-				},
-				{
-					"name": "arm_left",
-					"parent": "arms",
-					"pivot": [2, 18, 1],
-					"cubes": [
-						{"origin": [1.5, 17, 0], "size": [6, 2, 2], "uv": [46, 36]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [7.5, 18, 2],
-					"cubes": [
-						{"origin": [7.5, 17, 0], "size": [5, 2, 2], "inflate": 0.02, "uv": [68, 26]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [12.5, 18, 1],
-					"cubes": [
-						{"origin": [12.5, 17, -1], "size": [3, 2, 4], "inflate": 0.02, "uv": [62, 30]}
-					]
-				},
-				{
-					"name": "thumb_left",
-					"parent": "hand_left",
-					"pivot": [14.5, 17.5, -1],
-					"cubes": [
-						{"origin": [14, 17, -2], "size": [1, 1, 2], "uv": [38, 72]}
-					]
-				},
-				{
-					"name": "thumb_left_tip",
-					"parent": "thumb_left",
-					"pivot": [14.5, 18, -2],
-					"cubes": [
-						{"origin": [14, 17, -3], "size": [1, 1, 1], "inflate": 0.01, "uv": [78, 79]}
-					]
-				},
-				{
-					"name": "hand_left_fingers",
-					"parent": "hand_left",
-					"pivot": [15.25, 19, 1]
-				},
-				{
-					"name": "hand_left_finger",
-					"parent": "hand_left_fingers",
-					"pivot": [15.25, 19, -0.5],
-					"cubes": [
-						{"origin": [15.25, 18, -1], "size": [2, 1, 1], "uv": [78, 24]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip",
-					"parent": "hand_left_finger",
-					"pivot": [17.225, 19, -0.5],
-					"cubes": [
-						{"origin": [17.225, 18, -1], "size": [1, 1, 1], "inflate": 0.01, "uv": [64, 54]}
-					]
-				},
-				{
-					"name": "hand_left_finger2",
-					"parent": "hand_left_fingers",
-					"pivot": [15.25, 19, 0.5],
-					"cubes": [
-						{"origin": [15.25, 18, 0], "size": [2, 1, 1], "uv": [26, 78]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip2",
-					"parent": "hand_left_finger2",
-					"pivot": [17.225, 19, 0.5],
-					"cubes": [
-						{"origin": [17.225, 18, 0], "size": [1, 1, 1], "inflate": 0.01, "uv": [38, 79]}
-					]
-				},
-				{
-					"name": "hand_left_finger3",
-					"parent": "hand_left_fingers",
-					"pivot": [15.25, 19, 1.5],
-					"cubes": [
-						{"origin": [15.25, 18, 1], "size": [2, 1, 1], "uv": [32, 78]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip3",
-					"parent": "hand_left_finger3",
-					"pivot": [17.225, 19, 1.5],
-					"cubes": [
-						{"origin": [17.225, 18, 1], "size": [1, 1, 1], "inflate": 0.01, "uv": [42, 79]}
-					]
-				},
-				{
-					"name": "hand_left_finger4",
-					"parent": "hand_left_fingers",
-					"pivot": [15.25, 19, 2.5],
-					"cubes": [
-						{"origin": [15.25, 18, 2], "size": [2, 1, 1], "uv": [78, 48]}
-					]
-				},
-				{
-					"name": "hand_left_finger_tip4",
-					"parent": "hand_left_finger4",
-					"pivot": [17.225, 19, 2.5],
-					"cubes": [
-						{"origin": [17.225, 18, 2], "size": [1, 1, 1], "inflate": 0.01, "uv": [46, 79]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "arms",
-					"pivot": [-2, 18, 1],
-					"cubes": [
-						{"origin": [-7.5, 17, 0], "size": [6, 2, 2], "uv": [64, 44]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-7.5, 18, 2],
-					"cubes": [
-						{"origin": [-12.5, 17, 0], "size": [5, 2, 2], "inflate": 0.02, "uv": [0, 69]}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-12.5, 18, 1],
-					"cubes": [
-						{"origin": [-15.5, 17, -1], "size": [3, 2, 4], "inflate": 0.02, "uv": [64, 48]}
-					]
-				},
-				{
-					"name": "thumb_right",
-					"parent": "hand_right",
-					"pivot": [-14.5, 17.5, -1],
-					"cubes": [
-						{"origin": [-15, 17, -2], "size": [1, 1, 2], "uv": [50, 75]}
-					]
-				},
-				{
-					"name": "thumb_right_tip",
-					"parent": "thumb_right",
-					"pivot": [-14.5, 18, -2],
-					"cubes": [
-						{"origin": [-15, 17, -3], "size": [1, 1, 1], "inflate": 0.01, "uv": [26, 80]}
-					]
-				},
-				{
-					"name": "hand_right_fingers",
-					"parent": "hand_right",
-					"pivot": [-15.25, 19, 1]
-				},
-				{
-					"name": "hand_right_finger",
-					"parent": "hand_right_fingers",
-					"pivot": [-15.25, 19, -0.5],
-					"cubes": [
-						{"origin": [-17.25, 18, -1], "size": [2, 1, 1], "uv": [50, 78]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip",
-					"parent": "hand_right_finger",
-					"pivot": [-17.275, 19, -0.5],
-					"cubes": [
-						{"origin": [-18.25, 18, -1], "size": [1, 1, 1], "inflate": 0.01, "uv": [30, 80]}
-					]
-				},
-				{
-					"name": "hand_right_finger2",
-					"parent": "hand_right_fingers",
-					"pivot": [-15.25, 19, 0.5],
-					"cubes": [
-						{"origin": [-17.25, 18, 0], "size": [2, 1, 1], "uv": [78, 50]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip2",
-					"parent": "hand_right_finger2",
-					"pivot": [-17.275, 19, 0.5],
-					"cubes": [
-						{"origin": [-18.25, 18, 0], "size": [1, 1, 1], "inflate": 0.01, "uv": [34, 80]}
-					]
-				},
-				{
-					"name": "hand_right_finger3",
-					"parent": "hand_right_fingers",
-					"pivot": [-15.25, 19, 1.5],
-					"cubes": [
-						{"origin": [-17.25, 18, 1], "size": [2, 1, 1], "uv": [78, 52]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip3",
-					"parent": "hand_right_finger3",
-					"pivot": [-17.275, 19, 1.5],
-					"cubes": [
-						{"origin": [-18.25, 18, 1], "size": [1, 1, 1], "inflate": 0.01, "uv": [80, 44]}
-					]
-				},
-				{
-					"name": "hand_right_finger4",
-					"parent": "hand_right_fingers",
-					"pivot": [-15.25, 19, 2.5],
-					"cubes": [
-						{"origin": [-17.25, 18, 2], "size": [2, 1, 1], "uv": [56, 78]}
-					]
-				},
-				{
-					"name": "hand_right_finger_tip4",
-					"parent": "hand_right_finger4",
-					"pivot": [-17.275, 19, 2.5],
-					"cubes": [
-						{"origin": [-18.25, 18, 2], "size": [1, 1, 1], "inflate": 0.01, "uv": [80, 46]}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso2",
-					"pivot": [0, 20.25, 1]
-				},
-				{
-					"name": "head_correction",
-					"parent": "head",
-					"pivot": [0, 20.25, 1]
-				},
-				{
-					"name": "head_ai",
-					"parent": "head_correction",
-					"pivot": [0, 20.25, 1]
-				},
-				{
-					"name": "head_angle",
-					"parent": "head_ai",
-					"pivot": [0, 20.25, 1],
-					"cubes": [
-						{"origin": [-5, 19, -4], "size": [10, 9, 10], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "hair",
-					"parent": "head_angle",
-					"pivot": [0, 28.5, 2.5]
-				},
-				{
-					"name": "hair_center",
-					"parent": "hair",
-					"pivot": [0, 28.5, 2.5]
-				},
-				{
-					"name": "hair_right",
-					"parent": "hair_center",
-					"pivot": [0.25, 28.5, 0],
-					"rotation": [5, 7.5, 10],
-					"cubes": [
-						{"origin": [-8.73481, 23.82635, 0], "size": [9, 7, 4], "inflate": 0.02, "uv": [0, 19]}
-					]
-				},
-				{
-					"name": "hair_right2",
-					"parent": "hair_right",
-					"pivot": [-8.23481, 24.07635, 2],
-					"rotation": [-5, 0, -22.5],
-					"cubes": [
-						{"origin": [-8.23481, 17.07635, 0.5], "size": [3, 8, 3], "uv": [24, 50]}
-					]
-				},
-				{
-					"name": "hair_right_tip",
-					"parent": "hair_right2",
-					"pivot": [-7.23481, 18.07635, 2],
-					"cubes": [
-						{"origin": [-9.73481, 16.07635, 1], "size": [3, 3, 2], "uv": [76, 30]}
-					]
-				},
-				{
-					"name": "hair_left",
-					"parent": "hair_center",
-					"pivot": [-0.25, 28.5, 0],
-					"rotation": [5, -7.5, -10],
-					"cubes": [
-						{"origin": [-0.26519, 23.82635, 0], "size": [9, 7, 4], "inflate": 0.02, "uv": [26, 19]}
-					]
-				},
-				{
-					"name": "hair_left2",
-					"parent": "hair_left",
-					"pivot": [8.23481, 24.07635, 2],
-					"rotation": [-5, 0, 22.5],
-					"cubes": [
-						{"origin": [5.23481, 17.07635, 0.5], "size": [3, 8, 3], "uv": [36, 50]}
-					]
-				},
-				{
-					"name": "hair_left_tip",
-					"parent": "hair_left2",
-					"pivot": [7.23481, 18.07635, 2],
-					"cubes": [
-						{"origin": [6.73481, 16.07635, 1], "size": [3, 3, 2], "uv": [76, 35]}
-					]
-				},
-				{
-					"name": "hair_back",
-					"parent": "hair",
-					"pivot": [0, 28, 4]
-				},
-				{
-					"name": "hair_back_left",
-					"parent": "hair_back",
-					"pivot": [-1, 28, 5],
-					"rotation": [0, -35, -7.5],
-					"cubes": [
-						{"origin": [-1, 23.5, 1], "size": [7, 6, 4], "inflate": 0.02, "uv": [24, 30]}
-					]
-				},
-				{
-					"name": "hair_back_left2",
-					"parent": "hair_back_left",
-					"pivot": [5.5, 23.5, 3],
-					"rotation": [0, 0, 15],
-					"cubes": [
-						{"origin": [2.5, 15.5, 1.5], "size": [3, 9, 3], "uv": [0, 50]}
-					]
-				},
-				{
-					"name": "hair_back_left_tip",
-					"parent": "hair_back_left2",
-					"pivot": [4.5, 16.5, 3],
-					"cubes": [
-						{"origin": [4, 14.5, 2], "size": [3, 3, 2], "uv": [68, 77]}
-					]
-				},
-				{
-					"name": "hair_back_right",
-					"parent": "hair_back",
-					"pivot": [1, 28, 5],
-					"rotation": [0, 35, 7.5],
-					"cubes": [
-						{"origin": [-6, 23.5, 1], "size": [7, 6, 4], "inflate": 0.02, "uv": [0, 40]}
-					]
-				},
-				{
-					"name": "hair_back_right2",
-					"parent": "hair_back_right",
-					"pivot": [-5.5, 23.5, 3],
-					"rotation": [0, 0, -15],
-					"cubes": [
-						{"origin": [-5.5, 15.5, 1.5], "size": [3, 9, 3], "uv": [12, 50]}
-					]
-				},
-				{
-					"name": "hair_back_right_tip",
-					"parent": "hair_back_right2",
-					"pivot": [-4.5, 16.5, 3],
-					"cubes": [
-						{"origin": [-7, 14.5, 2], "size": [3, 3, 2], "uv": [12, 78]}
-					]
-				},
-				{
-					"name": "hair_front",
-					"parent": "hair",
-					"pivot": [0, 28, -1]
-				},
-				{
-					"name": "hair_front_left",
-					"parent": "hair_front",
-					"pivot": [-0.5, 28, -2.5],
-					"rotation": [0, 10, -7.5],
-					"cubes": [
-						{"origin": [-0.5, 23.5, -2.5], "size": [7, 6, 4], "inflate": 0.02, "uv": [40, 0]}
-					]
-				},
-				{
-					"name": "hair_front_left2",
-					"parent": "hair_front_left",
-					"pivot": [6, 23.5, -0.5],
-					"rotation": [0, 0, 15],
-					"cubes": [
-						{"origin": [4, 15.5, -2], "size": [2, 9, 3], "uv": [48, 56]}
-					]
-				},
-				{
-					"name": "hair_front_left_tip",
-					"parent": "hair_front_left2",
-					"pivot": [5, 16.5, -0.5],
-					"cubes": [
-						{"origin": [4.5, 14.5, -1.5], "size": [3, 3, 2], "uv": [78, 14]}
-					]
-				},
-				{
-					"name": "hair_front_right",
-					"parent": "hair_front",
-					"pivot": [0.5, 28, -2.5],
-					"rotation": [0, -10, 7.5],
-					"cubes": [
-						{"origin": [-6.5, 23.5, -2.5], "size": [7, 6, 4], "inflate": 0.02, "uv": [22, 40]}
-					]
-				},
-				{
-					"name": "hair_front_right2",
-					"parent": "hair_front_right",
-					"pivot": [-6, 23.5, -0.5],
-					"rotation": [0, 0, -15],
-					"cubes": [
-						{"origin": [-6, 15.5, -2], "size": [2, 9, 3], "uv": [58, 56]}
-					]
-				},
-				{
-					"name": "hair_front_right_tip",
-					"parent": "hair_front_right2",
-					"pivot": [-5, 16.5, -0.5],
-					"cubes": [
-						{"origin": [-7.5, 14.5, -1.5], "size": [3, 3, 2], "uv": [78, 19]}
-					]
-				},
-				{
-					"name": "ear_left",
-					"parent": "head_angle",
-					"pivot": [5, 23.5, 0.75],
-					"cubes": [
-						{"origin": [4, 20.5, 0.75], "size": [8, 6, 0], "uv": [46, 30]}
-					]
-				},
-				{
-					"name": "ear_right",
-					"parent": "head_angle",
-					"pivot": [-5, 23.5, 0.75],
-					"cubes": [
-						{"origin": [-12, 20.5, 0.75], "size": [8, 6, 0], "uv": [52, 18]}
-					]
-				},
-				{
-					"name": "nose",
-					"parent": "head_angle",
-					"pivot": [1, 20.75, 0],
-					"cubes": [
-						{"origin": [-1, 21.5, -4.02], "size": [2, 1, 0], "uv": [74, 7]}
-					]
-				},
-				{
-					"name": "expressions",
-					"parent": "head_angle",
-					"pivot": [0, 20.25, -4.02]
-				},
-				{
-					"name": "mouths",
-					"parent": "expressions",
-					"pivot": [0, 20.25, -4.02]
-				},
-				{
-					"name": "mouth",
-					"parent": "mouths",
-					"pivot": [0, 20.25, -4.02],
-					"cubes": [
-						{"origin": [-3, 19.5, -4.02], "size": [6, 1, 0], "uv": [40, 18]},
-						{"origin": [-4, 20, -4.02], "size": [8, 1, 0], "uv": [74, 0]}
-					]
-				},
-				{
-					"name": "mouth_open_happy",
-					"parent": "mouths",
-					"pivot": [0, 20, -3.92],
-					"cubes": [
-						{"origin": [-4, 19, -3.92], "size": [8, 2, 0], "uv": [62, 8]}
-					]
-				},
-				{
-					"name": "mouth_open_tall",
-					"parent": "mouths",
-					"pivot": [0, 20, -3.92],
-					"cubes": [
-						{"origin": [-0.5, 19, -3.92], "size": [1, 2, 0], "uv": [62, 36]}
-					]
-				},
-				{
-					"name": "mouth_open_small",
-					"parent": "mouths",
-					"pivot": [0, 20, -3.92],
-					"cubes": [
-						{"origin": [-1, 19, -3.92], "size": [2, 2, 0], "uv": [50, 80]}
-					]
-				},
-				{
-					"name": "mouth_frown",
-					"parent": "mouths",
-					"pivot": [0, 20.25, -3.92],
-					"cubes": [
-						{"origin": [-1, 20, -3.92], "size": [2, 1, 0], "uv": [80, 55]},
-						{"origin": [-3, 19.5, -3.92], "size": [6, 1, 0], "uv": [76, 43]}
-					]
-				},
-				{
-					"name": "mouth_straight",
-					"parent": "mouths",
-					"pivot": [0, 20.25, -3.92],
-					"cubes": [
-						{"origin": [-4, 19.75, -3.92], "size": [8, 1, 0], "uv": [74, 6]}
-					]
-				},
-				{
-					"name": "mouth_open_smile",
-					"parent": "mouths",
-					"pivot": [0, 20, -3.92],
-					"cubes": [
-						{"origin": [-2, 19, -3.92], "size": [4, 2, 0], "uv": [60, 16]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "expressions",
-					"pivot": [0, 24, -4.02]
-				},
-				{
-					"name": "eyes_left",
-					"parent": "eyes",
-					"pivot": [3, 24, -4.02]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes_left",
-					"pivot": [3, 24, -4.02],
-					"cubes": [
-						{"origin": [2, 22, -4.02], "size": [2, 4, 0], "uv": [44, 61]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [3, 23.91667, -4.04],
-					"cubes": [
-						{"origin": [3.5, 23.25, -4.04], "size": [1, 1, 0], "uv": [62, 39]},
-						{"origin": [1.5, 23.25, -4.04], "size": [1, 1, 0], "uv": [68, 67]},
-						{"origin": [2.5, 23.75, -4.04], "size": [1, 1, 0], "uv": [62, 38]}
-					]
-				},
-				{
-					"name": "pupil_left_down",
-					"parent": "eye_left",
-					"pivot": [3, 23.91667, -3.94],
-					"cubes": [
-						{"origin": [3.5, 23.75, -3.94], "size": [1, 1, 0], "uv": [68, 76]},
-						{"origin": [1.5, 23.75, -3.94], "size": [1, 1, 0], "uv": [12, 77]},
-						{"origin": [2.5, 23.25, -3.94], "size": [1, 1, 0], "uv": [62, 80]}
-					]
-				},
-				{
-					"name": "pupil_left_sad",
-					"parent": "eye_left",
-					"pivot": [3, 24, -3.94],
-					"cubes": [
-						{"origin": [2, 23.75, -3.94], "size": [1, 1, 0], "uv": [12, 74]},
-						{"origin": [3, 23.25, -3.94], "size": [1, 1, 0], "uv": [68, 73]}
-					]
-				},
-				{
-					"name": "pupil_left_angry",
-					"parent": "eye_left",
-					"pivot": [3, 24, -3.94],
-					"cubes": [
-						{"origin": [2, 23.25, -3.94], "size": [1, 1, 0], "uv": [68, 74]},
-						{"origin": [3, 23.75, -3.94], "size": [1, 1, 0], "uv": [12, 75]}
-					]
-				},
-				{
-					"name": "pupil_left_blink",
-					"parent": "eye_left",
-					"pivot": [3, 24, -4.04],
-					"cubes": [
-						{"origin": [2, 23.5, -3.94], "size": [2, 1, 0], "uv": [54, 80]}
-					]
-				},
-				{
-					"name": "eyebrow_left_straight",
-					"parent": "eye_left",
-					"pivot": [3, 25.5, -3.92],
-					"cubes": [
-						{"origin": [1.5, 25, -3.94], "size": [3, 1, 0], "uv": [78, 77]}
-					]
-				},
-				{
-					"name": "eyebrow_left_sad",
-					"parent": "eye_left",
-					"pivot": [3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [2.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [80, 58]},
-						{"origin": [1.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [42, 81]}
-					]
-				},
-				{
-					"name": "eyebrow_left_angry",
-					"parent": "eye_left",
-					"pivot": [3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [1.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [80, 60]},
-						{"origin": [3.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [46, 81]}
-					]
-				},
-				{
-					"name": "eyes_right",
-					"parent": "eyes",
-					"pivot": [-3, 24, -4.02]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes_right",
-					"pivot": [-3, 24, -4.02],
-					"cubes": [
-						{"origin": [-4, 22, -4.02], "size": [2, 4, 0], "uv": [22, 78]}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-3, 23.91667, -4.04],
-					"cubes": [
-						{"origin": [-4.5, 23.25, -4.04], "size": [1, 1, 0], "uv": [68, 65]},
-						{"origin": [-2.5, 23.25, -4.04], "size": [1, 1, 0], "uv": [12, 73]},
-						{"origin": [-3.5, 23.75, -4.04], "size": [1, 1, 0], "uv": [68, 66]}
-					]
-				},
-				{
-					"name": "pupil_right_angry",
-					"parent": "eye_right",
-					"pivot": [-3, 24, -3.94],
-					"cubes": [
-						{"origin": [-3, 23.25, -3.94], "size": [1, 1, 0], "uv": [68, 75]},
-						{"origin": [-4, 23.75, -3.94], "size": [1, 1, 0], "uv": [12, 76]}
-					]
-				},
-				{
-					"name": "pupil_right_sad",
-					"parent": "eye_right",
-					"pivot": [-3, 24, -3.94],
-					"cubes": [
-						{"origin": [-3, 23.75, -3.94], "size": [1, 1, 0], "uv": [76, 14]},
-						{"origin": [-4, 23.25, -3.94], "size": [1, 1, 0], "uv": [76, 15]}
-					]
-				},
-				{
-					"name": "pupil_right_down",
-					"parent": "eye_right",
-					"pivot": [-3, 23.91667, -3.94],
-					"cubes": [
-						{"origin": [-4.5, 23.75, -3.94], "size": [1, 1, 0], "uv": [64, 80]},
-						{"origin": [-2.5, 23.75, -3.94], "size": [1, 1, 0], "uv": [66, 80]},
-						{"origin": [-3.5, 23.25, -3.94], "size": [1, 1, 0], "uv": [38, 81]}
-					]
-				},
-				{
-					"name": "eyebrow_right_straight",
-					"parent": "eye_right",
-					"pivot": [-3, 25.5, -3.92],
-					"cubes": [
-						{"origin": [-4.5, 25, -3.94], "size": [3, 1, 0], "uv": [78, 78]}
-					]
-				},
-				{
-					"name": "eyebrow_right_sad",
-					"parent": "eye_right",
-					"pivot": [-3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [-4.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [58, 80]},
-						{"origin": [-2.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [40, 81]}
-					]
-				},
-				{
-					"name": "eyebrow_right_angry",
-					"parent": "eye_right",
-					"pivot": [-3, 25.75, -3.92],
-					"cubes": [
-						{"origin": [-3.5, 25.25, -3.94], "size": [2, 1, 0], "uv": [80, 59]},
-						{"origin": [-4.5, 25.75, -3.94], "size": [1, 1, 0], "uv": [44, 81]}
-					]
-				},
-				{
-					"name": "pupil_right_blink",
-					"parent": "eye_right",
-					"pivot": [-3, 24, -3.94],
-					"cubes": [
-						{"origin": [-4, 23.5, -3.94], "size": [2, 1, 0], "uv": [80, 54]}
-					]
-				},
-				{
-					"name": "blush",
-					"parent": "expressions",
-					"pivot": [0, 21.75, -3.94]
-				},
-				{
-					"name": "blush_left",
-					"parent": "blush",
-					"pivot": [4, 21.75, -3.94],
-					"cubes": [
-						{"origin": [3, 21.25, -3.94], "size": [2, 1, 0], "uv": [80, 56]}
-					]
-				},
-				{
-					"name": "blush_right",
-					"parent": "blush",
-					"pivot": [-4, 21.75, -3.94],
-					"cubes": [
-						{"origin": [-5, 21.25, -3.94], "size": [2, 1, 0], "uv": [80, 57]}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0750_mudsdale/mudsdale.geo.json

@@ -26,7 +26,10 @@
 					"pivot": [0, 24.5, -1],
 					"cubes": [
 						{"origin": [-6, 18.5, -13.75], "size": [12, 12, 26], "uv": [52, 39]}
-					]
+					],
+					"locators": {
+						"seat_1": [0, 24, 0]
+					}
 				},
 				{
 					"name": "neck",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0935_charcadet/charcadet.geo.json

@@ -1,5 +1,5 @@
 {
-	"format_version": "1.12.0",
+	"format_version": "1.21.0",
 	"minecraft:geometry": [
 		{
 			"description": {
@@ -173,247 +173,247 @@
 				{
 					"name": "head",
 					"parent": "neck",
-					"pivot": [0, 12.5, -0.25],
+					"pivot": [0, 17.5, -0.25],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [-5, 12.37186, -4.23161], "size": [10, 10, 10], "uv": [0, 0]}
+						{"origin": [-5, 12.51903, -5.43578], "size": [10, 10, 10], "uv": [0, 0]}
 					]
 				},
 				{
 					"name": "eyes",
 					"parent": "head",
-					"pivot": [1, 12.12186, -1.23161]
+					"pivot": [1, 12.26903, -2.43578]
 				},
 				{
 					"name": "eye_left",
 					"parent": "eyes",
-					"pivot": [3.51, 15.62186, -3.74161],
+					"pivot": [3.51, 15.76903, -4.94578],
 					"cubes": [
-						{"origin": [2.01, 14.12186, -4.24161], "size": [3, 3, 1], "uv": [0, 0]}
+						{"origin": [2.01, 14.26903, -5.44578], "size": [3, 3, 1], "uv": [0, 0]}
 					]
 				},
 				{
 					"name": "eye_angry_left",
 					"parent": "eye_left",
-					"pivot": [3.41, 17.12186, -3.66161],
+					"pivot": [3.41, 17.26903, -4.86578],
 					"cubes": [
-						{"origin": [1.91, 15.62186, -4.16161], "size": [2, 2, 0], "inflate": 0.01, "uv": [60, 34]},
-						{"origin": [3.91, 16.37186, -4.16161], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 30]}
+						{"origin": [1.91, 15.76903, -5.36578], "size": [2, 2, 0], "inflate": 0.01, "uv": [60, 34]},
+						{"origin": [3.91, 16.51903, -5.36578], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 30]}
 					]
 				},
 				{
 					"name": "eye_sad_left",
 					"parent": "eye_left",
-					"pivot": [3.41, 16.87186, -3.66161],
+					"pivot": [3.41, 17.01903, -4.86578],
 					"cubes": [
-						{"origin": [3.91, 16.12186, -4.16161], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 38]}
+						{"origin": [3.91, 16.26903, -5.36578], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 38]}
 					]
 				},
 				{
 					"name": "eye_unamused_left",
 					"parent": "eye_left",
-					"pivot": [3.41, 17.12186, -3.66161],
+					"pivot": [3.41, 17.26903, -4.86578],
 					"cubes": [
-						{"origin": [1.91, 15.62186, -4.16161], "size": [3, 2, 1], "inflate": 0.01, "uv": [36, 38]}
+						{"origin": [1.91, 15.76903, -5.36578], "size": [3, 2, 1], "inflate": 0.01, "uv": [36, 38]}
 					]
 				},
 				{
 					"name": "pupil_left",
 					"parent": "eye_left",
-					"pivot": [3.76, 15.62186, -3.74161],
+					"pivot": [3.76, 15.76903, -4.94578],
 					"cubes": [
-						{"origin": [2.26, 14.12186, -4.25161], "size": [2, 3, 0], "uv": [0, 20]}
+						{"origin": [2.26, 14.26903, -5.45578], "size": [2, 3, 0], "uv": [0, 20]}
 					]
 				},
 				{
 					"name": "pupil_left2",
 					"parent": "pupil_left",
-					"pivot": [4.01, 16.12186, -3.74161],
+					"pivot": [4.01, 16.26903, -4.94578],
 					"cubes": [
-						{"origin": [2.51, 14.62186, -4.26161], "size": [1, 2, 0], "uv": [4, 20]}
+						{"origin": [2.51, 14.76903, -5.46578], "size": [1, 2, 0], "uv": [4, 20]}
 					]
 				},
 				{
 					"name": "eye_flame_left",
 					"parent": "eye_left",
-					"pivot": [3.76, 16.22186, -4.14161],
+					"pivot": [3.76, 16.36903, -5.34578],
 					"cubes": [
-						{"origin": [3.26, 16.22186, -5.39161], "size": [1, 0, 1], "pivot": [3.76, 16.22186, -4.89161], "rotation": [0, -45, 0], "uv": [-1, 8]}
+						{"origin": [3.26, 16.36903, -6.59578], "size": [1, 0, 1], "pivot": [3.76, 16.36903, -6.09578], "rotation": [0, -45, 0], "uv": [-1, 8]}
 					]
 				},
 				{
 					"name": "eye_flame_left2",
 					"parent": "eye_flame_left",
-					"pivot": [3.76, 16.22186, -5.59161],
+					"pivot": [3.76, 16.36903, -6.79578],
 					"cubes": [
-						{"origin": [3.26, 16.22186, -6.79161], "size": [1, 0, 1], "pivot": [3.76, 16.22186, -6.29161], "rotation": [0, -45, 0], "uv": [1, 8]}
+						{"origin": [3.26, 16.36903, -7.99578], "size": [1, 0, 1], "pivot": [3.76, 16.36903, -7.49578], "rotation": [0, -45, 0], "uv": [1, 8]}
 					]
 				},
 				{
 					"name": "eye_flame_left3",
 					"parent": "eye_flame_left2",
-					"pivot": [3.76, 16.22186, -6.09161],
+					"pivot": [3.76, 16.36903, -7.29578],
 					"cubes": [
-						{"origin": [3.26, 16.22186, -7.29161], "size": [1, 0, 1], "pivot": [3.76, 16.22186, -6.79161], "rotation": [0, -45, 0], "uv": [3, 8]}
+						{"origin": [3.26, 16.36903, -8.49578], "size": [1, 0, 1], "pivot": [3.76, 16.36903, -7.99578], "rotation": [0, -45, 0], "uv": [3, 8]}
 					]
 				},
 				{
 					"name": "eyelid_left",
 					"parent": "eye_left",
-					"pivot": [3.41, 15.62186, -3.66161],
+					"pivot": [3.41, 15.76903, -4.86578],
 					"cubes": [
-						{"origin": [1.91, 14.12186, -4.16161], "size": [3, 3, 1], "inflate": 0.01, "uv": [36, 30]}
+						{"origin": [1.91, 14.26903, -5.36578], "size": [3, 3, 1], "inflate": 0.01, "uv": [36, 30]}
 					]
 				},
 				{
 					"name": "eyelid_happy_left",
 					"parent": "eye_left",
-					"pivot": [3.41, 15.62186, -3.66161],
+					"pivot": [3.41, 15.76903, -4.86578],
 					"cubes": [
-						{"origin": [1.91, 14.12186, -4.16161], "size": [3, 3, 1], "inflate": 0.01, "uv": [36, 34]}
+						{"origin": [1.91, 14.26903, -5.36578], "size": [3, 3, 1], "inflate": 0.01, "uv": [36, 34]}
 					]
 				},
 				{
 					"name": "eyelid_recoil_left",
 					"parent": "eye_left",
-					"pivot": [3.41, 15.62186, -3.66161],
+					"pivot": [3.41, 15.76903, -4.86578],
 					"cubes": [
-						{"origin": [1.91, 14.12186, -4.16161], "size": [3, 3, 1], "inflate": 0.01, "uv": [52, 30]}
+						{"origin": [1.91, 14.26903, -5.36578], "size": [3, 3, 1], "inflate": 0.01, "uv": [52, 30]}
 					]
 				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",
-					"pivot": [-3.51, 15.62186, -3.74161],
+					"pivot": [-3.51, 15.76903, -4.94578],
 					"cubes": [
-						{"origin": [-5.01, 14.12186, -4.24161], "size": [3, 3, 1], "uv": [0, 4], "mirror": true}
+						{"origin": [-5.01, 14.26903, -5.44578], "size": [3, 3, 1], "uv": [0, 4], "mirror": true}
 					]
 				},
 				{
 					"name": "eye_angry_right",
 					"parent": "eye_right",
-					"pivot": [-3.41, 17.12186, -3.66161],
+					"pivot": [-3.41, 17.26903, -4.86578],
 					"cubes": [
-						{"origin": [-3.91, 15.62186, -4.16161], "size": [2, 2, 0], "inflate": 0.01, "uv": [60, 36], "mirror": true},
-						{"origin": [-4.91, 16.37186, -4.16161], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 32], "mirror": true}
+						{"origin": [-3.91, 15.76903, -5.36578], "size": [2, 2, 0], "inflate": 0.01, "uv": [60, 36], "mirror": true},
+						{"origin": [-4.91, 16.51903, -5.36578], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 32], "mirror": true}
 					]
 				},
 				{
 					"name": "eye_sad_right",
 					"parent": "eye_right",
-					"pivot": [-3.41, 16.87186, -3.66161],
+					"pivot": [-3.41, 17.01903, -4.86578],
 					"cubes": [
-						{"origin": [-4.91, 16.12186, -4.16161], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 40], "mirror": true}
+						{"origin": [-4.91, 16.26903, -5.36578], "size": [1, 1, 1], "inflate": 0.01, "uv": [60, 40], "mirror": true}
 					]
 				},
 				{
 					"name": "eye_unamused_right",
 					"parent": "eye_right",
-					"pivot": [-3.41, 17.12186, -3.66161],
+					"pivot": [-3.41, 17.26903, -4.86578],
 					"cubes": [
-						{"origin": [-4.91, 15.62186, -4.16161], "size": [3, 2, 1], "inflate": 0.01, "uv": [44, 38], "mirror": true}
+						{"origin": [-4.91, 15.76903, -5.36578], "size": [3, 2, 1], "inflate": 0.01, "uv": [44, 38], "mirror": true}
 					]
 				},
 				{
 					"name": "pupil_right",
 					"parent": "eye_right",
-					"pivot": [-3.76, 15.62186, -3.74161],
+					"pivot": [-3.76, 15.76903, -4.94578],
 					"cubes": [
-						{"origin": [-4.26, 14.12186, -4.25161], "size": [2, 3, 0], "uv": [0, 23], "mirror": true}
+						{"origin": [-4.26, 14.26903, -5.45578], "size": [2, 3, 0], "uv": [0, 23], "mirror": true}
 					]
 				},
 				{
 					"name": "pupil_right2",
 					"parent": "pupil_right",
-					"pivot": [-4.01, 16.12186, -3.74161],
+					"pivot": [-4.01, 16.26903, -4.94578],
 					"cubes": [
-						{"origin": [-3.51, 14.62186, -4.26161], "size": [1, 2, 0], "uv": [4, 22], "mirror": true}
+						{"origin": [-3.51, 14.76903, -5.46578], "size": [1, 2, 0], "uv": [4, 22], "mirror": true}
 					]
 				},
 				{
 					"name": "eye_flame_right",
 					"parent": "eye_right",
-					"pivot": [-3.76, 16.22186, -4.14161],
+					"pivot": [-3.76, 16.36903, -5.34578],
 					"cubes": [
-						{"origin": [-4.26, 16.22186, -5.39161], "size": [1, 0, 1], "pivot": [-3.76, 16.22186, -4.89161], "rotation": [0, 45, 0], "uv": [-1, 9], "mirror": true}
+						{"origin": [-4.26, 16.36903, -6.59578], "size": [1, 0, 1], "pivot": [-3.76, 16.36903, -6.09578], "rotation": [0, 45, 0], "uv": [-1, 9], "mirror": true}
 					]
 				},
 				{
 					"name": "eye_flame_right2",
 					"parent": "eye_flame_right",
-					"pivot": [-3.76, 16.22186, -5.59161],
+					"pivot": [-3.76, 16.36903, -6.79578],
 					"cubes": [
-						{"origin": [-4.26, 16.22186, -6.79161], "size": [1, 0, 1], "pivot": [-3.76, 16.22186, -6.29161], "rotation": [0, 45, 0], "uv": [1, 9], "mirror": true}
+						{"origin": [-4.26, 16.36903, -7.99578], "size": [1, 0, 1], "pivot": [-3.76, 16.36903, -7.49578], "rotation": [0, 45, 0], "uv": [1, 9], "mirror": true}
 					]
 				},
 				{
 					"name": "eye_flame_right3",
 					"parent": "eye_flame_right2",
-					"pivot": [-3.76, 16.22186, -6.09161],
+					"pivot": [-3.76, 16.36903, -7.29578],
 					"cubes": [
-						{"origin": [-4.26, 16.22186, -7.29161], "size": [1, 0, 1], "pivot": [-3.76, 16.22186, -6.79161], "rotation": [0, 45, 0], "uv": [3, 9], "mirror": true}
+						{"origin": [-4.26, 16.36903, -8.49578], "size": [1, 0, 1], "pivot": [-3.76, 16.36903, -7.99578], "rotation": [0, 45, 0], "uv": [3, 9], "mirror": true}
 					]
 				},
 				{
 					"name": "eyelid_right",
 					"parent": "eye_right",
-					"pivot": [-3.41, 15.62186, -3.66161],
+					"pivot": [-3.41, 15.76903, -4.86578],
 					"cubes": [
-						{"origin": [-4.91, 14.12186, -4.16161], "size": [3, 3, 1], "inflate": 0.01, "uv": [44, 30], "mirror": true}
+						{"origin": [-4.91, 14.26903, -5.36578], "size": [3, 3, 1], "inflate": 0.01, "uv": [44, 30], "mirror": true}
 					]
 				},
 				{
 					"name": "eyelid_happy_right",
 					"parent": "eye_right",
-					"pivot": [-3.41, 15.62186, -3.66161],
+					"pivot": [-3.41, 15.76903, -4.86578],
 					"cubes": [
-						{"origin": [-4.91, 14.12186, -4.16161], "size": [3, 3, 1], "inflate": 0.01, "uv": [44, 34], "mirror": true}
+						{"origin": [-4.91, 14.26903, -5.36578], "size": [3, 3, 1], "inflate": 0.01, "uv": [44, 34], "mirror": true}
 					]
 				},
 				{
 					"name": "eyelid_recoil_right",
 					"parent": "eye_right",
-					"pivot": [-3.41, 15.62186, -3.66161],
+					"pivot": [-3.41, 15.76903, -4.86578],
 					"cubes": [
-						{"origin": [-4.91, 14.12186, -4.16161], "size": [3, 3, 1], "inflate": 0.01, "uv": [52, 34], "mirror": true}
+						{"origin": [-4.91, 14.26903, -5.36578], "size": [3, 3, 1], "inflate": 0.01, "uv": [52, 34], "mirror": true}
 					]
 				},
 				{
 					"name": "helmet",
 					"parent": "head",
-					"pivot": [0, 15.87186, 2.01839],
+					"pivot": [0, 16.01903, 0.81422],
 					"rotation": [10, 0, 0],
 					"cubes": [
-						{"origin": [-5.5, 15.87186, -4.98161], "size": [11, 8, 7], "inflate": 0.005, "uv": [0, 21]},
-						{"origin": [-5.5, 17.87186, -4.98161], "size": [11, 0, 7], "uv": [35, 23]},
-						{"origin": [-1, 17.87186, -4.99161], "size": [2, 2, 0], "inflate": 0.005, "uv": [3, 26]}
+						{"origin": [-5.5, 16.01903, -6.18578], "size": [11, 8, 7], "inflate": 0.005, "uv": [0, 21]},
+						{"origin": [-5.5, 18.01903, -6.18578], "size": [11, 0, 7], "uv": [35, 23]},
+						{"origin": [-1, 18.01903, -6.19578], "size": [2, 2, 0], "inflate": 0.005, "uv": [3, 26]}
 					]
 				},
 				{
 					"name": "head_flame",
 					"parent": "head",
-					"pivot": [0, 23.11758, 3.33365],
+					"pivot": [0, 23.26475, 2.12948],
 					"rotation": [-7.5, 0, 0],
 					"cubes": [
-						{"origin": [0, 22.11758, 0.83365], "size": [0, 1, 6], "uv": [30, -4]},
-						{"origin": [-2, 22.91758, 0.83365], "size": [4, 3, 6], "pivot": [0, 24.41758, 3.83365], "rotation": [2.5, 0, 0], "uv": [0, 36]}
+						{"origin": [0, 22.26475, -0.37052], "size": [0, 1, 6], "uv": [30, -4]},
+						{"origin": [-2, 23.06475, -0.37052], "size": [4, 3, 6], "pivot": [0, 24.56475, 2.62948], "rotation": [2.5, 0, 0], "uv": [0, 36]}
 					]
 				},
 				{
 					"name": "head_flame2",
 					"parent": "head_flame",
-					"pivot": [0, 25.91758, 4.83365],
+					"pivot": [0, 26.06475, 3.62948],
 					"cubes": [
-						{"origin": [0, 25.91758, 0.83365], "size": [0, 1, 6], "uv": [30, -2]},
-						{"origin": [-1, 26.61758, 2.63365], "size": [2, 2, 4], "pivot": [0, 27.61758, 4.63365], "rotation": [-10, 0, 0], "uv": [14, 36]}
+						{"origin": [0, 26.06475, -0.37052], "size": [0, 1, 6], "uv": [30, -2]},
+						{"origin": [-1, 26.76475, 1.42948], "size": [2, 2, 4], "pivot": [0, 27.76475, 3.42948], "rotation": [-10, 0, 0], "uv": [14, 36]}
 					]
 				},
 				{
 					"name": "head_flame3",
 					"parent": "head_flame2",
-					"pivot": [0, 28.41758, 5.83365],
+					"pivot": [0, 28.56475, 4.62948],
 					"cubes": [
-						{"origin": [0, 28.41758, 2.83365], "size": [0, 2, 4], "uv": [33, 2]}
+						{"origin": [0, 28.56475, 1.62948], "size": [0, 2, 4], "uv": [33, 2]}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0511_pansage/pansage.json

@@ -1,27 +0,0 @@
-{
-  "portraitScale": 1.41,
-  "portraitTranslation": [0.0, 0.16, 0],
-  "profileScale": 0.89,
-  "profileTranslation": [-0.07, 0.43, 0],
-  "poses": {
-    "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "animations": [
-		"q.look('head_ai')",
-        "q.bedrock('pansage', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('pansage', 'blink')"
-      ]
-    },
-    "walking": {
-      "poseTypes": ["WALK"],
-      "animations": [
-        "q.bedrock('pansage', 'ground_idle')",
-        "q.biped_walk(0.56, 0.5, 'leg_left', 'leg_right')",
-        "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')"
-      ],
-      "quirks": ["q.bedrock_quirk('pansage', 'blink')"]
-    }
-  }
- }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0512_simisage/simisage.json

@@ -1,27 +0,0 @@
-{
-  "portraitScale": 1.55,
-  "portraitTranslation": [0.01, 0.77, 0],
-  "profileScale": 0.59,
-  "profileTranslation": [0.05, 0.87, 0],
-  "poses": {
-    "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "animations": [
-		"q.look('head_ai')",
-        "q.bedrock('simisage', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('simisage', 'blink')"
-      ]
-    },
-    "walking": {
-      "poseTypes": ["WALK"],
-      "animations": [
-        "q.bedrock('simisage', 'ground_idle')",
-        "q.biped_walk(0.56, 0.5, 'leg_left', 'leg_right')",
-        "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')"
-      ],
-      "quirks": ["q.bedrock_quirk('simisage', 'blink')"]
-    }
-  }
- }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0513_pansear/pansear.json

@@ -1,27 +0,0 @@
-{
-  "portraitScale": 1.41,
-  "portraitTranslation": [-0.07, 0.13, 0],
-  "profileScale": 0.89,
-  "profileTranslation": [-0.07, 0.43, 0],
-  "poses": {
-    "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "animations": [
-		    "q.look('head_ai')",
-        "q.bedrock('pansear', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('pansear', 'blink')"
-      ]
-    },
-    "walking": {
-      "poseTypes": ["WALK"],
-      "animations": [
-        "q.bedrock('pansear', 'ground_idle')",
-        "q.biped_walk(0.56, 0.5, 'leg_left', 'leg_right')",
-        "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')"
-      ],
-      "quirks": ["q.bedrock_quirk('pansear', 'blink')"]
-    }
-  }
- }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0514_simisear/simisear.json

@@ -1,27 +0,0 @@
-{
-  "portraitScale": 1.55,
-  "portraitTranslation": [-0.05, 0.8, 0],
-  "profileScale": 0.64,
-  "profileTranslation": [0.05, 0.8, 0],
-  "poses": {
-    "standing": {
-      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "animations": [
-		    "q.look('head_ai')",
-        "q.bedrock('simisear', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('simisear', 'blink')"
-      ]
-    },
-    "walking": {
-      "poseTypes": ["WALK"],
-      "animations": [
-        "q.bedrock('simisear', 'ground_idle')",
-        "q.biped_walk(0.56, 0.5, 'leg_left', 'leg_right')",
-        "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')"
-      ],
-      "quirks": ["q.bedrock_quirk('simisear', 'blink')"]
-    }
-  }
- }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0515_panpour/panpour.json

@@ -1,39 +0,0 @@
-{
-  "portraitScale": 1.41,
-  "portraitTranslation": [0.0, 0.16, 0],
-  "profileScale": 0.89,
-  "profileTranslation": [-0.07, 0.43, 0],
-  "rootBone": "panpour",
-  "poses": {
-    "standing": {
-      "poseTypes": [
-        "STAND",
-        "NONE",
-        "PORTRAIT",
-        "PROFILE"
-      ],
-      "isBattle": false,
-      "animations": [
-        "q.look('head_ai')",
-        "q.bedrock('panpour', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('panpour', 'blink')"
-      ]
-    },
-    "walking": {
-      "poseTypes": [
-        "WALK"
-      ],
-      "animations": [
-        "q.look('head_ai')",
-        "q.biped_walk(0.5, 0.5, 'leg_left', 'leg_right')",
-         "q.bimanual_swing(0.5, 0.5, 'arm_left', 'arm_right')",
-        "q.bedrock('panpour', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('panpour', 'blink')"
-      ]
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0516_simipour/simipour.json

@@ -1,39 +0,0 @@
-{
-  "portraitScale": 1.55,
-  "portraitTranslation": [0.01, 0.77, 0],
-  "profileScale": 0.59,
-  "profileTranslation": [0.05, 0.87, 0],
-  "rootBone": "simipour",
-  "poses": {
-    "standing": {
-      "poseTypes": [
-        "STAND",
-        "NONE",
-        "PORTRAIT",
-        "PROFILE"
-      ],
-      "isBattle": false,
-      "animations": [
-        "q.look('head')",
-        "q.bedrock('simipour', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('simipour', 'blink')"
-      ]
-    },
-    "walking": {
-      "poseTypes": [
-        "WALK"
-      ],
-      "animations": [
-        "q.look('head')",
-        "q.biped_walk(0.5, 0.5, 'leg_left', 'leg_right')",
-         "q.bimanual_swing(0.5, 0.5, 'arm_left', 'arm_right')",
-        "q.bedrock('simipour', 'ground_idle')"
-      ],
-      "quirks": [
-        "q.bedrock_quirk('simipour', 'blink')"
-      ]
-    }
-  }
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0511_pansage/0_pansage_base.json

@@ -1,16 +0,0 @@
-{
-    "species": "cobblemon:pansage",
-    "order": 0,
-    "variations": [
-      {
-        "aspects": [],
-        "poser": "cobblemon:pansage",
-        "model": "cobblemon:pansage.geo",
-        "texture": "cobblemon:textures/pokemon/0511_pansage/pansage.png"
-        },
-      {
-        "aspects": ["shiny"],
-        "texture": "cobblemon:textures/pokemon/0511_pansage/pansage_shiny.png"  
-      }
-    ]
-  }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0512_simisage/0_simisage_base.json

@@ -1,16 +0,0 @@
-{
-    "species": "cobblemon:simisage",
-    "order": 0,
-    "variations": [
-      {
-        "aspects": [],
-        "poser": "cobblemon:simisage",
-        "model": "cobblemon:simisage.geo",
-        "texture": "cobblemon:textures/pokemon/0512_simisage/simisage.png"
-        },
-      {
-        "aspects": ["shiny"],
-        "texture": "cobblemon:textures/pokemon/0512_simisage/simisage_shiny.png"  
-      }
-    ]
-  }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0513_pansear/0_pansear_base.json

@@ -1,17 +0,0 @@
-{
-  "species": "cobblemon:pansear",
-  "order": 0,
-  "variations": [
-    {
-      "aspects": [],
-      "poser": "cobblemon:pansear",
-      "model": "cobblemon:pansear.geo",
-      "texture": "cobblemon:textures/pokemon/0513_pansear/pansear.png",
-      "layers": []
-    },
-    {
-      "aspects": ["shiny"],
-      "texture": "cobblemon:textures/pokemon/0513_pansear/pansear_shiny.png"
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0514_simisear/0_simisear_base.json

@@ -1,17 +0,0 @@
-{
-  "species": "cobblemon:simisear",
-  "order": 0,
-  "variations": [
-    {
-      "aspects": [],
-      "poser": "cobblemon:simisear",
-      "model": "cobblemon:simisear.geo",
-      "texture": "cobblemon:textures/pokemon/0514_simisear/simisear.png",
-      "layers": []
-    },
-    {
-      "aspects": ["shiny"],
-      "texture": "cobblemon:textures/pokemon/0514_simisear/simisear_shiny.png"
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0515_panpour/0_panpour_base.json

@@ -1,17 +0,0 @@
-{
-  "species": "cobblemon:panpour",
-  "order": 0,
-  "variations": [
-    {
-      "aspects": [],
-      "poser": "cobblemon:panpour",
-      "model": "cobblemon:panpour.geo",
-      "texture": "cobblemon:textures/pokemon/0515_panpour/panpour.png",
-      "layers": []
-    },
-    {
-      "aspects": ["shiny"],
-      "texture": "cobblemon:textures/pokemon/0515_panpour/panpour_shiny.png"
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0516_simipour/0_simipour_base.json

@@ -1,17 +0,0 @@
-{
-  "species": "cobblemon:simipour",
-  "order": 0,
-  "variations": [
-    {
-      "aspects": [],
-      "poser": "cobblemon:simipour",
-      "model": "cobblemon:simipour.geo",
-      "texture": "cobblemon:textures/pokemon/0516_simipour/simipour.png",
-      "layers": []
-    },
-    {
-      "aspects": ["shiny"],
-      "texture": "cobblemon:textures/pokemon/0516_simipour/simipour_shiny.png"
-    }
-  ]
-}

common/src/main/resources/assets/cobblemon/cobblemon/bedrock/pokemon/animations/0453_croagunk/croagunk.animation.json

@@ -1,186 +0,0 @@
-{
-	"format_version": "1.8.0",
-	"animations": {
-		"animation.croagunk.ground_idle": {
-			"loop": true,
-			"bones": {
-				"torso": {
-					"rotation": [15, 0, 0]
-				},
-				"torso2": {
-					"rotation": [12.5, 0, 0]
-				},
-				"arm_left": {
-					"rotation": [34.02303, 37.01211, 53.05604]
-				},
-				"arm_left2": {
-					"rotation": [19.19106, 25.34074, -3.61526]
-				},
-				"hand_left": {
-					"rotation": [6.36341, -4.57838, 19.09316]
-				},
-				"finger_front_left1": {
-					"rotation": [1.63219, 4.82123, 12.60443]
-				},
-				"finger_front_left2": {
-					"rotation": [0, 0, 27.5]
-				},
-				"finger_back_left1": {
-					"rotation": [-2.61298, -7.15594, 15.22074]
-				},
-				"finger_back_left2": {
-					"rotation": [0, 0, 27.5]
-				},
-				"finger_middle_left1": {
-					"rotation": [0, 0, 10]
-				},
-				"finger_middle_left2": {
-					"rotation": [0, 0, 27.5]
-				},
-				"head": {
-					"rotation": [-27.5, 0, 0]
-				},
-				"leg_left1": {
-					"rotation": [40, -30, 0]
-				},
-				"foot_left": {
-					"rotation": [-30, 0, 0],
-					"position": [0, 0.1, 0]
-				},
-				"toes_left": {
-					"rotation": [-10, 0, 0]
-				},
-				"arm_right": {
-					"rotation": [34.02303, -37.01211, -53.05604]
-				},
-				"arm_right2": {
-					"rotation": [19.19106, -25.34074, 3.61526]
-				},
-				"hand_right": {
-					"rotation": [6.36341, 4.57838, -19.09316]
-				},
-				"finger_front_right1": {
-					"rotation": [1.63219, -4.82123, -12.60443]
-				},
-				"finger_front_right2": {
-					"rotation": [0, 0, -27.5]
-				},
-				"finger_back_right1": {
-					"rotation": [-2.61298, 7.15594, -15.22074]
-				},
-				"finger_back_right2": {
-					"rotation": [0, 0, -27.5]
-				},
-				"finger_middle_right1": {
-					"rotation": [0, 0, -10]
-				},
-				"finger_middle_right2": {
-					"rotation": [0, 0, -27.5]
-				},
-				"leg_right1": {
-					"rotation": [40, 30, 0]
-				},
-				"foot_right": {
-					"rotation": [-30, 0, 0],
-					"position": [0, 0.1, 0]
-				},
-				"toes_right": {
-					"rotation": [-10, 0, 0]
-				}
-			}
-		},
-		"animation.croagunk.blink": {
-			"animation_length": 0.1667,
-			"bones": {
-				"eyelid_left": {
-					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.12": [0.1, 0, -0.1],
-						"0.16": [0, 0, 0]
-					}
-				},
-				"eyelid_right": {
-					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.12": [-0.1, 0, -0.1],
-						"0.16": [0, 0, 0]
-					}
-				}
-			}
-		},
-		"animation.croagunk.cry": {
-			"animation_length": 1,
-			"bones": {
-				"mouth_closed_teeth": {
-					"position": {
-						"0.0417": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, 0.1]},
-						"0.9167": {"pre": [0, 0, 0.1], "post": [0, 0, 0.1]},
-						"0.9583": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0417": [0, 0, 0],
-						"0.0833": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"0.9167": {"pre": [0, 0, -0.1], "post": [0, 0, -0.1]},
-						"0.9583": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				}
-			},
-			"sound_effects": {
-				"0.0417": {
-					"effect": "pokemon.croagunk.cry"
-				},
-				"0.25": {
-					"effect": "pokemon.smeargle.cry"
-				}
-			}
-		},
-		"animation.croagunk.cheek_inflate": {
-			"animation_length": 1,
-			"bones": {
-				"cheek_inflated_left": {
-					"position": {
-						"0.0": [3, 0, 0],
-						"1.0": [3, 0, 0]
-					},
-					"scale": {
-						"0.0": {
-							"post": [0, 0.8, 0.8],
-							"lerp_mode": "catmullrom"
-						},
-						"0.16": {
-							"post": [0.525, 0.95, 0.95],
-							"lerp_mode": "catmullrom"
-						},
-						"0.32": {
-							"post": [0.9, 0.9772, 0.9772],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				},
-				"cheek_inflated_right": {
-					"position": {
-						"0.0": [-3, 0, 0],
-						"1.0": [-3, 0, 0]
-					},
-					"scale": {
-						"0.0": {
-							"post": [0, 0.8, 0.8],
-							"lerp_mode": "catmullrom"
-						},
-						"0.16": {
-							"post": [0.525, 0.95, 0.95],
-							"lerp_mode": "catmullrom"
-						},
-						"0.32": {
-							"post": [0.9, 0.9772, 0.9772],
-							"lerp_mode": "catmullrom"
-						}
-					}
-				}
-			}
-		}
-	}
-}

common/src/main/resources/assets/cobblemon/cobblemon/bedrock/pokemon/models/0453_croagunk/croagunk_female.geo.json

@@ -1,451 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.croagunk_female",
-				"texture_width": 64,
-				"texture_height": 64,
-				"visible_bounds_width": 4,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
-			},
-			"bones": [
-				{
-					"name": "croagunk",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "croagunk",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "torso",
-					"parent": "body",
-					"pivot": [0, 7, 1.5],
-					"cubes": [
-						{"origin": [-5, 5, -3], "size": [10, 8, 9], "uv": [0, 47]},
-						{"origin": [-5, 11.5, -3], "size": [10, 1, 0], "inflate": 0.01, "uv": [29, 8]},
-						{"origin": [-5, 11.5, 6], "size": [10, 1, 0], "inflate": 0.01, "uv": [29, 8]},
-						{"origin": [5, 11.5, -3], "size": [0, 1, 9], "inflate": 0.01, "uv": [46, -9]},
-						{"origin": [-5, 11.5, -3], "size": [0, 1, 9], "inflate": 0.01, "uv": [46, -9]}
-					]
-				},
-				{
-					"name": "torso2",
-					"parent": "torso",
-					"pivot": [0, 13, 1.3],
-					"cubes": [
-						{"origin": [-4.5, 12, -2.7], "size": [9, 8, 8], "uv": [29, 34]}
-					]
-				},
-				{
-					"name": "arm_left",
-					"parent": "torso2",
-					"pivot": [4.5, 15.8, 2.1],
-					"cubes": [
-						{"origin": [4.5, 14.41299, 1.06175], "size": [5, 2, 2], "uv": [36, 25]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [9.5, 15.41299, 3.06175],
-					"cubes": [
-						{"origin": [9.5, 14.41299, 0.56175], "size": [4, 2, 3], "uv": [36, 29]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [13.5, 15.41299, 2.06175],
-					"cubes": [
-						{"origin": [13.5, 14.41299, 0.56175], "size": [2, 2, 3], "inflate": 0.01, "uv": [11, 33]}
-					]
-				},
-				{
-					"name": "finger_front_left1",
-					"parent": "hand_left",
-					"pivot": [15.3, 16.11299, 0.86175],
-					"rotation": [0, 2.5, 0],
-					"cubes": [
-						{"origin": [15.5, 14.91299, 0.46175], "size": [2, 1, 1], "inflate": 0.2, "uv": [55, 38]}
-					]
-				},
-				{
-					"name": "finger_front_left2",
-					"parent": "finger_front_left1",
-					"pivot": [17.7, 16.11299, 0.96175],
-					"cubes": [
-						{"origin": [17.9, 14.91299, 0.46175], "size": [1, 1, 1], "inflate": 0.19, "uv": [39, 50]}
-					]
-				},
-				{
-					"name": "finger_back_left1",
-					"parent": "hand_left",
-					"pivot": [15.3, 16.11299, 3.23825],
-					"rotation": [0, -2.5, 0],
-					"cubes": [
-						{"origin": [15.5, 14.91299, 2.63825], "size": [2, 1, 1], "inflate": 0.2, "uv": [0, 23]}
-					]
-				},
-				{
-					"name": "finger_back_left2",
-					"parent": "finger_back_left1",
-					"pivot": [17.7, 16.11299, 3.13825],
-					"cubes": [
-						{"origin": [17.9, 14.91299, 2.63825], "size": [1, 1, 1], "inflate": 0.19, "uv": [29, 50]}
-					]
-				},
-				{
-					"name": "finger_middle_left1",
-					"parent": "hand_left",
-					"pivot": [15.5, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [15.7, 14.91299, 1.56175], "size": [2, 1, 1], "inflate": 0.21, "uv": [38, 62]}
-					]
-				},
-				{
-					"name": "finger_middle_left2",
-					"parent": "finger_middle_left1",
-					"pivot": [17.9, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [18.1, 14.91299, 1.56175], "size": [1, 1, 1], "inflate": 0.2, "uv": [60, 58]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "torso2",
-					"pivot": [-4.5, 15.8, 2.1],
-					"cubes": [
-						{"origin": [-9.5, 14.41299, 1.06175], "size": [5, 2, 2], "uv": [50, 25], "mirror": true}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-9.5, 15.41299, 3.06175],
-					"cubes": [
-						{"origin": [-13.5, 14.41299, 0.56175], "size": [4, 2, 3], "uv": [50, 29], "mirror": true}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-13.5, 15.41299, 2.06175],
-					"cubes": [
-						{"origin": [-15.5, 14.41299, 0.56175], "size": [2, 2, 3], "inflate": 0.01, "uv": [27, 33], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_front_right1",
-					"parent": "hand_right",
-					"pivot": [-15.3, 16.11299, 0.86175],
-					"rotation": [0, -2.5, 0],
-					"cubes": [
-						{"origin": [-17.5, 14.91299, 0.46175], "size": [2, 1, 1], "inflate": 0.2, "uv": [55, 40], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_front_right2",
-					"parent": "finger_front_right1",
-					"pivot": [-17.7, 16.11299, 0.96175],
-					"cubes": [
-						{"origin": [-18.9, 14.91299, 0.46175], "size": [1, 1, 1], "inflate": 0.19, "uv": [39, 52], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_back_right1",
-					"parent": "hand_right",
-					"pivot": [-15.3, 16.11299, 3.23825],
-					"rotation": [0, 2.5, 0],
-					"cubes": [
-						{"origin": [-17.5, 14.91299, 2.63825], "size": [2, 1, 1], "inflate": 0.2, "uv": [47, 29], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_back_right2",
-					"parent": "finger_back_right1",
-					"pivot": [-17.7, 16.11299, 3.13825],
-					"cubes": [
-						{"origin": [-18.9, 14.91299, 2.63825], "size": [1, 1, 1], "inflate": 0.19, "uv": [29, 52], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_middle_right1",
-					"parent": "hand_right",
-					"pivot": [-15.5, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [-17.7, 14.91299, 1.56175], "size": [2, 1, 1], "inflate": 0.21, "uv": [44, 62], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_middle_right2",
-					"parent": "finger_middle_right1",
-					"pivot": [-17.9, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [-19.1, 14.91299, 1.56175], "size": [1, 1, 1], "inflate": 0.2, "uv": [60, 60], "mirror": true}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso2",
-					"pivot": [0, 20, 3.5],
-					"cubes": [
-						{"origin": [-5, 16, -3.5], "size": [10, 8, 8], "uv": [0, 17]},
-						{"origin": [5.01, 16.5, -1.5], "size": [0, 3, 3], "uv": [9, 39], "mirror": true},
-						{"origin": [-5.01, 16.5, -1.5], "size": [0, 3, 3], "uv": [9, 39], "mirror": true},
-						{"origin": [-1.5, 19.3, -3.5], "size": [3, 1, 0], "inflate": 0.01, "uv": [21, 44]},
-						{"origin": [2.01, 22, -3.51], "size": [3, 1, 1], "inflate": 0.04, "uv": [43, 52]},
-						{"origin": [5.01, 19, -3], "size": [0, 4, 1], "uv": [58, 8]},
-						{"origin": [-5.01, 22, -3.51], "size": [3, 1, 1], "inflate": 0.04, "uv": [43, 50], "mirror": true},
-						{"origin": [-5.01, 19, -3], "size": [0, 4, 1], "uv": [56, 8], "mirror": true}
-					]
-				},
-				{
-					"name": "cheek_inflated_left",
-					"parent": "head",
-					"pivot": [2, 18.1, 0],
-					"cubes": [
-						{"origin": [2, 16, -2], "size": [3, 4, 4], "inflate": -0.01, "uv": [50, 50]}
-					]
-				},
-				{
-					"name": "cheek_inflated_right",
-					"parent": "head",
-					"pivot": [-2, 18.1, 0],
-					"cubes": [
-						{"origin": [-5, 16, -2], "size": [3, 4, 4], "inflate": -0.01, "uv": [40, 54], "mirror": true}
-					]
-				},
-				{
-					"name": "mouth",
-					"parent": "head",
-					"pivot": [0, 17.8, -3.51],
-					"cubes": [
-						{"origin": [-5, 16.8, -3.51], "size": [10, 2, 2], "inflate": 0.01, "uv": [29, 4]}
-					]
-				},
-				{
-					"name": "mouth_closed_teeth",
-					"parent": "mouth",
-					"pivot": [0, 16.5, -3.5],
-					"cubes": [
-						{"origin": [-2, 16, -3.5], "size": [4, 1, 0], "inflate": 0.01, "uv": [0, 8]}
-					]
-				},
-				{
-					"name": "mouth_open",
-					"parent": "mouth",
-					"pivot": [0, 16.5, -3.4],
-					"cubes": [
-						{"origin": [-2, 16, -3.4], "size": [4, 1, 0], "inflate": 0.01, "uv": [21, 42]}
-					]
-				},
-				{
-					"name": "eye_left",
-					"parent": "head",
-					"pivot": [3.5, 20.9, -3],
-					"cubes": [
-						{"origin": [3.01, 19.5, -3.51], "size": [2, 3, 1], "inflate": 0.01, "uv": [0, 4]},
-						{"origin": [2.51, 19.5, -3.51], "size": [1, 3, 0], "inflate": 0.005, "uv": [6, 3]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [3.71, 21.5, -3.01],
-					"cubes": [
-						{"origin": [3.21, 20.5, -3.51], "size": [1, 2, 1], "inflate": 0.02, "uv": [4, 53]}
-					]
-				},
-				{
-					"name": "eyelid_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [52, 1]},
-						{"origin": [2.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [60, 14]}
-					]
-				},
-				{
-					"name": "eyelid_unamused_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 21.5, -3.41], "size": [2, 1, 1], "inflate": 0.03, "uv": [55, 36]},
-						{"origin": [2.41, 21.5, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [60, 13]}
-					]
-				},
-				{
-					"name": "eyelid_angry_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [2.41, 21, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [62, 13]}
-					]
-				},
-				{
-					"name": "eyelid_sad_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [3.91, 21, -3.41], "size": [1, 1, 1], "inflate": 0.03, "uv": [32, 40]}
-					]
-				},
-				{
-					"name": "eyelid_happy_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [58, 5]},
-						{"origin": [2.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [62, 14]}
-					]
-				},
-				{
-					"name": "eyelid_recoil_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [58, 1]},
-						{"origin": [2.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [62, 9]}
-					]
-				},
-				{
-					"name": "eye_right",
-					"parent": "head",
-					"pivot": [-3.5, 20.9, -3],
-					"cubes": [
-						{"origin": [-5.01, 19.5, -3.51], "size": [2, 3, 1], "inflate": 0.01, "uv": [0, 0], "mirror": true},
-						{"origin": [-3.51, 19.5, -3.51], "size": [1, 3, 0], "inflate": 0.005, "uv": [6, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-3.71, 21.5, -3.01],
-					"cubes": [
-						{"origin": [-4.21, 20.5, -3.51], "size": [1, 2, 1], "inflate": 0.02, "uv": [0, 53], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [29, 0], "mirror": true},
-						{"origin": [-3.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [56, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_unamused_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 21.5, -3.41], "size": [2, 1, 1], "inflate": 0.03, "uv": [55, 34], "mirror": true},
-						{"origin": [-3.41, 21.5, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [56, 13], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_angry_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [-3.41, 21, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [58, 13], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_sad_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 21, -3.41], "size": [1, 1, 1], "inflate": 0.03, "uv": [32, 38], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_happy_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [41, 0], "mirror": true},
-						{"origin": [-3.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [58, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_recoil_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [35, 0], "mirror": true},
-						{"origin": [-3.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [60, 9], "mirror": true}
-					]
-				},
-				{
-					"name": "leg_left1",
-					"parent": "body",
-					"pivot": [4.5, 7, 1.5],
-					"cubes": [
-						{"origin": [3.5, 5, -2.5], "size": [3, 4, 5], "uv": [16, 33]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left1",
-					"pivot": [5, 7, -2.5],
-					"cubes": [
-						{"origin": [4, 4, -3.5], "size": [2, 4, 2], "uv": [0, 47]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [5, 4, -2.5],
-					"cubes": [
-						{"origin": [3.5, 2, -4.5], "size": [3, 2, 3], "uv": [12, 42]}
-					]
-				},
-				{
-					"name": "toes_left",
-					"parent": "foot_left",
-					"pivot": [5, 2, -4.5],
-					"cubes": [
-						{"origin": [3.5, 2, -8.5], "size": [3, 2, 4], "inflate": 0.01, "uv": [29, 50]}
-					]
-				},
-				{
-					"name": "leg_right1",
-					"parent": "body",
-					"pivot": [-4.5, 7, 1.5],
-					"cubes": [
-						{"origin": [-6.5, 5, -2.5], "size": [3, 4, 5], "uv": [0, 33], "mirror": true}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right1",
-					"pivot": [-5, 7, -2.5],
-					"cubes": [
-						{"origin": [-6, 4, -3.5], "size": [2, 4, 2], "uv": [0, 17], "mirror": true}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-5, 4, -2.5],
-					"cubes": [
-						{"origin": [-6.5, 2, -4.5], "size": [3, 2, 3], "uv": [0, 42], "mirror": true}
-					]
-				},
-				{
-					"name": "toes_right",
-					"parent": "foot_right",
-					"pivot": [-5, 2, -4.5],
-					"cubes": [
-						{"origin": [-6.5, 2, -8.5], "size": [3, 2, 4], "inflate": 0.01, "uv": [50, 58], "mirror": true}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/cobblemon/bedrock/pokemon/models/0453_croagunk/croagunk_male.geo.json

@@ -1,451 +0,0 @@
-{
-	"format_version": "1.12.0",
-	"minecraft:geometry": [
-		{
-			"description": {
-				"identifier": "geometry.croagunk_male",
-				"texture_width": 64,
-				"texture_height": 64,
-				"visible_bounds_width": 3,
-				"visible_bounds_height": 2.5,
-				"visible_bounds_offset": [0, 0.75, 0]
-			},
-			"bones": [
-				{
-					"name": "croagunk",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "body",
-					"parent": "croagunk",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "torso",
-					"parent": "body",
-					"pivot": [0, 7, 1.5],
-					"cubes": [
-						{"origin": [-5, 5, -3], "size": [10, 8, 9], "uv": [0, 0]},
-						{"origin": [-5, 10.5, -3], "size": [10, 1, 0], "inflate": 0.01, "uv": [29, 8]},
-						{"origin": [-5, 10.5, 6], "size": [10, 1, 0], "inflate": 0.01, "uv": [29, 8]},
-						{"origin": [5, 10.5, -3], "size": [0, 1, 9], "inflate": 0.01, "uv": [46, -9]},
-						{"origin": [-5, 10.5, -3], "size": [0, 1, 9], "inflate": 0.01, "uv": [46, -9]}
-					]
-				},
-				{
-					"name": "torso2",
-					"parent": "torso",
-					"pivot": [0, 13, 1.3],
-					"cubes": [
-						{"origin": [-4.5, 12, -2.7], "size": [9, 8, 8], "uv": [30, 9]}
-					]
-				},
-				{
-					"name": "arm_left",
-					"parent": "torso2",
-					"pivot": [4.5, 15.8, 2.1],
-					"cubes": [
-						{"origin": [4.5, 14.41299, 1.06175], "size": [5, 2, 2], "uv": [36, 25]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [9.5, 15.41299, 3.06175],
-					"cubes": [
-						{"origin": [9.5, 14.41299, 0.56175], "size": [4, 2, 3], "uv": [36, 29]}
-					]
-				},
-				{
-					"name": "hand_left",
-					"parent": "arm_left2",
-					"pivot": [13.5, 15.41299, 2.06175],
-					"cubes": [
-						{"origin": [13.5, 14.41299, 0.56175], "size": [2, 2, 3], "inflate": 0.01, "uv": [11, 33]}
-					]
-				},
-				{
-					"name": "finger_front_left1",
-					"parent": "hand_left",
-					"pivot": [15.3, 16.11299, 0.86175],
-					"rotation": [0, 2.5, 0],
-					"cubes": [
-						{"origin": [15.5, 14.91299, 0.46175], "size": [2, 1, 1], "inflate": 0.2, "uv": [55, 38]}
-					]
-				},
-				{
-					"name": "finger_front_left2",
-					"parent": "finger_front_left1",
-					"pivot": [17.7, 16.11299, 0.96175],
-					"cubes": [
-						{"origin": [17.9, 14.91299, 0.46175], "size": [1, 1, 1], "inflate": 0.19, "uv": [39, 50]}
-					]
-				},
-				{
-					"name": "finger_back_left1",
-					"parent": "hand_left",
-					"pivot": [15.3, 16.11299, 3.23825],
-					"rotation": [0, -2.5, 0],
-					"cubes": [
-						{"origin": [15.5, 14.91299, 2.63825], "size": [2, 1, 1], "inflate": 0.2, "uv": [0, 23]}
-					]
-				},
-				{
-					"name": "finger_back_left2",
-					"parent": "finger_back_left1",
-					"pivot": [17.7, 16.11299, 3.13825],
-					"cubes": [
-						{"origin": [17.9, 14.91299, 2.63825], "size": [1, 1, 1], "inflate": 0.19, "uv": [29, 50]}
-					]
-				},
-				{
-					"name": "finger_middle_left1",
-					"parent": "hand_left",
-					"pivot": [15.5, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [15.7, 14.91299, 1.56175], "size": [2, 1, 1], "inflate": 0.21, "uv": [38, 62]}
-					]
-				},
-				{
-					"name": "finger_middle_left2",
-					"parent": "finger_middle_left1",
-					"pivot": [17.9, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [18.1, 14.91299, 1.56175], "size": [1, 1, 1], "inflate": 0.2, "uv": [60, 58]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "torso2",
-					"pivot": [-4.5, 15.8, 2.1],
-					"cubes": [
-						{"origin": [-9.5, 14.41299, 1.06175], "size": [5, 2, 2], "uv": [50, 25], "mirror": true}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-9.5, 15.41299, 3.06175],
-					"cubes": [
-						{"origin": [-13.5, 14.41299, 0.56175], "size": [4, 2, 3], "uv": [50, 29], "mirror": true}
-					]
-				},
-				{
-					"name": "hand_right",
-					"parent": "arm_right2",
-					"pivot": [-13.5, 15.41299, 2.06175],
-					"cubes": [
-						{"origin": [-15.5, 14.41299, 0.56175], "size": [2, 2, 3], "inflate": 0.01, "uv": [27, 33], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_front_right1",
-					"parent": "hand_right",
-					"pivot": [-15.3, 16.11299, 0.86175],
-					"rotation": [0, -2.5, 0],
-					"cubes": [
-						{"origin": [-17.5, 14.91299, 0.46175], "size": [2, 1, 1], "inflate": 0.2, "uv": [55, 40], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_front_right2",
-					"parent": "finger_front_right1",
-					"pivot": [-17.7, 16.11299, 0.96175],
-					"cubes": [
-						{"origin": [-18.9, 14.91299, 0.46175], "size": [1, 1, 1], "inflate": 0.19, "uv": [39, 52], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_back_right1",
-					"parent": "hand_right",
-					"pivot": [-15.3, 16.11299, 3.23825],
-					"rotation": [0, 2.5, 0],
-					"cubes": [
-						{"origin": [-17.5, 14.91299, 2.63825], "size": [2, 1, 1], "inflate": 0.2, "uv": [47, 29], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_back_right2",
-					"parent": "finger_back_right1",
-					"pivot": [-17.7, 16.11299, 3.13825],
-					"cubes": [
-						{"origin": [-18.9, 14.91299, 2.63825], "size": [1, 1, 1], "inflate": 0.19, "uv": [29, 52], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_middle_right1",
-					"parent": "hand_right",
-					"pivot": [-15.5, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [-17.7, 14.91299, 1.56175], "size": [2, 1, 1], "inflate": 0.21, "uv": [44, 62], "mirror": true}
-					]
-				},
-				{
-					"name": "finger_middle_right2",
-					"parent": "finger_middle_right1",
-					"pivot": [-17.9, 16.11299, 2.06175],
-					"cubes": [
-						{"origin": [-19.1, 14.91299, 1.56175], "size": [1, 1, 1], "inflate": 0.2, "uv": [60, 60], "mirror": true}
-					]
-				},
-				{
-					"name": "head",
-					"parent": "torso2",
-					"pivot": [0, 20, 3.5],
-					"cubes": [
-						{"origin": [-5, 16, -3.5], "size": [10, 8, 8], "uv": [0, 17]},
-						{"origin": [5.01, 16.5, -1.5], "size": [0, 3, 3], "uv": [9, 39], "mirror": true},
-						{"origin": [-5.01, 16.5, -1.5], "size": [0, 3, 3], "uv": [9, 39], "mirror": true},
-						{"origin": [-1.5, 19.3, -3.5], "size": [3, 1, 0], "inflate": 0.01, "uv": [21, 44]},
-						{"origin": [2.01, 22, -3.51], "size": [3, 1, 1], "inflate": 0.04, "uv": [43, 52]},
-						{"origin": [5.01, 19, -3], "size": [0, 4, 1], "uv": [58, 8]},
-						{"origin": [-5.01, 22, -3.51], "size": [3, 1, 1], "inflate": 0.04, "uv": [43, 50], "mirror": true},
-						{"origin": [-5.01, 19, -3], "size": [0, 4, 1], "uv": [56, 8], "mirror": true}
-					]
-				},
-				{
-					"name": "cheek_inflated_left",
-					"parent": "head",
-					"pivot": [2, 18.1, 0],
-					"cubes": [
-						{"origin": [2, 16, -2], "size": [3, 4, 4], "inflate": -0.01, "uv": [50, 50]}
-					]
-				},
-				{
-					"name": "cheek_inflated_right",
-					"parent": "head",
-					"pivot": [-2, 18.1, 0],
-					"cubes": [
-						{"origin": [-5, 16, -2], "size": [3, 4, 4], "inflate": -0.01, "uv": [40, 54], "mirror": true}
-					]
-				},
-				{
-					"name": "mouth",
-					"parent": "head",
-					"pivot": [0, 17.8, -3.51],
-					"cubes": [
-						{"origin": [-5, 16.8, -3.51], "size": [10, 2, 2], "inflate": 0.01, "uv": [29, 4]}
-					]
-				},
-				{
-					"name": "mouth_closed_teeth",
-					"parent": "mouth",
-					"pivot": [0, 16.5, -3.5],
-					"cubes": [
-						{"origin": [-2, 16, -3.5], "size": [4, 1, 0], "inflate": 0.01, "uv": [0, 8]}
-					]
-				},
-				{
-					"name": "mouth_open",
-					"parent": "mouth",
-					"pivot": [0, 16.5, -3.4],
-					"cubes": [
-						{"origin": [-2, 16, -3.4], "size": [4, 1, 0], "inflate": 0.01, "uv": [21, 42]}
-					]
-				},
-				{
-					"name": "eye_left",
-					"parent": "head",
-					"pivot": [3.5, 20.9, -3],
-					"cubes": [
-						{"origin": [3.01, 19.5, -3.51], "size": [2, 3, 1], "inflate": 0.01, "uv": [0, 4]},
-						{"origin": [2.51, 19.5, -3.51], "size": [1, 3, 0], "inflate": 0.005, "uv": [6, 3]}
-					]
-				},
-				{
-					"name": "pupil_left",
-					"parent": "eye_left",
-					"pivot": [3.71, 21.5, -3.01],
-					"cubes": [
-						{"origin": [3.21, 20.5, -3.51], "size": [1, 2, 1], "inflate": 0.02, "uv": [4, 53]}
-					]
-				},
-				{
-					"name": "eyelid_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [52, 1]},
-						{"origin": [2.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [60, 14]}
-					]
-				},
-				{
-					"name": "eyelid_unamused_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 21.5, -3.41], "size": [2, 1, 1], "inflate": 0.03, "uv": [55, 36]},
-						{"origin": [2.41, 21.5, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [60, 13]}
-					]
-				},
-				{
-					"name": "eyelid_angry_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [2.41, 21, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [62, 13]}
-					]
-				},
-				{
-					"name": "eyelid_sad_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [3.91, 21, -3.41], "size": [1, 1, 1], "inflate": 0.03, "uv": [32, 40]}
-					]
-				},
-				{
-					"name": "eyelid_happy_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [58, 5]},
-						{"origin": [2.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [62, 14]}
-					]
-				},
-				{
-					"name": "eyelid_recoil_left",
-					"parent": "eye_left",
-					"pivot": [3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [2.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [58, 1]},
-						{"origin": [2.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [62, 9]}
-					]
-				},
-				{
-					"name": "eye_right",
-					"parent": "head",
-					"pivot": [-3.5, 20.9, -3],
-					"cubes": [
-						{"origin": [-5.01, 19.5, -3.51], "size": [2, 3, 1], "inflate": 0.01, "uv": [0, 0], "mirror": true},
-						{"origin": [-3.51, 19.5, -3.51], "size": [1, 3, 0], "inflate": 0.005, "uv": [6, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-3.71, 21.5, -3.01],
-					"cubes": [
-						{"origin": [-4.21, 20.5, -3.51], "size": [1, 2, 1], "inflate": 0.02, "uv": [0, 53], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [29, 0], "mirror": true},
-						{"origin": [-3.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [56, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_unamused_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 21.5, -3.41], "size": [2, 1, 1], "inflate": 0.03, "uv": [55, 34], "mirror": true},
-						{"origin": [-3.41, 21.5, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [56, 13], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_angry_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [-3.41, 21, -3.41], "size": [1, 1, 0], "inflate": 0.025, "uv": [58, 13], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_sad_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.4, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 21, -3.41], "size": [1, 1, 1], "inflate": 0.03, "uv": [32, 38], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_happy_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [41, 0], "mirror": true},
-						{"origin": [-3.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [58, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_recoil_right",
-					"parent": "eye_right",
-					"pivot": [-3.4, 20.9, -2.9],
-					"cubes": [
-						{"origin": [-4.91, 19.5, -3.41], "size": [2, 3, 1], "inflate": 0.03, "uv": [35, 0], "mirror": true},
-						{"origin": [-3.41, 19.5, -3.41], "size": [1, 3, 0], "inflate": 0.025, "uv": [60, 9], "mirror": true}
-					]
-				},
-				{
-					"name": "leg_left1",
-					"parent": "body",
-					"pivot": [4.5, 7, 1.5],
-					"cubes": [
-						{"origin": [3.5, 5, -2.5], "size": [3, 4, 5], "uv": [16, 33]}
-					]
-				},
-				{
-					"name": "leg_left2",
-					"parent": "leg_left1",
-					"pivot": [5, 7, -2.5],
-					"cubes": [
-						{"origin": [4, 4, -3.5], "size": [2, 4, 2], "uv": [0, 47]}
-					]
-				},
-				{
-					"name": "foot_left",
-					"parent": "leg_left2",
-					"pivot": [5, 4, -2.5],
-					"cubes": [
-						{"origin": [3.5, 2, -4.5], "size": [3, 2, 3], "uv": [12, 42]}
-					]
-				},
-				{
-					"name": "toes_left",
-					"parent": "foot_left",
-					"pivot": [5, 2, -4.5],
-					"cubes": [
-						{"origin": [3.5, 2, -8.5], "size": [3, 2, 4], "inflate": 0.01, "uv": [29, 50]}
-					]
-				},
-				{
-					"name": "leg_right1",
-					"parent": "body",
-					"pivot": [-4.5, 7, 1.5],
-					"cubes": [
-						{"origin": [-6.5, 5, -2.5], "size": [3, 4, 5], "uv": [0, 33], "mirror": true}
-					]
-				},
-				{
-					"name": "leg_right2",
-					"parent": "leg_right1",
-					"pivot": [-5, 7, -2.5],
-					"cubes": [
-						{"origin": [-6, 4, -3.5], "size": [2, 4, 2], "uv": [0, 17], "mirror": true}
-					]
-				},
-				{
-					"name": "foot_right",
-					"parent": "leg_right2",
-					"pivot": [-5, 4, -2.5],
-					"cubes": [
-						{"origin": [-6.5, 2, -4.5], "size": [3, 2, 3], "uv": [0, 42], "mirror": true}
-					]
-				},
-				{
-					"name": "toes_right",
-					"parent": "foot_right",
-					"pivot": [-5, 2, -4.5],
-					"cubes": [
-						{"origin": [-6.5, 2, -8.5], "size": [3, 2, 4], "inflate": 0.01, "uv": [50, 58], "mirror": true}
-					]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/cobblemon/bedrock/pokemon/posers/0453_croagunk/croagunk.json

@@ -1,35 +0,0 @@
-{
-    "portraitScale": 1.63,
-    "portraitTranslation": [-0.17, 0.43, 0],
-    "profileScale": 0.62,
-    "profileTranslation": [-0.03, 0.83, 0],
-    "animations": {
-      "cry": "q.bedrock_stateful('croagunk', 'cry')"
-    },
-    "poses": {
-      "standing": {
-        "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE", "FLOAT"],
-        "isBattle": false,
-        "animations": [
-          "q.look('head', 1, 1, 70, -45, 0, 0)",
-          "q.bedrock('croagunk', 'ground_idle')"
-        ],
-        "quirks": [
-          "q.bedrock_quirk('croagunk', 'blink')"
-        ]
-      },
-      "walking": {
-        "poseTypes": ["WALK", "SWIM"],
-        "animations": [
-          "q.look('head' )",
-          "q.bedrock('croagunk', 'ground_idle')",
-          "q.biped_walk(0.45, 0.66, 'leg_left1', 'leg_right1')",
-          "q.bimanual_swing(0.45, 1, 'arm_left', 'arm_right')"
-        ],
-        "quirks": ["q.bedrock_quirk('croagunk', 'blink')"]
-      }
-    }
-   }
-   
-   
-   

common/src/main/resources/assets/cobblemon/cobblemon/bedrock/pokemon/resolvers/0453_croagunk/0_croagunk_base.json

@@ -1,18 +0,0 @@
-{
-    "species": "cobblemon:croagunk",
-    "order": 0,
-    "variations": [
-      {
-        "aspects": [],
-        "poser": "cobblemon:croagunk",
-        "model": "cobblemon:croagunk_male.geo",
-        "texture": "cobblemon:textures/pokemon/0453_croagunk/croagunk.png",
-        "layers": []
-      },
-      {
-        "aspects": ["shiny"],
-        "texture": "cobblemon:textures/pokemon/0453_croagunk/croagunk_shiny.png"
-      }
-    ]
-  }
-  

common/src/main/resources/assets/cobblemon/cobblemon/bedrock/pokemon/resolvers/0453_croagunk/1_croagunk_female.json

@@ -1,11 +0,0 @@
-{
-    "species": "cobblemon:croagunk",
-    "order": 1,
-    "variations": [
-      {
-        "aspects": ["female"],
-        "model": "cobblemon:croagunk_female.geo"
-      }
-    ]
-  }
-  

common/src/main/resources/data/cobblemon/species/generation1/clefairy.json

@@ -270,7 +270,7 @@
       "id": "clefairy_clefable",
       "variant": "item_interact",
       "result": "clefable",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:moon_stone"

common/src/main/resources/data/cobblemon/species/generation1/eevee.json

@@ -153,7 +153,7 @@
       "id": "eevee_jolteon",
       "variant": "item_interact",
       "result": "jolteon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "thundershock"
       ],
@@ -164,7 +164,7 @@
       "id": "eevee_vaporeon",
       "variant": "item_interact",
       "result": "vaporeon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "watergun"
       ],
@@ -175,7 +175,7 @@
       "id": "eevee_flareon",
       "variant": "item_interact",
       "result": "flareon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "ember"
       ],
@@ -186,7 +186,7 @@
       "id": "eevee_espeon",
       "variant": "level_up",
       "result": "espeon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "confusion"
       ],
@@ -205,7 +205,7 @@
       "id": "eevee_umbreon",
       "variant": "level_up",
       "result": "umbreon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "pursuit",
         "snarl"
@@ -245,7 +245,7 @@
       "id": "eevee_leafeon",
       "variant": "item_interact",
       "result": "leafeon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "razorleaf"
       ],
@@ -256,7 +256,7 @@
       "id": "eevee_glaceon",
       "variant": "item_interact",
       "result": "glaceon",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "icywind"
       ],

common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json

@@ -177,17 +177,23 @@
       "id": "exeggcute_exeggutor",
       "variant": "item_interact",
       "result": "exeggutor",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "stomp"
       ],
+      "requirements": [
+        {
+          "variant": "biome",
+          "biomeAnticondition": "#cobblemon:evolution/regional/exeggcute_alolabiome"
+        }
+      ],
       "requiredContext": "cobblemon:leaf_stone"
     },
     {
       "id": "exeggcute_exeggutoralola",
       "variant": "item_interact",
       "result": "exeggutor alolan",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "dragonhammer"
       ],
@@ -195,6 +201,10 @@
         {
           "variant": "biome",
           "biomeCondition": "#cobblemon:evolution/regional/exeggcute_alolabiome"
+        },
+        {
+          "variant": "biome",
+          "biomeAnticondition": "#cobblemon:evolution/regional/exeggcute_kantobiome"
         }
       ],
       "requiredContext": "cobblemon:leaf_stone"
@@ -225,11 +235,15 @@
           "id": "exeggcute_exeggutor",
           "variant": "item_interact",
           "result": "exeggutor",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "stomp"
           ],
           "requirements": [
+            {
+              "variant": "biome",
+              "biomeAnticondition": "#cobblemon:evolution/regional/exeggcute_alolabiome"
+            },
             {
               "variant": "biome",
               "biomeCondition": "#cobblemon:evolution/regional/exeggcute_kantobiome"
@@ -241,10 +255,16 @@
           "id": "exeggcute_exeggutoralola",
           "variant": "item_interact",
           "result": "exeggutor alolan",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "dragonhammer"
           ],
+          "requirements": [
+            {
+              "variant": "biome",
+              "biomeAnticondition": "#cobblemon:evolution/regional/exeggcute_kantobiome"
+            }
+          ],
           "requiredContext": "cobblemon:leaf_stone"
         }
       ]

common/src/main/resources/data/cobblemon/species/generation1/gloom.json

@@ -157,7 +157,7 @@
       "id": "gloom_vileplume",
       "variant": "item_interact",
       "result": "vileplume",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "petalblizzard"
       ],
@@ -168,7 +168,7 @@
       "id": "gloom_bellossom",
       "variant": "item_interact",
       "result": "bellossom",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "magicalleaf",
         "petalblizzard"

common/src/main/resources/data/cobblemon/species/generation1/growlithe.json

@@ -166,7 +166,7 @@
       "id": "growlithe_arcanine",
       "variant": "item_interact",
       "result": "arcanine",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "extremespeed"
       ],
@@ -297,7 +297,7 @@
           "id": "growlithe_arcaninehisui",
           "variant": "item_interact",
           "result": "arcanine hisuian",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "extremespeed"
           ],

common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json

@@ -268,7 +268,7 @@
       "id": "jigglypuff_wigglytuff",
       "variant": "item_interact",
       "result": "wigglytuff",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:moon_stone"

common/src/main/resources/data/cobblemon/species/generation1/magneton.json

@@ -188,7 +188,7 @@
       "id": "magneton_magnezone",
       "variant": "item_interact",
       "result": "magnezone",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:thunder_stone"

common/src/main/resources/data/cobblemon/species/generation1/nidorina.json

@@ -164,7 +164,7 @@
       "id": "nidorina_nidoqueen",
       "variant": "item_interact",
       "result": "nidoqueen",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "superpower"
       ],

common/src/main/resources/data/cobblemon/species/generation1/nidorino.json

@@ -168,7 +168,7 @@
       "id": "nidorino_nidoking",
       "variant": "item_interact",
       "result": "nidoking",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "megahorn"
       ],

common/src/main/resources/data/cobblemon/species/generation1/pikachu.json

@@ -213,7 +213,7 @@
       "id": "pikachu_raichu",
       "variant": "item_interact",
       "result": "raichu",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "thunderpunch"
       ],
@@ -229,7 +229,7 @@
       "id": "pikachu_raichualola",
       "variant": "item_interact",
       "result": "raichu alolan",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "psychic"
       ],
@@ -312,7 +312,7 @@
           "id": "pikachu_raichu",
           "variant": "item_interact",
           "result": "raichu",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "thunderpunch"
           ],
@@ -332,7 +332,7 @@
           "id": "pikachu_raichualola",
           "variant": "item_interact",
           "result": "raichu alolan",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "psychic"
           ],

common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json

@@ -181,7 +181,7 @@
       "id": "poliwhirl_poliwrath",
       "variant": "item_interact",
       "result": "poliwrath",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "submission",
         "dynamicpunch"

common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json

@@ -398,7 +398,7 @@
           "id": "sandshrew_sandslashalola",
           "variant": "item_interact",
           "result": "sandslash alolan",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "iciclespear"
           ],

common/src/main/resources/data/cobblemon/species/generation1/scyther.json

@@ -187,7 +187,7 @@
       "id": "scyther_kleavor",
       "variant": "item_interact",
       "result": "kleavor",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "stoneaxe"
       ],

common/src/main/resources/data/cobblemon/species/generation1/shellder.json

@@ -153,7 +153,7 @@
       "id": "shellder_cloyster",
       "variant": "item_interact",
       "result": "cloyster",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "iciclespear"
       ],

common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json

@@ -409,7 +409,7 @@
           "id": "slowpoke_slowbrogalar",
           "variant": "item_interact",
           "result": "slowbro galarian",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "shellsidearm"
           ],
@@ -420,7 +420,7 @@
           "id": "slowpoke_slowkinggalar",
           "variant": "item_interact",
           "result": "slowking galarian",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "eeriespell"
           ],

common/src/main/resources/data/cobblemon/species/generation1/staryu.json

@@ -153,7 +153,7 @@
       "id": "staryu_starmie",
       "variant": "item_interact",
       "result": "starmie",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:water_stone"

common/src/main/resources/data/cobblemon/species/generation1/voltorb.json

@@ -291,7 +291,7 @@
           "id": "voltorb_electrodehisui",
           "variant": "item_interact",
           "result": "electrode hisuian",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "chloroblast"
           ],

common/src/main/resources/data/cobblemon/species/generation1/vulpix.json

@@ -185,7 +185,7 @@
       "id": "vulpix_ninetales",
       "variant": "item_interact",
       "result": "ninetales",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:fire_stone"
@@ -339,7 +339,7 @@
           "id": "vulpix_ninetalesalola",
           "variant": "item_interact",
           "result": "ninetales alolan",
-          "consumeHeldItem": false,
+          "consumeHeldItem": true,
           "learnableMoves": [
             "dazzlinggleam"
           ],

common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json

@@ -170,7 +170,7 @@
       "id": "weepinbell_victreebel",
       "variant": "item_interact",
       "result": "victreebel",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "leaftornado",
         "leafstorm"

common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json

@@ -204,7 +204,7 @@
       "id": "misdreavus_mismagius",
       "variant": "item_interact",
       "result": "mismagius",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:dusk_stone"

common/src/main/resources/data/cobblemon/species/generation2/murkrow.json

@@ -204,7 +204,7 @@
       "id": "murkrow_honchkrow",
       "variant": "item_interact",
       "result": "honchkrow",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:dusk_stone"

common/src/main/resources/data/cobblemon/species/generation2/sunkern.json

@@ -151,7 +151,7 @@
       "id": "sunkern_sunflora",
       "variant": "item_interact",
       "result": "sunflora",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:sun_stone"

common/src/main/resources/data/cobblemon/species/generation2/togetic.json

@@ -232,7 +232,7 @@
       "id": "togetic_togekiss",
       "variant": "item_interact",
       "result": "togekiss",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "airslash"
       ],

common/src/main/resources/data/cobblemon/species/generation3/lombre.json

@@ -200,7 +200,7 @@
       "id": "lombre_ludicolo",
       "variant": "item_interact",
       "result": "ludicolo",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:water_stone"

common/src/main/resources/data/cobblemon/species/generation3/nosepass.json

@@ -199,7 +199,7 @@
       "id": "nosepass_probopass",
       "variant": "item_interact",
       "result": "probopass",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "triattack"
       ],

common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json

@@ -205,7 +205,7 @@
       "id": "nuzleaf_shiftry",
       "variant": "item_interact",
       "result": "shiftry",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "leaftornado",
         "leafblade"

common/src/main/resources/data/cobblemon/species/generation3/roselia.json

@@ -181,7 +181,7 @@
       "id": "roselia_roserade",
       "variant": "item_interact",
       "result": "roserade",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:shiny_stone"

common/src/main/resources/data/cobblemon/species/generation3/skitty.json

@@ -177,7 +177,7 @@
       "id": "skitty_delcatty",
       "variant": "item_interact",
       "result": "delcatty",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [],
       "requirements": [],
       "requiredContext": "cobblemon:moon_stone"

common/src/main/resources/data/cobblemon/species/generation4/budew.json

@@ -153,7 +153,7 @@
       "id": "budew_roselia",
       "variant": "level_up",
       "result": "roselia",
-      "consumeHeldItem": false,
+      "consumeHeldItem": true,
       "learnableMoves": [
         "poisonsting"
       ],