Closes #1715

Aprijuice feeding crash

Closes #1712

See merge request cable-mc/cobblemon!1887

CHANGELOG.md

@@ -293,6 +293,7 @@
 - Tauros - Paldea Blaze
 - Tauros - Paldea Combat
 - Dewgong
+- Exeggutor - Kanto
 
 ### Model updates for the following Pokémon
 - Cleffa
@@ -403,6 +404,9 @@
 - Revavroom
 - Nickit
 - Thievul
+- Litwick
+- Lampent
+- Chandelure
 
 ### Changes
 - Changed pokemon caught and seen count to update based on the current pokedex being looked
@@ -467,6 +471,7 @@
 - Updated `HatchEggEvent.Post` to include the Pokemon that hatched.
 - Roseli Berry Trees now naturally generate in their preferred biomes.
 - Refactored dynamic lights compat to be more future proof. The dynamic light support is only tested with LambDynamicLights, on NeoForged use that mod in combination with Sinytra Connector
+- Shulker Boxes and Traveler's Backpacks can no longer be held by Pokémon. Thanks Monocle ;) You could re-enable this with a datapack but you'd be crazy.
 
 ### Fixes
 - Fixed game crashing when removing national pokedex using datapacks

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

@@ -30,6 +30,6 @@ interface RidingBehaviourSettings: Encodable, Decodable {
 
     fun calculate(stat: RidingStat, boostAmount: Float): Float {
         val range = stats[stat] ?: return 0F
-        return range.first + boostAmount
+        return (range.first + boostAmount).coerceAtMost(range.endInclusive.toFloat())
     }
 }

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

@@ -110,7 +110,11 @@ class RidingController(
 
     private fun canTransitionToLand(): Boolean {
         if (entity.isInLiquid || entity.isUnderWater) return false
-        return entity.onGround()
+        if (entity.onGround()) return true
+
+        val y = 0.1
+        val nearGround = !entity.level().noCollision(entity, entity.boundingBox.move(0.0, -y, 0.0))
+        return nearGround
     }
 
     private fun canTransitionToLiquid(): Boolean {

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

@@ -25,6 +25,8 @@ import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.features.FriendshipFeatureRenderer
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.features.FullnessFeatureRenderer
 import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.pokemon.EVs
+import com.cobblemon.mod.common.pokemon.IVs
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
@@ -74,6 +76,7 @@ class StatWidget(
         private val statsBaseResource = cobblemonResource("textures/gui/summary/summary_stats_chart_base.png")
         private val statsChartResource = cobblemonResource("textures/gui/summary/summary_stats_chart.png")
         private val statsChartPentagonResource = cobblemonResource("textures/gui/summary/summary_stats_chart_pentagon.png")
+        private val statsChartPentagonHighlightResource = cobblemonResource("textures/gui/summary/summary_stats_chart_pentagon_highlight.png")
         private val statsOtherBaseResource = cobblemonResource("textures/gui/summary/summary_stats_other_base.png")
         private val statsOtherSidebarsResource = cobblemonResource("textures/gui/summary/summary_stats_other_sidebars.png")
         private val statsOtherSidebarArrowLeft = cobblemonResource("textures/gui/summary/summary_stats_other_sidebar_arrow_left.png")
@@ -290,33 +293,34 @@ class StatWidget(
             }
         } else {
             if (renderPentagonStats) {
-                blitk(
-                    matrixStack = matrices,
-                    texture = statsChartPentagonResource,
-                    x= (x + 20.5) / SCALE,
-                    y = (y + 22) / SCALE,
-                    width = 186,
-                    height = 176,
-                    scale = SCALE
-                )
-
                 pokemon.form.riding.behaviours?.let {
                     val behaviours = it.entries.toList()
                     val selectedBehaviour = behaviours[rideBehaviourIndex]
+                    val canSwitchStyle = behaviours.size > 1 && centerHovered(pMouseX, pMouseY)
+
+                    blitk(
+                        matrixStack = matrices,
+                        texture = if (canSwitchStyle) statsChartPentagonHighlightResource else statsChartPentagonResource,
+                        x= (x + 20.5) / SCALE,
+                        y = (y + 22) / SCALE,
+                        width = 186,
+                        height = 176,
+                        scale = SCALE
+                    )
 
                     val pentagonColour = when (selectedBehaviour.key) {
                         RidingStyle.AIR -> {
-                            if (behaviours.size > 1 && centerHovered(pMouseX, pMouseY))
+                            if (canSwitchStyle)
                                 Vector3f(70F/255F, 235F/225F, 195F/255F)
                             else Vector3f(40F/255F, 205F/255F, 165F/255F)
                         }
                         RidingStyle.LIQUID -> {
-                            if (behaviours.size > 1 && centerHovered(pMouseX, pMouseY))
+                            if (canSwitchStyle)
                                 Vector3f(95F/255F, 165F/255F, 1F)
                             else Vector3f(65F/255F, 135F/255F, 1F)
                         }
                         else -> {
-                            if (behaviours.size > 1 && centerHovered(pMouseX, pMouseY))
+                            if (canSwitchStyle)
                                 Vector3f(1F, 195F/255F, 30F/255F)
                             else Vector3f(1F, 165F/255F, 0F)
                         }
@@ -353,8 +357,8 @@ class StatWidget(
                         context = context,
                         labels = RidingStat.entries.toList().map { stat ->
                             if (statLabelsHovered(pentagonVerticesOffset, pMouseX, pMouseY))
-                                "${floor((pokemon.getRideStat(selectedBehaviour.key, stat) / (selectedBehaviour.value.stats[stat]?.endInclusive ?: 1)) * 100)}%".text()
-                                else floor(pokemon.getRideStat(selectedBehaviour.key, stat)).toString().text()
+                                "+${floor(pokemon.getRideBoost(stat) / pokemon.getMaxRideBoost(stat) * 100)}%".text()
+                            else floor(pokemon.getRideStat(selectedBehaviour.key, stat)).toString().text()
                         },
                         verticesOffset = pentagonVerticesOffset,
                         offsetY = 5.5
@@ -389,7 +393,7 @@ class StatWidget(
                         colour = Vector3f(216F/255, 100F/255, 1F)
                     )
                     EV -> drawStatPolygon(
-                        statLabels.values.map { (pokemon.evs[it]?.toFloat() ?: 0F) / 252F },
+                        statLabels.values.map { (pokemon.evs[it]?.toFloat() ?: 0F) / EVs.MAX_STAT_VALUE.toFloat() },
                         colour = Vector3f(1F, 1F, 100F/255F)
                     )
                 }
@@ -403,9 +407,9 @@ class StatWidget(
                                 "${
                                     if (pokemon.ivs.isHyperTrained(stat.value)) "${pokemon.ivs[stat.value]} (${pokemon.ivs.hyperTrainedIVs[stat.value]})"
                                     else pokemon.ivs[stat.value].toString()
-                                }/31".text()
+                                }/${IVs.MAX_VALUE}".text()
                             }
-                            EV -> "${pokemon.evs.getOrDefault(stat.value)}/252".text()
+                            EV -> "${pokemon.evs.getOrDefault(stat.value)}/${EVs.MAX_STAT_VALUE}".text()
                             else -> stat.key
                         }
                     } else { stat.key }
@@ -490,14 +494,14 @@ class StatWidget(
                 STATS -> (if (stat == Stats.HP) "${pokemon.currentHealth} / ${pokemon.maxHealth}" else pokemon.getStat(stat).toString()).text()
                 IV -> {
                     (if (asPercent) {
-                        "${floor((((if (pokemon.ivs.isHyperTrained(stat)) pokemon.ivs.hyperTrainedIVs[stat] else pokemon.ivs[stat]) ?: 0) / 31.0) * 100)}%"
+                        "${floor((((if (pokemon.ivs.isHyperTrained(stat)) pokemon.ivs.hyperTrainedIVs[stat] else pokemon.ivs[stat]) ?: 0) / IVs.MAX_VALUE.toDouble()) * 100)}%"
                     } else {
                         if (pokemon.ivs.isHyperTrained(stat)) "${pokemon.ivs[stat]} (${pokemon.ivs.hyperTrainedIVs[stat]})"
                         else pokemon.ivs[stat].toString()
                     }).text()
                 }
                 EV -> {
-                    (if (asPercent) "${floor((pokemon.evs.getOrDefault(stat) / 252.0) * 100)}%"
+                    (if (asPercent) "${floor((pokemon.evs.getOrDefault(stat) / EVs.MAX_STAT_VALUE.toDouble()) * 100)}%"
                     else pokemon.evs.getOrDefault(stat).toString()).text()
                 }
                 else -> "0".text()
@@ -558,7 +562,9 @@ class StatWidget(
     }
 
     private fun centerHovered(pMouseX: Number, pMouseY: Number): Boolean {
-        return (pMouseX.toInt() in (x + 44)..(x + 90)) && (pMouseY.toInt() in (y + 47)..(y + 93))
+        val centerX = x + (WIDTH / 2)
+        val centerY = y + (HEIGHT / 2)
+        return (pMouseX.toInt() in (centerX - 30)..(centerX + 30)) && (pMouseY.toInt() in (centerY - 30)..(centerY + 30))
     }
 
     private fun statLabelsHovered(labelOffsets: List<Pair<Double, Double>>, mouseX: Int, mouseY: Int): Boolean {

common/src/main/kotlin/com/cobblemon/mod/common/client/net/data/RideSettingsSyncHandler.kt

@@ -9,13 +9,12 @@
 package com.cobblemon.mod.common.client.net.data
 
 import com.cobblemon.mod.common.CobblemonRideSettings
-import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
+import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
 import com.cobblemon.mod.common.net.messages.client.data.RideSettingsSyncPacket
-import net.minecraft.server.MinecraftServer
-import net.minecraft.server.level.ServerPlayer
+import net.minecraft.client.Minecraft
 
-object RideSettingsSyncHandler : ServerNetworkPacketHandler<RideSettingsSyncPacket> {
-    override fun handle(packet: RideSettingsSyncPacket, server: MinecraftServer, player: ServerPlayer) {
+object RideSettingsSyncHandler : ClientNetworkPacketHandler<RideSettingsSyncPacket> {
+    override fun handle(packet: RideSettingsSyncPacket, client: Minecraft) {
         CobblemonRideSettings.bird = packet.bird
         CobblemonRideSettings.glider = packet.glider
         CobblemonRideSettings.helicopter = packet.helicopter

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

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

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

@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen5
-
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ChandelureModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("chandelure")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.85F
-    override var portraitTranslation = Vec3(-0.3, -0.19, 0.0)
-
-    override var profileScale = 0.81F
-    override var profileTranslation = Vec3(0.0, 0.68, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var hover: CobblemonPose
-    lateinit var flying: CobblemonPose
-    lateinit var battle_idle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("chandelure", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("chandelure", "blink") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES - PoseType.HOVER,
-            quirks = arrayOf(blink),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                bedrock("chandelure", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES - PoseType.FLY,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("chandelure", "ground_walk")
-            )
-        )
-
-        hover = registerPose(
-            poseName = "hover",
-            poseType = PoseType.HOVER,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("chandelure", "air_idle")
-            )
-        )
-
-        flying = registerPose(
-            poseName = "flying",
-            poseType = PoseType.FLY,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("chandelure", "air_fly")
-            )
-        )
-
-        battle_idle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("chandelure", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("chandelure", "faint") else null
-}

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

@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen5
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ElgyemModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("elgyem")
-    override val head = getPart("head")
-    override val rightArm = getPart("arm_right")
-    override val leftArm = getPart("arm_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftLeg = getPart("leg_left")
-
-    override var portraitScale = 2.5F
-    override var portraitTranslation = Vec3(-0.2, -0.8, 0.0)
-
-    override var profileScale = 0.85F
-    override var profileTranslation = Vec3(0.0, 0.5, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var battleidle: Pose
-    lateinit var shoulderLeft: Pose
-    lateinit var shoulderRight: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("elgyem", "cry") }
-
-    val shoulderOffset = 5.6
-
-    override fun registerPoses() {
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("elgyem", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("elgyem", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 5,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("elgyem", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("elgyem", "battle_idle")
-            )
-        )
-
-        shoulderLeft = registerPose(
-                poseType = PoseType.SHOULDER_LEFT,
-                //quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("elgyem", "ground_idle")
-                ),
-                transformedParts = arrayOf(
-                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, shoulderOffset)
-                )
-        )
-
-        shoulderRight = registerPose(
-                poseType = PoseType.SHOULDER_RIGHT,
-                //quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("elgyem", "ground_idle")
-                ),
-                transformedParts = arrayOf(
-                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, -shoulderOffset)
-                )
-        )
-    }
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, sleep)) bedrockStateful("elgyem", "faint") else null
-}

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

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen5
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class LampentModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("lampent")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.2F
-    override var portraitTranslation = Vec3(-0.19, -0.17, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var hover: CobblemonPose
-    lateinit var flying: CobblemonPose
-    lateinit var battle_idle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("lampent", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("lampent", "blink") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(
-                bedrock("lampent", "sleep")
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES - PoseType.HOVER,
-            quirks = arrayOf(blink),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                bedrock("lampent", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES - PoseType.FLY,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("lampent", "ground_walk")
-            )
-        )
-
-        hover = registerPose(
-            poseName = "hover",
-            poseType = PoseType.HOVER,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("lampent", "air_idle")
-            )
-        )
-
-        flying = registerPose(
-            poseName = "flying",
-            poseType = PoseType.FLY,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("lampent", "air_fly")
-            )
-        )
-
-        battle_idle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("lampent", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("lampent", "faint") else null
-}

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

@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen5
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class LitwickModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("litwick")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.33F
-    override var portraitTranslation = Vec3(0.01, -1.9, 0.0)
-
-    override var profileScale = 0.86F
-    override var profileTranslation = Vec3(0.0, 0.44, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battle_idle: CobblemonPose
-    lateinit var shoulderLeft: CobblemonPose
-    lateinit var shoulderRight: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("litwick", "cry") }
-
-    val shoulderOffset = 5.5
-    val wax = getPart("wax_trail")
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("litwick", "blink") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(
-                bedrock("litwick", "sleep")
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("litwick", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("litwick", "ground_walk")
-            )
-        )
-
-        battle_idle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("litwick", "battle_idle")
-            )
-        )
-
-        shoulderLeft = registerPose(
-                poseType = PoseType.SHOULDER_LEFT,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        bedrock("litwick", "ground_idle")
-                ),
-                transformedParts = arrayOf(
-                        wax.createTransformation().withVisibility(visibility = false)
-                )
-        )
-
-        shoulderRight = registerPose(
-                poseType = PoseType.SHOULDER_RIGHT,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        bedrock("litwick", "ground_idle")
-                ),
-                transformedParts = arrayOf(
-                        wax.createTransformation().withVisibility(visibility = false)
-                )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("litwick", "faint") else null
-}

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

@@ -361,8 +361,6 @@ object VaryingModelRepository {
         inbuilt("chespin", :: ChespinModel)
         inbuilt("quilladin", :: QuilladinModel)
         inbuilt("chesnaught", :: ChesnaughtModel)
-        inbuilt("elgyem", :: ElgyemModel)
-        inbuilt("beheeyem", :: BeheeyemModel)
         inbuilt("pineco", :: PinecoModel)
         inbuilt("forretress", :: ForretressModel)
         inbuilt("lotad", :: LotadModel)
@@ -554,9 +552,6 @@ object VaryingModelRepository {
         inbuilt("gurdurr", ::GurdurrModel)
         inbuilt("conkeldurr", ::ConkeldurrModel)
         inbuilt("clodsire", ::ClodsireModel)
-        inbuilt("litwick", ::LitwickModel)
-        inbuilt("lampent", ::LampentModel)
-        inbuilt("chandelure", ::ChandelureModel)
         inbuilt("gimmighoulchest", ::GimmighoulChestModel)
         inbuilt("drifloon", ::DrifloonModel)
         inbuilt("lileep", ::LileepModel)

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

@@ -102,13 +102,11 @@ class AprijuiceItem(val type: Apricorn): CobblemonItem(Properties().stacksTo(16)
         if (!canUseOnPokemon(stack, pokemon)) {
             return InteractionResultHolder.fail(stack)
         }
-        val boosts = getBoosts(stack, pokemon)
-        // Feed the Pokémon 1 fullness point
-        pokemon.feedPokemon(1)
 
-        boosts.forEach { (stat, value) ->
-            pokemon.addRideBoost(stat, value)
-        }
+        pokemon.feedPokemon(1)
+        
+        val boosts = getBoosts(stack, pokemon)
+        pokemon.addRideBoosts(boosts)
 
         stack.consume(1, player)
 

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

@@ -1867,19 +1867,40 @@ open class Pokemon : ShowdownIdentifiable {
         }
         val max = getMaxRideBoost(stat)
         rideBoosts[stat] = (getRideBoost(stat) + boostAmount).coerceAtMost(max)
-        onChange(RideBoostsUpdatePacket({ this }, rideBoosts))
+        onChange(RideBoostsUpdatePacket({ this }, getRideBoosts()))
         return true
     }
 
+    fun addRideBoosts(boosts: Map<RidingStat, Float>) {
+        var changed = false
+
+        for (boost in boosts) {
+            val (stat, boostAmount) = boost
+
+            if (!canAddRideBoost(stat)) {
+                continue
+            }
+
+            val max = getMaxRideBoost(stat)
+            rideBoosts[stat] = (getRideBoost(stat) + boostAmount).coerceAtMost(max)
+
+            changed = true
+        }
+
+        if (changed) {
+            onChange(RideBoostsUpdatePacket({ this }, getRideBoosts()))
+        }
+    }
+
     fun setRideBoost(stat: RidingStat, boost: Float) {
         rideBoosts[stat] = boost.coerceIn(0F, getMaxRideBoost(stat))
-        onChange(RideBoostsUpdatePacket({ this }, rideBoosts))
+        onChange(RideBoostsUpdatePacket({ this }, getRideBoosts()))
     }
 
     fun setRideBoosts(boosts: Map<RidingStat, Float>) {
         rideBoosts.clear()
         rideBoosts.putAll(boosts.mapValues { it.value.coerceIn(0F, getMaxRideBoost(it.key)) })
-        onChange(RideBoostsUpdatePacket({ this }, rideBoosts))
+        onChange(RideBoostsUpdatePacket({ this }, getRideBoosts()))
     }
 
     fun getExperienceToNextLevel() = getExperienceToLevel(level + 1)

common/src/main/resources/assets/cobblemon/bedrock/particles/pokemon/hooh/hooh_tailtrail.particle.json

@@ -21,7 +21,7 @@
 				"per_update_expression": "variable.radius = 0.6;"
 			},
 			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 30,
+				"spawn_rate": 60,
 				"max_particles": 10000
 			},
 			"minecraft:emitter_lifetime_expression": {
@@ -29,14 +29,14 @@
 			},
 			"minecraft:emitter_shape_sphere": {
 				"offset": [0, 0, -1],
-				"radius": "1.25+(v.particle_random_4*1.25)",
+				"radius": "0.85+(v.particle_random_4*1.25)",
 				"surface_only": true,
-				"direction": ["math.random(-0.1,0.1)*3", "math.random(-0.1,0.1)*1.25", "-0.5-math.random(-0.1,0.1)*2"]
+				"direction": ["math.random(-0.1,0.1)*1", "math.random(-0.1,0.1)*1", "-math.random(-0.1,0.1)*1"]
 			},
 			"minecraft:particle_lifetime_expression": {
-				"max_lifetime": 1
+				"max_lifetime": 1.25
 			},
-			"minecraft:particle_initial_speed": 1,
+			"minecraft:particle_initial_speed": 0.3,
 			"minecraft:particle_motion_dynamic": {
 				"linear_drag_coefficient": "0.25+v.particle_random_4"
 			},
@@ -50,8 +50,9 @@
 						"base_UV": [0, 0],
 						"size_UV": [9, 9],
 						"step_UV": [9, 0],
-						"frames_per_second": 20,
-						"max_frame": 11
+						"frames_per_second": 12,
+						"max_frame": 11,
+						"loop": true
 					}
 				}
 			},

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor.animation.json

@@ -163,7 +163,7 @@
 		},
 		"animation.exeggutor.ground_walk": {
 			"loop": true,
-			"animation_length": 4.79167,
+			"animation_length": 4.7917,
 			"bones": {
 				"leg_left": {
 					"rotation": {
@@ -724,126 +724,36 @@
 				}
 			}
 		},
-		"animation.exeggutor.cry": {
-			"animation_length": 1.5,
-			"bones": {
-				"mouth": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -2, 0],
-						"1.25": [0, -2, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth2": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -5, 0],
-						"1.25": [0, -5, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"jaw": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": [0, -3, 0],
-						"1.25": [0, -3, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"head": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-15, 0, 0],
-						"1.25": [-15, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
-					}
-				},
-				"mouth_open": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]}
-					}
-				},
-				"head2": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-15, 0, 0],
-						"1.25": [-15, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed2": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.2]},
-						"1.25": {"pre": [0, 0, 0.2], "post": [0, 0, 0]}
-					}
-				},
-				"mouth_open2": {
-					"position": {
-						"0.0": [0, 0, 0],
-						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
-						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
-					}
-				},
-				"head3": {
-					"rotation": {
-						"0.0": [0, 0, 0],
-						"0.25": [-15, 0, 0],
-						"1.25": [-15, 0, 0],
-						"1.5": [0, 0, 0]
-					}
-				},
-				"mouth_closed3": {
-					"position": {
-						"0.0": [0, 0, -0.1],
-						"0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}
-					}
-				},
-				"mouth_open3": {
-					"position": {
-						"0.0": [0, 0, 0.1],
-						"0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]}
-					}
-				}
-			}
-		},
 		"animation.exeggutor.battle_idle": {
 			"loop": true,
-			"animation_length": 1.58333,
+			"animation_length": 1.5833,
 			"bones": {
 				"leg_left": {
 					"rotation": {
-						"0.0": ["-15+math.clamp(-math.sin(q.anim_time*90*2.5+225)*65,-90,0)", -35, 0],
+						"0.0": [-15, -35, 0],
 						"0.5833": [-15, -35, 0],
-						"0.625": ["-15+math.clamp(-math.sin(q.anim_time*90*2.5+225)*65,-90,0)", -35, 0],
-						"1.125": ["-15+math.clamp(-math.sin(q.anim_time*90*2.5+225)*65,-90,0)", -35, 0],
+						"0.7917": [-65, -35, 0],
+						"0.9583": {
+							"pre": [-75, -35, 0],
+							"post": [-75, -35, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"1.125": {
+							"post": [-65, -35, 0],
+							"lerp_mode": "catmullrom"
+						},
 						"1.2917": [-15, -35, 0],
 						"1.5833": [-15, -35, 0]
 					},
 					"position": {
-						"0.0": [
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,0,90)",
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*3.5,0,90)",
-							"math.clamp(-math.sin(q.anim_time*90*2.5+225)*2,-90,0)"
-						],
+						"0.0": [0, 0, 0],
 						"0.5833": [0, 0, 0],
-						"0.625": [
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,0,90)",
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*3.5,0,90)",
-							"math.clamp(-math.sin(q.anim_time*90*2.5+225)*2,-90,0)"
-						],
+						"0.625": [0.06, 0.42, -0.24],
+						"0.7083": [0.18, 1.26, -0.72],
+						"0.7917": [0.15, 1.08, -0.62],
+						"0.9167": [0.11, 0.81, -0.47],
+						"1.0417": [0.07, 0.54, -0.31],
+						"1.1667": [0.04, 0.27, -0.16],
 						"1.2917": [0, 0, 0],
 						"1.5833": [0, 0, 0]
 					}
@@ -852,7 +762,7 @@
 					"rotation": {
 						"0.0": [20, 0, 0],
 						"0.5833": [20, 0, 0],
-						"0.875": [5, 0, 0],
+						"0.875": [40, 0, 0],
 						"1.125": [20, 0, 0]
 					}
 				},
