Merge branch 'main' into berry-tree-scanning

# Conflicts: # common/src/main/resources/assets/cobblemon/lang/en_us.json
Merge branch 'compat-improvements' into 'main'
2026-11-02 14:28:54 -05:00 · 2026-11-02 11:54:19 -05:00 · 2026-11-02 09:17:39 +00:00 · 2026-11-02 13:30:23 +10:00 · 2026-11-02 13:26:43 +10:00 · 2026-11-02 13:23:42 +10:00
37 changed files with 1534 additions and 749 deletions
@@ -2,10 +2,161 @@
 ## [1.8.5 (MONTH xth, 2026)](#1-8-5)

 ### Additions
+- 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
+- Drampa
+- Archeops
+
+### Pokémon Added
+- Pancham (+ Cosmetic with Black Glasses)
+- Pangoro (+ Cosmetic with Black Glasses)
+- Skitty
+- Delcatty
+- Wurmple
+- Silcoon
+- Beautifly
+- Cascoon
+- Dustox
+- Audino
+- Rockruff
+- Lycanroc
+- Snom
+- Frosmoth
+- Applin
+- Flapple
+- Appletun
+- 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
+- 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
 - 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 Ponigiri food values for AppleSkin integration
@@ -93,6 +93,8 @@ import com.cobblemon.mod.common.events.StatHandler
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
+import com.cobblemon.mod.common.api.pokedex.scan.BlockScanProviderRegistry
+import com.cobblemon.mod.common.pokedex.scanner.block.BerryBlockScanProvider
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.pokemon.aspects.ALPHA_ASPECT
 import com.cobblemon.mod.common.pokemon.aspects.CHARACTERISTIC_RAINBOW_ASPECT
@@ -358,6 +360,8 @@ object Cobblemon {

        CobblemonEvents.POKEMON_PROPERTY_INITIALISED.emit(Unit)

+        BlockScanProviderRegistry.register(cobblemonResource("berry"), BerryBlockScanProvider)
+
        CallbackHandler.setup()
        EntityCallbackHandler.setup()

@@ -0,0 +1,15 @@
+package com.cobblemon.mod.common.api.pokedex.scan
+
+object BlockScanDefinition {
+    data class Frame(
+        val slot: Int,
+        val text: ScanText,
+        val scale: Float? = null
+    )
+
+    sealed interface ScanText {
+        data class Literal(val text: String) : ScanText
+        data class Key(val key: String) : ScanText
+        data class Translate(val key: String, val with: List<ScanText> = emptyList()) : ScanText
+    }
+}
@@ -0,0 +1,14 @@
+package com.cobblemon.mod.common.api.pokedex.scan
+
+import com.cobblemon.mod.common.pokedex.scanner.block.BlockScanProvider
+import net.minecraft.resources.ResourceLocation
+
+object BlockScanProviderRegistry {
+    private val providers = mutableMapOf<ResourceLocation, BlockScanProvider>()
+
+    fun register(typeId: ResourceLocation, provider: BlockScanProvider) {
+        providers[typeId] = provider
+    }
+
+    fun get(typeId: ResourceLocation): BlockScanProvider? = providers[typeId]
+}
@@ -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) }
@@ -8,9 +8,11 @@

 package com.cobblemon.mod.common.client.pokedex

+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.pokedex.PokedexLearnedInformation
 import com.cobblemon.mod.common.api.text.*
+import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay.Companion.SCALE
@@ -24,6 +26,11 @@ 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 com.cobblemon.mod.common.api.pokedex.scan.BlockScanDefinition
+import com.cobblemon.mod.common.api.pokedex.scan.BlockScanProviderRegistry
+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
@@ -32,6 +39,7 @@ import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth.clamp
+import net.minecraft.world.item.ItemStack
 import org.joml.Quaternionf
 import kotlin.math.*

@@ -82,13 +90,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
+
    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 effectiveTypeId = blockEntityInFocus
