System reworked to be simpler, since a provider is no longer necessary

# Conflicts:
#	common/src/main/resources/assets/cobblemon/lang/en_us.json

CHANGELOG.md

@@ -1,107 +1,175 @@
 # Changelog
-## [1.8.3 (October 25th, 2026)](#1-8-3)
+## [1.8.5 (MONTH xth, 2026)](#1-8-5)
 
 ### Additions
-- Added compatability with AppleSkin.
+- Added trades for Saccharine Saplings, Hearty Grains, Chipped Pot, and Masterpiece Teacup to the Wandering Trader.
+- Added brewing recipe for Throat Spray.
+- Added Berry Tree scanning for Pokedex
+- Added Datapackable Pokedex Scanning for Block Entities
+- Added config options to award experience to fainted Pokémon for opponents they helped defeat (`awardExperienceToFaintedPokemon`) and to still award experience for defeated enemies even after battle loss/forfeit (`awardExperienceOnBattleLoss`)
+- Party Overlay Exp Gained Animation will now display the amount of EXP the Pokémon gained
+- Added a toast to notify players of how they can scroll through their party. Did you know you can hold R and scroll instead of using arrow keys??!
+- Added a new layer property that makes a layer scroll in a direction. "scrolling": {"speedU": 0.1, "speedV": 0.1}
+- Added missing crops to Botany Pots integration
+- Added a way to obtain Porygon by inserting the Upgrade or Dubious Disc into a data monitor
+- Added a new `cobblemon:structure`, which is a feature without any restrictions allowing the Builders to place certain structures in much more specific manner.
+- Added Configs for Infinite Use TMs and Unlocking all TMs
+- Added Type Gem blocks
+- Added Type Gem Clusters
+- Added TMs
+- Added TM Machine
+- Added Deepslate Core Block
+- Added /givetm Command
+- Added advancement triggers for learning TMs: `cobblemon:has_learn_specific_tm` (per-TM), `cobblemon:has_learn_all_tm` (all TMs learned), and `cobblemon:tms_learned` (count-based), backed by a new `totalTMLearnedCount` on player advancement data.
+- Added `cobblemon:catch_alpha_pokemon` advancement trigger and `totalAlphaCaptureCount` tracking for capturing Alpha Pokémon.
+- Added Move Dex to Pokédex
+- Added the Habitat Block, a spawner block for servers and adventure maps that controls spawning in an area.
+- Added Disk Rack for storing disks and being an audio sequencer for Noteblocks
+- Added intrinsic scaling to all mons (+-5%). Some rendering cases, such as shoulder mounting, revert to 1.0 scaling to preserve animation accuracy.
+- Added scaling to "baby" Pokémon (smaller (-20%) at level 1 → normally sized at level 10)
+- Added conditional seats for riding. Seats can be gated by molang such as "is_alpha".
+- Added Alpha Pokémon
+    - Added alpha scaling (alphas are larger than their normal counterparts)
+    - Alphas will always lead herds and will spawn in herds
+    - Alphas spawn with two random TM moves from their learnset
+    - Alpha Pokémon will always defend themselves from players that attack them
+    - Added alpha level matching and stat boost (based on level)
+    - Added pitch-down and reverb to alpha cries
+    - Added alpha Pokémon bait effect
+    - Added alpha eye rendering including eye overlay, bloom, eye trail, and particles.
+- Added cobweb block slowness immunity for spider Pokémon
+- Added 49 new habitat structures. 34 as typical Minecraft structures and 15 as structures that get placed as biome features to allow for more natural placement in generation. Structures placed as biome features will not be able to be located with the `/locate structure` command.
+- Vanilla village house template pools have been adjusted to account for the new abandoned village structure habitat. Weights have changed within the JSON file for every piece to ensure too many habitats don't generate in a single village.
+- Added 10 new ruin structures.
+- rooted_arch_ruins & crumbling_arch_ruins have been transferred over to biome features, allowing for better placement in generation.
+- All ruin structures that did not generate with a gimmighoul/gilded chest before will now generate with one.
+- All ruin structures gilded chest loot tables have been updated to include a guaranteed TM not learned naturally by any Pokémon through their level-up moveset. Each ruin gets its own specific TM, so you can now go hunting ruins to complete your move dex!
+- All fossil structures have been transferred over to biome features, allowing for better placement in generation.
+- The prehistoric_underwater_fissure & prehistoric_submerged_impact fossil structures now use the biome tag `#cobblemon:is_temperate_ocean`.
+- A new Biome tag called `#cobblemon:is_stony_beach` has been added.
+- Gimmighoul towers now generate at ground level rather than sinking one block into the ground.
+- 1 New shipwreck cove structure called the "magma_shipwreck_cove" has been added.
+- Shipwreck coves now generate slightly more frequently.
+- Added equipment loot tables for shipwreck cove enemies.
+- Maps from abandoned fishing boats leading to shipwreck coves now will skip explored chunks, allowing the player to find more shipwreck coves easier.
+- The lush shipwreck cove's phantom mob spawner has been replaced with breezes.
+- The lush shipwreck cove structure itself has been slightly cleaned up to be less noisy with the blocks it is built out of.
+- All shipwreck coves' spawners have been adjusted to give compatible mobs enchanted iron or diamond armour and weapons while in its ominous state. The armour given to the mobs will also use the automaton trim. We upped the difficulty because it was too easy now that your Pokémon can fight for you.
+- One TM of the elemental hyper beams has been added as guaranteed loot to the main treasure chest in every shipwreck cove. (Magma cove gets blast burn, lush cove gets frenzy plant, and submerged cove gets hydro cannon)
+- Added 7 new advancements
 
-### New Rideable Pokémon
-- Vikavolt
-- Fearow
+### New rideable Pokémon
+- Drampa
+- Archeops
 
-### Particles
-## New Move Animations
-- Water Shuriken
-
-### Cries added/updated for the following Pokémon
-- Hoppip
-- Skiploom
-- Jumpluff
-- Houndour
-- Houndoom
+### Pokémon Added
+- Pancham (+ Cosmetic with Black Glasses)
+- Pangoro (+ Cosmetic with Black Glasses)
+- Skitty
+- Delcatty
 - Wurmple
 - Silcoon
 - Beautifly
 - Cascoon
 - Dustox
-- Surskit
-- Masquerain
-- Torkoal
-- Starly
-- Staravia
-- Staraptor
-- Combee
-- Vespiquen
-- Dusknoir
-- Helioptile
-- Heliolisk
-- Grubbin
-- Charjabug
-- Vikavolt
-- Applin (updated)
-- Flapple (updated)
+- Audino
+- Rockruff
+- Lycanroc
+- Snom
+- Frosmoth
+- Applin
+- Flapple
 - Appletun
-- Runerigus
 - Dipplin
+- Hydrapple
+- Sandshrew (Alolan)
+- Sandslash (Alolan)
+- Seviper
+- Zangoose
+- Stunky
+- Skuntank
+- Pawniard
+- Bisharp
+- Kingambit
+
+### Model updates for the following Pokémon
+- Goomy
+- Sliggoo
+- Goodra
+- Porygon
+- Porygon2
+- Porygon-Z
+- Zubat
+- Golbat
+- Crobat
+- Pidgey
+- Pidgeotto
+- Pidgeot
+- Sandslash
+- Nidoking
+- Sableye
+- Mawile
+- Nacli
+- Naclestack
+- Garganacl
+- Skarmory
 
 ### Animation updates for the following Pokémon
-- Vikavolt
-- Magby
-- Magmar
-- Ninetales (+ Alolan)
-- Spearow
-- Fearow
-- Squawkabilly
-- Mudkip
-- Marshtomp
-- Swampert
+- Drampa
+- Archeops
+- Skarmory
+- Riolu
+- Lucario
+- Shellos
+- Skitty
+- Joltik
+- Purrloin
+- Liepard
+- Flygon
+
+#### Added sounds to the following moves
+- Absorb
+- Aurora Beam
+- Double Team
+- Fire Punch
+- Fire Spin
+- Flame Charge
+- Flame Wheel
+- Giga Drain
+- Ice Punch
+- Leech Life
+- Magical Leaf
+- Mega Drain
+- Minimize
+- Poison Gas
+- Rock Throw
+- Scary Face
+- Seed bomb
+- Smokescreen
+- String Shot
+- Tail Whip
+- 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
-- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy.
-- Moved EXP Candies from the Medicine recipe book category to the Misc category.
-- Removed Dynamic Lights data from the Magmarizer item for consistency with the block.
-- Added `doPokemonPredation` game rule, which controls aggressiveness of Pokémon with the `hate_entity` brain task defined.
-- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found in `hate_entity` brain tasks.
-- Prehistoric Eroded Pillar generates slightly more frequently.
-- Togekiss was changed from a jet-style mount to bird-style.
+- 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
 
 ### Fixes
-- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
-- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
-- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
-- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
-- Fixed some display names in the Pokédex evolution tree having unintended font colours.
-- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
-- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
-- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
-- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion.
-- Fixed friendship booster items not being recognised as such.
-- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot).
-- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event.
-- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands.
-- Fixed MoLang that's targeting players intermittedly failing when they have died, requiring them to relog.
-- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots.
-- Fixed party overlay not hiding when the player opens the Pokédex scanner.
-- Fixed `hate_entity` task focusing on its own entity, therefore enabling deadly warfare between Zangoose and Seviper.
-- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now actually generate (oops).
-- Fixed Frogadier floating in its `battle_idle` animation.
-- Fixed absence or incorrect mergers in spawning conditions, causing the max height/depth of conditions to use the min value instead.
-- Added stricter riding checks on server side to prevent possible packet forgery when a player tries to ride Pokémon.
-- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures.
-- Fixed Archeops T-posing during its `air_cry` animation.
+- Fixed Ponigiri food values for AppleSkin integration
+- Fixed errors emitted by typos in Parched Peat bog structure files
 
 ### Developer
-- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation.
-- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end).
-- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead.
-  - It is now tied much closer to the actual entity rather than the player or their connection.
 
 ### Molang & Datapacks
-- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`).
-- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as the target parameter.
-- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target.
+- `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.
+
+### Particles
 
 ### Localization
 - Updated translations for:
-  - Russian
-  - Japanese
-  - Brazilian Portuguese

changelogs/CHANGELOG-1.8.3.md