@@ -860,53 +770,55 @@
 					"rotation": {
 						"0.0": [-5, 0, 0],
 						"0.5833": [-5, 0, 0],
-						"0.7083": [30, 0, 0],
-						"0.9167": [10, 0, 0],
-						"1.125": [-5, 0, 0],
-						"1.25": [-5, 0, 0]
+						"0.7083": [17.5, 0, 0],
+						"0.9167": [-5, 0, 0]
 					}
 				},
 				"leg_right": {
 					"rotation": {
-						"0.0": ["-15+math.clamp(math.sin(q.anim_time*90*2.5+225)*65,-90,0)", 35, 0],
-						"0.3333": ["-15+math.clamp(math.sin(q.anim_time*90*2.5+225)*65,-90,0)", 35, 0],
+						"0.0": [-65, 35, 0],
+						"0.1667": {
+							"pre": [-75, 35, 0],
+							"post": [-75, 35, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.3333": {
+							"post": [-65, 35, 0],
+							"lerp_mode": "catmullrom"
+						},
 						"0.5": [-15, 35, 0],
 						"1.3333": [-15, 35, 0],
-						"1.375": ["-15+math.clamp(math.sin(q.anim_time*90*2.5+225)*65,-90,0)", 35, 0]
+						"1.375": [-15, 35, 0],
+						"1.5833": [-65, 35, 0]
 					},
 					"position": {
-						"0.0": [
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,-90,0)",
-							"math.clamp(-math.sin(q.anim_time*90*2.5+225)*3.5,0,90)",
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*2,-90,0)"
-						],
+						"0.0": [-0.37, 2.61, -1.49],
+						"0.0417": [-0.37, 2.61, -1.49],
+						"0.125": [-0.3, 2.13, -1.22],
+						"0.25": [-0.2, 1.42, -0.81],
+						"0.375": [-0.1, 0.71, -0.4],
 						"0.5": [0, 0, 0],
 						"1.3333": [0, 0, 0],
-						"1.375": [
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,-90,0)",
-							"math.clamp(-math.sin(q.anim_time*90*2.5+225)*3.5,0,90)",
-							"math.clamp(math.sin(q.anim_time*90*2.5+225)*2,-90,0)"
-						]
+						"1.375": [0, 0, 0],
+						"1.5833": [-0.37, 2.61, -1.49]
 					}
 				},
 				"leg_right2": {
 					"rotation": {
-						"0.0": [7, 0, 0],
-						"0.125": [5, 0, 0],
+						"0.0": [35, 0, 0],
+						"0.125": [40, 0, 0],
 						"0.375": [20, 0, 0],
 						"1.375": [20, 0, 0],
-						"1.5833": [7, 0, 0]
+						"1.5833": [35, 0, 0]
 					}
 				},
 				"foot_right": {
 					"rotation": {
-						"0.0": [22, 0, 0],
-						"0.125": [10, 0, 0],
-						"0.3333": [-5, 0, 0],
-						"0.4583": [-5, 0, 0],
+						"0.0": [4, 0, 0],
+						"0.0833": [-5, 0, 0],
 						"1.375": [-5, 0, 0],
-						"1.5": [30, 0, 0],
-						"1.5833": [22, 0, 0]
+						"1.5": [17.5, 0, 0],
+						"1.5833": [8.5, 0, 0]
 					}
 				},
 				"body": {
@@ -1063,6 +975,106 @@
 				}
 			}
 		},
+		"animation.exeggutor.cry": {
+			"animation_length": 1.5,
+			"bones": {
+				"mouth": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -2, 0],
+						"1.25": [0, -2, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -5, 0],
+						"1.25": [0, -5, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"jaw": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": [0, -3, 0],
+						"1.25": [0, -3, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [-5, 0, 0],
+						"1.25": [-2.5, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth_closed": {
+					"position": {
+						"0.0": [-1, 0, -0.1],
+						"0.25": {"pre": [-1, 0, -0.1], "post": [-1, 0, 0]},
+						"1.25": {"pre": [-1, 0, 0], "post": [-1, 0, -0.1]}
+					}
+				},
+				"mouth_open": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]}
+					}
+				},
+				"head2": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [-5, 0, 0],
+						"1.25": [-2.5, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth_closed2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.2]},
+						"1.25": {"pre": [0, 0, 0.2], "post": [0, 0, 0]}
+					}
+				},
+				"mouth_open2": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]},
+						"1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}
+					}
+				},
+				"head3": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"0.25": [-5, 0, 0],
+						"1.25": [-2.5, 0, 0],
+						"1.5": [0, 0, 0]
+					}
+				},
+				"mouth_closed3": {
+					"position": {
+						"0.0": [-1, 0, -0.1],
+						"0.25": {"pre": [-1, 0, -0.1], "post": [-1, 0, 0]},
+						"1.25": {"pre": [-1, 0, 0], "post": [-1, 0, -0.1]}
+					}
+				},
+				"mouth_open3": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]},
+						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]}
+					}
+				}
+			},
+			"sound_effects": {
+				"0.25": {
+					"effect": "pokemon.exeggutor.cry"
+				}
+			}
+		},
 		"animation.exeggutor.sleep": {
 			"loop": true,
 			"animation_length": 8,
@@ -1294,7 +1306,7 @@
 			}
 		},
 		"animation.exeggutor.blink3": {
-			"animation_length": 0.16667,
+			"animation_length": 0.1667,
 			"bones": {
 				"eyelid_right3": {
 					"position": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0606_beheeyem/beheeyem.animation.json

@@ -5,47 +5,78 @@
 			"loop": true,
 			"bones": {
 				"body": {
-					"rotation": ["5+(math.sin(q.anim_time*90*2*1+180)*6)*0.6", 0, "0+(math.sin(q.anim_time*90*2*1+180)*1)*0.6"],
-					"position": [0, "2+(math.cos(q.anim_time*90*2*1+180)*0.8)*0.6", 0]
+					"rotation": ["-5+math.cos(query.anim_time*90*1)*2", 0, "0+math.cos(query.anim_time*90*1/2)*2"],
+					"position": ["0+math.sin(query.anim_time*90*1/2)*0.75", "3+math.sin(query.anim_time*90*1)*0.5", 0]
 				},
 				"torso_top": {
-					"rotation": ["0-(math.sin(q.anim_time*90*2*1+180)*1.5)*0.6", 0, 0]
+					"rotation": ["2.5-math.cos(query.anim_time*90*1-30)*2", 0, "0+math.cos(query.anim_time*90*1/2-60)*2"]
 				},
 				"collar_back": {
-					"rotation": ["0-(math.sin(q.anim_time*90*2*1+180)*5)*0.6", 0, 0]
+					"rotation": ["0+math.cos(query.anim_time*90*1-30)*2", 0, 0]
 				},
 				"collar_front": {
-					"rotation": ["0+(math.sin(q.anim_time*90*2*1+180)*5)*0.6", 0, 0]
+					"rotation": ["27.5-math.cos(query.anim_time*90*1-60)*1", 0, 0]
 				},
-				"head": {
-					"rotation": ["5-(math.sin(q.anim_time*90*2*1+180)*3)*0.6", 0, 0]
+				"eyes_bright": {
+					"position": [0, 0, -0.1]
 				},
 				"arm_right": {
-					"rotation": [0, "(math.sin(q.anim_time*90*2*1+180)*2)*1", "-60-(math.sin(q.anim_time*90*2*1+180)*2)*0.6"]
+					"rotation": [
+						"26.4641+math.cos(query.anim_time*90*1/2-120)*7",
+						"19.3475-math.cos(query.anim_time*90*1/2-60)*6",
+						"-42.5248-math.cos(query.anim_time*90*1-90)*2"
+					]
 				},
 				"arm_right2": {
-					"rotation": [0, "0+(math.cos(q.anim_time*90*2*1+180)*1)*0.6", 0]
+					"rotation": [
+						"48.1034+math.cos(query.anim_time*90*1-90)*6",
+						"-28.22+math.cos(query.anim_time*90*1/2-90)*8",
+						"-9.9783-math.cos(query.anim_time*90*1-120)*6"
+					]
 				},
 				"hand_right": {
-					"rotation": [0, 0, -10]
+					"rotation": [12.42995, "-10.0859-math.cos(query.anim_time*90*1-120)*5", "-31.3315+math.cos(query.anim_time*90*1-150)*6"]
 				},
 				"arm_left": {
-					"rotation": [0, "-(math.sin(q.anim_time*90*2*1+180)*2)*1", "60+(math.sin(q.anim_time*90*2*1+180)*2)*0.6"]
+					"rotation": [
+						"26.4641+math.cos(query.anim_time*90*1/2-120)*7",
+						"-19.3475+math.cos(query.anim_time*90*1/2-60)*6",
+						"42.5248+math.cos(query.anim_time*90*1-90)*2"
+					]
 				},
 				"arm_left2": {
-					"rotation": [0, "0-(math.sin(q.anim_time*90*2*1+180)*5)*0.6", 0]
+					"rotation": [
+						"48.1034+math.cos(query.anim_time*90*1-90)*6",
+						"28.22-math.cos(query.anim_time*90*1/2-90)*8",
+						"9.9783+math.cos(query.anim_time*90*1-120)*6"
+					]
 				},
 				"hand_left": {
-					"rotation": [0, 0, 10]
+					"rotation": [12.42995, "10.0859+math.cos(query.anim_time*90*1-120)*5", "31.3315-math.cos(query.anim_time*90*1-150)*6"]
+				},
+				"torso_bottom": {
+					"rotation": ["-7.5+math.cos(query.anim_time*90*1-60)*2", 0, "0-math.cos(query.anim_time*90*1/2-120)*2"]
 				},
 				"bottom_coat": {
-					"rotation": ["0-(math.cos(q.anim_time*90*2*1+180)*3)*0.6", 0, 0]
+					"rotation": ["-3+math.cos(query.anim_time*90*1-90)*2", 0, "0-math.cos(query.anim_time*90*1/2-90)*3"]
 				},
 				"leg_right": {
-					"rotation": ["0+(math.sin(q.anim_time*90*2*1+180)*3)*0.6", 0, "0-(math.sin(q.anim_time*90*2*1+180)*3)*0.6"]
+					"rotation": ["2.5062+math.cos(query.anim_time*90*1-120)*6", 10.02087, "2.4142-math.cos(query.anim_time*90*1/2-90)*8"]
+				},
+				"leg_right2": {
+					"rotation": ["22.5+math.cos(query.anim_time*90*1-170)*10", 0, "NaN-math.cos(query.anim_time*90*1/2-150)*6"]
 				},
 				"leg_left": {
-					"rotation": ["0+(math.sin(q.anim_time*90*2*1+180)*3)*0.6", 0, "0+(math.sin(q.anim_time*90*2*1+180)*3)*0.6"]
+					"rotation": ["2.5062+math.cos(query.anim_time*90*1-120)*6", -10.02087, "-2.4142-math.cos(query.anim_time*90*1/2-90)*8"]
+				},
+				"leg_left2": {
+					"rotation": ["22.5+math.cos(query.anim_time*90*1-170)*10", 0, "-math.cos(query.anim_time*90*1/2-150)*6"]
+				},
+				"eyes_dim": {
+					"position": [0, 0, 0.1]
+				},
+				"head": {
+					"rotation": ["15+math.cos(query.anim_time*90*1)*1", 0, "0-math.cos(query.anim_time*90*1/2-120)*3"]
 				}
 			}
 		},
@@ -53,47 +84,157 @@
 			"loop": true,
 			"bones": {
 				"body": {
-					"rotation": ["17.5-(math.cos(q.anim_time*90*2*1+180)*10)*0.6", 0, "0-(math.sin(q.anim_time*90*2*1+180)*1)*0.6"],
-					"position": [0, "2+(math.cos(q.anim_time*90*2*1+180)*1.5)*0.6", "0+(math.sin(q.anim_time*90*2*1+180)*1.8)*0.6"]
+					"rotation": ["25+math.cos(query.anim_time*90*3/2)*2", "0+math.cos(query.anim_time*90*3/2/2)*4", "0+math.cos(query.anim_time*90*3/2/2-60)*2"],
+					"position": ["0-math.cos(query.anim_time*90*3/2/2-30)*1", "3+math.sin(query.anim_time*90*3/2)*0.7", "0-math.sin(query.anim_time*90*3/2-60)*1"]
 				},
 				"torso_top": {
-					"rotation": ["0+(math.cos(q.anim_time*90*2*1+180)*3)*0.6", 0, 0]
+					"rotation": ["10-math.cos(query.anim_time*90*3/2-30)*2", "0+math.cos(query.anim_time*90*3/2/2)*4", 0]
 				},
 				"collar_back": {
-					"rotation": ["0-(math.cos(q.anim_time*90*2*1+180)*6)*0.6", 0, 0]
+					"rotation": ["-15+math.cos(query.anim_time*90*3/2-30)*2", "0+math.cos(query.anim_time*90*3/2/2-90)*2", 0]
 				},
 				"collar_front": {
-					"rotation": ["0+(math.cos(q.anim_time*90*2*1+180)*6)*0.6", 0, 0]
+					"rotation": ["27.5-math.cos(query.anim_time*90*3/2-60)*1", 0, 0]
 				},
-				"head": {
-					"rotation": ["0+(math.cos(q.anim_time*90*2*1+180)*6)*0.6", 0, 0]
+				"eyes_bright": {
+					"position": [0, 0, -0.1]
 				},
 				"arm_right": {
-					"rotation": [0, "20-(math.sin(q.anim_time*90*2*1+180)*3)*0.6", "-55-(math.sin(q.anim_time*90*2*1+180)*6)*0.6"]
+					"rotation": [
+						"20.433+math.cos(query.anim_time*90*3/2/2-120)*7",
+						"31.8177-math.cos(query.anim_time*90*3/2-60)*6",
+						"-45.313-math.cos(query.anim_time*90*3/2-90)*2"
+					]
 				},
 				"arm_right2": {
-					"rotation": ["-(math.cos(q.anim_time*90*2*1+180)*6)*0.6", 0, "0+(math.cos(q.anim_time*90*2*1+180)*1)*0.6"]
+					"rotation": [
+						"39.442+math.cos(query.anim_time*90*3/2-90)*6",
+						"-27.7035+math.cos(query.anim_time*90*3/2-90)*8",
+						"-8.2892-math.cos(query.anim_time*90*3/2-120)*6"
+					]
 				},
 				"hand_right": {
-					"rotation": [0, 0, -10]
+					"rotation": [19.42631, "0.9236-math.cos(query.anim_time*90*3/2-120)*5", "-39.9562+math.cos(query.anim_time*90*3/2-150)*6"]
 				},
 				"arm_left": {
-					"rotation": [0, "-20+(math.sin(q.anim_time*90*2*1+180)*3)*0.6", "55+(math.sin(q.anim_time*90*2*1+180)*6)*0.6"]
+					"rotation": [
+						"20.433+math.cos(query.anim_time*90*3/2/2-120)*7",
+						"-31.8177+math.cos(query.anim_time*90*3/2-60)*6",
+						"45.313+math.cos(query.anim_time*90*3/2-90)*2"
+					]
 				},
 				"arm_left2": {
-					"rotation": ["(math.cos(q.anim_time*90*2*1+180)*6)*0.6", 0, "0-(math.cos(q.anim_time*90*2*1+180)*1)*0.6"]
+					"rotation": [
+						"39.442+math.cos(query.anim_time*90*3/2-90)*6",
+						"27.7035-math.cos(query.anim_time*90*3/2-90)*8",
+						"8.2892+math.cos(query.anim_time*90*3/2-120)*6"
+					]
 				},
 				"hand_left": {
-					"rotation": [0, 0, 10]
+					"rotation": [19.42631, "-0.9236+math.cos(query.anim_time*90*3/2-120)*5", "39.9562-math.cos(query.anim_time*90*3/2-150)*6"]
+				},
+				"torso_bottom": {
+					"rotation": ["2.5+math.cos(query.anim_time*90*3/2-60)*2", 0, "0+math.cos(query.anim_time*90*3/2/2-60)*4"]
 				},
 				"bottom_coat": {
-					"rotation": ["-2.5-(math.cos(q.anim_time*90*2*1+180)*6)*0.6", 0, 0]
+					"rotation": ["-8+math.cos(query.anim_time*90*3/2-90)*2", "0+math.cos(query.anim_time*90*3/2/2-120)*2", "0+math.cos(query.anim_time*90*3/2/2-120)*2"]
 				},
 				"leg_right": {
-					"rotation": ["0-(math.cos(q.anim_time*90*2*1+180)*5)*2", 0, "0-(math.cos(q.anim_time*90*2*1+180)*1)*2"]
+					"rotation": ["4.5574+math.cos(query.anim_time*90*3/2-120)*6", 10.64348, 7.53105]
+				},
+				"leg_right2": {
+					"rotation": ["22.5+math.cos(query.anim_time*90*3/2-170)*10", 0, 0]
 				},
 				"leg_left": {
-					"rotation": ["0-(math.cos(q.anim_time*90*2*1+180)*5)*2", 0, "0+(math.cos(q.anim_time*90*2*1+180)*1)*2"]
+					"rotation": ["4.5574+math.cos(query.anim_time*90*3/2-120)*6", -10.64348, -7.53105]
+				},
+				"leg_left2": {
+					"rotation": ["22.5+math.cos(query.anim_time*90*3/2-170)*10", 0, 0]
+				},
+				"eyes_dim": {
+					"position": [0, 0, 0.1]
+				},
+				"head": {
+					"rotation": ["-12.5+math.cos(query.anim_time*90*3/2)*3", "0-math.cos(query.anim_time*90*3/2/2)*4", 0]
+				}
+			}
+		},
+		"animation.beheeyem.battle_idle": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": ["-5+math.cos(query.anim_time*90*1)*2", 0, "0+math.cos(query.anim_time*90*1/2)*1"],
+					"position": ["0+math.sin(query.anim_time*90*1/2)*0.5", "3+math.sin(query.anim_time*90*1)*0.5", 0]
+				},
+				"torso_top": {
+					"rotation": ["2.5-math.cos(query.anim_time*90*1-30)*2", 0, "0+math.cos(query.anim_time*90*1/2-60)*2"]
+				},
+				"collar_back": {
+					"rotation": ["7.5+math.cos(query.anim_time*90*1-30)*2", 0, 0]
+				},
+				"collar_front": {
+					"rotation": ["27.5-math.cos(query.anim_time*90*1-60)*1", 0, 0]
+				},
+				"eyes_bright": {
+					"position": [0, 0, -0.1]
+				},
+				"arm_right": {
+					"rotation": [
+						"19.1787+math.cos(query.anim_time*90*1/2-120)*4",
+						"22.2175-math.cos(query.anim_time*90*1-60)*3",
+						"-48.3831-math.cos(query.anim_time*90*1-90)*2"
+					]
+				},
+				"arm_right2": {
+					"rotation": ["38.8131+math.cos(query.anim_time*90*1-90)*6", "-35.024+math.cos(query.anim_time*90*1-90)*4", "3.02+math.cos(query.anim_time*90*1-120)*2"]
+				},
+				"hand_right": {
+					"rotation": [17.41964, "-20.6269-math.cos(query.anim_time*90*1-120)*3", "-23.4374+math.cos(query.anim_time*90*1-150)*8"]
+				},
+				"arm_left": {
+					"rotation": [
+						"19.1787+math.cos(query.anim_time*90*1/2-120)*4",
+						"-22.2175+math.cos(query.anim_time*90*1-60)*3",
+						"48.3831+math.cos(query.anim_time*90*1-90)*2"
+					]
+				},
+				"arm_left2": {
+					"rotation": ["38.8131+math.cos(query.anim_time*90*1-90)*6", "35.024-math.cos(query.anim_time*90*1-90)*4", "-3.02-math.cos(query.anim_time*90*1-120)*2"]
+				},
+				"hand_left": {
+					"rotation": [17.41964, "20.6269+math.cos(query.anim_time*90*1-120)*3", "23.4374-math.cos(query.anim_time*90*1-150)*8"]
+				},
+				"torso_bottom": {
+					"rotation": ["-7.5+math.cos(query.anim_time*90*1-60)*2", 0, "0-math.cos(query.anim_time*90*1/2-120)*1"]
+				},
+				"bottom_coat": {
+					"rotation": ["-10.5+math.cos(query.anim_time*90*1-90)*2", 0, "-math.cos(query.anim_time*90*1/2-90)*2"]
+				},
+				"leg_right": {
+					"rotation": ["2.0651+math.cos(query.anim_time*90*1-120)*6", 9.9897, "-0.1242-math.cos(query.anim_time*90*1/2-90)*4"]
+				},
+				"leg_right2": {
+					"rotation": ["22.5+math.cos(query.anim_time*90*1-170)*10", 0, "NaN-math.cos(query.anim_time*90*1/2-150)*3"]
+				},
+				"leg_left": {
+					"rotation": ["2.9483+math.cos(query.anim_time*90*1-120)*6", -10.03277, "-4.953-math.cos(query.anim_time*90*1/2-90)*4"]
+				},
+				"leg_left2": {
+					"rotation": ["22.5+math.cos(query.anim_time*90*1-170)*10", 0, "-math.cos(query.anim_time*90*1/2-150)*3"]
+				},
+				"pupil_left": {
+					"position": [0, 0, -0.1],
+					"scale": 0.75
+				},
+				"pupil_right": {
+					"position": [0, 0, -0.1],
+					"scale": 0.75
+				},
+				"eyes_dim": {
+					"position": [0, 0, 0.1]
+				},
+				"head": {
+					"rotation": ["25+math.cos(query.anim_time*90*1)*1", 0, "0-math.cos(query.anim_time*90*1/2-120)*3"]
 				}
 			}
 		},
