diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt new file mode 100644 index 0000000000..2343d0d952 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt @@ -0,0 +1,68 @@ +/* + * 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.gen3 + +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.PokemonPose +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel +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.ModelPart +import net.minecraft.util.math.Vec3d + +class MightyenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, QuadrupedFrame { + override val rootPart = root.registerChildWithAllChildren("mightyena") + override val head = getPart("head") + + override val hindLeftLeg = getPart("leg_left") + override val hindRightLeg = getPart("leg_right") + override val foreLeftLeg = getPart("arm_left") + override val foreRightLeg = getPart("arm_right") + + override val portraitScale = 2.2F + override val portraitTranslation = Vec3d(-0.8, 0.6, 0.0) + + override val profileScale = 0.6F + override val profileTranslation = Vec3d(0.0, 0.8, 0.0) + + lateinit var standing: PokemonPose + lateinit var walk: PokemonPose + + override fun registerPoses() { + val blink = quirk("blink") { bedrockStateful("mightyena", "blink").setPreventsIdle(false) } + standing = registerPose( + poseName = "standing", + poseTypes = UI_POSES + STATIONARY_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("mightyena","ground_idle") + ) + ) + + walk = registerPose( + poseName = "walk", + poseTypes = MOVING_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + QuadrupedWalkAnimation(this, periodMultiplier = 0.8F, amplitudeMultiplier = 0.8F), + bedrock("mightyena","ground_idle") + ) + ) + } + +// override fun getFaintAnimation( +// pokemonEntity: PokemonEntity, +// state: PoseableEntityState +// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("mightyena", "faint") else null +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt new file mode 100644 index 0000000000..07b25d86ac --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt @@ -0,0 +1,70 @@ +/* + * 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.gen3 + +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.PokemonPose +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel +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.ModelPart +import net.minecraft.util.math.Vec3d + +class PoochyenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, QuadrupedFrame { + override val rootPart = root.registerChildWithAllChildren("poochyena") + override val head = getPart("head") + + override val hindLeftLeg = getPart("leg_left") + override val hindRightLeg = getPart("leg_right") + override val foreLeftLeg = getPart("shoulder_left") + override val foreRightLeg = getPart("shoulder_right") + + override val portraitScale = 2.2F + override val portraitTranslation = Vec3d(-0.4, -0.6, 0.0) + + override val profileScale = 0.8F + override val profileTranslation = Vec3d(0.0, 0.55, 0.0) + + lateinit var standing: PokemonPose + lateinit var walk: PokemonPose + + override fun registerPoses() { + val blink = quirk("blink") { bedrockStateful("poochyena", "blink").setPreventsIdle(false) } + standing = registerPose( + poseName = "standing", + poseTypes = UI_POSES + STATIONARY_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("poochyena","ground_idle") + ) + ) + + walk = registerPose( + poseName = "walk", + poseTypes = MOVING_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + QuadrupedWalkAnimation(this, periodMultiplier = 0.8F, amplitudeMultiplier = 0.8F), + bedrock("poochyena","ground_idle") + ) + ) + + + } + +// override fun getFaintAnimation( +// pokemonEntity: PokemonEntity, +// state: PoseableEntityState +// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("poochyena", "faint") else null +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt new file mode 100644 index 0000000000..c8c6988063 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt @@ -0,0 +1,59 @@ +/* + * 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.gen9 + +import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation +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.PokemonPose +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel +import com.cobblemon.mod.common.entity.PoseType +import net.minecraft.client.model.ModelPart +import net.minecraft.util.math.Vec3d + +class FloragatoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { + override val rootPart = root.registerChildWithAllChildren("floragato") + override val head = getPart("head") + + override val leftLeg = getPart("leg_left") + override val rightLeg = getPart("leg_right") + + override val portraitScale = 2.0F + override val portraitTranslation = Vec3d(0.0, 1.1, 0.0) + + override val profileScale = 0.65F + override val profileTranslation = Vec3d(0.0, 0.8, 0.0) + + lateinit var standing: PokemonPose + lateinit var walk: PokemonPose + + override fun registerPoses() { + val blink = quirk("blink") { bedrockStateful("floragato", "blink").setPreventsIdle(false) } + standing = registerPose( + poseName = "standing", + poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("floragato", "idle") + ) + ) + + walk = registerPose( + poseName = "walk", + poseTypes = PoseType.MOVING_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + BipedWalkAnimation(this, amplitudeMultiplier = 0.9F, periodMultiplier = 1F), + bedrock("floragato", "idle") + ) + ) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt new file mode 100644 index 0000000000..3d911f0602 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt @@ -0,0 +1,59 @@ +/* + * 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.gen9 + +import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation +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.PokemonPose +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel +import com.cobblemon.mod.common.entity.PoseType +import net.minecraft.client.model.ModelPart +import net.minecraft.util.math.Vec3d + +class MeowscaradaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { + override val rootPart = root.registerChildWithAllChildren("meowscarada") + override val head = getPart("head") + + override val leftLeg = getPart("leg_left_thigh") + override val rightLeg = getPart("leg_right_thigh") + + override val portraitScale = 1.9F + override val portraitTranslation = Vec3d(-0.3, 3.0, 0.0) + + override val profileScale = 0.46F + override val profileTranslation = Vec3d(0.0, 1.1, 0.0) + + lateinit var standing: PokemonPose + lateinit var walk: PokemonPose + + override fun registerPoses() { + val blink = quirk("blink") { bedrockStateful("meowscarada", "blink").setPreventsIdle(false) } + standing = registerPose( + poseName = "standing", + poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("meowscarada", "idle") + ) + ) + + walk = registerPose( + poseName = "walk", + poseTypes = PoseType.MOVING_POSES, + quirks = arrayOf(blink), + idleAnimations = arrayOf( + singleBoneLook(), + BipedWalkAnimation(this, amplitudeMultiplier = 0.9F, periodMultiplier = 1F), + bedrock("meowscarada", "idle") + ) + ) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt index dae7127170..d894bdf7bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt @@ -408,6 +408,11 @@ object PokemonModelRepository : VaryingModelRepository