+                        ?.let { BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(it.type) }
+                        ?: lastFocusedBlockTypeId
+
+                    // if a block entity is being focused on make sure we only show the frames needed
+                    if (pokedexEntityData == null && effectiveTypeId != null) {
+                        val provider = BlockScanProviderRegistry.get(effectiveTypeId)
+                        if (provider != null) {
+                            val hasFrameForSlot = provider.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 +150,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 +245,70 @@ 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) {
+                            val typeId = BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(blockEntityInFocus.type) ?: return@forEachIndexed
+                            val provider = BlockScanProviderRegistry.get(typeId) ?: return@forEachIndexed
+                            val values = provider.getValues(blockEntityInFocus)
+                            val frame = provider.frames.firstOrNull { it.slot == infoDisplayedCounter } ?: return@forEachIndexed
+                            val textComponent = resolveScanText(frame.text, values).bold()
+
+                            val scale = frame.scale
+                            if (scale != null) {
                                drawScaledText(
                                    context = graphics,
                                    font = CobblemonResources.DEFAULT_LARGE,
-                                    text = text(splitLines[1]).bold(),
+                                    text = textComponent,
                                    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 = textComponent,
                                    x = centerX + xOffset + xOffsetText,
                                    y = centerY + yOffset + yOffsetText,
                                    shadow = true,
@@ -462,4 +539,27 @@ 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())
+        }
+    }
+
+    private fun resolveScanText(
+        spec: BlockScanDefinition.ScanText,
+        values: Map<String, Any?>
+    ): MutableComponent {
+        return when (spec) {
+            is BlockScanDefinition.ScanText.Literal -> text(spec.text)
+            is BlockScanDefinition.ScanText.Key -> anyToComponent(values[spec.key])
+            is BlockScanDefinition.ScanText.Translate -> {
+                val args = spec.with.map { resolveScanText(it, values) }.toTypedArray()
+                lang(spec.key, *args)
+            }
+        }
+    }
 }
@@ -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)
@@ -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
@@ -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
@@ -9,11 +9,17 @@
 package com.cobblemon.mod.common.pokedex.scanner

 import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.block.entity.BerryBlockEntity
 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 com.cobblemon.mod.common.api.pokedex.scan.BlockScanProviderRegistry
+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 +106,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
+    }
 }
@@ -0,0 +1,47 @@
+package com.cobblemon.mod.common.pokedex.scanner.block
+
+import com.cobblemon.mod.common.api.pokedex.scan.BlockScanDefinition
+import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.block.BerryBlock
+import com.cobblemon.mod.common.block.entity.BerryBlockEntity
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.level.block.entity.BlockEntity
+
+object BerryBlockScanProvider : BlockScanProvider {
+    override val frames = listOf(
+        BlockScanDefinition.Frame(
+            slot = 1,
+            text = BlockScanDefinition.ScanText.Translate(
+                key = "ui.pokedex.scan.berry.stage",
+                with = listOf(BlockScanDefinition.ScanText.Key("stage"))
+            )
+        ),
+        BlockScanDefinition.Frame(
+            slot = 2,
+            text = BlockScanDefinition.ScanText.Key("berry_name")
+        ),
+        BlockScanDefinition.Frame(
+            slot = 3,
+            text = BlockScanDefinition.ScanText.Translate(
+                key = "ui.pokedex.scan.berry.mulch",
+                with = listOf(BlockScanDefinition.ScanText.Key("mulch_variant"))
+            ),
+            scale = 1.0f
+        )
+    )
+
+    override fun getValues(be: BlockEntity): Map<String, Any?> {
+        val berry = be as BerryBlockEntity
+        val stage = runCatching { berry.blockState.getValue(BerryBlock.AGE) }.getOrDefault(0)
+        val berryName = berry.berry()?.item()?.let { ItemStack(it).hoverName.copy().bold() }
+            ?: berry.berryIdentifier.toString().text().bold()
+
+        return mapOf(
+            "stage" to stage,
+            "mulch_variant" to berry.mulchVariant.toString(),
+            "berry_identifier" to berry.berryIdentifier.toString(),
+            "berry_name" to berryName
+        )
+    }
+}
@@ -0,0 +1,9 @@
+package com.cobblemon.mod.common.pokedex.scanner.block
+
+import com.cobblemon.mod.common.api.pokedex.scan.BlockScanDefinition
+import net.minecraft.world.level.block.entity.BlockEntity
+
+interface BlockScanProvider {
+    val frames: List<BlockScanDefinition.Frame>
+    fun getValues(be: BlockEntity): Map<String, Any?>
+}
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": "Mulch: %s",
+
  "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",