@@ -101,50 +242,341 @@
 			"loop": true,
 			"bones": {
 				"body": {
-					"rotation": ["0+(math.sin(q.anim_time*90*1+180)*1.5)*0.6", 0, "0+(math.sin(q.anim_time*90*1+180)*3)*0.6"],
-					"position": [0, "1+(math.cos(q.anim_time*90*1+180)*0.8)*0.6", 0]
+					"rotation": [40, 0, 0],
+					"position": [0, 3, 0]
 				},
 				"torso_top": {
-					"rotation": ["0+(math.sin(q.anim_time*90*1+180)*5)*0.6", 0, 0]
-				},
-				"collar_back": {
-					"rotation": ["0-(math.cos(q.anim_time*90*1+180)*3)*0.6", 0, 0]
-				},
-				"collar_front": {
-					"rotation": ["0-(math.cos(q.anim_time*90*1+180)*3)*0.6", 0, 0]
-				},
-				"head": {
-					"rotation": ["25+(math.sin(q.anim_time*90*1+180)*3)*0.6", 0, 0]
-				},
-				"arm_right": {
-					"rotation": [0, "0-(math.cos(q.anim_time*90*1+180)*10)*0.3", "-60+(math.sin(q.anim_time*90*1+180)*5)*0.6"]
-				},
-				"arm_right2": {
-					"rotation": [0, "0-(math.cos(q.anim_time*90*1+180)*10)*0.3", 0]
-				},
-				"hand_right": {
-					"rotation": [0, 0, -10]
-				},
-				"arm_left": {
-					"rotation": [0, "0+(math.cos(q.anim_time*90*1+180)*10)*0.3", "60-(math.sin(q.anim_time*90*1+180)*5)*0.6"]
-				},
-				"arm_left2": {
-					"rotation": [0, "0+(math.cos(q.anim_time*90*1+180)*10)*0.3", 0]
-				},
-				"hand_left": {
-					"rotation": [0, 0, 10]
-				},
-				"torso_bottom": {
-					"rotation": ["0+(math.sin(q.anim_time*90*1+180)*5)*0.6", 0, 0]
-				},
-				"bottom_coat": {
 					"rotation": [-2.5, 0, 0]
 				},
+				"collar_back": {
+					"rotation": [10, 0, 0]
+				},
+				"collar_front": {
+					"rotation": [-15, 0, 0]
+				},
+				"arm_right": {
+					"rotation": [30.18785, -13.49583, -55.38615]
+				},
+				"arm_right2": {
+					"rotation": [8.0521, -19.65857, 17.64818]
+				},
+				"hand_right": {
+					"rotation": [12.21635, -29.21703, -28.76232]
+				},
+				"arm_left": {
+					"rotation": [30.18785, 13.49583, 55.38615]
+				},
+				"arm_left2": {
+					"rotation": [8.0521, 19.65857, -17.64818]
+				},
+				"hand_left": {
+					"rotation": [12.21635, 29.21703, 28.76232]
+				},
+				"torso_bottom": {
+					"rotation": [-17.5, 0, 0]
+				},
+				"bottom_coat": {
+					"rotation": [-17.5, 0, 0]
+				},
 				"leg_right": {
-					"rotation": ["0+(math.sin(q.anim_time*90*1+180)*20)*0.6", 0, "0+(math.cos(q.anim_time*90*1+180)*5)*0.6"]
+					"rotation": [-22.5, 0, 0]
+				},
+				"leg_right2": {
+					"rotation": [10, 0, 0]
 				},
 				"leg_left": {
-					"rotation": ["0-(math.sin(q.anim_time*90*1+180)*20)*0.6", 0, "0-(math.cos(q.anim_time*90*1+180)*5)*0.6"]
+					"rotation": [-10, 0, 0]
+				},
+				"head": {
+					"rotation": [20, 0, 0]
+				}
+			}
+		},
+		"animation.beheeyem.alt_sleep": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": [-52.5, 0, 0],
+					"position": [0, 3, 0]
+				},
+				"torso_top": {
+					"rotation": [2.5, 0, 0]
+				},
+				"collar_back": {
+					"rotation": [5, 0, 0]
+				},
+				"collar_front": {
+					"rotation": [27.5, 0, 0]
+				},
+				"arm_right": {
+					"rotation": [-40.58835, 28.2876, -5.84768]
+				},
+				"arm_right2": {
+					"rotation": [-23.10066, 18.44452, 79.80343]
+				},
+				"hand_right": {
+					"rotation": [-103.94239, -26.14027, 28.61413]
+				},
+				"arm_left": {
+					"rotation": [-40.58835, -28.2876, 5.84768]
+				},
+				"arm_left2": {
+					"rotation": [-23.10066, -18.44452, -79.80343]
+				},
+				"hand_left": {
+					"rotation": [-103.94239, 26.14027, -28.61413]
+				},
+				"torso_bottom": {
+					"rotation": [-12.5, 0, 0]
+				},
+				"bottom_coat": {
+					"rotation": [-17.5, 0, 0]
+				},
+				"leg_right": {
+					"rotation": [-19.76968, -1.50179, -17.43745]
+				},
+				"leg_right2": {
+					"rotation": [10, 0, 0]
+				},
+				"leg_left": {
+					"rotation": [17.24721, -1.93597, 14.87739]
+				}
+			}
+		},
+		"animation.beheeyem.blink": {
+			"animation_length": 0.1667,
+			"bones": {
+				"eyes_bright": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.125": [0, 0, 0.1],
+						"0.1667": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}
+					}
+				}
+			}
+		},
+		"animation.beheeyem.pose": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": [-2.5, 0, 0],
+					"position": [0, 3, 0]
+				},
+				"torso_top": {
+					"rotation": [2.5, 0, 0]
+				},
+				"collar_back": {
+					"rotation": [5, 0, 0]
+				},
+				"collar_front": {
+					"rotation": [-7.5, 0, 0]
+				},
+				"eyes_bright": {
+					"position": [0, 0, -0.1]
+				},
+				"arm_right": {
+					"rotation": [0.18641, 11.50404, -55.30513]
+				},
+				"arm_right2": {
+					"rotation": [24.59434, -22.85086, 0.87852]
+				},
+				"hand_right": {
+					"rotation": [19.6995, -3.27667, -28.1772]
+				},
+				"arm_left": {
+					"rotation": [0.18641, -11.50404, 55.30513]
+				},
+				"arm_left2": {
+					"rotation": [24.59434, 22.85086, -0.87852]
+				},
+				"hand_left": {
+					"rotation": [19.6995, 3.27667, 28.1772]
+				},
+				"torso_bottom": {
+					"rotation": [-2.5, 0, 0]
+				},
+				"bottom_coat": {
+					"rotation": [-17.5, 0, 0]
+				},
+				"leg_right": {
+					"rotation": [-5, 0, 0]
+				},
+				"leg_right2": {
+					"rotation": [10, 0, 0]
+				},
+				"leg_left": {
+					"rotation": [7.5, 0, 0]
+				},
+				"leg_left2": {
+					"rotation": [15, 0, 0]
+				},
+				"eyes_dim": {
+					"position": [0, 0, 0.1]
+				},
+				"head": {
+					"rotation": [10, 0, 0]
+				}
+			}
+		},
+		"animation.beheeyem.lights_quirk1": {
+			"loop": true,
+			"animation_length": 1.5,
+			"bones": {
+				"right_finger_bright_red2": {
+					"scale": {
+						"0.0": [1.05, 1.05, 1.05],
+						"0.5": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"1.0": [1, 1, 1],
+						"1.5": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]}
+					}
+				},
+				"right_finger_bright_yellow": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.5": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"1.0": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"1.5": [1, 1, 1]
+					}
+				},
+				"right_finger_bright_green2": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.5": [1, 1, 1],
+						"1.0": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"1.5": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]}
+					}
+				},
+				"left_finger_bright_red2": {
+					"scale": {
+						"0.0": [1.05, 1.05, 1.05],
+						"0.5": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"1.0": [1, 1, 1],
+						"1.5": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]}
+					}
+				},
+				"left_finger_bright_yellow": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.5": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"1.0": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"1.5": [1, 1, 1]
+					}
+				},
+				"left_finger_bright_green2": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.5": [1, 1, 1],
+						"1.0": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"1.5": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]}
+					}
+				}
+			}
+		},
+		"animation.beheeyem.lights_quirk2": {
+			"loop": true,
+			"animation_length": 1,
+			"bones": {
+				"right_finger_bright_red2": {
+					"scale": {
+						"0.0": [1.05, 1.05, 1.05],
+						"0.3333": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"0.6667": [1, 1, 1],
+						"1.0": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]}
+					}
+				},
+				"right_finger_bright_yellow": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.3333": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"0.6667": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"1.0": [1, 1, 1]
+					}
+				},
+				"right_finger_bright_green2": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.3333": [1, 1, 1],
+						"0.6667": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"1.0": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]}
+					}
+				},
+				"left_finger_bright_red2": {
+					"scale": {
+						"0.0": [1.05, 1.05, 1.05],
+						"0.3333": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"0.6667": [1, 1, 1],
+						"1.0": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]}
+					}
+				},
+				"left_finger_bright_yellow": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.3333": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"0.6667": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"1.0": [1, 1, 1]
+					}
+				},
+				"left_finger_bright_green2": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.3333": [1, 1, 1],
+						"0.6667": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"1.0": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]}
+					}
+				}
+			}
+		},
+		"animation.beheeyem.lights_quirk3": {
+			"loop": true,
+			"animation_length": 0.5,
+			"bones": {
+				"right_finger_bright_red2": {
+					"scale": {
+						"0.0": [1.05, 1.05, 1.05],
+						"0.1667": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"0.3333": [1, 1, 1],
+						"0.5": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]}
+					}
+				},
+				"right_finger_bright_yellow": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.1667": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"0.3333": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"0.5": [1, 1, 1]
+					}
+				},
+				"right_finger_bright_green2": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.1667": [1, 1, 1],
+						"0.3333": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"0.5": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]}
+					}
+				},
+				"left_finger_bright_red2": {
+					"scale": {
+						"0.0": [1.05, 1.05, 1.05],
+						"0.1667": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"0.3333": [1, 1, 1],
+						"0.5": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]}
+					}
+				},
+				"left_finger_bright_yellow": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.1667": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"0.3333": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]},
+						"0.5": [1, 1, 1]
+					}
+				},
+				"left_finger_bright_green2": {
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.1667": [1, 1, 1],
+						"0.3333": {"pre": [1, 1, 1], "post": [1.05, 1.05, 1.05]},
+						"0.5": {"pre": [1.05, 1.05, 1.05], "post": [1, 1, 1]}
+					}
 				}
 			}
 		},
@@ -178,15 +610,6 @@
 						"1.4583": [0, 0, 0]
 					}
 				},
-				"head": {
-					"rotation": {
-						"0.0": ["0+(math.cos(q.anim_time*90*2*1+180)*0.8)*0.6", 0, 0],
-						"0.125": [11.5, 0, 0],
-						"0.4167": ["-6-(math.cos(q.anim_time*90*80+180)*2)*2", 0, 0],
-						"0.9583": ["-6+(math.cos(q.anim_time*90*8+180)*2)*0.6", 0, 0],
-						"1.4583": [0, 0, 0]
-					}
-				},
 				"arm_right": {
 					"rotation": {
 						"0.0": [0, 0, 0],
@@ -222,11 +645,94 @@
 						"0.9583": [7.3679, 40.2246, -30.8095],
 						"1.4583": [0, 0, 0]
 					}
+				},
+				"head": {
+					"rotation": {
+						"0.0": ["0+(math.cos(q.anim_time*90*2*1+180)*0.8)*0.6", 0, 0],
+						"0.125": [11.5, 0, 0],
+						"0.4167": ["-6-(math.cos(q.anim_time*90*80+180)*2)*2", 0, 0],
+						"0.9583": ["-6+(math.cos(q.anim_time*90*8+180)*2)*0.6", 0, 0],
+						"1.4583": [0, 0, 0]
+					}
 				}
-			},
-			"sound_effects": {
-				"0.04": {
-					"effect": "pokemon.beheeyem.cry"
+			}
+		},
+		"animation.beheeyem.new": {
+			"loop": true,
+			"bones": {
+				"beheeyem": {
+					"position": [0, 0, "33-query.anim_time*90*0.08"]
+				}
+			}
+		},
+		"animation.beheeyem.pose2": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"rotation": [-2.5, 0, 0],
+					"position": [0, 3, 0]
+				},
+				"torso_top": {
+					"rotation": [2.5, 0, 0]
+				},
+				"collar_back": {
+					"rotation": [5, 0, 0]
+				},
+				"collar_front": {
+					"rotation": [-7.5, 0, 0]
+				},
+				"eyes_bright": {
+					"position": [0, 0, -0.1]
+				},
+				"arm_right": {
+					"rotation": [-16.69715, -44.79233, -31.70444]
+				},
+				"arm_right2": {
+					"rotation": [24.59434, -22.85086, 0.87852]
+				},
+				"hand_right": {
+					"rotation": [19.6995, -3.27667, -28.1772]
+				},
+				"arm_left": {
+					"rotation": [0.18641, -11.50404, 55.30513]
+				},
+				"arm_left2": {
+					"rotation": [24.59434, 22.85086, -0.87852]
+				},
+				"hand_left": {
+					"rotation": [19.6995, 3.27667, 28.1772]
+				},
+				"torso_bottom": {
+					"rotation": [-2.5, 0, 0]
+				},
+				"bottom_coat": {
+					"rotation": [-17.5, 0, 0]
+				},
+				"leg_right": {
+					"rotation": [-5, 0, 0]
+				},
+				"leg_right2": {
+					"rotation": [10, 0, 0]
+				},
+				"leg_left": {
+					"rotation": [7.5, 0, 0]
+				},
+				"leg_left2": {
+					"rotation": [15, 0, 0]
+				},
+				"pupil_left": {
+					"position": [-0.25, 0, -0.1],
+					"scale": 0.75
+				},
+				"pupil_right": {
+					"position": [-0.25, 0, -0.1],
+					"scale": 0.75
+				},
+				"eyes_dim": {
+					"position": [0, 0, 0.1]
+				},
+				"head": {
+					"rotation": [10, 0, 0]
 				}
 			}
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0607_litwick/litwick.animation.json

@@ -26,6 +26,9 @@
 				},
 				"eyes": {
 					"scale": [1, "1-math.sin(q.anim_time*90)*0.03", 1]
+				},
+				"wax_trail": {
+					"position": [0, 0.02, 0]
 				}
 			}
 		},
@@ -43,7 +46,7 @@
 					"scale": [1, "1-math.sin(q.anim_time*90*4-135)*0.01", 1]
 				},
 				"flame": {
-					"rotation": ["(math.sin(q.anim_time*90)*6)*(math.sin(q.anim_time*90-90))", 0, "-(math.sin(q.anim_time*90-45)*6)*(math.sin(q.anim_time*90-90))"],
+					"rotation": ["-2.5+(math.sin(q.anim_time*90)*6)*(math.sin(q.anim_time*90-90))", 0, "0-(math.sin(q.anim_time*90-45)*6)*(math.sin(q.anim_time*90-90))"],
 					"scale": [1, "1+math.sin(q.anim_time*90*4+125)*0.1", 1]
 				},
 				"arm_right": {
@@ -61,7 +64,10 @@
 					"scale": [1, "1+math.sin(q.anim_time*90*4+90)*0.01", 1]
 				},
 				"wax_trail2": {
-					"position": [0, 0, "0.3-math.sin(q.anim_time*90*4+75)*0.33"]
+					"scale": [1, 1, "1-math.sin(q.anim_time*90*4+75)*0.1"]
+				},
+				"wax_trail": {
+					"position": [0, 0.03, 0]
 				}
 			}
 		},
