Merge remote-tracking branch 'origin/refactor/dekotlinify-posers' into refactor/dekotlinify-posers

# Conflicts:
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0007_squirtle/squirtle.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0008_wartortle/wartortle.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0011_metapod/metapod.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0012_butterfree/butterfree.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0015_beedrill/beedrill.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0020_raticate/raticate.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0020_raticate/raticate_alolan.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0028_sandslash/sandslash.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0033_nidorino/nidorino.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0046_paras/paras.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0048_venonat/venonat.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0052_meowth/meowth.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0056_mankey/mankey.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0106_hitmonlee/hitmonlee.json
#	common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0107_hitmonchan/hitmonchan.json

CHANGELOG.md

@@ -2,26 +2,26 @@
 ## [1.8.5 (MONTH xth, 2026)](#1-8-5)
 
 ### Additions
-
-### Particles
-
-### Cries added/updated for the following Pokémon
-
-### Model updates for the following Pokémon
-
-### Animation updates for the following Pokémon
+- Added the `healersSetSpawn` gamerule. When enabled, using a healing machine will set your spawnpoint.
+- A Pokémon holding a Power item now gains 1 point in the corresponding riding stat every two minutes while being ridden. The interval is configurable, and can be disabled with `-1`.
+- Added sounds to Gigaton Hammer and Pyro Ball
+- Added stepsounds to Venusaur, Blastoise, Dewgong, Rhydon, Rhyhorn, Parasect and Mr. Mime.
 
 ### Changes
+- Amethyst now grows from Typegem core blocks like typegems do
 
 ### Fixes
+- Fixed Ponigiri food values for AppleSkin integration
+- Fixed errors emitted by typos in Parched Peat bog structure files
 
 ### Developer
 
 ### Molang & Datapacks
-- Added a `loot_table` drop entry type. 
-  - Accepts an `id` field, pointing to a vanilla loot table.
-  - All base mod Pokémon have been moved to this new system.
-- Added the `cobblemon:requirement` loot item condition.
-  - Accepts a `requirement` field, containing a Requirement, using the existing Cobblemon requirement system.
+- `q.is_standing_on_blocks` now properly checks for non-full blocks like slabs, Mud or Soul Sand
+- Added Molang functions to play footstep sounds based on the corresponding surface. These are intended to be used by Pokémon animations.
+- Pokémon can now have their Minecraft footstep sounds silenced in their poser. This doesn't affect emitting game events.
 
-### Localization
+### Particles
+
+### Localization
+- Updated translations for:

common/src/main/java/com/cobblemon/mod/common/mixin/ServerPlayerMixin.java

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
 import com.cobblemon.mod.common.api.stats.CobblemonStats;
+import com.cobblemon.mod.common.block.HealingMachineBlock;
 import com.cobblemon.mod.common.duck.ServerLevelDuck;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
@@ -22,10 +23,14 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -33,6 +38,9 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
@@ -142,4 +150,17 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
                         ((ServerLevelDuck) this.serverLevel()).cobblemon$getLevelResourceLocation()
                 );
     }