@@ -0,0 +1,107 @@
+# Changelog
+## [1.8.3 (October 25th, 2026)](#1-8-3)
+
+### Additions
+- Added compatability with AppleSkin.
+
+### New Rideable Pokémon
+- Vikavolt
+- Fearow
+
+### Particles
+## New Move Animations
+- Water Shuriken
+
+### Cries added/updated for the following Pokémon
+- Hoppip
+- Skiploom
+- Jumpluff
+- Houndour
+- Houndoom
+- Wurmple
+- Silcoon
+- Beautifly
+- Cascoon
+- Dustox
+- Surskit
+- Masquerain
+- Torkoal
+- Starly
+- Staravia
+- Staraptor
+- Combee
+- Vespiquen
+- Dusknoir
+- Helioptile
+- Heliolisk
+- Grubbin
+- Charjabug
+- Vikavolt
+- Applin (updated)
+- Flapple (updated)
+- Appletun
+- Runerigus
+- Dipplin
+
+### Animation updates for the following Pokémon
+- Vikavolt
+- Magby
+- Magmar
+- Ninetales (+ Alolan)
+- Spearow
+- Fearow
+- Squawkabilly
+- Mudkip
+- Marshtomp
+- Swampert
+
+### Changes
+- Changed the Misc icon in the Campfire Pot Recipe Book to Health Candy.
+- Moved EXP Candies from the Medicine recipe book category to the Misc category.
+- Removed Dynamic Lights data from the Magmarizer item for consistency with the block.
+- Added `doPokemonPredation` game rule, which controls aggressiveness of Pokémon with the `hate_entity` brain task defined.
+- Added `predation_chance` server config value, which controls the possibility of attacking the hated entity found in `hate_entity` brain tasks.
+- Prehistoric Eroded Pillar generates slightly more frequently.
+- Togekiss was changed from a jet-style mount to bird-style.
+
+### Fixes
+- Fixed datapacks with item interaction evolutions that don't specify an item crashing the world on load.
+- Fixed the Pokédex evolution tree crashing when a datapack's dex entry is missing an evolution's form.
+- Fixed the Pokédex evolution tree crashing with a stack overflow on evolutions that loop back on themselves.
+- Fixed the Pokédex evolution tree crashing when looking at a dex that is not part of the "National Dex" aggregate.
+- Fixed some display names in the Pokédex evolution tree having unintended font colours.
+- Fixed evolution trees not building properly when a Pokémon has several Pokédex entries for different regions.
+- Fixed form-changing evolutions sometimes resolving to the source form in the Pokédex evolution tree.
+- Broken datapack evolutions are now logged and skipped in the Pokédex evolution tree instead of crashing.
+- Fixed the `alpha` property having no tab completion in commands such as `/pokespawn`, `/pokegive` and `/pokeedit`, and added the missing `dmax_level`, `gmax_factor` and `tradable` aliases to tab completion.
+- Fixed friendship booster items not being recognised as such.
+- Fixed conflicts with other mods that would make use of recipe books in certain ways (Farmer's Delight Cooking Pot).
+- Fixed Pokémon battles stalling when a sidemod cancels the `THROWN_POKEBALL_HIT` hit event.
+- Fixed choice feature tab completion in `spawnpokemon/pokegive/pokeedit` commands.
+- Fixed MoLang that's targeting players intermittedly failing when they have died, requiring them to relog.
+- Fixed a NeoForge bug where none of the Cobblemon plants/berries could be placed into pots.
+- Fixed party overlay not hiding when the player opens the Pokédex scanner.
+- Fixed `hate_entity` task focusing on its own entity, therefore enabling deadly warfare between Zangoose and Seviper.
+- Prehistoric Frozen Pond, Prehistoric Frozen Spike, and Prehistoric Lush Den now actually generate (oops).
+- Fixed Frogadier floating in its `battle_idle` animation.
+- Fixed absence or incorrect mergers in spawning conditions, causing the max height/depth of conditions to use the min value instead.
+- Added stricter riding checks on server side to prevent possible packet forgery when a player tries to ride Pokémon.
+- Fixed Pokémon cries and animation sounds played from GUIs, such as the starter selection screen and the Pokédex, being tied to the Master volume slider instead of Friendly Creatures.
+- Fixed Archeops T-posing during its `air_cry` animation.
+
+### Developer
+- Bumped NeoForge to `21.1.195` to get access to MixinExtras `0.5` and the expressions annotation.
+- New Platform Event `PLAYER_RESPAWN` which is fired when a player respawns (either through death or returning from the end).
+- Platform Events `SERVER_PLAYER_TICK_PRE` and `SERVER_PLAYER_TICK_POST` no longer fire when the player is dead.
+  - It is now tied much closer to the actual entity rather than the player or their connection.
+
+### Molang & Datapacks
+- Fixed `q.pokemon.nature` returning class instance instead of proper string value (`cobblemon:adamant`).
+- Fixed `q.entity.is_looking_at` result being always `1` for whatever entity passed as the target parameter.
+- Added hate chance optional parameter to `hate_entity` task. `1.0` will make an entity always attack the target.
+
+### Localization
+- Updated translations for:
+  - Russian
+  - Japanese
+  - Brazilian Portuguese

changelogs/CHANGELOG-1.8.4.md

@@ -0,0 +1,25 @@
+# Changelog
+## [1.8.4 (October 27th, 2026)](#1-8-4)
+
+### Changes
+- The Froakie line now blinks. The world will never be the same.
+
+### Fixes
+- Fixed heaps of spawns not working. This was caused by us missing something before release. RIP.
+- Fixed a crash caused by Fearow blinking while you're riding one. Makes sense to me.
+- Fixed Minior's "Shields Down" ability being very broken.
+- Fixed Dusclops using Squirtle's cry sound (lol).
+- Fixed blank Cooking Pot recipe book entries and missing tabs on Fabric.
+- Fixed a hitbox issue with placeable Orb held items attached to a ceiling.
+- Fixed something sneaky. I'll tell you about it later.
+
+### Molang & Datapacks
+- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
+
+### Particles
+- Updated Water Shuriken effect to be timed better when the opponent faints.
+
+### Localization
+- Updated translations for:
+  - Korean
+  - Simplified Chinese

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

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

common/src/main/java/com/cobblemon/mod/common/mixin/client/ClientRecipeBookMixin.java

@@ -69,7 +69,7 @@ public abstract class ClientRecipeBookMixin {
                     value = "INVOKE",
                     target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;"
             ))
