diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt deleted file mode 100644 index 52d676776c..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 - -import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel -import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose -import com.cobblemon.mod.common.entity.PoseType -import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES -import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES -import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES -import net.minecraft.client.model.geom.ModelPart -import net.minecraft.world.phys.Vec3 - -class SandslashModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame { - override val rootPart = root.registerChildWithAllChildren("sandslash") - override val head = getPart("head") - - override var portraitScale = 2.0F - override var portraitTranslation = Vec3(-0.15, 0.0, 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("sandslash", "cry") } - - override fun registerPoses() { - val blink = quirk { bedrockStateful("sandslash", "blink")} - standing = registerPose( - poseName = "standing", - poseTypes = STATIONARY_POSES + UI_POSES, - transformTicks = 10, - quirks = arrayOf(blink), - animations = arrayOf( - singleBoneLook(), - bedrock("sandslash", "ground_idle") - ) - ) - - sleep = registerPose( - poseType = PoseType.SLEEP, - animations = arrayOf(bedrock("sandslash", "sleep")) - ) - - walk = registerPose( - poseName = "walk", - poseTypes = MOVING_POSES, - transformTicks = 10, - quirks = arrayOf(blink), - animations = arrayOf( - singleBoneLook(), - bedrock("sandslash", "ground_walk") - ) - ) - } - -// override fun getFaintAnimation( -// pokemonEntity: PokemonEntity, -// state: PosableState -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("sandslash", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt index 698af06404..10bce3e553 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt @@ -255,7 +255,6 @@ object VaryingModelRepository { inbuilt("ponyta", ::PonytaModel) inbuilt("psyduck", ::PsyduckModel) inbuilt("rapidash", ::RapidashModel) - inbuilt("sandslash", ::SandslashModel) inbuilt("tangela", ::TangelaModel) inbuilt("venomoth", ::VenomothModel) inbuilt("venonat", ::VenonatModel) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0028_sandslash/sandslash.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0028_sandslash/sandslash.json new file mode 100644 index 0000000000..89e60918ce --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0028_sandslash/sandslash.json @@ -0,0 +1,38 @@ +{ + "portraitScale": 2, + "portraitTranslation": [-0.15, 0, 0], + "profileScale": 0.8, + "profileTranslation": [0, 0.55, 0], + "rootBone": "sandslash", + "poses": { + "standing": { + "poseTypes": ["STAND", "FLOAT", "HOVER", "PROFILE", "PORTRAIT"], + "animations": [ + "q.look('head')", + "q.bedrock('sandslash', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('sandslash', 'blink')" + ], + "transformTicks": 10 + }, + "walk": { + "poseName": "walk", + "poseTypes": ["WALK", "SWIM", "FLY"], + "animations": [ + "q.look('head')", + "q.bedrock('sandslash', 'ground_walk')" + ], + "quirks": [ + "q.bedrock_quirk('sandslash', 'blink')" + ], + "transformTicks": 10 + }, + "sleep": { + "poseTypes": ["SLEEP"], + "animations": [ + "q.bedrock('sandslash', 'sleep')" + ] + } + } +} \ No newline at end of file