add pokemon.can_learn(move_id, <by type>)

i.e. pokemon.can_learn("tackle", "level") would return true
type is optional, defaults to returning whether they can learn move by any method (tm/egg/tutor/level/form_change/evolution)

CHANGELOG.md

@@ -99,16 +99,27 @@
 - Probopass
 - Magnezone
 - Metagross
+- Added Syrupy Apples.
 
 ### Changes
 - Renamed `chargeGainedPerTick` config to `secondsToChargeHealingMachine`.
 - Made Blocks of Gold count as Big Nuggets when held by a Pokémon (for Fling functionality)
+- Players can now eat Sweet and Tart Apples, Whipped Dreams, and the Alcremie Sweets.
+- Updated Sweet and Tart Apple sprites
+- Updated the following recipes: Air Balloon, Assault Vest, Binding Band, Black Belt, Blunder Policy, Choice Band, Choice Scarf, Cleanse Tag, Covert Cloak, Destiny Knot, Eject Button, Expert Belt, Focus Band, Focus Sash, Magnet, Metronome, Muscle Band, Power Anklet, Power Band, Power Belt, Power Bracer, Power Lens, Power Weight, Protective Pads, Protein, Punching Glove, Reaper Cloth, Rocky Helmet, Room Service, Sachet, Safety Goggles, Silk Scarf, Spell Tag, Utility Umbrella, Weakness Policy, Zinc
+- Added alternate ingredient options to the following recipes: Cell Battery, Charcoal Stick, Dragon Fang, Miracle Seed, Mystic Water, Never Melt Ice, Twisted Spoon, Damp Rock, Heat Rock, Icy Rock, Smooth Rock
+- Grouped together some recipes within the Recipe Book. Groups include: the seven basic Poké Balls, the seven basic Ancient Poké Balls, Gilded Chests, Pokedexes, and the Weather Rocks.
+- Updated some item tags to better integrate behaviours between Cobblemon, Vanilla Minecraft, and other mods
+  - Removed Cooked Meat, Raw Meat, Protein Ingredients, and Zinc Ingredients, the first two are now using `c` namespace tags, the latter have better integrated use of tags within their recipes which removes need for custom tags.
+  - Added our seeds tag into `#c:seeds`, which is now made use of for the Miracle Seed recipe. 
+- Tweaked the Natural Materials Vanilla file to fit with the changes to tags
 - Substantially optimised spawning checks mainly by front-loading biome filtering.
 - When using the `cobblemon` or `generation_9` capture calculators a critical capture with a single shake will always play for successful captures when you've already registered the Pokémon as caught in your Pokédex.
 - Improved the performance of saving Pokédex and player data.
 - Pokémon hitbox now scales with entity attribute `generic.scale`.
 - Removed Shulker aspect and replaced it with cosmetic_item-shulker_shell.
 - Shulker shell Forretress is now a cosmetic rather than a special evo and thus all shulker Forretress will revert back to normal until a shulker shell is put in their cosmetic slot.
+- Updated `doPokemonSpawning` gamerule to support per-dimension configurations.
 
 ### Fixes
 - Fixed Particles sometimes facing the wrong direction (looking at you, Swords Dance)

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

@@ -293,20 +293,21 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val REAPER_CLOTH = noSettingsItem("reaper_cloth")
     @JvmField val PRISM_SCALE = noSettingsItem("prism_scale")
     @JvmField val SACHET = noSettingsItem("sachet")
-    @JvmField val WHIPPED_DREAM = noSettingsItem("whipped_dream")
-    @JvmField val STRAWBERRY_SWEET = noSettingsItem("strawberry_sweet")
-    @JvmField val LOVE_SWEET = noSettingsItem("love_sweet")
-    @JvmField val BERRY_SWEET = noSettingsItem("berry_sweet")
-    @JvmField val CLOVER_SWEET = noSettingsItem("clover_sweet")
-    @JvmField val FLOWER_SWEET = noSettingsItem("flower_sweet")
-    @JvmField val STAR_SWEET = noSettingsItem("star_sweet")
-    @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
+    @JvmField val WHIPPED_DREAM = create("whipped_dream", foodItem(8, 0.3f))
+    @JvmField val STRAWBERRY_SWEET = create("strawberry_sweet", foodItem(6, 0.125f))
+    @JvmField val LOVE_SWEET = create("love_sweet", foodItem(6, 0.125f))
+    @JvmField val BERRY_SWEET = create("berry_sweet", foodItem(6, 0.125f))
+    @JvmField val CLOVER_SWEET = create("clover_sweet", foodItem(6, 0.125f))
+    @JvmField val FLOWER_SWEET = create("flower_sweet", foodItem(6, 0.125f))
+    @JvmField val STAR_SWEET = create("star_sweet", foodItem(6, 0.125f))
+    @JvmField val RIBBON_SWEET = create("ribbon_sweet", foodItem(6, 0.125f))
     @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
     @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
     @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
     @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
-    @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
-    @JvmField val TART_APPLE = noSettingsItem("tart_apple")
+    @JvmField val SWEET_APPLE = create("sweet_apple", foodItem(4, 0.3f))
+    @JvmField val TART_APPLE = create("tart_apple", foodItem(4, 0.3f))
+    @JvmField val SYRUPY_APPLE = create("syrupy_apple", foodItem(4, 0.3f))
     @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
     @JvmField val GALARICA_WREATH = noSettingsItem("galarica_wreath")
     @JvmField val BLACK_AUGURITE = noSettingsItem("black_augurite")
@@ -1358,4 +1359,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return createdItem
     }
 
+    private fun foodItem(nutrition: Int, saturationModifier: Float): Item {
+        return Item(Item.Properties().food(FoodProperties.Builder().nutrition(nutrition).saturationModifier(saturationModifier).build()))
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -24,12 +24,16 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.dialogue.PlayerDialogueFaceProvider
 import com.cobblemon.mod.common.api.dialogue.ReferenceDialogueFaceProvider
 import com.cobblemon.mod.common.api.mark.Marks
+import com.cobblemon.mod.common.api.moves.MoveTemplate
+import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import com.cobblemon.mod.common.api.moves.animations.NPCProvider
 import com.cobblemon.mod.common.api.pokedex.*
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.api.pokemon.moves.Learnset
+import com.cobblemon.mod.common.api.pokemon.moves.LearnsetQuery
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.scripting.CobblemonScripts
 import com.cobblemon.mod.common.api.spawning.context.SpawningContext
@@ -782,6 +786,26 @@ object MoLangFunctions {
                 }
                 struct
             }
+            map.put("learnset") { pokemon.form.moves.asMoLangValue() }
+            map.put("can_learn") { params ->
+                val moveId = params.getString(0)
+                val move = Moves.getByName(moveId) ?: return@put DoubleValue.ZERO
+                val learnType = params.getStringOrNull(1) ?: return@put DoubleValue(
+                    LearnsetQuery.ANY.canLearn(move, pokemon.form.moves)
+                )
+
+                val query = when (learnType) {
+                    "tm" -> LearnsetQuery.TM_MOVE
+                    "egg" -> LearnsetQuery.EGG_MOVE
+                    "tutor" -> LearnsetQuery.TUTOR_MOVES
+                    "level" -> LearnsetQuery.ANY_LEVEL
+                    "form_change" -> LearnsetQuery.FORM_CHANGE
+                    "evolution" -> LearnsetQuery.EVOLUTION
+                    else -> LearnsetQuery.ANY
+                }
+
+                DoubleValue(query.canLearn(move, pokemon.form.moves))
+            }
             map.put("is_wild") { DoubleValue(pokemon.entity?.let { it.ownerUUID == null } == true) }
             map.put("is_shiny") { DoubleValue(pokemon.shiny) }
             map.put("species") { pokemon.species.struct }
@@ -1114,11 +1138,43 @@ object MoLangFunctions {
             map.put("hitbox_height") { DoubleValue(species.hitbox.height) }
             map.put("hitbox_fixed") { DoubleValue(species.hitbox.fixed) }
             map.put("catch_rate") { DoubleValue(species.catchRate) }
+            map.put("learnset") { species.moves.asMoLangValue() }
 
             map
         }
     )
 