-    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(name = "map2") Map<RecipeBookCategories, List<RecipeCollection>> map2) {
+    private void addCustomAggregateCategories(Iterable<RecipeHolder<?>> recipes, RegistryAccess registryAccess, CallbackInfo ci, @Local(ordinal = 1) Map<RecipeBookCategories, List<RecipeCollection>> map2) {
         CobblemonRecipeCategories.Companion.getCustomAggregateCategories().forEach((recipeBookCategories, list) -> map2.put(recipeBookCategories, (List) list.stream().flatMap((recipeBookCategoriesx) -> ((List) map2.getOrDefault(recipeBookCategoriesx, ImmutableList.of())).stream()).collect(ImmutableList.toImmutableList())));
     }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/client/RecipeBookComponentMixin.java

@@ -20,14 +20,14 @@ import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(RecipeBookComponent.class)
 public class RecipeBookComponentMixin {
-    @Definition(id = "recipeBookCategories", local = @Local(name = "recipeBookCategories"))
+    @Definition(id = "recipeBookCategories", local = @Local(type = RecipeBookCategories.class))
     @Definition(id = "FURNACE_SEARCH", field = "Lnet/minecraft/client/RecipeBookCategories;FURNACE_SEARCH:Lnet/minecraft/client/RecipeBookCategories;")
     @Expression("recipeBookCategories != FURNACE_SEARCH")
     @ModifyExpressionValue(
             method = "updateTabs",
             at = @At(value = "MIXINEXTRAS:EXPRESSION")
     )
-    private boolean notCookingPotSearch(boolean original, @Local(name = "recipeBookCategories") RecipeBookCategories recipeBookCategories) {
+    private boolean notCookingPotSearch(boolean original, @Local RecipeBookCategories recipeBookCategories) {
         return original && recipeBookCategories != CobblemonRecipeCategories.COOKING_POT_SEARCH.toVanillaCategory();
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -239,6 +239,10 @@ open class PokemonBattle(
     }
 
     fun writeShowdownAction(vararg messages: String) {
+        if (messages.any { it.contains("\n") || it.contains("\r") }) {
+            LOGGER.warn("Refusing to forward Showdown action with an embedded line break for battle {}: {}", battleId, messages.joinToString(" | "))
+            return
+        }
         log(messages.joinToString("\n"))
         ShowdownService.service.send(battleId, messages.toList().toTypedArray())
     }

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

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

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/Spawner.kt

@@ -198,7 +198,17 @@ interface Spawner {
         val mid = chunk.getBlockState(startPos)
         val above = chunk.getBlockState(abovePos)
 
-        return above.isPathfindable(PathComputationType.AIR) && mid.isAir
+        // Above must be non-solid
+        if (!above.isPathfindable(PathComputationType.AIR)) {
+            return false
+        }
+
+        // Position must be non-air
+        if (mid.isAir) {
+            return false
+        }
+
+        return true
     }
 
     fun constrainArea(area: SpawningZoneInput): SpawningZoneInput? {

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownActionRequest.kt

@@ -117,6 +117,9 @@ abstract class ShowdownActionResponse(val type: ShowdownActionResponseType) {
 
 data class MoveActionResponse(var moveName: String, var targetPnx: String? = null, var gimmickID: String? = null): ShowdownActionResponse(ShowdownActionResponseType.MOVE) {
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
+        // Ensure that the gimmick ID the player is sending is valid
+        gimmickID?.let { if (it !in VALID_GIMMICK_IDS) return false }
+
         if (forceSwitch || showdownMoveSet == null) {
             return false
         }
@@ -168,6 +171,10 @@ data class MoveActionResponse(var moveName: String, var targetPnx: String? = nul
         gimmickID = buffer.readNullable { buffer.readString() }
         return this
     }
+
+    companion object {
+        private val VALID_GIMMICK_IDS = ShowdownMoveset.Gimmick.entries.map { it.id }.toSet()
+    }
 }
 
 data class HealItemActionResponse(var item: String) : ShowdownActionResponse(ShowdownActionResponseType.FORCE_PASS) {
@@ -183,7 +190,8 @@ data class HealItemActionResponse(var item: String) : ShowdownActionResponse(Sho
     }
 
     override fun isValid(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?, forceSwitch: Boolean): Boolean {
-        return !forceSwitch
+        // Previously checked for !forceSwitch, excepts in the case of a forceSwitch, this couldn't legally be sent anyway.
+        return false
     }
 
     override fun toShowdownString(activeBattlePokemon: ActiveBattlePokemon, showdownMoveSet: ShowdownMoveset?): String {

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt

@@ -37,7 +37,6 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.cobblemonResource
 import java.util.concurrent.CompletableFuture
-import net.minecraft.world.entity.LivingEntity
 
 /**
  * Format: |move|POKEMON|MOVE|TARGET
@@ -77,7 +76,7 @@ class MoveInstruction(
             val pokemonName = userPokemon.getName()
             ShowdownInterpreter.lastCauser[battle.battleId] = message
             // For Spread targets the message data only gives the pnx strings. So we can't know what pokemon are actually targeted until the previous messages have been interpreted
-            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull() { poke -> poke.getPNX() == it }?.battlePokemon }
+            val spreadTargetPokemon = spreadTargets.map { battle.activePokemon.firstOrNull { poke -> poke.getPNX() == it }?.battlePokemon }
 
             val targetPokemonEntity = targetPokemon?.entity
             if (targetPokemonEntity != null) {
@@ -137,10 +136,20 @@ class MoveInstruction(
 
             val subsequentInstructions = instructionSet.findInstructionsCausedBy(this)
             val missedTargets = subsequentInstructions.filterIsInstance<MissInstruction>().mapNotNull { it.target }
+            val faintedTargets = subsequentInstructions.filterIsInstance<FaintInstruction>().map { it.faintingPokemon }
             val failed = subsequentInstructions.any { it is FailInstruction }
             val failedTargets = subsequentInstructions.filterIsInstance<FailInstruction>().mapNotNull { it.target }
             val hitCountInstruction = subsequentInstructions.filterIsInstance<HitCountInstruction>().firstOrNull()
 
+            runtime.environment.query.addFunction("target_fainted") { params ->
+                if (params.params.size == 0) {
+                    return@addFunction DoubleValue(faintedTargets.isNotEmpty())
+                } else {
+                    val entityUUID = params.getString(0)
+                    return@addFunction DoubleValue(faintedTargets.any { it.entity?.stringUUID == entityUUID })
+                }
+            }
+
             runtime.environment.query.addFunction("missed") { params ->
                 if (params.params.size == 0) {
                     return@addFunction DoubleValue(missedTargets.isNotEmpty())

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

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

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

@@ -30,7 +30,7 @@ class OrbBlock(properties: Properties) : SixFaceRotationalBlock(properties) {
 
         val FLOOR_NORTH = Shapes.box(0.3125, 0.0, 0.3125, 0.6875, 0.375, 0.6875)
         val WALL_NORTH = Shapes.box(0.3125, 0.3125, 0.625, 0.6875, 0.6875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.375, 0.6875, 1.0, 0.6875)
+        val CEILING_NORTH = Shapes.box(0.3125, 0.625, 0.3125, 0.6875, 1.0, 0.6875)
     }
 
     init {

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

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

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

@@ -51,10 +51,20 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 ResourceLocation.parse("cobblemon:dragon_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DRAGON,
                 ResourceLocation.parse("cobblemon:dark_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_DARK,
                 ResourceLocation.parse("cobblemon:steel_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_STEEL,
-                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY
+                ResourceLocation.parse("cobblemon:fairy_gem_block") to CobblemonBlocks.TYPE_GEM_CLUSTER_FAIRY,
+                ResourceLocation.parse("minecraft:amethyst_block") to Blocks.SMALL_AMETHYST_BUD
             )
         }
 
+        val AMETHYST_STAGES = listOf(
+            Blocks.SMALL_AMETHYST_BUD,
+            Blocks.MEDIUM_AMETHYST_BUD,
+            Blocks.LARGE_AMETHYST_BUD,
+            Blocks.AMETHYST_CLUSTER
+        )
+
+        private fun isAmethystStage(block: Block) = block in AMETHYST_STAGES
+
         fun getConnectedGemBlocks(level: BlockGetter, pos: BlockPos): List<Pair<BlockState, BlockPos>> {
             val connectedGems = mutableListOf<Pair<BlockState, BlockPos>>()
             val visited = mutableSetOf<BlockPos>()
@@ -85,12 +95,16 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
             Direction.entries.forEach {
                 if (random.nextFloat() < Cobblemon.config.typeGemGrowthChance) {
                     val faceState = level.getBlockState(pos.relative(it))
-                    val randomGrowthType = decideClusterGrowthType(level, pos)
-                    val newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
+                    var newState = BLOCK_TO_CLUSTER[BuiltInRegistries.BLOCK.getKey(state.block)]?.defaultBlockState()
                         ?.setValue(DirectionalBlock.FACING, it)
-                        ?.setValue(GROWTH_TYPE, randomGrowthType)
                         ?: return
 
+                    if (newState.hasProperty(GROWTH_TYPE)) {
+                        newState = newState.setValue(GROWTH_TYPE, decideClusterGrowthType(level, pos))
+                    } else if (getConnectedGemBlocks(level, pos).size > Cobblemon.config.typeGemMaxConnected) {
+                        return@forEach
+                    }
+
                     if (faceState.`is`(Blocks.AIR)) {
                         level.setBlock(pos.relative(it), newState, 3)
                     }
@@ -132,7 +146,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
                 if (!visited.add(clusterPos)) continue
 
                 val clusterState = level.getBlockState(clusterPos)
-                if (clusterState.block == expectedCluster) {
+                if (clusterState.block == expectedCluster && clusterState.hasProperty(GROWTH_TYPE)) {
                     clusters += clusterState to clusterPos
                 }
             }
@@ -178,13 +192,41 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
         Direction.entries.forEach { direction ->
             val relativePos = pos.relative(direction)
             val relativeState = level.getBlockState(relativePos)
-            val clusterBlock = relativeState.block as? TypeGemClusterBlock ?: return@forEach
-
-            if ((relativeState.getValue(DirectionalBlock.FACING) == direction &&
-                random.nextFloat() < Cobblemon.config.typeGemGrowthChance) || forceGrow
-                ) {
-                clusterBlock.advanceGrowth(relativeState, level, relativePos, random)
+            val matchesFace = relativeState.hasProperty(DirectionalBlock.FACING)
+                    && relativeState.getValue(DirectionalBlock.FACING) == direction
+            if (!(forceGrow || (matchesFace && random.nextFloat() < Cobblemon.config.typeGemGrowthChance))) {
+                return@forEach
             }
+
+            val block = relativeState.block
+            if (block is TypeGemClusterBlock) {
+                block.advanceGrowth(relativeState, level, relativePos, random)
+            } else if (isAmethystStage(block)) {
+                advanceAmethyst(relativeState, level, relativePos)
+            }
+        }
+    }
+
+    private fun advanceAmethyst(state: BlockState, level: LevelAccessor, pos: BlockPos) {
+        val facing = state.getValue(DirectionalBlock.FACING)
+        val supportState = level.getBlockState(pos.relative(facing.opposite))
+        if (!supportState.`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS) && supportState.block != CobblemonBlocks.TYPE_GEM_CORE) {
+            return
+        }
+
+        if (state.block != Blocks.AMETHYST_CLUSTER) {
+            val nextStage = AMETHYST_STAGES[AMETHYST_STAGES.indexOf(state.block) + 1]
+            level.setBlock(pos, nextStage.defaultBlockState().setValue(DirectionalBlock.FACING, facing), 3)
+            return
+        }
+
+        // Fully grown clusters mature into amethyst blocks unless boxed in, mirroring stunted type gems
+        val boxedIn = Direction.entries.any { direction ->
+            direction != facing.opposite
+                    && level.getBlockState(pos.relative(direction)).`is`(CobblemonBlockTags.TYPE_GEM_BLOCKS)
+        }
+        if (!boxedIn) {
+            level.setBlock(pos, Blocks.AMETHYST_BLOCK.defaultBlockState(), 3)
         }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/BerryBlockEntity.kt

@@ -15,13 +15,19 @@ import com.cobblemon.mod.common.api.berry.GrowthPoint
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.berry.BerryHarvestEvent
 import com.cobblemon.mod.common.api.mulch.MulchVariant
+import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.block.BerryBlock
+import com.cobblemon.mod.common.pokedex.scanner.BlockScanData
+import com.cobblemon.mod.common.pokedex.scanner.Frame
+import com.cobblemon.mod.common.pokedex.scanner.ScannableBlockEntity
+import com.cobblemon.mod.common.util.lang
 import net.minecraft.ResourceLocationException
 import net.minecraft.core.BlockPos
 import net.minecraft.core.HolderLookup
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
 import net.minecraft.nbt.StringTag
+import net.minecraft.network.chat.Component
 import net.minecraft.network.protocol.Packet
 import net.minecraft.network.protocol.game.ClientGamePacketListener
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
@@ -35,11 +41,10 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.CropBlock.UPDATE_CLIENTS
 import net.minecraft.world.level.block.entity.BlockEntity
-import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.gameevent.GameEvent
 
-class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.BERRY, pos, state) {
+class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.BERRY, pos, state), ScannableBlockEntity {
     lateinit var berryIdentifier: ResourceLocation
     private val ticksPerMinute = 1200
     var renderState: RenderState? = null
@@ -375,6 +380,22 @@ class BerryBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobblemon
         return stageTimer <= 0
     }
 
+    override fun resolveBlockScan(): BlockScanData {
+        val berryName = berry()?.item()?.let { ItemStack(it).hoverName.copy() }
+            ?: berryIdentifier.toString().text()
+
+        val frames = mutableSetOf<Frame>(
+            Frame(1, lang("ui.pokedex.scan.berry.stage", blockState.getValue(BerryBlock.AGE))),
+            Frame(2, berryName)
+        )
+
+        if (mulchVariant != MulchVariant.NONE) {
+            frames.add(Frame(3, Component.translatable("item.cobblemon.${mulchVariant.serializedName}_mulch")))
+        }
+
+        return BlockScanData(frames)
+    }
+
     //Using a similar approach to ComputerCraft, implement this client side
     interface RenderState : AutoCloseable {
         var needsRebuild: Boolean

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

@@ -19,11 +19,16 @@ import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_HEIG
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUIConstants.BASE_WIDTH
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.pokedex.scanner.BlockScanData
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext
+import com.cobblemon.mod.common.pokedex.scanner.ScannableBlockEntity
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.pokemon.PokemonSizeCategory
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.network.chat.Component
+import net.minecraft.world.level.block.entity.BlockEntity
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.DeltaTracker
@@ -82,13 +87,45 @@ class PokedexScannerRenderer {
         fun infoFrameResource(isLeft: Boolean, tier: Int): ResourceLocation = cobblemonResource("textures/gui/pokedex/scan/scan_info_frame_${if (isLeft) "left" else "right"}_$tier.png")
     }
 
+    private var lastFocusedBlockTypeId: ResourceLocation? = null
+
+    private fun getBlockEntityInfo(entity: BlockEntity): BlockScanData? {
+        val scannable = entity as? ScannableBlockEntity ?: return null
+        return scannable.resolveBlockScan()
+    }
+
     fun renderInfoFrames(graphics: GuiGraphics, poseStack: PoseStack, usageContext: PokedexUsageContext, centerX: Int, centerY: Int, opacity: Float) {
         if (usageContext.focusIntervals > 0) {
             var infoDisplayedCounter = 0
             usageContext.availableInfoFrames.forEachIndexed {index, isLeftSide ->
                 if (isLeftSide !== null) {
-                    if (infoDisplayedCounter > 2 && !usageContext.isPokemonInFocusOwned) return@forEachIndexed
+                    val isPokemonFocus = usageContext.scannableEntityInFocus != null
+                    if (isPokemonFocus && infoDisplayedCounter > 1 && !usageContext.isPokemonInFocusOwned) return@forEachIndexed
                     infoDisplayedCounter++
+
+                    val blockEntityInFocus: BlockEntity? = usageContext.blockEntityInFocus
+                    val pokedexEntityData = usageContext.scannableEntityInFocus?.resolvePokemonScan()
+
+                    // store the block entity typeId so our close animation knows what to show
+                    if (pokedexEntityData != null) {
+                        lastFocusedBlockTypeId = null
+                    } else if (blockEntityInFocus != null) {
+                        lastFocusedBlockTypeId = BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(blockEntityInFocus.type)
+                    } else if (usageContext.focusIntervals <= 0f) {
+                        lastFocusedBlockTypeId = null
+                    }
+
+                    val scanInfo = blockEntityInFocus?.let { getBlockEntityInfo(it) }
+
+                    // if a block entity is being focused on make sure we only show the frames needed
+                    if (pokedexEntityData == null && scanInfo != null) {
+                        val hasFrameForSlot = scanInfo.frames.any { it.slot == infoDisplayedCounter }
+                        if (!hasFrameForSlot) {
+                            return@forEachIndexed
+                        }
+                    }
+
+
                     // Frames
                     val isInnerFrame = index == 1 || index == 2
                     val frameHeight = if (isInnerFrame) INNER_INFO_FRAME_HEIGHT else OUTER_INFO_FRAME_HEIGHT
@@ -110,77 +147,79 @@ class PokedexScannerRenderer {
                     val yOffsetText = when(index) { 0 -> 5; 1 -> 4; 2 -> 8; 3 -> 42; else -> 0 }
 
                     // Text
-                    if (usageContext.focusIntervals == PokedexUsageContext.FOCUS_INTERVALS && usageContext.scannableEntityInFocus != null) {
-                        val pokedexEntityData = usageContext.scannableEntityInFocus?.resolvePokemonScan() ?: return
-
-                        if (infoDisplayedCounter == 1) {
-                            drawScaledText(
-                                context = graphics,
-                                font = CobblemonResources.DEFAULT_LARGE,
-                                text = lang("ui.lv.number", pokedexEntityData.pokemon.level).bold(),
-                                x = centerX + xOffset + xOffsetText,
-                                y = centerY + yOffset + yOffsetText,
-                                shadow = true,
-                                centered = true
-                            )
-                        }
-
-                        if (infoDisplayedCounter == 2) {
-                            val hasTrainer = (usageContext.scannableEntityInFocus?.resolveEntityScan() as? PokemonEntity)?.ownerUUID !== null
-                            val speciesName = pokedexEntityData.getApparentSpecies().translatedName.bold()
-                            var yOffsetName = if (hasTrainer) 2 else 0
-                            if (hasTrainer) {
-                                drawScaledText(
-                                    context = graphics,
-                                    text = lang("ui.pokedex.scan.trainer_owned"),
-                                    x = centerX + xOffset + xOffsetText,
-                                    y = centerY + yOffset + yOffsetText - yOffsetName,
-                                    shadow = true,
-                                    centered = true,
-                                    scale = 0.5F
-                                )
-                            }
-                            drawScaledText(
-                                context = graphics,
-                                font = CobblemonResources.DEFAULT_LARGE,
-                                text = speciesName,
-                                x = centerX + xOffset + xOffsetText,
-                                y = centerY + yOffset + yOffsetText + yOffsetName,
-                                shadow = true,
-                                centered = true
-                            )
-
-                            val gender = pokedexEntityData.pokemon.gender
-                            val speciesNameWidth = Minecraft.getInstance().font.width(speciesName.font(CobblemonResources.DEFAULT_LARGE))
-                            if (gender != Gender.GENDERLESS) {
-                                val isMale = gender == Gender.MALE
-                                val textSymbol = if (isMale) "♂".text().bold() else "♀".text().bold()
+                    if (usageContext.focusIntervals == PokedexUsageContext.FOCUS_INTERVALS && (pokedexEntityData != null || blockEntityInFocus != null)) {
+                        if (pokedexEntityData != null) {
+                            if (infoDisplayedCounter == 1) {
                                 drawScaledText(
                                     context = graphics,
                                     font = CobblemonResources.DEFAULT_LARGE,
-                                    text = textSymbol,
-                                    x = centerX + xOffset + xOffsetText + 2 + (speciesNameWidth / 2),
+                                    text = lang("ui.lv.number", pokedexEntityData.pokemon.level).bold(),
+                                    x = centerX + xOffset + xOffsetText,
+                                    y = centerY + yOffset + yOffsetText,
+                                    shadow = true,
+                                    centered = true
+                                )
+                            }
+
+                            if (infoDisplayedCounter == 2) {
+                                val hasTrainer =
+                                    (usageContext.scannableEntityInFocus?.resolveEntityScan() as? PokemonEntity)?.ownerUUID !== null
+                                val speciesName = pokedexEntityData.getApparentSpecies().translatedName.bold()
+                                var yOffsetName = if (hasTrainer) 2 else 0
+                                if (hasTrainer) {
+                                    drawScaledText(
+                                        context = graphics,
+                                        text = lang("ui.pokedex.scan.trainer_owned"),
+                                        x = centerX + xOffset + xOffsetText,
+                                        y = centerY + yOffset + yOffsetText - yOffsetName,
+                                        shadow = true,
+                                        centered = true,
+                                        scale = 0.5F
+                                    )
+                                }
+                                drawScaledText(
+                                    context = graphics,
+                                    font = CobblemonResources.DEFAULT_LARGE,
+                                    text = speciesName,
+                                    x = centerX + xOffset + xOffsetText,
                                     y = centerY + yOffset + yOffsetText + yOffsetName,
-                                    colour = if (isMale) 0x32CBFF else 0xFC5454,
-                                    shadow = true
+                                    shadow = true,
+                                    centered = true
                                 )
+
+                                val gender = pokedexEntityData.pokemon.gender
+                                val speciesNameWidth =
+                                    Minecraft.getInstance().font.width(speciesName.font(CobblemonResources.DEFAULT_LARGE))
+                                if (gender != Gender.GENDERLESS) {
+                                    val isMale = gender == Gender.MALE
+                                    val textSymbol = if (isMale) "♂".text().bold() else "♀".text().bold()
+                                    drawScaledText(
+                                        context = graphics,
+                                        font = CobblemonResources.DEFAULT_LARGE,
+                                        text = textSymbol,
+                                        x = centerX + xOffset + xOffsetText + 2 + (speciesNameWidth / 2),
+                                        y = centerY + yOffset + yOffsetText + yOffsetName,
+                                        colour = if (isMale) 0x32CBFF else 0xFC5454,
+                                        shadow = true
+                                    )
+                                }
+
+                                if (usageContext.isPokemonInFocusOwned) {
+                                    blitk(
+                                        matrixStack = poseStack,
+                                        texture = caughtIndicator,
+                                        x = (centerX + xOffset + xOffsetText - 7 - (speciesNameWidth / 2)) / SCALE,
+                                        y = (centerY + yOffset + yOffsetText + yOffsetName + 2) / SCALE,
+                                        height = 10,
+                                        width = 10,
+                                        scale = SCALE
+                                    )
+                                }
                             }
 
-                            if (usageContext.isPokemonInFocusOwned) {
-                                blitk(
-                                    matrixStack = poseStack,
-                                    texture = caughtIndicator,
-                                    x = (centerX + xOffset + xOffsetText - 7 - (speciesNameWidth / 2)) / SCALE,
-                                    y = (centerY + yOffset + yOffsetText + yOffsetName + 2) / SCALE,
-                                    height = 10,
-                                    width = 10,
-                                    scale = SCALE
-                                )
-                            }
-                        }
 
-                        if (infoDisplayedCounter == 3) {
-                            val pokemon = pokedexEntityData.pokemon
+                            if (infoDisplayedCounter == 3) {
+                                val pokemon = pokedexEntityData.pokemon
                             val entityAlpha = (usageContext.scannableEntityInFocus?.resolveEntityScan() as? PokemonEntity)
                                 ?.entityData
                                 ?.get(PokemonEntity.IS_ALPHA)
@@ -203,35 +242,66 @@ class PokedexScannerRenderer {
                         }
 
                         if (infoDisplayedCounter == 4) {
-                            val typeText = lang("type.suffix", pokedexEntityData.getApparentForm().types.map { it.displayName.copy() }.reduce { acc, next -> acc.plus("/").plus(next) }).bold()
-                            val typeWidth = Minecraft.getInstance().font.width(typeText.font(CobblemonResources.DEFAULT_LARGE))
-                            // Split into 2 lines if text width is too long
-                            if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.getApparentForm().secondaryType !== null) {
-                                val splitLines = typeText.string.split("/")
-                                drawScaledText(
-                                    context = graphics,
-                                    font = CobblemonResources.DEFAULT_LARGE,
-                                    text = text(splitLines[0], "/").bold(),
-                                    x = centerX + xOffset + xOffsetText,
-                                    y = centerY + yOffset + yOffsetText - 4,
-                                    shadow = true,
-                                    centered = true
-                                )
+                            val typeText = lang(
+                                    "type.suffix",
+                                    pokedexEntityData.getApparentForm().types.map { it.displayName.copy() }
+                                        .reduce { acc, next -> acc.plus("/").plus(next) }).bold()
+                                val typeWidth =
+                                    Minecraft.getInstance().font.width(typeText.font(CobblemonResources.DEFAULT_LARGE))
+                                // Split into 2 lines if text width is too long
+                                if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.getApparentForm().secondaryType !== null) {
+                                    val splitLines = typeText.string.split("/")
+                                    drawScaledText(
+                                        context = graphics,
+                                        font = CobblemonResources.DEFAULT_LARGE,
+                                        text = text(splitLines[0], "/").bold(),
+                                        x = centerX + xOffset + xOffsetText,
+                                        y = centerY + yOffset + yOffsetText - 4,
+                                        shadow = true,
+                                        centered = true
+                                    )
 
+                                    drawScaledText(
+                                        context = graphics,
+                                        font = CobblemonResources.DEFAULT_LARGE,
+                                        text = text(splitLines[1]).bold(),
+                                        x = centerX + xOffset + xOffsetText,
+                                        y = centerY + yOffset + yOffsetText + 3,
+                                        shadow = true,
+                                        centered = true
+                                    )
+                                } else {
+                                    drawScaledText(
+                                        context = graphics,
+                                        font = CobblemonResources.DEFAULT_LARGE,
+                                        text = typeText,
+                                        x = centerX + xOffset + xOffsetText,
+                                        y = centerY + yOffset + yOffsetText,
+                                        shadow = true,
+                                        centered = true
+                                    )
+                                }
+                            }
+                        } else if (blockEntityInFocus != null && scanInfo != null) {
+                            val frame = scanInfo.frames.firstOrNull { it.slot == infoDisplayedCounter } ?: return@forEachIndexed
+
+                            val scale = frame.scale
+                            if (scale != null) {
                                 drawScaledText(
                                     context = graphics,
                                     font = CobblemonResources.DEFAULT_LARGE,
-                                    text = text(splitLines[1]).bold(),
+                                    text = frame.text.bold(),
                                     x = centerX + xOffset + xOffsetText,
-                                    y = centerY + yOffset + yOffsetText + 3,
+                                    y = centerY + yOffset + yOffsetText,
                                     shadow = true,
-                                    centered = true
+                                    centered = true,
+                                    scale = scale
                                 )
                             } else {
                                 drawScaledText(
                                     context = graphics,
                                     font = CobblemonResources.DEFAULT_LARGE,
-                                    text = typeText,
+                                    text = frame.text.bold(),
                                     x = centerX + xOffset + xOffsetText,
                                     y = centerY + yOffset + yOffsetText,
                                     shadow = true,
@@ -462,4 +532,13 @@ class PokedexScannerRenderer {
             renderScanOverlay(graphics, tickDelta)
         }
     }
+
+    private fun anyToComponent(value: Any?): MutableComponent {
+        return when (value) {
+            null -> text("")
+            is MutableComponent -> value
+            is Component -> value.copy()
+            else -> text(value.toString())
+        }
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt

@@ -34,7 +34,7 @@ class DusclopsModel (root: ModelPart) : PokemonPosableModel(root) {
     lateinit var battleidle: Pose
 
     override fun registerPoses() {
-        animations["cry"] = "q.bedrock_stateful('squirtle', 'cry')".asExpressionLike()
+        animations["cry"] = "q.bedrock_stateful('dusclops', 'cry')".asExpressionLike()
 
         val blink = quirk { bedrockStateful("dusclops", "blink") }
 

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

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

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

@@ -2744,4 +2744,9 @@ open class PokemonEntity(
     }
 
     fun hasRider() = this.passengers.any { it is LivingEntity }
-}
+
+    override fun playStepSound(pos: BlockPos, state: BlockState) {
+        if (this.pokemon.species.silenceStepSounds) return
+        super.playStepSound(pos, state)
+    }
+}

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

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

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

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

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/battle/BattleSelectActionsHandler.kt

@@ -8,9 +8,12 @@
 
 package com.cobblemon.mod.common.net.serverhandling.battle
 
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.api.text.red
 import com.cobblemon.mod.common.battles.BattleRegistry
+import com.cobblemon.mod.common.battles.HealItemActionResponse
+import com.cobblemon.mod.common.battles.MoveActionResponse
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
 import com.cobblemon.mod.common.net.messages.client.battle.BattleQueueRequestPacket
@@ -25,6 +28,27 @@ object BattleSelectActionsHandler : ServerNetworkPacketHandler<BattleSelectActio
         if (!actor.mustChoose) {
             return
         }
+
+        // Battle command injection attempt detection
+        packet.showdownActionResponses.asSequence()
+            .flatMap {
+                when (it) {
+                    is MoveActionResponse -> sequenceOf(it.moveName, it.targetPnx, it.gimmickID)
+                    is HealItemActionResponse -> sequenceOf(it.item)
+                    else -> emptySequence()
+                }
+            }
+            .filterNotNull()
+            .firstOrNull { field -> field.any(Char::isISOControl) }
+            ?.let {
+                // Escapes control chars as \uXXXX to prevent forging logs.
+                val printable = it.replace(Regex("\\p{Cc}")) { "\\u%04x".format(it.value[0].code) }
+                Cobblemon.LOGGER.warn("Blocked battle command injection from ${player.name.string}: $printable")
+                actor.sendUpdate(BattleQueueRequestPacket(actor.request!!))
+                actor.sendUpdate(BattleMakeChoicePacket())
+                return
+            }
+
         try {
             actor.setActionResponses(packet.showdownActionResponses)
         } catch (e: IllegalActionChoiceException) {

common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/BlockScanData.kt

@@ -0,0 +1,13 @@
+package com.cobblemon.mod.common.pokedex.scanner
+
+import net.minecraft.network.chat.MutableComponent
+
+data class BlockScanData(
+    val frames: MutableSet<Frame> = mutableSetOf()
+)
+
+data class Frame(
+    val slot: Int,
+    val text: MutableComponent,
+    val scale: Float? = null
+)

common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.pokedex.scanner
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
 import com.cobblemon.mod.common.api.pokedex.PokedexLearnedInformation
+import com.cobblemon.mod.common.block.entity.BerryBlockEntity
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.gui.pokedex.PokedexGUI
 import com.cobblemon.mod.common.client.pokedex.PokedexScannerRenderer
@@ -18,6 +19,8 @@ import com.cobblemon.mod.common.client.pokedex.PokedexType
 import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.world.level.block.entity.BlockEntity
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.random.Random
@@ -26,6 +29,7 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.player.LocalPlayer
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
+import net.minecraft.core.BlockPos
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
 import kotlin.math.exp
@@ -51,6 +55,8 @@ class PokedexUsageContext {
     var infoGuiOpen: Boolean = false
     var scanningGuiOpen: Boolean = false
     var isPokemonInFocusOwned: Boolean = false
+    var blockEntityInFocus: BlockEntity? = null
+    var blockPosInFocus: BlockPos? = null
     var registerCompleted: Boolean = false
     var scannedSpecies: ResourceLocation? = null
     var scannableEntityInFocus: ScannableEntity? = null
@@ -68,6 +74,8 @@ class PokedexUsageContext {
     var availableInfoFrames: MutableList<Boolean?> = mutableListOf(null, null, null, null)
     val renderer: PokedexScannerRenderer = PokedexScannerRenderer()
 
+    private fun hasAnyFocus() = (scannableEntityInFocus != null) || (blockEntityInFocus != null)
+
     fun stopUsing(ticksInUse: Int, speciesId: ResourceLocation? = null) {
         if (ticksInUse < OPEN_SCANNER_BUFFER_TICKS) {
             openPokedexGUI(type, speciesId)
@@ -89,7 +97,9 @@ class PokedexUsageContext {
                 if (transitionIntervals == TRANSITION_INTERVALS) playSound(CobblemonSounds.POKEDEX_SCAN_CLOSE)
                 transitionIntervals = max(transitionIntervals - updateInterval, 0F)
                 if (transitionIntervals <= 0) {
-                    if (viewInfoTicks >= VIEW_INFO_BUFFER_TICKS) openPokedexGUI(type, scannableEntityInFocus!!.resolvePokemonScan()?.getApparentSpecies()?.resourceIdentifier)
+                    if (viewInfoTicks >= VIEW_INFO_BUFFER_TICKS && scannableEntityInFocus != null) {
+                        openPokedexGUI(type, scannableEntityInFocus!!.resolvePokemonScan()?.getApparentSpecies()?.resourceIdentifier)
+                    }
                     resetState()
                 }
             }
@@ -102,7 +112,7 @@ class PokedexUsageContext {
             if (scanningProgress >= MAX_SCAN_PROGRESS) targetId?.let { FinishScanningPacket(it, zoomLevel.toInt()).sendToServer() }
             if (focusIntervals > 0) focusIntervals = max(0F, focusIntervals - updateInterval)
         } else {
-            if (scannableEntityInFocus != null) {
+            if (hasAnyFocus()) {
                 if (focusIntervals < FOCUS_INTERVALS) focusIntervals = min(focusIntervals + updateInterval, FOCUS_INTERVALS)
             } else {
                 if (focusIntervals > 0) focusIntervals = max(0F, focusIntervals - updateInterval)
@@ -137,8 +147,9 @@ class PokedexUsageContext {
         playSound(CobblemonSounds.POKEDEX_OPEN)
     }
 
+    // todo display info of scanned berry to the Berry Dex later
     fun attackKeyHeld(isHeld: Boolean) {
-        if (isHeld && scannableEntityInFocus !== null && viewInfoTicks < VIEW_INFO_BUFFER_TICKS && scanningProgress == 0F) {
+        if (isHeld && hasAnyFocus() && viewInfoTicks < VIEW_INFO_BUFFER_TICKS && scanningProgress == 0F) {
             viewInfoTicks++
             if (viewInfoTicks % 2 == 0) playSound(CobblemonSounds.POKEDEX_SCAN_LOOP)
         } else if (viewInfoTicks > 0 && viewInfoTicks < VIEW_INFO_BUFFER_TICKS) {
@@ -147,26 +158,30 @@ class PokedexUsageContext {
     }
 
     fun tryScanPokemon(user: LocalPlayer) {
+        // Pokémon/entity scan
         val targetScannableEntity = PokemonScanner.findScannableEntity(user, zoomLevel.toInt())
         if (targetScannableEntity != null) {
             if (targetScannableEntity != scannableEntityInFocus) {
                 resetFocusedPokemonState()
                 scannableEntityInFocus = targetScannableEntity
+
                 val resolvedPokemon = scannableEntityInFocus?.resolvePokemonScan()
-                if(resolvedPokemon == null) {
+                if (resolvedPokemon == null) {
                     resetFocusedPokemonState()
                     return
                 }
 
                 // Check if Pokémon in focus is owned
-                isPokemonInFocusOwned = CobblemonClient.clientPokedexData.getHighestKnowledgeForSpecies(resolvedPokemon.getApparentSpecies().resourceIdentifier) == PokedexEntryProgress.OWNED
+                isPokemonInFocusOwned =
+                    CobblemonClient.clientPokedexData.getHighestKnowledgeForSpecies(resolvedPokemon.getApparentSpecies().resourceIdentifier) == PokedexEntryProgress.OWNED
 
                 // Randomize info frames for render
                 if (focusIntervals == 0F) {
                     availableInfoFrames = mutableListOf(null, null, null, null)
+
                     for (i in 0..3) {
                         var randomIndex = Random.nextInt(availableInfoFrames.size)
-                        if (availableInfoFrames[randomIndex] !== null) randomIndex = availableInfoFrames.indexOfFirst { it == null }
+                        if (availableInfoFrames[randomIndex] != null) randomIndex = availableInfoFrames.indexOfFirst { it == null }
                         availableInfoFrames.set(randomIndex, Random.nextBoolean())
                     }
                 }
@@ -176,9 +191,31 @@ class PokedexUsageContext {
                 if (newPokemonInfo == PokedexLearnedInformation.NONE) playSound(CobblemonSounds.POKEDEX_SCAN_DETAIL)
                 else scannedSpecies = resolvedPokemon.getApparentSpecies().resourceIdentifier
             }
-        } else {
-            resetFocusedPokemonState()
+            return
         }
+
+        // BlockEntity scan
+        val blockHit = PokemonScanner.findScannableBlockEntity(user, zoomLevel.toInt())
+        if (blockHit != null) {
+            val (pos, be) = blockHit
+            if (be != blockEntityInFocus || pos != blockPosInFocus) {
+                resetFocusedPokemonState()
+                blockEntityInFocus = be
+                blockPosInFocus = pos
+
+                if (focusIntervals == 0F) {
+                    availableInfoFrames = mutableListOf(null, null, null, null)
+                    for (i in 0..3) {
+                        var randomIndex = Random.nextInt(availableInfoFrames.size)
+                        if (availableInfoFrames[randomIndex] != null) randomIndex = availableInfoFrames.indexOfFirst { it == null }
+                        availableInfoFrames[randomIndex] = Random.nextBoolean()
+                    }
+                }
+            }
+            return
+        }
+
+        resetFocusedPokemonState()
     }
 
     fun onServerConfirmedRegister(packet: ServerConfirmedRegisterPacket) {
@@ -196,6 +233,8 @@ class PokedexUsageContext {
 
     fun resetFocusedPokemonState() {
         scannableEntityInFocus = null
+        blockEntityInFocus = null
+        blockPosInFocus = null
         scannedSpecies = null
         viewInfoTicks = 0
         scanningProgress = 0F

common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokemonScanner.kt

@@ -10,10 +10,14 @@ package com.cobblemon.mod.common.pokedex.scanner
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.pokedex.scanner.PokedexUsageContext.Companion.BLOCK_LENGTH_PER_ZOOM_STAGE
+import net.minecraft.core.BlockPos
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.ClipContext
 import net.minecraft.world.phys.AABB
+import net.minecraft.world.phys.BlockHitResult
 import net.minecraft.world.phys.HitResult
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.world.level.block.entity.BlockEntity
 
 //Handles the actual raycasting to figure out what pokemon we are looking at
 object PokemonScanner {
@@ -100,4 +104,34 @@ object PokemonScanner {
     fun isEntityInRange(castingEntity: Entity, targetEntity: Entity, zoomLevel: Int): Boolean {
         return targetEntity.position().distanceTo(castingEntity.position()) <= Cobblemon.config.maxPokedexScanningDetectionRange + (zoomLevel * BLOCK_LENGTH_PER_ZOOM_STAGE)
     }
+
+    fun findScannableBlockEntity(castingEntity: Entity, zoomLevel: Int): Pair<BlockPos, BlockEntity>? {
+        val eyePos = castingEntity.getEyePosition(1.0F)
+        val lookVec = castingEntity.getViewVector(1.0F)
+
+        val maxDistance =
+            Cobblemon.config.maxPokedexScanningDetectionRange + (zoomLevel * BLOCK_LENGTH_PER_ZOOM_STAGE)
+
+        val end = eyePos.add(lookVec.scale(maxDistance.toDouble()))
+
+        val hit = castingEntity.level().clip(
+            ClipContext(
+                eyePos,
+                end,
+                ClipContext.Block.OUTLINE,
+                ClipContext.Fluid.NONE,
+                castingEntity
+            )
+        )
+
+        if (hit.type != HitResult.Type.BLOCK) return null
+
+        val pos = (hit as BlockHitResult).blockPos
+        val be = castingEntity.level().getBlockEntity(pos) ?: return null
+
+        val typeId = BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(be.type) ?: return null
+//        if (BlockScanProviderRegistry.get(typeId) == null) return null
+
+        return pos to be
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/ScannableBlockEntity.kt

@@ -0,0 +1,5 @@
+package com.cobblemon.mod.common.pokedex.scanner
+
+interface ScannableBlockEntity {
+    fun resolveBlockScan(): BlockScanData
+}

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

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

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

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

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

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

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/watershuriken/watershuriken_actoralt.particle.json

@@ -64,7 +64,7 @@
 				"rotation": "math.random_integer(0,3)*90"
 			},
 			"minecraft:particle_motion_parametric": {
-				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*2))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*2))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
+				"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
 			},
 			"minecraft:particle_appearance_billboard": {
 				"size": ["0.4*v.rsize", "0.4*v.rsize"],

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3150,6 +3150,10 @@
 				"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": {
@@ -4473,6 +4477,10 @@
 				"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,6 +566,12 @@
 						"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": {
@@ -780,15 +786,27 @@
 				"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": {
@@ -1186,18 +1204,36 @@
 					"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": {
@@ -2204,6 +2240,16 @@
 						"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/bedrock/pokemon/models/0656_froakie/froakie.geo.json

@@ -227,6 +227,14 @@
 						{"origin": [3.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [60, 42]}
 					]
 				},
+				{
+					"name": "eyelid_closed_left",
+					"parent": "head_left",
+					"pivot": [3.6, 19.7, -0.91],
+					"cubes": [
+						{"origin": [2.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [98, 2]}
+					]
+				},
 				{
 					"name": "face_ditto_left",
 					"parent": "head_left",
@@ -332,6 +340,14 @@
 						{"origin": [-5.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [51, 42], "mirror": true}
 					]
 				},
+				{
+					"name": "eyelid_closed_right",
+					"parent": "head_right",
+					"pivot": [-3.6, 19.7, -0.91],
+					"cubes": [
+						{"origin": [-5.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [89, 2], "mirror": true}
+					]
+				},
 				{
 					"name": "face_ditto_right",
 					"parent": "head_right",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0657_frogadier/frogadier.geo.json

@@ -134,229 +134,114 @@
 						"jaw2": [0, 27, -7.35]
 					}
 				},
-				{
-					"name": "head_right",
-					"parent": "head_angle",
-					"pivot": [-3.525, 31, 0.25],
-					"rotation": [5, 0, 0],
-					"cubes": [
-						{"origin": [-4.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
-						{"origin": [-3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [52, 55]}
-					]
-				},
-				{
-					"name": "locator_eye_right",
-					"parent": "head_right",
-					"pivot": [-4.5, 31, -2.5],
-					"rotation": [0, 90, 0],
-					"locators": {
-						"eye1": [-4.5, 31, -2.5]
-					}
-				},
-				{
-					"name": "eye_right",
-					"parent": "head_right",
-					"pivot": [-4.525, 31.35, -2.25],
-					"cubes": [
-						{"origin": [-4.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [66, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_neutral_right",
-					"parent": "eye_right",
-					"pivot": [-4.525, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [-4.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_angry_right",
-					"parent": "eye_right",
-					"pivot": [-4.435, 32.1, -2.5],
-					"cubes": [
-						{"origin": [-4.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [66, 26], "mirror": true},
-						{"origin": [-4.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 27], "mirror": true}
-					]
-				},
-				{
-					"name": "eye_sad_right",
-					"parent": "eye_right",
-					"pivot": [-4.435, 32.85, -2.5],
-					"cubes": [
-						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 19], "mirror": true},
-						{"origin": [-4.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right",
-					"parent": "eye_right",
-					"pivot": [-4.525, 30.85095, -3.02179],
-					"cubes": [
-						{"origin": [-4.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [73, 0], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_right2",
-					"parent": "pupil_right",
-					"pivot": [-4.55, 31.35095, -3.02179],
-					"cubes": [
-						{"origin": [-4.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right",
-					"parent": "head_right",
-					"pivot": [-3.925, 31.35095, -2.27179],
-					"cubes": [
-						{"origin": [-4.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [77, 2], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_eyelid_right",
-					"parent": "eyelid_right",
-					"pivot": [-4.425, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [-4.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [77, 14], "mirror": true}
-					]
-				},
-				{
-					"name": "eyelid_right2",
-					"parent": "eyelid_right",
-					"pivot": [-3.925, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
-					]
-				},
-				{
-					"name": "pupil_happy_right",
-					"parent": "eyelid_right",
-					"pivot": [-4.325, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [-4.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [77, 20], "mirror": true}
-					]
-				},
-				{
-					"name": "face_ditto_right",
-					"parent": "head_right",
-					"pivot": [-4.435, 32, -2.25]
-				},
-				{
-					"name": "eye_ditto_right",
-					"parent": "face_ditto_right",
-					"pivot": [-4.435, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
-					]
-				},
-				{
-					"name": "eye_closed_ditto_right",
-					"parent": "face_ditto_right",
-					"pivot": [-4.335, 32, -2.25],
-					"cubes": [
-						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
-						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
-					]
-				},
 				{
 					"name": "head_left",
 					"parent": "head_angle",
-					"pivot": [3.525, 31, 0.25],
+					"pivot": [3.53, 31, 0.25],
 					"rotation": [5, 0, 0],
 					"cubes": [
-						{"origin": [2.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
-						{"origin": [3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
+						{"origin": [2.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
+						{"origin": [3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
 					]
 				},
-				{
-					"name": "locator_eye_left",
-					"parent": "head_left",
-					"pivot": [4.5, 31, -2.5],
-					"rotation": [0, -90, 0],
-					"locators": {
-						"eye2": [4.5, 31, -2.5]
-					}
-				},
 				{
 					"name": "eye_left",
 					"parent": "head_left",
-					"pivot": [4.525, 31.35, -2.25],
+					"pivot": [4.53, 31.5, -2.25],
 					"cubes": [
-						{"origin": [3.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [88, 2]}
+						{"origin": [3.54, 29, -4.25], "size": [1, 5, 4], "uv": [88, 2]}
 					]
 				},
 				{
 					"name": "eye_neutral_left",
 					"parent": "eye_left",
-					"pivot": [4.525, 32.85095, -2.27179],
+					"pivot": [4.54, 33, -2.25],
 					"cubes": [
-						{"origin": [3.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
+						{"origin": [3.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
 					]
 				},
 				{
 					"name": "eye_angry_left",
 					"parent": "eye_left",
-					"pivot": [4.435, 32.1, -2.5],
+					"pivot": [4.44, 32.5, -2.25],
 					"cubes": [
-						{"origin": [3.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [88, 26]},
-						{"origin": [3.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 27]}
+						{"origin": [3.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [88, 26]},
+						{"origin": [3.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 27]}
 					]
 				},
 				{
 					"name": "eye_sad_left",
 					"parent": "eye_left",
-					"pivot": [4.435, 32.85, -2.5],
+					"pivot": [4.43, 33, -2.25],
 					"cubes": [
-						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 19]},
-						{"origin": [3.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 20]}
+						{"origin": [3.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 19]},
+						{"origin": [3.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 20]}
 					]
 				},
 				{
 					"name": "pupil_left",
 					"parent": "eye_left",
-					"pivot": [4.525, 30.85095, -3.02179],
+					"pivot": [4.55, 31, -3.05],
 					"cubes": [
-						{"origin": [3.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [95, 0]}
+						{"origin": [3.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [95, 0]}
 					]
 				},
 				{
-					"name": "pupil_left2",
+					"name": "eye_shine_left",
 					"parent": "pupil_left",
-					"pivot": [4.55, 31.35095, -3.02179],
+					"pivot": [4.55, 31.5, -3.05],
 					"cubes": [
-						{"origin": [3.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+						{"origin": [3.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
+					]
+				},
+				{
+					"name": "open_eye_left",
+					"parent": "head_left",
+					"pivot": [4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "uv": [99, 2]}
+					]
+				},
+				{
+					"name": "open_pupil_left",
+					"parent": "open_eye_left",
+					"pivot": [4.45, 31.5, -2.25],
+					"cubes": [
+						{"origin": [3.45, 31, -3.75], "size": [1, 1, 3], "uv": [99, 14]}
+					]
+				},
+				{
+					"name": "open_neutral_left",
+					"parent": "open_eye_left",
+					"pivot": [4.34, 33, -2.25],
+					"cubes": [
+						{"origin": [3.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
+					]
+				},
+				{
+					"name": "open_happy_left",
+					"parent": "open_eye_left",
+					"pivot": [4.35, 32, -2.25],
+					"cubes": [
+						{"origin": [3.35, 31, -3.75], "size": [1, 2, 3], "uv": [99, 20]}
 					]
 				},
 				{
 					"name": "eyelid_left",
 					"parent": "head_left",
-					"pivot": [3.925, 31.35095, -2.27179],
+					"pivot": [4.44, 31.5, -2.25],
 					"cubes": [
-						{"origin": [3.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [99, 2]}
+						{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [99, 26]}
 					]
 				},
 				{
-					"name": "pupil_eyelid_left",
-					"parent": "eyelid_left",
-					"pivot": [4.425, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [3.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [99, 14]}
-					]
-				},
-				{
-					"name": "eyelid_left2",
-					"parent": "eyelid_left",
-					"pivot": [3.925, 32.85095, -2.27179],
-					"cubes": [
-						{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
-					]
-				},
-				{
-					"name": "pupil_happy_left",
-					"parent": "eyelid_left",
-					"pivot": [4.325, 30.80095, -2.27179],
-					"cubes": [
-						{"origin": [3.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [99, 20]}
-					]
+					"name": "locator_eye_left",
+					"parent": "head_left",
+					"pivot": [4.54, 31, -2.46],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"eye2": [4.54, 31, -2.46]
+					}
 				},
 				{
 					"name": "face_ditto_left",
@@ -368,7 +253,7 @@
 					"parent": "face_ditto_left",
 					"pivot": [4.435, 32, -2.25],
 					"cubes": [
-						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+						{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
 					]
 				},
 				{
@@ -376,8 +261,139 @@
 					"parent": "face_ditto_left",
 					"pivot": [4.335, 32, -2.25],
 					"cubes": [
-						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
-						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
+						{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
+						{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
+					]
+				},
+				{
+					"name": "head_right",
+					"parent": "head_angle",
+					"pivot": [-3.53, 31, 0.25],
+					"rotation": [5, 0, 0],
+					"cubes": [
+						{"origin": [-4.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
+						{"origin": [-3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55]}
+					]
+				},
+				{
+					"name": "eye_right",
+					"parent": "head_right",
+					"pivot": [-4.53, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.54, 29, -4.25], "size": [1, 5, 4], "uv": [66, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_neutral_right",
+					"parent": "eye_right",
+					"pivot": [-4.54, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_angry_right",
+					"parent": "eye_right",
+					"pivot": [-4.44, 32.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [66, 26], "mirror": true},
+						{"origin": [-4.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 27], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_sad_right",
+					"parent": "eye_right",
+					"pivot": [-4.43, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 19], "mirror": true},
+						{"origin": [-4.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "pupil_right",
+					"parent": "eye_right",
+					"pivot": [-4.55, 31, -3.05],
+					"cubes": [
+						{"origin": [-4.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [73, 0], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_shine_right",
+					"parent": "pupil_right",
+					"pivot": [-4.55, 31.5, -3.05],
+					"cubes": [
+						{"origin": [-4.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "open_eye_right",
+					"parent": "head_right",
+					"pivot": [-4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "uv": [77, 2], "mirror": true}
+					]
+				},
+				{
+					"name": "open_pupil_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.45, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.45, 31, -3.75], "size": [1, 1, 3], "uv": [77, 14], "mirror": true}
+					]
+				},
+				{
+					"name": "open_neutral_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.34, 33, -2.25],
+					"cubes": [
+						{"origin": [-4.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
+					]
+				},
+				{
+					"name": "open_happy_right",
+					"parent": "open_eye_right",
+					"pivot": [-4.35, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.35, 31, -3.75], "size": [1, 2, 3], "uv": [77, 20], "mirror": true}
+					]
+				},
+				{
+					"name": "eyelid_right",
+					"parent": "head_right",
+					"pivot": [-4.44, 31.5, -2.25],
+					"cubes": [
+						{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [77, 26], "mirror": true}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "head_right",
+					"pivot": [-4.54, 31, -2.46],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"eye1": [-4.54, 31, -2.46]
+					}
+				},
+				{
+					"name": "face_ditto_right",
+					"parent": "head_right",
+					"pivot": [-4.435, 32, -2.25]
+				},
+				{
+					"name": "eye_ditto_right",
+					"parent": "face_ditto_right",
+					"pivot": [-4.435, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
+					]
+				},
+				{
+					"name": "eye_closed_ditto_right",
+					"parent": "face_ditto_right",
+					"pivot": [-4.335, 32, -2.25],
+					"cubes": [
+						{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
+						{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0658_greninja/greninja.geo.json

@@ -830,11 +830,6 @@
 						{"origin": [-3.5, 38.3, 33.75], "size": [7, 5, 9], "uv": [106, 33]}
 					]
 				},
-				{
-					"name": "tongue6",
-					"parent": "tongue5",
-					"pivot": [0, 40.8, 40.5]
-				},
 				{
 					"name": "muzzle",
 					"parent": "head_angle",
@@ -913,6 +908,15 @@
 						{"origin": [-0.1, 44.3, -8.11], "size": [4, 2, 1], "uv": [87, 72]}
 					]
 				},
+				{
+					"name": "eyelid_base_left",
+					"parent": "eye_left_base",
+					"pivot": [1.9, 43.9, -8.11],
+					"cubes": [
+						{"origin": [-0.1, 45.3, -8.11], "size": [4, 1, 1], "uv": [87, 76]},
+						{"origin": [-0.1, 41.9, -8.11], "size": [4, 4, 1], "uv": [87, 79]}
+					]
+				},
 				{
 					"name": "eye_left",
 					"parent": "eye_left_base",
@@ -950,7 +954,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 76]}
+						{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 85]}
 					]
 				},
 				{
@@ -958,7 +962,7 @@
 					"parent": "eye_left",
 					"pivot": [1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 79]}
+						{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 88]}
 					]
 				},
 				{
@@ -995,6 +999,15 @@
 						{"origin": [-3.9, 44.3, -8.11], "size": [4, 2, 1], "uv": [76, 72], "mirror": true}
 					]
 				},
+				{
+					"name": "eyelid_base_right",
+					"parent": "eye_right_base",
+					"pivot": [-1.9, 43.9, -8.11],
+					"cubes": [
+						{"origin": [-3.9, 45.3, -8.11], "size": [4, 1, 1], "uv": [76, 76], "mirror": true},
+						{"origin": [-3.9, 41.9, -8.11], "size": [4, 4, 1], "uv": [76, 79], "mirror": true}
+					]
+				},
 				{
 					"name": "eye_right",
 					"parent": "eye_right_base",
@@ -1032,7 +1045,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 76], "mirror": true}
+						{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 85], "mirror": true}
 					]
 				},
 				{
@@ -1040,7 +1053,7 @@
 					"parent": "eye_right",
 					"pivot": [-1.9, 44.2, -8.07],
 					"cubes": [
-						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 79], "mirror": true}
+						{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 88], "mirror": true}
 					]
 				},
 				{

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0022_fearow/fearow.json

@@ -8,7 +8,6 @@
   "poses": {
     "standing": {
       "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
-      "isBattle": false,
       "animations": [
         "q.look('neck', 1, 1, 70, -10, 20, -20)",
         "q.look('head_ai')",
@@ -35,6 +34,9 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "walking": {
@@ -65,6 +67,9 @@
           "part": "wing_closed_left",
           "isVisible": true
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "hover": {
@@ -96,6 +101,9 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "fly": {
@@ -128,6 +136,9 @@
           "part": "wing_closed_left",
           "isVisible": false
         }
+      ],
+      "quirks": [
+        "q.bedrock_quirk('fearow', 'blink')"
       ]
     },
     "sleep": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0656_froakie/froakie.json

@@ -27,7 +27,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_swim')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('froakie', 'water_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('froakie', 'blink')"]
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0657_frogadier/frogadier.json

@@ -27,7 +27,7 @@
             "q.look('head_ai', 1, 1, 5, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "walking": {
          "poseTypes": ["WALK"],
@@ -36,7 +36,7 @@
             "q.look('head_ai', 1, 1, 0, -45, 45, -45)",
             "q.bedrock('frogadier', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -46,7 +46,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_swim')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "float": {
          "poseTypes": ["STAND","FLOAT"],
@@ -55,7 +55,7 @@
             "q.look('head_ai')",
             "q.bedrock('frogadier', 'water_idle')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
       },
       "sleep": {
          "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0658_greninja/greninja.json

@@ -66,7 +66,7 @@
             "q.bedrock('greninja', math.random(0, 1) < 0.4 ? 'ground_idle_alt' : 'ground_idle')"
          ],
          "quirks": [
-            "q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
+            "q.bedrock_quirk('greninja', 'blink')","q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
          ]
       },
       "walking": {
@@ -78,7 +78,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_walk')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
       },
       "running": {
          "poseTypes": ["WALK"],
@@ -89,7 +89,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'ground_run')"
          ],
-         "quirks": []
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"]
       },
       "surface-swimming": {
          "poseTypes": ["WALK","SWIM"],
@@ -101,7 +101,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -118,7 +118,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -136,7 +136,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_swim')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",
@@ -153,7 +153,7 @@
             "q.look('tongue1', -1, 1, 70, -45, 0, 0)",
             "q.bedrock('greninja', 'water_idle')"
          ],
-         "quirks": [],
+         "quirks": ["q.bedrock_quirk('greninja', 'blink')"],
          "transformedParts": [
             {
                "part": "body",

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

@@ -383,7 +383,7 @@
   "item.cobblemon.eject_pack.tooltip_1": "Switches out the holder if any stats are lowered",
   "item.cobblemon.eject_pack.tooltip_2": "Consumed after use",
   "item.cobblemon.electric_seed": "Electric Seed",
-  "item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric terrain",
+  "item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric Terrain",
   "item.cobblemon.everstone": "Everstone",
   "item.cobblemon.everstone.tooltip": "Prevents the holder from evolving",
   "item.cobblemon.eviolite": "Eviolite",
@@ -402,7 +402,7 @@
   "item.cobblemon.focus_sash.tooltip_1": "Prevents the holder from fainting in a single hit",
   "item.cobblemon.focus_sash.tooltip_2": "Consumed after use",
   "item.cobblemon.grassy_seed": "Grassy Seed",
-  "item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy terrain",
+  "item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy Terrain",
   "item.cobblemon.grip_claw": "Grip Claw",
   "item.cobblemon.hard_stone": "Hard Stone",
   "item.cobblemon.hard_stone.tooltip": "Boosts the power of the holder's Rock-type moves",
@@ -507,7 +507,7 @@
   "item.cobblemon.mirror_herb.tooltip_1": "Allows the holder to mirror an opponent's stat increases to boost its own stats",
   "item.cobblemon.mirror_herb.tooltip_2": "Consumed after use",
   "item.cobblemon.misty_seed": "Misty Seed",
-  "item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty terrain",
+  "item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty Terrain",
   "item.cobblemon.power_herb": "Power Herb",
   "item.cobblemon.power_herb.tooltip_1": "Allows the holder to immediately use a move that normally requires a change of turn to charge",
   "item.cobblemon.power_herb.tooltip_2": "Consumed after use",
@@ -535,7 +535,7 @@
   "item.cobblemon.power_weight": "Power Weight",
   "item.cobblemon.power_weight.tooltip": "Grants 8 HP EVs when gaining experience in battle",
   "item.cobblemon.psychic_seed": "Psychic Seed",
-  "item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic terrain",
+  "item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic Terrain",
   "item.cobblemon.flame_orb": "Flame Orb",
   "item.cobblemon.flame_orb.tooltip": "Burns the holder",
   "item.cobblemon.smoke_ball": "Smoke Ball",
@@ -1473,6 +1473,9 @@
   "cobblemon.ui.pokedex.weight": "Weight: %1$skg",
   "cobblemon.ui.pokedex.height": "Height: %1$sm",
 
+  "cobblemon.ui.pokedex.scan.berry.stage": "Stage: %s",
+  "cobblemon.ui.pokedex.scan.berry.mulch_none": "No Mulch",
+
   "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "Needs %1$s item to evolve",
   "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "Evolves when traded with %1$s",
   "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "Evolves when traded",
@@ -2434,6 +2437,8 @@
   "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",

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

@@ -6526,7 +6526,7 @@
     "cobblemon.move.10000000voltthunderbolt": "1000만볼트",
     "cobblemon.species.unown-x.desc": "고대 문자를 닮은 모습의 포켓몬이다. 먼저 생겨난 것은 문자인가 안농인가. 연구 중이지만 아직도 수수께끼다.",
     "cobblemon.ui.pokedex.info.form.qwilfish-hisui": "히스이의 모습",
-    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시그란돈",
+    "cobblemon.ui.pokedex.info.form.groudon-primal": "원시회귀",
     "cobblemon.ui.pokedex.info.form.burmy-sandy": "모래땅도롱",
     "cobblemon.ui.pokedex.info.form.abomasnow-mega": "메가눈설왕",
     "cobblemon.species.rotom-frost.desc": "특수한 모터로 움직이는 냉장고에 들어갔다. 냉기를 뿜으며 싸운다.",
@@ -6758,7 +6758,7 @@
     "cobblemon.species.salamence-mega.desc": "앞다리를 껍질 틈에 얹어서 비행 태세를 갖춘다. 복잡한 지형도 고속으로 날아다닌다.",
     "cobblemon.species.metagross-mega.desc": "이길 수 없다고 판단하면 발톱으로 상대를 붙잡고 대폭발의 카운트를 시작한다.",
     "cobblemon.species.latios-mega.desc": "본 것이나 생각한 이미지를 상대방에게 영상으로 보여주는 능력을 지녔다. 인간의 말을 이해할 수 있다.",
-    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시가이오가",
+    "cobblemon.ui.pokedex.info.form.kyogre-primal": "원시회귀",
     "cobblemon.species.deoxys-attack.desc": "공격적인 형상으로 변화한 테오키스. 다른 모습을 보여 적을 혼란시키는 힘을 가졌다.",
     "cobblemon.ui.pokedex.info.form.deoxys-speed": "스피드폼",
     "cobblemon.ui.pokedex.info.form.burmy-trash": "슈레도롱",
@@ -9549,5 +9549,125 @@
     "cobblemon.config.ui.world_spawning_blocklist": "월드별 스폰 차단 목록",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "포켓몬 생성 로직을 비활성화하는 월드입니다.",
     "advancements.cobblemon.obtain_tm": "기술을 보여줘!",
-    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요"
+    "advancements.cobblemon.obtain_tm.description": "TM을 찾거나 제작하세요",
+    "itemGroup.cobblemon.tm_item": "코블몬: 기술머신",
+    "block.cobblemon.pomohana": "이글이글꽃",
+    "block.cobblemon.pauvillea": "파칙파칙꽃",
+    "block.cobblemon.lobaila": "훌라훌라꽃",
+    "block.cobblemon.wistensu": "하늘하늘꽃",
+    "block.cobblemon.voltaconia": "찌릿꽃",
+    "block.cobblemon.verdroot": "풀빛뿌리",
+    "block.cobblemon.lucibell": "빛방울꽃",
+    "block.cobblemon.mistleaf": "안개잎",
+    "cobblemon.ui.pokedex.info.evolution_tree": "진화 계통",
+    "cobblemon.ui.pokedex.evolution.item_interact.tooltip": "진화하려면 %1$s 필요",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_species": "%1$s와(과) 교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.trade.tooltip.with_any_species": "교환 시 진화",
+    "cobblemon.ui.pokedex.evolution.shedder.tooltip": "남는 몬스터볼과 파티 빈칸도 필요",
+    "cobblemon.ui.pokedex.evolution.or": "또는",
+    "cobblemon.ui.pokedex.evolution.one_of": "다음 중 하나:",
+    "cobblemon.ui.pokedex.requirement.advancement.tooltip": "발전 과제 %1$s 달성 필요",
+    "cobblemon.ui.pokedex.requirement.battle_critical_hits.tooltip": "배틀에서 급소 %1$s회 맞히기",
+    "cobblemon.ui.pokedex.requirement.biome.anticondition.tooltip": "%1$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.both.tooltip": "%1$s 바이옴 안, %2$s 바이옴 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.biome.tooltip": "%1$s 바이옴에 있기",
+    "cobblemon.ui.pokedex.requirement.blocks_traveled.tooltip": "%1$s블록 이동하기",
+    "cobblemon.ui.pokedex.requirement.damage_taken.tooltip": "배틀에서 기절하지 않고 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.defeat.tooltip": "배틀에서 %1$s을(를) 쓰러뜨리기",
+    "cobblemon.ui.pokedex.requirement.friendship.tooltip": "친밀도 %1$s 이상 필요",
+    "cobblemon.ui.pokedex.requirement.has_move.tooltip": "기술 %1$s 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.has_move_type.tooltip": "%1$s 타입 기술 배우고 있기",
+    "cobblemon.ui.pokedex.requirement.held_item.tooltip": "%1$s 지니고 있기",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.min": "레벨 %1$s부터 진화",
+    "cobblemon.ui.pokedex.requirement.level.tooltip.between": "레벨 %1$s~%2$s 사이에 진화",
+    "cobblemon.ui.pokedex.requirement.moon_phase.tooltip": "달 모양이 %1$s일 때 진화",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_amped": "§a노력§r, §a용감§r, §a고집§r, §a개구쟁이§r, §a온순§r, §a장난꾸러기§r, §a촐랑§r, §a성급§r, §a명랑§r, §a천진난만§r, §a덜렁§r, §a건방§r, §a변덕§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.nature.toxtricity_low_key": "§a외로움§r, §a대담§r, §a무사태평§r, §a겁쟁이§r, §a성실§r, §a조심§r, §a의젓§r, §a냉정§r, §a수줍음§r, §a차분§r, §a얌전§r, §a신중§r 성격 중 하나",
+    "cobblemon.ui.pokedex.requirement.negate.tooltip": "아님: %1$s",
+    "cobblemon.ui.pokedex.requirement.nickname.malamar": "이름이 §aDinnerbone§r 또는 §aGrumm§r이어야 함",
+    "cobblemon.ui.pokedex.requirement.party_member.anticondition.tooltip": "파티에 %1$s 포켓몬이 없기",
+    "cobblemon.ui.pokedex.requirement.party_member.tooltip": "파티에 %1$s 포켓몬이 있기",
+    "cobblemon.ui.pokedex.requirement.pokemon_properties.tooltip": "조건: %1$s",
+    "cobblemon.ui.pokedex.requirement.properties.and": "%1$s, %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.custom.cocoon_species": "%1$s 고치",
+    "cobblemon.ui.pokedex.requirement.properties.held_item": "%1$s 지닌",
+    "cobblemon.ui.pokedex.requirement.properties.int_feature": "%1$s %2$s",
+    "cobblemon.ui.pokedex.requirement.properties.nature": "%1$s 성격",
+    "cobblemon.ui.pokedex.requirement.properties.nickname": "이름이 %1$s인",
+    "cobblemon.ui.pokedex.requirement.properties.type": "%1$s 타입",
+    "cobblemon.ui.pokedex.requirement.property_range.tooltip": "%1$s이(가) %2$s~%3$s 사이여야 함",
+    "cobblemon.ui.pokedex.requirement.recoil.tooltip": "배틀에서 반동 데미지 %1$s 받기",
+    "cobblemon.ui.pokedex.requirement.stat_compare.tooltip": "%1$s이(가) %2$s보다 높아야 함",
+    "cobblemon.ui.pokedex.requirement.stat_equal.tooltip": "%1$s와(과) %2$s이(가) 같아야 함",
+    "cobblemon.ui.pokedex.requirement.structure.anticondition.tooltip": "%1$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.both.tooltip": "%1$s 구조물 안, %2$s 구조물 밖에 있기",
+    "cobblemon.ui.pokedex.requirement.structure.tooltip": "%1$s 구조물에 있기",
+    "cobblemon.ui.pokedex.requirement.time_range.tooltip": "%1$s에 진화",
+    "cobblemon.ui.pokedex.requirement.use_move.tooltip": "배틀에서 기술 %1$s 사용하기",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.raining": "비가 올 때 진화",
+    "cobblemon.ui.pokedex.requirement.weather.tooltip.thundering": "뇌우가 칠 때 진화",
+    "cobblemon.ui.moon_phase.full_moon": "보름달",
+    "cobblemon.ui.moon_phase.waning_gibbous": "기우는 볼록달",
+    "cobblemon.ui.moon_phase.third_quarter": "하현달",
+    "cobblemon.ui.moon_phase.waning_crescent": "그믐달",
+    "cobblemon.ui.moon_phase.new_moon": "삭",
+    "cobblemon.ui.moon_phase.waxing_crescent": "초승달",
+    "cobblemon.ui.moon_phase.first_quarter": "상현달",
+    "cobblemon.ui.moon_phase.waxing_gibbous": "차오르는 볼록달",
+    "cobblemon.ui.time_range.any": "언제든",
+    "cobblemon.ui.time_range.day": "낮",
+    "cobblemon.ui.time_range.night": "밤",
+    "cobblemon.ui.time_range.noon": "정오",
+    "cobblemon.ui.time_range.midnight": "자정",
+    "cobblemon.ui.time_range.dawn": "새벽",
+    "cobblemon.ui.time_range.dusk": "해 질 녘",
+    "cobblemon.ui.time_range.twilight": "황혼",
+    "cobblemon.ui.time_range.morning": "아침",
+    "cobblemon.ui.time_range.afternoon": "오후",
+    "cobblemon.ui.time_range.predawn": "동트기 전",
+    "cobblemon.ui.time_range.evening": "저녁",
+    "cobblemon.subtitle.item.bright_powder.use": "반짝가루가 빛남",
+    "cobblemon.config.ui.type_gem_max_connected": "연결된 타입주얼 블록 최대 수",
+    "cobblemon.config.ui.type_gem_min_growth": "타입주얼 최소 성장",
+    "cobblemon.config.ui.type_gem_growth_chance": "타입주얼 성장 확률",
+    "cobblemon.config.ui.type_gem_initial_expansion_cycles": "타입주얼 초기 확장 횟수",
+    "cobblemon.battle.activate.ficklebeam": "%1$s은(는) 전력을 다해 공격한다!",
+    "tag.item.cobblemon.oricorio_flowers": "꽃꿀 꽃",
+    "tag.item.cobblemon.terrain_plants": "필드 식물",
+    "tag.item.cobblemon.tall_flowers": "큰 꽃",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.bergmite_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.cubone_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dartrix_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.dewott_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.exeggcute_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.goomy_kalosbiome": "칼로스",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.koffing_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_galarbiome": "가라르",
+    "tag.worldgen.biome.cobblemon.evolution.regional.mimejr_sinnohbiome": "신오",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.petilil_unovabiome": "하나",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_alolabiome": "알로라",
+    "tag.worldgen.biome.cobblemon.evolution.regional.pikachu_kantobiome": "관동",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.quilava_johtobiome": "성도",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_hisuibiome": "히스이",
+    "tag.worldgen.biome.cobblemon.evolution.regional.rufflet_unovabiome": "하나",
+    "cobblemon.ui.pokedex.info.form.vivillon-icy snow": "빙설의 모양",
+    "cobblemon.species.vivillon-icy-snow.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 얼어붙은 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-high plains": "황야의 모양",
+    "cobblemon.species.vivillon-high-plains.desc": "태어난 땅의 기후나 풍토에 영향을 받아 모양이 달라진다. 비가 적게 내리는 땅에서의 모습이다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-inferno": "지옥의 모양",
+    "cobblemon.species.vivillon-inferno.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-void": "공허의 모양",
+    "cobblemon.species.vivillon-void.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.ui.pokedex.info.form.vivillon-forsaken": "망각의 모양",
+    "cobblemon.species.vivillon-forsaken.desc": "살고 있는 장소의 기후나 풍토에 따라 날개의 모양이 다른 포켓몬이다. 화려한 색의 날개 가루를 뿌린다.",
+    "cobblemon.species.minior-red.desc": "겉껍질이 벗겨진 모습. 코어의 색이 다른 이유는 먹은 먹이의 성분이 다르기 때문이다."
 }

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

@@ -9677,5 +9677,6 @@
     "cobblemon.config.ui.world_spawning_blocklist": "维度生成黑名单",
     "cobblemon.config.ui.world_spawning_blocklist.tooltip": "禁用宝可梦生成逻辑的维度。",
     "advancements.cobblemon.obtain_tm": "让我看看你的招式",
-    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器"
+    "advancements.cobblemon.obtain_tm.description": "发现或刻写一个招式学习器",
+    "itemGroup.cobblemon.tm_item": "招式学习器"
 }

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

@@ -1653,6 +1653,18 @@
   "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 },
@@ -2031,6 +2043,850 @@
       { "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": [
       {
@@ -7828,6 +8684,9 @@
   "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 } ]
   },