+
+    @Inject(
+            method = "findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;FZZ)Ljava/util/Optional;",
+            at = @At(value = "HEAD"),
+            cancellable = true
+    )
+    private static void cobblemon$useHealthStationAsRespawn(ServerLevel level, BlockPos pos, float angle, boolean forced, boolean keepInventory, CallbackInfoReturnable<Optional<ServerPlayer.RespawnPosAngle>> cir) {
+        BlockState state = level.getBlockState(pos);
+        Block block = state.getBlock();
+        if (block instanceof HealingMachineBlock && HealingMachineBlock.Companion.canSetSpawn(level)) {
+            cir.setReturnValue(HealingMachineBlock.Companion.findStandUpPosition(EntityType.PLAYER, level, pos).map((vec3) -> ServerPlayer.RespawnPosAngle.of(vec3, pos)));
+        }
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -16,7 +16,6 @@ import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.EvolutionItemDropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.drop.LootTableDropEntry
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
 import com.cobblemon.mod.common.api.habitats.HabitatPools
@@ -91,7 +90,6 @@ import com.cobblemon.mod.common.events.EntityCallbackHandler
 import com.cobblemon.mod.common.events.PokedexHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
 import com.cobblemon.mod.common.events.StatHandler
-import com.cobblemon.mod.common.loot.CobblemonLootItemConditions
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
@@ -225,15 +223,12 @@ object Cobblemon {
         implementation.registerEntityDataSerializers()
         implementation.registerCriteria()
         implementation.registerEntitySubPredicates()
-        implementation.registerLootItemConditions()
         implementation.registerMobEffects()
         DispenserBehaviorRegistry.registerDispenserBehaviors()
-        CobblemonLootItemConditions.touch()
 
         DropEntry.register("command", CommandDropEntry::class.java)
         DropEntry.register("item", ItemDropEntry::class.java, isDefault = true)
         DropEntry.register("evolution", EvolutionItemDropEntry::class.java)
-        DropEntry.register("loot_table", LootTableDropEntry::class.java)
 
         ExperienceGroups.registerDefaults()
         CaptureCalculators.registerDefaults()

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonImplementation.kt

@@ -118,7 +118,6 @@ interface CobblemonImplementation {
     fun registerMenu()
 
     fun registerEntitySubPredicates()
-    fun registerLootItemConditions()
 
     /**
      * TODO

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt

@@ -10,14 +10,9 @@ package com.cobblemon.mod.common.api.drop
 
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.core.registries.Registries
 import kotlin.random.Random
 import net.minecraft.network.RegistryFriendlyByteBuf
-import net.minecraft.resources.ResourceKey
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
@@ -110,11 +105,7 @@ class DropTable {
     ) {
         LOOT_DROPPED.postThen(
             event = LootDroppedEvent(this, player, entity, drops),
-            ifSucceeded = {
-                val pokemon = (entity as? PokemonEntity)?.pokemon?.species?.resourceIdentifier ?: return@postThen
-                it.drops.forEach { it.drop(entity, world, pos, player) }
-//                val lootKey = ResourceKey.create(Registries.LOOT_TABLE, cobblemonResource("pokemon/${pokemon}"))
-            }
+            ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/LootTableDropEntry.kt

@@ -1,64 +0,0 @@
-package com.cobblemon.mod.common.api.drop
-
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.item.ItemEntity
-import net.minecraft.world.level.storage.loot.LootParams
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams
-import net.minecraft.world.phys.Vec3
-
-/**
- * A drop entry that points to a vanilla loot table.
- */
-class LootTableDropEntry(
-    override var percentage: Float,
-    override var quantity: Int,
-    override var maxSelectableTimes: Int,
-    val id: ResourceLocation
-) : DropEntry {
-    override fun drop(
-        entity: LivingEntity?,
-        world: ServerLevel,
-        pos: Vec3,
-        player: ServerPlayer?
-    ) {
-        val key = ResourceKey.create(Registries.LOOT_TABLE, id)
-        val playerEntity = player as? LivingEntity
-        if (entity == null) return
-        if (playerEntity != null) {
-            val params = LootParams.Builder(world)
-                .withParameter(LootContextParams.ATTACKING_ENTITY, playerEntity)
-                .withParameter(LootContextParams.DAMAGE_SOURCE, playerEntity.damageSources().genericKill())
-                .withParameter(LootContextParams.ORIGIN, pos)
-                .withParameter(LootContextParams.THIS_ENTITY, entity)
-                .create(LootContextParamSets.ENTITY)
-            val drops = world.server.reloadableRegistries().getLootTable(key)
-                .getRandomItems(params)
-            for (stack in drops) {
-                if (stack.isEmpty) continue
-
-                val itemEntity = ItemEntity(world, pos.x, pos.y, pos.z, stack)
-                itemEntity.setDefaultPickUpDelay()
-                world.addFreshEntity(itemEntity)
-            }
-        } else {
-            val params = LootParams.Builder(world)
-                .create(LootContextParamSets.EMPTY)
-            val drops = world.server.reloadableRegistries().getLootTable(key)
-                .getRandomItems(params)
-            for (stack in drops) {
-                if (stack.isEmpty) continue
-
-                val itemEntity = ItemEntity(world, pos.x, pos.y, pos.z, stack)
-                itemEntity.setDefaultPickUpDelay()
-                world.addFreshEntity(itemEntity)
-            }
-        }
-
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/filter/SearchFilter.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.pokedex.filter
 
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.drop.LootTableDropEntry
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
@@ -18,22 +17,14 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.api.tms.TechnicalMachines
 import com.cobblemon.mod.common.client.CobblemonClient
-import com.cobblemon.mod.common.client.gui.pokedex.widgets.DropsScrollingWidget.DropWidgetEntry
 import com.cobblemon.mod.common.pokemon.abilities.HiddenAbility
 import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.itemRegistry
-import com.cobblemon.mod.common.util.server
-import com.google.gson.JsonArray
-import com.google.gson.JsonParser
 import net.minecraft.client.Minecraft
-import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.tags.TagKey
 import net.minecraft.world.item.ItemStack
-import java.util.Locale
-import java.util.Locale.getDefault
 
 /**
  * A Pokedex [EntryFilter] that filters out entries that do not contain the current search.
@@ -84,59 +75,11 @@ class SearchFilter(val pokedexManager: AbstractPokedexManager, val searchString:
                 if (pokedexManager.getHighestKnowledgeFor(entry) == PokedexEntryProgress.UNREGISTERED) return false
                 val dropsList = mutableListOf<String>()
                 val formsList = if (species.forms.isEmpty()) mutableListOf(species.standardForm) else species.forms
-                formsList.forEach { formData ->
-                    formData.drops.entries.forEach { dropEntry ->
-                        if (dropEntry is ItemDropEntry) {
-                            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(dropEntry.item)?.defaultInstance ?: ItemStack.EMPTY
+                formsList.forEach {
+                    it.drops.entries.forEach {
+                        if (it is ItemDropEntry) {
+                            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(it.item)?.defaultInstance ?: ItemStack.EMPTY
                             if (!itemStack.isEmpty) dropsList.add(itemStack.displayName.string.lowercase())
-                        } else if (dropEntry is LootTableDropEntry) {
-                            val server = server() ?: return@forEach
-
-                            val lootTableResource = ResourceLocation.fromNamespaceAndPath(
-                                dropEntry.id.namespace,
-                                "loot_table/${dropEntry.id.path}.json"
-                            )
-
-                            val resource = server.resourceManager
-                                .getResource(lootTableResource)
-                                .orElse(null)
-                                ?: return@forEach
-
-                            val json = resource.openAsReader().use { reader ->
-                                JsonParser.parseReader(reader).asJsonObject
-                            }
-
-                            json.getAsJsonArray("pools")?.forEach { poolElement ->
-                                val pool = poolElement.asJsonObject
-                                val entries = pool.getAsJsonArray("entries") ?: return@forEach
-
-                                for (entry in entries.map { it.asJsonObject }) {
-                                    val items = mutableSetOf<String>()
-
-                                    if (entry["type"].asString == "minecraft:tag") {
-                                        val itemRegistry = Minecraft.getInstance()
-                                            .level!!
-                                            .registryAccess()
-                                            .lookupOrThrow(Registries.ITEM)
-                                        val tagKey = TagKey.create(Registries.ITEM, ResourceLocation.parse(entry["name"].asString))
-
-                                        val tagItems = itemRegistry.getOrThrow(tagKey)
-                                            .stream()
-                                            .map { holder ->
-                                                holder.unwrapKey().map {
-                                                    val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(it.location())?.defaultInstance ?: ItemStack.EMPTY
-                                                    itemStack.displayName.string.lowercase()
-                                                }.orElse(null)
-                                            }.toList().filterNotNull()
-
-                                        items.addAll(tagItems)
-                                    } else if (entry["type"].asString == "minecraft:item") {
-                                        val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(ResourceLocation.parse(entry["name"].asString))?.defaultInstance ?: ItemStack.EMPTY
-                                        items.add(itemStack.displayName.string.lowercase())
-                                    }
-                                    dropsList.addAll(items.map { it })
-                                }
-                            }
                         }
                     }
                 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/requirement/Requirement.kt

@@ -8,14 +8,9 @@
 
 package com.cobblemon.mod.common.api.pokemon.requirement
 
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.evolution.ContextEvolution
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.mojang.serialization.Codec
-import com.mojang.serialization.DataResult
-import com.mojang.serialization.Dynamic
-import com.mojang.serialization.JsonOps
 import net.minecraft.resources.ResourceLocation
 import java.util.WeakHashMap
 
@@ -45,26 +40,5 @@ fun interface Requirement {
     companion object {
         val pokedexIconOverrides = WeakHashMap<Requirement, ResourceLocation>()
         val pokedexTooltipOverrides = WeakHashMap<Requirement, String>()
-
-        val CODEC: Codec<Requirement> = Codec.PASSTHROUGH.comapFlatMap(
-            { dynamic ->
-                try {
-                    val json = dynamic.convert(JsonOps.INSTANCE).value
-                    DataResult.success(
-                        PokemonSpecies.gson.fromJson(json, Requirement::class.java)
-                    )
-                } catch (e: Exception) {
-                    DataResult.error {
-                        "Failed to decode Requirement: ${e.message}"
-                    }
-                }
-            },
-            { requirement ->
-                Dynamic(
-                    JsonOps.INSTANCE,
-                    PokemonSpecies.gson.toJsonTree(requirement, Requirement::class.java)
-                )
-            }
-        )
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/stats/RidingStat.kt

@@ -9,9 +9,12 @@
 package com.cobblemon.mod.common.api.riding.stats
 
 import com.cobblemon.mod.common.api.cooking.Flavour
+import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
+import net.minecraft.tags.TagKey
+import net.minecraft.world.item.Item
 
 /**
  * A stat that is used for riding Pokémon. The exact implementation of each of these depends on the [com.cobblemon.mod.common.api.riding.controller.RideController].
@@ -20,13 +23,14 @@ import net.minecraft.network.chat.MutableComponent
  * @since February 17th, 2025
  */
 enum class RidingStat(
-    val flavour: Flavour
+    val flavour: Flavour,
+    val powerItem: TagKey<Item>
 ) {
-    ACCELERATION(Flavour.SPICY),
-    SKILL(Flavour.DRY),
-    SPEED(Flavour.SWEET),
-    STAMINA(Flavour.SOUR),
-    JUMP(Flavour.BITTER);
+    ACCELERATION(Flavour.SPICY, CobblemonItemTags.POWER_BRACER),
+    SKILL(Flavour.DRY, CobblemonItemTags.POWER_BELT),
+    SPEED(Flavour.SWEET, CobblemonItemTags.POWER_ANKLET),
+    STAMINA(Flavour.SOUR, CobblemonItemTags.POWER_WEIGHT),
+    JUMP(Flavour.BITTER, CobblemonItemTags.POWER_BAND);
 
     companion object {
         fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }

common/src/main/kotlin/com/cobblemon/mod/common/block/HealingMachineBlock.kt

@@ -24,6 +24,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.util.RandomSource
 import net.minecraft.world.InteractionResult
+import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Item
@@ -31,13 +32,9 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.BlockGetter
+import net.minecraft.world.level.CollisionGetter
 import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.BaseEntityBlock
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.HorizontalDirectionalBlock
-import net.minecraft.world.level.block.Mirror
-import net.minecraft.world.level.block.RenderShape
-import net.minecraft.world.level.block.Rotation
+import net.minecraft.world.level.block.*
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
@@ -48,9 +45,11 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty
 import net.minecraft.world.level.block.state.properties.Property
 import net.minecraft.world.level.pathfinder.PathComputationType
 import net.minecraft.world.phys.BlockHitResult
+import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.Shapes
 import net.minecraft.world.phys.shapes.VoxelShape
+import java.util.Optional
 
 @Suppress("DEPRECATED", "OVERRIDE_DEPRECATION")
 class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
@@ -79,6 +78,14 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         const val MAX_CHARGE_LEVEL = 5
         val CHARGE_LEVEL: IntegerProperty = IntegerProperty.create("charge", 0, MAX_CHARGE_LEVEL + 1)
         val NATURAL: BooleanProperty = BooleanProperty.create("natural")
+
+        fun canSetSpawn(level: Level): Boolean {
+            return level.gameRules.getBoolean(CobblemonGameRules.HEALER_SET_SPAWN)
+        }
+
+        fun findStandUpPosition(entityType: EntityType<*>, level: CollisionGetter, pos: BlockPos): Optional<Vec3> {
+            return RespawnAnchorBlock.findStandUpPosition(entityType, level, pos) // Exists if we ever want to make something more custom, but anchor block logic should suffice
+        }
     }
 
     init {
@@ -158,7 +165,12 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         }
         val party = serverPlayerEntity.party()
         val pc = serverPlayerEntity.pc()
-        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC);
+        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC)
+
+        // Do spawnpoint stuff
+        if (canSetSpawn(world)) {
+            player.setRespawnPosition(world.dimension(), blockPos, player.yRot, false, true)
+        }
 
         if (party.none() && (!healPC || pc.none())) {
             player.sendSystemMessage(lang("healingmachine.nopokemon").red(), true)
@@ -183,6 +195,7 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
             player.sendSystemMessage(lang("healingmachine.notenoughcharge", "${((neededCharge/party.count())*100f).toInt()}%").red(), true)
         }
         party.forEach { it.tryRecallWithAnimation() }
+
         return InteractionResult.CONSUME
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemClusterBlock.kt

@@ -160,8 +160,8 @@ class TypeGemClusterBlock(
             && state.getValue(STAGE) == 3) return false
 
         val supportPos = pos.relative(state.getValue(FACING).opposite)
-        val supportBlock = level.getBlockState(supportPos).block
-        return CobblemonBlocks.typeGemBlocks().containsValue(supportBlock) || (supportBlock == CobblemonBlocks.TYPE_GEM_CORE) // Cannot grow if not on any gem blocks
+        val supportState = level.getBlockState(supportPos)
+        return supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) || supportState.block == CobblemonBlocks.TYPE_GEM_CORE // Cannot grow if not on any gem blocks
     }
 
 

common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemCoreBlock.kt

@@ -22,7 +22,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.util.RandomSource
 import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelAccessor
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
@@ -52,10 +51,20 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 ResourceLocation.parse("cobblemon:dragon_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON,
                 ResourceLocation.parse("cobblemon:dark_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DARK,
                 ResourceLocation.parse("cobblemon:steel_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL,
-                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
+                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY,
+                ResourceLocation.parse("minecraft:amethyst_block") to Blocks.SMALL_AMETHYST_BUD
             )
         }
 
+        val AMETHYST_STAGES = listOf(
+            Blocks.SMALL_AMETHYST_BUD,
+            Blocks.MEDIUM_AMETHYST_BUD,
+            Blocks.LARGE_AMETHYST_BUD,
+            Blocks.AMETHYST_CLUSTER
+        )
+
+        private fun isAmethystStage(block: Block) = block in AMETHYST_STAGES
+
         fun getConnectedGemBlocks(level: BlockGetter, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
             val connectedGems = mutableListOf<Pair<BlockState, BlockPos>>()
             val visited = mutableSetOf<BlockPos>()
@@ -86,12 +95,16 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             Direction.entries.forEach {
                 if (random.nextFloat() < Cobblemon.config.typeGemGrowthChance) {
                     val faceState = level.getBlockState(pos.relative(it))
-                    val randomGrowthType = decideClusterGrowthType(level, pos)
-                    val newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
+                    var newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
                         ?.setValue(DirectionalBlock.FACING, it)
-                        ?.setValue(GROWTH_TYPE, randomGrowthType)
                         ?: return
 
+                    if (newState.hasProperty(GROWTH_TYPE)) {
+                        newState = newState.setValue(GROWTH_TYPE, decideClusterGrowthType(level, pos))
+                    } else if (getConnectedGemBlocks(level, pos).size > Cobblemon.config.typeGemMaxConnected) {
+                        return@forEach
+                    }
+
                     if (faceState.`is`(Blocks.AIR)) {
                         level.setBlock(pos.relative(it), newState, 3)
                     }
@@ -133,7 +146,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 if (!visited.add(clusterPos)) continue
 
                 val clusterState = level.getBlockState(clusterPos)
-                if (clusterState.block == expectedCluster) {
+                if (clusterState.block == expectedCluster && clusterState.hasProperty(GROWTH_TYPE)) {
                     clusters += clusterState to clusterPos
                 }
             }
@@ -141,19 +154,6 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         return clusters
     }
 
-    override fun onRemove(
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        newState: BlockState,
-        movedByPiston: Boolean
-    ) {
-        getConnectedClusters(level, pos).forEach { // Stop growth of connected gems when core is removed
-            level.setBlockAndUpdate(it.second, it.first.setValue(GROWTH_TYPE, GrowthType.DECORATION))
-        }
-        super.onRemove(state, level, pos, newState, movedByPiston)
-    }
-
     override fun randomTick(state: BlockState, level: ServerLevel, pos: BlockPos, random: RandomSource) {
         // should we tick at all?
         if (random.nextFloat() >= Cobblemon.config.typeGemTickChance) {
@@ -192,13 +192,41 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         Direction.entries.forEach { direction ->
             val relativePos = pos.relative(direction)
             val relativeState = level.getBlockState(relativePos)
-            val clusterBlock = relativeState.block as? TypeGemClusterBlock ?: return@forEach
-
-            if ((relativeState.getValue(DirectionalBlock.FACING) == direction &&
-                random.nextFloat() < Cobblemon.config.typeGemGrowthChance) || forceGrow
-                ) {
-                clusterBlock.advanceGrowth(relativeState, level, relativePos, random)
+            val matchesFace = relativeState.hasProperty(DirectionalBlock.FACING)
+                    && relativeState.getValue(DirectionalBlock.FACING) == direction
+            if (!(forceGrow || (matchesFace && random.nextFloat() < Cobblemon.config.typeGemGrowthChance))) {
+                return@forEach
             }
+
+            val block = relativeState.block
+            if (block is TypeGemClusterBlock) {
+                block.advanceGrowth(relativeState, level, relativePos, random)
+            } else if (isAmethystStage(block)) {
+                advanceAmethyst(relativeState, level, relativePos)
+            }
+        }
+    }
+
+    private fun advanceAmethyst(state: BlockState, level: LevelAccessor, pos: BlockPos) {
+        val facing = state.getValue(DirectionalBlock.FACING)
+        val supportState = level.getBlockState(pos.relative(facing.opposite))
+        if (!supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) && supportState.block != CobblemonBlocks.TYPE_GEM_CORE) {
+            return
+        }
+
+        if (state.block != Blocks.AMETHYST_CLUSTER) {
+            val nextStage = AMETHYST_STAGES[AMETHYST_STAGES.indexOf(state.block) + 1]
+            level.setBlock(pos, nextStage.defaultBlockState().setValue(DirectionalBlock.FACING, facing), 3)
+            return
+        }
+
+        // Fully grown clusters mature into amethyst blocks unless boxed in, mirroring stunted type gems
+        val boxedIn = Direction.entries.any { direction ->
+            direction != facing.opposite
+                    && level.getBlockState(pos.relative(direction)).`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
+        }
+        if (!boxedIn) {
+            level.setBlock(pos, Blocks.AMETHYST_BLOCK.defaultBlockState(), 3)
         }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/PokedexGUI.kt

@@ -748,8 +748,6 @@ class PokedexGUI private constructor(
                 }
                 TAB_DROPS -> {
                     (tabInfoElement as DropsScrollingWidget).dropTable = form.drops
-                    (tabInfoElement as DropsScrollingWidget).form = form
-                    (tabInfoElement as DropsScrollingWidget).aspects = aspects.toSet()
                     (tabInfoElement as DropsScrollingWidget).setEntries()
                 }
                 TAB_MOVES -> {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/DropsScrollingWidget.kt

@@ -10,9 +10,6 @@ package com.cobblemon.mod.common.client.gui.pokedex.widgets
 
 import com.cobblemon.mod.common.api.drop.DropTable
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
-import com.cobblemon.mod.common.api.drop.LootTableDropEntry
-import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
-import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.api.text.bold
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.ScrollingWidget
@@ -20,27 +17,17 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.render.drawScaledTextJustifiedRight
 import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
-import com.cobblemon.mod.common.pokemon.FormData
-import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.itemRegistry
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.server
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
+import java.text.DecimalFormat
 import net.minecraft.ChatFormatting
-import net.minecraft.Util
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
-import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
 import net.minecraft.network.chat.MutableComponent
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.tags.TagKey
 import net.minecraft.util.FastColor
 import net.minecraft.util.Mth
 import net.minecraft.world.item.ItemStack
-import java.text.DecimalFormat
 
 class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrollingWidget.DropWidgetEntry>(
     width = PokedexGUIConstants.HALF_OVERLAY_WIDTH - 2,
@@ -51,8 +38,6 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
 ) {
 
     var dropTable: DropTable = DropTable()
-    var aspects: Set<String> = emptySet()
-    var form: FormData = FormData()
 
     companion object {
         val df = DecimalFormat("#.##")
@@ -65,157 +50,9 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
     override fun getX() = pX
     override fun getY() = pY
 
-    private fun getFormAspects(): Set<String> {
-        val formAspects = form.species.forms
-            .flatMapTo(mutableSetOf()) { it.aspects }
-            .apply { addAll(form.species.standardForm.aspects) }
-
-        val selectedFormAspectPrefixes = form.aspects
-            .mapNotNull { it.substringBeforeLast('-', "").takeIf(String::isNotEmpty) }
-            .toSet()
-
-        return formAspects + aspects.filter { aspect ->
-            val prefix = aspect.substringBeforeLast('-', "")
-            prefix.isNotEmpty() && prefix in selectedFormAspectPrefixes
-        }
-    }
-
-    private fun checkPokemonConditions(condition: JsonObject): Boolean {
-        val conditionType = condition["condition"].asString
-        if (conditionType == "cobblemon:requirement") {
-            val requirementJson = condition["requirement"].asJsonObject
-            val selectedAspects = (aspects - getFormAspects()) + form.aspects
-            val requirement = PokemonSpecies.gson.fromJson(requirementJson, Requirement::class.java)
-            val tempPokemon = Pokemon().apply { species = form.species }
-            tempPokemon.form = form
-            tempPokemon.forcedAspects = selectedAspects
-            tempPokemon.shiny = "shiny" in selectedAspects
-            tempPokemon.updateAspects()
-            return requirement.check(tempPokemon)
-        }
-        if (conditionType == "minecraft:all_of") {
-            val terms = condition["terms"]?.asJsonArray ?: return true
-            return terms.all {
-                checkPokemonConditions(it.asJsonObject)
-            }
-        }
-        if (conditionType == "minecraft:any_of") {
-            val terms = condition["terms"]?.asJsonArray ?: return true
-            return terms.any {
-                checkPokemonConditions(it.asJsonObject)
-            }
-        }
-        if (conditionType == "minecraft:inverted") {
-            val term = condition["term"]?.asJsonObject ?: return true
-            return !checkPokemonConditions(term)
-        }
-
-        return true
-    }
-
     fun setEntries() {
-        clearEntries()
-        dropTable.entries.forEach { it ->
-            if (it is ItemDropEntry) {
-                addEntry(DropWidgetEntry(it, mutableSetOf(it.item)))
-            } else if (it is LootTableDropEntry) { // LootTable doesn't expose pools, so we gotta do all this bullshit
-                val server = server() ?: return
-
-                val lootTableResource = ResourceLocation.fromNamespaceAndPath(
-                    it.id.namespace,
-                    "loot_table/${it.id.path}.json"
-                )
-
-                val resource = server.resourceManager
-                    .getResource(lootTableResource)
-                    .orElse(null)
-                    ?: return@forEach
-
-                val json = resource.openAsReader().use { reader ->
-                    JsonParser.parseReader(reader).asJsonObject
-                }
-
-                json.getAsJsonArray("pools")?.forEach { poolElement ->
-                    val pool = poolElement.asJsonObject
-                    val entries = pool.getAsJsonArray("entries") ?: return@forEach
-
-                    val validEntries = entries
-                        .map { entryElement -> entryElement.asJsonObject }
-                        .filter { entry ->
-                            val conditions = entry["conditions"]?.asJsonArray ?: JsonArray()
-
-                            conditions.all { condition ->
-                                val conditionJson = condition.asJsonObject
-                                checkPokemonConditions(conditionJson)
-                            }
-                        }
-
-                    val totalWeight = validEntries.sumOf { entry ->
-                        entry["weight"]?.asInt ?: 1
-                    }
-
-                    for (entry in validEntries) {
-                        val dropEntry = ItemDropEntry()
-                        val conditions = entry["conditions"]?.asJsonArray ?: JsonArray()
-                        val functions = entry["functions"]?.asJsonArray ?: JsonArray()
-                        val items = mutableSetOf<ResourceLocation>()
-                        var tag: ResourceLocation? = null
-
-                        if (validEntries.size > 1 && totalWeight > 0) {
-                            val weight = entry["weight"]?.asInt ?: 1
-                            dropEntry.percentage = weight.toFloat() / totalWeight.toFloat() * 100F
-                        }
-
-                        conditions.forEach { condition ->
-                            val conditionJson = condition.asJsonObject
-                            val conditionType = conditionJson["condition"].asString
-
-                            if (conditionType == "minecraft:random_chance") {
-                                val chance = conditionJson["chance"].asFloat * 100F
-
-                                if (validEntries.size > 1) {
-                                    dropEntry.percentage *= chance / 100F
-                                } else {
-                                    dropEntry.percentage = chance
-                                }
-                            }
-                        }
-
-                        functions.forEach { function ->
-                            val functionObj = function.asJsonObject
-                            if (functionObj["function"].asString == "set_count") {
-                                val count = functionObj["count"].asJsonObject
-                                val min = count["min"].asInt
-                                val max = count["max"].asInt
-                                dropEntry.quantityRange = IntRange(min, max)
-                            }
-                        }
-
-                        if (entry["type"].asString == "minecraft:tag") {
-                            val itemRegistry = Minecraft.getInstance()
-                                .level!!
-                                .registryAccess()
-                                .lookupOrThrow(Registries.ITEM)
-                            val tagKey = TagKey.create(Registries.ITEM, ResourceLocation.parse(entry["name"].asString))
-                            tag = tagKey.location
-
-                            val tagItems = itemRegistry.getOrThrow(tagKey)
-                                .stream()
-                                .map { holder ->
-                                    holder.unwrapKey().map {
-                                        it.location()
-                                    }.orElse(null)
-                                }.toList().filterNotNull()
-
-                            items.addAll(tagItems)
-                        } else if (entry["type"].asString == "minecraft:item") {
-                            items.add(ResourceLocation.parse(entry["name"].asString))
-                        }
-
-                        addEntry(DropWidgetEntry(dropEntry, items, tag))
-                    }
-                }
-            }
+        dropTable.entries.forEach {
+            if (it is ItemDropEntry) addEntry(DropWidgetEntry(it))
         }
     }
 
@@ -253,7 +90,7 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
             shadow = true
         )
 
-        if (dropTable.entries.isEmpty()) {
+        if (dropTable.entries.size == 0) {
             drawScaledText(
                 context = context,
                 text = lang("ui.pokedex.info.drops_empty"),
@@ -291,7 +128,7 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
         return children()[index] as DropWidgetEntry
     }
 
-    class DropWidgetEntry(val entry: ItemDropEntry, val items: MutableSet<ResourceLocation>, val tag: ResourceLocation? = null): Slot<DropWidgetEntry>() {
+    class DropWidgetEntry(val entry: ItemDropEntry): Slot<DropWidgetEntry>() {
         override fun render(
             context: GuiGraphics,
             index: Int,
@@ -304,14 +141,9 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
             hovered: Boolean,
             tickDelta: Float
         ) {
-            if (items.isEmpty()) return
             context.pose().pushPose()
             context.pose().translate(0f, 0f, 100f)
-
-            val index = ((Util.getMillis() / 1000L) % items.size).toInt()
-            val itemLocation = items.elementAt(index)
-            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(itemLocation)?.defaultInstance ?: ItemStack.EMPTY
-
+            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(entry.item)?.defaultInstance ?: ItemStack.EMPTY
             renderScaledGuiItemIcon(
                 itemStack = itemStack,
                 x = x.toDouble(),
@@ -319,32 +151,28 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
                 matrixStack = context.pose(),
                 scale = PokedexGUIConstants.SCALE.toDouble()
             )
-
             context.pose().pushPose()
 
             val min = entry.quantityRange?.min() ?: entry.quantity
             val max = entry.quantityRange?.max() ?: entry.quantity
-            if (min == max) {
-                entry.quantity = min
-                entry.quantityRange = null
-            }
 
-            val displayName = if (tag == null) {
-                itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD)
-            } else {
-                Component.translatable("tag.item.${tag.namespace}.${tag.path.replace('/', '.')}").withStyle(ChatFormatting.BOLD)
-            }
+//            var itemName: String = Component.translatable(itemStack.hoverName).string
+//            itemName = if (itemName.length > 24) {
+//                itemName.substring(0, 24 - 3) + "..."
+//            } else {
+//                itemName
+//            }
 
             val displayText: MutableComponent = if (entry.quantityRange != null) {
                 lang(
                     "ui.pokedex.info.drops_display",
-                    displayName,
+                    itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD),
                     lang("ui.pokedex.info.drops_range", min, max)
                 )
             } else {
                 lang(
                     "ui.pokedex.info.drops_display",
-                    displayName,
+                    itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD),
                     lang("ui.pokedex.info.drops_amount", entry.quantity)
                 )
             }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt

@@ -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.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
-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.ModelPartTransformation.Companion.Y_AXIS
-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 BeedrillModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BiWingedFrame {
-    override val rootPart = root.registerChildWithAllChildren("beedrill")
-    override val head = getPart("head")
-    override val leftWing = getPart("wing_left")
-    override val rightWing = getPart("wing_right")
-
-    override var portraitScale = 1.9F
-    override var portraitTranslation = Vec3(0.05, 0.9, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(-0.1, 0.9, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("beedrill", "cry") }
-
-    override fun registerPoses() {
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("beedrill", "sleep")),
-            transformedParts = arrayOf(
-                rootPart.createTransformation().addPosition(Y_AXIS, -3F)
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("beedrill", "air_idle")
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(Y_AXIS, -10F))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("beedrill", "air_fly")
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(Y_AXIS, -5F))
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt

@@ -1,64 +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.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
-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.ModelPartTransformation.Companion.Y_AXIS
-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 ButterfreeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BiWingedFrame {
-    override val rootPart = root.registerChildWithAllChildren("butterfree")
-    override val head = getPart("head")
-    override val leftWing = getPart("wing_left")
-    override val rightWing = getPart("wing_right")
-
-    override var portraitScale = 2.4F
-    override var portraitTranslation = Vec3(-0.1, 0.2, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.1, 0.8, 0.0)
-
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("butterfree", "cry") }
-
-    override fun registerPoses() {
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("butterfree", "sleep"))
-        )
-
-        registerPose(
-            poseName = "standing",
-            poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.PORTRAIT, PoseType.STAND, PoseType.HOVER, PoseType.FLOAT),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("butterfree", "air_idle")
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(Y_AXIS, -5F))
-        )
-
-        registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("butterfree", "air_fly")
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(Y_AXIS, -5F))
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CuboneModel.kt

@@ -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.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.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.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 CuboneModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("cubone")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("left_leg")
-    override val rightLeg = getPart("right_leg")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(0.1, -0.7, 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
-
-    override val cryAnimation = CryProvider { bedrockStateful("cubone", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("cubone", "blink") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("cubone", "idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                BipedWalkAnimation(this, periodMultiplier = 1.1F, amplitudeMultiplier = 1.15f),
-                singleBoneLook(),
-                bedrock("cubone", "idle")
-                //bedrock("cubone", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("cubone", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt

@@ -1,103 +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.animation.SingleBoneLookAnimation
-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 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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class DodrioModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("dodrio")
-    override val head = getPart("head4")
-
-    val lefthead = object : HeadedFrame {
-        override val rootPart = this@DodrioModel.rootPart
-        override val head: ModelPart = getPart("head3")
-    }
-    val righthead = object : HeadedFrame {
-        override val rootPart = this@DodrioModel.rootPart
-        override val head: ModelPart = getPart("head2")
-    }
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.15, 0.9, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walking: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("dodrio", "cry") }
-
-    override fun registerPoses() {
-        val blink1 = quirk { bedrockStateful("dodrio", "blink1") }
-        val blink2 = quirk { bedrockStateful("dodrio", "blink2") }
-        val blink3 = quirk { bedrockStateful("dodrio", "blink3") }
-        val bite1 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("dodrio", "bite_quirk1") }
-        val bite2 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("dodrio", "bite_quirk2") }
-        val bite3 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("dodrio", "bite_quirk3") }
-
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("dodrio", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink1, blink2, blink3),
-            animations = arrayOf(
-                singleBoneLook(pitchMultiplier = 1F, yawMultiplier = 0.4F),
-                SingleBoneLookAnimation(lefthead, false, false, false, false, 1F, 1.5F, 45F, -45F, 45F, 10F),
-                SingleBoneLookAnimation(righthead, false, false, false, false, 1F, 1.5F, 45F, -45F, 10F, -45F),
-                bedrock("dodrio", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink1, blink2, blink3),
-            animations = arrayOf(
-                bedrock("dodrio", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink1, blink2, blink3, bite1, bite2, bite3),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("dodrio", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("dodrio", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.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.gen1
-
-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 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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class DoduoModel (root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("doduo")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.1, 0.35, 0.0)
-
-    override var profileScale = 0.85F
-    override var profileTranslation = Vec3(0.0, 0.5, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walking: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("doduo", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("doduo", "blink1") }
-        val blink2 = quirk { bedrockStateful("doduo", "blink2") }
-        val bite = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("doduo", "bite_quirk1") }
-        val bite2 = quirk(secondsBetweenOccurrences = 5F to 20F) { bedrockStateful("doduo", "bite_quirk2") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("doduo", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                bedrock("doduo", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, blink2),
-            animations = arrayOf(
-                bedrock("doduo", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, blink2, bite, bite2),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("doduo", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("doduo", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt

@@ -1,95 +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.CobblemonPose
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ElectabuzzModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("electabuzz")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.5F
-    override var portraitTranslation = Vec3(-0.3, 0.2, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var sleepambient: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("electabuzz", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("electabuzz", "blink") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            poseName = "sleep",
-            condition = { it.isBattling },
-            animations = arrayOf(bedrock("electabuzz", "sleep"))
-        )
-
-        sleepambient = registerPose(
-            poseType = PoseType.SLEEP,
-            poseName = "ambientsleep",
-            condition = { !it.isBattling },
-            animations = arrayOf(bedrock("electabuzz", "ambient_sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("electabuzz", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("electabuzz", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("electabuzz", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("electabuzz", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeHisuianModel.kt

@@ -1,60 +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.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 ElectrodeHisuianModel (root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("electrode_hisuian")
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.4, -0.3, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.5, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("electrode_hisuian", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("electrode_hisuian", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 0,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("electrode_hisuian", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 0,
-            quirks = arrayOf(blink),
-            onTransitionedInto = { it?.reset() },
-            animations = arrayOf(
-                bedrock("electrode_hisuian", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("electrode_hisuian", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.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.gen1
-
-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.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 ElectrodeModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("electrode")
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.4, -0.3, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.5, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("electrode", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("electrode", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 0,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("electrode", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 0,
-            quirks = arrayOf(blink),
-            onTransitionedInto = { it?.reset() },
-            animations = arrayOf(
-                bedrock("electrode", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("electrode", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt

@@ -1,76 +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.PosableState
-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 net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ExeggcuteModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("exeggcute")
-
-    override var portraitScale = 2.1F
-    override var portraitTranslation = Vec3(0.0, -1.9, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(-0.15, 0.0, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-    lateinit var uiPortrait: Pose
-
-    override fun registerPoses() {
-        val blink1 = quirk { bedrockStateful("exeggcute", "blink") }
-        val blink2 = quirk { bedrockStateful("exeggcute", "blink2") }
-        val blink3 = quirk { bedrockStateful("exeggcute", "blink3") }
-        val blink4 = quirk { bedrockStateful("exeggcute", "blink4") }
-        val blink5 = quirk { bedrockStateful("exeggcute", "blink5") }
-        val blink6 = quirk { bedrockStateful("exeggcute", "blink6") }
-        uiPortrait = registerPose(
-            poseName = "portrait",
-            poseType = PoseType.PORTRAIT,
-            animations = arrayOf(
-                bedrock("exeggcute", "portrait")
-            )
-        )
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("exeggcute", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + PoseType.PROFILE,
-            transformTicks = 10,
-            quirks = arrayOf(blink1, blink2, blink3, blink4, blink5, blink6),
-            animations = arrayOf(
-                bedrock("exeggcute", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("exeggcute", "ground_idle"),
-                bedrock("exeggcute", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("exeggcute", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt

@@ -1,104 +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.animation.SingleBoneLookAnimation
-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.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ExeggutorModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("exeggutor")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    val head2 = object : HeadedFrame {
-        override val rootPart = this@ExeggutorModel.rootPart
-        override val head: ModelPart = getPart("head2")
-    }
-    val head3 = object : HeadedFrame {
-        override val rootPart = this@ExeggutorModel.rootPart
-        override val head: ModelPart = getPart("head3")
-    }
-
-    override var portraitScale = 1.2F
-    override var portraitTranslation = Vec3(-1.0, 1.77, 0.0)
-
-    override var profileScale = 0.45F
-    override var profileTranslation = Vec3(0.0, 1.1, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override fun registerPoses() {
-        val blink1 = quirk { bedrockStateful("exeggutor", "blink") }
-        val blink2 = quirk { bedrockStateful("exeggutor", "blink2") }
-        val blink3 = quirk { bedrockStateful("exeggutor", "blink3") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("exeggutor", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink1, blink2, blink3),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false),
-                SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false),
-                bedrock("exeggutor", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink1, blink2, blink3),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false),
-                SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false),
-                bedrock("exeggutor", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink1, blink2, blink3),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("exeggutor", "battle_idle")
-            )
-
-        )
-    }
-
-    //override fun getFaintAnimation(
-    //    pokemonEntity: PokemonEntity,
-    //    state: PosableState<PokemonEntity>
-    //) = bedrockStateful("exeggutor", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.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.gen1
-
-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.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.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class FarfetchdGalarianModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("farfetchd")
-    override val head = getPart("neck")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 2.6F
-    override var portraitTranslation = Vec3(-0.2, -1.0, 0.0)
-
-    override var profileScale = 0.93F
-    override var profileTranslation = Vec3(-0.1, 0.36, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("farfetchd_galar", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("farfetchd_galar", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("farfetchd_galar", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 5,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("farfetchd_galar", "ground_idle"),
-                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("farfetchd_galar", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt

@@ -1,98 +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.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 com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class FarfetchdModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("farfetchd")
-    override val head = getPart("neck")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 2.6F
-    override var portraitTranslation = Vec3(-0.2, -1.0, 0.0)
-
-    override var profileScale = 0.93F
-    override var profileTranslation = Vec3(-0.1, 0.36, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var hover: Pose
-    lateinit var fly: Pose
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("farfetchd", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("farfetchd", "blink") }
-        val leakflipidle = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_idle") }
-        val leakflipwalk = quirk(secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_walk") }
-        val wink = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_wink") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("farfetchd", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + UI_POSES - PoseType.HOVER,
-            transformTicks = 10,
-            quirks = arrayOf(blink, leakflipidle, wink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("farfetchd", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES - PoseType.FLY,
-            transformTicks = 5,
-            quirks = arrayOf(blink, leakflipwalk),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("farfetchd", "ground_walk")
-            )
-        )
-
-        hover = registerPose(
-            poseName = "hover",
-            poseType = PoseType.HOVER,
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("farfetchd", "air_idle")
-            )
-        )
-
-        fly = registerPose(
-            poseName = "fly",
-            poseType = PoseType.FLY,
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("farfetchd", "air_fly")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("farfetchd", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GengarModel.kt

@@ -1,63 +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.animation.BipedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-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.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 GengarModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("gengar")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 1.1F
-    override var portraitTranslation = Vec3(-0.3, 0.55, 0.0)
-
-    override var profileScale = 0.6F
-    override var profileTranslation = Vec3(0.0, 0.77, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("gengar", "cry") }
-
-    override fun registerPoses() {
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            animations = arrayOf(
-                bedrock("gengar", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            animations = arrayOf(
-                BipedWalkAnimation(this, periodMultiplier = 1.0F, amplitudeMultiplier = 0.9f),
-                bedrock("gengar", "ground_idle")
-                //bedrock("gengar", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("gengar", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt

@@ -1,66 +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.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 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 GeodudeModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("geodude")
-
-    override var portraitScale = 1.9F
-    override var portraitTranslation = Vec3(0.0, -1.4, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(-0.05, 0.3, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("geodude", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("geodude", "blink")}
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("geodude", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("geodude", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("geodude", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("geodude", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt

@@ -1,90 +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.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class GolduckModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("golduck")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.1F
-    override var portraitTranslation = Vec3(-0.1, 0.55, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.54, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var float: Pose
-    lateinit var swim: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("golduck", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("golduck", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = UI_POSES + PoseType.STAND,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("golduck", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("golduck", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("golduck", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseType = PoseType.FLOAT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("golduck", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("golduck", "water_swim")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("golduck", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.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.gen1
-
-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.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.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 GolemModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("golem")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("left_upper_leg")
-    override val rightLeg = getPart("right_upper_leg")
-
-    override var portraitScale = 1.7F
-    override var portraitTranslation = Vec3(-0.6, -0.25, 0.0)
-
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("golem", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("golem", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("golem", "test")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                BipedWalkAnimation(this, periodMultiplier = 0.7F, amplitudeMultiplier = 0.6f),
-                singleBoneLook(),
-                bedrock("golem", "test")
-                //bedrock("golem", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("golem", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt

@@ -1,90 +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.PosableState
-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.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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class HitmonchanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("hitmonchan")
-    override val head = getPart("head")
-
-    override val leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 2.5F
-    override var portraitTranslation = Vec3(-0.3, 0.8, 0.0)
-
-    override var profileScale = 0.82F
-    override var profileTranslation = Vec3(0.0, 0.5, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("hitmonchan", "blink")}
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("hitmonchan", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 5,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("hitmonchan", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("hitmonchan", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("hitmonchan", "battle_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("hitmonchan", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.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.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-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.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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class HitmonleeModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("hitmonlee")
-
-    override val leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 2.2F
-    override var portraitTranslation = Vec3(-0.2, 0.3, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.47, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("hitmonlee", "blink")}
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("hitmonlee", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 5,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("hitmonlee", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("hitmonlee", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("hitmonlee", "battle_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("hitmonlee", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutoModel.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.gen1
-
-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.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 KabutoModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("kabuto")
-
-    override var portraitScale = 3.3F
-    override var portraitTranslation = Vec3(0.0, -3.3, 0.0)
-
-    override var profileScale = 1.25F
-    override var profileTranslation = Vec3(0.0, -0.17, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("kabuto", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("kabuto", "blink") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("kabuto", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("kabuto", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("kabuto", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KabutopsModel.kt

@@ -1,114 +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.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.CobblemonPose
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class KabutopsModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("kabutops")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("left_upper_leg")
-    override val rightLeg = getPart("right_upper_leg")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.35, 0.2, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-//    lateinit var float: CobblemonPose
-//    lateinit var swim: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("kabutops", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("kabutops", "blink") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kabutops", "sleep")
-            )
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = UI_POSES + STATIONARY_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kabutops", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kabutops", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            condition = { it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("kabutops", "battle_idle")
-            )
-        )
-
-//        float = registerPose(
-//            poseName = "float",
-//            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
-//            animations = arrayOf(
-//                singleBoneLook(),
-//                bedrock("kabutops", "water_idle")
-//            )
-//        )
-//
-//        swim = registerPose(
-//            poseName = "swim",
-//            poseTypes = setOf(PoseType.SWIM, PoseType.FLOAT),
-//            animations = arrayOf(
-//                singleBoneLook(),
-//                bedrock("kabutops", "water_swim")
-//            )
-//        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("kabutops", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt

@@ -1,59 +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.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.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 KoffingModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("koffing")
-
-    override var portraitScale = 1.9F
-    override var portraitTranslation = Vec3(-0.4, -0.2, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("koffing", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("koffing", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("koffing", "air_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("koffing", "air_fly")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("koffing", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt

@@ -1,102 +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.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 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 com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isDusk
-import com.cobblemon.mod.common.util.isInWaterOrRain
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class KrabbyModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("krabby")
-
-    override var portraitScale = 2.5F
-    override var portraitTranslation = Vec3(-0.15, -1.8, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.2, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var standingBubbles: CobblemonPose
-    lateinit var standingRain: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("krabby", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("krabby", "blink")}
-        val snipLeft = quirk { bedrockStateful("krabby", "snip_left")}
-        val snipRight = quirk { bedrockStateful("krabby", "snip_right")}
-        val bubble = quirk(5F to 24F) { bedrockStateful("krabby", "quirk_bubble")}
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling && it.getEntity()?.isDusk() != true },
-            quirks = arrayOf(blink, snipLeft, snipRight ),
-            animations = arrayOf(
-                bedrock("krabby", "ground_idle")
-            )
-        )
-
-        standingBubbles = registerPose(
-            poseName = "standing_bubbles",
-            poseTypes = STATIONARY_POSES,
-            condition = { !it.isBattling && it.getEntity()?.isDusk() == true && !it.isInWaterOrRain },
-            quirks = arrayOf(blink, snipLeft, snipRight, bubble),
-            animations = arrayOf(
-                bedrock("krabby", "ground_idle")
-            )
-        )
-
-        standingRain = registerPose(
-            poseName = "standing_rain",
-            poseTypes = STATIONARY_POSES,
-            condition = { !it.isBattling && it.getEntity()?.isDusk() == true && it.isInWaterOrRain},
-            quirks = arrayOf(blink, snipLeft, snipRight),
-            animations = arrayOf(
-                bedrock("krabby", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink, snipLeft, snipRight),
-            animations = arrayOf(
-                bedrock("krabby", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, snipLeft, snipRight),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("krabby", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("krabby", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt

@@ -1,82 +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.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.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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class LickitungModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("lickitung")
-    override val head = getPart("head")
-    override val leftLeg = getPart("left_leg")
-    override val rightLeg = getPart("right_leg")
-    override val leftArm = getPart("left_upper_arm")
-    override val rightArm = getPart("right_upper_arm")
-
-    override var portraitScale = 2.1F
-    override var portraitTranslation = Vec3(-0.1, 0.0, 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 battleidle: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("lickitung", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("lickitung", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("lickitung", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("lickitung", "battle_idle")
-            )
-
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("lickitung", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt

@@ -1,65 +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.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 MachampModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("machamp")
-    override val head = getPart("head")
-
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.3, 1.2, 0.0)
-
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(-0.1, 0.66, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("machamp", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("machamp", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("machamp", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("machamp", "ground_walk")
-            )
-        )
-    }
-    /*
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk)) bedrockStateful("machamp", "faint") else null
-
-     */
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt

@@ -1,63 +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.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 MachokeModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("machoke")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.9F
-    override var portraitTranslation = Vec3(-0.1, 1.0, 0.0)
-
-    override var profileScale = 0.71F
-    override var profileTranslation = Vec3(0.0, 0.69, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("machoke", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("machoke", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("machoke", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("machoke", "ground_walk")
-            )
-        )
-    }
-
-    /*override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk)) bedrockStateful("machoke", "faint") else null
-     */
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt

@@ -1,66 +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.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 MachopModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("machop")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.03, 0.35, 0.0)
-
-    override var profileScale = 0.73F
-    override var profileTranslation = Vec3(-0.03, 0.64, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("machop", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("machop", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("machop", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("machop", "ground_walk")
-            )
-        )
-    }
-    /*
-        override fun getFaintAnimation(
-            pokemonEntity: PokemonEntity,
-            state: PosableState<PokemonEntity>
-        ) = if (state.isPosedIn(standing, walk)) bedrockStateful("machop", "faint") else null
-        */
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt

@@ -1,66 +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.PosableState
-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 MankeyModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("mankey")
-
-    override var portraitScale = 1.72F
-    override var portraitTranslation = Vec3(0.0, -0.4, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(-0.03, 0.4, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("mankey", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("mankey", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("mankey", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("mankey", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("mankey", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("mankey", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MarowakModel.kt

@@ -1,71 +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.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.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.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 MarowakModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("marowak")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("left_leg")
-    override val rightLeg = getPart("right_leg")
-
-    override var portraitScale = 1.7F
-    override var portraitTranslation = Vec3(0.0, 0.15, 0.0)
-
-    override var profileScale = 0.85F
-    override var profileTranslation = Vec3(0.0, 0.48, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("marowak", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("marowak", "blink") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("marowak", "idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                BipedWalkAnimation(this, periodMultiplier = 0.9F, amplitudeMultiplier = 1.1f),
-                singleBoneLook(),
-                bedrock("marowak", "idle")
-                //bedrock("marowak", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("marowak", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt

@@ -1,82 +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.animation.BimanualSwingAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
-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.CobblemonPose
-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 MeowthAlolanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    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 leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
-
-    override var portraitScale = 1.6F
-    override var portraitTranslation = Vec3(0.05, -0.1, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.54, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("meowth_alolan", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("meowth_alolan", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meowth_alolan", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("meowth_alolan", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                BipedWalkAnimation(this, periodMultiplier = .7F),
-                BimanualSwingAnimation(this),
-                bedrock("meowth_alolan", "ground_idle")
-                //bedrock("meowth_alolan", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("meowth_alolan", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt

@@ -1,92 +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.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 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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class MeowthGalarianModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("meowth")
-    override val head = getPart("head")
-    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 = 1.6F
-    override var portraitTranslation = Vec3(0.05, -0.1, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.54, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("meowth_galarian", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("meowth_galarian", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("meowth_galarian", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meowth_galarian", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meowth_galarian", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meowth_galarian", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = bedrockStateful("meowth_galarian", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt

@@ -1,82 +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.animation.BimanualSwingAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
-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.CobblemonPose
-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 MeowthModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    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 leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
-
-    override var portraitScale = 1.6F
-    override var portraitTranslation = Vec3(0.05, -0.1, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.54, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("meowth", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("meowth", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meowth", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("meowth", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                BipedWalkAnimation(this, periodMultiplier = .7F),
-                BimanualSwingAnimation(this),
-                bedrock("meowth", "ground_idle")
-                //bedrock("meowth", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("meowth", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt

@@ -1,49 +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.PosableState
-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.ALL_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class MetapodModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("metapod")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.15, -1.25, 0.0)
-    override var profileScale = 1.1F
-    override var profileTranslation = Vec3(0.0, 0.1, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("metapod", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("metapod", "blink")}
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("metapod", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            quirks = arrayOf(blink),
-            poseTypes = ALL_POSES - PoseType.SLEEP,
-            animations = arrayOf(bedrock("metapod", "ground_idle"))
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("metapod", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt

@@ -1,81 +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.BimanualSwingAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
-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.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 NidoqueenModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidoqueen")
-    override val head = getPart("head")
-    override val leftLeg = getPart("left_upper_leg")
-    override val rightLeg = getPart("right_upper_leg")
-    override val leftArm = getPart("left_shoulder")
-    override val rightArm = getPart("right_shoulder")
-
-    override var portraitScale = 1.56F
-    override var portraitTranslation = Vec3(-0.33, 0.78, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.5, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidoqueen", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidoqueen", "blink")}
-        val spg = quirk(secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink, spg),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidoqueen", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("nidoqueen", "ground_idle"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidoqueen", "ground_idle"),
-                BipedWalkAnimation(this),
-                BimanualSwingAnimation(this)
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoqueen", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt

@@ -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<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidorino", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt

@@ -1,88 +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.CobblemonPose
-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 NinetalesModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("ninetales")
-    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 = 1.65F
-    override var portraitTranslation = Vec3(-0.4, 0.7, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.67, 0.0)
-
-    // Alolan Nintales Portaits/Profiles
-    // override var portraitScale = 1.65F
-    // override var portraitTranslation = Vec3d(-0.4, 0.93, 0.0)
-
-    // override var profileScale = 0.7F
-    // override var profileTranslation = Vec3d(0.0, 0.67, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("ninetales", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("ninetales", "blink")}
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("ninetales", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ninetales", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ninetales", "ground_idle"),
-                QuadrupedWalkAnimation(this, periodMultiplier = 0.5F, amplitudeMultiplier = 1.1F)
-                // bedrock("ninetales", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("ninetales", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt

@@ -1,71 +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.PosableState
-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.SHOULDER_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 ParasModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("paras")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.2, -1.2, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("paras", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("paras", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES + SHOULDER_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("paras", "ground_idle"),
-                singleBoneLook()
-            )
-        )
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("paras", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("paras", "ground_walk"),
-                singleBoneLook()
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("paras", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt

@@ -1,76 +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.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.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 PersianAlolanModel(root: ModelPart) : PokemonPosableModel(root), 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 var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.76, -0.11, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.38, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("persian_alolan", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("persian_alolan", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("persian_alolan", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                QuadrupedWalkAnimation(this, periodMultiplier = 0.5F, amplitudeMultiplier = 1.1F),
-                singleBoneLook(),
-                bedrock("persian_alolan", "ground_idle")
-                //bedrock("persian_alolan", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("persian_alolan", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt

@@ -1,79 +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.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.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 PersianModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("persian")
-    override val head = getPart("neck")
-
-    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 var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.8, 0.3, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.38, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("persian", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("persian", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("persian", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("persian", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                QuadrupedWalkAnimation(this, periodMultiplier = 0.5F, amplitudeMultiplier = 1.1F),
-                singleBoneLook(),
-                bedrock("persian", "ground_idle")
-                //bedrock("persian", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("persian", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt

@@ -1,81 +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.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 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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class PinsirModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("pinsir")
-
-    override var portraitScale = 1.6F
-    override var portraitTranslation = Vec3(-0.3, 0.3, 0.0)
-
-    override var profileScale = 0.65F
-    override var profileTranslation = Vec3(0.0, 0.75, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("pinsir", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("pinsir", "blink")}
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("pinsir", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("pinsir", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("pinsir", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battleidle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            condition = { it.isBattling },
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(bedrock("pinsir", "battle_idle"))
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("pinsir", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt

@@ -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.PosableState
-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.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 PonytaGalarianModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("ponyta_galar")
-    override val head = getPart("neck")
-
-    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.2F
-    override var portraitTranslation = Vec3(-0.4, 0.2, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.43, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("ponyta_galar", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("ponyta_galar", "blink") }
-        val quirk = quirk(secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta_galar", "quirk") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("ponyta_galar", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.UI_POSES + PoseType.STAND,
-            quirks = arrayOf(blink, quirk),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ponyta_galar", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ponyta_galar", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("ponyta_galar", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt

@@ -1,78 +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.PosableState
-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.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 PonytaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("ponyta")
-    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 = 3.0F
-    override var portraitTranslation = Vec3(-0.6, -0.2, 0.0)
-
-    override var profileScale = 0.9F
-    override var profileTranslation = Vec3(0.0, 0.43, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("ponyta", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("ponyta", "blink") }
-        val quirk = quirk(secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta", "quirk1") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("ponyta", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, quirk),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ponyta", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("ponyta", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("ponyta", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt

@@ -1,66 +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.PosableState
-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 PrimeapeModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("primeape")
-
-    override var portraitScale = 1.4F
-    override var portraitTranslation = Vec3(0.0, 0.1, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.3, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("primeape", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("primeape", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("primeape", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("primeape", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("primeape", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("primeape", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt

@@ -1,86 +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.PosableState
-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 com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class PsyduckModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("psyduck")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.1, -0.55, 0.0)
-
-    override var profileScale = 0.95F
-    override var profileTranslation = Vec3(0.0, 0.32, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var float: CobblemonPose
-    lateinit var swim: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("psyduck", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("psyduck", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = UI_POSES + PoseType.STAND,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("psyduck", "ground_idle")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("psyduck", "sleep"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("psyduck", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseType = PoseType.FLOAT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("psyduck", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("psyduck", "water_swim")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("psyduck", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt

@@ -1,83 +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.frame.QuadrupedFrame
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class RapidashGalarianModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("rapidash_galar")
-    override val head = getPart("neck")
-
-    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 = 1.86F
-    override var portraitTranslation = Vec3(-0.5, 1.3, 0.0)
-
-    override var profileScale = 0.67F
-    override var profileTranslation = Vec3(0.0, 0.72, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battle_idle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("rapidash_galar", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("rapidash_galar", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("rapidash_galar", "ground_idle"),
-                bedrock("rapidash_galar", "hair")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("rapidash_galar", "ground_walk"),
-                bedrock("rapidash_galar", "hair")
-            )
-        )
-
-        battle_idle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("rapidash_galar", "battle_idle"),
-                bedrock("rapidash_galar", "hair")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("rapidash_galar", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt

@@ -1,93 +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.PosableState
-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.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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class RapidashModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("rapidash")
-    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.5F
-    override var portraitTranslation = Vec3(-0.7, 1.11, 0.0)
-
-    override var profileScale = 0.75F
-    override var profileTranslation = Vec3(0.0, 0.65, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-    lateinit var battling: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("rapidash", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("rapidash", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("rapidash", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("rapidash", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("rapidash", "ground_walk")
-            )
-        )
-
-        battling = registerPose(
-            poseName = "battlestanding",
-            poseTypes = STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("rapidash", "ground_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("rapidash", "faint") else
-        if (state.isPosedIn(battling)) bedrockStateful("rapidash", "battle_faint")
-        else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt

@@ -1,66 +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.PosableState
-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.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 RaticateAlolanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("raticate_alolan")
-    override val head = getPart("head")
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.2, 0.1, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.22, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("raticate_alolan", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("raticate_alolan", "blink")}
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("raticate_alolan", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("raticate_alolan", "ground_idle")
-            )
-        )
-        walk = registerPose(
-            poseType = PoseType.WALK,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("raticate_alolan", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("raticate_alolan", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt

@@ -1,65 +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.PosableState
-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.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 RaticateModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("raticate")
-    override val head = getPart("head")
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.2, 0.0, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.22, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("raticate", "cry") }
-
-    override fun registerPoses() {
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("raticate", "sleep"))
-        )
-        val blink = quirk { bedrockStateful("raticate", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("raticate", "ground_idle")
-            )
-        )
-        walk = registerPose(
-            poseType = PoseType.WALK,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("raticate", "ground_walk")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("raticate", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt

@@ -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<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("sandslash", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt

@@ -1,188 +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.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-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.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isUnderWater
-import com.cobblemon.mod.common.util.isInWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SquirtleModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("squirtle")
-    override val head = getPart("head_ai")
-
-
-    override var portraitScale = 2.02F
-    override var portraitTranslation = Vec3(-0.26, -0.21, 0.0)
-
-    override var profileScale = 0.78F
-    override var profileTranslation = Vec3(0.0, 0.57, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var shoulderLeft: CobblemonPose
-    lateinit var shoulderRight: CobblemonPose
-    lateinit var floating: CobblemonPose
-    lateinit var swimming: CobblemonPose
-    lateinit var water_surface_idle: CobblemonPose
-    lateinit var water_surface_swim: CobblemonPose
-
-    val shoulderOffset = 5.5
-    val wateroffset = -10
-
-    override fun registerPoses() {
-        animations["physical"] = "q.bedrock_primary('squirtle', 'physical', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-        animations["special"] = "q.bedrock_primary('squirtle', 'special', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-        animations["status"] = "q.bedrock_primary('squirtle', 'status', q.curve('symmetrical_wide'))".asExpressionLike()
-        animations["recoil"] = "q.bedrock_stateful('squirtle', 'recoil')".asExpressionLike()
-        animations["cry"] = "q.bedrock_stateful('squirtle', 'cry')".asExpressionLike()
-
-        val faint = "q.bedrock_primary('squirtle', 'faint', q.curve('one'))".asExpressionLike()
-
-        val blink = quirk { bedrockStateful("squirtle", "blink") }
-        val quirkidle = quirk { bedrockStateful("squirtle", "quirk_ground_idle") }
-        val quirkwater = quirk { bedrockStateful("squirtle", "quirk_water") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(blink),
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(bedrock("squirtle", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = setOf(PoseType.STAND) + UI_POSES,
-            quirks = arrayOf(blink, quirkidle),
-            condition = { !it.isBattling && !it.isInWater },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "ground_idle")
-            )
-        )
-
-        battleidle = registerPose(
-            poseType = PoseType.STAND,
-            poseName = "battle_standing",
-            quirks = arrayOf(blink, quirkidle),
-            condition = { it.isBattling },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "battle_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = setOf(PoseType.WALK),
-            quirks = arrayOf(blink),
-            condition = { !it.isInWater },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "ground_walk")
-            )
-        )
-
-        floating = registerPose(
-            poseName = "floating",
-            transformTicks = 10,
-            poseType = PoseType.FLOAT,
-            namedAnimations = mutableMapOf("faint" to faint),
-            quirks = arrayOf(blink, quirkwater),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "water_idle")
-            )
-        )
-
-        swimming = registerPose(
-            poseName = "swimming",
-            poseType = PoseType.SWIM,
-            transformTicks = 10,
-            namedAnimations = mutableMapOf("faint" to faint),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "water_swim"),
-            )
-        )
-
-        water_surface_idle = registerPose(
-            poseName = "surface_idle",
-            poseType = PoseType.STAND,
-            namedAnimations = mutableMapOf("faint" to faint),
-            quirks = arrayOf(blink),
-            condition = { it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "surfacewater_idle"),
-            ),
-            transformedParts = arrayOf(
-                rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset)
-            )
-        )
-
-        water_surface_swim = registerPose(
-            poseName = "surface_swim",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            condition = { it.isInWater },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "surfacewater_swim"),
-            ),
-            transformedParts = arrayOf(
-                rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset)
-            )
-        )
-
-        shoulderLeft = registerPose(
-            poseType = PoseType.SHOULDER_LEFT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "shoulder_left")
-            ),
-                transformedParts = arrayOf(
-                        rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, -2)
-                )
-        )
-
-        shoulderRight = registerPose(
-            poseType = PoseType.SHOULDER_RIGHT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("squirtle", "shoulder_right")
-            ),
-                transformedParts = arrayOf(
-                        rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, -2)
-                )
-        )
-
-        properties["item_display_context"] = "THIRD_PERSON_RIGHT_HAND"
-
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TangelaModel.kt

@@ -1,65 +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.animation.BipedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-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.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 TangelaModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("tangela")
-
-    override val leftLeg = getPart("leftfoot")
-    override val rightLeg = getPart("rightfoot")
-
-    override var portraitScale = 2.2F
-    override var portraitTranslation = Vec3(-0.1, -1.6, 0.0)
-
-    override var profileScale = 1.2F
-    override var profileTranslation = Vec3(0.0, -0.09, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("tangela", "cry") }
-    // Animating illegally rn. Created a new file for this cry. hope it works
-
-    override fun registerPoses() {
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            animations = arrayOf(
-                //bedrock("tangela", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            animations = arrayOf(
-                BipedWalkAnimation(this, amplitudeMultiplier = 1F, periodMultiplier = 0.4F)
-                //bedrock("tangela", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("tangela", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenomothModel.kt

@@ -1,111 +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.frame.BiWingedFrame
-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.pose.CobblemonPose
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class VenomothModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BiWingedFrame {
-    override val rootPart = root.registerChildWithAllChildren("venomoth")
-    override val head = getPart("head")
-
-    override val leftWing = getPart("left_wings")
-    override val rightWing = getPart("right_wings")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.46, 0.1, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.6, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var hover: CobblemonPose
-    lateinit var flying: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("venomoth", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("venomoth", "blink") }
-        val quirk1 = quirk { bedrockStateful("venomoth", "quirk1") }
-        val quirk2 = quirk { bedrockStateful("venomoth", "quirk2") }
-        val quirkSleep = quirk { bedrockStateful("venomoth", "quirk_sleep") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(quirk1, quirkSleep),
-            animations = arrayOf(bedrock("venomoth", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES - PoseType.HOVER,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink, quirk1, quirk2),
-            animations = arrayOf(
-                bedrock("venomoth", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES - PoseType.FLY,
-            quirks = arrayOf(blink, quirk1, quirk2),
-            animations = arrayOf(
-                bedrock("venomoth", "ground_walk")
-            )
-        )
-
-        hover = registerPose(
-            poseName = "hover",
-            poseType = PoseType.HOVER,
-            quirks = arrayOf(blink, quirk1, quirk2),
-            animations = arrayOf(
-                bedrock("venomoth", "air_idle")
-            )
-        )
-
-        flying = registerPose(
-            poseName = "fly",
-            poseType = PoseType.FLY,
-            quirks = arrayOf(blink, quirk1, quirk2),
-            animations = arrayOf(
-                bedrock("venomoth", "air_fly")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, quirk1, quirk2),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("venomoth", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("venomoth", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenonatModel.kt

@@ -1,83 +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.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 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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class VenonatModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("venonat")
-
-    override var portraitScale = 1.66F
-    override var portraitTranslation = Vec3(-0.08, -0.66, 0.0)
-
-    override var profileScale = 0.86F
-    override var profileTranslation = Vec3(0.0, 0.43, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("venonat", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("venonat", "blink") }
-        val quirk1 = quirk { bedrockStateful("venonat", "quirk1") }
-        val quirk2 = quirk { bedrockStateful("venonat", "quirk2") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(quirk1, quirk2),
-            animations = arrayOf(bedrock("venonat", "sleep"))
-        )
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink, quirk1, quirk2),
-            animations = arrayOf(
-                bedrock("venonat", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink, quirk1, quirk2),
-            animations = arrayOf(
-                bedrock("venonat", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink, quirk1, quirk2),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("venonat", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("venonat", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbHisuianModel.kt

@@ -1,60 +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.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 VoltorbHisuianModel (root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("voltorb_hisuian")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.2, -1.2, 0.0)
-
-    override var profileScale = 1.1F
-    override var profileTranslation = Vec3(0.0, 0.1, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("voltorb_hisuian", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("voltorb_hisuian", "blink") }
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 0,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("voltorb_hisuian", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            onTransitionedInto = { it?.reset() },
-            transformTicks = 0,
-            animations = arrayOf(
-                bedrock("voltorb_hisuian", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("voltorb_hisuian", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt

@@ -1,61 +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.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.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 VoltorbModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("voltorb")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.2, -1.2, 0.0)
-
-    override var profileScale = 1.1F
-    override var profileTranslation = Vec3(0.0, 0.1, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("voltorb", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("voltorb", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 0,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("voltorb", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            onTransitionedInto = { it?.reset() },
-            transformTicks = 0,
-            animations = arrayOf(
-                bedrock("voltorb", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("voltorb", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt

@@ -1,80 +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.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.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-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 VulpixModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("vulpix")
-    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 = 1.7F
-    override var portraitTranslation = Vec3(-0.1, -0.15, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var sleep: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("vulpix", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("vulpix", "blink")}
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("vulpix", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-//                bedrock("vulpix", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                QuadrupedWalkAnimation(this, periodMultiplier = 0.5F),
-//                bedrock("vulpix", "ground_walk")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("vulpix", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt

@@ -1,157 +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.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.asExpressionLike
-import com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isUnderWater
-import com.cobblemon.mod.common.util.isInWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class WartortleModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("wartortle")
-    override val head = getPart("head_ai")
-
-    override var portraitScale = 1.57F
-    override var portraitTranslation = Vec3(-0.17, 0.54, 0.0)
-
-    override var profileScale = 0.69F
-    override var profileTranslation = Vec3(0.0, 0.69, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-    lateinit var shoulderLeft: CobblemonPose
-    lateinit var shoulderRight: CobblemonPose
-    lateinit var floating: CobblemonPose
-    lateinit var swimming: CobblemonPose
-    lateinit var water_surface_idle: CobblemonPose
-    lateinit var water_surface_swim: CobblemonPose
-
-    val shoulderOffset = 5.5
-    val wateroffset = -10
-
-    override fun registerPoses() {
-        animations["physical"] = "q.bedrock_primary('wartortle', 'physical', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-        animations["special"] = "q.bedrock_primary('wartortle', 'special', 'look', q.curve('symmetrical_wide'))".asExpressionLike()
-        animations["status"] = "q.bedrock_primary('wartortle', 'status', q.curve('symmetrical_wide'))".asExpressionLike()
-        animations["recoil"] = "q.bedrock_stateful('wartortle', 'recoil')".asExpressionLike()
-        animations["cry"] = "q.bedrock_stateful('wartortle', 'cry')".asExpressionLike()
-
-        val faint = "q.bedrock_primary('wartortle', 'faint', q.curve('one'))".asExpressionLike()
-
-        val blink = quirk { bedrockStateful("wartortle", "blink") }
-        val quirkidle = quirk { bedrockStateful("wartortle", "quirk_idle") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            quirks = arrayOf(blink),
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(bedrock("wartortle", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = setOf(PoseType.STAND) + UI_POSES,
-            quirks = arrayOf(blink, quirkidle),
-            condition = { !it.isBattling && !it.isUnderWater},
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "ground_idle")
-            )
-        )
-
-        battleidle = registerPose(
-            poseTypes = setOf(PoseType.STAND),
-            poseName = "battle_standing",
-            quirks = arrayOf(blink, quirkidle),
-            condition = { it.isBattling },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "battle_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = setOf(PoseType.WALK),
-            quirks = arrayOf(blink),
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "ground_walk")
-            )
-        )
-
-        floating = registerPose(
-            poseName = "floating",
-            transformTicks = 10,
-            poseType = PoseType.FLOAT,
-            namedAnimations = mutableMapOf("faint" to faint),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "water_idle")
-            )
-        )
-
-        swimming = registerPose(
-            poseName = "swimming",
-            transformTicks = 10,
-            namedAnimations = mutableMapOf("faint" to faint),
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "water_swim"),
-            )
-        )
-
-        water_surface_idle = registerPose(
-            poseName = "surface_idle",
-            poseType = PoseType.STAND,
-            namedAnimations = mutableMapOf("faint" to faint),
-            quirks = arrayOf(blink),
-            condition = { it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "surfacewater_idle"),
-            ),
-            transformedParts = arrayOf(
-                rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset)
-            )
-        )
-
-        water_surface_swim = registerPose(
-            poseName = "surface_swim",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            condition = { it.isInWater },
-            namedAnimations = mutableMapOf("faint" to faint),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("wartortle", "surfacewater_swim"),
-            ),
-            transformedParts = arrayOf(
-                rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset)
-            )
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt

@@ -1,83 +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.gen2
-
-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.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class BayleefModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("bayleef")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.8F
-    override var portraitTranslation = Vec3(-0.5, 0.7, 0.0)
-
-    override var profileScale = 0.71F
-    override var profileTranslation = Vec3(0.0, 0.65, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("bayleef", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("bayleef", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("bayleef", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("bayleef", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("bayleef", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("bayleef", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("bayleef", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt

@@ -1,80 +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.gen2
-
-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.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ChikoritaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("chikorita")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.7F
-    override var portraitTranslation = Vec3(-0.1, -0.32, 0.0)
-
-    override var profileScale = 0.71F
-    override var profileTranslation = Vec3(0.0, 0.67, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("chikorita", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("chikorita", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("chikorita", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("chikorita", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("chikorita", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                bedrock("chikorita", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("chikorita", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt

@@ -1,152 +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.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-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.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isUnderWater
-import com.cobblemon.mod.common.util.isInWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class CroconawModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("croconaw")
-    override val head = getPart("head")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 1.3F
-    override var portraitTranslation = Vec3(-0.2, 1.0, 0.0)
-
-    override var profileScale = 0.6F
-    override var profileTranslation = Vec3(0.0, 0.76, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var floating: Pose
-    lateinit var swimming: Pose
-    lateinit var sleep: Pose
-    lateinit var watersleep: Pose
-    lateinit var battleidle: Pose
-    lateinit var water_surface_idle: Pose
-    lateinit var water_surface_swim: Pose
-
-    val wateroffset = -10
-
-    override val cryAnimation = CryProvider { bedrockStateful("croconaw", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("croconaw", "blink")}
-
-        sleep = registerPose(
-            poseName = "sleeping",
-            poseType = PoseType.SLEEP,
-            condition = { !it.isInWater },
-            animations = arrayOf(bedrock("croconaw", "sleep"))
-        )
-
-        watersleep = registerPose(
-            poseName = "water_sleeping",
-            poseType = PoseType.SLEEP,
-            condition = { it.isInWater },
-            animations = arrayOf(bedrock("croconaw", "water_sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.UI_POSES + PoseType.STAND,
-            condition = { !it.isBattling && !it.isInWater && !it.isUnderWater },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            condition = { !it.isInWater && !it.isUnderWater },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "ground_walk")
-            )
-        )
-
-        floating = registerPose(
-            poseName = "floating",
-            poseType = PoseType.FLOAT,
-            condition = { it.isUnderWater },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "water_idle")
-            )
-        )
-
-        swimming = registerPose(
-            poseName = "swimming",
-            transformTicks = 10,
-            condition = { it.isUnderWater },
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "water_swim"),
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling && !it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "battle_idle")
-            )
-        )
-
-        water_surface_idle = registerPose(
-            poseName = "surface_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            condition = { !it.isUnderWater && it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "surfacewater_idle"),
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset))
-        )
-
-        water_surface_swim = registerPose(
-            poseName = "surface_swim",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            condition = { !it.isUnderWater && it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("croconaw", "surfacewater_swim"),
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset))
-        )
-    }
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, sleep)) bedrockStateful("croconaw", "faint") else if (state.isPosedIn(water_surface_idle, water_surface_swim, watersleep )) bedrockStateful("croconaw", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilHisuiBiasModel.kt

@@ -1,84 +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.gen2
-
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class CyndaquilHisuiBiasModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("cyndaquil_hisui_bias")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.4F
-    override var portraitTranslation = Vec3(-0.26, 0.0, 0.0)
-
-    override var profileScale = 0.65F
-    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walking: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { if (it.isBattling) bedrockStateful("cyndaquil_hisui_bias", "battle_cry") else bedrockStateful("cyndaquil_hisui_bias", "cry") }
-
-    override fun registerPoses() {
-//        val sneeze = quirk { bedrockStateful("cyndaquil_hisui_bias", "sneeze_quirk") }
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("cyndaquil_hisui_bias", "sleep"))
-        )
-
-        standing = registerPose(
-                poseName = "standing",
-                poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-                transformTicks = 10,
-                condition = { !it.isBattling },
-//            quirks = arrayOf(sneeze),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("cyndaquil_hisui_bias", "ground_idle")
-                )
-        )
-
-        walking = registerPose(
-                poseName = "walking",
-                poseTypes = PoseType.MOVING_POSES,
-                transformTicks = 10,
-//            quirks = arrayOf(sneeze),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("cyndaquil_hisui_bias", "ground_walk")
-                )
-        )
-
-        battleidle = registerPose(
-                poseName = "battle_idle",
-                poseTypes = PoseType.STATIONARY_POSES,
-                transformTicks = 10,
-//            quirks = arrayOf(sneeze),
-                condition = { it.isBattling },
-                animations = arrayOf(
-                        singleBoneLook(minPitch = 0F),
-                        bedrock("cyndaquil_hisui_bias", "battle_idle")
-                )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("cyndaquil_hisui_bias", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt

@@ -1,84 +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.gen2
-
-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.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class CyndaquilModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("cyndaquil")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.4F
-    override var portraitTranslation = Vec3(-0.26, 0.0, 0.0)
-
-    override var profileScale = 0.65F
-    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { if (it.isBattling) bedrockStateful("cyndaquil", "battle_cry") else bedrockStateful("cyndaquil", "cry") }
-
-    override fun registerPoses() {
-//        val sneeze = quirk { bedrockStateful("cyndaquil", "sneeze_quirk") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("cyndaquil", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-//            quirks = arrayOf(sneeze),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("cyndaquil", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 10,
-//            quirks = arrayOf(sneeze),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("cyndaquil", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-//            quirks = arrayOf(sneeze),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(minPitch = 0F),
-                bedrock("cyndaquil", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("cyndaquil", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt

@@ -1,83 +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.gen2
-
-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.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class MeganiumModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("meganium")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.2F
-    override var portraitTranslation = Vec3(-0.7, 2.4, 0.0)
-
-    override var profileScale = 0.43F
-    override var profileTranslation = Vec3(0.0, 1.12, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("meganium", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("meganium", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("meganium", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meganium", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meganium", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("meganium", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("meganium", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt

@@ -1,88 +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.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
-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.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class QuilavaModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("quilava")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.65, -0.6, 0.0)
-
-    override var profileScale = 0.7F
-    override var profileTranslation = Vec3(0.0, 0.65, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { if (it.isBattling) bedrockStateful("quilava", "battle_cry") else PrimaryAnimation(bedrockStateful("quilava", "cry")) }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("quilava", "blink") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("quilava", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("quilava", "fire_idle"),
-                bedrock("quilava", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("quilava", "fire_idle"),
-                bedrock("quilava", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("quilava", "fire_idle"),
-                bedrock("quilava", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("quilava", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionHisuianModel.kt

@@ -1,114 +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.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-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 com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class TyphlosionHisuianModel  (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("typhlosion")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.4F
-    override var portraitTranslation = Vec3(-0.45, 2.37, 0.0)
-
-    override var profileScale = 0.5F
-    override var profileTranslation = Vec3(0.0, 1.0, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walking: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    val spoopy_flame = getPart("fire_main")
-    val spoopy_orb1 = getPart("fire_orb_right1")
-    val spoopy_orb2 = getPart("fire_orb_middle1")
-    val spoopy_orb3 = getPart("fire_orb_left1")
-
-    override val cryAnimation = CryProvider { if (it.isBattling) bedrockStateful("typhlosion_hisuian", "battle_cry") else bedrockStateful("typhlosion_hisuian", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("typhlosion_hisuian", "blink") }
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                transformedParts = arrayOf(
-                        spoopy_flame.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb1.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb2.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb3.createTransformation().withVisibility(visibility = false)
-                ),
-                animations = arrayOf(bedrock("typhlosion_hisuian", "sleep"))
-        )
-
-        standing = registerPose(
-                poseName = "standing",
-                poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-                transformTicks = 10,
-                condition = { !it.isBattling },
-                quirks = arrayOf(blink),
-                transformedParts = arrayOf(
-                        spoopy_flame.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb1.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb2.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb3.createTransformation().withVisibility(visibility = false)
-                ),
-                animations = arrayOf(
-                        singleBoneLook(minPitch = 0F),
-                        bedrock("typhlosion_hisuian", "ground_idle")
-                )
-        )
-
-        walking = registerPose(
-                poseName = "walking",
-                poseTypes = PoseType.MOVING_POSES,
-                transformTicks = 10,
-                quirks = arrayOf(blink),
-                transformedParts = arrayOf(
-                        spoopy_flame.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb1.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb2.createTransformation().withVisibility(visibility = false),
-                        spoopy_orb3.createTransformation().withVisibility(visibility = false)
-                ),
-                animations = arrayOf(
-                        singleBoneLook(minPitch = 0F),
-                        bedrock("typhlosion_hisuian", "ground_walk")
-                )
-        )
-
-        battleidle = registerPose(
-                poseName = "battle_idle",
-                poseTypes = PoseType.STATIONARY_POSES,
-                transformTicks = 10,
-                quirks = arrayOf(blink),
-                transformedParts = arrayOf(
-                        spoopy_flame.createTransformation().withVisibility(visibility = true),
-                        spoopy_orb1.createTransformation().withVisibility(visibility = true),
-                        spoopy_orb2.createTransformation().withVisibility(visibility = true),
-                        spoopy_orb3.createTransformation().withVisibility(visibility = true)
-                ),
-                condition = { it.isBattling },
-                animations = arrayOf(
-                        singleBoneLook(minPitch = 0F),
-                        bedrock("typhlosion_hisuian", "battle_idle")
-                )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("typhlosion_hisuian", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.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.gen2
-
-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.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class TyphlosionModel  (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("typhlosion")
-    override val head = getPart("head")
-
-    override var portraitScale = 1.4F
-    override var portraitTranslation = Vec3(-0.65, 1.8, 0.0)
-
-    override var profileScale = 0.5F
-    override var profileTranslation = Vec3(0.0, 1.0, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walking: Pose
-    lateinit var sleep: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { state -> if ((state.getEntity() as? PokemonEntity)?.isBattling == true) bedrockStateful("typhlosion", "battle_cry") else bedrockStateful("typhlosion", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("typhlosion", "blink") }
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("typhlosion", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            transformTicks = 10,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(minPitch = 0F),
-                bedrock("typhlosion", "ground_idle")
-            )
-        )
-
-        walking = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(minPitch = 0F),
-                bedrock("typhlosion", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(minPitch = 0F),
-                bedrock("typhlosion", "battle_idle")
-            )
-        )
-    }
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walking, battleidle, sleep)) bedrockStateful("typhlosion", "faint") else null
-}

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

@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokeball.Ancient
 import com.cobblemon.mod.common.client.render.models.blockbench.pokeball.BeastBallModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pokeball.PokeBallModel
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1.*
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2.*
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen3.*
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4.*
@@ -218,54 +217,6 @@ object VaryingModelRepository {
         inbuilt("ancient_leaden_ball", ::AncientPokeBallModel)
         inbuilt("ancient_gigaton_ball", ::AncientPokeBallModel)
 
-        inbuilt("squirtle", ::SquirtleModel)
-        inbuilt("wartortle", ::WartortleModel)
-        inbuilt("metapod", ::MetapodModel)
-        inbuilt("butterfree", ::ButterfreeModel)
-        inbuilt("beedrill", ::BeedrillModel)
-        inbuilt("raticate", ::RaticateModel)
-        inbuilt("raticate_alolan", ::RaticateAlolanModel)
-        inbuilt("krabby", ::KrabbyModel)
-        inbuilt("paras", ::ParasModel)
-        inbuilt("mankey", ::MankeyModel)
-        inbuilt("primeape", ::PrimeapeModel)
-        inbuilt("voltorb", ::VoltorbModel)
-        inbuilt("electrode", ::ElectrodeModel)
-        inbuilt("machop", ::MachopModel)
-        inbuilt("machoke", ::MachokeModel)
-        inbuilt("machamp", ::MachampModel)
-        inbuilt("cubone", ::CuboneModel)
-        inbuilt("dodrio", ::DodrioModel)
-        inbuilt("doduo", ::DoduoModel)
-        inbuilt("electabuzz", ::ElectabuzzModel)
-        inbuilt("exeggcute", ::ExeggcuteModel)
-        inbuilt("exeggutor", ::ExeggutorModel)
-        inbuilt("farfetchd", ::FarfetchdModel)
-        inbuilt("farfetchd_galarian", ::FarfetchdGalarianModel)
-        inbuilt("gengar", ::GengarModel)
-        inbuilt("geodude", ::GeodudeModel)
-        inbuilt("golduck", ::GolduckModel)
-        inbuilt("golem", ::GolemModel)
-        inbuilt("hitmonchan", ::HitmonchanModel)
-        inbuilt("hitmonlee", ::HitmonleeModel)
-        inbuilt("kabuto", ::KabutoModel)
-        inbuilt("kabutops", ::KabutopsModel)
-        inbuilt("koffing", ::KoffingModel)
-        inbuilt("krabby", ::KrabbyModel)
-        inbuilt("lickitung", ::LickitungModel)
-        inbuilt("marowak", ::MarowakModel)
-        inbuilt("meowth", ::MeowthModel)
-        inbuilt("nidoqueen", ::NidoqueenModel)
-        inbuilt("nidorino", ::NidorinoModel)
-        inbuilt("persian", ::PersianModel)
-        inbuilt("pinsir", ::PinsirModel)
-        inbuilt("ponyta", ::PonytaModel)
-        inbuilt("psyduck", ::PsyduckModel)
-        inbuilt("rapidash", ::RapidashModel)
-        inbuilt("sandslash", ::SandslashModel)
-        inbuilt("tangela", ::TangelaModel)
-        inbuilt("venomoth", ::VenomothModel)
-        inbuilt("venonat", ::VenonatModel)
         inbuilt("elekid", ::ElekidModel)
         inbuilt("hitmontop", ::HitmontopModel)
         inbuilt("electivire", ::ElectivireModel)
@@ -397,8 +348,6 @@ object VaryingModelRepository {
         inbuilt("bunnelby", ::BunnelbyModel)
         inbuilt("arrokuda", ::ArrokudaModel)
         inbuilt("barraskewda", ::BarraskewdaModel)
-        inbuilt("ponyta_galarian", ::PonytaGalarianModel)
-        inbuilt("rapidash_galarian", ::RapidashGalarianModel)
         inbuilt("volbeat", ::VolbeatModel)
         inbuilt("illumise", ::IllumiseModel)
         inbuilt("yamper", ::YamperModel)
@@ -423,20 +372,10 @@ object VaryingModelRepository {
         inbuilt("obstagoon", :: ObstagoonModel)
         inbuilt("wishiwashi_solo", :: WishiwashiSoloModel)
         inbuilt("wishiwashi_schooling", :: WishiwashiSchoolingModel)
-        inbuilt("meowth_alolan", ::MeowthAlolanModel)
-        inbuilt("meowth_galarian", ::MeowthGalarianModel)
-        inbuilt("persian_alolan", ::PersianAlolanModel)
         inbuilt("perrserker", ::PerrserkerModel)
         inbuilt("komala", ::KomalaModel)
         inbuilt("phantump", ::PhantumpModel)
         inbuilt("totodile", ::TotodileModel)
-        inbuilt("croconaw", ::CroconawModel)
-        inbuilt("cyndaquil", ::CyndaquilModel)
-        inbuilt("quilava", ::QuilavaModel)
-        inbuilt("typhlosion", ::TyphlosionModel)
-        inbuilt("chikorita", ::ChikoritaModel)
-        inbuilt("bayleef", ::BayleefModel)
-        inbuilt("meganium", ::MeganiumModel)
         inbuilt("crabrawler", ::CrabrawlerModel)
         inbuilt("wimpod", ::WimpodModel)
         inbuilt("golisopod", ::GolisopodModel)
@@ -475,8 +414,6 @@ object VaryingModelRepository {
         inbuilt("zoroark", ::ZoroarkModel)
         inbuilt("zoroark_hisuian", ::ZoroarkHisuianModel)
         inbuilt("aurorus", ::AurorusModel)
-        inbuilt("voltorb_hisuian", ::VoltorbHisuianModel)
-        inbuilt("electrode_hisuian", ::ElectrodeHisuianModel)
         inbuilt("sentret", ::SentretModel)
         inbuilt("qwilfish", ::QwilfishModel)
         inbuilt("qwilfish_hisuian", ::QwilfishHisuianModel)
@@ -516,9 +453,7 @@ object VaryingModelRepository {
         inbuilt("grimmsnarl", ::GrimmsnarlModel)
         inbuilt("klefki", ::KlefkiModel)
         inbuilt("samurott_hisuian", ::SamurottHisuianModel)
-        inbuilt("cyndaquil_hisui_bias", ::CyndaquilHisuiBiasModel)
         inbuilt("quilava_hisui_bias", ::QuilavaHisuiBiasModel)
-        inbuilt("typhlosion_hisuian", ::TyphlosionHisuianModel)
         inbuilt("rowlet_hisui_bias", ::RowletHisuiBiasModel)
         inbuilt("dartrix_hisui_bias", ::DartrixHisuiBiasModel)
         inbuilt("decidueye_hisuian", ::DecidueyeHisuianModel)
@@ -666,4 +601,4 @@ object VaryingModelRepository {
             }
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt

@@ -47,6 +47,10 @@ class CobblemonConfig {
     @IntConstraint(min = 0, max = 1000)
     var maxPokemonFriendship = 255
 
+    @CobblemonConfigField(Category.Pokemon, lang = "power_item_ride_stat_gain_interval_seconds", SERVER)
+    @IntConstraint(min = -1, max = Int.MAX_VALUE)
+    var powerItemRideStatGainIntervalSeconds = 120
+
     @CobblemonConfigField(Category.Pokemon, lang = "announce_drop_items", SERVER)
     var announceDropItems = true
     @CobblemonConfigField(Category.Pokemon, lang = "default_drop_item_method", SERVER)

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt

@@ -117,7 +117,6 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.component.DataComponents
 import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.NbtOps
 import net.minecraft.nbt.NbtUtils
@@ -133,7 +132,6 @@ import net.minecraft.network.protocol.game.DebugPackets
 import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.network.syncher.EntityDataSerializers
 import net.minecraft.network.syncher.SynchedEntityData
-import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerEntity
 import net.minecraft.server.level.ServerLevel
@@ -175,7 +173,6 @@ import net.minecraft.world.level.gameevent.GameEvent
 import net.minecraft.world.level.material.EmptyFluid
 import net.minecraft.world.level.material.FluidState
 import net.minecraft.world.level.pathfinder.PathType
-import net.minecraft.world.level.storage.loot.LootTable
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
 import java.util.*
@@ -245,12 +242,6 @@ open class PokemonEntity(
 
     override val schedulingTracker = SchedulingTracker()
 
-    override fun getDefaultLootTable(): ResourceKey<LootTable?>? {
-        println(cobblemonResource("pokemon/${this.pokemon.species.resourceIdentifier.path}"))
-//        return ResourceKey.create(Registries.LOOT_TABLE, )
-        return super.getDefaultLootTable()
-    }
-
     val form: FormData
         get() = pokemon.form
     val behaviour: FormPokemonBehaviour
@@ -2753,4 +2744,9 @@ open class PokemonEntity(
     }
 
     fun hasRider() = this.passengers.any { it is LivingEntity }
-}
+
+    override fun playStepSound(pos: BlockPos, state: BlockState) {
+        if (this.pokemon.species.silenceStepSounds) return
+        super.playStepSound(pos, state)
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt

@@ -22,6 +22,7 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.feature.TickingSpeciesFeature
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
+import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.spawning.fishing.FishingSpawnCause.Companion.DROPS_REROLL_ASPECT
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.BattleRegistry
@@ -46,10 +47,15 @@ import kotlin.math.*
 
 /** Handles purely server logic for a Pokémon */
 class PokemonServerDelegate : PokemonSideDelegate {
+    companion object {
+        private const val RIDE_STAT_GAIN_AMOUNT = 1F
+    }
+
     lateinit var entity: PokemonEntity
     var acknowledgedHPValue = -1
     var acknowledgedLevel = -1
     val passengerOffsets = mutableMapOf<Int, Vec3>()
+    private var rideStatGainAnchor: Vec3? = null
 
     /** Mocked properties exposed to the client [PokemonEntity]. */
     private val mock: PokemonProperties?
@@ -355,9 +361,30 @@ class PokemonServerDelegate : PokemonSideDelegate {
             }
         }
 
+        val rideStatGainIntervalSeconds = Cobblemon.config.powerItemRideStatGainIntervalSeconds
+        if (rideStatGainIntervalSeconds > 0) {
+            val rideStatGainIntervalTicks = rideStatGainIntervalSeconds * 20L
+            if (entity.level().gameTime % rideStatGainIntervalTicks == 0L) {
+                trainRideStats()
+            }
+        }
+
         updateTrackedValues()
     }
 
+    private fun trainRideStats() {
+        val position = entity.position()
+        val anchor = rideStatGainAnchor
+        rideStatGainAnchor = position
+        if (anchor == null || anchor == position || entity.passengers.isEmpty()) return
+
+        val heldItem = entity.pokemon.heldItemNoCopy()
+        if (heldItem.isEmpty) return
+
+        val stat = RidingStat.entries.firstOrNull { heldItem.`is`(it.powerItem) } ?: return
+        entity.pokemon.addRideBoost(stat, RIDE_STAT_GAIN_AMOUNT)
+    }
+
     fun updateShownItem() {
         val trackedShownItem = when {
             // Show Hand Item if Held item is hidden

common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/PonigiriItem.kt

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.item.interactive
 
 import com.cobblemon.mod.common.CobblemonItemComponents
+import com.cobblemon.mod.common.item.components.FoodComponent
 import net.minecraft.network.chat.Component
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundEvents
@@ -23,10 +24,15 @@ import net.minecraft.world.level.Level
 class PonigiriItem : Item(
         Properties().stacksTo(64)
                 .food(FoodProperties.Builder()
-                        .nutrition(2)
-                        .saturationModifier(0.55f)
+                        .nutrition(NUTRITION)
+                        .saturationModifier(SATURATION_MODIFIER)
                         .build())
 ) {
+    companion object {
+        const val NUTRITION = 2
+        const val SATURATION_MODIFIER = 0.55f
+    }
+
     override fun getName(stack: ItemStack): Component {
 
         val ingredients = stack.get(CobblemonItemComponents.INGREDIENT)
@@ -59,4 +65,9 @@ class PonigiriItem : Item(
     override fun getEatingSound(): SoundEvent {
         return SoundEvents.GENERIC_EAT
     }
-}
+
+    fun getFoodValues(stack: ItemStack): Pair<Int, Float> {
+        val (hunger, saturation) = stack.getOrDefault(CobblemonItemComponents.FOOD, FoodComponent(NUTRITION, SATURATION_MODIFIER))
+        return hunger to saturation
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/loot/CobblemonLootItemConditions.kt

@@ -1,28 +0,0 @@
-package com.cobblemon.mod.common.loot
-
-import com.cobblemon.mod.common.loot.conditions.RequirementLootItemCondition
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
-
-object CobblemonLootItemConditions :
-    PlatformRegistry<Registry<LootItemConditionType>, ResourceKey<Registry<LootItemConditionType>>, LootItemConditionType>() {
-
-    @JvmField
-    val REQUIREMENT_CONDITION = create(
-        cobblemonResource("requirement"),
-        LootItemConditionType(RequirementLootItemCondition.CODEC)
-    )
-
-    fun touch() = Unit
-
-    override val registry: Registry<LootItemConditionType>
-        get() = BuiltInRegistries.LOOT_CONDITION_TYPE
-    override val resourceKey: ResourceKey<Registry<LootItemConditionType>>
-        get() = Registries.LOOT_CONDITION_TYPE
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/loot/conditions/RequirementLootItemCondition.kt

@@ -1,37 +0,0 @@
-package com.cobblemon.mod.common.loot.conditions
-
-import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.loot.CobblemonLootItemConditions
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.world.level.storage.loot.LootContext
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams
-import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
-import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
-
-/**
- * Allows for use of a [Requirement] as a [LootItemConditionType]
- */
-class RequirementLootItemCondition(
-    val requirement: Requirement
-) : LootItemCondition {
-
-    override fun getType(): LootItemConditionType {
-        return CobblemonLootItemConditions.REQUIREMENT_CONDITION
-    }
-
-    override fun test(t: LootContext): Boolean {
-        val entity = t.getParamOrNull(LootContextParams.THIS_ENTITY) as? PokemonEntity ?: return false
-        return requirement.check(entity.pokemon)
-    }
-
-    companion object {
-        val CODEC: MapCodec<RequirementLootItemCondition> = RecordCodecBuilder.mapCodec { instance ->
-            instance.group(
-                Requirement.CODEC.fieldOf("requirement")
-                    .forGetter(RequirementLootItemCondition::requirement)
-            ).apply(instance, ::RequirementLootItemCondition)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt

@@ -173,6 +173,7 @@ class Species : ShowdownIdentifiable {
         .addStandardFunctions()
         .addSpeciesFunctions(this)
 
+    var silenceStepSounds = false
 
     fun initialize() {
         Cobblemon.statProvider.provide(this)
@@ -256,6 +257,7 @@ class Species : ShowdownIdentifiable {
         }
 
         this.riding.encode(buffer)
+        buffer.writeBoolean(this.silenceStepSounds)
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -299,6 +301,7 @@ class Species : ShowdownIdentifiable {
             }
         }
         this.riding = RidingProperties.decode(buffer)
+        this.silenceStepSounds = buffer.readBoolean()
         this.initialize()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/adapters/CobbledRequirementAdapter.kt

@@ -71,7 +71,6 @@ object CobblemonRequirementAdapter : RequirementAdapter {
         this.registerType(OwnerHoldsItemRequirement.ADAPTER_VARIANT, OwnerHoldsItemRequirement::class)
         this.registerType(ChanceRequirement.ADAPTER_VARIANT, ChanceRequirement::class)
         this.registerType(NegateRequirement.ADAPTER_VARIANT, NegateRequirement::class)
-        this.registerType(AspectRequirement.ADAPTER_VARIANT, AspectRequirement::class)
     }
 
     val gson: Gson by lazy {

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/requirements/AspectRequirement.kt

@@ -1,20 +0,0 @@
-package com.cobblemon.mod.common.pokemon.requirements
-
-import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
-import com.cobblemon.mod.common.pokemon.Pokemon
-
-/**
- * A [Requirement] that checks if a [Pokemon] has a certain aspect.
- *
- * @property aspect The aspect to check for.
- * @author whatsy
- */
-class AspectRequirement(val target: String) : Requirement {
-    override fun check(pokemon: Pokemon): Boolean {
-        return target in pokemon.aspects
-    }
-
-    companion object {
-        val ADAPTER_VARIANT = "aspect"
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt

@@ -234,11 +234,11 @@ fun Entity.isDusk(): Boolean {
 }
 
 fun Entity.isStandingOn(blocks: Set<String>, depth: Int = 2): Boolean {
-    for (currentDepth in 1..depth) {
-        val bellowBlockPos = blockPosition().below(currentDepth)
+    for (currentDepth in 0..depth) {
+        val bellowBlockPos = blockPosBelowThatAffectsMyMovement.below(currentDepth)
         val blockState = level().getBlockState(bellowBlockPos)
 
-        if (blockState.isAir || !blockState.isCollisionShapeFullBlock(level(), bellowBlockPos)) continue
+        if (blockState.isAir) continue
 
         val elementOrTags = ExtraCodecs.TAG_OR_ELEMENT_ID.listOf().decode(JavaOps.INSTANCE, blocks.toList()).result().get().first
         elementOrTags.forEach {

common/src/main/kotlin/com/cobblemon/mod/common/world/gamerules/CobblemonGameRules.kt

@@ -27,5 +27,7 @@ object CobblemonGameRules {
     @JvmField
     val HEALERS_HEAL_PC: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersHealPC", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
     @JvmField
+    val HEALER_SET_SPAWN: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("healersSetSpawn", GameRules.Category.MISC, BooleanRuleInvoker.`cobblemon$create`(false))
+    @JvmField
     val DO_POKEMON_PREDATION: GameRules.Key<GameRules.BooleanValue> = Cobblemon.implementation.registerGameRule("doPokemonPredation", GameRules.Category.MOBS, BooleanRuleInvoker.`cobblemon$create`(true))
 }

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0009_blastoise/blastoise.animation.json

@@ -456,6 +456,12 @@
 				"cannon_left": {
 					"position": [0, 0, 3]
 				}
+			},
+			"timeline": {
+				"0.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.25": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.25": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.blastoise.ground_run": {

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

@@ -1815,6 +1815,12 @@
 				"wings_open": {
 					"scale": 0
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_claw_medium');"
 			}
 		},
 		"animation.pidgeot.mount_ground_idle": {
@@ -3631,6 +3637,12 @@
 				"wings_open": {
 					"scale": 0
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_claw_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_claw_medium');"
 			}
 		},
 		"animation.pidgeot.ride_ground_walk": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0047_parasect/parasect.animation.json

@@ -83,6 +83,7 @@
 		},
 		"animation.parasect.ground_walk": {
 			"loop": true,
+			"animation_length": 1,
 			"bones": {
 				"body": {
 					"rotation": [0, 0, 0],
@@ -134,6 +135,12 @@
 				"locator_seat_1": {
 					"rotation": [7.5, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.25": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.5": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.75": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.parasect.ground_run": {
@@ -258,6 +265,10 @@
 					"rotation": ["5+Math.cos((query.anim_time) * 90 * 16 - 90) * 2", 0, 0],
 					"position": [0, "0+Math.cos((query.anim_time) * 90 * 32) * -0.2", -0.25]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.125": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.parasect.ride_ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0059_arcanine/arcanine.animation.json

@@ -1682,6 +1682,12 @@
 						"1.3333": [10, 9, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.4583": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.6667": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.125": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.arcanine.ride_ground_walk": {
@@ -2639,6 +2645,12 @@
 				"chest_fluff_right": {
 					"rotation": [5, "-22.5+math.cos(q.anim_time*90*8-120)*15", "-math.sin(q.anim_time*90*8-120)*3"]
 				}
+			},
+			"timeline": {
+				"0.125": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.2083": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.2917": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.375": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.arcanine.ride_ground_run": {
@@ -4161,41 +4173,101 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"0.5": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"1.6667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"0.5": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"1.6667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {
@@ -4823,41 +4895,101 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"0.5": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, 0.1]},
-						"1.6667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"0.5": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, 0.1]},
-						"1.6667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, 0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.1667": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
-						"2.5": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.5": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"1.4167": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"1.6667": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						},
+						"2.5": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {
@@ -5287,14 +5419,20 @@
 					"position": {
 						"0.0": [-0.1, 0, 0.1],
 						"0.125": [-0.1, 0, 0.1],
-						"0.1667": {"pre": [-0.1, 0, 0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [-0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0.1, 0, 0.1],
 						"0.125": [0.1, 0, 0.1],
-						"0.1667": {"pre": [0.1, 0, 0.1], "post": [0, 0, 0]}
+						"0.1667": {
+							"pre": [0.1, 0, 0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				}
 			}
@@ -5491,47 +5629,95 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {
@@ -6238,47 +6424,95 @@
 				"eye_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eye_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.2, 0, 0.1]},
-						"0.3333": {"pre": [-0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [-0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.2, 0, 0.1]},
-						"0.3333": {"pre": [0.2, 0, 0.1], "post": [0, 0, 0]},
-						"1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.2, 0, 0.1]
+						},
+						"0.3333": {
+							"pre": [0.2, 0, 0.1],
+							"post": [0, 0, 0]
+						},
+						"1.25": {
+							"pre": [0, 0, 0],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_left_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
-						"0.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"eyelid_right_hurt": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
-						"0.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
+						"0.0417": {
+							"pre": [0, 0, 0],
+							"post": [-0.1, 0, -0.1]
+						},
+						"0.3333": {
+							"pre": [-0.1, 0, -0.1],
+							"post": [0, 0, 0]
+						}
 					}
 				},
 				"jaw": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0087_dewgong/dewgong.animation.json

@@ -391,6 +391,10 @@
 						"0.7083": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0833": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.2917": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.dewgong.water_idle": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0111_rhyhorn/rhyhorn.animation.json

@@ -1071,6 +1071,16 @@
 				"head": {
 					"rotation": ["-0.8*math.cos(q.anim_time*90*8-120)", 0, "3*math.sin(q.anim_time*90*4+70)"]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.5": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhyhorn.ride_ground_walk": {
@@ -1917,6 +1927,16 @@
 					],
 					"position": [0, "0.4+0.6*math.cos(q.anim_time*90*8-120)", 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.375": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"0.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.875": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.375": "q.run_molang('cobblemon:stepsound_standard_medium');",
+				"1.5": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.875": "q.run_molang('cobblemon:stepsound_standard_medium');"
 			}
 		},
 		"animation.rhyhorn.ride_ground_run": {

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

@@ -329,6 +329,12 @@
 				"locator_seat_1": {
 					"rotation": [-15, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"2.0": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"3.0": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhydon.ride_ground_walk": {
@@ -807,6 +813,12 @@
 				"locator_seat_1": {
 					"rotation": [-15, 0, 0]
 				}
+			},
+			"timeline": {
+				"0.3333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"0.8333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.3333": "q.run_molang('cobblemon:stepsound_standard_large');",
+				"1.8333": "q.run_molang('cobblemon:stepsound_standard_large');"
 			}
 		},
 		"animation.rhydon.ride_ground_run": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0122_mrmime/mr_mime.animation.json

@@ -391,6 +391,10 @@
 						"1.0": [0, 0, 0]
 					}
 				}
+			},
+			"timeline": {
+				"0.0833": "q.run_molang('cobblemon:stepsound_minecraft');",
+				"0.5833": "q.run_molang('cobblemon:stepsound_minecraft');"
 			}
 		},
 		"animation.mr_mime.ground_run": {