diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt deleted file mode 100644 index 3aa93fc26c..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 - -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel -import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider -import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose -import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES -import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES -import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES -import net.minecraft.client.model.geom.ModelPart -import net.minecraft.world.phys.Vec3 - -class NidorinoModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame { - override val rootPart = root.registerChildWithAllChildren("nidorino") - override val head = getPart("head") - override val foreLeftLeg= getPart("leg_front_left") - override val foreRightLeg = getPart("leg_front_right") - override val hindLeftLeg = getPart("leg_back_left") - override val hindRightLeg = getPart("leg_back_right") - - override var portraitScale = 2.6F - override var portraitTranslation = Vec3(-0.71, -2.0, 0.0) - - override var profileScale = 1.0F - override var profileTranslation = Vec3(-0.1, 0.21, 0.0) - - lateinit var standing: Pose - lateinit var walk: Pose - - override val cryAnimation = CryProvider { bedrockStateful("nidorino", "cry") } - - override fun registerPoses() { - val blink = quirk { bedrockStateful("nidorino", "blink")} - standing = registerPose( - poseName = "standing", - poseTypes = STATIONARY_POSES + UI_POSES, - transformTicks = 10, - quirks = arrayOf(blink), - animations = arrayOf( - singleBoneLook(), - bedrock("nidorino", "ground_idle") - ) - ) - - walk = registerPose( - poseName = "walk", - poseTypes = MOVING_POSES, - transformTicks = 10, - quirks = arrayOf(blink), - animations = arrayOf( - singleBoneLook(), - bedrock("nidorino", "ground_idle"), - QuadrupedWalkAnimation(this, periodMultiplier = 0.7F, amplitudeMultiplier = 0.7F) - //bedrock("nidorino", "ground_walk") - ) - ) - } - -// override fun getFaintAnimation( -// pokemonEntity: PokemonEntity, -// state: PosableState -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidorino", "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 10bce3e553..3b89da0122 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 @@ -249,7 +249,6 @@ object VaryingModelRepository { inbuilt("marowak", ::MarowakModel) inbuilt("meowth", ::MeowthModel) inbuilt("nidoqueen", ::NidoqueenModel) - inbuilt("nidorino", ::NidorinoModel) inbuilt("persian", ::PersianModel) inbuilt("pinsir", ::PinsirModel) inbuilt("ponyta", ::PonytaModel) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0033_nidorino/nidorino.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0033_nidorino/nidorino.json new file mode 100644 index 0000000000..0f3ab964d3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0033_nidorino/nidorino.json @@ -0,0 +1,34 @@ +{ + "portraitScale": 2.6, + "portraitTranslation": [-0.71, -2, 0], + "profileScale": 1, + "profileTranslation": [-0.1, 0.21, 0], + "rootBone": "nidorino", + "poses": { + "standing": { + "poseName": "standing", + "poseTypes": ["STAND", "FLOAT", "HOVER", "PROFILE", "PORTRAIT"], + "animations": [ + "q.look('head')", + "q.bedrock('nidorino', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('nidorino', 'blink')" + ], + "transformTicks": 10 + }, + "walk": { + "poseName": "walk", + "poseTypes": ["WALK","SWIM", "FLY"], + "animations": [ + "q.look('head')", + "q.bedrock('nidorino', 'ground_idle')", + "q.quadruped_walk('null', 'leg_front_right', 'leg_back_left', 'leg_back_right', 0.7, 0.7)" + ], + "quirks": [ + "q.bedrock_quirk('nidorino', 'blink')" + ], + "transformTicks": 10 + } + } +} \ No newline at end of file