- adjusted logic to prepare for detecting user switches and to allow for better use of pivot moves

# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt
#	common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt

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

@@ -46,6 +46,7 @@ object CobblemonCommands {
         ClearPartyCommand.register(dispatcher)
         ClearPCCommand.register(dispatcher)
         PokemonRestartCommand.register(dispatcher)
+        RandomBattleCommand.register(dispatcher)
         BedrockParticleCommand.register(dispatcher)
         OpenDialogueCommand.register(dispatcher)
     }

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

@@ -596,16 +596,28 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
 
     // Held Items
     @JvmField
+    val ABILITY_SHIELD = heldItem("ability_shield")
+    @JvmField
+    val ABSORB_BULB = heldItem("absorb_bulb")
+    @JvmField
+    val AIR_BALLOON = heldItem("air_balloon")
+    @JvmField
     val ASSAULT_VEST = heldItem("assault_vest")
     @JvmField
     val BIG_ROOT = blockItem("big_root", CobblemonBlocks.BIG_ROOT)
     @JvmField
+    val BINDING_BAND = heldItem("binding_band")
+    @JvmField
     val BLACK_BELT = heldItem("black_belt")
     @JvmField
     val BLACK_GLASSES = heldItem("black_glasses")
     @JvmField
     val BLACK_SLUDGE = heldItem("black_sludge")
     @JvmField
+    val BLUNDER_POLICY = heldItem("blunder_policy")
+    @JvmField
+    val CELL_BATTERY = heldItem("cell_battery")
+    @JvmField
     val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
     @JvmField
     val CHOICE_BAND = heldItem("choice_band")
@@ -616,26 +628,64 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val CLEANSE_TAG = heldItem("cleanse_tag")
     @JvmField
+    val CLEAR_AMULET = heldItem("clear_amulet")
+    @JvmField
+    val COVERT_CLOAK = heldItem("covert_cloak")
+    @JvmField
+    val DESTINY_KNOT = heldItem("destiny_knot")
+    @JvmField
     val DRAGON_FANG = heldItem("dragon_fang")
     @JvmField
+    val EJECT_BUTTON = heldItem("eject_button")
+    @JvmField
+    val EJECT_PACK = heldItem("eject_pack")
+    @JvmField
+    val EVERSTONE = heldItem("everstone")
+    @JvmField
+    val EVIOLITE = heldItem("eviolite")
+    @JvmField
     val EXP_SHARE = heldItem("exp_share")
     @JvmField
+    val EXPERT_BELT = heldItem("expert_belt")
+    @JvmField
     val FAIRY_FEATHER = heldItem("fairy_feather")
     @JvmField
+    val FLAME_ORB = heldItem("flame_orb")
+    @JvmField
+    val FLOAT_STONE = heldItem("float_stone")
+    @JvmField
     val FOCUS_BAND = heldItem("focus_band")
     @JvmField
+    val FOCUS_SASH = heldItem("focus_sash")
+    @JvmField
+    val GRIP_CLAW = heldItem("grip_claw")
+    @JvmField
     val HARD_STONE = heldItem("hard_stone")
     @JvmField
     val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
     @JvmField
+    val IRON_BALL = heldItem("iron_ball")
+    @JvmField
+    val LAGGING_TAIL = heldItem("lagging_tail")
+    @JvmField
     val LEFTOVERS = heldItem("leftovers")
     @JvmField
+    val LIFE_ORB = heldItem("life_orb")
+    @JvmField
+    val LIGHT_BALL = heldItem("light_ball")
+    @JvmField
     val LIGHT_CLAY = heldItem("light_clay")
     @JvmField
+    val LOADED_DICE = heldItem("loaded_dice")
+    @JvmField
     val LUCKY_EGG = heldItem("lucky_egg")
     @JvmField
+    val LUMINOUS_MOSS = heldItem("luminous_moss")
+    @JvmField
     val MAGNET = heldItem("magnet")
     @JvmField
+    val METRONOME = heldItem("metronome")
+    @JvmField
     val MIRACLE_SEED = heldItem("miracle_seed")
     @JvmField
     val MUSCLE_BAND = heldItem("muscle_band")
@@ -646,14 +696,42 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val POISON_BARB = heldItem("poison_barb")
     @JvmField
+    val POWER_ANKLET = heldItem("power_anklet")
+    @JvmField
+    val POWER_BAND = heldItem("power_band")
+    @JvmField
+    val POWER_BELT = heldItem("power_belt")
+    @JvmField
+    val POWER_BRACER = heldItem("power_bracer")
+    @JvmField
+    val POWER_LENS = heldItem("power_lens")
+    @JvmField
+    val POWER_WEIGHT = heldItem("power_weight")
+    @JvmField
+    val PROTECTIVE_PADS = heldItem("protective_pads")
+    @JvmField
+    val PUNCHING_GLOVE = heldItem("punching_glove")
+    @JvmField
     val QUICK_CLAW = heldItem("quick_claw")
     @JvmField
+    val RED_CARD = heldItem("red_card")
+    @JvmField
+    val RING_TARGET = heldItem("ring_target")
+    @JvmField
     val ROCKY_HELMET = heldItem("rocky_helmet")
     @JvmField
+    val ROOM_SERVICE = heldItem("room_service")
+    @JvmField
     val SAFETY_GOGGLES = heldItem("safety_goggles")
     @JvmField
+    val SCOPE_LENS = heldItem("scope_lens")
+    @JvmField
     val SHARP_BEAK = heldItem("sharp_beak")
     @JvmField
+    val SHED_SHELL = heldItem("shed_shell")
+    @JvmField
+    val SHELL_BELL = heldItem("shell_bell")
+    @JvmField
     val SILK_SCARF = heldItem("silk_scarf")
     @JvmField
     val SILVER_POWDER = heldItem("silver_powder")
@@ -662,10 +740,28 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val SPELL_TAG = heldItem("spell_tag")
     @JvmField
+    val SMOKE_BALL = heldItem("smoke_ball")
+    @JvmField
+    val STICKY_BARB = heldItem("sticky_barb")
+    @JvmField
+    val TERRAIN_EXTENDER = heldItem("terrain_extender")
+    @JvmField
+    val THROAT_SPRAY = heldItem("throat_spray")
+    @JvmField
+    val TOXIC_ORB = heldItem("toxic_orb")
+    @JvmField
     val TWISTED_SPOON = heldItem("twisted_spoon")
     @JvmField
+    val UTILITY_UMBRELLA = heldItem("utility_umbrella")
+    @JvmField
+    val WEAKNESS_POLICY = heldItem("weakness_policy")
+    @JvmField
+    val WIDE_LENS = heldItem("wide_lens")
+    @JvmField
     val WISE_GLASSES = heldItem("wise_glasses")
     @JvmField
+    val ZOOM_LENS = heldItem("zoom_lens")
+    @JvmField
     val MENTAL_HERB = compostableHeldItem("mental_herb", null, 1F)
     @JvmField
     val MIRROR_HERB = compostableHeldItem("mirror_herb", null, 1F)
@@ -680,29 +776,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val QUICK_POWDER = heldItem("quick_powder")
     @JvmField
-    val DESTINY_KNOT = heldItem("destiny_knot")
+    val DAMP_ROCK = heldItem("damp_rock")
     @JvmField
-    val EVERSTONE = heldItem("everstone")
+    val HEAT_ROCK = heldItem("heat_rock")
     @JvmField
-    val POWER_ANKLET = heldItem("power_anklet")
+    val SMOOTH_ROCK = heldItem("smooth_rock")
     @JvmField
-    val POWER_BAND = heldItem("power_band")
-    @JvmField
-    val POWER_BELT = heldItem("power_belt")
-    @JvmField
-    val POWER_BRACER = heldItem("power_bracer")
-    @JvmField
-    val POWER_LENS = heldItem("power_lens")
-    @JvmField
-    val POWER_WEIGHT = heldItem("power_weight")
-    @JvmField
-    val FLAME_ORB = heldItem("flame_orb")
-    @JvmField
-    val LIFE_ORB = heldItem("life_orb")
-    @JvmField
-    val TOXIC_ORB = heldItem("toxic_orb")
-    @JvmField
-    val SMOKE_BALL = heldItem("smoke_ball")
+    val ICY_ROCK = heldItem("icy_rock")
 
     // Mulch
     @JvmField

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