@@ -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 },
@@ -8672,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 } ]
  },
@@ -0,0 +1,35 @@
+{
+  "timeline": [
+    {
+      "type": "add_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "animation",
+      "animation": ["gigatonhammer"],
+      "delay": 0.3
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.gigatonhammer.actor');"]
+    },
+    {
+      "type": "pause",
+      "pause": 1.1
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.gigatonhammer.target');"]
+    },
+    {
+      "type": "remove_holds",
+      "holds": ["effects"]
+    },
+    {
+      "type": "pause",
+      "pause": 1.5
+    }
+  ]
+}
@@ -3,11 +3,38 @@
    {
      "type": "add_holds",
      "holds": ["effects"]
+
    },
    {
      "type": "animation",
-      "animation": ["pyroball"],
-      "delay": 2.05
+      "animation": ["pyroball"]
+    },
+    {
+      "type": "pause",
+      "pause" : 0.1
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('move.pyroball.actor');"]
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == true",
+      "expressions": ["q.sound('pokemon.cinderace.pyroball');"]
+    },
+    {
+      "type": "pause",
+      "pause" : 1.875
+    },
+    {
+      "type": "entity_molang",
+      "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
+      "expressions": ["q.sound('move.pyroball.target');"]
+    },
+    {
+      "type": "pause",
+      "pause" : 0.175
    },
    {
      "type": "entity_particles",
@@ -14,7 +14,7 @@
    }
  ],
    "type": "cobblemon:cooking_pot_shapeless",
-    "category": "medicines",
+    "category": "misc",
    "ingredients": [
        {
            "item": "create:experience_nugget"
@@ -6,6 +6,7 @@
  "maleRatio": 0.875,
  "height": 16,
  "weight": 855,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.blastoise.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 17,
  "weight": 1200,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.dewgong.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 13,
  "weight": 545,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.mrmime.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 10,
  "weight": 295,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.parasect.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 19,
  "weight": 1200,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.rhydon.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.5,
  "height": 10,
  "weight": 1150,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.rhyhorn.desc"
  ],
@@ -7,6 +7,7 @@
  "maleRatio": 0.875,
  "height": 20,
  "weight": 1000,
+  "silenceStepSounds": true,
  "pokedex": [
    "cobblemon.species.venusaur.desc"
  ],
@@ -6,6 +6,7 @@
    "cobblemon:tart_apple",
 	"cobblemon:syrupy_apple",
 	"cobblemon:candied_apple",
-    { "id": "create:honeyed_apple","required": false }
+    { "id": "create:honeyed_apple","required": false },
+    { "id": "nomansland:honeyed_apple","required": false }
  ]
 }
