diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CuboneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CuboneModel.kt index 10bb9e27b5..e1062ee265 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CuboneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CuboneModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 CuboneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class CuboneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("cubone") override val head = getPart("head") + override val leftLeg = getPart("leftleg") + override val rightLeg = getPart("rightleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -45,6 +50,7 @@ class CuboneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = MOVING_POSES, transformTicks = 10, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.1F, amplitudeMultiplier = 1.15f), singleBoneLook(), bedrock("0104_cubone/cubone", "ground_idle") //bedrock("0104_cubone/cubone", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt index 4ca6693a3a..1e39fff37e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 DrowzeeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class DrowzeeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("drowzee") override val head = getPart("head") + override val leftLeg = getPart("leftleg") + override val rightLeg = getPart("rightleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -45,6 +50,7 @@ class DrowzeeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = MOVING_POSES, transformTicks = 10, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.1F), singleBoneLook(), bedrock("0096_drowzee/drowzee", "ground_idle") //bedrock("0096_drowzee/drowzee", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt index 1ecccf71e8..f04aac8537 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("exeggutor") override val head = getPart("head") + override val leftLeg = getPart("leftleg") + override val rightLeg = getPart("rightleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -43,6 +48,7 @@ class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.2F, amplitudeMultiplier = 1f), singleBoneLook(), bedrock("0103_exeggutor/exeggutor", "ground_idle") //bedrock("0103_exeggutor/exeggutor", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GengarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GengarModel.kt index 3b8e0416c7..9398c2a1d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GengarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GengarModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.common.client.render.models.blockbench.frame.BipedFrame 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 @@ -15,9 +17,12 @@ 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 GengarModel(root: ModelPart) : PokemonPoseableModel() { +class GengarModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override val rootPart = root.registerChildWithAllChildren("gengar") + override val leftLeg = getPart("leg_left") + override val rightLeg = getPart("leg_right") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -40,6 +45,7 @@ class GengarModel(root: ModelPart) : PokemonPoseableModel() { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.0F, amplitudeMultiplier = 0.9f), bedrock("0094_gengar/gengar", "ground_idle") //bedrock("0094_gengar/gengar", "ground_walk") ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt index ce1a2cafd2..95f56d7176 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 GolemModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class GolemModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("golem") override val head = getPart("head") + override val leftLeg = getPart("leg_left") + override val rightLeg = getPart("leg_right") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -43,6 +48,7 @@ class GolemModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.2F, amplitudeMultiplier = 0.9f), singleBoneLook(), bedrock("0076_golem/golem", "ground_idle") //bedrock("0076_golem/golem", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt index 7923797a77..30dbfed963 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.common.client.render.models.blockbench.frame.BipedFrame 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 @@ -15,9 +17,12 @@ 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 GravelerModel(root: ModelPart) : PokemonPoseableModel() { +class GravelerModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override val rootPart = root.registerChildWithAllChildren("graveler") + override val leftLeg = getPart("leg_left") + override val rightLeg = getPart("leg_right") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -40,6 +45,7 @@ class GravelerModel(root: ModelPart) : PokemonPoseableModel() { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.1F), bedrock("0075_graveler/graveler", "ground_idle") //bedrock("0075_graveler/graveler", "ground_walk") ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt index a832f4fd14..bac6082235 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 HypnoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class HypnoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("hypno") override val head = getPart("head") + override val leftLeg = getPart("leftleg") + override val rightLeg = getPart("rightleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -43,6 +48,7 @@ class HypnoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.1F), singleBoneLook(), bedrock("0097_hypno/hypno", "ground_idle") //bedrock("0097_hypno/hypno", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MarowakModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MarowakModel.kt index 9f08eab4bd..9c45a5333a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MarowakModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MarowakModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 MarowakModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class MarowakModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("marowak") override val head = getPart("head") + override val leftLeg = getPart("leftleg") + override val rightLeg = getPart("rightleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -43,6 +48,7 @@ class MarowakModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 0.9F, amplitudeMultiplier = 1.1f), singleBoneLook(), bedrock("0105_marowak/marowak", "ground_idle") //bedrock("0105_marowak/marowak", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt index 8188b6ff00..772c6e5a62 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ 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 MeowthModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class MeowthModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("meowth") override val head = getPart("head") + override val leftLeg = getPart("leg_left") + override val rightLeg = getPart("leg_right") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -44,6 +49,7 @@ class MeowthModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseTypes = MOVING_POSES, idleAnimations = arrayOf( singleBoneLook(), + BipedWalkAnimation(this, periodMultiplier = .7F), bedrock("0052_meowth/meowth", "ground_idle") //bedrock("0052_meowth/meowth", "ground_walk") ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt index 4dbab0c29e..bbc5d1ac1d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt @@ -8,7 +8,9 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cablemc.pokemod.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 @@ -16,10 +18,15 @@ 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 PersianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class PersianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, QuadrupedFrame { override val rootPart = root.registerChildWithAllChildren("persian") override val head = getPart("head") + override val foreLeftLeg = getPart("leg_front_left1") + override val foreRightLeg = getPart("leg_front_right1") + override val hindLeftLeg = getPart("leg_back_left1") + override val hindRightLeg = getPart("leg_back_right1") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -43,6 +50,7 @@ class PersianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + QuadrupedWalkAnimation(this, periodMultiplier = 0.5F, amplitudeMultiplier = 1.1F), singleBoneLook(), bedrock("0053_persian/persian", "ground_idle") //bedrock("0053_persian/persian", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt index d0505b9384..6f7d57f1b5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.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 @@ -16,10 +18,13 @@ import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d -class SlowbroModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class SlowbroModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame { override val rootPart = root.registerChildWithAllChildren("slowbro") override val head = getPart("head") + override val leftLeg = getPart("leftleg") + override val rightLeg = getPart("rightleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -45,6 +50,7 @@ class SlowbroModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseType = PoseType.WALK, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1.1F), singleBoneLook(), bedrock("0080_slowbro/slowbro", "ground_idle") //bedrock("0080_slowbro/slowbro", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt index c6ca367692..931285e048 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt @@ -8,7 +8,9 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cablemc.pokemod.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 @@ -16,10 +18,15 @@ import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d -class SlowpokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { +class SlowpokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, QuadrupedFrame { override val rootPart = root.registerChildWithAllChildren("slowpoke") override val head = getPart("head") + override val foreLeftLeg = getPart("leftfrontleg") + override val foreRightLeg = getPart("rightfrontleg") + override val hindLeftLeg = getPart("leftbackleg") + override val hindRightLeg = getPart("rightbackleg") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -45,6 +52,7 @@ class SlowpokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { poseName = "walk", poseType = PoseType.WALK, idleAnimations = arrayOf( + QuadrupedWalkAnimation(this, periodMultiplier = 1.1F), singleBoneLook(), bedrock("0079_slowbro/slowpoke", "ground_idle") //bedrock("0079_slowpoke/slowpoke", "ground_walk") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenonatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenonatModel.kt index b090dfaa28..d5f429270c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenonatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenonatModel.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cablemc.pokemod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cablemc.pokemod.common.client.render.models.blockbench.frame.BipedFrame 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 @@ -15,9 +17,12 @@ 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 VenonatModel(root: ModelPart) : PokemonPoseableModel() { +class VenonatModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override val rootPart = root.registerChildWithAllChildren("venonat") + override val leftLeg = getPart("foot_left") + override val rightLeg = getPart("foot_right") + override val portraitScale = 1.0F override val portraitTranslation = Vec3d(0.0, 0.0, 0.0) @@ -40,6 +45,7 @@ class VenonatModel(root: ModelPart) : PokemonPoseableModel() { poseName = "walk", poseTypes = MOVING_POSES, idleAnimations = arrayOf( + BipedWalkAnimation(this, periodMultiplier = 1F,amplitudeMultiplier = 0.8f), bedrock("0048_venonat/venonat", "ground_idle") //bedrock("0048_venonat/venonat", "ground_walk") )