@@ -96,6 +96,7 @@ open class PokemonBattle(
     val chatLog = mutableListOf<Text>()
     var started = false
     var ended = false
+    var simulation = false
     // TEMP battle showcase stuff
     var announcingRules = false
     var turn: Int = 1
@@ -205,7 +206,8 @@ open class PokemonBattle(
 
     fun end() {
         ended = true
-        this.actors.forEach { actor ->
+        // award XP if it is not a simulation battle
+        if (simulation == false) this.actors.forEach { actor ->
             val faintedPokemons = actor.pokemonList.filter { it.health <= 0 }
             actor.getSide().getOppositeSide().actors.forEach { opponent ->
                 val opponentNonFaintedPokemons = opponent.pokemonList.filter { it.health > 0 }

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

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.api.battles.model.ai.BattleAI
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.battles.PassActionResponse
+import com.cobblemon.mod.common.battles.ai.StrongBattleAI
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.exception.IllegalActionChoiceException
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMakeChoicePacket
@@ -20,7 +21,7 @@ import java.util.UUID
 abstract class AIBattleActor(
     gameId: UUID,
     pokemonList: List<BattlePokemon>,
-    val battleAI: BattleAI
+    val battleAI: BattleAI = StrongBattleAI(0)
 ) : BattleActor(gameId, pokemonList.toMutableList()) {
     override fun sendUpdate(packet: NetworkPacket<*>) {
         super.sendUpdate(packet)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt

@@ -13,7 +13,9 @@ import com.cobblemon.mod.common.api.moves.categories.DamageCategory
 import com.cobblemon.mod.common.api.types.ElementalType
 import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.battles.MoveTarget
+import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.util.lang
+import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName
 import net.minecraft.text.MutableText
 
@@ -45,7 +47,8 @@ open class MoveTemplate(
     val pp: Int,
     val priority: Int,
     val critRatio: Double,
-    val effectChances: Array<Double>
+    val effectChances: Array<Double>,
+    val flags: Set<String>
 ) {
 
     val displayName: MutableText
@@ -65,7 +68,8 @@ open class MoveTemplate(
         pp = 5,
         priority = 0,
         critRatio = 0.0,
-        effectChances = emptyArray()
+        effectChances = emptyArray(),
+        flags = emptySet()
     )
 
     companion object {
@@ -92,4 +96,9 @@ open class MoveTemplate(
             template = this
         )
     }
+
+    /**
+     * Returns this move's showdown data as a [JsonObject]
+     */
+    fun showdownJson() = ShowdownService.service.getMoves()[num].asJsonObject
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt

@@ -72,7 +72,22 @@ object Moves : DataRegistry {
                         effectChances += secondaryMember.get("chance").asDouble
                     }
                 }
-                val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray())
+                val flags = mutableSetOf<String>()
+                jsMove["flags"].asJsonObject.asMap().forEach { flags.add(it.key) }
+                val move = MoveTemplate(
+                    id,
+                    num,
+                    elementalType,
+                    damageCategory,
+                    power,
+                    target,
+                    accuracy,
+                    pp,
+                    priority,
+                    critRatio,
+                    effectChances.toTypedArray(),
+                    flags
+                )
                 this.register(move)
             } catch (e: Exception) {
                 Cobblemon.LOGGER.error("Caught exception trying to resolve the move '{}'", id, e)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/tags/MoveTag.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.moves.tags
+
+import com.cobblemon.mod.common.api.moves.MoveTemplate
+
+class MoveTag(
+    val moves: List<MoveTemplate>
+)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/tags/MoveTags.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.moves.tags
+
+import com.cobblemon.mod.common.api.moves.Moves
+
+object MoveTags {
+
+    private val moves = Moves.all()
+
+    val PRIORITY_ZERO = MoveTag(moves.filter { it.priority == 0 })
+
+    /* Showdown flags */
+    val PROTECT = MoveTag(moves.filter { it.flags.contains("protect") })
+    val CONTACT = MoveTag(moves.filter { it.flags.contains("contact") })
+    val DISTANCE = MoveTag(moves.filter { it.flags.contains("distance") })
+    val ALLY_ANIM = MoveTag(moves.filter { it.flags.contains("allyanim") })
+    val FAIL_ENCORE = MoveTag(moves.filter { it.flags.contains("failencore") })
+    val FAIL_COPYCAT = MoveTag(moves.filter { it.flags.contains("failcopycat") })
+    val REFLECTABLE = MoveTag(moves.filter { it.flags.contains("reflectable") })
+    val BITE = MoveTag(moves.filter { it.flags.contains("bite") })
+    val NON_SKY = MoveTag(moves.filter { it.flags.contains("nonsky") })
+    val GRAVITY = MoveTag(moves.filter { it.flags.contains("gravity") })
+    val POWDER = MoveTag(moves.filter { it.flags.contains("powder") })
+    val PLEDGE_COMBO = MoveTag(moves.filter { it.flags.contains("pledgecombo") })
+    val MIRROR = MoveTag(moves.filter { it.flags.contains("mirror") })
+    val SNATCH = MoveTag(moves.filter { it.flags.contains("snatch") })
+    val SLICING = MoveTag(moves.filter { it.flags.contains("slicing") })
+    val WIND = MoveTag(moves.filter { it.flags.contains("wind") })
+    val NO_SLEEP_TALK = MoveTag(moves.filter { it.flags.contains("nosleeptalk") })
+    val FAIL_INSTRUCT = MoveTag(moves.filter { it.flags.contains("failinstruct") })
+    val PULSE = MoveTag(moves.filter { it.flags.contains("pulse") })
+    val RECHARGE = MoveTag(moves.filter { it.flags.contains("recharge") })
+    val SOUND = MoveTag(moves.filter { it.flags.contains("sound") })
+    val PUNCH = MoveTag(moves.filter { it.flags.contains("punch") })
+    val FUTURE_MOVE = MoveTag(moves.filter { it.flags.contains("futuremove") })
+    val MUST_PRESSURE = MoveTag(moves.filter { it.flags.contains("mustpressure") })
+    val HEAL = MoveTag(moves.filter { it.flags.contains("heal") })
+    val BULLET = MoveTag(moves.filter { it.flags.contains("bullet") })
+    val BYPASS_SUB = MoveTag(moves.filter { it.flags.contains("bypasssub") })
+    val DANCE = MoveTag(moves.filter { it.flags.contains("dance") })
+    val NO_ASSIST = MoveTag(moves.filter { it.flags.contains("noassist") })
+    val FAIL_MIMIC = MoveTag(moves.filter { it.flags.contains("failmimic") })
+    val FAIL_ME_FIRST = MoveTag(moves.filter { it.flags.contains("failmefirst") })
+    val CANT_USE_TWICE = MoveTag(moves.filter { it.flags.contains("cantusetwice") })
+    val CHARGE = MoveTag(moves.filter { it.flags.contains("charge") })
+    val DEFROST = MoveTag(moves.filter { it.flags.contains("defrost") })
+    val NO_PARENTAL_BOND = MoveTag(moves.filter { it.flags.contains("noparentalbond") })
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/permission/CobblemonPermissions.kt

@@ -70,6 +70,9 @@ object CobblemonPermissions {
     val CLEAR_PARTY = this.create("${COMMAND_PREFIX}clearparty", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
     val CLEAR_PC = this.create("${COMMAND_PREFIX}clearpc", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
 
+    // Test for starting a random battle with AI Player
+    val RANDOM_BATTLE = this.create("${COMMAND_PREFIX}randombattle", PermissionLevel.CHEAT_COMMANDS_AND_COMMAND_BLOCKS)
+
     fun all(): Iterable<Permission> = this.permissions
 
     private fun create(node: String, level: PermissionLevel): Permission {

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

@@ -13,6 +13,7 @@ import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.Abilities
+import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
@@ -92,6 +93,10 @@ open class PokemonProperties {
             props.dmaxLevel = parseIntProperty(keyPairs, listOf("dmax_level", "dmax"))?.coerceIn(0, Cobblemon.config.maxDynamaxLevel)
             props.gmaxFactor = parseBooleanProperty(keyPairs, listOf("gmax_factor", "gmax"))
             props.tradeable = parseBooleanProperty(keyPairs, listOf("tradeable", "tradable"))
+            props.move1 = parseStringOfRegistry(keyPairs, listOf("move1", "m1")) { Moves.getByName(it)?.name }
+            props.move2 = parseStringOfRegistry(keyPairs, listOf("move2", "m2")) { Moves.getByName(it)?.name }
+            props.move3 = parseStringOfRegistry(keyPairs, listOf("move3", "m3")) { Moves.getByName(it)?.name }
+            props.move4 = parseStringOfRegistry(keyPairs, listOf("move4", "m4")) { Moves.getByName(it)?.name }
             props.originalTrainerType = OriginalTrainerType.values().toList().parsePropertyOfCollection(keyPairs, listOf("originaltrainertype", "ottype"), labelsOptional = true) { it.name.lowercase() }
             props.originalTrainer = parsePlayerProperty(keyPairs, listOf("originaltrainer", "ot"))
 
@@ -274,9 +279,14 @@ open class PokemonProperties {
     var dmaxLevel: Int? = null
     var gmaxFactor: Boolean? = null
     var tradeable: Boolean? = null
+    var move1: String? = null
+    var move2: String? = null
+    var move3: String? = null
+    var move4: String? = null
     var originalTrainerType: OriginalTrainerType? = null
     var originalTrainer: String? = null // Original Trainer by Username or UUID
 
+
     var ivs: IVs? = null
     var evs: EVs? = null
     var customProperties = mutableListOf<CustomPokemonProperty>()
@@ -329,6 +339,10 @@ open class PokemonProperties {
         dmaxLevel?.let { pokemon.dmaxLevel = it }
         gmaxFactor?.let { pokemon.gmaxFactor = it }
         tradeable?.let { pokemon.tradeable = it }
+        move1?.let { pokemon.setMove(it, 0) }
+        move2?.let { pokemon.setMove(it, 1) }
+        move3?.let { pokemon.setMove(it, 2) }
+        move4?.let { pokemon.setMove(it, 3) }
         // If it has been explicitly set to NONE, clear the stored information, including the originalTrainer property
         originalTrainerType?.let {
             if (it == OriginalTrainerType.NONE) {
@@ -391,6 +405,10 @@ open class PokemonProperties {
         dmaxLevel?.let { pokemonEntity.pokemon.dmaxLevel = it }
         gmaxFactor?.let { pokemonEntity.pokemon.gmaxFactor = it }
         tradeable?.let { pokemonEntity.pokemon.tradeable = it }
+        move1?.let { pokemonEntity.pokemon.setMove(it, 0) }
+        move2?.let { pokemonEntity.pokemon.setMove(it, 1) }
+        move3?.let { pokemonEntity.pokemon.setMove(it, 2) }
+        move4?.let { pokemonEntity.pokemon.setMove(it, 3) }
         // If it has been explicitly set to NONE, clear the stored information, including the originalTrainer property
         originalTrainerType?.let {
             if (it == OriginalTrainerType.NONE) {
@@ -451,6 +469,10 @@ open class PokemonProperties {
         dmaxLevel?.takeIf { it != pokemon.dmaxLevel }?.let { return false }
         gmaxFactor?.takeIf { it != pokemon.gmaxFactor }?.let { return false }
         tradeable?.takeIf { it != pokemon.tradeable }?.let { return false }
+        move1?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move2?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move3?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move4?.takeIf { move -> pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
         originalTrainer?.takeIf { it != pokemon.originalTrainer }?.let{ return false }
         originalTrainerType?.takeIf { it != pokemon.originalTrainerType }?.let{ return false }
         return customProperties.none { !it.matches(pokemon) }
@@ -489,6 +511,10 @@ open class PokemonProperties {
         dmaxLevel?.takeIf { it != pokemonEntity.pokemon.dmaxLevel }?.let { return false }
         gmaxFactor?.takeIf { it != pokemonEntity.pokemon.gmaxFactor }?.let { return false }
         tradeable?.takeIf { it != pokemonEntity.pokemon.tradeable }?.let { return false }
+        move1?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move2?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move3?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
+        move4?.takeIf { move -> pokemonEntity.pokemon.moveSet.getMoves().none { it.name == move } }?.let { return false }
         originalTrainer?.takeIf { it != pokemonEntity.pokemon.originalTrainer }?.let{ return false }
         originalTrainerType?.takeIf { it != pokemonEntity.pokemon.originalTrainerType }?.let{ return false }
         return customProperties.none { !it.matches(pokemonEntity) }
@@ -535,6 +561,10 @@ open class PokemonProperties {
         dmaxLevel?.takeIf { it != properties.dmaxLevel }?.let { return false }
         gmaxFactor?.takeIf { it != properties.gmaxFactor }?.let { return false }
         tradeable?.takeIf { it != properties.tradeable }?.let { return false }
+        move1?.takeIf { it != properties.move1 }?.let { return false }
+        move2?.takeIf { it != properties.move2 }?.let { return false }
+        move3?.takeIf { it != properties.move3 }?.let { return false }
+        move4?.takeIf { it != properties.move4 }?.let { return false }
         originalTrainer?.takeIf { it != properties.originalTrainer }?.let{ return false }
         originalTrainerType?.takeIf { it != properties.originalTrainerType }?.let{ return false }
         return true
@@ -543,7 +573,8 @@ open class PokemonProperties {
     fun create(): Pokemon {
         val pokemon = Pokemon()
         apply(pokemon)
-        pokemon.initialize()
+        if (move1 == null) //if there is not a move1 or later specific moves stated then initialize
+            pokemon.initialize()
         roll(pokemon)
         return pokemon
     }

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

@@ -33,6 +33,7 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.api.spawning.TimeRange
 import com.cobblemon.mod.common.api.types.ElementalType
+import com.cobblemon.mod.common.api.types.ElementalTypes
 import com.cobblemon.mod.common.api.types.adapters.ElementalTypeAdapter
 import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPacket
 import com.cobblemon.mod.common.pokemon.FormData
@@ -171,6 +172,9 @@ object PokemonSpecies : JsonDataRegistry<Species> {
      */
     fun random(): Species = this.implemented.random()
 
+    // overloaded function to give random pokemon species of a certain type
+    fun random(type: ElementalType): Species = this.implemented.filter { it.primaryType == type || it.secondaryType == type }.random()
+
     override fun reload(data: Map<Identifier, Species>) {
         this.speciesByIdentifier.clear()
         this.implemented.clear()

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

@@ -16,6 +16,7 @@ import com.cobblemon.mod.common.api.events.battles.BattleStartedPreEvent
 import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
+import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.battles.runner.ShowdownService
 import com.cobblemon.mod.common.net.messages.client.battle.BattleChallengeExpiredPacket
@@ -44,6 +45,7 @@ object BattleRegistry {
         .registerTypeAdapter(ShowdownMoveset::class.java, ShowdownMovesetAdapter)
         .create()
     private val battleMap = ConcurrentHashMap<UUID, PokemonBattle>()
+    private val partyMap = ConcurrentHashMap<UUID, List<PartyStore>>()
     // Challenger to challenge
     val pvpChallenges = mutableMapOf<UUID, BattleChallenge>()
 
@@ -201,10 +203,11 @@ object BattleRegistry {
     }
 
     fun startBattle(
-        battleFormat: BattleFormat,
-        side1: BattleSide,
-        side2: BattleSide,
-        silent: Boolean = false
+            battleFormat: BattleFormat,
+            side1: BattleSide,
+            side2: BattleSide,
+            silent: Boolean = false,
+            clonePartyStores: List<PartyStore>? = null // used for cloned team battles
     ): BattleStartResult {
         val battle = PokemonBattle(battleFormat, side1, side2)
         if (silent) return SuccessfulBattleStart(battle)
@@ -212,6 +215,9 @@ object BattleRegistry {
         val preBattleEvent = BattleStartedPreEvent(battle)
         CobblemonEvents.BATTLE_STARTED_PRE.postThen(preBattleEvent) {
             battleMap[battle.battleId] = battle
+            if(clonePartyStores != null) {
+                partyMap[battle.battleId] = clonePartyStores
+            }
             startShowdown(battle)
             CobblemonEvents.BATTLE_STARTED_POST.post(BattleStartedPostEvent(battle))
             return SuccessfulBattleStart(battle)
@@ -221,6 +227,7 @@ object BattleRegistry {
 
     fun closeBattle(battle: PokemonBattle) {
         battleMap.remove(battle.battleId)
+        partyMap.remove(battle.battleId)
     }
 
     fun getBattle(id: UUID) : PokemonBattle? {

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

@@ -387,6 +387,8 @@ class ShowdownPokemon {
     lateinit var baseAbility: String
     lateinit var pokeball: String
     lateinit var ability: String
+    var baseTypes = mutableListOf<String>()
+    var types = mutableListOf<String>()
     var reviving: Boolean = false
 
     val uuid: UUID by lazy { UUID.fromString(details.split(",")[1].trim()) }
@@ -401,6 +403,11 @@ class ShowdownPokemon {
         buffer.writeString(baseAbility)
         buffer.writeString(pokeball)
         buffer.writeString(ability)
+        buffer.writeSizedInt(IntSize.U_BYTE, baseTypes.size)
+        baseTypes.forEach(buffer::writeString)
+        buffer.writeSizedInt(IntSize.U_BYTE, types.size)
+        types.forEach(buffer::writeString)
+
 
     }
     fun loadFromBuffer(buffer: PacketByteBuf): ShowdownPokemon {
@@ -415,6 +422,12 @@ class ShowdownPokemon {
         baseAbility = buffer.readString()
         pokeball = buffer.readString()
         ability = buffer.readString()
+        repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) {
+            baseTypes.add(buffer.readString())
+        }
+        repeat(times = buffer.readSizedInt(IntSize.U_BYTE)) {
+            types.add(buffer.readString())
+        }
         return this
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/PokemonBattleActor.kt

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.battles.model.actor.FleeableBattleActor
 import com.cobblemon.mod.common.api.battles.model.ai.BattleAI
 import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.battles.ai.RandomBattleAI
+import com.cobblemon.mod.common.battles.ai.StrongBattleAI
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleEndPacket
@@ -29,7 +30,8 @@ open class PokemonBattleActor(
     uuid: UUID,
     val pokemon: BattlePokemon,
     override val fleeDistance: Float,
-    artificialDecider: BattleAI = RandomBattleAI()
+    //artificialDecider: BattleAI = RandomBattleAI()
+    artificialDecider: BattleAI = StrongBattleAI(0)
 ) : AIBattleActor(uuid, listOf(pokemon), artificialDecider), EntityBackedBattleActor<PokemonEntity>, FleeableBattleActor {
     override fun getName() = pokemon.effectedPokemon.species.translatedName
     override fun nameOwned(name: String): MutableText = Text.literal(name)

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/TrainerBattleActor.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.battles.actor
 import com.cobblemon.mod.common.api.battles.model.actor.AIBattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.ai.BattleAI
+import com.cobblemon.mod.common.battles.ai.StrongBattleAI
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.battleLang
@@ -18,10 +19,11 @@ import java.util.UUID
 import net.minecraft.text.MutableText
 
 class TrainerBattleActor(
-    val trainerName: String,
-    uuid: UUID,
-    pokemonList: List<BattlePokemon>,
-    artificialDecider: BattleAI
+        val trainerName: String,
+        uuid: UUID,
+        pokemonList: List<BattlePokemon>,
+        skill: Int,
+        artificialDecider: BattleAI = StrongBattleAI(skill)
 ) : AIBattleActor(uuid, pokemonList, artificialDecider) {
     override fun getName() = trainerName.asTranslated()
     override fun nameOwned(name: String): MutableText = battleLang("owned_pokemon", this.getName(), name)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/BattleGUI.kt

@@ -116,12 +116,12 @@ class BattleGUI : Screen(battleLang("gui.title")) {
         val currentSelection = getCurrentActionSelection()
         if (currentSelection == null || currentSelection is BattleGeneralActionSelection ) {
             drawScaledText(
-                context = context,
-                text = battleLang("ui.hide_label", PartySendBinding.boundKey().localizedText),
-                x = MinecraftClient.getInstance().window.scaledWidth / 2,
-                y = (MinecraftClient.getInstance().window.scaledHeight / 5),
-                opacity = 0.75F * opacity,
-                centered = true
+                    context = context,
+                    text = battleLang("ui.hide_label", PartySendBinding.boundKey().localizedText),
+                    x = MinecraftClient.getInstance().window.scaledWidth / 2,
+                    y = (MinecraftClient.getInstance().window.scaledHeight / 5),
+                    opacity = 0.75F * opacity,
+                    centered = true
             )
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGeneralActionSelection.kt

@@ -25,16 +25,16 @@ import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.text.MutableText
 import net.minecraft.util.Identifier
 class BattleGeneralActionSelection(
-    battleGUI: BattleGUI,
-    request: SingleActionRequest
+        battleGUI: BattleGUI,
+        request: SingleActionRequest
 ) : BattleActionSelection(
-    battleGUI,
-    request,
-    BattleGUI.OPTION_ROOT_X,
-    MinecraftClient.getInstance().window.scaledHeight - BattleGUI.OPTION_VERTICAL_OFFSET,
-    (BattleOptionTile.OPTION_WIDTH + 3 * BattleGUI.OPTION_HORIZONTAL_SPACING).toInt(),
-    (BattleOptionTile.OPTION_HEIGHT + 3 * BattleGUI.OPTION_VERTICAL_SPACING).toInt(),
-    battleLang("choose_action")
+        battleGUI,
+        request,
+        BattleGUI.OPTION_ROOT_X,
+        MinecraftClient.getInstance().window.scaledHeight - BattleGUI.OPTION_VERTICAL_OFFSET,
+        (BattleOptionTile.OPTION_WIDTH + 3 * BattleGUI.OPTION_HORIZONTAL_SPACING).toInt(),
+        (BattleOptionTile.OPTION_HEIGHT + 3 * BattleGUI.OPTION_VERTICAL_SPACING).toInt(),
+        battleLang("choose_action")
 ) {
     val tiles = mutableListOf<BattleOptionTile>()
     init {
@@ -74,14 +74,14 @@ class BattleGeneralActionSelection(
         val x = if (rank % 2 == 0) BattleGUI.OPTION_ROOT_X else BattleGUI.OPTION_ROOT_X + BattleGUI.OPTION_HORIZONTAL_SPACING + BattleOptionTile.OPTION_WIDTH
         val y = if (rank > 1) startY + BattleOptionTile.OPTION_HEIGHT + BattleGUI.OPTION_HORIZONTAL_SPACING else startY
         tiles.add(
-            BattleOptionTile(
-                battleGUI = battleGUI,
-                x = x,
-                y = y,
-                resource = texture,
-                text = text,
-                onClick = onClick
-            )
+                BattleOptionTile(
+                        battleGUI = battleGUI,
+                        x = x,
+                        y = y,
+                        resource = texture,
+                        text = text,
+                        onClick = onClick
+                )
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGimmickButton.kt

@@ -138,7 +138,8 @@ abstract class BattleGimmickButton(gimmick: ShowdownMoveset.Gimmick, val x: Floa
                 pp = gimmickTemplate?.pp ?: moveTemplate.pp,
                 priority = gimmickTemplate?.priority ?: moveTemplate.priority,
                 critRatio = gimmickTemplate?.critRatio ?: moveTemplate.critRatio,
-                effectChances = gimmickTemplate?.effectChances ?: moveTemplate.effectChances
+                effectChances = gimmickTemplate?.effectChances ?: moveTemplate.effectChances,
+                flags = gimmickTemplate!!.flags
             )
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleMoveSelection.kt

@@ -35,16 +35,16 @@ import net.minecraft.text.Text
 import net.minecraft.util.math.MathHelper.floor
 
 class BattleMoveSelection(
-    battleGUI: BattleGUI,
-    request: SingleActionRequest,
+        battleGUI: BattleGUI,
+        request: SingleActionRequest,
 ) : BattleActionSelection(
-    battleGUI = battleGUI,
-    request = request,
-    x = 20,
-    y = MinecraftClient.getInstance().window.scaledHeight - 84,
-    width = 100,
-    height = 100,
-    battleLang("ui.select_move")
+        battleGUI = battleGUI,
+        request = request,
+        x = 20,
+        y = MinecraftClient.getInstance().window.scaledHeight - 84,
+        width = 100,
+        height = 100,
+        battleLang("ui.select_move")
 ) {
     companion object {
         const val MOVE_WIDTH = 92
@@ -77,10 +77,10 @@ class BattleMoveSelection(
     }
 
     open class MoveTile(
-        val moveSelection: BattleMoveSelection,
-        val move: InBattleMove,
-        val x: Float,
-        val y: Float,
+            val moveSelection: BattleMoveSelection,
+            val move: InBattleMove,
+            val x: Float,
+            val y: Float,
     ) {
         var moveTemplate = Moves.getByNameOrDummy(move.id)
         var rgb = moveTemplate.elementalType.hue.toRGB()
@@ -102,54 +102,54 @@ class BattleMoveSelection(
             val selectConditionOpacity = moveSelection.opacity * if (!selectable) 0.5F else 1F
 
             blitk(
-                matrixStack = context.matrices,
-                texture = moveTexture,
-                x = x,
-                y = y,
-                width = MOVE_WIDTH,
-                height = MOVE_HEIGHT,
-                vOffset = if (selectable && isHovered(mouseX.toDouble(), mouseY.toDouble())) MOVE_HEIGHT else 0,
-                textureHeight = MOVE_HEIGHT * 2,
-                red = rgb.first,
-                green = rgb.second,
-                blue = rgb.third,
-                alpha = selectConditionOpacity
+                    matrixStack = context.matrices,
+                    texture = moveTexture,
+                    x = x,
+                    y = y,
+                    width = MOVE_WIDTH,
+                    height = MOVE_HEIGHT,
+                    vOffset = if (selectable && isHovered(mouseX.toDouble(), mouseY.toDouble())) MOVE_HEIGHT else 0,
+                    textureHeight = MOVE_HEIGHT * 2,
+                    red = rgb.first,
+                    green = rgb.second,
+                    blue = rgb.third,
+                    alpha = selectConditionOpacity
             )
 
             blitk(
-                matrixStack = context.matrices,
-                texture = moveOverlayTexture,
-                x = x,
-                y = y,
-                width = MOVE_WIDTH,
-                height = MOVE_HEIGHT,
-                alpha = moveSelection.opacity
+                    matrixStack = context.matrices,
+                    texture = moveOverlayTexture,
+                    x = x,
+                    y = y,
+                    width = MOVE_WIDTH,
+                    height = MOVE_HEIGHT,
+                    alpha = moveSelection.opacity
             )
 
             // Type Icon
             TypeIcon(
-                x = x - 9,
-                y = y + 2,
-                type = moveTemplate.elementalType,
-                opacity = moveSelection.opacity
+                    x = x - 9,
+                    y = y + 2,
+                    type = moveTemplate.elementalType,
+                    opacity = moveSelection.opacity
             ).render(context)
 
             // Move Category
             MoveCategoryIcon(
-                x = x + 48,
-                y = y + 14.5,
-                category = moveTemplate.damageCategory,
-                opacity = moveSelection.opacity
+                    x = x + 48,
+                    y = y + 14.5,
+                    category = moveTemplate.damageCategory,
+                    opacity = moveSelection.opacity
             ).render(context)
 
             drawScaledText(
-                context = context,
-                font = CobblemonResources.DEFAULT_LARGE,
-                text = moveTemplate.displayName.bold(),
-                x = x + 17,
-                y = y + 2,
-                opacity = selectConditionOpacity,
-                shadow = true
+                    context = context,
+                    font = CobblemonResources.DEFAULT_LARGE,
+                    text = moveTemplate.displayName.bold(),
+                    x = x + 17,
+                    y = y + 2,
+                    opacity = selectConditionOpacity,
+                    shadow = true
             )
 
             var movePPText = Text.literal("${move.pp}/${move.maxpp}").bold()
@@ -163,13 +163,13 @@ class BattleMoveSelection(
             }
 
             drawScaledText(
-                context = context,
-                font = CobblemonResources.DEFAULT_LARGE,
-                text = movePPText,
-                x = x + 75,
-                y = y + 14,
-                opacity = moveSelection.opacity,
-                centered = true
+                    context = context,
+                    font = CobblemonResources.DEFAULT_LARGE,
+                    text = movePPText,
+                    x = x + 75,
+                    y = y + 14,
+                    opacity = moveSelection.opacity,
+                    centered = true
             )
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleSwitchPokemonSelection.kt

@@ -26,16 +26,16 @@ import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.math.MathHelper.ceil
 class BattleSwitchPokemonSelection(
-    battleGUI: BattleGUI,
-    request: SingleActionRequest
+        battleGUI: BattleGUI,
+        request: SingleActionRequest
 ) : BattleActionSelection(
-    battleGUI,
-    request,
-    x = 12,
-    y = ceil((MinecraftClient.getInstance().window.scaledHeight / 2) - (((SWITCH_TILE_HEIGHT * 3) + (SWITCH_TILE_VERTICAL_SPACING * 2)) / 2)),
-    width = 250,
-    height = 100,
-    battleLang("switch_pokemon")
+        battleGUI,
+        request,
+        x = 12,
+        y = ceil((MinecraftClient.getInstance().window.scaledHeight / 2) - (((SWITCH_TILE_HEIGHT * 3) + (SWITCH_TILE_VERTICAL_SPACING * 2)) / 2)),
+        width = 250,
+        height = 100,
+        battleLang("switch_pokemon")
 ) {
     companion object {
         const val SWITCH_TILE_WIDTH = BattleOverlay.TILE_WIDTH
@@ -48,11 +48,11 @@ class BattleSwitchPokemonSelection(
     val backButton = BattleBackButton(x - 3F, MinecraftClient.getInstance().window.scaledHeight - 22F )
 
     class SwitchTile(
-        val selection: BattleSwitchPokemonSelection,
-        val x: Float,
-        val y: Float,
-        val pokemon: Pokemon,
-        val showdownPokemon: ShowdownPokemon
+            val selection: BattleSwitchPokemonSelection,
+            val x: Float,
+            val y: Float,
+            val pokemon: Pokemon,
+            val showdownPokemon: ShowdownPokemon
     ) {
         fun isHovered(mouseX: Double, mouseY: Double) = mouseX in x..(x + SWITCH_TILE_WIDTH) && mouseY in (y..(y + SWITCH_TILE_HEIGHT))
         fun render(context: DrawContext, mouseX: Double, mouseY: Double, deltaTicks: Float) {
@@ -64,23 +64,23 @@ class BattleSwitchPokemonSelection(
                     healthRatioSplits[0].toInt() to pokemon.hp
                 }
                 CobblemonClient.battleOverlay.drawBattleTile(
-                    context = context,
-                    x = x,
-                    y = y,
-                    reversed = false,
-                    species = pokemon.species,
-                    level = pokemon.level,
-                    aspects = pokemon.aspects,
-                    displayName = pokemon.getDisplayName(),
-                    gender = pokemon.gender,
-                    status = pokemon.status?.status,
-                    maxHealth = maxHp,
-                    health = hp.toFloat(),
-                    isFlatHealth = true,
-                    state = null,
-                    colour = null,
-                    opacity = selection.opacity,
-                    partialTicks = deltaTicks
+                        context = context,
+                        x = x,
+                        y = y,
+                        reversed = false,
+                        species = pokemon.species,
+                        level = pokemon.level,
+                        aspects = pokemon.aspects,
+                        displayName = pokemon.getDisplayName(),
+                        gender = pokemon.gender,
+                        status = pokemon.status?.status,
+                        maxHealth = maxHp,
+                        health = hp.toFloat(),
+                        isFlatHealth = true,
+                        state = null,
+                        colour = null,
+                        opacity = selection.opacity,
+                        partialTicks = deltaTicks
                 )
             } catch (exception: Exception) {
                 throw exception
@@ -92,20 +92,20 @@ class BattleSwitchPokemonSelection(
         val pendingActionRequests = CobblemonClient.battle!!.pendingActionRequests
         val switchingInPokemon = pendingActionRequests.mapNotNull { it.response }.filterIsInstance<SwitchActionResponse>().map { it.newPokemonId }
         val showdownPokemonToPokemon = request.side!!.pokemon
-            .mapNotNull { showdownPokemon ->
-                battleGUI.actor!!.pokemon
-                    .find { it.uuid == showdownPokemon.uuid }
-                    ?.let { showdownPokemon to it }
-            }
-            .filter {
-                if (request.side.pokemon[0].reviving) {
-                    "fnt" in it.first.condition
-                } else {
-                    "fnt" !in it.first.condition
+                .mapNotNull { showdownPokemon ->
+                    battleGUI.actor!!.pokemon
+                            .find { it.uuid == showdownPokemon.uuid }
+                            ?.let { showdownPokemon to it }
                 }
-            }
-            .filter { it.second.uuid !in battleGUI.actor!!.activePokemon.map { it.battlePokemon?.uuid } }
-            .filter { it.second.uuid !in switchingInPokemon }
+                .filter {
+                    if (request.side.pokemon[0].reviving) {
+                        "fnt" in it.first.condition
+                    } else {
+                        "fnt" !in it.first.condition
+                    }
+                }
+                .filter { it.second.uuid !in battleGUI.actor!!.activePokemon.map { it.battlePokemon?.uuid } }
+                .filter { it.second.uuid !in switchingInPokemon }
 
         showdownPokemonToPokemon.forEachIndexed { index, (showdownPokemon, pokemon) ->
             val row = index / 2

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/info/InfoWidget.kt

@@ -89,17 +89,6 @@ class InfoWidget(
         )
         typeWidget.render(context, pMouseX, pMouseY, pPartialTicks)
 
-        // Original Trainer
-        val otName: MutableText = Text.literal(pokemon.originalTrainerName ?: "")
-        val otWidget = InfoOneLineWidget(
-            pX = x,
-            pY = y + 3 * ROW_HEIGHT,
-            width = width,
-            label = lang("ui.info.original_trainer"),
-            value = otName
-        )
-        otWidget.render(context, pMouseX, pMouseY, pPartialTicks)
-
 
         // Nature
         // Get the name of the MintItem used to mint the Pokémon's nature

common/src/main/kotlin/com/cobblemon/mod/common/command/RandomBattleCommand.kt

@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.command
+
+import com.cobblemon.mod.common.api.permission.CobblemonPermissions
+import com.cobblemon.mod.common.battles.BattleBuilder
+import com.cobblemon.mod.common.util.permission
+import com.mojang.brigadier.Command.SINGLE_SUCCESS
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.arguments.IntegerArgumentType
+import com.mojang.brigadier.arguments.StringArgumentType
+import com.mojang.brigadier.context.CommandContext
+import net.minecraft.command.argument.EntityArgumentType
+import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.server.command.CommandManager.literal
+import net.minecraft.server.command.ServerCommandSource
+
+object RandomBattleCommand {
+
+    // todo add param before number or type for AI subtypes
+
+    fun register(dispatcher: CommandDispatcher<ServerCommandSource>) {
+        dispatcher.register(
+                literal("randombattle")
+                        .permission(CobblemonPermissions.RANDOM_BATTLE)
+                        .then(
+                                argument("player", EntityArgumentType.player())
+                                        .then(
+                                                argument("aiType", StringArgumentType.string())
+                                                        .then(
+                                                                argument("number", IntegerArgumentType.integer())
+                                                                        .executes { executeNumber(it, 50, "random") } // If only number is provided after aiType
+                                                                        .then(
+                                                                                argument("type", StringArgumentType.string())
+                                                                                        .executes { executeWithNumberType(it) } // If number and type are provided after aiType
+                                                                        )
+                                                        )
+                                                        .then(
+                                                                argument("type", StringArgumentType.string())
+                                                                        .executes { executeType(it, "random", 50) } // If only type is provided after aiType
+                                                                        .then(
+                                                                                argument("number", IntegerArgumentType.integer())
+                                                                                        .executes { executeWithTypeNumber(it) } // If type and number are provided after aiType
+                                                                        )
+                                                        )
+                                                        .executes { executeAITypeDefault(it, 50, "random") } // Default if neither number nor type is provided after aiType
+                                        )
+                                        .executes { executeDefault(it, "random", 50, "random") } // Default if aiType is not provided
+                        )
+        )
+    }
+
+    // NUMBER and TYPE
+    private fun executeWithNumberType(context: CommandContext<ServerCommandSource>): Int {
+        val player = EntityArgumentType.getPlayer(context, "player")
+        val aiType = StringArgumentType.getString(context,"aiType").lowercase()
+        val number = IntegerArgumentType.getInteger(context, "number")
+        val type = StringArgumentType.getString(context, "type")
+
+        // Your command logic here using 'player', 'number', and 'stringArg'
+        BattleBuilder.pvc(player, aiType, number, type, true)
+        return SINGLE_SUCCESS
+    }
+
+    // TYPE and NUMBER
+    private fun executeWithTypeNumber(context: CommandContext<ServerCommandSource>): Int {
+        val player = EntityArgumentType.getPlayer(context, "player")
+        val aiType = StringArgumentType.getString(context,"aiType").lowercase()
+        val number = IntegerArgumentType.getInteger(context, "number")
+        val type = StringArgumentType.getString(context, "type")
+
+        // Your command logic here using 'player', 'number', and 'stringArg'
+        BattleBuilder.pvc(player,aiType, number, type, true)
+        return SINGLE_SUCCESS
+    }
+
+    // if no type is given to the command after the integer for level NUMBER
+    private fun executeNumber(context: CommandContext<ServerCommandSource>, defaultNumber: Int, defaultString: String): Int {
+        val player = EntityArgumentType.getPlayer(context, "player")
+        val aiType = StringArgumentType.getString(context,"aiType").lowercase()
+        val number = IntegerArgumentType.getInteger(context, "number")
+
+        // Use default string
+        val type = defaultString
+
+        // Your command logic here using 'player', 'number', and 'stringArg'
+        BattleBuilder.pvc(player, aiType, number, type, true)
+
+        return SINGLE_SUCCESS
+    }
+
+    // if no type is given to the command after the integer for level NUMBER
+    private fun executeType(context: CommandContext<ServerCommandSource>, defaultString: String, defaultNumber: Int): Int {
+        val player = EntityArgumentType.getPlayer(context, "player")
+        val aiType = StringArgumentType.getString(context,"aiType").lowercase()
+        val type = StringArgumentType.getString(context, "type")
+
+        // Use default string
+        val number = defaultNumber
+
+        // Your command logic here using 'player', 'number', and 'stringArg'
+        BattleBuilder.pvc(player, aiType, number, type, true)
+
+        return SINGLE_SUCCESS
+    }
+
+    // if no additional arguments are provided after player DEFAULT
+    private fun executeDefault(context: CommandContext<ServerCommandSource>, defaultAIType: String, defaultNumber: Int, defaultString: String): Int {
+        val player = EntityArgumentType.getPlayer(context, "player")
+        val aiType = defaultAIType
+        val number = defaultNumber
+        val type = defaultString
+
+        // Your command logic here using 'player', 'number', and 'stringArg'
+        BattleBuilder.pvc(player, aiType, number, type, true)
+
+        return SINGLE_SUCCESS
+    }
+
+    // DEFAULT WITH AI Type
+    private fun executeAITypeDefault(context: CommandContext<ServerCommandSource>, defaultNumber: Int, defaultString: String): Int {
+        val player = EntityArgumentType.getPlayer(context, "player")
+        val aiType = StringArgumentType.getString(context,"aiType").lowercase()
+        val number = defaultNumber
+        val type = defaultString
+
+        // Your command logic here using 'player', 'number', and 'stringArg'
+        BattleBuilder.pvc(player, aiType, number, type, true)
+
+        return SINGLE_SUCCESS
+    }
+
+}

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

@@ -359,37 +359,58 @@ object CobblemonItemGroups {
     }
 
     private fun heldItemEntries(displayContext: DisplayContext, entries: Entries) {
+        entries.add(CobblemonItems.ABILITY_SHIELD)
+        entries.add(CobblemonItems.ABSORB_BULB)
+        entries.add(CobblemonItems.AIR_BALLOON)
         entries.add(CobblemonItems.ASSAULT_VEST)
         entries.add(CobblemonItems.BIG_ROOT)
+        entries.add(CobblemonItems.BINDING_BAND)
         entries.add(CobblemonItems.BLACK_BELT)
         entries.add(CobblemonItems.BLACK_GLASSES)
         entries.add(CobblemonItems.BLACK_SLUDGE)
+        entries.add(CobblemonItems.BLUNDER_POLICY)
         entries.add(CobblemonItems.BRIGHT_POWDER)
+        entries.add(CobblemonItems.CELL_BATTERY)
         entries.add(CobblemonItems.CHARCOAL)
         entries.add(CobblemonItems.CHOICE_BAND)
         entries.add(CobblemonItems.CHOICE_SCARF)
         entries.add(CobblemonItems.CHOICE_SPECS)
         entries.add(CobblemonItems.CLEANSE_TAG)
+        entries.add(CobblemonItems.CLEAR_AMULET)
+        entries.add(CobblemonItems.COVERT_CLOAK)
         entries.add(CobblemonItems.DEEP_SEA_SCALE)
         entries.add(CobblemonItems.DEEP_SEA_TOOTH)
         entries.add(CobblemonItems.DESTINY_KNOT)
         entries.add(CobblemonItems.DRAGON_FANG)
+        entries.add(CobblemonItems.EJECT_BUTTON)
+        entries.add(CobblemonItems.EJECT_PACK)
         entries.add(CobblemonItems.EVERSTONE)
+        entries.add(CobblemonItems.EVIOLITE)
         entries.add(CobblemonItems.EXP_SHARE)
+        entries.add(CobblemonItems.EXPERT_BELT)
         entries.add(CobblemonItems.FAIRY_FEATHER)
         entries.add(CobblemonItems.FLAME_ORB)
+        entries.add(CobblemonItems.FLOAT_STONE)
         entries.add(CobblemonItems.FOCUS_BAND)
+        entries.add(CobblemonItems.FOCUS_SASH)
+        entries.add(CobblemonItems.GRIP_CLAW)
         entries.add(CobblemonItems.HARD_STONE)
         entries.add(CobblemonItems.HEAVY_DUTY_BOOTS)
+        entries.add(CobblemonItems.IRON_BALL)
         entries.add(CobblemonItems.KINGS_ROCK)
+        entries.add(CobblemonItems.LAGGING_TAIL)
         entries.add(CobblemonItems.LEFTOVERS)
         entries.add(CobblemonItems.LIFE_ORB)
+        entries.add(CobblemonItems.LIGHT_BALL)
         entries.add(CobblemonItems.LIGHT_CLAY)
+        entries.add(CobblemonItems.LOADED_DICE)
         entries.add(CobblemonItems.LUCKY_EGG)
+        entries.add(CobblemonItems.LUMINOUS_MOSS)
         entries.add(CobblemonItems.MAGNET)
         entries.add(CobblemonItems.MENTAL_HERB)
         entries.add(CobblemonItems.METAL_COAT)
         entries.add(CobblemonItems.METAL_POWDER)
+        entries.add(CobblemonItems.METRONOME)
         entries.add(CobblemonItems.MIRACLE_SEED)
         entries.add(CobblemonItems.MIRROR_HERB)
         entries.add(CobblemonItems.MUSCLE_BAND)
@@ -403,22 +424,41 @@ object CobblemonItemGroups {
         entries.add(CobblemonItems.POWER_LENS)
         entries.add(CobblemonItems.POWER_WEIGHT)
         entries.add(CobblemonItems.POWER_HERB)
+        entries.add(CobblemonItems.PROTECTIVE_PADS)
+        entries.add(CobblemonItems.PUNCHING_GLOVE)
         entries.add(CobblemonItems.QUICK_CLAW)
         entries.add(CobblemonItems.QUICK_POWDER)
         entries.add(CobblemonItems.RAZOR_CLAW)
         entries.add(CobblemonItems.RAZOR_FANG)
+        entries.add(CobblemonItems.RED_CARD)
+        entries.add(CobblemonItems.RING_TARGET)
         entries.add(CobblemonItems.ROCKY_HELMET)
+        entries.add(CobblemonItems.ROOM_SERVICE)
         entries.add(CobblemonItems.SAFETY_GOGGLES)
+        entries.add(CobblemonItems.SCOPE_LENS)
         entries.add(CobblemonItems.SHARP_BEAK)
+        entries.add(CobblemonItems.SHED_SHELL)
+        entries.add(CobblemonItems.SHELL_BELL)
         entries.add(CobblemonItems.SILK_SCARF)
         entries.add(CobblemonItems.SILVER_POWDER)
         entries.add(CobblemonItems.SMOKE_BALL)
         entries.add(CobblemonItems.SOFT_SAND)
         entries.add(CobblemonItems.SPELL_TAG)
+        entries.add(CobblemonItems.STICKY_BARB)
+        entries.add(CobblemonItems.TERRAIN_EXTENDER)
+        entries.add(CobblemonItems.THROAT_SPRAY)
         entries.add(CobblemonItems.TOXIC_ORB)
         entries.add(CobblemonItems.TWISTED_SPOON)
+        entries.add(CobblemonItems.UTILITY_UMBRELLA)
+        entries.add(CobblemonItems.WEAKNESS_POLICY)
         entries.add(CobblemonItems.WHITE_HERB)
+        entries.add(CobblemonItems.WIDE_LENS)
         entries.add(CobblemonItems.WISE_GLASSES)
+        entries.add(CobblemonItems.ZOOM_LENS)
+        entries.add(CobblemonItems.DAMP_ROCK)
+        entries.add(CobblemonItems.HEAT_ROCK)
+        entries.add(CobblemonItems.SMOOTH_ROCK)
+        entries.add(CobblemonItems.ICY_ROCK)
     }
 
     private fun pokeballentries(displayContext: DisplayContext, entries: Entries) {

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/MovesRegistrySyncPacket.kt

@@ -47,10 +47,11 @@ class MovesRegistrySyncPacket(moves: List<MoveTemplate>) : DataRegistrySyncPacke
         val priority = buffer.readInt()
         val critRatio = buffer.readDouble()
         val effectChances = arrayListOf<Double>()
+        val flags = mutableSetOf<String>()
         repeat(buffer.readVarInt()) {
             effectChances += buffer.readDouble()
         }
-        return MoveTemplate(name, num, type, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray())
+        return MoveTemplate(name, num, type, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray(), flags)
     }
 
     override fun synchronizeDecoded(entries: Collection<MoveTemplate>) {

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

@@ -159,6 +159,20 @@ open class Pokemon : ShowdownIdentifiable {
         _evs.emit(evs)
     }
 
+    fun setMoveset(moveset: List<String>) {
+        moveset.forEachIndexed { index, it ->
+            this.benchedMoves.add(BenchedMove(Moves.getByName(it)!!, 0))
+            this.exchangeMove( this.moveSet[index]!!.template, Moves.getByName(it)!!)
+        }
+    }
+
+    fun setMove(move: String, moveSlot: Int) {
+        if (moveSlot < this.moveSet.getMoves().size) {
+            this.benchedMoves.add(BenchedMove(Moves.getByName(move)!!, 0))
+            this.exchangeMove(this.moveSet[moveSlot]!!.template, Moves.getByName(move)!!)
+        }
+    }
+
     var nickname: MutableText? = null
         set(value) {
             field = value
@@ -751,9 +765,9 @@ open class Pokemon : ShowdownIdentifiable {
         experience = nbt.getInt(DataKeys.POKEMON_EXPERIENCE).takeIf { experienceGroup.getLevel(it) == level } ?: experienceGroup.getExperience(level)
         friendship = nbt.getShort(DataKeys.POKEMON_FRIENDSHIP).toInt().coerceIn(0, if (this.isClient) Int.MAX_VALUE else Cobblemon.config.maxPokemonFriendship)
         gender = Gender.valueOf(nbt.getString(DataKeys.POKEMON_GENDER).takeIf { it.isNotBlank() } ?: Gender.MALE.name)
-        currentHealth = nbt.getShort(DataKeys.POKEMON_HEALTH).toInt()
         ivs.loadFromNBT(nbt.getCompound(DataKeys.POKEMON_IVS))
         evs.loadFromNBT(nbt.getCompound(DataKeys.POKEMON_EVS))
+        currentHealth = nbt.getShort(DataKeys.POKEMON_HEALTH).toInt()
         moveSet.loadFromNBT(nbt)
         scaleModifier = nbt.getFloat(DataKeys.POKEMON_SCALE_MODIFIER)
         val abilityNBT = nbt.getCompound(DataKeys.POKEMON_ABILITY) ?: NbtCompound()
@@ -879,10 +893,10 @@ open class Pokemon : ShowdownIdentifiable {
         level = json.get(DataKeys.POKEMON_LEVEL).asInt
         experience = json.get(DataKeys.POKEMON_EXPERIENCE).asInt.takeIf { experienceGroup.getLevel(it) == level } ?: experienceGroup.getExperience(level)
         friendship = json.get(DataKeys.POKEMON_FRIENDSHIP).asInt.coerceIn(0, if (this.isClient) Int.MAX_VALUE else Cobblemon.config.maxPokemonFriendship)
-        currentHealth = json.get(DataKeys.POKEMON_HEALTH).asInt
         gender = Gender.valueOf(json.get(DataKeys.POKEMON_GENDER)?.asString ?: "male")
         ivs.loadFromJSON(json.getAsJsonObject(DataKeys.POKEMON_IVS))
         evs.loadFromJSON(json.getAsJsonObject(DataKeys.POKEMON_EVS))
+        currentHealth = json.get(DataKeys.POKEMON_HEALTH).asInt
         moveSet.loadFromJSON(json.get(DataKeys.POKEMON_MOVESET).asJsonObject)
         scaleModifier = json.get(DataKeys.POKEMON_SCALE_MODIFIER).asFloat
         val abilityJSON = json.get(DataKeys.POKEMON_ABILITY)?.asJsonObject ?: JsonObject()
@@ -1145,6 +1159,50 @@ open class Pokemon : ShowdownIdentifiable {
         return this
     }
 
+    // overloaded version that has boolean for whether to initialize moves or not
+    fun initialize(initializeMoves: Boolean = true): Pokemon {
+        // Force the setter to initialize it
+        species = species
+        checkGender()
+        checkAbility()
+        // This should only be a thing once we have moveset control in properties until then a creation should require a moveset init.
+        /*
+        if (pokemon.moveSet.none { it != null }) {
+            pokemon.initializeMoveset()
+        }
+         */
+        if (initializeMoves)
+            initializeMoveset()
+        return this
+    }
+
+    // overloaded version that initializes a pokemon with a certain typing
+    fun initialize(typing: ElementalType): Pokemon {
+        // Force the setter to initialize it
+        species = PokemonSpecies.random(typing)
+
+        // initialize the rest of the pokemon
+        if (PokemonSpecies.getByIdentifier(species.resourceIdentifier) == null) {
+            throw IllegalArgumentException("Cannot set a species that isn't registered")
+        }
+        val quotient = clamp(currentHealth / hp.toFloat(), 0F, 1F)
+        //field = species // todo do I need field? I don't think so
+        val newFeatures = SpeciesFeatures.getFeaturesFor(species).mapNotNull { it.invoke(this) }
+        features.clear()
+        features.addAll(newFeatures)
+        this.evolutionProxy.current().clear()
+        updateAspects()
+        updateForm()
+        checkGender()
+        checkAbility()
+        updateHP(quotient)
+        _species.emit(species)
+        initializeMoveset()
+
+        return this
+    }
+
+
     // Last flower fed to a Mooshtank
     var lastFlowerFed: ItemStack = ItemStack.EMPTY
 
@@ -1382,6 +1440,14 @@ open class Pokemon : ShowdownIdentifiable {
             move.raisedPpStages = benchedNewMove.ppRaisedStages
             move.currentPp = move.maxPp
             moveSet.add(move)
+            // Inserts the new move in the old move's position and pushes the other move's down a postion
+            val srcIdx = moveSet.indexOf(moveSet.find { it.template == oldMove })
+            val dstIdx = moveSet.indexOf(moveSet.find { it.template == newMove })
+            var currIdx = srcIdx + 1
+            while(currIdx <= dstIdx) {
+                moveSet.swapMove(srcIdx, currIdx)
+                currIdx++
+            }
             return true
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.pokemon.properties
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.moves.Moves
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.Natures
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
@@ -141,8 +142,10 @@ internal object PropertiesCompletionProvider : DataRegistry {
         this.inject(setOf("gmax"), setOf("yes", "no"))
         this.inject(setOf("tera"), ElementalTypes.all().map { it.name })
         this.inject(setOf("tradeable"), setOf("yes", "no"))
-        this.inject(setOf("originaltrainer", "ot"), setOf(""))
-        this.inject(setOf("originaltrainertype", "ottype"), setOf("None", "Player", "NPC"))
+        this.inject(setOf("move1"), Moves.all().map { if (it.name.asIdentifierDefaultingNamespace().namespace == Cobblemon.MODID) it.name.asIdentifierDefaultingNamespace().path else it.name })
+        this.inject(setOf("move2"), Moves.all().map { if (it.name.asIdentifierDefaultingNamespace().namespace == Cobblemon.MODID) it.name.asIdentifierDefaultingNamespace().path else it.name })
+        this.inject(setOf("move3"), Moves.all().map { if (it.name.asIdentifierDefaultingNamespace().namespace == Cobblemon.MODID) it.name.asIdentifierDefaultingNamespace().path else it.name })
+        this.inject(setOf("move4"), Moves.all().map { if (it.name.asIdentifierDefaultingNamespace().namespace == Cobblemon.MODID) it.name.asIdentifierDefaultingNamespace().path else it.name })
 
         Stats.PERMANENT.forEach{ stat ->
             val statName = stat.toString().lowercase()

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

@@ -161,44 +161,81 @@
   "item.cobblemon.jolly_mint": "Jolly Mint",
   "item.cobblemon.naive_mint": "Naive Mint",
   "item.cobblemon.serious_mint": "Serious Mint",
+  "item.cobblemon.ability_shield": "Ability Shield",
+  "item.cobblemon.absorb_bulb": "Absorb Bulb",
+  "item.cobblemon.air_balloon": "Air Balloon",
   "item.cobblemon.assault_vest": "Assault Vest",
   "item.cobblemon.auspicious_armor": "Auspicious Armor",
   "item.cobblemon.malicious_armor": "Malicious Armor",
+  "item.cobblemon.binding_band": "Binding Band",
   "item.cobblemon.black_belt": "Black Belt",
   "item.cobblemon.black_glasses": "Black Glasses",
   "item.cobblemon.black_sludge": "Black Sludge",
+  "item.cobblemon.blunder_policy": "Blunder Policy",
+  "item.cobblemon.cell_battery": "Cell Battery",
   "item.cobblemon.charcoal_stick": "Charcoal Stick",
   "item.cobblemon.choice_band": "Choice Band",
   "item.cobblemon.choice_scarf": "Choice Scarf",
   "item.cobblemon.choice_specs": "Choice Specs",
   "item.cobblemon.cleanse_tag": "Cleanse Tag",
+  "item.cobblemon.clear_amulet": "Clear Amulet",
+  "item.cobblemon.covert_cloak": "Covert Cloak",
   "item.cobblemon.dragon_fang": "Dragon Fang",
+  "item.cobblemon.eject_button": "Eject Button",
+  "item.cobblemon.eject_pack": "Eject Pack",
+  "item.cobblemon.everstone": "Everstone",
+  "item.cobblemon.eviolite": "Eviolite",
   "item.cobblemon.exp_share": "Exp. Share",
+  "item.cobblemon.expert_belt": "Expert Belt",
   "item.cobblemon.fairy_feather": "Fairy Feather",
+  "item.cobblemon.float_stone": "Float Stone",
   "item.cobblemon.focus_band": "Focus Band",
+  "item.cobblemon.focus_sash": "Focus Sash",
+  "item.cobblemon.grip_claw": "Grip Claw",
   "item.cobblemon.hard_stone": "Hard Stone",
   "item.cobblemon.heavy_duty_boots": "Heavy-Duty Boots",
+  "item.cobblemon.iron_ball": "Iron Ball",
+  "item.cobblemon.lagging_tail": "Lagging Tail",
   "item.cobblemon.leftovers": "Leftovers",
+  "item.cobblemon.light_ball": "Light Ball",
   "item.cobblemon.light_clay": "Light Clay",
+  "item.cobblemon.loaded_dice": "Loaded Dice",
   "item.cobblemon.lucky_egg": "Lucky Egg",
+  "item.cobblemon.luminous_moss": "Luminous Moss",
   "item.cobblemon.magnet": "Magnet",
+  "item.cobblemon.metronome": "Metronome",
   "item.cobblemon.miracle_seed": "Miracle Seed",
   "item.cobblemon.muscle_band": "Muscle Band",
   "item.cobblemon.mystic_water": "Mystic Water",
   "item.cobblemon.never_melt_ice": "Never-Melt Ice",
   "item.cobblemon.poison_barb": "Poison Barb",
+  "item.cobblemon.protective_pads": "Protective Pads",
+  "item.cobblemon.punching_glove": "Punching Glove",
   "item.cobblemon.quick_claw": "Quick Claw",
   "item.cobblemon.razor_claw": "Razor Claw",
   "item.cobblemon.razor_fang": "Razor Fang",
+  "item.cobblemon.red_card": "Red Card",
+  "item.cobblemon.ring_target": "Ring Target",
   "item.cobblemon.rocky_helmet": "Rocky Helmet",
+  "item.cobblemon.room_service": "Room Service",
   "item.cobblemon.safety_goggles": "Safety Goggles",
+  "item.cobblemon.scope_lens": "Scope Lens",
   "item.cobblemon.sharp_beak": "Sharp Beak",
+  "item.cobblemon.shed_shell": "Shed Shell",
+  "item.cobblemon.shell_bell": "Shell Bell",
   "item.cobblemon.silk_scarf": "Silk Scarf",
   "item.cobblemon.silver_powder": "Silver Powder",
   "item.cobblemon.soft_sand": "Soft Sand",
   "item.cobblemon.spell_tag": "Spell Tag",
+  "item.cobblemon.sticky_barb": "Sticky Barb",
+  "item.cobblemon.terrain_extender": "Terrain Extender",
+  "item.cobblemon.throat_spray": "Throat Spray",
   "item.cobblemon.twisted_spoon": "Twisted Spoon",
+  "item.cobblemon.utility_umbrella": "Utility Umbrella",
+  "item.cobblemon.weakness_policy": "Weakness Policy",
+  "item.cobblemon.wide_lens": "Wide Lens",
   "item.cobblemon.wise_glasses": "Wise Glasses",
+  "item.cobblemon.zoom_lens": "Zoom Lens",
   "item.cobblemon.mental_herb": "Mental Herb",
   "item.cobblemon.mirror_herb": "Mirror Herb",
   "item.cobblemon.power_herb": "Power Herb",
@@ -207,7 +244,6 @@
   "item.cobblemon.metal_powder": "Metal Powder",
   "item.cobblemon.quick_powder": "Quick Powder",
   "item.cobblemon.destiny_knot": "Destiny Knot",
-  "item.cobblemon.everstone": "Everstone",
   "item.cobblemon.power_anklet": "Power Anklet",
   "item.cobblemon.power_band": "Power Band",
   "item.cobblemon.power_belt": "Power Belt",
@@ -219,6 +255,10 @@
   "item.cobblemon.smoke_ball": "Smoke Ball",
   "item.cobblemon.toxic_orb": "Toxic Orb",
   "item.cobblemon.life_orb": "Life Orb",
+  "item.cobblemon.damp_rock": "Damp Rock",
+  "item.cobblemon.heat_rock": "Heat Rock",
+  "item.cobblemon.smooth_rock": "Smooth Rock",
+  "item.cobblemon.icy_rock": "Icy Rock",
 
   "item.cobblemon.poke_ball.tooltip": "1× catch rate",
   "item.cobblemon.slate_ball.tooltip": "1× catch rate",
@@ -1251,6 +1291,8 @@
   "cobblemon.battle.enditem.whiteherb": "%1$s returned its status to normal using its White Herb!",
   "cobblemon.battle.enditem.corrosivegas": "%3$s corroded %1$s's %2$s!",
   "cobblemon.battle.enditem.stealeat": "%3$s stole and ate its target's %2$s!",
+  "cobblemon.battle.enditem.cellbattery": "%1$s used its Cell Battery!",
+  "cobblemon.battle.enditem.ejectbutton": "%1$s is switched out with the Eject Button!",
 
   "cobblemon.battle.heal.zeffect": "%1$s's HP was restored by the Z-Power!",
   "cobblemon.battle.heal.wish": "%1$s's wish came true!",
@@ -1459,6 +1501,34 @@
   "tag.item.cobblemon.sun_stone_ores": "Sun Stone Ores",
   "tag.item.cobblemon.thunder_stone_ores": "Thunder Stone Ores",
   "tag.item.cobblemon.water_stone_ores": "Water Stone Ores",
+  "tag.item.cobblemon.apples": "Apples",
+  "tag.item.cobblemon.apricorn_poke_balls": "Apricorn Poké Balls",
+  "tag.item.cobblemon.ancient_poke_balls": "Ancient Poké Balls",
+  "tag.item.cobblemon.black_tumblestones": "Black Tumblestones",
+  "tag.item.cobblemon.copper_poke_balls": "Copper Tier Poké Balls",
+  "tag.item.cobblemon.diamond_poke_balls": "Diamond Tier Poké Balls",
+  "tag.item.cobblemon.deep_seas": "Deep Sea Items",
+  "tag.item.cobblemon.ethers": "Ethers and Elixirs",
+  "tag.item.cobblemon.fossil_machine_parts": "Fossil Machine Parts",
+  "tag.item.cobblemon.gold_poke_balls": "Gold Tier Poké Balls",
+  "tag.item.cobblemon.iron_poke_balls": "Iron Tier Poké Balls",
+  "tag.item.cobblemon.machines": "Machines",
+  "tag.item.cobblemon.nether_star_poke_balls": "Nether Star Tier Poké Balls",
+  "tag.item.cobblemon.potions": "Potions",
+  "tag.item.cobblemon.red_tumblestones": "Tumblestones",
+  "tag.item.cobblemon.remedies": "Remedies",
+  "tag.item.cobblemon.restores": "Restores",
+  "tag.item.cobblemon.revives": "Revives",
+  "tag.item.cobblemon.sky_tumblestones": "Sky Tumblestones",
+  "tag.item.cobblemon.sweets": "Sweets",
+  "tag.item.cobblemon.teapots": "Teapots",
+  "tag.item.cobblemon.vitamins": "Vitamins",
+  "tag.item.cobblemon.x_items": "X Battle Items",
+  "tag.item.cobblemon.raw_meat": "Raw Meat",
+  "tag.item.cobblemon.cooked_meat": "Cooked Meat",
+  "tag.item.cobblemon.fossils": "Fossils",
+  "tag.item.cobblemon.mint_seeds": "Mint Seeds",
+  "tag.item.cobblemon.tumblestones": "Tumblestones",
 
   "cobblemon.move.10000000voltthunderbolt": "10,000,000 Volt Thunderbolt",
   "cobblemon.move.10000000voltthunderbolt.desc": "The user, Pikachu wearing a cap, powers up a jolt of electricity using its Z-Power and unleashes it. Critical hits land more easily.",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,3 @@
 {
-    "showdownVersion": "11"
+    "showdownVersion": "12"
 }

common/src/main/resources/data/cobblemon/advancements/recipes/held/cell_battery.json

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

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

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/eject_pack.json

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/eviolite.json

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

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

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

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

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/iron_ball.json

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/loaded_dice.json

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/metronome.json

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/ring_target.json

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

common/src/main/resources/data/cobblemon/advancements/recipes/held/terrain_extender.json

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

common/src/main/resources/data/cobblemon/recipes/ability_shield.json

@@ -0,0 +1,25 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "IDI",
+        "DSD",
+        " A "
+    ],
+    "key": {
+        "I": {
+            "item": "minecraft:iron_ingot"
+        },
+        "D": {
+            "item": "minecraft:diamond"
+        },
+        "S": {
+            "item": "minecraft:shield"
+        },
+        "A": {
+            "item": "minecraft:amethyst_shard"
+        }
+    },
+    "result": {
+        "item": "cobblemon:ability_shield"
+    }
+}

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

@@ -0,0 +1,22 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        " WW",
+        " PW",
+        "S  "
+    ],
+    "key": {
+        "W": {
+            "item": "minecraft:red_wool"
+        },
+        "P": {
+            "item": "minecraft:phantom_membrane"
+        },
+        "S": {
+            "item": "minecraft:string"
+        }
+    },
+    "result": {
+        "item": "cobblemon:air_balloon"
+    }
+}

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

@@ -0,0 +1,22 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        " SW",
+        "SsS",
+        "WS "
+    ],
+    "key": {
+        "S": {
+            "item": "minecraft:string"
+        },
+        "s": {
+            "item": "minecraft:slime_ball"
+        },
+        "W": {
+            "item": "minecraft:brown_wool"
+        }
+    },
+    "result": {
+        "item": "cobblemon:binding_band"
+    }
+}

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

@@ -0,0 +1,28 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        " R ",
+        "DIF",
+        " P "
+    ],
+    "key": {
+        "R": {
+            "item": "minecraft:rabbit_foot"
+        },
+        "D": {
+            "item": "minecraft:yellow_dye"
+        },
+        "I": {
+            "item": "minecraft:ink_sac"
+        },
+        "F": {
+            "item": "minecraft:feather"
+        },
+        "P": {
+            "item": "minecraft:paper"
+        }
+    },
+    "result": {
+        "item": "cobblemon:blunder_policy"
+    }
+}

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

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "I",
+    "R",
+    "C"
+  ],
+  "key": {
+    "C": {
+      "item": "minecraft:copper_ingot"
+    },
+	"R": {
+		"item": "minecraft:redstone"
+	},
+	"I": {
+		"item": "minecraft:iron_ingot"
+	}
+  },
+  "result": {
+    "item": "cobblemon:cell_battery"
+  }
+}

common/src/main/resources/data/cobblemon/recipes/clear_amulet.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SDS",
+    "GAG",
+    " D "
+  ],
+  "key": {
+    "D": {
+      "item": "minecraft:diamond"
+    },
+    "S": {
+      "item": "minecraft:string"
+    },
+    "G": {
+      "item": "minecraft:gold_ingot"
+    },
+    "A": {
+      "item": "minecraft:amethyst_shard"
+    }
+  },
+  "result": {
+    "item": "cobblemon:clear_amulet"
+  }
+}

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

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " W ",
+    "WPW",
+    "WGW"
+  ],
+  "key": {
+    "G": {
+      "item": "minecraft:golden_carrot"
+    },
+    "W": {
+      "item": "minecraft:gray_wool"
+    },
+    "P": {
+      "item": "minecraft:phantom_membrane"
+    }
+  },
+  "result": {
+    "item": "cobblemon:covert_cloak"
+  }
+}

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

@@ -0,0 +1,22 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "DS",
+        "HD"
+    ],
+    "key": {
+        "D": {
+            "item": "minecraft:dripstone_block"
+        },
+        "S": {
+            "item": "cobblemon:water_stone"
+        },
+        "H": {
+            "item": "cobblemon:hard_stone"
+        }
+    },
+    "result":
+    {
+        "item": "cobblemon:damp_rock"
+    }
+}

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

@@ -0,0 +1,28 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "IBI",
+        "YPY",
+		"IRI"
+    ],
+    "key": {
+        "Y": {
+            "item": "minecraft:yellow_dye"
+        },
+        "I": {
+            "item": "minecraft:iron_ingot"
+        },
+        "B": {
+            "tag": "minecraft:buttons"
+        },
+        "R": {
+            "item": "minecraft:redstone"
+        },
+        "P": {
+            "item": "minecraft:piston"
+        }
+    },
+    "result": {
+        "item": "cobblemon:eject_button"
+    }
+}

common/src/main/resources/data/cobblemon/recipes/eject_pack.json

@@ -0,0 +1,25 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"WWW",
+		"WEW",
+		"LRL"
+	],
+	"key": {
+		"W": {
+			"item": "minecraft:white_wool"
+		},
+		"E": {
+			"item": "cobblemon:eject_button"
+		},
+		"R": {
+			"item": "minecraft:redstone"
+		},
+		"L": {
+			"item": "minecraft:leather"
+		}
+	},
+	"result": {
+		"item": "cobblemon:eject_pack"
+	}
+}

common/src/main/resources/data/cobblemon/recipes/eviolite.json

@@ -0,0 +1,19 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		" A ",
+		"AEA",
+		" A "
+	],
+	"key": {
+		"A": {
+			"item": "minecraft:amethyst_shard"
+		},
+		"E": {
+			"item": "cobblemon:everstone"
+		}
+	},
+	"result": {
+		"item": "cobblemon:eviolite"
+	}
+}

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

@@ -0,0 +1,22 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"P  ",
+		"WBW",
+		"  P"
+	],
+	"key": {
+		"P": {
+			"item": "minecraft:blaze_powder"
+		},
+		"W": {
+			"item": "minecraft:black_wool"
+		},
+		"B": {
+			"item": "cobblemon:black_belt"
+		}
+	},
+	"result": {
+		"item": "cobblemon:expert_belt"
+	}
+}

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

@@ -0,0 +1,22 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "D  ",
+        "WIW",
+        "  D"
+    ],
+    "key": {
+        "W": {
+            "item": "minecraft:red_wool"
+        },
+        "D": {
+            "item": "minecraft:blaze_powder"
+        },
+        "I": {
+            "item": "minecraft:copper_ingot"
+        }
+    },
+    "result": {
+        "item": "cobblemon:focus_sash"
+    }
+}

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

@@ -0,0 +1,22 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "DS",
+        "HD"
+    ],
+    "key": {
+        "D": {
+            "item": "minecraft:dripstone_block"
+        },
+        "S": {
+            "item": "cobblemon:fire_stone"
+        },
+        "H": {
+            "item": "cobblemon:hard_stone"
+        }
+    },
+    "result":
+    {
+        "item": "cobblemon:heat_rock"
+    }
+}

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

@@ -0,0 +1,22 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "DS",
+        "HD"
+    ],
+    "key": {
+        "D": {
+            "item": "minecraft:dripstone_block"
+        },
+        "S": {
+            "item": "cobblemon:ice_stone"
+        },
+        "H": {
+            "item": "cobblemon:hard_stone"
+        }
+    },
+    "result":
+    {
+        "item": "cobblemon:icy_rock"
+    }
+}

common/src/main/resources/data/cobblemon/recipes/iron_ball.json

@@ -0,0 +1,8 @@
+{
+  "type": "minecraft:stonecutting",
+  "count": 1,
+  "ingredient": {
+    "item": "minecraft:iron_block"
+  },
+  "result": "cobblemon:iron_ball"
+}

common/src/main/resources/data/cobblemon/recipes/loaded_dice.json

@@ -0,0 +1,25 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"SOS",
+		"OCO",
+		"IOI"
+	],
+	"key": {
+		"S": {
+			"item": "minecraft:slime_ball"
+		},
+		"O": {
+			"item": "minecraft:obsidian"
+		},
+		"C": {
+			"item": "cobblemon:clover_sweet"
+		},
+		"I": {
+			"item": "cobblemon:iron_ball"
+		}
+	},
+	"result": {
+		"item": "cobblemon:loaded_dice"
+	}
+}

common/src/main/resources/data/cobblemon/recipes/luminous_moss.json

@@ -0,0 +1,21 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"MG",
+		"BM"
+	],
+	"key": {
+		"M": {
+			"item": "minecraft:moss_block"
+		},
+		"G": {
+			"item": "minecraft:glow_berries"
+		},
+		"B": {
+			"item": "minecraft:bowl"
+		}
+	},
+	"result": {
+		"item": "cobblemon:luminous_moss"
+	}
+}