@@ -100,7 +106,7 @@
 					"position": ["(math.sin(q.anim_time*90*2)*0.5)", 0, 0]
 				},
 				"wax_trail": {
-					"position": ["(math.sin(q.anim_time*90*2-90)*0.2)", 0, 0],
+					"position": ["(math.sin(q.anim_time*90*2-90)*0.2)", 0.02, 0],
 					"scale": ["1+(math.sin(q.anim_time*90*4+45)*0.04)", 1, 1]
 				},
 				"lip": {
@@ -141,7 +147,7 @@
 					"scale": [1, 0.9, 1]
 				},
 				"wax_trail": {
-					"position": [0, 0.5, 0],
+					"position": [0, 0.52, 0],
 					"scale": 1.075
 				},
 				"eyelid_right": {
@@ -153,62 +159,129 @@
 				"lip": {
 					"rotation": [4.98, 0, 0],
 					"position": [0, 0, -0.008]
+				},
+				"eye_left_open": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_closed_left": {
+					"position": [0, 0, -0.1]
+				},
+				"eye_right_open": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_closed_right": {
+					"position": [0, 0, -0.1]
 				}
 			}
 		},
 		"animation.litwick.blink": {
-			"animation_length": 0.20833,
+			"animation_length": 0.1667,
 			"bones": {
-				"eyelid_right": {
+				"eye_left_open": {
 					"position": {
-						"0.0": [-0.1, 0, -0.1],
-						"0.1667": [-0.1, 0, -0.1],
-						"0.2083": [0, 0, 0]
+						"0.0": [0, 0, 0.1],
+						"0.125": [0, 0, 0.1],
+						"0.1667": [0, 0, 0]
 					}
 				},
-				"eyelid_left": {
+				"eye_closed_left": {
 					"position": {
-						"0.0": [0.1, 0, -0.1],
-						"0.1667": [0.1, 0, -0.1],
-						"0.2083": [0, 0, 0]
+						"0.0": [0, 0, -0.1],
+						"0.125": [0, 0, -0.1],
+						"0.1667": [0, 0, 0]
+					}
+				},
+				"eye_right_open": {
+					"position": {
+						"0.0": [0, 0, 0.1],
+						"0.125": [0, 0, 0.1],
+						"0.1667": [0, 0, 0]
+					}
+				},
+				"eye_closed_right": {
+					"position": {
+						"0.0": [0, 0, -0.1],
+						"0.125": [0, 0, -0.1],
+						"0.1667": [0, 0, 0]
 					}
 				}
 			}
 		},
-		"animation.litwick.pose": {
+		"animation.litwick.shock": {
 			"loop": true,
 			"bones": {
-				"head": {
-					"rotation": [-7.56397, -7.43547, 0.98448]
+				"eye_left_open": {
+					"position": [0, 0.25, 0],
+					"scale": [1, 0.5, 1]
 				},
-				"hair": {
-					"rotation": [-2.5, 0, 0]
+				"eye_right_open": {
+					"position": [0, 0.25, 0]
 				},
-				"flame": {
-					"rotation": [-19.8423, -2.55868, -12.05239]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -50]
-				},
-				"arm_left": {
-					"rotation": [0, 0, 52.5]
-				},
-				"lip": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"mouth_small": {
-					"position": [0, 0, 0]
-				},
-				"mouth_large": {
-					"position": [0, 0, 0]
+				"mouth_open": {
+					"position": [0, 0, -0.1],
+					"scale": [0.9, 1, 1]
 				}
 			}
 		},
-		"animation.litwick.cry": {
-			"animation_length": 1.2,
-			"sound_effects": {
-				"0.04": {
-					"effect": "pokemon.litwick.cry"
+		"animation.litwick.angry": {
+			"loop": true,
+			"bones": {
+				"eye_expression_left": {
+					"position": [-0.5, 0, -0.1]
+				},
+				"eye_expression_right": {
+					"position": [0.5, 0, -0.1]
+				}
+			}
+		},
+		"animation.litwick.sad": {
+			"loop": true,
+			"bones": {
+				"eye_expression_left": {
+					"position": [0.5, 0, -0.1]
+				},
+				"eye_expression_right": {
+					"position": [-0.5, 0, -0.1]
+				}
+			}
+		},
+		"animation.litwick.happy": {
+			"loop": true,
+			"bones": {
+				"eye_left_open": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_happy_left": {
+					"position": [0, 0, -0.1]
+				},
+				"eye_right_open": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_happy_right": {
+					"position": [0, 0, -0.1]
+				},
+				"mouth_open": {
+					"position": [0, 0, -0.1],
+					"scale": [0.9, 1, 1]
+				}
+			}
+		},
+		"animation.litwick.hurt": {
+			"loop": true,
+			"bones": {
+				"eye_left_open": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_closed_left": {
+					"rotation": [0, 0, -27.5],
+					"position": [0, 0, -0.1]
+				},
+				"eye_right_open": {
+					"position": [0, 0, 0.1]
+				},
+				"eye_closed_right": {
+					"rotation": [0, 0, 27.5],
+					"position": [0, 0, -0.1]
 				}
 			}
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0608_lampent/lampent.animation.json

@@ -20,7 +20,7 @@
 					"rotation": ["-2.5 + math.sin(q.anim_time*90*2-90)", 5, "7.5 + 5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_left2": {
-					"rotation": [0, 0, "10 + 5*math.sin(q.anim_time*90*2+90)"]
+					"rotation": [0, 0, "5*math.sin(q.anim_time*90*2+90)"]
 				},
 				"arm_left3": {
 					"rotation": [0, 0, "10 + 5*math.sin(q.anim_time*90*2+180)"]
@@ -38,7 +38,7 @@
 					"rotation": ["-2.5+math.sin(q.anim_time*90*2-90)", -5, "-7.5 - 5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_right2": {
-					"rotation": [0, 0, "-10 - 5*math.sin(q.anim_time*90*2+90)"]
+					"rotation": [0, 0, "- 5*math.sin(q.anim_time*90*2+90)"]
 				},
 				"arm_right3": {
 					"rotation": [0, 0, "-10 - 5*math.sin(q.anim_time*90*2+180)"]
@@ -59,7 +59,13 @@
 					"scale": 0
 				},
 				"body": {
-					"position": [0, 4, 0]
+					"position": [0, 1, 0]
+				},
+				"arm_left7": {
+					"rotation": [0, 0, 57.5]
+				},
+				"arm_right7": {
+					"rotation": [0, 0, -57.5]
 				}
 			}
 		},
@@ -82,7 +88,7 @@
 					"rotation": ["10.2854 + math.sin(q.anim_time*90*2-90)*2", 6.26335, "18.6835 + 5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_left2": {
-					"rotation": [0, 0, "18 + 5*math.sin(q.anim_time*90*2+90)"]
+					"rotation": [0, 0, "10.5 + 5*math.sin(q.anim_time*90*2+90)"]
 				},
 				"arm_left3": {
 					"rotation": [0, 0, "20 + 5*math.sin(q.anim_time*90*2+180)"]
@@ -100,7 +106,7 @@
 					"rotation": ["10.2854 + math.sin(q.anim_time*90*2-90)*2", -6.26335, "-18.6835+ 5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_right2": {
-					"rotation": [0, 0, "-18+ 5*math.sin(q.anim_time*90*2+90)"]
+					"rotation": [0, 0, "-10.5+ 5*math.sin(q.anim_time*90*2+90)"]
 				},
 				"arm_right3": {
 					"rotation": [0, 0, "-20+ 5*math.sin(q.anim_time*90*2+180)"]
@@ -125,6 +131,12 @@
 				},
 				"head": {
 					"rotation": [0, 0, 0]
+				},
+				"arm_left7": {
+					"rotation": [0, 0, 57.5]
+				},
+				"arm_right7": {
+					"rotation": [-2.50463, -13.04546, -71.15153]
 				}
 			}
 		},
@@ -187,6 +199,12 @@
 				},
 				"body": {
 					"position": [0, 4, 0]
+				},
+				"arm_left7": {
+					"rotation": [0, 0, 47.5]
+				},
+				"arm_right7": {
+					"rotation": [0, 0, -47.5]
 				}
 			}
 		},
@@ -209,7 +227,7 @@
 					"rotation": ["10.2854 + math.sin(q.anim_time*90*2-90)*2", 6.26335, "18.6835 + 5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_left2": {
-					"rotation": [0, 0, "18 + 5*math.sin(q.anim_time*90*2+90)"]
+					"rotation": [0, 0, "10.5 + 5*math.sin(q.anim_time*90*2+90)"]
 				},
 				"arm_left3": {
 					"rotation": [0, 0, "20 + 5*math.sin(q.anim_time*90*2+180)"]
@@ -227,7 +245,7 @@
 					"rotation": ["10.2854 + math.sin(q.anim_time*90*2-90)*2", -6.26335, "-18.6835+ 5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_right2": {
-					"rotation": [0, 0, "-18+ 5*math.sin(q.anim_time*90*2+90)"]
+					"rotation": [0, 0, "-10.5+ 5*math.sin(q.anim_time*90*2+90)"]
 				},
 				"arm_right3": {
 					"rotation": [0, 0, "-20+ 5*math.sin(q.anim_time*90*2+180)"]
@@ -252,6 +270,12 @@
 				},
 				"head": {
 					"rotation": [0, 0, 0]
+				},
+				"arm_left7": {
+					"rotation": [0, 0, 57.5]
+				},
+				"arm_right7": {
+					"rotation": [0, 0, -57.5]
 				}
 			}
 		},
@@ -297,13 +321,13 @@
 					"rotation": [0, 0, "22+5*math.sin(q.anim_time*90*2)*0.5"]
 				},
 				"arm_right3": {
-					"rotation": [0, 0, "35+5*math.sin(q.anim_time*90*2)"]
+					"rotation": [0, 0, "25+5*math.sin(q.anim_time*90*2)"]
 				},
 				"arm_right4": {
 					"rotation": [0, 0, "19.5+5*math.sin(q.anim_time*90*2)*0.5"]
 				},
 				"arm_right5": {
-					"rotation": [0, 0, "30+5*math.sin(q.anim_time*90*2)*0.5"]
+					"rotation": [0, 0, "15+5*math.sin(q.anim_time*90*2)*0.5"]
 				},
 				"arm_right6": {
 					"rotation": [0, 0, "24+5*math.sin(q.anim_time*90*2)*0.5"]
@@ -316,6 +340,12 @@
 				},
 				"body": {
 					"position": [0, 4, 0]
+				},
+				"arm_left7": {
+					"rotation": [0, 0, 70]
+				},
+				"arm_right7": {
+					"rotation": [0, 0, 12.5]
 				}
 			}
 		},
@@ -379,31 +409,29 @@
 				"body": {
 					"position": [0, 4, 0]
 				},
-				"eye_left": {
-					"scale": 0
+				"arm_left7": {
+					"rotation": [0, 0, 67.5]
 				},
-				"eye_right": {
-					"scale": 0
+				"arm_right7": {
+					"rotation": [0, 0, -67.5]
+				},
+				"eye_left_open": {
+					"position": [0, 4, 0]
+				},
+				"eye_closed_left": {
+					"position": [0, -4, 0]
+				},
+				"eye_right_open": {
+					"position": [0, 4, 0]
+				},
+				"eye_closed_right": {
+					"position": [0, -4, 0]
 				}
 			}
 		},
 		"animation.lampent.blink": {
-			"animation_length": 0.16667,
+			"animation_length": 0.1667,
 			"bones": {
-				"eye_left": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"0.125": [0, 0, 0],
-						"0.1667": [1, 1, 1]
-					}
-				},
-				"eye_right": {
-					"scale": {
-						"0.0": [0, 0, 0],
-						"0.125": [0, 0, 0],
-						"0.1667": [1, 1, 1]
-					}
-				},
 				"eyelid_left": {
 					"scale": {
 						"0.0": [1, 1, 1],
@@ -417,68 +445,116 @@
 						"0.125": [1, 1, 1],
 						"0.1667": [1, 1, 1]
 					}
+				},
+				"eye_left_open": {
+					"position": {
+						"0.0": [0, 4, 0],
+						"0.125": {"pre": [0, 4, 0], "post": [0, 4, 0]},
+						"0.1667": {"pre": [0, 4, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_closed_left": {
+					"position": {
+						"0.0": [0, -4, 0],
+						"0.125": {"pre": [0, -4, 0], "post": [0, -4, 0]},
+						"0.1667": {"pre": [0, -4, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_right_open": {
+					"position": {
+						"0.0": [0, 4, 0],
+						"0.125": {"pre": [0, 4, 0], "post": [0, 4, 0]},
+						"0.1667": {"pre": [0, 4, 0], "post": [0, 0, 0]}
+					}
+				},
+				"eye_closed_right": {
+					"position": {
+						"0.0": [0, -4, 0],
+						"0.125": {"pre": [0, -4, 0], "post": [0, -4, 0]},
+						"0.1667": {"pre": [0, -4, 0], "post": [0, 0, 0]}
+					}
 				}
 			}
 		},
-		"animation.lampent.pose": {
+		"animation.lampent.shock": {
 			"loop": true,
 			"bones": {
-				"body": {
-					"rotation": [0, -5, 7.5]
+				"eye_left_open": {
+					"position": [0, 0.25, 0],
+					"scale": [0.7, 0.7, 1]
 				},
-				"head": {
-					"rotation": [14.60945, 2.9986, -5.59467]
+				"eye_left_open2": {
+					"scale": 0
 				},
-				"arm_left": {
-					"rotation": [0, 25, -7.5]
+				"eye_right_open": {
+					"position": [0, 0.25, 0],
+					"scale": [0.7, 0.7, 1]
 				},
-				"arm_left2": {
-					"rotation": [0, 0, -22.5]
-				},
-				"arm_left3": {
-					"rotation": [0, 0, -17.5]
-				},
-				"arm_left4": {
-					"rotation": [0, 0, -22.5]
-				},
-				"arm_left5": {
-					"rotation": [0, 0, -30]
-				},
-				"arm_left6": {
-					"rotation": [0, 0, -28.5]
-				},
-				"arm_right": {
-					"rotation": [0, 0, -5]
-				},
-				"arm_right2": {
-					"rotation": [0, 0, -20]
-				},
-				"arm_right3": {
-					"rotation": [0, 0, -25]
-				},
-				"arm_right4": {
-					"rotation": [0, 0, -40]
-				},
-				"arm_right5": {
-					"rotation": [0, 0, -38.5]
-				},
-				"arm_right6": {
-					"rotation": [0, 0, -36.5]
-				},
-				"swing": {
-					"rotation": [-13.63677, 25.79103, 6.17047],
-					"position": [4.2, 4, 11]
-				},
-				"flame": {
-					"rotation": [0, 22.5, 0]
+				"eye_right_open2": {
+					"position": [-0.25, -0.25, 0],
+					"scale": 0
 				}
 			}
 		},
-		"animation.lampent.cry": {
-			"animation_length": 1.2,
-			"sound_effects": {
-				"0.04": {
-					"effect": "pokemon.lampent.cry"
+		"animation.lampent.angry": {
+			"loop": true,
+			"bones": {
+				"eye_left_open2": {
+					"position": [0.25, -0.25, 0],
+					"scale": [0.5, 0.5, 1]
+				},
+				"eye_right_open2": {
+					"position": [-0.25, -0.25, 0],
+					"scale": [0.5, 0.5, 1]
+				}
+			}
+		},
+		"animation.lampent.sad": {
+			"loop": true,
+			"bones": {
+				"eye_left_open2": {
+					"position": [-0.25, -0.25, 0],
+					"scale": [0.5, 0.5, 1]
+				},
+				"eye_right_open2": {
+					"position": [0.25, -0.25, 0],
+					"scale": [0.5, 0.5, 1]
+				}
+			}
+		},
+		"animation.lampent.happy": {
+			"loop": true,
+			"bones": {
+				"eye_left_open": {
+					"position": [0, 4, 0]
+				},
+				"eye_happy_left": {
+					"position": [0, -4, 0]
+				},
+				"eye_right_open": {
+					"position": [0, 4, 0]
+				},
+				"eye_happy_right": {
+					"position": [0, -4, 0]
+				}
+			}
+		},
+		"animation.lampent.hurt": {
+			"loop": true,
+			"bones": {
+				"eye_left_open": {
+					"position": [0, 4, 0]
+				},
+				"eye_closed_left": {
+					"rotation": [0, 0, -20],
+					"position": [0, -4, 0]
+				},
+				"eye_right_open": {
+					"position": [0, 4, 0]
+				},
+				"eye_closed_right": {
+					"rotation": [0, 0, 20],
+					"position": [0, -4, 0]
 				}
 			}
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0310_manectric/manectric.geo.json

@@ -31,6 +31,14 @@
 						"top": [0, 38, 0]
 					}
 				},
+				{
+					"name": "locator_target",
+					"parent": "manectric",
+					"pivot": [0, 15, -17],
+					"locators": {
+						"target": [0, 15, -17]
+					}
+				},
 				{
 					"name": "body",
 					"parent": "manectric",
@@ -44,14 +52,6 @@
 						"middle": [0, 17, 0]
 					}
 				},
-				{
-					"name": "locator_target",
-					"parent": "body",
-					"pivot": [0, 18, -19],
-					"locators": {
-						"target": [0, 18, -19]
-					}
-				},
 				{
 					"name": "hips",
 					"parent": "body",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0605_elgyem/elgyem.geo.json

@@ -16,144 +16,445 @@
 					"pivot": [0, 0, 0]
 				},
 				{
-					"name": "body",
+					"name": "locator_root",
 					"parent": "elgyem",
-					"pivot": [0, 5.5, 0.25]
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
 				},
 				{
-					"name": "torso_medium",
+					"name": "locator_top",
+					"parent": "elgyem",
+					"pivot": [0, 24, 0],
+					"locators": {
+						"top": [0, 24, 0]
+					}
+				},
+				{
+					"name": "body",
+					"parent": "elgyem",
+					"pivot": [0, 5.75, 0]
+				},
+				{
+					"name": "locator_target",
 					"parent": "body",
-					"pivot": [0, 5, 1.75],
+					"pivot": [0, 9, -6],
+					"locators": {
+						"target": [0, 9, -6]
+					}
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 10, 0],
+					"locators": {
+						"middle": [0, 10, 0]
+					}
+				},
+				{
+					"name": "torso_middle",
+					"parent": "body",
+					"pivot": [0, 5.25, 1.75],
 					"cubes": [
-						{"origin": [-1.5, 4.75, -1.25], "size": [3, 2, 3], "uv": [39, 4]}
+						{"origin": [-1.5, 5, -1.25], "size": [3, 2, 3], "uv": [39, 4]}
 					]
 				},
 				{
 					"name": "torso_top",
-					"parent": "torso_medium",
-					"pivot": [0, 6.25, 1],
+					"parent": "torso_middle",
+					"pivot": [0, 6.5, 1],
 					"cubes": [
-						{"origin": [-1, 6, -1], "size": [2, 3, 2], "uv": [49, 11]}
+						{"origin": [-1, 6.25, -1], "size": [2, 4, 2], "uv": [39, 13]}
 					]
 				},
 				{
 					"name": "head",
 					"parent": "torso_top",
-					"pivot": [0, 9, 0],
+					"pivot": [0, 9.25, 0]
+				},
+				{
+					"name": "head_ai",
+					"parent": "head",
+					"pivot": [0, 9.25, 0]
+				},
+				{
+					"name": "head_angle",
+					"parent": "head_ai",
+					"pivot": [0, 9.25, 0],
 					"cubes": [
-						{"origin": [-3.5, 9, -3.25], "size": [7, 11, 6], "uv": [0, 0]},
-						{"origin": [-3.5, 11.5, -3.25], "size": [7, 1, 6], "inflate": 0.01, "uv": [0, 17]}
+						{"origin": [-3.5, 9.25, -3.25], "size": [7, 11, 6], "uv": [0, 0]},
+						{"origin": [-3.5, 11.75, -3.25], "size": [7, 1, 6], "inflate": 0.01, "uv": [0, 17]}
 					]
 				},
+				{
+					"name": "locator_item_hat",
+					"parent": "head_angle",
+					"pivot": [0, 19.5, -0.25],
+					"locators": {
+						"item_hat": [0, 19.5, -0.25]
+					}
+				},
+				{
+					"name": "locator_head",
+					"parent": "head_angle",
+					"pivot": [0, 19.25, -3.25],
+					"locators": {
+						"head": [0, 19.25, -3.25]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "head_angle",
+					"pivot": [0, 11, -3.25],
+					"locators": {
+						"item_face": [0, 11, -3.25]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "head_angle",
+					"pivot": [0, 11.25, -3.25],
+					"locators": {
+						"face": [0, 11.25, -3.25]
+					}
+				},
+				{
+					"name": "eyes",
+					"parent": "head_angle",
+					"pivot": [0, 10.75, -3.25]
+				},
 				{
 					"name": "eye_right",
-					"parent": "head",
-					"pivot": [-1.25, 10.5, -3.25],
+					"parent": "eyes",
+					"pivot": [-1.5, 10.75, -3.25],
 					"cubes": [
-						{"origin": [-1.75, 9.5, -3.265], "size": [1, 2, 0], "uv": [4, 17]}
+						{"origin": [-2, 9.75, -3.265], "size": [1, 2, 0], "uv": [43, 1]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-1.5, 10.75, -3.25],
+					"locators": {
+						"eye1": [-1.5, 10.75, -3.25]
+					}
+				},
+				{
+					"name": "eye_bright_right",
+					"parent": "eye_right",
+					"pivot": [-1.5, 10.75, -3.15],
+					"cubes": [
+						{"origin": [-2, 9.75, -3.165], "size": [1, 2, 0], "inflate": 0.01, "uv": [49, 1]}
 					]
 				},
 				{
 					"name": "eye_left",
-					"parent": "head",
-					"pivot": [1.25, 10.5, -3.25],
+					"parent": "eyes",
+					"pivot": [1.5, 10.75, -3.25],
 					"cubes": [
-						{"origin": [0.75, 9.5, -3.265], "size": [1, 2, 0], "uv": [4, 0]}
+						{"origin": [1, 9.75, -3.265], "size": [1, 2, 0], "uv": [40, 1]}
 					]
 				},
 				{
-					"name": "arm_right",
-					"parent": "torso_top",
-					"pivot": [-1, 8.5, 0],
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [1.5, 10.75, -3.25],
+					"locators": {
+						"eye2": [1.5, 10.75, -3.25]
+					}
+				},
+				{
+					"name": "eye_bright_left",
+					"parent": "eye_left",
+					"pivot": [1.5, 10.75, -3.15],
 					"cubes": [
-						{"origin": [-4.5, 7.5, -0.5], "size": [4, 1, 1], "uv": [38, 11]}
+						{"origin": [1, 9.75, -3.165], "size": [1, 2, 0], "inflate": 0.01, "uv": [46, 1]}
+					]
+				},
+				{
+					"name": "arms",
+					"parent": "torso_top",
+					"pivot": [0, 8.75, 0]
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-1, 8.75, 0],
+					"cubes": [
+						{"origin": [-4.5, 7.75, -0.5], "size": [4, 1, 1], "uv": [38, 11]}
 					]
 				},
 				{
 					"name": "forearm_right",
 					"parent": "arm_right",
-					"pivot": [-4, 8, 0],
+					"pivot": [-4, 8.25, 0],
 					"cubes": [
-						{"origin": [-6, 7, -1], "size": [2, 2, 2], "uv": [44, 0]}
+						{"origin": [-7, 7.25, -1], "size": [3, 2, 2], "uv": [47, 11]}
 					]
 				},
 				{
 					"name": "hand_right",
 					"parent": "forearm_right",
-					"pivot": [-6, 8, 0],
+					"pivot": [-7, 9.25, 0],
 					"cubes": [
-						{"origin": [-9, 7, -1.5], "size": [3, 2, 3], "inflate": 0.01, "uv": [26, 11]},
-						{"origin": [-8.75, 6.5, -0.5], "size": [1, 1, 1], "uv": [0, 17]},
-						{"origin": [-7.25, 6.5, 0.25], "size": [1, 1, 1], "uv": [0, 19]},
-						{"origin": [-7.25, 6.5, -1.25], "size": [1, 1, 1], "uv": [0, 21]}
+						{"origin": [-9, 7.25, -1.5], "size": [3, 2, 3], "inflate": 0.01, "uv": [26, 11]}
+					]
+				},
+				{
+					"name": "locator_hand_primary",
+					"parent": "hand_right",
+					"pivot": [-7.5, 7.25, 0],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"hand_primary": [-7.5, 7.25, 0],
+						"physical": [-7.5, 7.25, 0],
+						"special": [-7.5, 7.25, 0]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "hand_right",
+					"pivot": [-7.5, 6.5, -0.5],
+					"locators": {
+						"item": [-7.5, 6.5, -0.5]
+					}
+				},
+				{
+					"name": "fingers_right",
+					"parent": "hand_right",
+					"pivot": [-7.25, 7.25, 0]
+				},
+				{
+					"name": "right_finger_dim_green",
+					"parent": "fingers_right",
+					"pivot": [-6.75, 7.25, -0.75],
+					"cubes": [
+						{"origin": [-7.25, 6.75, -1.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [5, 29]}
+					]
+				},
+				{
+					"name": "right_finger_bright_green",
+					"parent": "right_finger_dim_green",
+					"pivot": [-6.75, 7.25, -0.75],
+					"cubes": [
+						{"origin": [-7.25, 6.75, -1.25], "size": [1, 1, 1], "uv": [10, 29]}
+					]
+				},
+				{
+					"name": "right_finger_dim_red",
+					"parent": "fingers_right",
+					"pivot": [-8.25, 7.25, 0],
+					"cubes": [
+						{"origin": [-8.75, 6.75, -0.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [5, 25]}
+					]
+				},
+				{
+					"name": "right_finger_bright_red",
+					"parent": "right_finger_dim_red",
+					"pivot": [-8.25, 7.25, 0],
+					"cubes": [
+						{"origin": [-8.75, 6.75, -0.5], "size": [1, 1, 1], "uv": [10, 25]}
+					]
+				},
+				{
+					"name": "right_finger_dim_yellow",
+					"parent": "fingers_right",
+					"pivot": [-6.75, 7.25, 0.75],
+					"cubes": [
+						{"origin": [-7.25, 6.75, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [5, 27]}
+					]
+				},
+				{
+					"name": "right_finger_bright_yellow",
+					"parent": "right_finger_dim_yellow",
+					"pivot": [-6.75, 7.25, 0.75],
+					"cubes": [
+						{"origin": [-7.25, 6.75, 0.25], "size": [1, 1, 1], "uv": [10, 27]}
 					]
 				},
 				{
 					"name": "arm_left",
-					"parent": "torso_top",
-					"pivot": [1, 8.5, 0],
+					"parent": "arms",
+					"pivot": [1, 8.75, 0],
 					"cubes": [
-						{"origin": [0.5, 7.5, -0.5], "size": [4, 1, 1], "uv": [38, 9]}
+						{"origin": [0.5, 7.75, -0.5], "size": [4, 1, 1], "uv": [38, 9]}
 					]
 				},
 				{
 					"name": "forearm_left",
 					"parent": "arm_left",
-					"pivot": [4, 8, 0],
+					"pivot": [4, 8.25, 0],
 					"cubes": [
-						{"origin": [4, 7, -1], "size": [2, 2, 2], "uv": [36, 0]}
+						{"origin": [4, 7.25, -1], "size": [3, 2, 2], "uv": [47, 15]}
 					]
 				},
 				{
 					"name": "hand_left",
 					"parent": "forearm_left",
-					"pivot": [6, 8, 0],
+					"pivot": [7, 9.25, 0],
 					"cubes": [
-						{"origin": [6, 7, -1.5], "size": [3, 2, 3], "inflate": 0.01, "uv": [26, 6]},
-						{"origin": [7.75, 6.5, -0.5], "size": [1, 1, 1], "uv": [0, 0]},
-						{"origin": [6.25, 6.5, 0.25], "size": [1, 1, 1], "uv": [0, 2]},
-						{"origin": [6.25, 6.5, -1.25], "size": [1, 1, 1], "uv": [0, 4]}
+						{"origin": [6, 7.25, -1.5], "size": [3, 2, 3], "inflate": 0.01, "uv": [26, 6]}
+					]
+				},
+				{
+					"name": "locator_hand_secondary",
+					"parent": "hand_left",
+					"pivot": [7.5, 7.25, 0],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"hand_secondary": [7.5, 7.25, 0]
+					}
+				},
+				{
+					"name": "fingers_left",
+					"parent": "hand_left",
+					"pivot": [7.25, 7.25, 0]
+				},
+				{
+					"name": "left_finger_dim_green",
+					"parent": "fingers_left",
+					"pivot": [6.75, 7.25, -0.75],
+					"cubes": [
+						{"origin": [6.25, 6.75, -1.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [1, 29]}
+					]
+				},
+				{
+					"name": "left_finger_bright_green",
+					"parent": "left_finger_dim_green",
+					"pivot": [6.75, 7.25, -0.75],
+					"cubes": [
+						{"origin": [6.25, 6.75, -1.25], "size": [1, 1, 1], "uv": [14, 29]}
+					]
+				},
+				{
+					"name": "left_finger_dim_red",
+					"parent": "fingers_left",
+					"pivot": [8.25, 7.25, 0],
+					"cubes": [
+						{"origin": [7.75, 6.75, -0.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [1, 25]}
+					]
+				},
+				{
+					"name": "left_finger_bright_red2",
+					"parent": "left_finger_dim_red",
+					"pivot": [8.25, 7.25, 0],
+					"cubes": [
+						{"origin": [7.75, 6.75, -0.5], "size": [1, 1, 1], "uv": [14, 25]}
+					]
+				},
+				{
+					"name": "left_finger_dim_yellow",
+					"parent": "fingers_left",
+					"pivot": [6.75, 7.25, 0.75],
+					"cubes": [
+						{"origin": [6.25, 6.75, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [1, 27]}
+					]
+				},
+				{
+					"name": "left_finger_bright_yellow",
+					"parent": "left_finger_dim_yellow",
+					"pivot": [6.75, 7.25, 0.75],
+					"cubes": [
+						{"origin": [6.25, 6.75, 0.25], "size": [1, 1, 1], "uv": [14, 27]}
 					]
 				},
 				{
 					"name": "torso_bottom",
 					"parent": "body",
-					"pivot": [0, 5.5, 1.75],
+					"pivot": [0, 5.75, 1.75],
 					"cubes": [
-						{"origin": [-2, 2.5, -1.5], "size": [4, 3, 4], "uv": [48, 0]}
+						{"origin": [-2, 2.75, -1.5], "size": [4, 3, 4], "uv": [48, 0]}
 					]
 				},
 				{
 					"name": "tail",
 					"parent": "torso_bottom",
-					"pivot": [0, 2.5, 1.5],
+					"pivot": [0, 3.75, 1.5],
 					"cubes": [
-						{"origin": [-1, 2.5, 1.25], "size": [2, 2, 2], "inflate": 0.01, "uv": [49, 7]}
+						{"origin": [-1, 2.75, 1.25], "size": [2, 2, 2], "inflate": 0.01, "uv": [49, 7]}
 					]
 				},
 				{
-					"name": "tail_tip",
+					"name": "locator_tail",
 					"parent": "tail",
-					"pivot": [0, 3.5, 3.25],
+					"pivot": [0, 3.75, 3.25],
+					"rotation": [-180, 0, 180],
+					"locators": {
+						"tail": [0, 3.75, 3.25]
+					}
+				},
+				{
+					"name": "tail2",
+					"parent": "tail",
+					"pivot": [0, 3.75, 3.25],
 					"cubes": [
-						{"origin": [-0.5, 3, 3], "size": [1, 1, 2], "uv": [36, 4]}
+						{"origin": [-0.5, 3.25, 3], "size": [1, 1, 2], "uv": [36, 4]}
 					]
 				},
+				{
+					"name": "locator_tail_tip",
+					"parent": "tail2",
+					"pivot": [0, 3.75, 5],
+					"rotation": [-180, 0, 180],
+					"locators": {
+						"tail_tip": [0, 3.75, 5]
+					}
+				},
+				{
+					"name": "legs",
+					"parent": "torso_bottom",
+					"pivot": [0, 3.25, -0.25]
+				},
 				{
 					"name": "leg_right",
-					"parent": "torso_bottom",
-					"pivot": [-1.25, 3.25, 0.25],
+					"parent": "legs",
+					"pivot": [-1.25, 3.25, -0.25],
 					"cubes": [
-						{"origin": [-2.5, 0, -0.75], "size": [2, 4, 2], "uv": [28, 0]}
+						{"origin": [-2.5, 2, -1.25], "size": [2, 2, 2], "inflate": 0.01, "uv": [28, 20]}
 					]
 				},
 				{
-					"name": "leg_left",
-					"parent": "torso_bottom",
-					"pivot": [1.25, 3.25, 0.25],
+					"name": "leg_right2",
+					"parent": "leg_right",
+					"pivot": [-1.5, 2, -1.25],
 					"cubes": [
-						{"origin": [0.5, 0, -0.75], "size": [2, 4, 2], "uv": [20, 0]}
+						{"origin": [-2.5, 0, -1.25], "size": [2, 2, 2], "uv": [28, 16]}
 					]
+				},
+				{
+					"name": "locator_foot_primary",
+					"parent": "leg_right2",
+					"pivot": [-1.5, 0.5, -0.3],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_primary": [-1.5, 0.5, -0.3]
+					}
+				},
+				{
+					"name": "leg_left",
+					"parent": "legs",
+					"pivot": [1.25, 3.25, -0.25],
+					"cubes": [
+						{"origin": [0.5, 2, -1.25], "size": [2, 2, 2], "inflate": 0.01, "uv": [20, 2]}
+					]
+				},
+				{
+					"name": "leg_left2",
+					"parent": "leg_left",
+					"pivot": [1.5, 2, -1.25],
+					"cubes": [
+						{"origin": [0.5, 0, -1.25], "size": [2, 2, 2], "uv": [28, 2]}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "leg_left2",
+					"pivot": [1.5, 0.5, -0.3],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [1.5, 0.5, -0.3]
+					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0606_beheeyem/beheeyem.geo.json

@@ -4,8 +4,8 @@
 		{
 			"description": {
 				"identifier": "geometry.beheeyem",
-				"texture_width": 128,
-				"texture_height": 32,
+				"texture_width": 64,
+				"texture_height": 64,
 				"visible_bounds_width": 3,
 				"visible_bounds_height": 3.5,
 				"visible_bounds_offset": [0, 1.25, 0]
@@ -15,160 +15,442 @@
 					"name": "beheeyem",
 					"pivot": [0, 0, 0]
 				},
+				{
+					"name": "locator_root",
+					"parent": "beheeyem",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "beheeyem",
+					"pivot": [0, 31, 0],
+					"locators": {
+						"top": [0, 31, 0]
+					}
+				},
 				{
 					"name": "body",
 					"parent": "beheeyem",
 					"pivot": [0, 7, 0]
 				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 11, 0],
+					"locators": {
+						"middle": [0, 11, 0]
+					}
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 10, -8],
+					"locators": {
+						"target": [0, 10, -8]
+					}
+				},
 				{
 					"name": "torso_top",
 					"parent": "body",
-					"pivot": [-1.25, 7.25, 2],
+					"pivot": [0.25, 7.25, 0],
 					"cubes": [
-						{"origin": [-2, 7.22906, -2.00011], "size": [4, 6, 4], "uv": [35, 0]},
-						{"origin": [0.75, 7.97906, -2.32511], "size": [1, 1, 1], "pivot": [1.25, 8.47906, -1.92511], "rotation": [0, -5, 0], "uv": [81, 2]},
-						{"origin": [-1.75, 7.97906, -2.32511], "size": [1, 1, 1], "pivot": [-1.25, 8.47906, -1.92511], "rotation": [0, 5, 0], "uv": [95, 2]}
+						{"origin": [-2, 6.25, -2], "size": [4, 7, 4], "uv": [35, 0]},
+						{"origin": [0.75, 8.5, -2.3], "size": [1, 1, 1], "uv": [40, 58]},
+						{"origin": [-1.75, 8.5, -2.3], "size": [1, 1, 1], "uv": [36, 58]}
 					]
 				},
 				{
 					"name": "collar_back",
 					"parent": "torso_top",
-					"pivot": [0, 13.22906, -0.25011],
+					"pivot": [0, 12.23, -0.25],
 					"cubes": [
-						{"origin": [-2.5, 11.22906, -0.25011], "size": [5, 2, 3], "inflate": 0.01, "uv": [89, 14]}
+						{"origin": [-2.5, 11.25, -0.25], "size": [5, 2, 3], "inflate": 0.01, "uv": [48, 12]}
 					]
 				},
 				{
 					"name": "collar_front",
 					"parent": "collar_back",
-					"pivot": [0, 12.72906, -0.25011],
-					"rotation": [30, 0, 0],
+					"pivot": [0, 12.75, -0.25],
 					"cubes": [
-						{"origin": [-2.5, 11.72906, -3.25011], "size": [2, 1, 3], "uv": [50, 22]},
-						{"origin": [0.5, 11.72906, -3.25011], "size": [2, 1, 3], "uv": [60, 22]}
+						{"origin": [-2.5, 11.75, -3.25], "size": [2, 1, 3], "uv": [54, 17]},
+						{"origin": [0.5, 11.75, -3.25], "size": [2, 1, 3], "uv": [54, 21]}
 					]
 				},
 				{
 					"name": "head",
 					"parent": "torso_top",
-					"pivot": [0, 12.72906, -0.00011],
+					"pivot": [0, 12.73, 0]
+				},
+				{
+					"name": "head_ai",
+					"parent": "head",
+					"pivot": [0, 12.73, 0]
+				},
+				{
+					"name": "head_angle",
+					"parent": "head_ai",
+					"pivot": [0, 12.73, 0],
 					"cubes": [
-						{"origin": [-4, 19.72906, -3.50011], "size": [8, 7, 7], "uv": [0, 14]},
-						{"origin": [-4.5, 16.72906, -4.50011], "size": [9, 3, 9], "uv": [92, 0]},
-						{"origin": [-6, 13.72906, -5.50011], "size": [12, 3, 11], "uv": [0, 0]},
-						{"origin": [-4, 12.72906, -3.50011], "size": [8, 1, 7], "uv": [98, 12]},
-						{"origin": [-0.5, 19.72906, -3.50011], "size": [1, 1, 1], "inflate": 0.005, "uv": [51, 5]},
-						{"origin": [-6, 14.22906, -5.50011], "size": [12, 1, 11], "inflate": 0.005, "uv": [46, 0]},
-						{"origin": [-5, 13.72906, -4.50011], "size": [10, 1, 9], "inflate": 0.005, "uv": [37, 12]},
-						{"origin": [-4, 13.22906, -3.50011], "size": [8, 1, 7], "inflate": 0.005, "uv": [66, 12]}
+						{"origin": [-4, 19.75, -4], "size": [8, 7, 7], "uv": [0, 14]},
+						{"origin": [-4.5, 16.75, -5], "size": [9, 3, 9], "uv": [0, 28]},
+						{"origin": [-6, 13.75, -6], "size": [12, 3, 11], "uv": [0, 0]},
+						{"origin": [-4, 12.75, -4], "size": [8, 1, 7], "uv": [23, 40]},
+						{"origin": [-0.5, 19.75, -4], "size": [1, 1, 0], "inflate": 0.005, "uv": [48, 1]},
+						{"origin": [-6, 14.25, -6], "size": [12, 1, 11], "inflate": 0.005, "uv": [0, 52]},
+						{"origin": [-4, 13.25, -4], "size": [8, 1, 7], "inflate": 0.005, "uv": [0, 44]}
 					]
 				},
+				{
+					"name": "locator_item_hat",
+					"parent": "head_angle",
+					"pivot": [0, 25.75, -0.5],
+					"locators": {
+						"item_hat": [0, 25.75, -0.5]
+					}
+				},
+				{
+					"name": "locator_head",
+					"parent": "head_angle",
+					"pivot": [0, 22.75, -4],
+					"locators": {
+						"head": [0, 22.75, -4]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "head_angle",
+					"pivot": [0, 15, -5.9],
+					"locators": {
+						"item_face": [0, 15, -5.9]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "head_angle",
+					"pivot": [0, 14.85, -6],
+					"locators": {
+						"face": [0, 14.85, -6]
+					}
+				},
 				{
 					"name": "eyes",
-					"parent": "head",
-					"pivot": [0, 14.72906, -5.50011],
+					"parent": "head_angle",
+					"pivot": [0, 14.75, -6]
+				},
+				{
+					"name": "eyes_bright",
+					"parent": "eyes",
+					"pivot": [0, 14.85, -5.9],
 					"cubes": [
-						{"origin": [-4, 14.22906, -5.51511], "size": [8, 1, 0], "uv": [35, 10]},
-						{"origin": [-3, 13.72906, -5.51011], "size": [2, 2, 0], "uv": [51, 7]},
-						{"origin": [1, 13.72906, -5.51011], "size": [2, 2, 0], "uv": [51, 9]},
-						{"origin": [-2.5, 13.72906, -5.52011], "size": [1, 2, 0], "uv": [55, 7]},
-						{"origin": [1.5, 13.72906, -5.52011], "size": [1, 2, 0], "uv": [55, 9]},
-						{"origin": [-2.5, 14.22906, -5.52511], "size": [1, 1, 0], "uv": [55, 5]},
-						{"origin": [1.5, 14.22906, -5.52511], "size": [1, 1, 0], "uv": [55, 6]}
+						{"origin": [-4, 14.35, -5.91], "size": [8, 1, 0], "uv": [47, 45]},
+						{"origin": [-3, 13.85, -5.915], "size": [2, 2, 0], "uv": [1, 4]},
+						{"origin": [1, 13.85, -5.915], "size": [2, 2, 0], "uv": [6, 4]}
 					]
 				},
 				{
-					"name": "arm_right",
-					"parent": "torso_top",
-					"pivot": [-2, 10.97906, -0.00011],
+					"name": "eyes_dim",
+					"parent": "eyes",
+					"pivot": [0, 14.85, -6],
 					"cubes": [
-						{"origin": [-6.5, 10.47906, -0.50011], "size": [5, 1, 1], "uv": [87, 20]}
+						{"origin": [-4, 14.35, -6.01], "size": [8, 1, 0], "uv": [47, 43]},
+						{"origin": [-3, 13.85, -6.015], "size": [2, 2, 0], "uv": [1, 1]},
+						{"origin": [1, 13.85, -6.015], "size": [2, 2, 0], "uv": [6, 1]}
+					]
+				},
+				{
+					"name": "pupil_left",
+					"parent": "eyes",
+					"pivot": [2, 14.85, -6],
+					"cubes": [
+						{"origin": [1.5, 14.35, -6.02], "size": [1, 1, 0], "uv": [6, 7]}
+					]
+				},
+				{
+					"name": "locator_eye_left",
+					"parent": "pupil_left",
+					"pivot": [2, 14.85, -6],
+					"locators": {
+						"eye2": [2, 14.85, -6]
+					}
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eyes",
+					"pivot": [-2, 14.85, -6.01],
+					"cubes": [
+						{"origin": [-2.5, 14.35, -6.02], "size": [1, 1, 0], "uv": [1, 7]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "pupil_right",
+					"pivot": [-2, 14.85, -6],
+					"locators": {
+						"eye1": [-2, 14.85, -6]
+					}
+				},
+				{
+					"name": "arms",
+					"parent": "torso_top",
+					"pivot": [0, 11, 0]
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-2, 11, -0.00011],
+					"cubes": [
+						{"origin": [-5.5, 10.5, -0.5], "size": [4, 1, 1], "uv": [27, 35]}
 					]
 				},
 				{
 					"name": "arm_right2",
 					"parent": "arm_right",
-					"pivot": [-6, 10.97906, -0.00011],
+					"pivot": [-5, 11, 0],
 					"cubes": [
-						{"origin": [-9, 10.22906, -1.00011], "size": [3, 2, 2], "uv": [0, 4]}
+						{"origin": [-9, 10.25, -1], "size": [4, 2, 2], "uv": [23, 14]}
 					]
 				},
 				{
 					"name": "hand_right",
 					"parent": "arm_right2",
-					"pivot": [-8.5, 10.97906, -0.00011],
+					"pivot": [-8.5, 11.25, 0],
 					"cubes": [
-						{"origin": [-10.5, 10.22906, -1.50011], "size": [2, 3, 3], "inflate": 0.01, "uv": [30, 22]},
-						{"origin": [-11, 10.37906, 0.27489], "size": [1, 1, 1], "uv": [119, 2]},
-						{"origin": [-11, 12.07906, -0.50011], "size": [1, 1, 1], "uv": [119, 0]},
-						{"origin": [-11, 10.37906, -1.27511], "size": [1, 1, 1], "uv": [119, 4]}
+						{"origin": [-11, 10, -1.5], "size": [3, 3, 3], "inflate": 0.01, "uv": [51, 6]}
+					]
+				},
+				{
+					"name": "locator_hand_primary",
+					"parent": "hand_right",
+					"pivot": [-11, 11.5, 0],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"hand_primary": [-11, 11.5, 0],
+						"physical": [-11, 11.5, 0],
+						"special": [-11, 11.5, 0]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "hand_right",
+					"pivot": [-11.75, 11.25, 0],
+					"rotation": [-90, 0, 0],
+					"locators": {
+						"item": [-11.75, 11.25, 0]
+					}
+				},
+				{
+					"name": "right_fingers",
+					"parent": "hand_right",
+					"pivot": [-11, 10.75, 0.75]
+				},
+				{
+					"name": "right_finger_dim_green",
+					"parent": "right_fingers",
+					"pivot": [-11, 10.75, -0.75],
+					"cubes": [
+						{"origin": [-11.5, 10.25, -1.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [55, 40]}
+					]
+				},
+				{
+					"name": "right_finger_bright_green2",
+					"parent": "right_finger_dim_green",
+					"pivot": [-11, 10.75, -0.75],
+					"cubes": [
+						{"origin": [-11.5, 10.25, -1.25], "size": [1, 1, 1], "uv": [55, 33]}
+					]
+				},
+				{
+					"name": "right_finger_dim_red",
+					"parent": "right_fingers",
+					"pivot": [-11, 12.25, 0],
+					"cubes": [
+						{"origin": [-11.5, 11.75, -0.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [55, 36]}
+					]
+				},
+				{
+					"name": "right_finger_bright_red2",
+					"parent": "right_finger_dim_red",
+					"pivot": [-11, 12.25, 0],
+					"cubes": [
+						{"origin": [-11.5, 11.75, -0.5], "size": [1, 1, 1], "uv": [55, 29]}
+					]
+				},
+				{
+					"name": "right_finger_dim_yellow",
+					"parent": "right_fingers",
+					"pivot": [-11, 10.75, 0.75],
+					"cubes": [
+						{"origin": [-11.5, 10.25, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [55, 38]}
+					]
+				},
+				{
+					"name": "right_finger_bright_yellow",
+					"parent": "right_finger_dim_yellow",
+					"pivot": [-11, 10.75, 0.75],
+					"cubes": [
+						{"origin": [-11.5, 10.25, 0.25], "size": [1, 1, 1], "uv": [55, 31]}
 					]
 				},
 				{
 					"name": "arm_left",
-					"parent": "torso_top",
-					"pivot": [2, 10.97906, -0.00011],
+					"parent": "arms",
+					"pivot": [2, 11, 0],
 					"cubes": [
-						{"origin": [1.5, 10.47906, -0.50011], "size": [5, 1, 1], "uv": [75, 20]}
+						{"origin": [1.5, 10.5, -0.5], "size": [4, 1, 1], "uv": [37, 35]}
 					]
 				},
 				{
 					"name": "arm_left2",
 					"parent": "arm_left",
-					"pivot": [6, 10.97906, -0.00011],
+					"pivot": [5, 11, 0],
 					"cubes": [
-						{"origin": [6, 10.22906, -1.00011], "size": [3, 2, 2], "uv": [0, 0]}
+						{"origin": [5, 10.25, -1], "size": [4, 2, 2], "uv": [35, 14]}
 					]
 				},
 				{
 					"name": "hand_left",
 					"parent": "arm_left2",
-					"pivot": [8.5, 10.97906, -0.00011],
+					"pivot": [8.5, 11.25, 0],
 					"cubes": [
-						{"origin": [8.5, 10.22906, -1.50011], "size": [2, 3, 3], "inflate": 0.01, "uv": [40, 22]},
-						{"origin": [10, 10.37906, 0.27489], "size": [1, 1, 1], "uv": [124, 2]},
-						{"origin": [10, 12.07906, -0.50011], "size": [1, 1, 1], "uv": [124, 0]},
-						{"origin": [10, 10.37906, -1.27511], "size": [1, 1, 1], "uv": [124, 4]}
+						{"origin": [8, 10, -1.5], "size": [3, 3, 3], "inflate": 0.01, "uv": [51, 0]}
+					]
+				},
+				{
+					"name": "locator_hand_secondary",
+					"parent": "hand_left",
+					"pivot": [11, 11.5, 0],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"hand_secondary": [11, 11.5, 0]
+					}
+				},
+				{
+					"name": "left_fingers",
+					"parent": "hand_left",
+					"pivot": [11, 10.75, 0.75]
+				},
+				{
+					"name": "left_finger_dim_green",
+					"parent": "left_fingers",
+					"pivot": [11, 10.75, -0.75],
+					"cubes": [
+						{"origin": [10.5, 10.25, -1.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [59, 40]}
+					]
+				},
+				{
+					"name": "left_finger_bright_green2",
+					"parent": "left_finger_dim_green",
+					"pivot": [11, 10.75, -0.75],
+					"cubes": [
+						{"origin": [10.5, 10.25, -1.25], "size": [1, 1, 1], "uv": [59, 33]}
+					]
+				},
+				{
+					"name": "left_finger_dim_red",
+					"parent": "left_fingers",
+					"pivot": [11, 12.25, 0],
+					"cubes": [
+						{"origin": [10.5, 11.75, -0.5], "size": [1, 1, 1], "inflate": 0.01, "uv": [59, 36]}
+					]
+				},
+				{
+					"name": "left_finger_bright_red2",
+					"parent": "left_finger_dim_red",
+					"pivot": [11, 12.25, 0],
+					"cubes": [
+						{"origin": [10.5, 11.75, -0.5], "size": [1, 1, 1], "uv": [59, 29]}
+					]
+				},
+				{
+					"name": "left_finger_dim_yellow",
+					"parent": "left_fingers",
+					"pivot": [11, 10.75, 0.75],
+					"cubes": [
+						{"origin": [10.5, 10.25, 0.25], "size": [1, 1, 1], "inflate": 0.01, "uv": [59, 38]}
+					]
+				},
+				{
+					"name": "left_finger_bright_yellow",
+					"parent": "left_finger_dim_yellow",
+					"pivot": [11, 10.75, 0.75],
+					"cubes": [
+						{"origin": [10.5, 10.25, 0.25], "size": [1, 1, 1], "uv": [59, 31]}
 					]
 				},
 				{
 					"name": "torso_bottom",
 					"parent": "body",
-					"pivot": [0, 7.25, 2],
+					"pivot": [0, 7.25, 0],
 					"cubes": [
-						{"origin": [-2.5, 3.25, -2], "size": [5, 4, 4], "uv": [81, 0]},
-						{"origin": [-1.75, 5.5, -2.275], "size": [1, 1, 1], "pivot": [-1.25, 6, -1.875], "rotation": [0, 5, 0], "uv": [81, 0]},
-						{"origin": [0.75, 5.5, -2.275], "size": [1, 1, 1], "pivot": [1.25, 6, -1.875], "rotation": [0, -5, 0], "uv": [95, 0]}
+						{"origin": [-2.5, 3.75, -2.5], "size": [5, 4, 5], "inflate": 0.01, "uv": [27, 26]},
+						{"origin": [-1.75, 6, -2.8], "size": [1, 1, 1], "uv": [36, 60]},
+						{"origin": [0.75, 6, -2.8], "size": [1, 1, 1], "uv": [40, 60]}
 					]
 				},
 				{
 					"name": "bottom_coat",
 					"parent": "torso_bottom",
-					"pivot": [0, 5, -2],
-					"rotation": [-17.5, 0, 0],
+					"pivot": [0, 4.75, -2.6],
 					"cubes": [
-						{"origin": [-4, 3, -2], "size": [0, 2, 6], "uv": [100, 14]},
-						{"origin": [-4, 3, -2], "size": [8, 2, 0], "uv": [112, 20]},
-						{"origin": [4, 3, -2], "size": [0, 2, 6], "uv": [100, 16]},
-						{"origin": [-4, 3, 4], "size": [8, 2, 0], "uv": [112, 22]},
-						{"origin": [-4, 5, -2], "size": [8, 0, 6], "uv": [106, 24]}
+						{"origin": [-4, 2.75, -2.6], "size": [0, 2, 7], "uv": [50, 44]},
+						{"origin": [-4, 2.75, -2.6], "size": [8, 2, 0], "uv": [48, 53]},
+						{"origin": [4, 2.75, -2.6], "size": [0, 2, 7], "uv": [50, 42]},
+						{"origin": [-4, 2.75, 4.4], "size": [8, 2, 0], "uv": [48, 55]},
+						{"origin": [-4, 4.75, -2.6], "size": [8, 0, 7], "uv": [41, 57]}
 					]
 				},
 				{
 					"name": "leg_right",
 					"parent": "torso_bottom",
-					"pivot": [-1.25, 3.25, 0],
+					"pivot": [-1.5, 3.25, 0],
 					"cubes": [
-						{"origin": [-2.25, 0, -1], "size": [2, 4, 2], "uv": [23, 15]}
+						{"origin": [-2.5, 2, -1], "size": [2, 2, 2], "inflate": 0.01, "uv": [30, 18]}
 					]
 				},
+				{
+					"name": "leg_right2",
+					"parent": "leg_right",
+					"pivot": [-1.5, 2, -1],
+					"cubes": [
+						{"origin": [-2.5, 0, -1], "size": [2, 2, 2], "uv": [30, 22]}
+					]
+				},
+				{
+					"name": "locator_foot_primary",
+					"parent": "leg_right2",
+					"pivot": [-1.5, 0.5, 0],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_primary": [-1.5, 0.5, 0]
+					}
+				},
 				{
 					"name": "leg_left",
 					"parent": "torso_bottom",
-					"pivot": [1.25, 3.25, 0],
+					"pivot": [1.5, 3.25, 0],
 					"cubes": [
-						{"origin": [0.25, 0, -1], "size": [2, 4, 2], "uv": [38, 15]}
+						{"origin": [0.5, 2, -1], "size": [2, 2, 2], "inflate": 0.01, "uv": [38, 18]}
 					]
+				},
+				{
+					"name": "leg_left2",
+					"parent": "leg_left",
+					"pivot": [1.5, 2, -1],
+					"cubes": [
+						{"origin": [0.5, 0, -1], "size": [2, 2, 2], "uv": [38, 22]}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "leg_left2",
+					"pivot": [1.5, 0.5, 0],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [1.5, 0.5, 0]
+					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0607_litwick/litwick.geo.json

@@ -18,136 +18,179 @@
 				{
 					"name": "body",
 					"parent": "litwick",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "wax_trail",
-					"parent": "body",
-					"pivot": [0, 0, 0],
-					"cubes": [
-						{"origin": [-4, 0.015, -4], "size": [8, 0, 8], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "wax_trail2",
-					"parent": "wax_trail",
-					"pivot": [0, 0, 0],
-					"cubes": [
-						{"origin": [-4, 0.02, 0], "size": [8, 0, 4], "uv": [14, 8]}
-					]
+					"pivot": [0, 4.5, 0]
 				},
 				{
 					"name": "head",
 					"parent": "body",
 					"pivot": [0, 0, 0],
 					"cubes": [
-						{"origin": [-3, 0, -3], "size": [6, 7, 6], "uv": [0, 8]}
+						{"origin": [-3.5, 0.015, -3.5], "size": [7, 2, 7], "inflate": -0.01, "uv": [0, 16]}
+					]
+				},
+				{
+					"name": "head2",
+					"parent": "head",
+					"pivot": [0, 1.5, 0],
+					"cubes": [
+						{"origin": [-4, 1.25, -4], "size": [8, 8, 8], "inflate": -0.1, "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "eyes",
+					"parent": "head2",
+					"pivot": [0, 4, -3.9]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [2.45, 4, -3.91]
+				},
+				{
+					"name": "eye_left_open",
+					"parent": "eye_left",
+					"pivot": [2.45, 4, -3.91],
+					"cubes": [
+						{"origin": [1.95, 3, -3.91], "size": [1, 2, 0], "uv": [0, 0]}
+					]
+				},
+				{
+					"name": "eye_expression_left",
+					"parent": "eye_left_open",
+					"pivot": [2.45, 5, -3.82],
+					"cubes": [
+						{"origin": [1.95, 4.5, -3.82], "size": [1, 1, 0], "uv": [2, 0]}
+					]
+				},
+				{
+					"name": "eye_closed_left",
+					"parent": "eye_left",
+					"pivot": [2.45, 4, -3.81],
+					"cubes": [
+						{"origin": [1.45, 3.5, -3.81], "size": [2, 1, 0], "uv": [4, 0]}
+					]
+				},
+				{
+					"name": "eye_happy_left",
+					"parent": "eye_left",
+					"pivot": [2.45, 4.5, -3.81],
+					"cubes": [
+						{"origin": [1.45, 4, -3.81], "size": [2, 1, 0], "uv": [4, 2]},
+						{"origin": [1.95, 3.5, -3.82], "size": [1, 1, 0], "uv": [2, 2]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-2.45, 4, -3.91]
+				},
+				{
+					"name": "eye_right_open",
+					"parent": "eye_right",
+					"pivot": [-2.45, 4, -3.91],
+					"cubes": [
+						{"origin": [-2.95, 3, -3.91], "size": [1, 2, 0], "uv": [0, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_expression_right",
+					"parent": "eye_right_open",
+					"pivot": [-2.45, 5, -3.82],
+					"cubes": [
+						{"origin": [-2.95, 4.5, -3.82], "size": [1, 1, 0], "uv": [2, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_right",
+					"parent": "eye_right",
+					"pivot": [-2.45, 4, -3.81],
+					"cubes": [
+						{"origin": [-3.45, 3.5, -3.81], "size": [2, 1, 0], "uv": [4, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_happy_right",
+					"parent": "eye_right",
+					"pivot": [-2.45, 4.5, -3.81],
+					"cubes": [
+						{"origin": [-3.45, 4, -3.81], "size": [2, 1, 0], "uv": [4, 3], "mirror": true},
+						{"origin": [-2.95, 3.5, -3.82], "size": [1, 1, 0], "uv": [2, 3], "mirror": true}
+					]
+				},
+				{
+					"name": "mouth",
+					"parent": "head2",
+					"pivot": [0, 3.5, -3.9]
+				},
+				{
+					"name": "mouth_rotation",
+					"parent": "mouth",
+					"pivot": [0, 3.5, -3.9],
+					"rotation": [-25, 0, 0],
+					"cubes": [
+						{"origin": [-1, 2.5, -3.9], "size": [2, 1, 1], "uv": [24, 2]}
+					]
+				},
+				{
+					"name": "mouth_open",
+					"parent": "mouth",
+					"pivot": [0, 2.5, -3.8],
+					"cubes": [
+						{"origin": [-1, 2, -3.81], "size": [2, 1, 0], "uv": [4, 7]}
 					]
 				},
 				{
 					"name": "hair",
-					"parent": "head",
-					"pivot": [0, 9.5, 0],
+					"parent": "head2",
+					"pivot": [0, 9, 0],
 					"cubes": [
-						{"origin": [-3.5, 7.5, -3.5], "size": [7, 0, 7], "uv": [17, 0]},
-						{"origin": [-3.5, 2.5, -3.5], "size": [7, 5, 0], "uv": [0, 26]},
-						{"origin": [-3.5, 2.5, -3.5], "size": [0, 5, 7], "uv": [14, 14]},
-						{"origin": [3.5, 2.5, -3.5], "size": [0, 5, 7], "uv": [0, 14]},
-						{"origin": [-3.5, 2.5, 3.5], "size": [7, 5, 0], "uv": [24, 12]}
+						{"origin": [-4.5, 2.5, -4.5], "size": [9, 7, 9], "inflate": 0.01, "uv": [23, 7]}
 					]
 				},
 				{
 					"name": "flame",
 					"parent": "hair",
-					"pivot": [0, 7.5, 0],
+					"pivot": [0, 9.5, 0],
 					"cubes": [
-						{"origin": [-2, 7, 0], "size": [4, 5, 0], "uv": [0, 0]},
-						{"origin": [0, 7, -2], "size": [0, 5, 4], "uv": [14, 22]}
+						{"origin": [-3, 9.5, 0], "size": [6, 8, 0], "pivot": [0, 13, 0], "rotation": [0, 45, 0], "uv": [51, 8]},
+						{"origin": [0, 9.5, -3], "size": [0, 8, 6], "pivot": [0, 13, 0], "rotation": [0, 45, 0], "uv": [51, -6]}
+					]
+				},
+				{
+					"name": "arms",
+					"parent": "head2",
+					"pivot": [0, 2.5, 0]
+				},
+				{
+					"name": "arm_left",
+					"parent": "arms",
+					"pivot": [4, 2.75, 0],
+					"cubes": [
+						{"origin": [3.75, 2, -0.5], "size": [2, 1, 1], "inflate": 0.1, "uv": [24, 4]}
 					]
 				},
 				{
 					"name": "arm_right",
-					"parent": "head",
-					"pivot": [-3, 2, -0.5],
-					"rotation": [0, 0, -90],
+					"parent": "arms",
+					"pivot": [-4, 2.75, 0],
 					"cubes": [
-						{"origin": [-3, 2, -2], "size": [0, 2, 2], "uv": [18, 10]}
+						{"origin": [-5.75, 2, -0.5], "size": [2, 1, 1], "inflate": 0.1, "uv": [24, 6], "mirror": true}
 					]
 				},
 				{
-					"name": "arm_left",
-					"parent": "head",
-					"pivot": [3, 2, -0.5],
-					"rotation": [0, 0, -90],
+					"name": "wax_trail",
+					"parent": "body",
+					"pivot": [0, 0, 0],
 					"cubes": [
-						{"origin": [3, 0, -2], "size": [0, 2, 2], "uv": [0, 9]}
+						{"origin": [-5.5, 0.015, -5.5], "size": [11, 0, 7], "uv": [21, 23]}
 					]
 				},
 				{
-					"name": "eyes",
-					"parent": "head",
-					"pivot": [0, 4.5, -4]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes",
-					"pivot": [-2, 2.5, -3],
+					"name": "wax_trail2",
+					"parent": "wax_trail",
+					"pivot": [0, 0, 1.5],
 					"cubes": [
-						{"origin": [-2.5, 2.5, -3.01], "size": [1, 1, 0], "uv": [6, 6]}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "eye_right",
-					"pivot": [-1.9, 2.5, -2.9],
-					"cubes": [
-						{"origin": [-2.9, 2.5, -2.91], "size": [2, 2, 1], "inflate": 0.01, "uv": [0, 8]}
-					]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes",
-					"pivot": [2, 2.5, -3],
-					"cubes": [
-						{"origin": [1.5, 2.5, -3.01], "size": [1, 1, 0], "uv": [5, 5]}
-					]
-				},
-				{
-					"name": "eyelid_left",
-					"parent": "eye_left",
-					"pivot": [1.9, 2.5, -2.9],
-					"cubes": [
-						{"origin": [0.9, 2.5, -2.91], "size": [2, 2, 1], "inflate": 0.01, "uv": [0, 5]}
-					]
-				},
-				{
-					"name": "mouth",
-					"parent": "head",
-					"pivot": [0, 2.5, -3]
-				},
-				{
-					"name": "lip",
-					"parent": "mouth",
-					"pivot": [0, 2.5, -3],
-					"rotation": [-5, 0, 0],
-					"cubes": [
-						{"origin": [-1, 1.5, -3.01], "size": [2, 1, 0], "uv": [24, 7]}
-					]
-				},
-				{
-					"name": "mouth_small",
-					"parent": "mouth",
-					"pivot": [0, 2.5, -3],
-					"cubes": [
-						{"origin": [-1, 1.5, -3.01], "size": [2, 1, 0], "uv": [0, 13]}
-					]
-				},
-				{
-					"name": "mouth_large",
-					"parent": "mouth",
-					"pivot": [0, 2.5, -2.9],
-					"cubes": [
-						{"origin": [-1, 0.5, -2.91], "size": [2, 2, 0], "uv": [24, 17]}
+						{"origin": [-4.5, 0.02, 1.5], "size": [9, 0, 5], "uv": [5, 26]}
 					]
 				}
 			]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0608_lampent/lampent.geo.json

@@ -4,11 +4,11 @@
 		{
 			"description": {
 				"identifier": "geometry.lampent",
-				"texture_width": 64,
+				"texture_width": 128,
 				"texture_height": 64,
-				"visible_bounds_width": 4,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
+				"visible_bounds_width": 5,
+				"visible_bounds_height": 2.5,
+				"visible_bounds_offset": [0, 0.75, 0]
 			},
 			"bones": [
 				{
@@ -18,16 +18,134 @@
 				{
 					"name": "body",
 					"parent": "lampent",
-					"pivot": [0, 0, 0]
+					"pivot": [0, 6, 0]
 				},
 				{
 					"name": "swing",
 					"parent": "body",
 					"pivot": [0, 21, 0],
 					"cubes": [
-						{"origin": [-1.5, 1.5, -1.5], "size": [3, 2, 3], "pivot": [0, 0, 0], "rotation": [0, -45, 0], "uv": [30, 16]},
-						{"origin": [-1, 0, -1], "size": [2, 1, 2], "pivot": [0, 0, 0], "rotation": [0, -45, 0], "uv": [0, 31]},
-						{"origin": [-2.5, 1, -2.5], "size": [5, 1, 5], "pivot": [0, 0, 0], "rotation": [0, -45, 0], "uv": [27, 28]}
+						{"origin": [-1, 0.5, -1], "size": [2, 1, 2], "uv": [120, 11]},
+						{"origin": [-3, 1.35, -3], "size": [6, 1, 6], "inflate": 0.1, "uv": [104, 16]},
+						{"origin": [-1.5, 2, -1.5], "size": [3, 2, 3], "inflate": -0.1, "uv": [116, 1]},
+						{"origin": [-2.5, 3.69, -2.5], "size": [5, 1, 5], "inflate": -0.1, "uv": [96, 0]}
+					]
+				},
+				{
+					"name": "arms",
+					"parent": "swing",
+					"pivot": [0, 3.5, 0]
+				},
+				{
+					"name": "arm_left",
+					"parent": "arms",
+					"pivot": [2.125, 3.5, 0],
+					"cubes": [
+						{"origin": [1.125, 3.5, -0.5], "size": [3, 0, 1], "uv": [59, 20]}
+					]
+				},
+				{
+					"name": "arm_left2",
+					"parent": "arm_left",
+					"pivot": [4.125, 3.5, 0],
+					"cubes": [
+						{"origin": [4.125, 3.5, -0.5], "size": [3, 0, 1], "uv": [65, 20]}
+					]
+				},
+				{
+					"name": "arm_left3",
+					"parent": "arm_left2",
+					"pivot": [7.125, 3.5, 0],
+					"cubes": [
+						{"origin": [7.125, 3.5, -1], "size": [4, 0, 2], "uv": [70, 18]}
+					]
+				},
+				{
+					"name": "arm_left4",
+					"parent": "arm_left3",
+					"pivot": [11.125, 3.5, 0],
+					"cubes": [
+						{"origin": [11.125, 3.5, -1], "size": [4, 0, 2], "uv": [78, 18]}
+					]
+				},
+				{
+					"name": "arm_left5",
+					"parent": "arm_left4",
+					"pivot": [15.125, 3.5, 0],
+					"cubes": [
+						{"origin": [15.125, 3.5, -1], "size": [3, 0, 2], "uv": [86, 18]}
+					]
+				},
+				{
+					"name": "arm_left6",
+					"parent": "arm_left5",
+					"pivot": [18.125, 3.5, 0],
+					"cubes": [
+						{"origin": [18.125, 3.5, -1.5], "size": [3, 0, 3], "uv": [91, 18]}
+					]
+				},
+				{
+					"name": "arm_left7",
+					"parent": "arm_left6",
+					"pivot": [21.125, 3.5, 0],
+					"cubes": [
+						{"origin": [21.125, 3.5, -1.5], "size": [3, 0, 3], "uv": [91, 21]}
+					]
+				},
+				{
+					"name": "arm_right",
+					"parent": "arms",
+					"pivot": [-2.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-4.125, 3.5, -0.5], "size": [3, 0, 1], "uv": [59, 21], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right2",
+					"parent": "arm_right",
+					"pivot": [-4.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-7.125, 3.5, -0.5], "size": [3, 0, 1], "uv": [65, 21], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right3",
+					"parent": "arm_right2",
+					"pivot": [-7.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-11.125, 3.5, -1], "size": [4, 0, 2], "uv": [70, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right4",
+					"parent": "arm_right3",
+					"pivot": [-11.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-15.125, 3.5, -1], "size": [4, 0, 2], "uv": [78, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right5",
+					"parent": "arm_right4",
+					"pivot": [-15.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-18.125, 3.5, -1], "size": [3, 0, 2], "uv": [86, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right6",
+					"parent": "arm_right5",
+					"pivot": [-18.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-21.125, 3.5, -1.5], "size": [3, 0, 3], "uv": [97, 18], "mirror": true}
+					]
+				},
+				{
+					"name": "arm_right7",
+					"parent": "arm_right6",
+					"pivot": [-21.125, 3.5, 0],
+					"cubes": [
+						{"origin": [-24.125, 3.5, -1.5], "size": [3, 0, 3], "uv": [97, 23], "mirror": true}
 					]
 				},
 				{
@@ -35,165 +153,112 @@
 					"parent": "swing",
 					"pivot": [0, 3.5, 0],
 					"cubes": [
-						{"origin": [-4.5, 3.5, -4.5], "size": [9, 6, 0], "uv": [42, 34]},
-						{"origin": [-4.5, 3.5, 4.5], "size": [9, 6, 0], "uv": [42, 40]},
-						{"origin": [-4.5, 3.5, -4.5], "size": [0, 6, 9], "uv": [42, 7]},
-						{"origin": [4.5, 3.5, -4.5], "size": [0, 6, 9], "uv": [42, 13]},
-						{"origin": [-4.5, 9.5, -4.5], "size": [9, 0, 9], "inflate": 0.01, "uv": [0, 28]},
-						{"origin": [-4.5, 3.5, -4.5], "size": [9, 0, 9], "inflate": 0.001, "uv": [33, 0]},
-						{"origin": [-4.5, 3.5, -4.5], "size": [9, 6, 9], "uv": [0, 37]}
-					]
-				},
-				{
-					"name": "flame",
-					"parent": "head",
-					"pivot": [0, 3.5, 0],
-					"cubes": [
-						{"origin": [-3, 3.5, 0], "size": [6, 6, 0], "pivot": [0, 3.5, 0], "rotation": [0, -45, 0], "uv": [0, 0]},
-						{"origin": [0, 3.5, -3], "size": [0, 6, 6], "pivot": [0, 3.5, 0], "rotation": [0, -45, 0], "uv": [0, 0]}
+						{"origin": [-5, 4.6, -5], "size": [10, 6, 0], "uv": [0, 20]},
+						{"origin": [-5, 4.6, 5], "size": [10, 6, 0], "uv": [0, 26]},
+						{"origin": [-5, 4.6, -5], "size": [10, 0, 10], "uv": [30, 20]},
+						{"origin": [5, 4.6, -5], "size": [0, 6, 10], "uv": [20, 10]},
+						{"origin": [-5, 4.6, -5], "size": [0, 6, 10], "uv": [20, 16], "mirror": true}
 					]
 				},
 				{
 					"name": "eyes",
 					"parent": "head",
-					"pivot": [0, 6, -4.5]
+					"pivot": [0, 7.5, -5]
 				},
 				{
 					"name": "eye_left",
 					"parent": "eyes",
-					"pivot": [3, 7, -4.5],
+					"pivot": [3.2, 7.75, -5.01]
+				},
+				{
+					"name": "eye_left_open",
+					"parent": "eye_left",
+					"pivot": [3.2, 7.75, -5.01],
 					"cubes": [
-						{"origin": [2.5, 6, -4.5], "size": [1, 2, 0], "uv": [12, 0]}
+						{"origin": [2.7, 6.75, -5.01], "size": [1, 1, 0], "uv": [2, 16]}
+					]
+				},
+				{
+					"name": "eye_left_open2",
+					"parent": "eye_left_open",
+					"pivot": [3.2, 8.25, -5.02],
+					"cubes": [
+						{"origin": [2.7, 7.75, -5.01], "size": [1, 1, 0], "uv": [4, 16]}
+					]
+				},
+				{
+					"name": "eye_closed_left",
+					"parent": "eye_left",
+					"pivot": [3.2, 11.75, -5.01],
+					"cubes": [
+						{"origin": [2.2, 11.25, -5.01], "size": [2, 1, 0], "uv": [6, 16]}
+					]
+				},
+				{
+					"name": "eye_happy_left",
+					"parent": "eye_left",
+					"pivot": [3.2, 12, -5.01],
+					"cubes": [
+						{"origin": [1.7, 11, -5.01], "size": [3, 1, 0], "uv": [12, 16]},
+						{"origin": [2.7, 11.5, -5.02], "size": [1, 1, 0], "uv": [10, 16]}
 					]
 				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",
-					"pivot": [-3, 7, -4.5],
+					"pivot": [-3.2, 7.75, -5.01]
+				},
+				{
+					"name": "eye_right_open",
+					"parent": "eye_right",
+					"pivot": [-3.2, 7.75, -5.01],
 					"cubes": [
-						{"origin": [-3.5, 6, -4.5], "size": [1, 2, 0], "uv": [0, 12]}
+						{"origin": [-3.7, 6.75, -5.01], "size": [1, 1, 0], "uv": [2, 17], "mirror": true}
 					]
 				},
 				{
-					"name": "eyelid_left",
-					"parent": "eyes",
-					"pivot": [1.5, 6, -4.5],
+					"name": "eye_right_open2",
+					"parent": "eye_right_open",
+					"pivot": [-3.2, 8.25, -5.02],
 					"cubes": [
-						{"origin": [2.5, 6.5, -4.51], "size": [1, 1, 0], "uv": [42, 48]}
+						{"origin": [-3.7, 7.75, -5.01], "size": [1, 1, 0], "uv": [4, 17], "mirror": true}
 					]
 				},
 				{
-					"name": "eyelid_right",
-					"parent": "eyes",
-					"pivot": [4.5, 6, -4.5],
+					"name": "eye_closed_right",
+					"parent": "eye_right",
+					"pivot": [-3.2, 11.75, -5.01],
 					"cubes": [
-						{"origin": [-3.5, 6.5, -4.51], "size": [1, 1, 0], "uv": [42, 49], "mirror": true}
+						{"origin": [-4.2, 11.25, -5.01], "size": [2, 1, 0], "uv": [6, 17], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_happy_right",
+					"parent": "eye_right",
+					"pivot": [-3.2, 12, -5.01],
+					"cubes": [
+						{"origin": [-4.7, 11, -5.01], "size": [3, 1, 0], "uv": [12, 17], "mirror": true},
+						{"origin": [-3.7, 11.5, -5.02], "size": [1, 1, 0], "uv": [10, 17], "mirror": true}
+					]
+				},
+				{
+					"name": "flame",
+					"parent": "head",
+					"pivot": [0, 4.5, 0],
+					"cubes": [
+						{"origin": [-2.5, 4.5, 0], "size": [5, 7, 0], "pivot": [0, 8, 0], "rotation": [0, 45, 0], "uv": [58, 9]},
+						{"origin": [0, 4.5, -2.5], "size": [0, 7, 5], "pivot": [0, 8, 0], "rotation": [0, 45, 0], "uv": [58, -3]}
 					]
 				},
 				{
 					"name": "brim",
 					"parent": "head",
-					"pivot": [0, 9.5, 0],
+					"pivot": [0, 11.5, 0],
 					"cubes": [
-						{"origin": [-7, 9.5, -7], "size": [14, 2, 14], "uv": [0, 0]},
-						{"origin": [-5, 11.5, -5], "size": [10, 2, 10], "uv": [0, 16]},
-						{"origin": [-1, 13.5, -1], "size": [2, 4, 2], "uv": [0, 16]}
-					]
-				},
-				{
-					"name": "arm_left",
-					"parent": "swing",
-					"pivot": [2.125, 2.75, 0],
-					"cubes": [
-						{"origin": [1.125, 2.75, -0.5], "size": [3, 0, 1], "uv": [26, 34]}
-					]
-				},
-				{
-					"name": "arm_left2",
-					"parent": "arm_left",
-					"pivot": [4.125, 2.75, 0],
-					"cubes": [
-						{"origin": [4.125, 2.75, -0.5], "size": [4, 0, 1], "uv": [0, 30]}
-					]
-				},
-				{
-					"name": "arm_left3",
-					"parent": "arm_left2",
-					"pivot": [8.125, 2.75, 0],
-					"cubes": [
-						{"origin": [8.125, 2.75, -0.5], "size": [4, 0, 1], "uv": [29, 25]}
-					]
-				},
-				{
-					"name": "arm_left4",
-					"parent": "arm_left3",
-					"pivot": [12.125, 2.75, 0],
-					"cubes": [
-						{"origin": [12.125, 2.75, -1], "size": [3, 0, 2], "uv": [28, 21]}
-					]
-				},
-				{
-					"name": "arm_left5",
-					"parent": "arm_left4",
-					"pivot": [15.125, 2.75, 0],
-					"cubes": [
-						{"origin": [15.125, 2.75, -1], "size": [3, 0, 2], "uv": [0, 28]}
-					]
-				},
-				{
-					"name": "arm_left6",
-					"parent": "arm_left5",
-					"pivot": [18.125, 2.75, 0],
-					"cubes": [
-						{"origin": [18.125, 2.75, -1], "size": [3, 0, 2], "uv": [0, 24]}
-					]
-				},
-				{
-					"name": "arm_right",
-					"parent": "swing",
-					"pivot": [-2.125, 2.75, 0],
-					"cubes": [
-						{"origin": [-4.125, 2.75, -0.5], "size": [3, 0, 1], "uv": [0, 34]}
-					]
-				},
-				{
-					"name": "arm_right2",
-					"parent": "arm_right",
-					"pivot": [-4.125, 2.75, 0],
-					"cubes": [
-						{"origin": [-8.125, 2.75, -0.5], "size": [4, 0, 1], "uv": [29, 24]}
-					]
-				},
-				{
-					"name": "arm_right3",
-					"parent": "arm_right2",
-					"pivot": [-8.125, 2.75, 0],
-					"cubes": [
-						{"origin": [-12.125, 2.75, -0.5], "size": [4, 0, 1], "uv": [29, 23]}
-					]
-				},
-				{
-					"name": "arm_right4",
-					"parent": "arm_right3",
-					"pivot": [-12.125, 2.75, 0],
-					"cubes": [
-						{"origin": [-15.125, 2.75, -1], "size": [3, 0, 2], "uv": [0, 22]}
-					]
-				},
-				{
-					"name": "arm_right5",
-					"parent": "arm_right4",
-					"pivot": [-15.125, 2.75, 0],
-					"cubes": [
-						{"origin": [-18.125, 2.75, -1], "size": [3, 0, 2], "uv": [6, 12]}
-					]
-				},
-				{
-					"name": "arm_right6",
-					"parent": "arm_right5",
-					"pivot": [-18.125, 2.75, 0],
-					"cubes": [
-						{"origin": [-21.125, 2.75, -1], "size": [3, 0, 2], "uv": [0, 12]}
+						{"origin": [-9, 10.5, -9], "size": [18, 2, 18], "uv": [0, 0]},
+						{"origin": [-6.75, 12, -7], "size": [14, 2, 14], "uv": [54, 2]},
+						{"origin": [-4, 13.5, -4], "size": [8, 2, 8], "uv": [96, 6]},
+						{"origin": [-1, 15.5, -1], "size": [2, 5, 2], "uv": [96, 7]}
 					]
 				}
 			]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0609_chandelure/chandelure.geo.json

@@ -5,10 +5,10 @@
 			"description": {
 				"identifier": "geometry.chandelure",
 				"texture_width": 128,
-				"texture_height": 64,
-				"visible_bounds_width": 6,
-				"visible_bounds_height": 3.5,
-				"visible_bounds_offset": [0, 1.25, 0]
+				"texture_height": 128,
+				"visible_bounds_width": 8,
+				"visible_bounds_height": 4.5,
+				"visible_bounds_offset": [0, 1.75, 0]
 			},
 			"bones": [
 				{
@@ -18,283 +18,548 @@
 				{
 					"name": "body",
 					"parent": "chandelure",
-					"pivot": [0, 0, 0]
+					"pivot": [0, 4, 0]
 				},
 				{
 					"name": "swing",
 					"parent": "body",
-					"pivot": [0, 41, 0]
+					"pivot": [0, 52, 0],
+					"cubes": [
+						{"origin": [-1, 0, -1], "size": [2, 3, 2], "inflate": 0.1, "uv": [40, 43]},
+						{"origin": [-2, 2.5, -2], "size": [4, 3, 4], "uv": [42, 28]},
+						{"origin": [-5, 5.51, -5], "size": [10, 2, 10], "uv": [2, 22]}
+					]
 				},
 				{
-					"name": "head",
+					"name": "arms",
 					"parent": "swing",
-					"pivot": [0, 5, 0],
-					"cubes": [
-						{"origin": [-6.5, 5, -6.4], "size": [13, 9, 13], "uv": [0, 0]},
-						{"origin": [-6.5, 5, -6.4], "size": [13, 0, 13], "inflate": 0.001, "uv": [51, 18]},
-						{"origin": [-6.5, 14, -6.4], "size": [13, 0, 13], "uv": [51, 31]},
-						{"origin": [-6.5, 5, -6.4], "size": [13, 9, 0], "uv": [63, 0]},
-						{"origin": [-6.5, 5, 6.6], "size": [13, 9, 0], "uv": [89, 0]},
-						{"origin": [-6.5, 5, -6.4], "size": [0, 9, 13], "uv": [63, -4]},
-						{"origin": [6.5, 5, -6.4], "size": [0, 9, 13], "uv": [89, -4]},
-						{"origin": [-1.5, 0, -1.5], "size": [3, 5, 3], "pivot": [0, 0, 0], "rotation": [0, -45, 0], "uv": [16, 36]}
-					]
-				},
-				{
-					"name": "eyes",
-					"parent": "head",
-					"pivot": [0.5, 9, -6]
-				},
-				{
-					"name": "eye_left",
-					"parent": "eyes",
-					"pivot": [4.5, 9.5, -6],
-					"cubes": [
-						{"origin": [3, 8, -6.42], "size": [3, 3, 0], "uv": [26, 47]},
-						{"origin": [3, 8, -6.39], "size": [3, 3, 0], "uv": [26, 53]},
-						{"origin": [3.5, 8.5, -6.43], "size": [2, 2, 0], "uv": [12, 42]}
-					]
-				},
-				{
-					"name": "eyelid_left",
-					"parent": "eye_left",
-					"pivot": [0.5, 3.5, 0],
-					"cubes": [
-						{"origin": [-0.5, 2.5, -0.43], "size": [2, 2, 1], "inflate": 0.01, "uv": [51, 21]}
-					]
-				},
-				{
-					"name": "eye_right",
-					"parent": "eyes",
-					"pivot": [-4.5, 9.5, -6],
-					"cubes": [
-						{"origin": [-6, 8, -6.42], "size": [3, 3, 0], "uv": [20, 47]},
-						{"origin": [-5.5, 8.5, -6.43], "size": [2, 2, 0], "uv": [12, 40]},
-						{"origin": [-6, 8, -6.39], "size": [3, 3, 0], "uv": [32, 53]}
-					]
-				},
-				{
-					"name": "eyelid_left2",
-					"parent": "eye_right",
-					"pivot": [-0.5, 3.5, 0],
-					"cubes": [
-						{"origin": [-1.5, 2.5, -0.43], "size": [2, 2, 1], "inflate": 0.01, "uv": [52, 18]}
-					]
-				},
-				{
-					"name": "brim",
-					"parent": "head",
-					"pivot": [0, 14, 0],
-					"cubes": [
-						{"origin": [-4, 14, -3], "size": [8, 3, 0], "pivot": [0, 14.5, -3], "rotation": [20, 0, 0], "uv": [40, 25]},
-						{"origin": [-3, 14, -4], "size": [0, 3, 8], "pivot": [-3, 14.5, 0], "rotation": [0, 0, -20], "uv": [16, 14]},
-						{"origin": [-4, 14, 3], "size": [8, 3, 0], "pivot": [0, 14.5, 3], "rotation": [-20, 0, 0], "uv": [39, 10]},
-						{"origin": [3, 14, -4], "size": [0, 3, 8], "pivot": [3, 14.5, 0], "rotation": [0, 0, 20], "uv": [0, 14]},
-						{"origin": [-3, 14.16, -3], "size": [6, 0, 6], "inflate": -0.15, "uv": [84, 18]}
-					]
-				},
-				{
-					"name": "flame_middle",
-					"parent": "head",
-					"pivot": [0, 14, 0],
-					"cubes": [
-						{"origin": [-3, 14, 0], "size": [6, 7, 0], "uv": [28, 36]},
-						{"origin": [0, 14, -3], "size": [0, 7, 6], "uv": [12, 19]}
-					]
-				},
-				{
-					"name": "flame_middle2",
-					"parent": "flame_middle",
-					"pivot": [0, 21, 0],
-					"cubes": [
-						{"origin": [-3, 21, 0], "size": [6, 7, 0], "uv": [39, 3]},
-						{"origin": [0, 21, -3], "size": [0, 7, 6], "uv": [0, 19]}
-					]
-				},
-				{
-					"name": "flame_middle3",
-					"parent": "flame_middle2",
-					"pivot": [0, 28, 0],
-					"cubes": [
-						{"origin": [-3, 28, 0], "size": [6, 7, 0], "uv": [0, 40]},
-						{"origin": [0, 28, -3], "size": [0, 7, 6], "uv": [0, 0]}
-					]
-				},
-				{
-					"name": "flame_inner",
-					"parent": "head",
-					"pivot": [0, 5, 0],
-					"cubes": [
-						{"origin": [-5, 5, 0], "size": [10, 9, 0], "uv": [100, 27]},
-						{"origin": [0, 5, -5], "size": [0, 9, 10], "uv": [100, 26]}
-					]
+					"pivot": [0, 4.25, 0]
 				},
 				{
 					"name": "arm_left",
-					"parent": "head",
-					"pivot": [2.125, 3, 0],
+					"parent": "arms",
+					"pivot": [2, 4.25, 0],
 					"cubes": [
-						{"origin": [1.125, 2, 0], "size": [6, 2, 0], "inflate": 0.01, "uv": [14, 54]}
+						{"origin": [1.5, 3.75, -0.5], "size": [9, 1, 1], "uv": [0, 34]}
 					]
 				},
 				{
 					"name": "arm_left2",
 					"parent": "arm_left",
-					"pivot": [7.125, 2, 0],
+					"pivot": [9.5, 4.25, 0],
 					"cubes": [
-						{"origin": [7.125, 2, 0], "size": [6, 2, 0], "uv": [40, 34]}
+						{"origin": [9, 3.25, -1], "size": [9, 2, 2], "inflate": -0.15, "uv": [20, 34]}
 					]
 				},
 				{
 					"name": "arm_left3",
 					"parent": "arm_left2",
-					"pivot": [13.125, 2, 0],
+					"pivot": [17.5, 4.25, 0],
 					"cubes": [
-						{"origin": [13.125, 2, 0], "size": [6, 2, 0], "inflate": 0.01, "uv": [0, 0]}
+						{"origin": [17, 3.25, -1], "size": [8, 2, 2], "uv": [0, 38]}
+					]
+				},
+				{
+					"name": "candle_front_left",
+					"parent": "arm_left3",
+					"pivot": [19, 4.25, -1],
+					"cubes": [
+						{"origin": [18.5, 4.25, -1.5], "size": [4, 0, 1], "uv": [57, 44]}
+					]
+				},
+				{
+					"name": "candle_front_left2",
+					"parent": "candle_front_left",
+					"pivot": [22.5, 4.25, -1],
+					"cubes": [
+						{"origin": [22, 4.25, -1.5], "size": [4, 0, 1], "inflate": 0.005, "uv": [76, 28]}
+					]
+				},
+				{
+					"name": "candle_front_left3",
+					"parent": "candle_front_left2",
+					"pivot": [26, 4.25, -1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [25.5, 4.25, -1.5], "size": [4, 0, 1], "inflate": 0.01, "uv": [-1, 62]}
+					]
+				},
+				{
+					"name": "candle_front_left4",
+					"parent": "candle_front_left3",
+					"pivot": [29.5, 4.25, -1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [29, 1.75, -3.5], "size": [6, 5, 5], "uv": [0, 42]}
+					]
+				},
+				{
+					"name": "flame_front_left",
+					"parent": "candle_front_left4",
+					"pivot": [34.5, 4.75, -1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [34, 2.25, -3], "size": [5, 4, 4], "uv": [44, 44]}
+					]
+				},
+				{
+					"name": "flame_front_left2",
+					"parent": "flame_front_left",
+					"pivot": [39, 4.25, -1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [38.5, 2.75, -2.5], "size": [4, 3, 3], "inflate": -0.1, "uv": [77, 39]}
+					]
+				},
+				{
+					"name": "flame_front_left3",
+					"parent": "flame_front_left2",
+					"pivot": [42.5, 4.25, -1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [42, 3.25, -1], "size": [4, 2, 0], "uv": [17, 43]}
+					]
+				},
+				{
+					"name": "candle_back_left",
+					"parent": "arm_left3",
+					"pivot": [19, 4.25, 1],
+					"cubes": [
+						{"origin": [18.5, 4.25, 0.5], "size": [4, 0, 1], "uv": [57, 46]}
+					]
+				},
+				{
+					"name": "candle_back_left2",
+					"parent": "candle_back_left",
+					"pivot": [22.5, 4.25, 1],
+					"cubes": [
+						{"origin": [22, 4.25, 0.5], "size": [4, 0, 1], "inflate": 0.005, "uv": [79, 34]}
+					]
+				},
+				{
+					"name": "candle_back_left3",
+					"parent": "candle_back_left2",
+					"pivot": [26, 4.25, 1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [25.5, 4.25, 0.5], "size": [4, 0, 1], "inflate": 0.01, "uv": [7, 62]}
+					]
+				},
+				{
+					"name": "candle_back_left4",
+					"parent": "candle_back_left3",
+					"pivot": [29.5, 4.25, 1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [29, 1.75, -1.5], "size": [6, 5, 5], "uv": [22, 43]}
+					]
+				},
+				{
+					"name": "flame_back_left",
+					"parent": "candle_back_left4",
+					"pivot": [34.5, 4.75, 1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [34, 2.25, -1], "size": [5, 4, 4], "uv": [62, 44]}
+					]
+				},
+				{
+					"name": "flame_back_left2",
+					"parent": "flame_back_left",
+					"pivot": [39, 4.25, 1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [38.5, 2.75, -0.5], "size": [4, 3, 3], "inflate": -0.1, "uv": [93, 36]}
+					]
+				},
+				{
+					"name": "flame_back_left3",
+					"parent": "flame_back_left2",
+					"pivot": [42.5, 4.25, 1],
+					"rotation": [0, 0, -0.00001],
+					"cubes": [
+						{"origin": [42, 3.25, 1], "size": [4, 2, 0], "uv": [17, 53]}
 					]
 				},
 				{
 					"name": "arm_left4",
 					"parent": "arm_left3",
-					"pivot": [19.125, 2, 0],
+					"pivot": [25, 4.25, 0],
 					"cubes": [
-						{"origin": [19.125, 2, 0], "size": [8, 8, 0], "uv": [0, 32]}
+						{"origin": [24, 3.25, -1], "size": [8, 2, 2], "inflate": 0.1, "uv": [42, 35]}
 					]
 				},
 				{
-					"name": "candleholder_front_left",
+					"name": "arm_left5",
 					"parent": "arm_left4",
-					"pivot": [19.125, 2, 0],
+					"pivot": [32, 4.25, 0],
 					"cubes": [
-						{"origin": [19.125, 2, -2], "size": [4, 0, 2], "uv": [10, 46]}
+						{"origin": [31, 3.25, -1], "size": [7, 2, 2], "inflate": 0.05, "uv": [40, 39]}
 					]
 				},
 				{
-					"name": "candleholder_front_left2",
-					"parent": "candleholder_front_left",
-					"pivot": [23.125, 2, -2],
+					"name": "arm_left6",
+					"parent": "arm_left5",
+					"pivot": [38, 4.25, 0],
 					"cubes": [
-						{"origin": [23.125, 2, -2], "size": [2, 0, 2], "uv": [30, 45]},
-						{"origin": [25.125, 0.5, -2.5], "size": [2, 3, 3], "uv": [49, 35]}
+						{"origin": [37, 3.25, -1], "size": [7, 2, 2], "uv": [58, 40]}
 					]
 				},
 				{
-					"name": "flame_front_left",
-					"parent": "candleholder_front_left2",
-					"pivot": [27.125, 2, -1],
+					"name": "arm_left7",
+					"parent": "arm_left6",
+					"pivot": [44, 4.25, 0],
 					"cubes": [
-						{"origin": [26.625, 2, -2.5], "size": [7, 0, 3], "uv": [36, 0]},
-						{"origin": [26.625, 0.5, -1], "size": [7, 3, 0], "uv": [40, 31]}
-					]
-				},
-				{
-					"name": "candleholder_back_left",
-					"parent": "arm_left4",
-					"pivot": [19.125, 2, 0],
-					"cubes": [
-						{"origin": [19.125, 2, 0], "size": [4, 0, 2], "uv": [22, 45]}
-					]
-				},
-				{
-					"name": "candleholder_back_left2",
-					"parent": "candleholder_back_left",
-					"pivot": [23.125, 2, 2],
-					"cubes": [
-						{"origin": [23.125, 2, 0], "size": [2, 0, 2], "uv": [38, 44]},
-						{"origin": [25.125, 0.5, -0.5], "size": [2, 3, 3], "uv": [54, 25]}
-					]
-				},
-				{
-					"name": "flame_back_left",
-					"parent": "candleholder_back_left2",
-					"pivot": [27.125, 2, 1],
-					"cubes": [
-						{"origin": [26.625, 2, -0.5], "size": [7, 0, 3], "uv": [-3, 50]},
-						{"origin": [26.625, 0.5, 1], "size": [7, 3, 0], "uv": [40, 28]}
+						{"origin": [43.5, 3.75, -0.5], "size": [6, 1, 1], "uv": [32, 28]}
 					]
 				},
 				{
 					"name": "arm_right",
-					"parent": "head",
-					"pivot": [-2.125, 3, 0],
+					"parent": "arms",
+					"pivot": [-2, 4.25, 0],
 					"cubes": [
-						{"origin": [-7.125, 2, 0], "size": [6, 2, 0], "inflate": 0.01, "uv": [14, 51]}
+						{"origin": [-10.5, 3.75, -0.5], "size": [9, 1, 1], "uv": [0, 36], "mirror": true}
 					]
 				},
 				{
 					"name": "arm_right2",
 					"parent": "arm_right",
-					"pivot": [-7.125, 2, 0],
+					"pivot": [-9.5, 4.25, 0],
 					"cubes": [
-						{"origin": [-13.125, 2, 0], "size": [6, 2, 0], "uv": [40, 36]}
+						{"origin": [-18, 3.25, -1], "size": [9, 2, 2], "inflate": -0.15, "uv": [54, 28], "mirror": true}
 					]
 				},
 				{
 					"name": "arm_right3",
 					"parent": "arm_right2",
-					"pivot": [-13.125, 2, 0],
+					"pivot": [-17.5, 4.25, 0],
 					"cubes": [
-						{"origin": [-19.125, 2, 0], "size": [6, 2, 0], "inflate": 0.01, "uv": [0, 3]}
+						{"origin": [-25, 3.25, -1], "size": [8, 2, 2], "uv": [20, 38], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_front_right",
+					"parent": "arm_right3",
+					"pivot": [-19, 4.25, -1],
+					"cubes": [
+						{"origin": [-22.5, 4.25, -1.5], "size": [4, 0, 1], "uv": [57, 45], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_front_right2",
+					"parent": "candle_front_right",
+					"pivot": [-22.5, 4.25, -1],
+					"cubes": [
+						{"origin": [-26, 4.25, -1.5], "size": [4, 0, 1], "inflate": 0.005, "uv": [76, 29], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_front_right3",
+					"parent": "candle_front_right2",
+					"pivot": [-26, 4.25, -1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-29.5, 4.25, -1.5], "size": [4, 0, 1], "inflate": 0.01, "uv": [-1, 63], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_front_right4",
+					"parent": "candle_front_right3",
+					"pivot": [-29.5, 4.25, -1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-35, 1.75, -3.5], "size": [6, 5, 5], "uv": [0, 52], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_front_right",
+					"parent": "candle_front_right4",
+					"pivot": [-34.5, 4.75, -1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-39, 2.25, -3], "size": [5, 4, 4], "uv": [76, 64], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_front_right2",
+					"parent": "flame_front_right",
+					"pivot": [-39, 4.25, -1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-42.5, 2.75, -2.5], "size": [4, 3, 3], "inflate": -0.1, "uv": [80, 45], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_front_right3",
+					"parent": "flame_front_right2",
+					"pivot": [-42.5, 4.25, -1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-46, 3.25, -1], "size": [4, 2, 0], "uv": [17, 45], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_back_right",
+					"parent": "arm_right3",
+					"pivot": [-19, 4.25, 1],
+					"cubes": [
+						{"origin": [-22.5, 4.25, 0.5], "size": [4, 0, 1], "uv": [57, 47], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_back_right2",
+					"parent": "candle_back_right",
+					"pivot": [-22.5, 4.25, 1],
+					"cubes": [
+						{"origin": [-26, 4.25, 0.5], "size": [4, 0, 1], "inflate": 0.005, "uv": [79, 35], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_back_right3",
+					"parent": "candle_back_right2",
+					"pivot": [-26, 4.25, 1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-29.5, 4.25, 0.5], "size": [4, 0, 1], "inflate": 0.01, "uv": [7, 63], "mirror": true}
+					]
+				},
+				{
+					"name": "candle_back_right4",
+					"parent": "candle_back_right3",
+					"pivot": [-29.5, 4.25, 1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-35, 1.75, -1.5], "size": [6, 5, 5], "uv": [0, 81], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_back_right",
+					"parent": "candle_back_right4",
+					"pivot": [-34.5, 4.75, 1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-39, 2.25, -1], "size": [5, 4, 4], "uv": [60, 56], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_back_right2",
+					"parent": "flame_back_right",
+					"pivot": [-39, 4.25, 1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-42.5, 2.75, -0.5], "size": [4, 3, 3], "inflate": -0.1, "uv": [82, 28], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_back_right3",
+					"parent": "flame_back_right2",
+					"pivot": [-42.5, 4.25, 1],
+					"rotation": [0, 0, 0.00001],
+					"cubes": [
+						{"origin": [-46, 3.25, 1], "size": [4, 2, 0], "uv": [17, 55], "mirror": true}
 					]
 				},
 				{
 					"name": "arm_right4",
 					"parent": "arm_right3",
-					"pivot": [-19.125, 2, 0],
+					"pivot": [-25, 4.25, 0],
 					"cubes": [
-						{"origin": [-27.125, 2, 0], "size": [8, 8, 0], "uv": [24, 25]}
+						{"origin": [-32, 3.25, -1], "size": [8, 2, 2], "inflate": 0.1, "uv": [60, 32], "mirror": true}
 					]
 				},
 				{
-					"name": "candleholder_front_right",
+					"name": "arm_right5",
 					"parent": "arm_right4",
-					"pivot": [-19.125, 2, 0],
+					"pivot": [-32, 4.25, 0],
 					"cubes": [
-						{"origin": [-23.125, 2, -2], "size": [4, 0, 2], "uv": [38, 42]}
+						{"origin": [-38, 3.25, -1], "size": [7, 2, 2], "inflate": 0.05, "uv": [62, 36], "mirror": true}
 					]
 				},
 				{
-					"name": "candleholder_front_right2",
-					"parent": "candleholder_front_right",
-					"pivot": [-23.125, 2, -2],
+					"name": "arm_right6",
+					"parent": "arm_right5",
+					"pivot": [-38, 4.25, 0],
 					"cubes": [
-						{"origin": [-25.125, 2, -2], "size": [2, 0, 2], "uv": [30, 22]},
-						{"origin": [-27.125, 0.5, -2.5], "size": [2, 3, 3], "uv": [52, 10]}
+						{"origin": [-44, 3.25, -1], "size": [7, 2, 2], "uv": [60, 52], "mirror": true}
 					]
 				},
 				{
-					"name": "flame_front_right",
-					"parent": "candleholder_front_right2",
-					"pivot": [-27.125, 2, -1],
+					"name": "arm_right7",
+					"parent": "arm_right6",
+					"pivot": [-44, 4.25, 0],
 					"cubes": [
-						{"origin": [-33.625, 2, -2.5], "size": [7, 0, 3], "uv": [13, 33]},
-						{"origin": [-33.625, 0.5, -1], "size": [7, 3, 0], "uv": [36, 46]}
+						{"origin": [-49.5, 3.75, -0.5], "size": [6, 1, 1], "uv": [32, 30], "mirror": true}
 					]
 				},
 				{
-					"name": "candleholder_back_right",
-					"parent": "arm_right4",
-					"pivot": [-19.125, 2, 0],
+					"name": "head",
+					"parent": "swing",
+					"pivot": [0, 7.5, 0],
 					"cubes": [
-						{"origin": [-23.125, 2, 0], "size": [4, 0, 2], "uv": [38, 40]}
+						{"origin": [-8.5, 7.5, -8.5], "size": [17, 11, 17], "inflate": -0.01, "uv": [8, 53]},
+						{"origin": [-8.5, 7.5, -8.5], "size": [17, 11, 0], "uv": [0, 11]},
+						{"origin": [-8.5, 7.5, 8.5], "size": [17, 11, 0], "uv": [0, 0]},
+						{"origin": [-8.5, 18.5, -8.5], "size": [17, 0, 17], "uv": [17, 0]},
+						{"origin": [-8.5, 7.5, -8.5], "size": [17, 0, 17], "uv": [51, 0]},
+						{"origin": [8.5, 7.5, -8.5], "size": [0, 11, 17], "uv": [34, 0]},
+						{"origin": [-8.5, 7.5, -8.5], "size": [0, 11, 17], "uv": [68, 0], "mirror": true}
 					]
 				},
 				{
-					"name": "candleholder_back_right2",
-					"parent": "candleholder_back_right",
-					"pivot": [-23.125, 2, 2],
+					"name": "eyes",
+					"parent": "head",
+					"pivot": [0, 13, -8.51]
+				},
+				{
+					"name": "eye_left",
+					"parent": "eyes",
+					"pivot": [6, 13, -8.51]
+				},
+				{
+					"name": "eye_open_left",
+					"parent": "eye_left",
+					"pivot": [6, 13, -8.51],
 					"cubes": [
-						{"origin": [-25.125, 2, 0], "size": [2, 0, 2], "uv": [38, 38]},
-						{"origin": [-27.125, 0.5, -0.5], "size": [2, 3, 3], "uv": [29, 47]}
+						{"origin": [5, 12, -8.51], "size": [2, 2, 0], "uv": [0, 64]}
 					]
 				},
 				{
-					"name": "flame_back_right",
-					"parent": "candleholder_back_right2",
-					"pivot": [-27.125, 2, 1],
+					"name": "eye_expression_left",
+					"parent": "eye_open_left",
+					"pivot": [6, 14, -8.42],
 					"cubes": [
-						{"origin": [-33.625, 2, -0.5], "size": [7, 0, 3], "uv": [-3, 47]},
-						{"origin": [-33.625, 0.5, 1], "size": [7, 3, 0], "uv": [48, 41]}
+						{"origin": [5.5, 13.5, -8.42], "size": [1, 1, 0], "uv": [0, 69]}
+					]
+				},
+				{
+					"name": "eye_closed_left",
+					"parent": "eye_left",
+					"pivot": [6, 12.5, -8.41],
+					"cubes": [
+						{"origin": [5, 12, -8.41], "size": [2, 1, 0], "uv": [0, 66]}
+					]
+				},
+				{
+					"name": "eye_happy_left",
+					"parent": "eye_left",
+					"pivot": [6, 12.75, -8.41],
+					"cubes": [
+						{"origin": [4.499, 12.25, -8.41], "size": [3, 1, 0], "uv": [0, 67]},
+						{"origin": [5.5, 12.75, -8.41], "size": [1, 1, 0], "uv": [2, 69]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-6, 13, -8.51]
+				},
+				{
+					"name": "eye_open_right",
+					"parent": "eye_right",
+					"pivot": [-6, 13, -8.51],
+					"cubes": [
+						{"origin": [-7, 12, -8.51], "size": [2, 2, 0], "uv": [4, 64], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_expression_right",
+					"parent": "eye_open_right",
+					"pivot": [-6, 14, -8.42],
+					"cubes": [
+						{"origin": [-6.5, 13.5, -8.42], "size": [1, 1, 0], "uv": [0, 70], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_right",
+					"parent": "eye_right",
+					"pivot": [-6, 12.5, -8.41],
+					"cubes": [
+						{"origin": [-7, 12, -8.41], "size": [2, 1, 0], "uv": [4, 66], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_happy_right",
+					"parent": "eye_right",
+					"pivot": [-6, 12.75, -8.41],
+					"cubes": [
+						{"origin": [-7.499, 12.25, -8.41], "size": [3, 1, 0], "uv": [0, 68], "mirror": true},
+						{"origin": [-6.5, 12.75, -8.41], "size": [1, 1, 0], "uv": [2, 70], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_inner",
+					"parent": "head",
+					"pivot": [0, 7.5, -0.1],
+					"cubes": [
+						{"origin": [-3, 7, -3.1], "size": [6, 3, 6], "uv": [102, 2]}
+					]
+				},
+				{
+					"name": "flame_inner2",
+					"parent": "flame_inner",
+					"pivot": [0, 8.75, -0.1],
+					"cubes": [
+						{"origin": [-4, 8.75, -4.1], "size": [8, 8, 8], "uv": [96, 20]}
+					]
+				},
+				{
+					"name": "flame_inner3",
+					"parent": "flame_inner2",
+					"pivot": [0, 16.75, -0.1],
+					"cubes": [
+						{"origin": [-3, 15.5, -3.1], "size": [6, 3, 6], "uv": [102, 11]}
+					]
+				},
+				{
+					"name": "brim",
+					"parent": "head",
+					"pivot": [0, 19, -0.1],
+					"cubes": [
+						{"origin": [-3.5, 18.5, -3.6], "size": [7, 1, 7], "inflate": 0.01, "uv": [100, 36]},
+						{"origin": [-3.5, 18.76, -3.35], "size": [7, 3, 0], "pivot": [0, 18.75, -3.35], "rotation": [25, 0, 0], "uv": [106, 44]},
+						{"origin": [-3.5, 18.76, 3.15], "size": [7, 3, 0], "pivot": [0, 18.75, 3.15], "rotation": [-25, 0, 0], "uv": [112, 47]},
+						{"origin": [3.25, 18.76, -3.6], "size": [0, 3, 7], "pivot": [3.25, 18.75, -0.1], "rotation": [0, 0, 25], "uv": [80, 29]},
+						{"origin": [-3.25, 18.76, -3.6], "size": [0, 3, 7], "pivot": [-3.25, 18.75, -0.1], "rotation": [0, 0, -25], "uv": [59, 57], "mirror": true}
+					]
+				},
+				{
+					"name": "flame_middle",
+					"parent": "brim",
+					"pivot": [0, 19, -0.1],
+					"cubes": [
+						{"origin": [-3, 19, -3.1], "size": [6, 8, 6], "uv": [104, 50]}
+					]
+				},
+				{
+					"name": "flame_middle2",
+					"parent": "flame_middle",
+					"pivot": [0, 26, -0.1],
+					"cubes": [
+						{"origin": [-2.5, 25.5, -2.6], "size": [5, 8, 5], "uv": [78, 51]}
+					]
+				},
+				{
+					"name": "flame_middle3",
+					"parent": "flame_middle2",
+					"pivot": [0, 33, -0.1],
+					"cubes": [
+						{"origin": [-2, 32, -2.1], "size": [4, 7, 4], "uv": [94, 45]}
+					]
+				},
+				{
+					"name": "flame_middle4",
+					"parent": "flame_middle3",
+					"pivot": [0, 39, -0.1],
+					"cubes": [
+						{"origin": [-1.5, 38, -1.6], "size": [3, 7, 3], "uv": [0, 22]}
+					]
+				},
+				{
+					"name": "flame_middle5",
+					"parent": "flame_middle4",
+					"pivot": [0, 45, -0.1],
+					"cubes": [
+						{"origin": [-1, 44, -0.1], "size": [2, 6, 0], "uv": [120, 11]}
 					]
 				}
 			]

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

@@ -53,7 +53,6 @@
       "isTouchingWater": true,
       "isUnderWater": false,
       "animations": [
-        "q.look('body')",
         "q.bedrock('staryu', 'surfacewater_swim')"
       ]
     },
@@ -71,7 +70,6 @@
       "isUnderWater": true,
       "animations": [
         "q.pitch_tilt('body', 1)",
-        "q.look('body')",
         "q.bedrock('staryu', 'water_swim')"
       ]
     }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0121_starmie/starmie.json

@@ -92,7 +92,6 @@
       "isTouchingWater": true,
       "isUnderWater": false,
       "animations": [
-        "q.look('body')",
         "q.bedrock('starmie', 'surfacewater_swim')"
       ]
     },
@@ -114,7 +113,6 @@
       "isUnderWater": true,
       "animations": [
         "q.pitch_tilt('body', 1)",
-        "q.look('body')",
         "q.bedrock('starmie', 'water_swim')"
       ]
     }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0128_tauros/tauros.json

@@ -21,6 +21,7 @@
   "poses": {
     "jump": {
       "poseTypes": ["STAND", "WALK"],
+      "isBattle": false,
       "condition": "q.in_air",
       "animations": [
         "q.look('head')",
@@ -38,7 +39,6 @@
     },
     "running": {
       "poseTypes": ["WALK", "FLOAT", "SWIM"],
-      "isBattle": false,
       "condition": "!q.in_air && q.is_sprinting",
       "animations": [
         "q.look('head')",
@@ -65,7 +65,6 @@
     },
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "isBattle": false,
       "condition": "!q.in_air",
       "animations": [
         "q.look('head')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0128_tauros/tauros_paldean_aqua.json

@@ -56,7 +56,6 @@
     },
     "running": {
       "poseTypes": ["WALK"],
-      "isBattle": false,
       "isTouchingWater": false,
       "condition": "!q.in_air && q.is_sprinting",
       "animations": [
@@ -85,7 +84,6 @@
     },
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "isBattle": false,
       "isTouchingWater": false,
       "condition": "!q.in_air",
       "animations": [
@@ -99,7 +97,6 @@
       "quirks": ["q.bedrock_quirk('tauros_paldean_aqua', 'blink')"]
     },
     "surface-swimming": {
-      "isBattle": false,
       "isTouchingWater": true,
       "poseTypes": ["WALK", "SWIM"],
       "animations": [
@@ -112,7 +109,6 @@
       "quirks": ["q.bedrock_quirk('tauros_paldean_aqua', 'blink')"]
     },
     "surface-floating": {
-      "isBattle": false,
       "isTouchingWater": true,
       "poseTypes": ["STAND", "FLOAT"],
       "animations": [

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0128_tauros/tauros_paldean_blaze.json

@@ -38,7 +38,6 @@
     },
     "running": {
       "poseTypes": ["WALK", "FLOAT", "SWIM"],
-      "isBattle": false,
       "condition": "!q.in_air && q.is_sprinting",
       "animations": [
         "q.look('head')",
@@ -65,7 +64,6 @@
     },
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "isBattle": false,
       "condition": "!q.in_air",
       "animations": [
         "q.look('head')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0169_crobat/crobat.json

@@ -36,7 +36,7 @@
         "q.look('body', 0.5, 0.5)",
         "q.bedrock('crobat', 'ground_idle')"
       ],
-        "quirks": ["q.bedrock_quirk('crobat', 'blink')","q.bedrock_quirk('crobat', 'fang_quirk')"],
+        "quirks": ["q.bedrock_quirk('crobat', 'blink')"],
       "transformTicks": 10
     },
     "walk": {

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

@@ -52,7 +52,6 @@
       "isUnderWater": true,
       "animations": [
         "q.pitch_tilt('body')",
-        "q.look('head')",
         "q.bedrock('corsola', 'water_swim')"
       ],
       "quirks": ["q.bedrock_quirk('corsola', 'blink')"]
@@ -78,7 +77,6 @@
       "isUnderWater": false,
       "animations": [
         "q.pitch_tilt('body')",
-        "q.look('head')",
         "q.bedrock('corsola', 'surfacewater_swim')"
       ],
       "quirks": ["q.bedrock_quirk('corsola', 'blink')"]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0605_elgyem/elgyem.json

@@ -0,0 +1,51 @@
+{
+  "portraitScale": 2.35,
+  "portraitTranslation": [-0.09, -0.55, 0],
+  "profileScale": 0.72,
+  "profileTranslation": [0, 0.73, 0],
+  "rootBone": "elgyem",
+  "animations": {
+    "cry": "q.bedrock_stateful('elgyem', 'cry')",
+    "recoil": "q.bedrock_stateful('elgyem', 'recoil')"
+  },
+  "poses": {
+    "battle-standing": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": ["q.look('head_ai')", "q.bedrock('elgyem', 'battle_idle')"],
+      "quirks": [
+        "q.bedrock_quirk('elgyem', 'blink')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk1')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk2')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk3')"
+      ]
+    },
+    "standing": {
+      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
+      "animations": ["q.look('head_ai')", "q.bedrock('elgyem', 'ground_idle')"],
+      "quirks": [
+        "q.bedrock_quirk('elgyem', 'blink')",
+        "q.bedrock_quirk('elgyem', 'look_quirk')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk1')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk2')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk3')"
+      ]
+    },
+    "walking": {
+      "poseTypes": ["WALK", "SWIM"],
+      "animations": ["q.look('head_ai')", "q.bedrock('elgyem', 'ground_walk')"],
+      "quirks": [
+        "q.bedrock_quirk('elgyem', 'blink')",
+        "q.bedrock_quirk('elgyem', 'look_quirk')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk1')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk2')",
+        "q.bedrock_quirk('elgyem', 'lights_quirk3')"
+      ]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('elgyem', 'sleep')"]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0606_beheeyem/beheeyem.json

@@ -0,0 +1,48 @@
+{
+  "portraitScale": 2.32,
+  "portraitTranslation": [-0.52, 0.04, 0],
+  "profileScale": 0.71,
+  "profileTranslation": [0, 0.7, 0],
+  "rootBone": "beheeyem",
+  "animations": {
+    "cry": "q.bedrock_stateful('beheeyem', 'cry')"
+  },
+  "poses": {
+    "battle-standing": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": ["q.look('head_ai')", "q.bedrock('beheeyem', 'battle_idle')"],
+      "quirks": [
+        "q.bedrock_quirk('beheeyem', 'blink')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk1')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk2')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk3')"
+      ]
+    },
+    "standing": {
+      "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
+      "animations": ["q.look('head_ai')", "q.bedrock('beheeyem', 'ground_idle')"],
+      "quirks": [
+        "q.bedrock_quirk('beheeyem', 'blink')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk1')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk2')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk3')"
+      ]
+    },
+    "walking": {
+      "poseTypes": ["WALK", "SWIM"],
+      "animations": ["q.look('head_ai')", "q.bedrock('beheeyem', 'ground_walk')"],
+      "quirks": [
+        "q.bedrock_quirk('beheeyem', 'blink')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk1')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk2')",
+        "q.bedrock_quirk('beheeyem', 'lights_quirk3')"
+      ]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('beheeyem', 'sleep')"]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0607_litwick/litwick.json

@@ -0,0 +1,87 @@
+{
+  "portraitScale": 1.9,
+  "portraitTranslation": [-0.04,-1.19,0],
+  "profileScale": 0.8,
+  "profileTranslation": [0,0.49,0],
+  "rootBone": "litwick",
+  "poses": {
+    "standing": {
+      "poseTypes": [
+        "STAND",
+        "FLOAT",
+        "NONE",
+        "PROFILE",
+        "PORTRAIT"
+      ],
+      "isBattle": false,
+      "animations": [
+        "q.look('head', 1, 1, 0, 0, 7, -7)",
+        "q.look('head2', 1, 1, 7, -7, 0, 0)",
+        "q.bedrock('litwick', 'ground_idle')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('litwick', 'blink')"
+      ]
+    },
+    "walk": {
+      "poseTypes": [
+        "WALK",
+        "SWIM"
+      ],
+      "animations": [
+        "q.look('head', 1, 1, 0, 0, 7, -7)",
+        "q.look('head2', 1, 1, 7, -7, 0, 0)",
+        "q.bedrock('litwick', 'ground_walk')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('litwick', 'blink')"
+      ]
+    },
+    "battle_idle": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": [
+        "q.look('head', 1, 1, 0, 0, 7, -7)",
+        "q.look('head2', 1, 1, 7, -7, 0, 0)",
+        "q.bedrock('litwick', 'battle_idle')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('litwick', 'blink')"
+      ]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('litwick', 'sleep')"]
+    },
+    "shoulder_left": {
+      "poseTypes": ["SHOULDER_LEFT"],
+      "animations": [
+        "q.look('head', 1, 1, 0, 0, 7, -7)",
+        "q.look('head2', 1, 1, 7, -7, 0, 0)",
+        "q.bedrock('litwick', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('litwick', 'blink')"],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [1.5, 0, 0]
+        }
+      ]
+    },
+    "shoulder_right": {
+      "poseTypes": ["SHOULDER_RIGHT"],
+      "animations": [
+        "q.look('head', 1, 1, 0, 0, 7, -7)",
+        "q.look('head2', 1, 1, 7, -7, 0, 0)",
+        "q.bedrock('litwick', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('litwick', 'blink')"],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [-1.5, 0, 0]
+        }
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0608_lampent/lampent.json

@@ -0,0 +1,60 @@
+{
+  "portraitScale": 1.65,
+  "portraitTranslation": [-0.1,0.15,0],
+  "profileScale": 0.77,
+  "profileTranslation": [0,0.52,0],
+  "rootBone": "lampent",
+  "poses": {
+    "sleep": {
+      "poseName": "sleep",
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('lampent', 'sleep')"]
+    },
+    "standing": {
+      "poseTypes": [
+        "STAND",
+        "NONE",
+        "PORTRAIT",
+        "PROFILE"
+      ],
+      "isBattle": false,
+      "animations": [
+        "q.look('body')",
+        "q.bedrock('lampent', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('lampent', 'blink')"]
+    },
+    "walk": {
+      "poseTypes": ["WALK"],
+      "animations": ["q.bedrock('lampent', 'ground_walk')"],
+      "quirks": ["q.bedrock_quirk('lampent', 'blink')"]
+    },
+    "hover": {
+      "poseTypes": ["HOVER"],
+      "isBattle": false,
+      "animations": [
+        "q.pitch_tilt('body')",
+        "q.look('body')",
+        "q.bedrock('lampent', 'air_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('lampent', 'blink')"]
+    },
+    "fly": {
+      "poseTypes": ["FLY"],
+      "animations": [
+        "q.pitch_tilt('body')",
+        "q.bedrock('lampent', 'air_fly')"
+      ],
+      "quirks": ["q.bedrock_quirk('lampent', 'blink')"]
+    },
+    "battle_standing": {
+      "poseTypes": ["STAND", "HOVER"],
+      "isBattle": true,
+      "animations": [
+        "q.look('body')",
+        "q.bedrock('lampent', 'battle_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('lampent', 'blink')"]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0609_chandelure/chandelure.json

@@ -0,0 +1,60 @@
+{
+  "portraitScale": 1.53,
+  "portraitTranslation": [-0.32,0.48,0],
+  "profileScale": 0.57,
+  "profileTranslation": [0,0.99,0],
+  "rootBone": "chandelure",
+  "poses": {
+    "standing": {
+      "isBattle": false,
+      "poseTypes": [
+        "STAND",
+        "NONE",
+        "PORTRAIT",
+        "PROFILE"
+      ],
+      "animations": [
+        "q.look('body')",
+        "q.bedrock('chandelure', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('chandelure', 'blink')"]
+    },
+    "walk": {
+      "poseTypes": ["WALK"],
+      "animations": ["q.bedrock('chandelure', 'ground_walk')"],
+      "quirks": ["q.bedrock_quirk('chandelure', 'blink')"]
+    },
+    "hover": {
+      "poseTypes": ["HOVER"],
+      "isBattle": false,
+      "animations": [
+        "q.pitch_tilt('body')",
+        "q.look('body')",
+        "q.bedrock('chandelure', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('chandelure', 'blink')"]
+    },
+    "fly": {
+      "poseTypes": ["FLY"],
+      "animations": [
+        "q.pitch_tilt('body')",
+        "q.bedrock('chandelure', 'ground_walk')"
+      ],
+      "quirks": ["q.bedrock_quirk('chandelure', 'blink')"]
+    },
+    "battle-standing": {
+      "poseTypes": ["STAND", "HOVER"],
+      "isBattle": true,
+      "animations": [
+        "q.look('body')",
+        "q.bedrock('chandelure', 'battle_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('chandelure', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('chandelure', 'sleep')"
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0635_hydreigon/hydreigon.json

@@ -26,16 +26,26 @@
       "animations": ["q.look('head_ai')", "q.bedrock('hydreigon', 'potrait_pose')"],
       "quirks": ["q.bedrock_quirk('hydreigon', 'blink')"]
     },
-    "standing": {
+    "mount-standing": {
       "poseTypes": ["STAND", "NONE", "PROFILE"],
       "isBattle": false,
+      "condition": "q.is_ridden",
       "animations": [
         "q.look('head_ai')",
         "q.bedrock('hydreigon', 'air_idle')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('hydreigon', 'ride_air_fly')"
-        }
+        "q.bedrock('hydreigon', 'ride_air_fly')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('hydreigon', 'blink')"
+      ]
+    },
+    "standing": {
+      "poseTypes": ["STAND", "NONE", "PROFILE"],
+      "isBattle": false,
+      "condition": "!q.is_ridden",
+      "animations": [
+        "q.look('head_ai')",
+        "q.bedrock('hydreigon', 'air_idle')"
       ],
       "quirks": [
         "q.bedrock_quirk('hydreigon', 'blink')",
@@ -55,17 +65,28 @@
       ],
       "quirks": ["q.bedrock_quirk('hydreigon', 'blink')"]
     },
-    "hover": {
+    "mount-hover": {
       "poseTypes": ["HOVER", "NONE"],
       "isBattle": false,
+      "condition": "q.is_ridden",
       "animations": [
         "q.pitch_tilt('body', 1)",
         "q.look('head_ai')",
         "q.bedrock('hydreigon', 'air_idle')",
-        {
-          "condition": "q.is_ridden",
-          "animation": "q.bedrock('hydreigon', 'ride_air_fly')"
-        }
+        "q.bedrock('hydreigon', 'ride_air_fly')"
+      ],
+      "quirks": [
+        "q.bedrock_quirk('hydreigon', 'blink')"
+      ]
+    },
+    "hover": {
+      "poseTypes": ["HOVER", "NONE"],
+      "isBattle": false,
+      "condition": "!q.is_ridden",
+      "animations": [
+        "q.pitch_tilt('body', 1)",
+        "q.look('head_ai')",
+        "q.bedrock('hydreigon', 'air_idle')"
       ],
       "quirks": [
         "q.bedrock_quirk('hydreigon', 'blink')",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0605_elgyem/0_elgyem_base.json

@@ -9,16 +9,8 @@
       "texture": "cobblemon:textures/pokemon/0605_elgyem/elgyem.png",
       "layers": [
         {
-          "name": "color",
-          "texture": {
-            "frames": [
-              "cobblemon:textures/pokemon/0605_elgyem/glow/hand_glow_green.png",
-              "cobblemon:textures/pokemon/0605_elgyem/glow/hand_glow_red.png",
-              "cobblemon:textures/pokemon/0605_elgyem/glow/hand_glow_yellow.png"
-            ],
-            "fps": 5,
-            "loop": true
-          },
+          "name": "glow",
+          "texture": "cobblemon:textures/pokemon/0605_elgyem/elgyem_emissive.png",
           "emissive": true
         }
       ]
@@ -28,16 +20,8 @@
       "texture": "cobblemon:textures/pokemon/0605_elgyem/elgyem_shiny.png",
       "layers": [
         {
-          "name": "color",
-          "texture": {
-            "frames": [
-              "cobblemon:textures/pokemon/0605_elgyem/glow/hand_shiny_blue.png",
-              "cobblemon:textures/pokemon/0605_elgyem/glow/hand_shiny_purple.png",
-              "cobblemon:textures/pokemon/0605_elgyem/glow/hand_shiny_yellow.png"
-            ],
-            "fps": 5,
-            "loop": true
-          },
+          "name": "glow",
+          "texture": "cobblemon:textures/pokemon/0605_elgyem/elgyem_emissive_shiny.png",
           "emissive": true
         }
       ]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0606_beheeyem/0_beheeyem_base.json

@@ -9,16 +9,8 @@
       "texture": "cobblemon:textures/pokemon/0606_beheeyem/beheeyem.png",
       "layers": [
         {
-          "name": "color",
-          "texture": {
-            "frames": [
-              "cobblemon:textures/pokemon/0606_beheeyem/glow/hand_glow_yellow.png",
-              "cobblemon:textures/pokemon/0606_beheeyem/glow/hand_glow_red.png",
-              "cobblemon:textures/pokemon/0606_beheeyem/glow/hand_glow_green.png"
-            ],
-            "fps": 5,
-            "loop": true
-          },
+          "name": "glow",
+          "texture": "cobblemon:textures/pokemon/0606_beheeyem/beheeyem_emissive.png",
           "emissive": true
         }
       ]
@@ -28,16 +20,8 @@
       "texture": "cobblemon:textures/pokemon/0606_beheeyem/beheeyem_shiny.png",
       "layers": [
         {
-          "name": "shiny_color",
-          "texture": {
-            "frames": [
-              "cobblemon:textures/pokemon/0606_beheeyem/glow/hand_shiny_blue.png",
-              "cobblemon:textures/pokemon/0606_beheeyem/glow/hand_shiny_purple.png",
-              "cobblemon:textures/pokemon/0606_beheeyem/glow/hand_shiny_green.png"
-            ],
-            "fps": 5,
-            "loop": true
-          },
+          "name": "glow",
+          "texture": "cobblemon:textures/pokemon/0606_beheeyem/beheeyem_emissive_shiny.png",
           "emissive": true
         }
       ]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0607_litwick/0_litwick_base.json

@@ -9,9 +9,10 @@
       "texture": "cobblemon:textures/pokemon/0607_litwick/litwick.png",
       "layers": [
         {
-          "name": "color",
+          "name": "emissive",
           "texture": "cobblemon:textures/pokemon/0607_litwick/litwick_emissive.png",
-          "emissive": true
+          "emissive": true,
+          "translucent": true
         }
       ]
     },
@@ -20,9 +21,10 @@
       "texture": "cobblemon:textures/pokemon/0607_litwick/litwick_shiny.png",
       "layers": [
         {
-          "name": "color",
-          "texture": "cobblemon:textures/pokemon/0607_litwick/litwick_shiny_emissive.png",
-          "emissive": true
+          "name": "emissive",
+          "texture": "cobblemon:textures/pokemon/0607_litwick/litwick_emissive_shiny.png",
+          "emissive": true,
+          "translucent": true
         }
       ]
     }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0608_lampent/0_lampent_base.json

@@ -9,9 +9,10 @@
       "texture": "cobblemon:textures/pokemon/0608_lampent/lampent.png",
       "layers": [
         {
-          "name": "color",
+          "name": "emissive",
           "texture": "cobblemon:textures/pokemon/0608_lampent/lampent_emissive.png",
-          "emissive": true
+          "emissive": true,
+          "translucent": true
         }
       ]
     },
@@ -20,9 +21,10 @@
       "texture": "cobblemon:textures/pokemon/0608_lampent/lampent_shiny.png",
       "layers": [
         {
-          "name": "color",
-          "texture": "cobblemon:textures/pokemon/0608_lampent/lampent_shiny_emissive.png",
-          "emissive": true
+          "name": "emissive",
+          "texture": "cobblemon:textures/pokemon/0608_lampent/lampent_emissive_shiny.png",
+          "emissive": true,
+          "translucent": true
         }
       ]
     }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0609_chandelure/0_chandelure_base.json

@@ -9,13 +9,16 @@
       "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure.png",
       "layers": [
         {
-          "name": "color",
+          "name": "emissive",
           "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_emissive.png",
-          "emissive": true
+          "emissive": true,
+          "translucent": true
         },
         {
-          "name": "trim",
-          "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_trim.png"
+          "name": "transparency",
+          "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_transparency.png",
+          "translucent": true,
+          "translucent_cull": true
         }
       ]
     },
@@ -24,13 +27,16 @@
       "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_shiny.png",
       "layers": [
         {
-          "name": "color",
-          "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_shiny_emissive.png",
-          "emissive": true
+          "name": "emissive",
+          "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_emissive_shiny.png",
+          "emissive": true,
+          "translucent": true
         },
         {
-          "name": "trim",
-          "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_trim.png"
+          "name": "transparency",
+          "texture": "cobblemon:textures/pokemon/0609_chandelure/chandelure_transparency_shiny.png",
+          "translucent": true,
+          "translucent_cull": true
         }
       ]
     }

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

@@ -410,6 +410,11 @@
               "tier": 2
             }
           ]
+        },
+        "moving": {
+          "fly": {
+            "canFly": false
+          }
         }
       }
     }

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

@@ -102,17 +102,7 @@
       }
     ]
   },
-  "behaviour": {
-    "resting": {
-      "canSleep": true,
-      "light": "0-4"
-    },
-    "moving": {
-      "fly": {
-        "canFly": true
-      }
-    },
-    "drops": {
+  "drops": {
       "amount": 5,
       "entries": [
         {
@@ -124,7 +114,7 @@
         }
       ]
     },
-    "moves": [
+  "moves": [
       "1:whirlwind",
       "1:weatherball",
       "1:gust",
@@ -272,8 +262,8 @@
       "legacy:zapcannon",
       "special:celebrate"
     ],
-    "evolutions": [],
-    "behaviour": {
+  "evolutions": [],
+  "behaviour": {
       "herd": {
         "maxSize": "2",
         "toleratedLeaders": [
@@ -282,7 +272,15 @@
             "tier": 1
           }
         ]
+      },
+      "resting": {
+        "canSleep": true,
+        "light": "0-4"
+      },
+      "moving": {
+        "fly": {
+          "canFly": true
+        }
       }
     }
-  }
-}
+  }

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

@@ -199,7 +199,7 @@
         "canFly": true
       },
       "swim": {
-        "canSwimInLava": true
+        "canSwim": true
       },
       "walk": {
         "walkSpeed": 0.55

common/src/main/resources/data/cobblemon/species/generation5/chandelure.json

@@ -43,10 +43,13 @@
   "catchRate": 45,
   "eggCycles": 20,
   "baseFriendship": 50,
-  "baseScale": 1,
+  "standingEyeHeight": 0.75,
+  "swimmingEyeHeight": 0.75,
+  "flyingEyeHeight": 0.75,
+  "baseScale": 0.6,
   "hitbox": {
-    "width": 1,
-    "height": 1.2,
+    "width": 1.2,
+    "height": 1.5,
     "fixed": false
   },
   "behaviour": {

common/src/main/resources/data/cobblemon/species/generation5/lampent.json

@@ -43,10 +43,13 @@
   "catchRate": 90,
   "eggCycles": 20,
   "baseFriendship": 50,
-  "baseScale": 1,
+  "standingEyeHeight": 0.65,
+  "swimmingEyeHeight": 0.65,
+  "flyingEyeHeight": 0.65,
+  "baseScale": 0.65,
   "hitbox": {
-    "width": 0.7,
-    "height": 1.2,
+    "width": 1.1,
+    "height": 1.3,
     "fixed": false
   },
   "behaviour": {

common/src/main/resources/data/cobblemon/species/generation5/litwick.json

@@ -44,10 +44,13 @@
   "eggCycles": 20,
   "baseFriendship": 50,
   "shoulderMountable": true,
-  "baseScale": 1,
+  "standingEyeHeight": 0.4,
+  "swimmingEyeHeight": 0.4,
+  "flyingEyeHeight": 0.4,
+  "baseScale": 0.6,
   "hitbox": {
-    "width": 0.5,
-    "height": 0.5,
+    "width": 0.6,
+    "height": 0.65,
     "fixed": false
   },
   "behaviour": {

common/src/main/resources/data/cobblemon/tags/item/held/blacklisted_items_to_hold.json

@@ -1,5 +1,6 @@
 {
   "replace": false,
   "values": [
+    "#cobblemon:held/container_held_items"
   ]
 }

common/src/main/resources/data/cobblemon/tags/item/held/container_held_items.json

@@ -0,0 +1,26 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#travelersbackpack:back",
+      "required": false
+    },
+    "minecraft:shulker_box",
+    "minecraft:black_shulker_box",
+    "minecraft:blue_shulker_box",
+    "minecraft:brown_shulker_box",
+    "minecraft:cyan_shulker_box",
+    "minecraft:gray_shulker_box",
+    "minecraft:green_shulker_box",
+    "minecraft:light_blue_shulker_box",
+    "minecraft:light_gray_shulker_box",
+    "minecraft:lime_shulker_box",
+    "minecraft:magenta_shulker_box",
+    "minecraft:orange_shulker_box",
+    "minecraft:pink_shulker_box",
+    "minecraft:purple_shulker_box",
+    "minecraft:red_shulker_box",
+    "minecraft:white_shulker_box",
+    "minecraft:yellow_shulker_box"
+  ]
+}