cleanup

# Conflicts:
#	common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json
#	common/src/main/resources/data/cobblemon/species/generation4/rotom.json
#	common/src/main/resources/data/cobblemon/species/generation4/wormadam.json
#	common/src/main/resources/data/cobblemon/species/generation5/kyurem.json
#	common/src/main/resources/data/cobblemon/species/generation6/avalugg.json
#	common/src/main/resources/data/cobblemon/species/generation6/flabebe.json
#	common/src/main/resources/data/cobblemon/species/generation6/floette.json
#	common/src/main/resources/data/cobblemon/species/generation6/florges.json
#	common/src/main/resources/data/cobblemon/species/generation6/goodra.json
#	common/src/main/resources/data/cobblemon/species/generation6/greninja.json
#	common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json
#	common/src/main/resources/data/cobblemon/species/generation7/decidueye.json
#	common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json

CHANGELOG.md

@@ -2,35 +2,26 @@
 ## [1.8.5 (MONTH xth, 2026)](#1-8-5)
 
 ### Additions
-- 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
-- Updated the recipe category for the Create compatibility EXP Candy recipe
-- Added No Man's Lands' Honeyed Apple to the Leaves Leftovers tag
-- Updated Unown's punctuation form names from `!` and `?` to `Exclamation` and `Question`, changing their visible form labels in tooltips and mod integrations.
-
-### Fixes
-- Fixed Ponigiri food values for AppleSkin integration
-- Fixed errors emitted by typos in Parched Peat bog structure files
-- Fixed Unown punctuation forms (? and !) resolving to duplicate Showdown IDs and colliding in form displays.
-
-### Developer
-- Fixed JsonArray to MoValue conversion not working properly. 
-
-### Molang & Datapacks
-- `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.
-- Fixed the Molang coalescing operator not working the way you'd expect a coalesce operator to. 
-- Added `v.spawnable_position` to the weight spawn rule component's "weight" expression
-- Added `is_alive` function to entities. Can be useful for terminating particles bound to them.
 
 ### Particles
-- Fixed local space settings for particles that are attached to Pokemon locators. Should fix a lot of jitters and rotation issues.
 
-### Localization
-- Updated translations for:
+### Cries added/updated for the following Pokémon
+
+### Model updates for the following Pokémon
+
+### Animation updates for the following Pokémon
+
+### Changes
+
+### Fixes
+
+### 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.
+
+### Localization

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

@@ -15,7 +15,6 @@ 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;
@@ -23,14 +22,10 @@ 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;
@@ -38,9 +33,6 @@ 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 {
@@ -150,17 +142,4 @@ 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,6 +16,7 @@ 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
@@ -90,6 +91,7 @@ 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
@@ -223,12 +225,15 @@ 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,6 +118,7 @@ interface CobblemonImplementation {
     fun registerMenu()
 
     fun registerEntitySubPredicates()
+    fun registerLootItemConditions()
 
     /**
      * TODO

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

@@ -10,9 +10,14 @@ 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
@@ -105,7 +110,11 @@ class DropTable {
     ) {
         LOOT_DROPPED.postThen(
             event = LootDroppedEvent(this, player, entity, drops),
-            ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } }
+            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}"))
+            }
         )
     }
 

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

@@ -0,0 +1,64 @@
+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/molang/function/EntityMoLangFunctions.kt

@@ -266,9 +266,6 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
             entity.noPhysics = intangible
             DoubleValue.ONE
         }
-        functions["is_alive"] = { params ->
-            if (entity.isAlive) DoubleValue.ONE else DoubleValue.ZERO
-        }
 
         when (entity) {
             is PosableEntity -> {

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

@@ -9,6 +9,7 @@
 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
@@ -17,14 +18,22 @@ 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.
@@ -75,11 +84,59 @@ 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 {
-                    it.drops.entries.forEach {
-                        if (it is ItemDropEntry) {
-                            val itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(it.item)?.defaultInstance ?: ItemStack.EMPTY
+                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
                             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,9 +8,14 @@
 
 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
 
@@ -40,5 +45,26 @@ 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,12 +9,9 @@
 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].
@@ -23,14 +20,13 @@ import net.minecraft.world.item.Item
  * @since February 17th, 2025
  */
 enum class RidingStat(
-    val flavour: Flavour,
-    val powerItem: TagKey<Item>
+    val flavour: Flavour
 ) {
-    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);
+    ACCELERATION(Flavour.SPICY),
+    SKILL(Flavour.DRY),
+    SPEED(Flavour.SWEET),
+    STAMINA(Flavour.SOUR),
+    JUMP(Flavour.BITTER);
 
     companion object {
         fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/rules/component/WeightTweakRuleComponent.kt

@@ -41,7 +41,6 @@ class WeightTweakRuleComponent : SpawnRuleComponent {
         return if (spawnDetailSelector.selects(detail) && spawnablePositionSelector.selects(spawnablePosition)) {
             runtime.environment.setSimpleVariable("spawn", detail.struct)
             runtime.environment.setSimpleVariable("spawn_detail", detail.struct)
-            runtime.environment.setSimpleVariable("spawnable_position", spawnablePosition.getOrSetupStruct())
             runtime.environment.setSimpleVariable("weight", DoubleValue(weight.toDouble()))
             runtime.resolveFloat(this.weight)
         } else {

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

@@ -24,7 +24,6 @@ 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
@@ -32,9 +31,13 @@ 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.*
+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.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
@@ -45,11 +48,9 @@ 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) {
@@ -78,14 +79,6 @@ 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 {
@@ -165,12 +158,7 @@ class HealingMachineBlock(settings: Properties) : BaseEntityBlock(settings) {
         }
         val party = serverPlayerEntity.party()
         val pc = serverPlayerEntity.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)
-        }
+        val healPC = player.level().gameRules.getBoolean(CobblemonGameRules.HEALERS_HEAL_PC);
 
         if (party.none() && (!healPC || pc.none())) {
             player.sendSystemMessage(lang("healingmachine.nopokemon").red(), true)
@@ -195,7 +183,6 @@ 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 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
+        val supportBlock = level.getBlockState(supportPos).block
+        return CobblemonBlocks.typeGemBlocks().containsValue(supportBlock) || (supportBlock == CobblemonBlocks.TYPE_GEM_CORE) // Cannot grow if not on any gem blocks
     }
 
 

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

@@ -22,6 +22,7 @@ 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
@@ -51,20 +52,10 @@ 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("minecraft:amethyst_block") to Blocks.SMALL_AMETHYST_BUD
+                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
             )
         }
 
-        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>()
@@ -95,16 +86,12 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             Direction.entries.forEach {
                 if (random.nextFloat() < Cobblemon.config.typeGemGrowthChance) {
                     val faceState = level.getBlockState(pos.relative(it))
-                    var newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
+                    val randomGrowthType = decideClusterGrowthType(level, pos)
+                    val 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)
                     }
@@ -146,7 +133,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 if (!visited.add(clusterPos)) continue
 
                 val clusterState = level.getBlockState(clusterPos)
-                if (clusterState.block == expectedCluster && clusterState.hasProperty(GROWTH_TYPE)) {
+                if (clusterState.block == expectedCluster) {
                     clusters += clusterState to clusterPos
                 }
             }
@@ -154,6 +141,19 @@ 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) {
@@ -169,6 +169,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
 
         if (fullClusterCount == 0) {
             if (gemCount < Cobblemon.config.typeGemMinGrowth && clusters.isNotEmpty()) {
+                println("Force set a cluster to FULL at size $gemCount")
                 val randomCluster = clusters.random()
                 level.setBlockAndUpdate(randomCluster.second, randomCluster.first.setValue(GROWTH_TYPE, GrowthType.FULL))
             }
@@ -191,41 +192,13 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         Direction.entries.forEach { direction ->
             val relativePos = pos.relative(direction)
             val relativeState = level.getBlockState(relativePos)
-            val matchesFace = relativeState.hasProperty(DirectionalBlock.FACING)
-                    && relativeState.getValue(DirectionalBlock.FACING) == direction
-            if (!(forceGrow || (matchesFace && random.nextFloat() < Cobblemon.config.typeGemGrowthChance))) {
-                return@forEach
+            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 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,6 +748,8 @@ 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,6 +10,9 @@ 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
@@ -17,17 +20,27 @@ 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 java.text.DecimalFormat
+import com.cobblemon.mod.common.util.server
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 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,
@@ -38,6 +51,8 @@ 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("#.##")
@@ -50,9 +65,157 @@ 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() {
-        dropTable.entries.forEach {
-            if (it is ItemDropEntry) addEntry(DropWidgetEntry(it))
+        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))
+                    }
+                }
+            }
         }
     }
 
@@ -90,7 +253,7 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
             shadow = true
         )
 
-        if (dropTable.entries.size == 0) {
+        if (dropTable.entries.isEmpty()) {
             drawScaledText(
                 context = context,
                 text = lang("ui.pokedex.info.drops_empty"),
@@ -128,7 +291,7 @@ class DropsScrollingWidget(val pX: Int, val pY: Int): ScrollingWidget<DropsScrol
         return children()[index] as DropWidgetEntry
     }
 
-    class DropWidgetEntry(val entry: ItemDropEntry): Slot<DropWidgetEntry>() {
+    class DropWidgetEntry(val entry: ItemDropEntry, val items: MutableSet<ResourceLocation>, val tag: ResourceLocation? = null): Slot<DropWidgetEntry>() {
         override fun render(
             context: GuiGraphics,
             index: Int,
@@ -141,9 +304,14 @@ 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 itemStack = Minecraft.getInstance().player?.level()?.itemRegistry?.get(entry.item)?.defaultInstance ?: ItemStack.EMPTY
+
+            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
+
             renderScaledGuiItemIcon(
                 itemStack = itemStack,
                 x = x.toDouble(),
@@ -151,28 +319,32 @@ 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
+            }
 
-//            var itemName: String = Component.translatable(itemStack.hoverName).string
-//            itemName = if (itemName.length > 24) {
-//                itemName.substring(0, 24 - 3) + "..."
-//            } else {
-//                itemName
-//            }
+            val displayName = if (tag == null) {
+                itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD)
+            } else {
+                Component.translatable("tag.item.${tag.namespace}.${tag.path.replace('/', '.')}").withStyle(ChatFormatting.BOLD)
+            }
 
             val displayText: MutableComponent = if (entry.quantityRange != null) {
                 lang(
                     "ui.pokedex.info.drops_display",
-                    itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD),
+                    displayName,
                     lang("ui.pokedex.info.drops_range", min, max)
                 )
             } else {
                 lang(
                     "ui.pokedex.info.drops_display",
-                    itemStack.hoverName.copy().withStyle(ChatFormatting.BOLD),
+                    displayName,
                     lang("ui.pokedex.info.drops_amount", entry.quantity)
                 )
             }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt

@@ -15,9 +15,7 @@ import com.cobblemon.mod.common.ModAPI
 import com.cobblemon.mod.common.api.snowstorm.ParticleMaterial
 import com.cobblemon.mod.common.api.snowstorm.ParticleMaterials
 import com.cobblemon.mod.common.api.snowstorm.UVDetails
-import com.cobblemon.mod.common.client.MountedPokemonAnimationRenderController
 import com.cobblemon.mod.common.client.particle.ParticleStorm
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.math.geometry.transformDirection
 import com.cobblemon.mod.common.util.resolveBoolean
 import com.cobblemon.mod.common.util.resolveDouble
@@ -142,19 +140,6 @@ class SnowstormParticle(
            }
         }
 
-        /* Without this, locators will lag behind the animation because particles render before Pokemon.
-         * This is important for particles attached to locators using local position/rotation.
-         *
-         * In the future, we may want to make `MountedPokemonAnimationRenderController` a more
-         * generic utility for bedrock models if we see a case where other non-pokemon models (ie. NPCs)
-         * should emit particles in their animations that utilise local space.
-         */
-        storm.entity?.let {
-            if (storm.effect.space.localPosition && it is PokemonEntity) {
-                MountedPokemonAnimationRenderController.setup(it, tickDelta)
-            }
-        }
-
         applyRandoms()
         setParticleAgeInRuntime()
         storm.effect.curves.forEach { it.apply(runtime) }
@@ -162,16 +147,11 @@ class SnowstormParticle(
 
         val vec3d = camera.position
 
-        // Interpolate because we are often between the ticks where these positions update.
         val interpLocalX = Mth.lerp(tickDelta.toDouble(), prevLocalX, localX)
         val interpLocalY = Mth.lerp(tickDelta.toDouble(), prevLocalY, localY)
         val interpLocalZ = Mth.lerp(tickDelta.toDouble(), prevLocalZ, localZ)
 
-        val pos = if (storm.effect.space.localPosition && storm.effect.space.localRotation) {
-            val vec = Vec3(interpLocalX, interpLocalY, interpLocalZ)
-            val rotated = storm.attachedMatrix.matrix.transformDirection(vec)
-            Vector3d(rotated.x, rotated.y, rotated.z)
-        } else if (storm.effect.space.localRotation) {
+        val pos = if (storm.effect.space.localRotation) {
             val interpRotation = Mth.lerp(tickDelta.toDouble(), 0.0, currentRotation.angle)
             val vec = Vector3d(interpLocalX, interpLocalY, interpLocalZ)
             oldAxisRotation.transform(vec)
@@ -180,11 +160,9 @@ class SnowstormParticle(
             Vector3d(interpLocalX, interpLocalY, interpLocalZ)
         }
 
-        val origin = if (storm.effect.space.localPosition) storm.attachedMatrix.getOrigin() else originPos
-
-        val f = (pos.x + origin.x - vec3d.x()).toFloat()
-        val g = (pos.y + origin.y - vec3d.y()).toFloat()
-        val h = (pos.z + origin.z - vec3d.z()).toFloat()
+        val f = (pos.x + originPos.x - vec3d.x()).toFloat()
+        val g = (pos.y + originPos.y - vec3d.y()).toFloat()
+        val h = (pos.z + originPos.z - vec3d.z()).toFloat()
         val quaternion = storm.effect.particle.cameraMode.getRotation(
             matrixWrapper = matrixWrapper,
             prevAngle = oRoll,
@@ -253,7 +231,7 @@ class SnowstormParticle(
 
     override fun tick() {
         if (storm.effect.space.localPosition) {
-            originPos = storm.attachedMatrix.getOrigin()
+            originPos = matrixWrapper.getOrigin()
         }
 
         applyRandoms()

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

@@ -47,10 +47,6 @@ 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,6 +117,7 @@ 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
@@ -132,6 +133,7 @@ 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
@@ -173,6 +175,7 @@ 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.*
@@ -242,6 +245,12 @@ 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
@@ -2744,9 +2753,4 @@ 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,7 +22,6 @@ 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
@@ -47,15 +46,10 @@ 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?
@@ -361,30 +355,9 @@ 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,7 +9,6 @@
 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
@@ -24,15 +23,10 @@ import net.minecraft.world.level.Level
 class PonigiriItem : Item(
         Properties().stacksTo(64)
                 .food(FoodProperties.Builder()
-                        .nutrition(NUTRITION)
-                        .saturationModifier(SATURATION_MODIFIER)
+                        .nutrition(2)
+                        .saturationModifier(0.55f)
                         .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)
@@ -65,9 +59,4 @@ 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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,37 @@
+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,7 +173,6 @@ class Species : ShowdownIdentifiable {
         .addStandardFunctions()
         .addSpeciesFunctions(this)
 
-    var silenceStepSounds = false
 
     fun initialize() {
         Cobblemon.statProvider.provide(this)
@@ -257,7 +256,6 @@ class Species : ShowdownIdentifiable {
         }
 
         this.riding.encode(buffer)
-        buffer.writeBoolean(this.silenceStepSounds)
     }
 
     fun decode(buffer: RegistryFriendlyByteBuf) {
@@ -301,7 +299,6 @@ 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,6 +71,7 @@ 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

@@ -0,0 +1,20 @@
+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 0..depth) {
-        val bellowBlockPos = blockPosBelowThatAffectsMyMovement.below(currentDepth)
+    for (currentDepth in 1..depth) {
+        val bellowBlockPos = blockPosition().below(currentDepth)
         val blockState = level().getBlockState(bellowBlockPos)
 
-        if (blockState.isAir) continue
+        if (blockState.isAir || !blockState.isCollisionShapeFullBlock(level(), bellowBlockPos)) 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,7 +27,5 @@ 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,12 +456,6 @@
 				"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,12 +1815,6 @@
 				"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": {
@@ -3637,12 +3631,6 @@
 				"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,7 +83,6 @@
 		},
 		"animation.parasect.ground_walk": {
 			"loop": true,
-			"animation_length": 1,
 			"bones": {
 				"body": {
 					"rotation": [0, 0, 0],
@@ -135,12 +134,6 @@
 				"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": {
@@ -265,10 +258,6 @@
 					"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,12 +1682,6 @@
 						"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": {
@@ -2645,12 +2639,6 @@
 				"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": {
@@ -4173,101 +4161,41 @@
 				"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": {
@@ -4895,101 +4823,41 @@
 				"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": {
@@ -5419,20 +5287,14 @@
 					"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]}
 					}
 				}
 			}
@@ -5629,95 +5491,47 @@
 				"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": {
@@ -6424,95 +6238,47 @@
 				"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,10 +391,6 @@
 						"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,16 +1071,6 @@
 				"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": {
@@ -1927,16 +1917,6 @@
 					],
 					"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,12 +329,6 @@
 				"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": {
@@ -813,12 +807,6 @@
 				"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,10 +391,6 @@
 						"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": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0823_corviknight/corviknight.animation.json

@@ -3150,10 +3150,6 @@
 				"locator_seat_2": {
 					"rotation": [45, 0, 0]
 				}
-			},
-			"timeline": {
-				"0.5": "q.run_molang('cobblemon:stepsound_claw_large');",
-				"1.5": "q.run_molang('cobblemon:stepsound_claw_large');"
 			}
 		},
 		"animation.corviknight.ground_run": {
@@ -4477,10 +4473,6 @@
 				"locator_seat_2": {
 					"rotation": [25, 0, 0]
 				}
-			},
-			"timeline": {
-				"0.3333": "q.run_molang('cobblemon:stepsound_claw_large');",
-				"0.8333": "q.run_molang('cobblemon:stepsound_claw_large');"
 			}
 		},
 		"animation.corviknight.air_idle": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0899_wyrdeer/wyrdeer.animation.json

@@ -566,12 +566,6 @@
 						"1.5": [0, 0.2, 0]
 					}
 				}
-			},
-			"timeline": {
-				"0.5417": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"0.7083": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"1.2917": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"1.4583": "q.run_molang('cobblemon:stepsound_hoof_medium');"
 			}
 		},
 		"animation.wyrdeer.sleep": {
@@ -786,27 +780,15 @@
 				"eyelid_right": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"0.5": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.25": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"0.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
-						"0.25": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"0.5": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"0.25": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"0.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"ear_right": {
@@ -1204,36 +1186,18 @@
 					"position": {
 						"0.0": [0, 0, 0],
 						"1.5833": [-0.1, 0, -0.1],
-						"1.6667": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"3.0": {
-							"pre": [0, 0, 0],
-							"post": [-0.1, 0, -0.1]
-						},
-						"3.125": {
-							"pre": [-0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]},
+						"3.125": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"eyelid_left": {
 					"position": {
 						"0.0": [0, 0, 0],
 						"1.5833": [0.1, 0, -0.1],
-						"1.6667": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						},
-						"3.0": {
-							"pre": [0, 0, 0],
-							"post": [0.1, 0, -0.1]
-						},
-						"3.125": {
-							"pre": [0.1, 0, -0.1],
-							"post": [0, 0, 0]
-						}
+						"1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]},
+						"3.0": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]},
+						"3.125": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}
 					}
 				},
 				"tail": {
@@ -2240,16 +2204,6 @@
 						"1.1667": [0, 0, 0]
 					}
 				}
-			},
-			"timeline": {
-				"0.2083": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"0.2917": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"0.375": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"0.4583": "q.run_molang('cobblemon:stepsound_hoof_large');",
-				"0.7917": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"0.875": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"0.9583": "q.run_molang('cobblemon:stepsound_hoof_medium');",
-				"1.0417": "q.run_molang('cobblemon:stepsound_hoof_large');"
 			}
 		},
 		"animation.wyrdeer.ride_jump": {

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -2434,8 +2434,6 @@
   "cobblemon.config.ui.max_pokemon_level.tooltip": "The maximum level Pokémon can get to.",
   "cobblemon.config.ui.max_pokemon_friendship": "Max Pokémon Friendship",
   "cobblemon.config.ui.max_pokemon_friendship.tooltip": "The maximum friendship value.",
-  "cobblemon.config.ui.power_item_ride_stat_gain_interval_seconds": "Power Item Riding Stat Training Interval (Seconds)",
-  "cobblemon.config.ui.power_item_ride_stat_gain_interval_seconds.tooltip": "Seconds between riding stat gains while riding a Pokémon holding a Power item. Defaults to 120 seconds. Set to -1 or 0 to disable; values below -1 are clamped to -1.",
   "cobblemon.config.ui.announce_drop_items": "Announce Drop Items",
   "cobblemon.config.ui.announce_drop_items.tooltip": "Whether to notify the Player of dropped items from defeating wild Pokémon.",
   "cobblemon.config.ui.default_drop_item_method": "Default Drop Item Method",
@@ -3673,6 +3671,12 @@
   "tag.item.cobblemon.terrain_plants": "Terrain Plants",
   "tag.item.cobblemon.tall_flowers": "Tall Flowers",
   "tag.item.cobblemon.small_flowers": "Small Flowers",
+  "tag.item.cobblemon.drops.coral": "Any Coral",
+  "tag.item.cobblemon.drops.dead_coral": "Any Dead Coral",
+  "tag.item.cobblemon.drops.dyes": "Any Dye",
+  "tag.item.cobblemon.drops.ink_sacs": "Any Ink Sac",
+  "tag.item.cobblemon.drops.flowers": "Any Flower",
+  "tag.item.cobblemon.drops.apricorn_sprouts": "Any Apricorn Sprout",
 
   "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_hisuibiome": "Hisuian",
   "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_kalosbiome": "Kalosian",

common/src/main/resources/assets/cobblemon/sounds.json

@@ -1653,18 +1653,6 @@
   "move.horndrill.target_2": {
     "sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_2", "volume": 1.0 } ]
   },
-  "move.gigatonhammer.actor": {
-    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_actor", "volume": 1.0 } ]
-  },
-  "move.gigatonhammer.target": {
-    "sounds": [ { "name": "cobblemon:move/gigatonhammer/gigatonhammer_target", "volume": 1.0 } ]
-  },
-  "move.pyroball.actor": {
-    "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_actor", "volume": 1.0 } ]
-  },
-  "move.pyroball.target": {
-    "sounds": [ { "name": "cobblemon:move/pyroball/pyroball_target", "volume": 1.0 } ]
-  },
   "impact.normal": {
     "sounds": [
       { "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 },
@@ -2043,850 +2031,6 @@
       { "name": "cobblemon:animation/wings/steel_wing_flap_medium_8", "volume": 0.25 }
     ]
   },
-  "stepsound.dirt.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/dirt/standard/large/stepsound_dirt_standard_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.dirt.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/dirt/standard/medium/stepsound_dirt_standard_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.grass.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/grass/standard/large/stepsound_grass_standard_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.grass.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/grass/standard/medium/stepsound_grass_standard_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.stone.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/stone/standard/large/stepsound_stone_standard_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.stone.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/stone/standard/medium/stepsound_stone_standard_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.sand.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/standard/large/stepsound_sand_standard_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.sand.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/standard/medium/stepsound_sand_standard_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.snow.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_1", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_2", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_3", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_4", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_5", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_6", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_7", "volume": 0.18 },
-      { "name": "cobblemon:stepsound/snow/standard/large/stepsound_snow_standard_large_8", "volume": 0.18 }
-    ]
-  },
-  "stepsound.snow.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_1", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_2", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_3", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_4", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_5", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_6", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_7", "volume": 0.08 },
-      { "name": "cobblemon:stepsound/snow/standard/medium/stepsound_snow_standard_medium_8", "volume": 0.08 }
-    ]
-  },
-  "stepsound.wood.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_1", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_2", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_3", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_4", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_5", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_6", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_7", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/standard/large/stepsound_wood_standard_large_8", "volume": 0.25 }
-    ]
-  },
-  "stepsound.wood.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_1", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_2", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_3", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_4", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_5", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_6", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_7", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/standard/medium/stepsound_wood_standard_medium_8", "volume": 0.15 }
-    ]
-  },
-  "stepsound.mud.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/standard/large/stepsound_mud_standard_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.mud.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_1", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_2", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_3", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_4", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_5", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_6", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_7", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/mud/standard/medium/stepsound_mud_standard_medium_8", "volume": 0.14 }
-    ]
-  },
-  "stepsound.glass.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/standard/large/stepsound_glass_standard_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.glass.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/standard/medium/stepsound_glass_standard_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.metal.standard.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/standard/large/stepsound_metal_standard_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.metal.standard.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/standard/medium/stepsound_metal_standard_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.dirt.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_1", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_2", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_3", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_4", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_5", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_6", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_7", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/dirt/hoof/large/stepsound_dirt_hoof_large_8", "volume": 0.25 }
-    ]
-  },
-  "stepsound.dirt.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_1", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_2", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_3", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_4", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_5", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_6", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_7", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/dirt/hoof/medium/stepsound_dirt_hoof_medium_8", "volume": 0.15 }
-    ]
-  },
-  "stepsound.grass.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_1", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_2", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_3", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_4", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_5", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_6", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_7", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/hoof/large/stepsound_grass_hoof_large_8", "volume": 0.25 }
-    ]
-  },
-  "stepsound.grass.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_1", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_2", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_3", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_4", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_5", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_6", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_7", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/grass/hoof/medium/stepsound_grass_hoof_medium_8", "volume": 0.15 }
-    ]
-  },
-
-  "stepsound.stone.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_1", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_2", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_3", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_4", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_5", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_6", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_7", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/stone/hoof/large/stepsound_stone_hoof_large_8", "volume": 0.25 }
-    ]
-  },
-  "stepsound.stone.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_1", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_2", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_3", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_4", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_5", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_6", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_7", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/stone/hoof/medium/stepsound_stone_hoof_medium_8", "volume": 0.15 }
-    ]
-  },
-  "stepsound.sand.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/sand/hoof/large/stepsound_sand_hoof_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.sand.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/sand/hoof/medium/stepsound_sand_hoof_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.snow.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/hoof/large/stepsound_snow_hoof_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.snow.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_1", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_2", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_3", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_4", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_5", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_6", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_7", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/snow/hoof/medium/stepsound_snow_hoof_medium_8", "volume": 0.12 }
-    ]
-  },
-  "stepsound.wood.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_1", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_2", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_3", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_4", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_5", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_6", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_7", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/wood/hoof/large/stepsound_wood_hoof_large_8", "volume": 0.25 }
-    ]
-  },
-  "stepsound.wood.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_1", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_2", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_3", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_4", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_5", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_6", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_7", "volume": 0.15 },
-      { "name": "cobblemon:stepsound/wood/hoof/medium/stepsound_wood_hoof_medium_8", "volume": 0.15 }
-    ]
-  },
-  "stepsound.mud.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/mud/hoof/large/stepsound_mud_hoof_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.mud.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/mud/hoof/medium/stepsound_mud_hoof_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.glass.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/glass/hoof/large/stepsound_glass_hoof_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.glass.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/glass/hoof/medium/stepsound_glass_hoof_medium_8", "volume": 0.1 }
-    ]
-  },
-
-  "stepsound.metal.hoof.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_1", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_2", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_3", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_4", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_5", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_6", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_7", "volume": 0.2 },
-      { "name": "cobblemon:stepsound/metal/hoof/large/stepsound_metal_hoof_large_8", "volume": 0.2 }
-    ]
-  },
-  "stepsound.metal.hoof.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_1", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_2", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_3", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_4", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_5", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_6", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_7", "volume": 0.1 },
-      { "name": "cobblemon:stepsound/metal/hoof/medium/stepsound_metal_hoof_medium_8", "volume": 0.1 }
-    ]
-  },
-  "stepsound.grass.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "step/grass1", "volume": 0.05 },
-      { "name": "step/grass2", "volume": 0.05 },
-      { "name": "step/grass3", "volume": 0.05 },
-      { "name": "step/grass4", "volume": 0.05 },
-      { "name": "step/grass5", "volume": 0.05 },
-      { "name": "step/grass6", "volume": 0.05 }
-    ]
-  },
-  "stepsound.glass.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "step/stone1", "volume": 0.05 },
-      { "name": "step/stone2", "volume": 0.05 },
-      { "name": "step/stone3", "volume": 0.05 },
-      { "name": "step/stone4", "volume": 0.05 },
-      { "name": "step/stone5", "volume": 0.05 },
-      { "name": "step/stone6", "volume": 0.05 }
-    ]
-  },
-  "stepsound.dirt.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "step/gravel1", "volume": 0.05 },
-      { "name": "step/gravel2", "volume": 0.05 },
-      { "name": "step/gravel3", "volume": 0.05 },
-      { "name": "step/gravel4", "volume": 0.05 }
-    ]
-  },
-  "stepsound.mud.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "block/mud/step1", "volume": 0.2 },
-      { "name": "block/mud/step2", "volume": 0.2 },
-      { "name": "block/mud/step3", "volume": 0.2 },
-      { "name": "block/mud/step4", "volume": 0.2 },
-      { "name": "block/mud/step5", "volume": 0.2 },
-      { "name": "block/mud/step6", "volume": 0.2 }
-    ]
-  },
-  "stepsound.stone.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "step/stone1", "volume": 0.08 },
-      { "name": "step/stone2", "volume": 0.08 },
-      { "name": "step/stone3", "volume": 0.08 },
-      { "name": "step/stone4", "volume": 0.08 },
-      { "name": "step/stone5", "volume": 0.08 },
-      { "name": "step/stone6", "volume": 0.08 }
-    ]
-  },
-  "stepsound.wood.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "block/cherry_wood/step1", "volume": 0.2 },
-      { "name": "block/cherry_wood/step2", "volume": 0.2 },
-      { "name": "block/cherry_wood/step3", "volume": 0.2 },
-      { "name": "block/cherry_wood/step4", "volume": 0.2 },
-      { "name": "block/cherry_wood/step5", "volume": 0.2 },
-      { "name": "block/cherry_wood/step6", "volume": 0.2 }
-    ]
-  },
-  "stepsound.metal.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "block/copper/step1", "volume": 0.2 },
-      { "name": "block/copper/step2", "volume": 0.2 },
-      { "name": "block/copper/step3", "volume": 0.2 },
-      { "name": "block/copper/step4", "volume": 0.2 },
-      { "name": "block/copper/step5", "volume": 0.2 },
-      { "name": "block/copper/step6", "volume": 0.2 }
-    ]
-  },
-  "stepsound.sand.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "step/sand1", "volume": 0.08 },
-      { "name": "step/sand2", "volume": 0.08 },
-      { "name": "step/sand3", "volume": 0.08 },
-      { "name": "step/sand4", "volume": 0.08 },
-      { "name": "step/sand5", "volume": 0.08 }
-    ]
-  },
-  "stepsound.snow.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "step/snow1", "volume": 0.08 },
-      { "name": "step/snow2", "volume": 0.08 },
-      { "name": "step/snow3", "volume": 0.08 },
-      { "name": "step/snow4", "volume": 0.08 }
-    ]
-  },
-  "stepsound.amethyst.minecraft": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "block/amethyst/step1", "volume":  0.11 },
-      { "name": "block/amethyst/step2", "volume":  0.11 },
-      { "name": "block/amethyst/step3", "volume":  0.11 },
-      { "name": "block/amethyst/step4", "volume":  0.11 },
-      { "name": "block/amethyst/step5", "volume":  0.11 },
-      { "name": "block/amethyst/step6", "volume":  0.11 },
-      { "name": "block/amethyst/step7", "volume":  0.11 },
-      { "name": "block/amethyst/step8", "volume":  0.11 },
-      { "name": "block/amethyst/step9", "volume":  0.11 },
-      { "name": "block/amethyst/step10", "volume":  0.11 },
-      { "name": "block/amethyst/step11", "volume":  0.11 },
-      { "name": "block/amethyst/step12", "volume":  0.11 },
-      { "name": "block/amethyst/step13", "volume":  0.11 },
-      { "name": "block/amethyst/step14", "volume":  0.11 }
-    ]
-  },
-  "stepsound.grass.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_1", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_2", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_3", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_4", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_5", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_6", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_7", "volume": 0.25 },
-      { "name": "cobblemon:stepsound/grass/claw/large/stepsound_grass_claw_large_8", "volume": 0.25 }
-    ]
-  },
-  "stepsound.grass.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_1", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_2", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_3", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_4", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_5", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_6", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_7", "volume": 0.14 },
-      { "name": "cobblemon:stepsound/grass/claw/medium/stepsound_grass_claw_medium_8", "volume": 0.14 }
-    ]
-  },
-  "stepsound.dirt.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/dirt/claw/large/stepsound_dirt_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.dirt.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/dirt/claw/medium/stepsound_dirt_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.stone.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/stone/claw/large/stepsound_stone_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.stone.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/stone/claw/medium/stepsound_stone_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.sand.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/sand/claw/large/stepsound_sand_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.sand.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/sand/claw/medium/stepsound_sand_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.snow.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/snow/claw/large/stepsound_snow_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.snow.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/snow/claw/medium/stepsound_snow_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.wood.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/wood/claw/large/stepsound_wood_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.wood.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/wood/claw/medium/stepsound_wood_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.mud.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/mud/claw/large/stepsound_mud_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.mud.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/mud/claw/medium/stepsound_mud_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.glass.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/glass/claw/large/stepsound_glass_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.glass.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/glass/claw/medium/stepsound_glass_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-
-  "stepsound.metal.claw.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_1", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_2", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_3", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_4", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_5", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_6", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_7", "volume": 0.22 },
-      { "name": "cobblemon:stepsound/metal/claw/large/stepsound_metal_claw_large_8", "volume": 0.22 }
-    ]
-  },
-  "stepsound.metal.claw.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_1", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_2", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_3", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_4", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_5", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_6", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_7", "volume": 0.11 },
-      { "name": "cobblemon:stepsound/metal/claw/medium/stepsound_metal_claw_medium_8", "volume": 0.11 }
-    ]
-  },
-  "stepsound.leaves.universal.large": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_1", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_2", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_3", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_4", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_5", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_6", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_7", "volume": 0.12 },
-      { "name": "cobblemon:stepsound/leaves/universal/large/stepsound_leaves_universal_large_8", "volume": 0.12 }
-    ]
-  },
-  "stepsound.leaves.universal.medium": {
-    "subtitle": "subtitles.block.generic.footsteps",
-    "sounds": [
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_1", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_2", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_3", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_4", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_5", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_6", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_7", "volume": 0.06 },
-      { "name": "cobblemon:stepsound/leaves/universal/medium/stepsound_leaves_universal_medium_8", "volume": 0.06 }
-    ]
-  },
   "ride.loop.wind.mono": {
     "sounds": [
       {
@@ -8684,9 +7828,6 @@
   "pokemon.cinderace.cry": {
     "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_cry", "volume": 0.8 } ]
   },
-  "pokemon.cinderace.pyroball": {
-    "sounds": [ { "name": "cobblemon:pokemon/cinderace/cinderace_pyroball", "volume": 0.5 } ]
-  },
   "pokemon.sobble.cry": {
     "sounds": [ {  "name": "cobblemon:pokemon/sobble/sobble_cry", "volume": 0.8 } ]
   },