+    val learnsetFunctions: MutableList<(Learnset) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
+        { learnset ->
+            val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
+
+            map.put("tutor_moves") { learnset.tutorMoves.map { it.struct }.asArrayValue() }
+            map.put("egg_moves") { learnset.eggMoves.map { it.struct }.asArrayValue() }
+            map.put("tm_moves") { learnset.tmMoves.map { it.struct }.asArrayValue() }
+            map.put("evolution_moves") { learnset.evolutionMoves.map { it.struct }.asArrayValue() }
+            map.put("form_change_moves") { learnset.formChangeMoves.map { it.struct }.asArrayValue() }
+
+            map.put("get_level_up_moves_to") { params ->
+                val level = params.getIntOrNull(0) ?: 0
+                learnset.getLevelUpMovesUpTo(level).map { it.struct }.asArrayValue()
+            }
+
+            map.put("level_up_moves") {
+                val struct = QueryStruct(hashMapOf())
+                for (level in learnset.levelUpMoves.keys) {
+                    struct.addFunction("$level") {
+                        learnset.levelUpMoves[level]?.map { it.struct }?.asArrayValue() ?: ArrayStruct()
+                    }
+                }
+                struct
+            }
+
+            map
+        }
+    )
+
+
+
     val pokemonPropertiesFunctions: MutableList<(PokemonProperties) -> HashMap<String, java.util.function.Function<MoParams, Any>>> = mutableListOf(
         { props ->
             val map = hashMapOf<String, java.util.function.Function<MoParams, Any>>()
@@ -1283,6 +1339,18 @@ object MoLangFunctions {
         return value
     }
 
+    fun Learnset.asMoLangValue(): ObjectValue<Learnset> {
+        val value = ObjectValue(
+            obj = this,
+            stringify = { it.toString() }
+        )
+
+        value.addFunctions(learnsetFunctions.flatMap { it(this).entries.map { it.key to it.value } }.toMap())
+
+        return value
+
+    }
+
     fun PokemonEntity.asMoLangValue(): ObjectValue<PokemonEntity> {
         val value = ObjectValue(
             obj = this,

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

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.util.server
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
+import net.minecraft.server.level.ServerLevel
 import java.util.UUID
 import net.minecraft.server.level.ServerPlayer
 
@@ -32,24 +33,45 @@ object CobblemonWorldSpawnerManager : SpawnerManager() {
     init {
         PlatformEvents.SERVER_PLAYER_LOGIN.subscribe { this.onPlayerLogin(it.player) }
         PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe { this.onPlayerLogout(it.player) }
+        PlatformEvents.CHANGE_DIMENSION.subscribe { this.onDimensionChange(it.player, it.origin, it.destination) }
     }
 
     fun onPlayerLogin(player: ServerPlayer) {
         // Disables spawning
-        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
+        if (!Cobblemon.config.enableSpawning || player.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
             return;
         }
 
-        val spawner = PlayerSpawnerFactory.create(this, player)
-        spawnersForPlayers[player.uuid] = spawner
-        registerSpawner(spawner)
+        registerPlayerSpawner(player)
     }
 
     fun onPlayerLogout(player: ServerPlayer) {
-        val spawner = spawnersForPlayers[player.uuid]
-        if (spawner != null) {
-            spawnersForPlayers.remove(player.uuid)
-            unregisterSpawner(spawner)
+        unregisterPlayerSpawner(player)
+    }
+
+    fun onDimensionChange(player: ServerPlayer, origin: ServerLevel?, destination: ServerLevel?) {
+        fun getSpawnRule(level: ServerLevel?) = level?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING)
+
+        if (!Cobblemon.config.enableSpawning || getSpawnRule(origin) == getSpawnRule(destination)) {
+            return
+        }
+
+        val spawnerAction = if (destination?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
+            ::unregisterPlayerSpawner
+        } else {
+            ::registerPlayerSpawner
+        }
+        spawnerAction(player)
+    }
+
+    private fun unregisterPlayerSpawner(player: ServerPlayer) {
+        spawnersForPlayers.remove(player.uuid)?.let { unregisterSpawner(it) }
+    }
+
+    private fun registerPlayerSpawner(player: ServerPlayer) {
+        PlayerSpawnerFactory.create(this, player).also {
+            spawnersForPlayers[player.uuid] = it
+            registerSpawner(it)
         }
     }
 }

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

@@ -71,10 +71,15 @@ open class SpawnerManager {
 
     open fun onServerTick() {
         // Disables spawning
-        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
+        if (!Cobblemon.config.enableSpawning) {
             return
         }
         influences.removeIf { it.isExpired() }
-        getSpawnersOfType<TickingSpawner>().forEach(TickingSpawner::tick)
+        getSpawnersOfType<TickingSpawner>().forEach {
+            if (it.getCauseEntity()?.level()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
+                return@forEach
+            }
+            it.tick()
+        }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt

@@ -353,6 +353,18 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.LEEK_AND_POTATO_STEW)
         entries.accept(CobblemonItems.BRAISED_VIVICHOKE)
         entries.accept(CobblemonItems.VIVICHOKE_DIP)
+        entries.accept(CobblemonItems.TART_APPLE)
+        entries.accept(CobblemonItems.SWEET_APPLE)
+        entries.accept(CobblemonItems.SYRUPY_APPLE)
+        entries.accept(CobblemonItems.WHIPPED_DREAM)
+        entries.accept(CobblemonItems.STRAWBERRY_SWEET)
+        entries.accept(CobblemonItems.LOVE_SWEET)
+        entries.accept(CobblemonItems.BERRY_SWEET)
+        entries.accept(CobblemonItems.CLOVER_SWEET)
+        entries.accept(CobblemonItems.FLOWER_SWEET)
+        entries.accept(CobblemonItems.STAR_SWEET)
+        entries.accept(CobblemonItems.RIBBON_SWEET)
+
         entries.accept(CobblemonItems.BERRY_JUICE)
         entries.accept(CobblemonItems.REMEDY)
         entries.accept(CobblemonItems.FINE_REMEDY)
@@ -475,6 +487,7 @@ object CobblemonItemGroups {
         entries.accept(CobblemonItems.WHIPPED_DREAM)
         entries.accept(CobblemonItems.TART_APPLE)
         entries.accept(CobblemonItems.SWEET_APPLE)
+        entries.accept(CobblemonItems.SYRUPY_APPLE)
         entries.accept(CobblemonItems.CRACKED_POT)
         entries.accept(CobblemonItems.CHIPPED_POT)
         entries.accept(CobblemonItems.MASTERPIECE_TEACUP)
@@ -644,9 +657,23 @@ object CobblemonItemGroups {
     }
 
     private fun foodInjections(injector: Injector) {
+        injector.putAfter(CobblemonItems.TART_APPLE, Items.ENCHANTED_GOLDEN_APPLE)
+        injector.putAfter(CobblemonItems.SWEET_APPLE, CobblemonItems.TART_APPLE)
+        injector.putAfter(CobblemonItems.SYRUPY_APPLE, CobblemonItems.SWEET_APPLE)
+
         injector.putAfter(CobblemonItems.MEDICINAL_LEEK, Items.POISONOUS_POTATO)
         injector.putAfter(CobblemonItems.ROASTED_LEEK, CobblemonItems.MEDICINAL_LEEK)
         injector.putAfter(CobblemonItems.BRAISED_VIVICHOKE, CobblemonItems.ROASTED_LEEK)
+
+        injector.putAfter(CobblemonItems.WHIPPED_DREAM, Items.PUMPKIN_PIE)
+        injector.putAfter(CobblemonItems.STRAWBERRY_SWEET, CobblemonItems.WHIPPED_DREAM)
+        injector.putAfter(CobblemonItems.LOVE_SWEET, CobblemonItems.STRAWBERRY_SWEET)
+        injector.putAfter(CobblemonItems.BERRY_SWEET, CobblemonItems.LOVE_SWEET)
+        injector.putAfter(CobblemonItems.CLOVER_SWEET, CobblemonItems.BERRY_SWEET)
+        injector.putAfter(CobblemonItems.FLOWER_SWEET, CobblemonItems.CLOVER_SWEET)
+        injector.putAfter(CobblemonItems.STAR_SWEET, CobblemonItems.FLOWER_SWEET)
+        injector.putAfter(CobblemonItems.RIBBON_SWEET, CobblemonItems.STAR_SWEET)
+
         injector.putAfter(CobblemonItems.LEEK_AND_POTATO_STEW, Items.RABBIT_STEW)
         injector.putAfter(CobblemonItems.VIVICHOKE_DIP, CobblemonItems.LEEK_AND_POTATO_STEW)
     }

common/src/main/kotlin/com/cobblemon/mod/common/platform/events/ChangeDimensionEvent.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.platform.events
 
+import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 
-class ChangeDimensionEvent(val player: ServerPlayer)
+class ChangeDimensionEvent(val player: ServerPlayer, val origin: ServerLevel?, val destination: ServerLevel?)

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

@@ -127,31 +127,33 @@
   "item.cobblemon.whipped_dream": "Whipped Dream",
   "item.cobblemon.whipped_dream.tooltip": "Evolves Swirlix into Slurpuff when held while trading",
   "item.cobblemon.strawberry_sweet": "Strawberry Sweet",
-  "item.cobblemon.strawberry_sweet.tooltip": "Evolves Milcery into Alcremie's Strawberry form",
+  "item.cobblemon.strawberry_sweet.tooltip": "Evolves Milcery into Alcremie with a Strawberry Sweet",
   "item.cobblemon.love_sweet": "Love Sweet",
-  "item.cobblemon.love_sweet.tooltip": "Evolves Milcery into Alcremie's Love form",
+  "item.cobblemon.love_sweet.tooltip": "Evolves Milcery into Alcremie with a Love Sweet",
   "item.cobblemon.berry_sweet": "Berry Sweet",
-  "item.cobblemon.berry_sweet.tooltip": "Evolves Milcery into Alcremie's Berry form",
+  "item.cobblemon.berry_sweet.tooltip": "Evolves Milcery into Alcremie with a Berry Sweet",
   "item.cobblemon.clover_sweet": "Clover Sweet",
-  "item.cobblemon.clover_sweet.tooltip": "Evolves Milcery into Alcremie's Clover form",
+  "item.cobblemon.clover_sweet.tooltip": "Evolves Milcery into Alcremie with a Clover Sweet",
   "item.cobblemon.flower_sweet": "Flower Sweet",
-  "item.cobblemon.flower_sweet.tooltip": "Evolves Milcery into Alcremie's Flower form",
+  "item.cobblemon.flower_sweet.tooltip": "Evolves Milcery into Alcremie with a Flower Sweet",
   "item.cobblemon.star_sweet": "Star Sweet",
-  "item.cobblemon.star_sweet.tooltip": "Evolves Milcery into Alcremie's Star form",
+  "item.cobblemon.star_sweet.tooltip": "Evolves Milcery into Alcremie with a Star Sweet",
   "item.cobblemon.ribbon_sweet": "Ribbon Sweet",
-  "item.cobblemon.ribbon_sweet.tooltip": "Evolves Milcery into Alcremie's Ribbon form",
+  "item.cobblemon.ribbon_sweet.tooltip": "Evolves Milcery into Alcremie with a Ribbon Sweet",
   "item.cobblemon.chipped_pot": "Chipped Pot",
   "item.cobblemon.chipped_pot.tooltip": "Evolves Antique Sinistea into Polteageist",
   "item.cobblemon.cracked_pot": "Cracked Pot",
   "item.cobblemon.cracked_pot.tooltip": "Evolves Phony Sinistea into Polteageist",
   "item.cobblemon.masterpiece_teacup": "Masterpiece Teacup",
-  "item.cobblemon.masterpiece_teacup.tooltip": "Evolves Artisan Form Poltchageist into Masterpiece Sinistcha",
+  "item.cobblemon.masterpiece_teacup.tooltip": "Evolves Artisan Poltchageist into Masterpiece Sinistcha",
   "item.cobblemon.unremarkable_teacup": "Unremarkable Teacup",
   "item.cobblemon.unremarkable_teacup.tooltip": "Evolves Counterfeit Poltchageist into Unremarkable Sinistcha",
   "item.cobblemon.sweet_apple": "Sweet Apple",
   "item.cobblemon.sweet_apple.tooltip": "Evolves Applin into Appletun",
   "item.cobblemon.tart_apple": "Tart Apple",
   "item.cobblemon.tart_apple.tooltip": "Evolves Applin into Flapple",
+  "item.cobblemon.syrupy_apple": "Syrupy Apple",
+  "item.cobblemon.syrupy_apple.tooltip": "Evolves Applin into Dipplin",
   "item.cobblemon.galarica_cuff": "Galarica Cuff",
   "item.cobblemon.galarica_cuff.tooltip": "Evolves Galarian Slowpoke into Galarian Slowbro",
   "item.cobblemon.galarica_wreath": "Galarica Wreath",
@@ -2571,55 +2573,133 @@
   "cobblemon.battle.weather.snow.upkeep": "The snow is falling down.",
   "cobblemon.battle.weather.snow.end": "The snow stopped.",
 
+  "cobblemon.battle.start.aquaring": "%1$s surrounded itself with a veil of water!",
+  "cobblemon.battle.start.attract": "%1$s fell in love!",
+  "cobblemon.battle.start.auroraveil": "Aurora Veil made %1$s team stronger against physical and special moves!",
+  "cobblemon.battle.start.autotomize": "%1$s became nimble!",
   "cobblemon.battle.start.bide": "%1$s begins storing energy!",
-  "cobblemon.battle.start.magnetrise": "%1$s levitated with electromagnetism!",
+  "cobblemon.battle.start.burnup": "%1$s burned itself out!",
+  "cobblemon.battle.start.charge": "%1$s began charging power!",
+  "cobblemon.battle.start.confusion": "%1$s became confused!",
+  "cobblemon.battle.start.curse": "%1$s cut its own HP and put a curse on %2$s!",
   "cobblemon.battle.start.disable": "%1$s's %2$s was disabled!",
-  "cobblemon.battle.start.nightmare": "%1$s began having a nightmare!",
+  "cobblemon.battle.start.doomdesire": "%1$s chose Doom Desire as its destiny!",
+  "cobblemon.battle.start.doubleshock": "%1$s used up all of its electricity!",
+  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
+  "cobblemon.battle.start.embargo": "%1$s can't use items anymore!",
+  "cobblemon.battle.start.encore": "%1$s must do an encore!",
+  "cobblemon.battle.start.flashfire": "The power of %1$s's fire type moves rose!",
+  "cobblemon.battle.start.focusenergy": "%1$s is getting pumped!",
+  "cobblemon.battle.start.foresight": "%1$s was identified!",
+  "cobblemon.battle.start.futuresight": "%1$s foresaw an attack!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
+  "cobblemon.battle.start.healblock": "%1$s was prevented from healing!",
   "cobblemon.battle.start.imprison": "%1$s sealed any moves its target shares with it!",
-  "cobblemon.battle.start.snatch": "%1$s is waiting for a target to make a move!",
+  "cobblemon.battle.start.ingrain": "%1$s planted its roots!",
+  "cobblemon.battle.start.laserfocus": "%1$s concentrated intensely!",
+  "cobblemon.battle.start.leechseed": "%1$s was seeded!",
+  "cobblemon.battle.start.lockon": "%2$s took aim at %1$s!",
+  "cobblemon.battle.start.magnetrise": "%1$s levitated with electromagnetism!",
+  "cobblemon.battle.start.mimic": "%1$s learned %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s was identified!",
+  "cobblemon.battle.start.nightmare": "%1$s began having a nightmare!",
   "cobblemon.battle.start.noretreat": "%1$s can no longer escape because it used No Retreat!",
+  "cobblemon.battle.start.octolock": "%1$s can no longer escape because of Octolock!",
+  "cobblemon.battle.start.perish": "%1$s's perish count fell to %2$s.",
+  "cobblemon.battle.start.powershift": "%1$s swapped its offensive stats with its defensive stats!",
+  "cobblemon.battle.start.powertrick": "%1$s switched its Attack and Defense!",
+  "cobblemon.battle.start.reflecttype": "%1$s's type became the same as %2$s's type!",
   "cobblemon.battle.start.saltcure": "%1$s is being salt cured!",
   "cobblemon.battle.start.shedtail": "%1$s shed its tail to create a decoy!",
   "cobblemon.battle.start.smackdown": "%1$s fell straight down!",
-  "cobblemon.battle.start.torment": "%1$s was subjected to torment!",
-  "cobblemon.battle.start.foresight": "%1$s was identified!",
-  "cobblemon.battle.start.telekinesis": "%1$s was hurled into the air!",
-  "cobblemon.battle.start.laserfocus": "%1$s concentrated intensely!",
-  "cobblemon.battle.start.lockon": "%2$s took aim at %1$s!",
-  "cobblemon.battle.start.yawn": "%1$s grew drowsy!",
-  "cobblemon.battle.start.perish": "%1$s's perish count fell to %2$s.",
-  "cobblemon.battle.start.leechseed": "%1$s was seeded!",
-  "cobblemon.battle.start.aquaring": "%1$s surrounded itself with a veil of water!",
-  "cobblemon.battle.start.charge": "%1$s began charging power!",
-  "cobblemon.battle.start.taunt": "%1$s fell for the taunt!",
-  "cobblemon.battle.start.autotomize": "%1$s became nimble!",
-  "cobblemon.battle.start.attract": "%1$s fell in love!",
-  "cobblemon.battle.start.focusenergy": "%1$s is getting pumped!",
-  "cobblemon.battle.start.uproar": "%1$s caused an uproar!",
-  "cobblemon.battle.start.curse": "%1$s cut its own HP and put a curse on %2$s!",
-  "cobblemon.battle.start.miracleeye": "%1$s was identified!",
-  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
-  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
-  "cobblemon.battle.start.encore": "%1$s must do an encore!",
-  "cobblemon.battle.start.futuresight": "%1$s foresaw an attack!",
-  "cobblemon.battle.start.ingrain": "%1$s planted its roots!",
-  "cobblemon.battle.start.healblock": "%1$s was prevented from healing!",
-  "cobblemon.battle.start.mimic": "%1$s learned %2$s!",
-  "cobblemon.battle.start.octolock": "%1$s can no longer escape because of Octolock!",
-  "cobblemon.battle.start.burnup": "%1$s burned itself out!",
-  "cobblemon.battle.start.typechange": "%1$s transformed into the %2$s type!",
-  "cobblemon.battle.start.doomdesire": "%1$s chose Doom Desire as its destiny!",
-  "cobblemon.battle.start.doubleshock": "%1$s used up all of its electricity!",
+  "cobblemon.battle.start.snatch": "%1$s is waiting for a target to make a move!",
   "cobblemon.battle.start.stockpile": "%1$s stockpiled %2$s!",
-  "cobblemon.battle.start.powertrick": "%1$s switched its Attack and Defense!",
-  "cobblemon.battle.start.powershift": "%1$s swapped its offensive stats with its defensive stats!",
   "cobblemon.battle.start.substitute": "%1$s put in a substitute!",
-  "cobblemon.battle.start.embargo": "%1$s can't use items anymore!",
-  "cobblemon.battle.start.typeadd": "%2$s type was added to %1$s!",
-  "cobblemon.battle.start.reflecttype": "%1$s's type became the same as %2$s's type!",
+  "cobblemon.battle.start.syrupbomb": "%1$s got covered in sticky candy syrup!",
   "cobblemon.battle.start.tarshot": "%1$s became weaker to fire!",
-  "cobblemon.battle.start.confusion": "%1$s became confused!",
-  "cobblemon.battle.start.flashfire": "The power of %1$s's fire type moves rose!",
+  "cobblemon.battle.start.taunt": "%1$s fell for the taunt!",
+  "cobblemon.battle.start.telekinesis": "%1$s was hurled into the air!",
+  "cobblemon.battle.start.torment": "%1$s was subjected to torment!",
+  "cobblemon.battle.start.typeadd": "%2$s type was added to %1$s!",
+  "cobblemon.battle.start.typechange": "%1$s transformed into the %2$s type!",
+  "cobblemon.battle.start.uproar": "%1$s caused an uproar!",
+  "cobblemon.battle.start.yawn": "%1$s grew drowsy!",
+
+  "cobblemon.battle.activate.afteryou": "%1$s took the kind offer!",
+  "cobblemon.battle.activate.allyswitch": "%1$s and %2$s switched places!",
+  "cobblemon.battle.activate.aromatherapy": "A soothing aroma wafted through the area!",
+  "cobblemon.battle.activate.attract": "%1$s is in love with %2$s!",
+  "cobblemon.battle.activate.beatup": "%1$s's attack!",
+  "cobblemon.battle.activate.bide": "%1$s is storing energy!",
+  "cobblemon.battle.activate.bind": "%1$s was squeezed by %2$s!",
+  "cobblemon.battle.activate.celebrate": "Congratulations, %1$s!",
+  "cobblemon.battle.activate.clamp": "%2$s clamped down on %1$s!",
+  "cobblemon.battle.activate.courtchange": "%1$s swapped the battle effects affecting each side of the field!",
+  "cobblemon.battle.activate.craftyshield": "Crafty Shield protected %1$s!",
+  "cobblemon.battle.activate.custapberry": "%1$s can act faster than normal, thanks to its Custap Berry!",
+  "cobblemon.battle.activate.destinybond": "%1$s took its attacker down with it!",
+  "cobblemon.battle.activate.disguise": "It's disguise served it as a decoy!",
+  "cobblemon.battle.activate.electricterrain": "%1$s surrounds itself with electrified terrain!",
+  "cobblemon.battle.activate.endure": "%1$s endured the hit!",
+  "cobblemon.battle.activate.firespin": "%1$s became trapped in the fiery vortex!",
+  "cobblemon.battle.activate.focusband": "%1$s hung on using its Focus Band!",
+  "cobblemon.battle.activate.forewarn": "%2$s's %3$s was revealed!",
+  "cobblemon.battle.activate.gravity": "%1$s couldn't stay airborne because of gravity!",
+  "cobblemon.battle.activate.grudge": "%1$s's %3$s lost all of its PP due to the grudge!",
+  "cobblemon.battle.activate.guardsplit": "%1$s shared its guard with the target!",
+  "cobblemon.battle.activate.happyhour": "Everyone is caught up in the happy atmosphere!",
+  "cobblemon.battle.activate.healbell": "A bell chimed!",
+  "cobblemon.battle.activate.infestation": "%1$s has become infested!",
+  "cobblemon.battle.activate.ingrain": "%1$s anchored itself with its roots!",
+  "cobblemon.battle.activate.insomnia": "The Pokémon is suffering from insomnia and cannot fall asleep.",
+  "cobblemon.battle.activate.leppaberry": "%1$s restored PP to %3$s using its Leppa Berry!",
+  "cobblemon.battle.activate.lingeringaroma": "A lingering aroma clings to %2$s!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sucked up the liquid ooze!",
+  "cobblemon.battle.activate.lockon": "%1$s took aim at %2$s!",
+  "cobblemon.battle.activate.magmastorm": "%1$s became trapped by swirling magma!",
+  "cobblemon.battle.activate.magnitude": "Magnitude %1$s!",
+  "cobblemon.battle.activate.matblock": "%3$s was blocked by the kicked-up mat!",
+  "cobblemon.battle.activate.mindreader": "%2$s read the mind of %1$s!",
+  "cobblemon.battle.activate.mist": "%1$s is protected by the mist!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s surrounds itself with a protective mist!",
+  "cobblemon.battle.activate.mummy": "%1$s's ability became Mummy!",
+  "cobblemon.battle.activate.phantomforce": "It broke through %1$s's protection!",
+  "cobblemon.battle.activate.poltergeist": "%1$s is about to be attacked by its %3$s!",
+  "cobblemon.battle.activate.powder": "When the flame touched the powder on the Pokémon, it exploded!",
+  "cobblemon.battle.activate.powersplit": "%1$s shared its power with the target!",
+  "cobblemon.battle.activate.protect": "%1$s protected itself!",
+  "cobblemon.battle.activate.protosynthesis": "The harsh sunlight activated %1$s's Protosynthesis!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s surrounds itself with psychic terrain!",
+  "cobblemon.battle.activate.pursuit": "(%1$s is being withdrawn...)",
+  "cobblemon.battle.activate.quash": "%1$s's move was postponed!",
+  "cobblemon.battle.activate.quickclaw": "%1$s can act faster than normal, thanks to its Quick Claw!",
+  "cobblemon.battle.activate.quickguard": "Quick Guard protected %1$s",
+  "cobblemon.battle.activate.safeguard": "%1$s is protected by Safeguard!",
+  "cobblemon.battle.activate.sandtomb": "%1$s became trapped by the quicksand!",
+  "cobblemon.battle.activate.sketch": "%1$s sketched %3$s!",
+  "cobblemon.battle.activate.skillswap": "%1$s swapped Abilities with its target!",
+  "cobblemon.battle.activate.snaptrap": "%1%s got trapped by a snap trap!",
+  "cobblemon.battle.activate.snatch": "%1$s snatched %2$s's move!",
+  "cobblemon.battle.activate.speedswap": "%1$s switched Speed with its target!",
+  "cobblemon.battle.activate.spite": "It reduced the PP of %1$s's %2$s by %3$s!",
+  "cobblemon.battle.activate.stickyweb": "%1$s was caught in a sticky web!",
+  "cobblemon.battle.activate.struggle": "%1$s has no moves left!",
+  "cobblemon.battle.activate.substitute": "The substitute took damage for %1$s!",
+  "cobblemon.battle.activate.switcheroo": "%1$s switched items with its target!",
+  "cobblemon.battle.activate.synchronize": "[%1$s's Synchronize]",
+  "cobblemon.battle.activate.thundercage": "%2$s trapped %1$s!",
+  "cobblemon.battle.activate.tidyup": "Tidying up complete!",
+  "cobblemon.battle.activate.trapped": "%1$s can no longer escape!",
+  "cobblemon.battle.activate.trick":"%1$s switched items with its target!",
+  "cobblemon.battle.activate.whirlpool": "%1$s became trapped in the vortex!",
+  "cobblemon.battle.activate.wideguard": "Wide Guard protected %1$s!",
+  "cobblemon.battle.activate.wrap": "%1$s was wrapped by %2$s!",
+  "cobblemon.battle.activate.confusion": "%1$s is confused!",
+
+  "cobblemon.battle.fieldactivate.fairylock": "No one will be able to run away during the next turn!",
+  "cobblemon.battle.fieldactivate.iondeluge": "A deluge of ions showers the battlefield!",
+  "cobblemon.battle.fieldactivate.perishsong": "All Pokémon that heard the song will faint in three turns!",
+  "cobblemon.battle.fieldactivate.teatime": "It's teatime! Everyone dug in to their Berries!",
 
   "cobblemon.battle.fieldstart.electricterrain": "An electric current ran across the battlefield!",
   "cobblemon.battle.fieldstart.grassyterrain": "Grass grew to cover the battlefield!",
@@ -2643,34 +2723,29 @@
   "cobblemon.battle.fieldend.watersport": "The effects of Water Sport have faded.",
   "cobblemon.battle.fieldend.wonderroom": "Wonder Room wore off, and Defense and Sp. Def stats returned to normal!",
 
-  "cobblemon.battle.fieldactivate.perishsong": "All Pokémon that heard the song will faint in three turns!",
-  "cobblemon.battle.fieldactivate.iondeluge": "A deluge of ions showers the battlefield!",
-  "cobblemon.battle.fieldactivate.fairylock": "No one will be able to run away during the next turn!",
-  "cobblemon.battle.fieldactivate.teatime": "It's teatime! Everyone dug in to their Berries!",
-
-  "cobblemon.battle.sidestart.stealthrock": "Polished stones float in the air around %1$s team!",
-  "cobblemon.battle.sidestart.spikes": "Spikes were scattered on the ground all around %1$s team!",
-  "cobblemon.battle.sidestart.toxicspikes": "Poison spikes were scattered on the ground all around %1$s team!",
-  "cobblemon.battle.sidestart.stickyweb": "A sticky web has been laid on the ground around %1$s team!",
-  "cobblemon.battle.sidestart.reflect": "Reflect made %1$s team stronger against physical moves!",
-  "cobblemon.battle.sidestart.lightscreen": "Light Screen made %1$s team stronger against special moves!",
   "cobblemon.battle.sidestart.auroraveil": "Aurora Veil made %1$s team stronger against physical and special moves!",
-  "cobblemon.battle.sidestart.tailwind": "The Tailwind blew from behind %1$s team!",
-  "cobblemon.battle.sidestart.safeguard": "%1$s team cloaked itself in a mystical veil!",
+  "cobblemon.battle.sidestart.lightscreen": "Light Screen made %1$s team stronger against special moves!",
   "cobblemon.battle.sidestart.luckychant": "Lucky Chant shielded %1$s team from critical hits!",
   "cobblemon.battle.sidestart.mist": "%1$s team became shrouded in mist!",
+  "cobblemon.battle.sidestart.reflect": "Reflect made %1$s team stronger against physical moves!",
+  "cobblemon.battle.sidestart.safeguard": "%1$s team cloaked itself in a mystical veil!",
+  "cobblemon.battle.sidestart.spikes": "Spikes were scattered on the ground all around %1$s team!",
+  "cobblemon.battle.sidestart.stealthrock": "Polished stones float in the air around %1$s team!",
+  "cobblemon.battle.sidestart.stickyweb": "A sticky web has been laid on the ground around %1$s team!",
+  "cobblemon.battle.sidestart.tailwind": "The Tailwind blew from behind %1$s team!",
+  "cobblemon.battle.sidestart.toxicspikes": "Poison spikes were scattered on the ground all around %1$s team!",
 
-  "cobblemon.battle.sideend.stealthrock": "The pointed stones disappeared from around %1$s team!",
-  "cobblemon.battle.sideend.spikes": "The spikes disappeared from the ground around %1$s team!",
-  "cobblemon.battle.sideend.toxicspikes": "The poison spikes disappeared from the ground around %1$s team!",
-  "cobblemon.battle.sideend.stickyweb": "The sticky web has disappeared from the ground around %1$s team",
-  "cobblemon.battle.sideend.reflect": "%1$s team's Reflect wore off!",
-  "cobblemon.battle.sideend.lightscreen": "%1$s team's Light Screen wore off!",
   "cobblemon.battle.sideend.auroraveil": "%1$s team's Aurora Veil wore off!",
-  "cobblemon.battle.sideend.tailwind": "%1$s team's Tailwind petered out!",
-  "cobblemon.battle.sideend.safeguard": "%1$s team is no longer protected by Safeguard!",
+  "cobblemon.battle.sideend.lightscreen": "%1$s team's Light Screen wore off!",
   "cobblemon.battle.sideend.luckychant": "%1$s team's Lucky Chant wore off!",
   "cobblemon.battle.sideend.mist": "%1$s team is no longer protected by mist!",
+  "cobblemon.battle.sideend.reflect": "%1$s team's Reflect wore off!",
+  "cobblemon.battle.sideend.safeguard": "%1$s team is no longer protected by Safeguard!",
+  "cobblemon.battle.sideend.spikes": "The spikes disappeared from the ground around %1$s team!",
+  "cobblemon.battle.sideend.stealthrock": "The pointed stones disappeared from around %1$s team!",
+  "cobblemon.battle.sideend.stickyweb": "The sticky web has disappeared from the ground around %1$s team",
+  "cobblemon.battle.sideend.tailwind": "%1$s team's Tailwind petered out!",
+  "cobblemon.battle.sideend.toxicspikes": "The poison spikes disappeared from the ground around %1$s team!",
 
   "cobblemon.battle.cant.generic": "%1$s can't use %2$s!",
   "cobblemon.battle.cant.truant": "%1$s is loafing around!",
@@ -2687,78 +2762,10 @@
   "cobblemon.battle.cant.throatchop": "The effects of Throat Chop prevent %1$s from using certain moves!",
   "cobblemon.battle.cant.nopp": "%1$s can't use %2$s because it is out of PP!",
 
-  "cobblemon.battle.activate.confusion": "%1$s is confused!",
-  "cobblemon.battle.activate.happyhour": "Everyone is caught up in the happy atmosphere!",
-  "cobblemon.battle.activate.mindreader": "%2$s read the mind of %1$s!",
-  "cobblemon.battle.activate.magmastorm": "%1$s became trapped by swirling magma!",
-  "cobblemon.battle.activate.powersplit": "%1$s shared its power with the target!",
-  "cobblemon.battle.activate.pursuit": "(%1$s is being withdrawn...)",
-  "cobblemon.battle.activate.gravity": "%1$s couldn't stay airborne because of gravity!",
-  "cobblemon.battle.activate.mistyterrain": "%1$s surrounds itself with a protective mist!",
-  "cobblemon.battle.activate.psychicterrain": "%1$s surrounds itself with psychic terrain!",
-  "cobblemon.battle.activate.healbell": "A bell chimed!",
-  "cobblemon.battle.activate.aromatherapy": "A soothing aroma wafted through the area!",
-  "cobblemon.battle.activate.trapped": "%1$s can no longer escape!",
-  "cobblemon.battle.activate.bind": "%1$s was squeezed by %2$s!",
-  "cobblemon.battle.activate.wrap": "%1$s was wrapped by %2$s!",
-  "cobblemon.battle.activate.snatch": "%1$s snatched %2$s's move!",
-  "cobblemon.battle.activate.sandtomb": "%1$s became trapped by the quicksand!",
-  "cobblemon.battle.activate.struggle": "%1$s has no moves left!",
-  "cobblemon.battle.activate.stickyweb": "%1$s was caught in a sticky web!",
-  "cobblemon.battle.activate.courtchange": "%1$s swapped the battle effects affecting each side of the field!",
-  "cobblemon.battle.activate.guardsplit": "%1$s shared its guard with the target!",
-  "cobblemon.battle.activate.spite": "It reduced the PP of %1$s's %2$s by %3$s!",
-  "cobblemon.battle.activate.lockon": "%1$s took aim at %2$s!",
-  "cobblemon.battle.activate.protosynthesis": "The harsh sunlight activated %1$s's Protosynthesis!",
-  "cobblemon.battle.activate.bide": "%1$s is storing energy!",
-  "cobblemon.battle.activate.protect": "%1$s protected itself!",
-  "cobblemon.battle.activate.magnitude": "Magnitude %1$s!",
-  "cobblemon.battle.activate.destinybond": "%1$s took its attacker down with it!",
-  "cobblemon.battle.activate.synchronize": "[%1$s's Synchronize]",
-  "cobblemon.battle.activate.endure": "%1$s endured the hit!",
-  "cobblemon.battle.activate.attract": "%1$s is in love with %2$s!",
-  "cobblemon.battle.activate.firespin": "%1$s became trapped in the fiery vortex!",
-  "cobblemon.battle.activate.trick":"%1$s switched items with its target!",
-  "cobblemon.battle.activate.quickclaw": "%1$s can act faster than normal, thanks to its Quick Claw!",
-  "cobblemon.battle.activate.focusband": "%1$s hung on using its Focus Band!",
-  "cobblemon.battle.activate.forewarn": "%2$s's %3$s was revealed!",
-  "cobblemon.battle.activate.disguise": "It's disguise served it as a decoy!",
-  "cobblemon.battle.activate.liquidooze": "%1$s sucked up the liquid ooze!",
-  "cobblemon.battle.activate.whirlpool": "%1$s became trapped in the vortex!",
-  "cobblemon.battle.activate.clamp": "%2$s clamped down on %1$s!",
-  "cobblemon.battle.activate.afteryou": "%1$s took the kind offer!",
-  "cobblemon.battle.activate.beatup": "%1$s's attack!",
-  "cobblemon.battle.activate.celebrate": "Congratulations, %1$s!",
-  "cobblemon.battle.activate.substitute": "The substitute took damage for %1$s!",
-  "cobblemon.battle.activate.infestation": "%1$s has become infested!",
-  "cobblemon.battle.activate.phantomforce": "It broke through %1$s's protection!",
-  "cobblemon.battle.activate.matblock": "%3$s was blocked by the kicked-up mat!",
-  "cobblemon.battle.activate.electricterrain": "%1$s surrounds itself with electrified terrain!",
-  "cobblemon.battle.activate.ingrain": "%1$s anchored itself with its roots!",
-  "cobblemon.battle.activate.mist": "%1$s is protected by the mist!",
-  "cobblemon.battle.activate.poltergeist": "%1$s is about to be attacked by its %3$s!",
-  "cobblemon.battle.activate.powder": "When the flame touched the powder on the Pokémon, it exploded!",
-  "cobblemon.battle.activate.quash": "%1$s's move was postponed!",
-  "cobblemon.battle.activate.quickguard": "Quick Guard protected %1$s",
-  "cobblemon.battle.activate.safeguard": "%1$s is protected by Safeguard!",
-  "cobblemon.battle.activate.sketch": "%1$s sketched %3$s!",
-  "cobblemon.battle.activate.grudge": "%1$s's %3$s lost all of its PP due to the grudge!",
-  "cobblemon.battle.activate.speedswap": "%1$s switched Speed with its target!",
-  "cobblemon.battle.activate.switcheroo": "%1$s switched items with its target!",
-  "cobblemon.battle.activate.skillswap": "%1$s swapped Abilities with its target!",
-  "cobblemon.battle.activate.wideguard": "Wide Guard protected %1$s!",
-  "cobblemon.battle.activate.craftyshield": "Crafty Shield protected %1$s!",
-  "cobblemon.battle.activate.tidyup": "Tidying up complete!",
-  "cobblemon.battle.activate.mummy": "%1$s's ability became Mummy!",
-  "cobblemon.battle.activate.allyswitch": "%1$s and %2$s switched places!",
-  "cobblemon.battle.activate.insomnia": "The Pokémon is suffering from insomnia and cannot fall asleep.",
-  "cobblemon.battle.activate.custapberry": "%1$s can act faster than normal, thanks to its Custap Berry!",
-  "cobblemon.battle.activate.lingeringaroma": "A lingering aroma clings to %2$s!",
-
   "cobblemon.battle.prepare.bounce": "%1$s sprang up!",
   "cobblemon.battle.prepare.dig": "%1$s burrowed its way under the ground!",
-  "cobblemon.battle.prepare.shelltrap": "%1$s set a shell trap!",
   "cobblemon.battle.prepare.dive": "%1$s hid underwater!",
+  "cobblemon.battle.prepare.electroshot": "%1$s absorbed electricity!",
   "cobblemon.battle.prepare.fly": "%1$s flew up high!",
   "cobblemon.battle.prepare.freezeshock": "%1$s became cloaked in a freezing light!",
   "cobblemon.battle.prepare.geomancy": "%1$s is absorbing power!",
@@ -2766,6 +2773,7 @@
   "cobblemon.battle.prepare.meteorbeam": "%1$s is overflowing with space power!",
   "cobblemon.battle.prepare.phantomforce": "%1$s vanished instantly!",
   "cobblemon.battle.prepare.razorwind": "%1$s whipped up a whirlwind!",
+  "cobblemon.battle.prepare.shelltrap": "%1$s set a shell trap!",
   "cobblemon.battle.prepare.skullbash": "%1$s tucked in its head!",
   "cobblemon.battle.prepare.skyattack": "%1$s became cloaked in a harsh light!",
   "cobblemon.battle.prepare.skydrop": "%1$s took its target into the sky!",
@@ -2778,99 +2786,101 @@
 
   "cobblemon.battle.copyboost.generic": "%1$s copied %2$s's stat changes!",
 
-  "cobblemon.battle.singleturn.protect": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.endure": "%1$s braced itself!",
-  "cobblemon.battle.singleturn.craftyshield": "Crafty Shield protected %1$s's team!",
-  "cobblemon.battle.singleturn.powder": "%1$s is covered in powder!",
-  "cobblemon.battle.singleturn.followme": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.snatch": "%1$s is waiting for a target to make a move!",
-  "cobblemon.battle.singleturn.quickguard": "Quick Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.wideguard": "Wide Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.roost": "(%1$s loses Flying type this turn.)",
-  "cobblemon.battle.singleturn.matblock": "%1$s intends to flip up a mat and block incoming attacks!",
-  "cobblemon.battle.singleturn.maxguard": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.instruct": "%1$s followed %2$s's instructions!",
-  "cobblemon.battle.singleturn.focuspunch": "%1$s is tightening its focus!",
-  "cobblemon.battle.singleturn.electrify": "%1$s's moves have been electrified!",
   "cobblemon.battle.singleturn.beakblast": "%1$s started heating up its beak!",
-  "cobblemon.battle.singleturn.helpinghand": "%2$s is ready to help %1$s!",
-  "cobblemon.battle.singleturn.magiccoat": "%1$s shrouded itself with Magic Coat!",
-  "cobblemon.battle.singleturn.ragepowder": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.shelltrap": "%1$s set a shell trap!",
-  "cobblemon.battle.singleturn.spotlight": "%1$s became the center of attention!",
-
+  "cobblemon.battle.singleturn.craftyshield": "Crafty Shield protected %1$s's team!",
   "cobblemon.battle.singlemove.destinybond": "%1$s is hoping to take its attacker down with it!",
+  "cobblemon.battle.singleturn.electrify": "%1$s's moves have been electrified!",
+  "cobblemon.battle.singleturn.endure": "%1$s braced itself!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s is tightening its focus!",
+  "cobblemon.battle.singleturn.followme": "%1$s became the center of attention!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s is ready to help %1$s!",
+  "cobblemon.battle.singleturn.instruct": "%1$s followed %2$s's instructions!",
   "cobblemon.battle.singlemove.glaiverush": "%1$s throws itself into a reckless charge!",
   "cobblemon.battle.singlemove.grudge": "%1$s wants its target to bear a grudge!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s shrouded itself with Magic Coat!",
+  "cobblemon.battle.singleturn.matblock": "%1$s intends to flip up a mat and block incoming attacks!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s protected itself!",
+  "cobblemon.battle.singleturn.powder": "%1$s is covered in powder!",
+  "cobblemon.battle.singleturn.protect": "%1$s protected itself!",
+  "cobblemon.battle.singleturn.quickguard": "Quick Guard protected %1$s's team!",
   "cobblemon.battle.singlemove.rage": "%1$s goes into a rage!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s became the center of attention!",
+  "cobblemon.battle.singleturn.roost": "(%1$s loses Flying type this turn.)",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s set a shell trap!",
+  "cobblemon.battle.singleturn.snatch": "%1$s is waiting for a target to make a move!",
+  "cobblemon.battle.singleturn.spotlight": "%1$s became the center of attention!",
+  "cobblemon.battle.singleturn.wideguard": "Wide Guard protected %1$s's team!",
 
-  "cobblemon.battle.damage.wrap": "%1$s was hurt by wrap!",
-  "cobblemon.battle.damage.confusion": "%1$s hurt itself in confusion!",
-  "cobblemon.battle.damage.leechseed": "%1$s's health is sapped by Leech Seed!",
-  "cobblemon.battle.damage.sandstorm": "%1$s was buffeted by the sandstorm.",
-  "cobblemon.battle.damage.hail": "%1$s was buffeted by hail.",
-  "cobblemon.battle.damage.saltcure": "%1$s is hurt by Salt Cure!",
-  "cobblemon.battle.damage.nightmare": "%1$s is locked in a nightmare!",
-  "cobblemon.battle.damage.magmastorm": "%1$s took damage from the magma!",
-  "cobblemon.battle.damage.stealthrock": "Pointed stones dug into %1$s!",
-  "cobblemon.battle.damage.highjumpkick": "%1$s crashed into the ground!",
-  "cobblemon.battle.damage.spikes": "%1$s was hurt by the spikes!",
-  "cobblemon.battle.damage.recoil": "%1$s was damaged by the recoil!",
-  "cobblemon.battle.damage.item": "%1$s was hurt by its %2$s!",
-  "cobblemon.battle.damage.lifeorb": "%1$s lost some of its HP!",
-  "cobblemon.battle.damage.rockyhelmet": "%1$s was hurt by %2$s's Rocky Helmet!",
-  "cobblemon.battle.damage.generic": "%1$s was hurt!",
-  "cobblemon.battle.damage.pokemonmimikyubusted": "%1$s's disguise was busted!",
-  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
-  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
-  "cobblemon.battle.damage.curse": "%1$s was afflicted by the curse!",
-  "cobblemon.battle.damage.firespin": "%1$s is hurt by Fire Spin!",
   "cobblemon.battle.damage.axekick": "%1$s crashed into the ground!",
-  "cobblemon.battle.damage.bind": "%1$s took damage from Bind!",
   "cobblemon.battle.damage.baddreams": "%1$s took damage from Bad Dreams!",
-  "cobblemon.battle.damage.mindblown": "%1$s cut its own HP to power up its move!",
-  "cobblemon.battle.damage.infestation": "%1$s took damage from the infestation!",
-  "cobblemon.battle.damage.spikyshield": "%1$s was damaged from contact!",
-  "cobblemon.battle.damage.flameburst": "The bursting flame hit %1$s!",
+  "cobblemon.battle.damage.bind": "%1$s took damage from Bind!",
+  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
+  "cobblemon.battle.damage.confusion": "%1$s hurt itself in confusion!",
+  "cobblemon.battle.damage.curse": "%1$s was afflicted by the curse!",
   "cobblemon.battle.damage.dryskin": "%1$s was hurt by its Dry Skin!",
-  "cobblemon.battle.damage.sandtomb": "%1$s is hurt by Sand Tomb!",
-  "cobblemon.battle.damage.roughskin": "%1$s was hurt!",
+  "cobblemon.battle.damage.firespin": "%1$s is hurt by Fire Spin!",
+  "cobblemon.battle.damage.flameburst": "The bursting flame hit %1$s!",
+  "cobblemon.battle.damage.generic": "%1$s was hurt!",
+  "cobblemon.battle.damage.hail": "%1$s was buffeted by hail.",
+  "cobblemon.battle.damage.highjumpkick": "%1$s crashed into the ground!",
+  "cobblemon.battle.damage.infestation": "%1$s took damage from the infestation!",
   "cobblemon.battle.damage.ironbarbs": "%1$s was hurt!",
+  "cobblemon.battle.damage.item": "%1$s was hurt by its %2$s!",
+  "cobblemon.battle.damage.leechseed": "%1$s's health is sapped by Leech Seed!",
+  "cobblemon.battle.damage.lifeorb": "%1$s lost some of its HP!",
+  "cobblemon.battle.damage.liquidooze": "%1$s sucked up the liquid ooze!",
+  "cobblemon.battle.damage.magmastorm": "%1$s took damage from the magma!",
+  "cobblemon.battle.damage.mindblown": "%1$s cut its own HP to power up its move!",
+  "cobblemon.battle.damage.nightmare": "%1$s is locked in a nightmare!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "%1$s's disguise was busted!",
+  "cobblemon.battle.damage.recoil": "%1$s was damaged by the recoil!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s was hurt by %2$s's Rocky Helmet!",
+  "cobblemon.battle.damage.roughskin": "%1$s was hurt!",
+  "cobblemon.battle.damage.saltcure": "%1$s is hurt by Salt Cure!",
+  "cobblemon.battle.damage.sandstorm": "%1$s was buffeted by the sandstorm.",
+  "cobblemon.battle.damage.sandtomb": "%1$s is hurt by Sand Tomb!",
+  "cobblemon.battle.damage.spikes": "%1$s was hurt by the spikes!",
+  "cobblemon.battle.damage.spikyshield": "%1$s was damaged from contact!",
+  "cobblemon.battle.damage.snaptrap": "%1$s is hurt by Snap Trap!",
+  "cobblemon.battle.damage.stealthrock": "Pointed stones dug into %1$s!",
+  "cobblemon.battle.damage.thundercage": "%1$s is hurt by Thunder Cage!",
+  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
+  "cobblemon.battle.damage.wrap": "%1$s was hurt by wrap!",
 
-  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
-  "cobblemon.battle.end.wrap": "%1$s was freed from wrap!",
-  "cobblemon.battle.end.magnetrise": "%1$s's electromagnetism wore off!",
-  "cobblemon.battle.end.doomdesire": "%1$s took the Doom Desire attack!",
-  "cobblemon.battle.end.leechseed": "%1$s was freed from Leech Seed!",
-  "cobblemon.battle.end.powershift": "%1$s swapped its offensive stats with its defensive stats!",
-  "cobblemon.battle.end.torment": "%1$s is no longer tormented!",
-  "cobblemon.battle.end.disable": "%1$s's move is no longer disabled!",
-  "cobblemon.battle.end.protosynthesis": "The effects of %1$s's Protosynthesis wore off!",
-  "cobblemon.battle.end.taunt": "%1$s shook off the taunt!",
-  "cobblemon.battle.end.firespin": "%1$s was freed from Fire Spin!",
-  "cobblemon.battle.end.bide": "%1$s unleashed its energy!",
-  "cobblemon.battle.end.confusion": "%1$s snapped out of its confusion!",
-  "cobblemon.battle.end.whirlpool": "%1$s was freed from the vortex!",
-  "cobblemon.battle.end.clamp": "%1$s was freed from Clamp!",
-  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
-  "cobblemon.battle.end.telekinesis": "%1$s was freed from the telekinesis!",
-  "cobblemon.battle.end.encore": "%1$s's Encore ended!",
   "cobblemon.battle.end.attract": "%1$s got over its infatuation!",
-  "cobblemon.battle.end.futuresight": "%1$s took the Future Sight attack!",
+  "cobblemon.battle.end.bide": "%1$s unleashed its energy!",
+  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
+  "cobblemon.battle.end.clamp": "%1$s was freed from Clamp!",
+  "cobblemon.battle.end.confusion": "%1$s snapped out of its confusion!",
+  "cobblemon.battle.end.disable": "%1$s's move is no longer disabled!",
+  "cobblemon.battle.end.doomdesire": "%1$s took the Doom Desire attack!",
+  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
   "cobblemon.battle.end.embargo": "%1$s can use items again!",
-  "cobblemon.battle.end.substitute": "%1$s's substitute faded!",
-  "cobblemon.battle.end.uproar": "%1$s calmed down.",
-  "cobblemon.battle.end.powertrick": "%1$s switched its Attack and Defense!",
+  "cobblemon.battle.end.encore": "%1$s's Encore ended!",
+  "cobblemon.battle.end.firespin": "%1$s was freed from Fire Spin!",
+  "cobblemon.battle.end.futuresight": "%1$s took the Future Sight attack!",
   "cobblemon.battle.end.healblock": "%1$s's Heal Block wore off!",
-  "cobblemon.battle.end.skydrop": "%1$s was freed from the Sky Drop!",
   "cobblemon.battle.end.illusion": "%1$s's illusion wore off!",
-  "cobblemon.battle.end.neutralizinggas": "The effects of the neutralizing gas wore off!",
-  "cobblemon.battle.end.stockpile": "%1$s's stockpiled effect wore off!",
   "cobblemon.battle.end.infestation": "%1$s was freed from Infestation!",
+  "cobblemon.battle.end.leechseed": "%1$s was freed from Leech Seed!",
+  "cobblemon.battle.end.magnetrise": "%1$s's electromagnetism wore off!",
+  "cobblemon.battle.end.neutralizinggas": "The effects of the neutralizing gas wore off!",
+  "cobblemon.battle.end.powershift": "%1$s swapped its offensive stats with its defensive stats!",
+  "cobblemon.battle.end.powertrick": "%1$s switched its Attack and Defense!",
+  "cobblemon.battle.end.protosynthesis": "The effects of %1$s's Protosynthesis wore off!",
+  "cobblemon.battle.end.skydrop": "%1$s was freed from the Sky Drop!",
+  "cobblemon.battle.end.stockpile": "%1$s's stockpiled effect wore off!",
+  "cobblemon.battle.end.substitute": "%1$s's substitute faded!",
+  "cobblemon.battle.end.taunt": "%1$s shook off the taunt!",
+  "cobblemon.battle.end.telekinesis": "%1$s was freed from the telekinesis!",
+  "cobblemon.battle.end.torment": "%1$s is no longer tormented!",
+  "cobblemon.battle.end.uproar": "%1$s calmed down.",
+  "cobblemon.battle.end.whirlpool": "%1$s was freed from the vortex!",
+  "cobblemon.battle.end.wrap": "%1$s was freed from wrap!",
 
+  "cobblemon.battle.block.aromaveil": "%1$s is protected by an aromatic veil!!",
   "cobblemon.battle.block.sweetveil": "%1$s can't fall asleep due to a veil of sweetness!",
   "cobblemon.battle.block.uproar": "But the uproar kept %1$s awake!",
-  "cobblemon.battle.block.aromaveil": "%1$s is protected by an aromatic veil!!",
 
   "cobblemon.battle.fail.substitute": "But it could not create a substitute!",
   "cobblemon.battle.fail.healblock": "But it failed to affect %1$s!",
@@ -3189,8 +3199,6 @@
   "tag.item.cobblemon.mint_seeds": "Mint Seeds",
   "tag.item.cobblemon.mutated_berries": "Mutation Berries",
   "tag.item.cobblemon.plants": "Plants",
-  "tag.item.cobblemon.protein_ingredients": "Protein Ingredients",
-  "tag.item.cobblemon.zinc_ingredients": "Zinc Ingredients",
   "tag.item.cobblemon.seeds": "Seeds",
   "tag.item.cobblemon.boats": "Boats",
   "tag.item.cobblemon.hanging_signs": "Hanging Signs",
@@ -3239,8 +3247,6 @@
   "tag.item.cobblemon.sweets": "Sweets",
   "tag.item.cobblemon.teapots": "Teapots",
   "tag.item.cobblemon.teacups": "Teacups",
-  "tag.item.cobblemon.raw_meat": "Raw Meat",
-  "tag.item.cobblemon.cooked_meat": "Cooked Meat",
   "tag.item.cobblemon.fossils": "Fossils",
   "tag.item.cobblemon.held.leaves_leftovers": "Leftover Foods",
   "tag.item.cobblemon.decorated_pot_sherds": "Decorated Pot Sherds",
@@ -3253,6 +3259,9 @@
   "tag.item.cobblemon.pokedex": "Pokédexes",
   "tag.item.cobblemon.pokedex_screen": "Pokédex Screens",
   "tag.item.cobblemon.gilded_chests": "Gilded Chests",
+  "tag.item.cobblemon.held.visibility.face": "Face Displayed Held Items",
+  "tag.item.cobblemon.held.visibility.hat": "Hat Displayed Held Items",
+  "tag.item.cobblemon.held.visibility.hidden": "Non-Displayed Held Items",
 
   "npc.sacchi.name": "Professor Sacchi",
   "npc.variable.challenge_cooldown.name": "Challenge Cooldown",
@@ -3322,6 +3331,8 @@
   "cobblemon.move.airslash.desc": "The user attacks with a blade of air that slices even the sky. This may also make the target flinch.",
   "cobblemon.move.alloutpummeling": "All-Out Pummeling",
   "cobblemon.move.alloutpummeling.desc": "The user rams an energy orb created by its Z-Power into the target with full force. The power varies, depending on the original move.",
+  "cobblemon.move.alluringvoice": "Alluring Voice",
+  "cobblemon.move.alluringvoice.desc": "The user attacks the target using its angelic voice. This also confuses the target if its stats have been boosted during the turn.",
   "cobblemon.move.allyswitch": "Ally Switch",
   "cobblemon.move.allyswitch.desc": "The user teleports using a strange power and switches places with one of its allies.",
   "cobblemon.move.amnesia": "Amnesia",
@@ -3428,6 +3439,8 @@
   "cobblemon.move.blizzard.desc": "A howling blizzard is summoned to strike opposing Pokémon. This may also leave the opposing Pokémon frozen.",
   "cobblemon.move.block": "Block",
   "cobblemon.move.block.desc": "The user blocks the target's way with arms spread wide to prevent escape.",
+  "cobblemon.move.bloodmoon": "Blood Moon",
+  "cobblemon.move.bloodmoon.desc": "The user unleashes the full brunt of its spirit from a full moon that shines as red as blood. This move can't be used twice in a row.",
   "cobblemon.move.bloomdoom": "Bloom Doom",
   "cobblemon.move.bloomdoom.desc": "The user collects energy from plants using its Z-Power and attacks the target with full force. The power varies, depending on the original move.",
   "cobblemon.move.blueflare": "Blue Flare",
@@ -3482,6 +3495,8 @@
   "cobblemon.move.bulletpunch.desc": "The user strikes the target with tough punches as fast as bullets. This move always goes first.",
   "cobblemon.move.bulletseed": "Bullet Seed",
   "cobblemon.move.bulletseed.desc": "The user forcefully shoots seeds at the target two to five times in a row.",
+  "cobblemon.move.burningbulwark": "Burning Bulwark",
+  "cobblemon.move.burningbulwark.desc": "The user's intensely hot fur protects it from attacks and also burns any attacker that makes direct contact with it.",
   "cobblemon.move.burningjealousy": "Burning Jealousy",
   "cobblemon.move.burningjealousy.desc": "The user attacks with energy from jealousy. This leaves all opposing Pokémon that have had their stats boosted during the turn with a burn.",
   "cobblemon.move.burnup": "Burn Up",
@@ -3656,6 +3671,8 @@
   "cobblemon.move.dragonascent.desc": "After soaring upward, the user attacks its target by dropping out of the sky at high speeds. But it lowers its own Defense and Sp. Def stats in the process.",
   "cobblemon.move.dragonbreath": "Dragon Breath",
   "cobblemon.move.dragonbreath.desc": "The user exhales a mighty gust that inflicts damage. This may also leave the target with paralysis.",
+  "cobblemon.move.dragoncheer": "Dragon Cheer",
+  "cobblemon.move.dragoncheer.desc": "The user raises its allies’ morale with a draconic cry so that their future attacks have a heightened chance of landing critical hits. This rouses Dragon types more.",
   "cobblemon.move.dragonclaw": "Dragon Claw",
   "cobblemon.move.dragonclaw.desc": "The user slashes the target with huge sharp claws.",
   "cobblemon.move.dragondance": "Dragon Dance",
@@ -3714,6 +3731,8 @@
   "cobblemon.move.electroball.desc": "The user hurls an electric orb at the target. The faster the user is than the target, the greater the move's power.",
   "cobblemon.move.electrodrift": "Electro Drift",
   "cobblemon.move.electrodrift.desc": "The user races forward at ultrafast speeds, piercing its target with futuristic electricity. This move's power is boosted more than usual if it's a supereffective hit.",
+  "cobblemon.move.electroshot": "Electro Shot",
+  "cobblemon.move.electroshot.desc": "The user gathers electricity on the first turn, boosting its Sp. Atk stat, then fires a high-voltage shot on the next turn. The shot will be fired immediately in rain.",
   "cobblemon.move.electroweb": "Electroweb",
   "cobblemon.move.electroweb.desc": "The user attacks and captures opposing Pokémon using an electric net. This lowers their Speed stats.",
   "cobblemon.move.embargo": "Embargo",
@@ -3768,6 +3787,8 @@
   "cobblemon.move.feintattack.desc": "The user approaches the target disarmingly, then throws a sucker punch. This attack never misses.",
   "cobblemon.move.fellstinger": "Fell Stinger",
   "cobblemon.move.fellstinger.desc": "When the user knocks out a target with this move, the user's Attack stat rises drastically.",
+  "cobblemon.move.ficklebeam": "Fickle Beam",
+  "cobblemon.move.ficklebeam.desc": "The user shoots a beam of light to inflict damage. Sometimes all the user's heads shoot beams in unison, doubling the move's power.",
   "cobblemon.move.fierydance": "Fiery Dance",
   "cobblemon.move.fierydance.desc": "Cloaked in flames, the user attacks the target by dancing and flapping its wings. This may also raise the user's Sp. Atk stat.",
   "cobblemon.move.fierywrath": "Fiery Wrath",
@@ -4008,6 +4029,8 @@
   "cobblemon.move.happyhour.desc": "Using Happy Hour doubles the amount of prize money received after battle.",
   "cobblemon.move.harden": "Harden",
   "cobblemon.move.harden.desc": "The user stiffens all the muscles in its body to raise its Defense stat.",
+  "cobblemon.move.hardpress": "Hard Press",
+  "cobblemon.move.hardpress.desc": "The target is crushed with an arm, a claw, or the like to inflict damage. The more HP the target has left, the greater the move's power.",
   "cobblemon.move.haze": "Haze",
   "cobblemon.move.haze.desc": "The user creates a haze that eliminates every stat change among all the Pokémon engaged in battle.",
   "cobblemon.move.headbutt": "Headbutt",
@@ -4132,6 +4155,8 @@
   "cobblemon.move.ironhead.desc": "The user slams the target with its steel-hard head. This may also make the target flinch.",
   "cobblemon.move.irontail": "Iron Tail",
   "cobblemon.move.irontail.desc": "The target is slammed with a steel-hard tail. This may also lower the target's Defense stat.",
+  "cobblemon.move.ivycudgel": "Ivy Cudgel",
+  "cobblemon.move.ivycudgel.desc": "The user strikes with an ivy-wrapped cudgel. This move's type changes depending on the mask worn by the user, and it has a heightened chance of landing a critical hit.",
   "cobblemon.move.jawlock": "Jaw Lock",
   "cobblemon.move.jawlock.desc": "This move prevents the user and the target from switching out until either of them faints. The effect goes away if either of the Pokémon leaves the field.",
   "cobblemon.move.jetpunch": "Jet Punch",
@@ -4242,6 +4267,8 @@
   "cobblemon.move.malignantchain.desc": "The user pours toxins into the target by wrapping them in a toxic, corrosive chain. This may also leave the target badly poisoned.",
   "cobblemon.move.matblock": "Mat Block",
   "cobblemon.move.matblock.desc": "Using a pulled-up mat as a shield, the user protects itself and its allies from damaging moves. This does not stop status moves.",
+  "cobblemon.move.matchagotcha": "Matcha Gotcha",
+  "cobblemon.move.matchagotcha.desc": "The user fires a blast of tea that it mixed. The user's HP is restored by up to half the damage taken by the target. This may also leave the target with a burn.",
   "cobblemon.move.maxairstream": "Max Airstream",
   "cobblemon.move.maxairstream.desc": "This is a Flying-type attack Dynamax Pokémon use. This raises ally Pokémon's Speed stats.",
   "cobblemon.move.maxdarkness": "Max Darkness",
@@ -4312,6 +4339,8 @@
   "cobblemon.move.meteormash.desc": "The target is hit with a hard punch fired like a meteor. This may also raise the user's Attack stat.",
   "cobblemon.move.metronome": "Metronome",
   "cobblemon.move.metronome.desc": "The user waggles a finger and stimulates its brain into randomly using nearly any move.",
+  "cobblemon.move.mightycleave": "Mighty Cleave",
+  "cobblemon.move.mightycleave.desc": "The user wields the light that has accumulated atop its head to cleave the target. This move hits even if the target protects itself.",
   "cobblemon.move.milkdrink": "Milk Drink",
   "cobblemon.move.milkdrink.desc": "The user restores its own HP by up to half of its max HP.",
   "cobblemon.move.mimic": "Mimic",
@@ -4504,10 +4533,14 @@
   "cobblemon.move.protect.desc": "This move enables the user to protect itself from all attacks. Its chance of failing rises if it is used in succession.",
   "cobblemon.move.psybeam": "Psybeam",
   "cobblemon.move.psybeam.desc": "The target is attacked with a peculiar ray. This may also leave the target confused.",
+  "cobblemon.move.psyblade": "Psyblade",
+  "cobblemon.move.psyblade.desc": "The user rends the target with an ethereal blade. This move's power is boosted by 50 percent if the user is on Electric Terrain.",
   "cobblemon.move.psychic": "Psychic",
   "cobblemon.move.psychic.desc": "The target is hit by a strong telekinetic force. This may also lower the target's Sp. Def stat.",
   "cobblemon.move.psychicfangs": "Psychic Fangs",
   "cobblemon.move.psychicfangs.desc": "The user bites the target with its psychic capabilities. This can also destroy Light Screen and Reflect.",
+  "cobblemon.move.psychicnoise": "Psychic Noise",
+  "cobblemon.move.psychicnoise.desc": "The user attacks the target with unpleasant sound waves. For two turns, the target is prevented from recovering HP through moves, Abilities, or held items.",
   "cobblemon.move.psychicterrain": "Psychic Terrain",
   "cobblemon.move.psychicterrain.desc": "This protects Pokémon on the ground from priority moves and powers up Psychic-type moves for five turns.",
   "cobblemon.move.psychoboost": "Psycho Boost",
@@ -4889,6 +4922,8 @@
   "cobblemon.move.sunnyday.desc": "The user intensifies the sun for five turns, powering up Fire-type moves. It lowers the power of Water-type moves.",
   "cobblemon.move.sunsteelstrike": "Sunsteel Strike",
   "cobblemon.move.sunsteelstrike.desc": "The user slams into the target with the force of a meteor. This move can be used on the target regardless of its Abilities.",
+  "cobblemon.move.supercellslam": "Supercell Slam",
+  "cobblemon.move.supercellslam.desc": "The user electrifies its body and drops onto the target to inflict damage. If this move misses, the user takes damage instead.",
   "cobblemon.move.superfang": "Super Fang",
   "cobblemon.move.superfang.desc": "The user chomps hard on the target with its sharp front fangs. This cuts the target's HP in half.",
   "cobblemon.move.superpower": "Superpower",
@@ -4919,6 +4954,10 @@
   "cobblemon.move.synchronoise.desc": "Using an odd shock wave, the user inflicts damage on any Pokémon of the same type in the area around it.",
   "cobblemon.move.synthesis": "Synthesis",
   "cobblemon.move.synthesis.desc": "The user restores its own HP. The amount of HP regained varies with the weather.",
+  "cobblemon.move.syrupbomb": "Syrup Bomb",
+  "cobblemon.move.syrupbomb.desc": "The user sets off an explosion of sticky candy syrup, which coats the target and causes the target's Speed stat to drop each turn for three turns.",
+  "cobblemon.move.tachyoncutter": "Tachyon Cutter",
+  "cobblemon.move.tachyoncutter.desc": "The user attacks by launching particle blades at the target twice in a row. This attack never misses.",
   "cobblemon.move.tackle": "Tackle",
   "cobblemon.move.tackle.desc": "A physical attack in which the user charges and slams into the target with its whole body.",
   "cobblemon.move.tailglow": "Tail Glow",
@@ -4951,8 +4990,12 @@
   "cobblemon.move.telekinesis.desc": "The user makes the target float with its psychic power. The target is easier to hit for three turns.",
   "cobblemon.move.teleport": "Teleport",
   "cobblemon.move.teleport.desc": "The user switches places with a party Pokémon in waiting, if any. If a wild Pokémon uses this move, it flees.",
+  "cobblemon.move.temperflare": "Temper Flare",
+  "cobblemon.move.temperflare.desc": "Spurred by desperation, the user attacks the target. This move's power is doubled if the user's previous move failed.",
   "cobblemon.move.terablast": "Tera Blast",
   "cobblemon.move.terablast.desc": "If the user has Terastallized, it unleashes energy of its Tera Type. This move inflicts damage using the Attack or Sp. Atk stat—whichever is higher for the user.",
+  "cobblemon.move.terastarstorm": "Tera Starstorm",
+  "cobblemon.move.terastarstorm.desc": "With the power of its crystals, the user bombards and eliminates the target. When used by Terapagos in its Stellar Form, this move damages all opposing Pokémon.",
   "cobblemon.move.terrainpulse": "Terrain Pulse",
   "cobblemon.move.terrainpulse.desc": "The user utilizes the power of the terrain to attack. This move's type and power changes depending on the terrain when it's used.",
   "cobblemon.move.thief": "Thief",
@@ -4971,6 +5014,8 @@
   "cobblemon.move.thunderbolt.desc": "A strong electric blast crashes down on the target. This may also leave the target with paralysis.",
   "cobblemon.move.thundercage": "Thunder Cage",
   "cobblemon.move.thundercage.desc": "The user traps the target in a cage of sparking electricity for four to five turns.",
+  "cobblemon.move.thunderclap": "Thunderclap",
+  "cobblemon.move.thunderclap.desc": "This move enables the user to attack first with a jolt of electricity. This move fails if the target is not readying an attack.",
   "cobblemon.move.thunderfang": "Thunder Fang",
   "cobblemon.move.thunderfang.desc": "The user bites with electrified fangs. This may also make the target flinch or leave it with paralysis.",
   "cobblemon.move.thunderouskick": "Thunderous Kick",
@@ -5125,10 +5170,12 @@
   "cobblemon.move.zippyzap.desc": "The user attacks the target with bursts of electricity at high speed. This move always goes first and results in a critical hit.",
 
   "cobblemon.entity.pokemon": "Pokémon",
+  "entity.cobblemon.pokemon": "Pokémon",
   "entity.cobblemon.empty_pokeball": "Empty Poké Ball",
   "entity.cobblemon.poke_bobber": "Poké Bobber",
   "entity.cobblemon.boat": "Boat",
   "entity.cobblemon.chest_boat": "Boat with Chest",
+  "entity.cobblemon.npc": "NPC",
 
   "painting.cobblemon.premonition.title": "Premonition",
   "painting.cobblemon.premonition.author": "PKMNCC",

common/src/main/resources/assets/cobblemon/models/item/syrupy_apple.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "cobblemon:item/evolution/syrupy_apple"
+  }
+}

common/src/main/resources/data/c/tags/item/foods.json

@@ -6,6 +6,8 @@
     "cobblemon:braised_vivichoke",
     "cobblemon:leek_and_potato_stew",
     "cobblemon:vivichoke_dip",
-    "cobblemon:energy_root"
+    "cobblemon:energy_root",
+    "cobblemon:whipped_dream",
+    "#cobblemon:sweets"
   ]
 }

common/src/main/resources/data/c/tags/item/foods/berry.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#cobblemon:berries"
+  ]
+}

