Merge remote-tracking branch 'origin/implement_pokemon' into implement_pokemon

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

@@ -1,62 +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.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SerperiorModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("serperior")
-    override val head = getPart("head_ai")
-
-    override var portraitScale = 2.5F
-    override var portraitTranslation = Vec3(-0.3, 1.25, 0.0)
-
-    override var profileScale = 0.6F
-    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("serperior", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("serperior", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("serperior", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("serperior", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("serperior", "ground_walk")
-            )
-        )
-    }
-}

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

@@ -1,70 +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 ServineModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("servine")
-    override val head = getPart("head_ai")
-    override val rightArm = getPart("arm_right")
-    override val leftArm = getPart("arm_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftLeg = getPart("leg_left")
-
-    override var portraitScale = 2.6F
-    override var portraitTranslation = Vec3(-0.15, 0.75, 0.0)
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("servine", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("servine", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            transformTicks = 10,
-            animations = arrayOf(bedrock("servine", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("servine", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walking",
-            poseTypes =  PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("servine", "ground_walk")
-            )
-        )
-    }
-}

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

@@ -1,70 +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 SnivyModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("snivy")
-    override val head = getPart("head_ai")
-    override val rightArm = getPart("arm_right")
-    override val leftArm = getPart("arm_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftLeg = getPart("leg_left")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.15, 0.32, 0.0)
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("snivy", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("snivy", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            transformTicks = 10,
-            animations = arrayOf(bedrock("snivy", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("snivy", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walking",
-            poseTypes =  PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("snivy", "ground_walk")
-            )
-        )
-    }
-}

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

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

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

@@ -1,77 +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.gen6
-
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class PumpkabooModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("pumpkaboo")
-    override val head = getPart("head")
-
-    override var portraitScale = 3.5F
-    override var portraitTranslation = Vec3(0.0, -1.5, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.25, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("pumpkaboo", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("pumpkaboo", "blink") }
-        val quirk = quirk { bedrockStateful("pumpkaboo", "quirk_idle") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("pumpkaboo", "sleep")
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink, quirk),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("pumpkaboo", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("pumpkaboo", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("pumpkaboo", "battle_idle")
-            )
-        )
-    }
-}

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

@@ -322,8 +322,6 @@ object VaryingModelRepository {
         inbuilt("loudred", :: LoudredModel)
         inbuilt("exploud", :: ExploudModel)
         inbuilt("cryogonal", :: CryogonalModel)
-        inbuilt("pumpkaboo", :: PumpkabooModel)
-        inbuilt("gourgeist", :: GourgeistModel)
         inbuilt("eiscue", :: EiscueModel)
         inbuilt("wooloo", :: WoolooModel)
         inbuilt("dubwool", :: DubwoolModel)
@@ -340,9 +338,6 @@ object VaryingModelRepository {
         inbuilt("thwackey", ::ThwackeyModel)
         inbuilt("rillaboom", ::RillaboomModel)
         inbuilt("samurott", ::SamurottModel)
-        inbuilt("snivy", ::SnivyModel)
-        inbuilt("servine", ::ServineModel)
-        inbuilt("serperior", ::SerperiorModel)
         inbuilt("slugma", ::SlugmaModel)
         inbuilt("magcargo", ::MagcargoModel)
         inbuilt("slugma_shiny", ::SlugmaShinyModel)

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

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

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

@@ -7,7 +7,7 @@
   "animations": {
     "cry": "q.bedrock_stateful('pidgeot', 'cry')",
     "recoil": "q.bedrock_stateful('pidgeot', 'recoil')",
-    "special": "q.bedrock_primary('pidgeot', 'special', q.curve('symmetrical'))"
+    "status": "q.bedrock_primary('pidgeot', 'status', q.curve('symmetrical_wide'))"
   },
   "firstPersonCameraOffset": {
     "seat_1": [0, 0.45, 0]

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

@@ -64,7 +64,7 @@
         "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head')",
-        "q.bedrock('spearow', 'air_idle')"
+        "q.bedrock('spearow', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [
@@ -93,7 +93,7 @@
         "q.sine_wing_flap(0.9, 0.9, 25, 'z', 'wing_open_left', 'wing_open_right')",
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head')",
-        "q.bedrock('spearow', 'air_idle')"
+        "q.bedrock('spearow', 'ground_idle')"
       ],
       "quirks": ["q.bedrock_quirk('spearow', 'blink')"],
       "transformedParts": [

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0043_oddish/oddish.json

@@ -16,9 +16,6 @@
         "q.look('head_ai', 1, 1, 8, -18, 10, -10)",
         "q.bedrock('oddish', 'battle_idle')"
       ],
-      "namedAnimations": {
-          "cry": "q.bedrock_stateful('oddish', 'battle_cry')"
-        },
       "quirks": ["q.bedrock_quirk('oddish', 'blink')"]
     },
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0044_gloom/gloom.json

@@ -16,9 +16,6 @@
         "q.look('head_ai', 1, 1, 6, -18, 10, -10)",
         "q.bedrock('gloom', 'battle_idle')"
       ],
-      "namedAnimations": {
-          "cry": "q.bedrock_stateful('gloom', 'battle_cry')"
-        },
       "quirks": ["q.bedrock_quirk('gloom', 'blink')"]
     },
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0045_vileplume/vileplume.json

@@ -16,9 +16,6 @@
         "q.look('head_ai', 1, 1, 6, -18, 10, -10)",
         "q.bedrock('vileplume', 'battle_idle')"
       ],
-      "namedAnimations": {
-          "cry": "q.bedrock_stateful('vileplume', 'battle_cry')"
-        },
       "quirks": [
         "q.bedrock_quirk('vileplume', 'blink')",
         "q.bedrock_primary_quirk('vileplume', 'quirk', 20, 40, 1, q.curve('symmetrical_wide'))"

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

@@ -7,7 +7,6 @@
   "animations": {
     "faint": "q.bedrock_primary('diglett', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('diglett', 'cry')",
-    "recoil": "q.bedrock_stateful('diglett', 'recoil')",
     "physical": "q.bedrock_primary('diglett', 'physical', q.curve('symmetrical'))"
   },
   "poses": {

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

@@ -5,9 +5,9 @@
   "profileTranslation": [0.0, 0.3, 0],
   "rootBone": "diglett_alolan",
   "animations": {
+    "faint": "q.bedrock_primary('diglett_alolan', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('diglett_alolan', 'cry')",
-    "recoil": "q.bedrock_stateful('diglett_alolan', 'recoil')",
-    "physical": "q.bedrock_primary('diglett_alolan', 'physical', q.curve('symmetrical'))"
+    "physical": "q.bedrock_primary('diglett_alolan', 'physical', q.curve('symmetrical_wide'))"
   },
   "poses": {
     "standing": {

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

@@ -7,7 +7,6 @@
   "animations": {
     "faint": "q.bedrock_primary('dugtrio', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('dugtrio', 'cry')",
-    "recoil": "q.bedrock_stateful('dugtrio', 'recoil')",
     "physical": "q.bedrock_primary('dugtrio', 'physical', q.curve('symmetrical'))"
   },
   "poses": {

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

@@ -5,9 +5,9 @@
   "profileTranslation": [0.0, 0.29, 0],
   "rootBone": "dugtrio_alolan",
   "animations": {
+    "faint": "q.bedrock_primary('dugtrio_alolan', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('dugtrio_alolan', 'cry')",
-    "recoil": "q.bedrock_stateful('dugtrio_alolan', 'recoil')",
-    "physical": "q.bedrock_primary('dugtrio_alolan', 'physical', q.curve('symmetrical'))"
+    "physical": "q.bedrock_primary('dugtrio_alolan', 'physical', q.curve('symmetrical_wide'))"
   },
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0072_tentacool/tentacool.json

@@ -83,7 +83,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('tentacool', 'ground_sleep')"]
+      "animations": ["q.bedrock('tentacool', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0073_tentacruel/tentacruel.json

@@ -108,7 +108,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('tentacruel', 'sleep')"]
+      "animations": ["q.bedrock('tentacruel', 'water_sleep')"]
     },
     "ground-sleep": {
       "poseTypes": ["SLEEP"],
@@ -116,7 +116,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('tentacruel', 'sleep')"]
+      "animations": ["q.bedrock('tentacruel', 'ground_sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem.json

@@ -6,8 +6,7 @@
   "rootBone": "golem",
   "animations": {
     "cry": "q.bedrock_stateful('golem', 'cry')",
-    "recoil": "q.bedrock_stateful('golem', 'recoil')",
-    "status": "q.bedrock_stateful('golem', 'status', q.curve('symmetrical_wide'))"
+    "recoil": "q.bedrock_stateful('golem', 'recoil')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem_alolan.json

@@ -6,8 +6,7 @@
   "rootBone": "golem",
   "animations": {
     "cry": "q.bedrock_stateful('golem_alolan', 'cry')",
-    "recoil": "q.bedrock_stateful('golem_alolan', 'recoil')",
-    "status": "q.bedrock_stateful('golem_alolan', 'status', q.curve('symmetrical_wide'))"
+    "recoil": "q.bedrock_stateful('golem_alolan', 'recoil')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0088_grimer/grimer.json

@@ -6,8 +6,7 @@
   "rootBone": "grimer",
   "animations": {
     "cry": "q.bedrock_stateful('grimer', 'cry')",
-    "recoil": "q.bedrock_stateful('grimer', 'recoil')",
-    "status": "q.bedrock_stateful('grimer', 'status', q.curve('symmetrical_wide'))"
+    "recoil": "q.bedrock_stateful('grimer', 'recoil')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0088_grimer/grimer_alolan.json

@@ -6,8 +6,7 @@
   "rootBone": "grimer_alola",
   "animations": {
     "cry": "q.bedrock_stateful('grimer', 'cry')",
-    "recoil": "q.bedrock_stateful('grimer', 'recoil')",
-    "status": "q.bedrock_stateful('grimer', 'status', q.curve('symmetrical_wide'))"
+    "recoil": "q.bedrock_stateful('grimer', 'recoil')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0105_marowak/marowak_alolan.json

@@ -1,6 +1,6 @@
 {
   "portraitScale": 1.82,
-  "portraitTranslation": [-0.01, 0.64, 0],
+  "portraitTranslation": [0.15, 0.52, 0],
   "profileScale": 0.84,
   "profileTranslation": [0, 0.51, 0],
   "rootBone": "marowak_alolan",
@@ -36,7 +36,7 @@
     },
     "portrait": {
       "poseTypes": ["PORTRAIT"],
-      "animations": ["q.bedrock('marowak_alolan', 'portrait')"]
+      "animations": ["q.bedrock('marowak_alolan', 'ground_idle')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0110_weezing/weezing.json

@@ -5,7 +5,6 @@
   "profileTranslation": [0, 0.46, 0],
   "rootBone": "weezing",
   "animations": {
-    "faint": "q.bedrock_primary('weezing', 'faint')",
     "cry": "q.bedrock_stateful('weezing', 'cry')",
     "recoil": "q.bedrock_stateful('weezing', 'recoil')",
     "physical": "q.bedrock_primary('weezing', 'physical', q.curve('symmetrical_wide'))",
@@ -57,7 +56,7 @@
       "namedAnimations": {
         "cry": "q.bedrock_stateful('dummy', 'cry')"
       },
-      "animations": ["q.bedrock('weezing', 'battle-sleep')"]
+      "animations": ["q.bedrock('weezing', 'battle_sleep')"]
     },
     "sleep": {
       "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0110_weezing/weezing_galar.json

@@ -39,10 +39,6 @@
         "q.bedrock_quirk('weezing_galar', 'blink')",
         "q.bedrock_quirk('weezing_galar', 'blink2')"
       ]
-    },
-    "sleeping": {
-      "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('weezing_galar', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0112_rhydon/rhydon.json

@@ -33,10 +33,7 @@
       "quirks": [
         "q.bedrock_quirk('rhydon', 'blink')",
         "q.bedrock_quirk('rhydon', 'battle_quirk')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_primary('rhydon', 'battle_cry', q.curve('symmetrical_wide'))"
-      }
+      ]
     },
     "jump": {
       "poseTypes": ["STAND", "WALK"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0122_mrmime/mrmime.json

@@ -94,13 +94,6 @@
         "q.bedrock('mr_mime', 'ground_run')"
       ],
       "quirks": ["q.bedrock_quirk('mr_mime', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('mr_mime', 'sleep')"]
     }
   }
 }

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

@@ -75,13 +75,6 @@
         }
       ],
       "quirks": ["q.bedrock_quirk('tauros', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('tauros', 'sleep')"]
     }
   }
 }

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

@@ -120,13 +120,6 @@
         }
       ],
       "quirks": ["q.bedrock_quirk('tauros_paldean_aqua', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('tauros_paldean_aqua', 'sleep')"]
     }
   }
 }

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