Author	SHA1	Message	Date
whatsy	04553d658f	Merge branch 'main' into berry-tree-scanning # Conflicts: # common/src/main/resources/assets/cobblemon/lang/en_us.json	2026-11-02 11:54:19 -05:00
Polymeta	99e0a26d7b	Merge branch 'compat-improvements' into 'main' teeny fixes to compat See merge request cable-mc/cobblemon!2520	2026-11-02 09:17:39 +00:00
dhi_holo	71753df513	Leftovers Also a slight fix to the order in changelog	2026-11-02 13:30:23 +10:00
dhi_holo	729f080f6e	Merge branch 'main' into compat-improvements	2026-11-02 13:26:43 +10:00
dhi_holo	13eb57afb1	category fix Fixing one recipe category I missed teehee	2026-11-02 13:23:42 +10:00
Jackson Bowes	72b6cb06ff	Merge branch 'soon-to-be-implemented-steps' into 'main' Implementing some steps See merge request cable-mc/cobblemon!2519	2026-11-01 08:15:06 -06:00
Jackson Bowes	74a57eb972	Merge branch 'sterr/move-sound-implementation' into 'main' Added sounds to Gigaton Hammer and Pyro Ball See merge request cable-mc/cobblemon!2518	2026-11-01 08:14:14 -06:00
Sterrezo	7246c7f8e6	Update CHANGELOG.md	2026-11-01 13:22:32 +01:00
Sterrezo	cd05f741ae	Merge branch 'main' into soon-to-be-implemented-steps	2026-11-01 13:21:23 +01:00
Sterrezo	00222d929d	Added sounds to Gigaton Hammer and Pyro Ball	2026-11-01 13:18:22 +01:00
Polymeta	b8f4637cb3	Merge branch 'feat/power-ride-training' into 'main' power bracer ride stat training See merge request cable-mc/cobblemon!2503	2026-10-31 12:33:22 +00:00
Ronak Chavva	9f572250f5	fix(*): modularization	2026-10-31 06:59:37 -05:00
Ronak Chavva	0927d6fa43	fix(*): enum change, configurable item stat	2026-10-31 06:26:45 -05:00
Ronak Chavva	a293b3d71f	changelog additions	2026-10-31 05:09:36 -05:00
Ronak Chavva	162b1cc68f	Merge branch 'main' of https://gitlab.com/ronakch8/cobblemon into feat/power-ride-training	2026-10-31 05:07:29 -05:00
Ronak Chavva	066a6b56f7	Merge branch 'main' of https://gitlab.com/ronakch8/cobblemon into feat/power-ride-training	2026-10-23 18:13:32 -05:00
Ronak Chavva	7687833add	mapping rewrite	2026-10-22 21:35:48 -05:00
Ronak Chavva	cb9ba82fcc	holding power bracer while riding, 1 to all 5 stats	2026-10-22 03:11:14 -05:00
Sterrezo	4221993f7d	Added stepsounds to Mr. Mime	2026-10-03 14:39:21 +02:00
Sterrezo	a616c25c8c	Added stepsounds to Parasect	2026-09-30 14:45:00 +02:00
Sterrezo	6ce4bf5673	Added stepsounds to Rhyhorn	2026-09-30 14:34:07 +02:00
Sterrezo	1b652ba99f	Added stepsounds to Rhydron	2026-09-30 14:01:50 +02:00
Sterrezo	11b59df386	Added stepsounds to Dewgong	2026-09-28 20:20:16 +02:00
Sterrezo	ac2b068bf3	Added stepsounds to Blastoise	2026-09-28 14:06:42 +02:00
Sterrezo	8e8f346e52	Added stepsounds keyframes to Venusaur	2026-09-28 13:47:47 +02:00
Plastered_Crab	ee8133356e	Remove test logging	2026-06-08 13:54:11 -07:00
Plastered_Crab	d78e114b3b	Revision to move to only code only providers for pokedex scanning of blocks and block entities	2026-06-08 13:23:22 -07:00
Plastered_Crab	14ab259eee	Merge branch 'main' into berry-tree-scanning # Conflicts: # common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt # common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt	2026-06-08 10:38:19 -07:00
Plastered_Crab	a8f78e3fd6	Merge branch 'main' into berry-tree-scanning	2026-03-02 12:54:16 -08:00
Plastered_Crab	96ae054aae	Changelog	2026-01-19 16:06:48 -08:00
Plastered_Crab	80666530db	Clean Up	2026-01-19 16:05:56 -08:00
Plastered_Crab	b5e912a13f	Fix closing animation and implement datapackable block entity scanning	2026-01-19 15:34:22 -08:00
Plastered_Crab	945f6b5f84	So close to getting Pokedex Scannable block entities datapackable	2025-12-19 16:07:16 -08:00
Plastered_Crab	bf6c668850	WIP system for scanning Berry Bushes for info. Might expand it into a generalized BlockEntity scanning system	2025-12-19 11:43:43 -08:00