common/src/main/resources/data/cobblemon/advancement/recipes/held/charcoal_stick.json

@@ -1,7 +1,7 @@
 {
   "parent": "cobblemon:recipes/root",
   "criteria": {
-    "has_fire": {
+    "has_stone": {
       "conditions": {
         "items": [
           {
@@ -13,6 +13,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:fire_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:charcoal_stick"
@@ -22,7 +34,8 @@
   },
   "requirements": [
     [
-      "has_fire",
+      "has_stone",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/damp_rock.json

@@ -13,6 +13,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:water_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:damp_rock"
@@ -23,6 +35,7 @@
   "requirements": [
     [
       "has_stone",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/dragon_fang.json

@@ -13,6 +13,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:dragon_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:dragon_fang"
@@ -23,6 +35,7 @@
   "requirements": [
     [
       "has_breath",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/heat_rock.json

@@ -6,13 +6,25 @@
         "items": [
           {
             "items": [
-              "cobblemon:water_stone"
+              "cobblemon:fire_stone"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:fire_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+  },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:heat_rock"
@@ -23,6 +35,7 @@
   "requirements": [
     [
       "has_stone",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/icy_rock.json

@@ -13,6 +13,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:ice_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:icy_rock"
@@ -23,6 +35,7 @@
   "requirements": [
     [
       "has_stone",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/mystic_water.json

@@ -1,7 +1,7 @@
 {
   "parent": "cobblemon:recipes/root",
   "criteria": {
-    "has_water": {
+    "has_stone": {
       "conditions": {
         "items": [
           {
@@ -13,6 +13,18 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:water_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:mystic_water"
@@ -22,7 +34,8 @@
   },
   "requirements": [
     [
-      "has_water",
+      "has_stone",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/never_melt_ice.json

@@ -13,6 +13,30 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:ice_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_stone": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:ice_stone"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:never_melt_ice"
@@ -23,6 +47,8 @@
   "requirements": [
     [
       "has_ice",
+      "has_stone",
+      "has_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/advancement/recipes/held/never_melt_ice_using_stone.json

@@ -1,34 +0,0 @@
-{
-  "parent": "cobblemon:recipes/root",
-  "criteria": {
-    "has_ice": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "cobblemon:ice_stone"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "cobblemon:never_melt_ice_using_stone"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_ice",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "cobblemon:never_melt_ice", "cobblemon:never_melt_ice_using_stone"
-    ]
-  }
-}

common/src/main/resources/data/cobblemon/advancement/recipes/held/smooth_rock.json

@@ -13,6 +13,30 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
+    "has_rock_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:rock_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_ground_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "cobblemon:ground_gem"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "cobblemon:smooth_rock"
@@ -23,6 +47,8 @@
   "requirements": [
     [
       "has_stone",
+      "has_rock_gem",
+      "has_ground_gem",
       "has_the_recipe"
     ]
   ],

common/src/main/resources/data/cobblemon/loot_table/injection/blocks/dark_oak_leaves.json

@@ -0,0 +1,63 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:any_of",
+            "terms": [
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "items": "minecraft:shears"
+                }
+              },
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "predicates": {
+                    "minecraft:enchantments": [
+                      {
+                        "enchantments": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "conditions": [
+            {
+              "condition": "minecraft:survives_explosion"
+            },
+            {
+              "chances": [
+                0.005,
+                0.0055555557,
+                0.00625,
+                0.008333334,
+                0.025
+              ],
+              "condition": "minecraft:table_bonus",
+              "enchantment": "minecraft:fortune"
+            }
+          ],
+          "name": "cobblemon:tart_apple"
+        }
+      ],
+      "rolls": 1
+    }
+  ],
+  "random_sequence": "minecraft:blocks/dark_oak_leaves"
+}

common/src/main/resources/data/cobblemon/loot_table/injection/blocks/oak_leaves.json

@@ -0,0 +1,63 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0,
+      "conditions": [
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:any_of",
+            "terms": [
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "items": "minecraft:shears"
+                }
+              },
+              {
+                "condition": "minecraft:match_tool",
+                "predicate": {
+                  "predicates": {
+                    "minecraft:enchantments": [
+                      {
+                        "enchantments": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "conditions": [
+            {
+              "condition": "minecraft:survives_explosion"
+            },
+            {
+              "chances": [
+                0.005,
+                0.0055555557,
+                0.00625,
+                0.008333334,
+                0.025
+              ],
+              "condition": "minecraft:table_bonus",
+              "enchantment": "minecraft:fortune"
+            }
+          ],
+          "name": "cobblemon:sweet_apple"
+        }
+      ],
+      "rolls": 1
+    }
+  ],
+  "random_sequence": "minecraft:blocks/oak_leaves"
+}

common/src/main/resources/data/cobblemon/natural_materials/vanilla.json

@@ -282,7 +282,11 @@
 	},
 	{
 		"content": 4,
-		"tag": "#cobblemon:cooked_meat"
+		"tag": "#c:foods/cooked_meat"
+	},
+	{
+		"content": 4,
+		"tag": "#c:foods/cooked_fish"
 	},
 	{
 		"content": 2,
@@ -410,11 +414,11 @@
 	},
 	{
 		"content": 8,
-		"tag": "#cobblemon:raw_meat"
+		"tag": "#c:foods/raw_meat"
 	},
 	{
 		"content": 8,
-		"item": "minecraft:pufferfish"
+		"tag": "#c:foods/raw_fish"
 	},
 	{
 		"content": 8,

common/src/main/resources/data/cobblemon/recipe/air_balloon.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "W": {
-            "item": "minecraft:red_wool"
+            "tag": "minecraft:wool"
         },
         "P": {
             "item": "minecraft:phantom_membrane"

common/src/main/resources/data/cobblemon/recipe/ancient_azure_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/ancient_citrine_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/ancient_ivory_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/ancient_poke_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/ancient_roseate_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/ancient_slate_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/ancient_verdant_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_ancient_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/assault_vest.json

@@ -2,8 +2,8 @@
     "type": "minecraft:crafting_shaped",
     "pattern": [
         "P P",
-        "WCW",
-        "WWW"
+        "SCS",
+        " S "
     ],
     "key": {
         "P": {
@@ -12,8 +12,8 @@
         "C": {
             "item": "minecraft:leather_chestplate"
         },
-        "W": {
-            "item": "minecraft:red_wool"
+        "S": {
+            "item": "minecraft:armadillo_scute"
         }
     },
     "result": {

common/src/main/resources/data/cobblemon/recipe/azure_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/binding_band.json

@@ -1,9 +1,9 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        " SW",
+        " S ",
         "SsS",
-        "WS "
+        " S "
     ],
     "key": {
         "S": {
@@ -11,9 +11,6 @@
         },
         "s": {
             "tag": "c:slime_balls"
-        },
-        "W": {
-            "item": "minecraft:brown_wool"
         }
     },
     "result": {

common/src/main/resources/data/cobblemon/recipe/black_belt.json

@@ -1,13 +1,13 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        "W  ",
-        "KKK",
-        "  W"
+        "K  ",
+        "KGK",
+        "  K"
     ],
     "key": {
-        "W": {
-            "item": "minecraft:black_wool"
+        "G": {
+            "item": "cobblemon:fighting_gem"
         },
         "K": {
             "item": "minecraft:dried_kelp"

common/src/main/resources/data/cobblemon/recipe/black_gilded_chest.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "gilded_chest",
     "pattern": [
         "GKG",
         "#C#",

common/src/main/resources/data/cobblemon/recipe/blue_gilded_chest.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "gilded_chest",
     "pattern": [
         "GKG",
         "#C#",

common/src/main/resources/data/cobblemon/recipe/blunder_policy.json

@@ -2,15 +2,15 @@
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " R ",
-        "DIF",
-        " P "
+        "SPF",
+        " I "
     ],
     "key": {
         "R": {
             "item": "minecraft:rabbit_foot"
         },
-        "D": {
-            "tag": "c:dyes/yellow"
+        "S": {
+            "item": "minecraft:sugar"
         },
         "I": {
             "item": "minecraft:ink_sac"

common/src/main/resources/data/cobblemon/recipe/cell_battery.json

@@ -1,17 +1,23 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "cell_battery",
     "pattern": [
-        "I",
-        "R",
-        "C"
+        " I",
+        " R",
+        " C"
     ],
     "key": {
         "C": {
             "tag": "c:ingots/copper"
         },
-        "R": {
+        "R": [
+            {
             "tag": "c:dusts/redstone"
-        },
+            },
+            {
+                "item": "cobblemon:electric_gem"
+            }
+        ],
         "I": {
             "tag": "c:ingots/iron"
         }

common/src/main/resources/data/cobblemon/recipe/charcoal_stick.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "charcoal_stick",
     "pattern": [
         "C",
         "S",
@@ -9,9 +10,14 @@
         "C": {
             "item": "minecraft:charcoal"
         },
-        "S": {
-            "item": "cobblemon:fire_stone"
-        }
+        "S": [
+            {
+                "item": "cobblemon:fire_stone"
+            },
+            {
+                "item": "cobblemon:fire_gem"
+            }
+        ]
     },
     "result": {
         "id": "cobblemon:charcoal_stick"

common/src/main/resources/data/cobblemon/recipe/choice_band.json

@@ -1,14 +1,11 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        "WQW",
-        "LMQ",
-        "RLW"
+        "QLQ",
+        "RML",
+        "QRQ"
     ],
     "key": {
-        "W": {
-            "item": "minecraft:white_wool"
-        },
         "L": {
             "tag": "c:gems/lapis"
         },

common/src/main/resources/data/cobblemon/recipe/choice_scarf.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "W": {
-            "item": "minecraft:light_blue_wool"
+            "tag": "minecraft:wool"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/citrine_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/cleanse_tag.json

@@ -1,21 +1,16 @@
 {
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        " PW",
-        "PRP",
-        "WP "
-    ],
-    "key": {
-        "P": {
+    "type": "minecraft:crafting_shapeless",
+    "ingredients": [
+        {
+            "item": "minecraft:bone_meal"
+        },
+        {
             "item": "minecraft:paper"
         },
-        "W": {
-            "tag": "c:dyes/white"
-        },
-        "R": {
-            "tag": "c:dyes/red"
+        {
+            "item": "minecraft:fermented_spider_eye"
         }
-    },
+    ],
     "result": {
         "id": "cobblemon:cleanse_tag"
     }

common/src/main/resources/data/cobblemon/recipe/covert_cloak.json

@@ -10,7 +10,7 @@
             "item": "minecraft:golden_carrot"
         },
         "W": {
-            "item": "minecraft:gray_wool"
+            "tag": "minecraft:wool"
         },
         "P": {
             "item": "minecraft:phantom_membrane"

common/src/main/resources/data/cobblemon/recipe/damp_rock.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "weather_rock",
     "pattern": [
         "DS",
         "HD"
@@ -8,9 +9,14 @@
         "D": {
             "item": "minecraft:dripstone_block"
         },
-        "S": {
-            "item": "cobblemon:water_stone"
-        },
+        "S": [
+            {
+                "item": "cobblemon:water_stone"
+            },
+            {
+                "item": "cobblemon:water_gem"
+            }
+        ],
         "H": {
             "item": "cobblemon:hard_stone"
         }

common/src/main/resources/data/cobblemon/recipe/destiny_knot.json

@@ -13,7 +13,7 @@
             "item": "minecraft:ghast_tear"
         },
         "W": {
-            "item": "minecraft:red_wool"
+            "tag": "minecraft:wool"
         }
     },
     "result": {

common/src/main/resources/data/cobblemon/recipe/dragon_fang.json

@@ -4,9 +4,14 @@
         {
             "item": "cobblemon:razor_fang"
         },
-        {
-            "item": "minecraft:dragon_breath"
-        }
+        [
+            {
+                "item": "cobblemon:dragon_gem"
+            },
+            {
+                "item": "minecraft:dragon_breath"
+            }
+        ]
     ],
     "result": {
         "id": "cobblemon:dragon_fang"

common/src/main/resources/data/cobblemon/recipe/eject_button.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "Y": {
-            "tag": "c:dyes/yellow"
+            "tag": "c:nuggets/gold"
         },
         "I": {
             "tag": "c:ingots/iron"

common/src/main/resources/data/cobblemon/recipe/expert_belt.json

@@ -2,16 +2,13 @@
     "type": "minecraft:crafting_shaped",
     "pattern": [
         "P  ",
-        "WBW",
+        " B ",
         "  P"
     ],
     "key": {
         "P": {
             "item": "minecraft:blaze_powder"
         },
-        "W": {
-            "item": "minecraft:black_wool"
-        },
         "B": {
             "item": "cobblemon:black_belt"
         }

common/src/main/resources/data/cobblemon/recipe/flame_orb.json

@@ -6,9 +6,14 @@
         "STP"
     ],
     "key": {
-        "S": {
-            "item": "cobblemon:fire_stone"
-        },
+        "S": [
+            {
+                "item": "cobblemon:fire_stone"
+            },
+            {
+                "item": "cobblemon:fire_gem"
+            }
+        ],
         "T": {
             "item": "minecraft:tinted_glass"
         },

common/src/main/resources/data/cobblemon/recipe/focus_band.json

@@ -1,13 +1,13 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        "WIW",
+        "LIL",
         "D I",
-        "WDW"
+        "LDL"
     ],
     "key": {
-        "W": {
-            "item": "minecraft:red_wool"
+        "L": {
+            "tag": "c:leathers"
         },
         "D": {
             "item": "minecraft:blaze_powder"

common/src/main/resources/data/cobblemon/recipe/focus_sash.json

@@ -2,12 +2,12 @@
     "type": "minecraft:crafting_shaped",
     "pattern": [
         "D  ",
-        "WIW",
+        "LIL",
         "  D"
     ],
     "key": {
-        "W": {
-            "item": "minecraft:red_wool"
+        "L": {
+            "tag": "c:leathers"
         },
         "D": {
             "item": "minecraft:blaze_powder"

common/src/main/resources/data/cobblemon/recipe/galarica_cuff.json

@@ -1,15 +1,15 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    "sns",
-    "n n",
-    "sns"
+    "SNS",
+    "N N",
+    "SNS"
   ],
   "key": {
-    "s": {
+    "S": {
       "item": "minecraft:stick"
     },
-    "n": {
+    "N": {
       "item": "cobblemon:galarica_nuts"
     }
   },

common/src/main/resources/data/cobblemon/recipe/galarica_wreath.json

@@ -1,12 +1,12 @@
 {
   "type": "minecraft:crafting_shaped",
   "pattern": [
-    "nnn",
-    "n n",
-    "nnn"
+    "NNN",
+    "N N",
+    "NNN"
   ],
   "key": {
-    "n": {
+    "N": {
       "item": "cobblemon:galarica_nuts"
     }
   },

common/src/main/resources/data/cobblemon/recipe/gilded_chest.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "gilded_chest",
     "pattern": [
         "GKG",
         "#C#",

common/src/main/resources/data/cobblemon/recipe/green_gilded_chest.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "gilded_chest",
     "pattern": [
         "GKG",
         "#C#",

common/src/main/resources/data/cobblemon/recipe/heat_rock.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "weather_rock",
     "pattern": [
         "DS",
         "HD"
@@ -8,9 +9,14 @@
         "D": {
             "item": "minecraft:dripstone_block"
         },
-        "S": {
-            "item": "cobblemon:fire_stone"
-        },
+        "S": [
+            {
+                "item": "cobblemon:fire_stone"
+            },
+            {
+                "item": "cobblemon:fire_gem"
+            }
+        ],
         "H": {
             "item": "cobblemon:hard_stone"
         }

common/src/main/resources/data/cobblemon/recipe/icy_rock.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "weather_rock",
     "pattern": [
         "DS",
         "HD"
@@ -8,9 +9,14 @@
         "D": {
             "item": "minecraft:dripstone_block"
         },
-        "S": {
-            "item": "cobblemon:ice_stone"
-        },
+        "S": [
+            {
+                "item": "cobblemon:ice_stone"
+            },
+            {
+                "item": "cobblemon:ice_gem"
+            }
+        ],
         "H": {
             "item": "cobblemon:hard_stone"
         }

common/src/main/resources/data/cobblemon/recipe/magnet.json

@@ -10,7 +10,7 @@
             "tag": "c:ingots/iron"
         },
         "B": {
-            "tag": "c:dyes/blue"
+            "tag": "c:gems/lapis"
         },
         "R": {
             "tag": "c:dusts/redstone"

common/src/main/resources/data/cobblemon/recipe/metronome.json

@@ -2,15 +2,15 @@
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " I ",
-        "IBI",
+        "InI",
 		"INI"
     ],
     "key": {
         "I": {
             "tag": "c:ingots/iron"
         },
-        "B": {
-            "item": "minecraft:iron_bars"
+        "n": {
+            "tag": "c:nuggets/iron"
         },
         "N": {
             "item": "minecraft:note_block"

common/src/main/resources/data/cobblemon/recipe/miracle_seed.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "miracle_seed",
     "pattern": [
         " S ",
         "SLS",
@@ -7,11 +8,16 @@
     ],
     "key": {
         "S": {
-            "tag": "minecraft:parrot_food"
+            "tag": "c:seeds"
         },
-        "L": {
-            "item": "cobblemon:leaf_stone"
-        }
+        "L": [
+            {
+                "item": "cobblemon:leaf_stone"
+            },
+            {
+                "item": "cobblemon:grass_gem"
+            }
+        ]
     },
     "result": {
         "id": "cobblemon:miracle_seed"

common/src/main/resources/data/cobblemon/recipe/muscle_band.json

@@ -1,13 +1,13 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        "WIW",
+        "LIL",
         "D I",
-        "WDW"
+        "LDL"
     ],
     "key": {
-        "W": {
-            "item": "minecraft:yellow_wool"
+        "L": {
+            "item": "minecraft:leather"
         },
         "D": {
             "tag": "c:dusts/redstone"

common/src/main/resources/data/cobblemon/recipe/mystic_water.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "mystic_water",
     "pattern": [
         " S ",
         "S S",
@@ -9,9 +10,14 @@
         "S": {
             "tag": "c:strings"
         },
-        "W": {
-            "item": "cobblemon:water_stone"
-        }
+        "W": [
+            {
+                "item": "cobblemon:water_stone"
+            },
+            {
+                "item": "cobblemon:water_gem"
+            }
+        ]
     },
     "result": {
         "id": "cobblemon:mystic_water"

common/src/main/resources/data/cobblemon/recipe/never_melt_ice.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "never_melt_ice",
     "pattern": [
         " P ",
         "PBP"
@@ -8,9 +9,17 @@
         "P": {
             "item": "minecraft:packed_ice"
         },
-        "B": {
-            "item": "minecraft:blue_ice"
-        }
+        "B": [
+            {
+                "item": "minecraft:blue_ice"
+            },
+            {
+                "item": "cobblemon:ice_stone"
+            },
+            {
+                "item": "cobblemon:ice_gem"
+            }
+        ]
     },
     "result": {
         "id": "cobblemon:never_melt_ice"

common/src/main/resources/data/cobblemon/recipe/never_melt_ice_using_stone.json

@@ -1,18 +0,0 @@
-{
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        " P ",
-        "PIP"
-    ],
-    "key": {
-        "P": {
-            "item": "minecraft:packed_ice"
-        },
-        "I": {
-            "item": "cobblemon:ice_stone"
-        }
-    },
-    "result": {
-        "id": "cobblemon:never_melt_ice"
-    }
-}

common/src/main/resources/data/cobblemon/recipe/pink_gilded_chest.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "gilded_chest",
     "pattern": [
         "GKG",
         "#C#",

common/src/main/resources/data/cobblemon/recipe/poke_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/pokedex_black.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/pokedex_blue.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/pokedex_green.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/pokedex_pink.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/pokedex_red.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/pokedex_white.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/pokedex_yellow.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "pokedex",
     "pattern": [
         "IAC",
         "ISI",

common/src/main/resources/data/cobblemon/recipe/power_anklet.json

@@ -10,7 +10,7 @@
             "item": "cobblemon:green_mint_leaf"
         },
         "C": {
-            "item": "minecraft:light_blue_concrete"
+            "tag": "c:concrete"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/power_band.json

@@ -10,7 +10,7 @@
             "item": "cobblemon:pink_mint_leaf"
         },
         "C": {
-            "item": "minecraft:yellow_concrete"
+            "tag": "c:concrete"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/power_belt.json

@@ -10,7 +10,7 @@
             "item": "cobblemon:blue_mint_leaf"
         },
         "C": {
-            "item": "minecraft:orange_concrete"
+            "tag": "c:concrete"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/power_bracer.json

@@ -10,7 +10,7 @@
             "item": "cobblemon:red_mint_leaf"
         },
         "C": {
-            "item": "minecraft:red_concrete"
+            "tag": "c:concrete"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/power_lens.json

@@ -10,7 +10,7 @@
             "item": "cobblemon:cyan_mint_leaf"
         },
         "C": {
-            "item": "minecraft:magenta_concrete"
+            "tag": "c:concrete"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/power_weight.json

@@ -10,7 +10,7 @@
             "item": "cobblemon:white_mint_leaf"
         },
         "C": {
-            "item": "minecraft:lime_concrete"
+            "tag": "c:concrete"
         },
         "D": {
             "tag": "c:gems/diamond"

common/src/main/resources/data/cobblemon/recipe/premier_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/protective_pads.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "W": {
-            "item": "minecraft:blue_wool"
+            "tag": "minecraft:wool"
         },
         "I": {
             "tag": "c:ingots/iron"

common/src/main/resources/data/cobblemon/recipe/protein.json

@@ -5,10 +5,10 @@
             "item": "cobblemon:medicinal_brew"
         },
         {
-            "tag": "cobblemon:protein_ingredients"
+            "tag": "c:foods/raw_meat"
         },
         {
-            "tag": "cobblemon:protein_ingredients"
+            "tag": "c:foods/raw_meat"
         },
         {
             "item": "cobblemon:kelpsy_berry"

common/src/main/resources/data/cobblemon/recipe/punching_glove.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "W": {
-            "item": "minecraft:red_wool"
+            "tag": "minecraft:wool"
         },
         "G": {
             "tag": "c:ingots/gold"

common/src/main/resources/data/cobblemon/recipe/reaper_cloth.json

@@ -10,7 +10,7 @@
             "item": "minecraft:phantom_membrane"
         },
         "W": {
-            "item": "minecraft:gray_wool"
+            "tag": "minecraft:wool"
         },
         "G": {
             "item": "minecraft:ghast_tear"

common/src/main/resources/data/cobblemon/recipe/rocky_helmet.json

@@ -10,7 +10,7 @@
             "tag": "c:ingots/gold"
         },
         "L": {
-            "tag": "c:dyes/lime"
+            "item": "minecraft:turtle_scute"
         },
         "S": {
             "item": "cobblemon:hard_stone"

common/src/main/resources/data/cobblemon/recipe/room_service.json

@@ -10,7 +10,7 @@
             "tag": "c:ingots/iron"
         },
         "W": {
-            "item": "minecraft:white_wool"
+            "tag": "minecraft:wool"
         },
         "M": {
             "item": "minecraft:minecart"

common/src/main/resources/data/cobblemon/recipe/roseate_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/sachet.json

@@ -1,28 +1,22 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-        "SPS",
-        "LAF",
-        "MPM"
+        "S S",
+        "HPH",
+        "AHA"
     ],
     "key": {
         "P": {
-            "item": "minecraft:purple_wool"
+            "item": "minecraft:pink_petals"
         },
         "S": {
             "tag": "c:strings"
         },
-        "M": {
-            "item": "minecraft:magenta_wool"
-        },
-        "L": {
-            "item": "minecraft:lilac"
+        "H": {
+            "item": "minecraft:rabbit_hide"
         },
         "A": {
-            "item": "minecraft:allium"
-        },
-        "F": {
-            "item": "minecraft:peony"
+            "tag": "c:gems/amethyst"
         }
     },
     "result": {

common/src/main/resources/data/cobblemon/recipe/safety_goggles.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "G": {
-            "item": "minecraft:red_stained_glass"
+            "tag": "c:gems/amethyst"
         },
         "S": {
             "item": "minecraft:turtle_scute"

common/src/main/resources/data/cobblemon/recipe/silk_scarf.json

@@ -7,7 +7,7 @@
     ],
     "key": {
         "W": {
-            "item": "minecraft:white_wool"
+            "tag": "minecraft:wool"
         },
         "S": {
             "tag": "c:strings"

common/src/main/resources/data/cobblemon/recipe/slate_ball.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "basic_balls",
     "pattern": [
         " t ",
         "lcr",

common/src/main/resources/data/cobblemon/recipe/smooth_rock.json

@@ -1,5 +1,6 @@
 {
     "type": "minecraft:crafting_shaped",
+    "group": "weather_rock",
     "pattern": [
         "DS",
         "HD"
@@ -8,9 +9,17 @@
         "D": {
             "item": "minecraft:dripstone_block"
         },
-        "S": {
-            "item": "cobblemon:soft_sand"
-        },
+        "S": [
+            {
+                "item": "cobblemon:soft_sand"
+            },
+            {
+                "item": "cobblemon:rock_gem"
+            },
+            {
+                "item": "cobblemon:ground_gem"
+            }
+        ],
         "H": {
             "item": "cobblemon:hard_stone"
         }

common/src/main/resources/data/cobblemon/recipe/spell_tag.json

@@ -1,24 +1,16 @@
 {
-    "type": "minecraft:crafting_shaped",
-    "pattern": [
-        " PG",
-        "PRP",
-        "WP "
-    ],
-    "key": {
-        "W": {
-            "tag": "c:dyes/white"
+    "type": "minecraft:crafting_shapeless",
+    "ingredients": [
+        {
+            "item": "minecraft:ink_sac"
         },
-        "R": {
-            "tag": "c:dyes/red"
-        },
-        "P": {
+        {
             "item": "minecraft:paper"
         },
-        "G": {
-            "tag": "c:dyes/gray"
+        {
+            "item": "cobblemon:ghost_gem"
         }
-    },
+    ],
     "result": {
         "id": "cobblemon:spell_tag"
     }

common/src/main/resources/data/cobblemon/recipe/twisted_spoon.json

@@ -4,9 +4,14 @@
         {
             "item": "minecraft:iron_shovel"
         },
-        {
-            "item": "minecraft:ender_pearl"
-        }
+        [
+            {
+                "item": "cobblemon:psychic_gem"
+            },
+            {
+                "item": "minecraft:ender_pearl"
+            }
+        ]
     ],
     "result": {
         "id": "cobblemon:twisted_spoon"

common/src/main/resources/data/cobblemon/recipe/utility_umbrella.json

@@ -7,13 +7,13 @@
     ],
     "key": {
         "I": {
-            "item": "minecraft:iron_bars"
+            "tag": "c:ingots/iron"
         },
         "W": {
-            "item": "minecraft:black_wool"
+            "tag": "minecraft:wool"
         },
         "B": {
-            "item": "minecraft:blackstone"
+            "item": "minecraft:flint"
         }
     },
     "result": {