@@ -74,13 +74,6 @@
         }
       ],
       "quirks": ["q.bedrock_quirk('tauros_paldean_blaze', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('tauros_paldean_blaze', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0138_omanyte/omanyte.json

@@ -5,7 +5,6 @@
   "profileTranslation": [0, -0.02, 0],
   "rootBone": "omanyte",
   "animations": {
-    "faint": "q.bedrock_primary('omanyte', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('omanyte', 'cry')"
   },
   "poses": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0139_omastar/omastar.json

@@ -5,7 +5,6 @@
   "profileTranslation": [0, 0.066, 0],
   "rootBone": "omastar",
   "animations": {
-    "faint": "q.bedrock_primary('omastar', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('omastar', 'cry')"
   },
   "poses": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0142_aerodactyl/aerodactyl.json

@@ -169,7 +169,7 @@
         "q.look('neck', 1, 1, 25, -20, 20, -20)",
         "q.look('head', 1, 1, 22.5, -10, 15, -15)",
         "q.bedrock('aerodactyl', 'air_glide')",
-        "q.bedrock('aerodactyl', 'air_dive')",
+        "q.bedrock('aerodactyl', 'ride_dive')",
         {
           "condition": "q.is_ridden",
           "animation": "q.bedrock('aerodactyl', 'ride_air_glide')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0160_feraligatr/feraligatr.json

@@ -5,8 +5,7 @@
   "profileTranslation": [0, 0.84, -10],
   "rootBone": "feraligatr",
   "animations": {
-    "cry": "q.bedrock_stateful('feraligatr', 'cry')",
-    "recoil": "q.bedrock_stateful('feraligatr', 'recoil')"
+    "cry": "q.bedrock_stateful('feraligatr', 'cry')"
   },
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0182_bellossom/bellossom.json

@@ -16,9 +16,6 @@
         "q.look('head_ai')",
         "q.bedrock('bellossom', 'battle_idle')"
       ],
-      "namedAnimations": {
-          "cry": "q.bedrock_stateful('bellossom', 'battle_cry')"
-        },
       "quirks": [
         "q.bedrock_quirk('bellossom', 'blink')"
       ]

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0370_luvdisc/luvdisc.json

@@ -5,7 +5,6 @@
   "profileTranslation": [0, -1.3, 0],
   "rootBone": "luvdisc",
   "animations": {
-    "cry": "q.bedrock_stateful('luvdisc', 'cry')",
     "faint": "q.bedrock_primary('luvdisc', 'ground_faint', q.curve('one'))"
   },
   "poses": {
@@ -44,12 +43,12 @@
     "ground-sleep": {
       "poseTypes": ["SLEEP"],
       "isTouchingWater": false,
-      "animations": ["q.bedrock('luvdisc', 'ground-sleep')"]
+      "animations": ["q.bedrock('luvdisc', 'ground_sleep')"]
     },
     "water-sleep": {
       "poseTypes": ["SLEEP"],
       "isTouchingWater": true,
-      "animations": ["q.bedrock('luvdisc', 'water-sleep')"]
+      "animations": ["q.bedrock('luvdisc', 'water_sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0496_servine/servine.json

@@ -17,10 +17,6 @@
       "poseTypes": ["WALK"],
       "animations": ["q.look('head_ai')", "q.bedrock('servine', 'ground_idle')"],
       "quirks": ["q.bedrock_quirk('servine', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "animations": ["q.bedrock('servine', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0499_pignite/pignite.json

@@ -5,7 +5,6 @@
   "profileTranslation": [0, 0.82, 0],
   "rootBone": "pignite",
   "animations": {
-    "faint": "q.bedrock_primary('pignite', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('pignite', 'cry')",
     "recoil": "q.bedrock_stateful('pignite', 'recoil')"
   },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0500_emboar/emboar.json

@@ -5,7 +5,6 @@
   "profileTranslation": [0, 0.96, 0],
   "rootBone": "emboar",
   "animations": {
-    "faint": "q.bedrock_primary('emboar', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('emboar', 'cry')",
     "recoil": "q.bedrock_stateful('pignite', 'recoil')"
   },

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0567_archeops/archeops.json

@@ -39,10 +39,7 @@
       ],
       "quirks": [
         "q.bedrock_quirk('archeops', 'blink')"
-      ],
-      "namedAnimations": {
-        "cry": "q.bedrock_primary('archeops', 'battle_cry', q.curve('symmetrical_wide'))"
-      }
+      ]
     },
     "battle-flying": {
       "poseTypes": ["HOVER"],
@@ -214,7 +211,6 @@
         "q.bedrock('archeops', 'sleep')"
       ],
       "quirks": [
-        "q.bedrock_quirk('archeops', 'sleep_quirk')"
       ]
     }
   }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0710_pumpkaboo/pumpkaboo.json

@@ -5,9 +5,7 @@
   "profileTranslation": [0.0, 0.25, 0.0],
   "rootBone": "pumpkaboo",
   "animations": {
-    "faint": "q.bedrock_primary('pumpkaboo', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')",
-    "recoil": "q.bedrock_stateful('pumpkaboo', 'recoil')"
+    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0710_pumpkaboo/pumpkaboo_large.json

@@ -5,9 +5,7 @@
   "profileTranslation": [0.0, 0.15, 0.0],
   "rootBone": "pumpkaboo",
   "animations": {
-    "faint": "q.bedrock_primary('pumpkaboo', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')",
-    "recoil": "q.bedrock_stateful('pumpkaboo', 'recoil')"
+    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0710_pumpkaboo/pumpkaboo_small.json

@@ -5,9 +5,7 @@
   "profileTranslation": [0.0, 0.35, 0.0],
   "rootBone": "pumpkaboo",
   "animations": {
-    "faint": "q.bedrock_primary('pumpkaboo', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')",
-    "recoil": "q.bedrock_stateful('pumpkaboo', 'recoil')"
+    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0710_pumpkaboo/pumpkaboo_super.json

@@ -5,9 +5,7 @@
   "profileTranslation": [0.0, 0.05, 0.0],
   "rootBone": "pumpkaboo",
   "animations": {
-    "faint": "q.bedrock_primary('pumpkaboo', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')",
-    "recoil": "q.bedrock_stateful('pumpkaboo', 'recoil')"
+    "cry": "q.bedrock_stateful('pumpkaboo', 'cry')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0729_brionne/brionne.json

@@ -6,8 +6,7 @@
   "rootBone": "brionne",
   "animations": {
     "faint": "q.bedrock_primary('brionne', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('brionne', 'cry')",
-    "recoil": "q.bedrock_stateful('brionne', 'recoil')"
+    "cry": "q.bedrock_stateful('brionne', 'cry')"
   },
   "poses": {
     "battle-standing": {
@@ -36,13 +35,6 @@
       "poseTypes": ["SWIM"],
       "animations": ["q.look('head')", "q.bedrock('brionne', 'water_swim')"],
       "quirks": ["q.bedrock_quirk('brionne', 'blink')"]
-    },
-    "sleep": {
-      "poseTypes": ["SLEEP"],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('dummy', 'cry')"
-      },
-      "animations": ["q.bedrock('brionne', 'sleep')"]
     }
   }
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0730_primarina/primarina.json

@@ -6,8 +6,7 @@
   "rootBone": "primarina",
   "animations": {
     "faint": "q.bedrock_primary('primarina', 'faint', q.curve('one'))",
-    "cry": "q.bedrock_stateful('primarina', 'cry')",
-    "recoil": "q.bedrock_stateful('primarina', 'recoil')"
+    "cry": "q.bedrock_stateful('primarina', 'cry')"
   },
   "poses": {
     "battle-standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0823_corviknight/corviknight.json

@@ -21,8 +21,7 @@
     "seat_2_reverse": [0, 1, 0.5]
   },
   "animations": {
-    "cry": "q.bedrock_stateful('corviknight', 'cry')",
-    "recoil": "q.bedrock_stateful('corviknight', 'recoil')"
+    "cry": "q.bedrock_stateful('corviknight', 'cry')"
   },
   "poses": {
     "standing": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0908_meowscarada/meowscarada.json

@@ -35,9 +35,6 @@
         "q.look('neck_ruff', 1, 0, 50, -45 )",
         "q.bedrock('meowscarada', 'battle_idle')"
       ],
-      "namedAnimations": {
-        "cry": "q.bedrock_stateful('meowscarada', 'battle_cry')"
-      },
       "transformTicks": 10,
       "quirks": [
         "q.bedrock_quirk('meowscarada', 'blink')"

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0940_wattrel/wattrel.json

@@ -4,9 +4,7 @@
   "profileScale": 0.71,
   "profileTranslation": [-0.03, 0.72, 0],
   "rootBone": "wattrel",
-  "animations": {
-    "cry": "q.bedrock_stateful('wattrel', 'cry')"
-  },
+  "animations": {},
   "poses": {
     "battle-standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],

common/src/main/resources/resourcepacks/regionbiasforms/assets/cobblemon/bedrock/pokemon/posers/0025_pikachu/pikachu_alolan.json

@@ -20,7 +20,7 @@
       "isBattle": true,
       "animations": ["q.look('head_ai')", "q.bedrock('pikachu', 'battle_idle')"],
       "quirks": ["q.bedrock_quirk('pikachu', 'blink')","q.bedrock_quirk('pikachu', q.array('battle_quirk1','battle_quirk2'), 20, 60, 1)"],
-      "namedAnimations": {"cry": "q.bedrock_primary('pikachu', 'alolan_battle_cry', q.curve('symmetrical_wide'))", "recoil": "q.bedrock_stateful('pikachu', 'battle_recoil')"}
+      "namedAnimations": {"cry": "q.bedrock_primary('pikachu', 'alolan_battle_cry', q.curve('symmetrical_wide'))"}
     },
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],

common/src/main/resources/resourcepacks/regionbiasforms/assets/cobblemon/bedrock/pokemon/posers/0025_pikachu/pikachu_alolan_captain.json

@@ -20,7 +20,7 @@
       "isBattle": true,
       "animations": ["q.look('head_ai')", "q.bedrock('pikachu_captain', 'battle_idle')"],
       "quirks": ["q.bedrock_quirk('pikachu_captain', 'blink')","q.bedrock_quirk('pikachu_captain', q.array('battle_quirk1','battle_quirk2'), 20, 60, 1)"],
-      "namedAnimations": {"cry": "q.bedrock_primary('pikachu_captain', 'alolan_battle_cry', q.curve('symmetrical_wide'))", "recoil": "q.bedrock_stateful('pikachu_captain', 'battle_recoil')"}
+      "namedAnimations": {"cry": "q.bedrock_primary('pikachu_captain', 'alolan_battle_cry', q.curve('symmetrical_wide'))"}
     },
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],