implemented capture xp

Shouldermon Sneaking Edits

Closes #786

See merge request cable-mc/cobblemon!950

.gitlab-ci.yml

@@ -1,3 +1,5 @@
+image: amazoncorretto:17
+
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 

CHANGELOG.md

@@ -4,18 +4,31 @@
 ### Fixes
 - Scaled down Amaura's fetus model to avoid clipping through the tank while animating
 - Added Polished Tumblestone and Tumblestone Brick block sets from Tumblestone, Black Tumblestone, and Sky Tumblestone.
+- Fixed Cubone's cry not having a sound.
 - Fixed the Seafloor spawning context not being a usable context.
 - Fixed Pokemon spawning in non-full blocks like slabs.
 - Fixed Gilded Chests not dropping the chest itself when broken, only the contents.
 - Fixed Pokémon losing their Hidden Ability through evolution if the middle stage did not have a Hidden Ability.
+- Fixed Chimchar and Monferno T posing whenever they sleep.
+- Fixed the Magby line not having any placeholder walk animations.
+- Fixed Duskull and Dusclops using skylight levels for their nether spawn data. There is no sun in the Nether!
+- Fixed Crumbling Arch not blending in with the world.
+- Fixed Energy Root applying being usable on a fainted Pokemon.
+- Fixed Pokémon entity not spawning when starting a battle while recalling said Pokémon
+- Fixed species comparison not using namespace for both sides in PokemonProperties.isSubsetOf.
 
 ### Additions
 - Added extra visuals to early berry growth stages
 
+### Added cries to the following Pokémon
+- Timburr, Gurdurr, Conkeldurr
+- Golett, Golurk
+
 ### Changes
 - Altered the item model for Medicinal Leeks and Roasted Leeks to be held like sticks and other rod items. 
 - Adjusted some berry balance values like yield and growth times
 - Changes to mulch buffs/durations
+- Dreepy is now shoulder mountable
 
 ### Developer
 

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

@@ -87,6 +87,7 @@ import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.events.AdvancementHandler
+import com.cobblemon.mod.common.events.CaptureXpHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
 import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
@@ -104,13 +105,7 @@ import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
 import com.cobblemon.mod.common.trade.TradeManager
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.ifDedicatedServer
-import com.cobblemon.mod.common.util.isLaterVersion
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.removeAmountIf
-import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -264,6 +259,12 @@ object Cobblemon {
             event.newFriendship = event.pokemon.friendship + increment.roundToInt()
         }
 
+        POKEMON_CAPTURED.subscribe { event ->
+            if (event.player.isInBattle()) CaptureXpHandler.handleCaptureInBattle(event) else CaptureXpHandler.handleCaptureOutOfBattle(
+                event
+            )
+        }
+
         HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt

@@ -8,24 +8,22 @@
 
 package com.cobblemon.mod.common.api.mulch
 
-import com.cobblemon.mod.common.BakingOverride
-import com.cobblemon.mod.common.client.CobblemonBakingOverrides
 import net.minecraft.util.StringIdentifiable
 
 /**
  * Represents the different types of Mulch implemented in the mod.
  *
  */
-enum class MulchVariant(val model: BakingOverride?, val duration: Int = -1) : StringIdentifiable {
-    COARSE(CobblemonBakingOverrides.COARSE_MULCH),
-    GROWTH(CobblemonBakingOverrides.GROWTH_MULCH, 5),
-    HUMID(CobblemonBakingOverrides.HUMID_MULCH),
-    LOAMY(CobblemonBakingOverrides.LOAMY_MULCH),
-    PEAT(CobblemonBakingOverrides.PEAT_MULCH),
-    RICH(CobblemonBakingOverrides.RICH_MULCH, 5),
-    SANDY(CobblemonBakingOverrides.SANDY_MULCH),
-    SURPRISE(CobblemonBakingOverrides.SURPRISE_MULCH, 3),
-    NONE(null);
+enum class MulchVariant(val duration: Int = -1) : StringIdentifiable {
+    COARSE,
+    GROWTH(5),
+    HUMID,
+    LOAMY,
+    PEAT,
+    RICH(5),
+    SANDY,
+    SURPRISE(3),
+    NONE;
 
     override fun asString(): String {
         return name.lowercase()

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

@@ -432,7 +432,7 @@ open class PokemonProperties {
                 } else {
                     PokemonSpecies.getByIdentifier(this.asIdentifierDefaultingNamespace()) ?: return@run
                 }
-                if (properties.species != species.toString()) {
+                if (properties.species != species.resourceIdentifier.toString()) {
                     return false
                 }
             } catch (_: InvalidIdentifierException) {}

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

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.api.pokemon.experience
 
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
+import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.command.CommandSource
 import net.minecraft.item.ItemStack
 import net.minecraft.server.network.ServerPlayerEntity
@@ -43,4 +44,8 @@ open class CommandExperienceSource(
 open class BattleExperienceSource(
     val battle: PokemonBattle,
     val facedPokemon: List<BattlePokemon>
-) : ExperienceSource
+) : ExperienceSource
+
+open class CaptureExperienceSource(
+    val capturedPokemon: Pokemon
+): ExperienceSource

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

@@ -47,7 +47,16 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
         if (!battle.started) {
             activePokemon.battlePokemon = pokemon
             activePokemon.illusion = illusion
-            val pokemonEntity = pokemon.entity
+            val pokemonEntity = pokemon.entity?.let {
+                // If a Pokémon entity is being recalled with an animation,
+                // wrap up the animation and recall the Pokémon immediately.
+                if (it.beamMode == 3) {
+                    pokemon.effectedPokemon.recall()
+                    return@let null
+                }
+                pokemon.entity
+            }
+
             if (pokemonEntity == null && entity != null) {
                 val targetPos = battleActor.getSide().getOppositeSide().actors.filterIsInstance<EntityBackedBattleActor<*>>().firstOrNull()?.entity?.pos?.let { pos ->
                     val offset = pos.subtract(entity.pos)

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

@@ -8,10 +8,10 @@
 
 package com.cobblemon.mod.common.client.render.block
 
+import com.cobblemon.mod.common.api.mulch.MulchVariant
 import com.cobblemon.mod.common.block.BerryBlock
 import com.cobblemon.mod.common.block.entity.BerryBlockEntity
-import com.cobblemon.mod.common.client.render.block.BerryBlockEntityRenderState
-import com.cobblemon.mod.common.client.render.atlas.CobblemonAtlases
+import com.cobblemon.mod.common.client.CobblemonBakingOverrides
 import com.cobblemon.mod.common.client.render.layer.CobblemonRenderLayers
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.BerryModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.setPosition
@@ -19,26 +19,33 @@ import com.cobblemon.mod.common.util.math.geometry.Axis
 import com.cobblemon.mod.common.util.toVec3d
 import com.mojang.blaze3d.systems.RenderSystem
 import net.minecraft.client.MinecraftClient
-import net.minecraft.client.gl.ShaderProgram
 import net.minecraft.client.gl.VertexBuffer
 import net.minecraft.client.render.GameRenderer
-import net.minecraft.client.render.LightmapTextureManager
 import net.minecraft.client.render.RenderLayer
 import net.minecraft.client.render.Tessellator
 import net.minecraft.client.render.VertexConsumerProvider
-import net.minecraft.client.render.VertexFormat
-import net.minecraft.client.render.VertexFormats
 import net.minecraft.client.render.block.entity.BlockEntityRenderer
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Vec3d
-import org.joml.Matrix4f
-import org.joml.Vector3f
 
 
 class BerryBlockRenderer(private val context: BlockEntityRendererFactory.Context) : BlockEntityRenderer<BerryBlockEntity> {
 
+    val mulchModels = mutableMapOf(
+        MulchVariant.COARSE to CobblemonBakingOverrides.COARSE_MULCH,
+        MulchVariant.GROWTH to CobblemonBakingOverrides.GROWTH_MULCH,
+        MulchVariant.HUMID to CobblemonBakingOverrides.HUMID_MULCH,
+        MulchVariant.LOAMY to CobblemonBakingOverrides.LOAMY_MULCH,
+        MulchVariant.PEAT to CobblemonBakingOverrides.PEAT_MULCH,
+        MulchVariant.RICH to CobblemonBakingOverrides.RICH_MULCH,
+        MulchVariant.SANDY to CobblemonBakingOverrides.SANDY_MULCH,
+        MulchVariant.SURPRISE to CobblemonBakingOverrides.SURPRISE_MULCH,
+        MulchVariant.NONE to null
+    )
+
+
     override fun isInRenderDistance(blockEntity: BerryBlockEntity, pos: Vec3d): Boolean {
         return super.isInRenderDistance(blockEntity, pos)
                 && MinecraftClient.getInstance().worldRenderer.frustum.isVisible(Box.of(pos, 2.0, 4.0, 2.0))
@@ -82,7 +89,7 @@ class BerryBlockRenderer(private val context: BlockEntityRendererFactory.Context
         matrices.push()
         //Mulch is rendered on a different layer than the actual berries so
         val mulchBuf = vertexConsumers.getBuffer(RenderLayer.getCutout())
-        val model = entity.mulchVariant.model
+        val model = mulchModels[entity.mulchVariant]
         model?.let {
             it.getModel().getQuads(entity.cachedState, null, entity.world?.random).forEach { quad ->
                 mulchBuf.quad(matrices.peek(), quad, 1F, 1F, 1F, light, overlay)

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

@@ -84,17 +84,18 @@ class PokemonOnShoulderRenderer<T : PlayerEntity>(renderLayerParent: FeatureRend
             }
             val scale = shoulderData.form.baseScale * shoulderData.scaleModifier
             val width = shoulderData.form.hitbox.width
-            val offset = width / 2 - 0.7
+            val heightOffset = -1.5 * scale
+            val widthOffset = width / 2 - 0.7
             // If they're sneaking, the pokemon needs to rotate a little bit and push forward
             // Shoulders move a bit when sneaking which is why the translation is necessary.
-            // Shoulder exact rotation according to MC code is 0.5 radians, the -0.15 is eyeballed though.
-            if (livingEntity.isSneaking) {
-                matrixStack.multiply(RotationAxis.POSITIVE_X.rotation(0.5F))
+            // Shoulder exact rotation according to testing (miasmus) is 0.4 radians, the -0.15 is eyeballed though.
+            if (livingEntity.isInSneakingPose) {
+                matrixStack.multiply(RotationAxis.POSITIVE_X.rotation(0.4F))
                 matrixStack.translate(0F, 0F, -0.15F)
             }
             matrixStack.translate(
-                if (pLeftShoulder) -offset else offset,
-                (if (livingEntity.isSneaking) -1.3 else -1.5) * scale,
+                if (pLeftShoulder) -widthOffset else widthOffset,
+                (if (livingEntity.isInSneakingPose) heightOffset + 0.2 else heightOffset),
                 0.0
             )
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagmarModel.kt

@@ -8,6 +8,10 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
@@ -17,10 +21,15 @@ import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
 
-class MagmarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
+class MagmarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame, BimanualFrame {
     override val rootPart = root.registerChildWithAllChildren("magmar")
     override val head = getPart("head")
 
+    override val leftArm = getPart("leftarm")
+    override val rightArm = getPart("rightarm")
+    override val leftLeg = getPart("leftleg")
+    override val rightLeg = getPart("rightleg")
+
     override var portraitScale = 2.8F
     override var portraitTranslation = Vec3d(-0.1, 0.3, 0.0)
 
@@ -45,7 +54,9 @@ class MagmarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
             poseTypes = MOVING_POSES,
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("magmar", "ground_idle")
+                bedrock("magmar", "ground_idle"),
+                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
+                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
             )
         )
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagbyModel.kt

@@ -8,6 +8,10 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2
 
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
@@ -17,10 +21,15 @@ import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
 
-class MagbyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
+class MagbyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame, BimanualFrame {
     override val rootPart = root.registerChildWithAllChildren("magby")
     override val head = getPart("head")
 
+    override val leftArm = getPart("lefthand")
+    override val rightArm = getPart("righthand")
+    override val leftLeg = getPart("leftleg")
+    override val rightLeg = getPart("rightleg")
+
     override var portraitScale = 2.4F
     override var portraitTranslation = Vec3d(-0.05, -0.45, 0.0)
 
@@ -45,7 +54,9 @@ class MagbyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
             poseTypes = MOVING_POSES,
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("magby", "ground_idle")
+                bedrock("magby", "ground_idle"),
+                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
+                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
             )
         )
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagmortarModel.kt

@@ -8,6 +8,10 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4
 
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
@@ -17,10 +21,15 @@ import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
 
-class MagmortarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
+class MagmortarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame, BimanualFrame {
     override val rootPart = root.registerChildWithAllChildren("magmortar")
     override val head = getPart("head")
 
+    override val leftArm = getPart("leftarm")
+    override val rightArm = getPart("rightarm")
+    override val leftLeg = getPart("leftleg")
+    override val rightLeg = getPart("rightleg")
+
     override var portraitScale = 2.2F
     override var portraitTranslation = Vec3d(-0.35, 1.2, 0.0)
 
@@ -45,7 +54,9 @@ class MagmortarModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
             poseTypes = MOVING_POSES,
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("magmortar", "ground_idle")
+                bedrock("magmortar", "ground_idle"),
+                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
+                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
             )
         )
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt

@@ -36,6 +36,7 @@ class ConkeldurrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B
     lateinit var battleidle: PokemonPose
 
     override val cryAnimation = CryProvider { _, _ -> bedrockStateful("conkeldurr", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("conkeldurr", "blink") }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt

@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFr
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -40,6 +41,8 @@ class GolettModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped
     lateinit var walk: PokemonPose
     lateinit var sleep: PokemonPose
 
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golett", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("golett", "blink") }
         standing = registerPose(

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntitySt
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -33,6 +34,8 @@ class GolurkModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     lateinit var walk: PokemonPose
     lateinit var sleep: PokemonPose
 
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golurk", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("golurk", "blink") }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DreepyModel.kt

@@ -8,10 +8,12 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen8
 
+import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
 import com.cobblemon.mod.common.entity.PoseType
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
@@ -28,6 +30,10 @@ class DreepyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose
+    lateinit var shoulderLeft: PokemonPose
+    lateinit var shoulderRight: PokemonPose
+
+    var shoulderOffset = 4.5
 
     override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dreepy", "cry") }
 
@@ -53,6 +59,32 @@ class DreepyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
                 bedrock("dreepy", "ground_idle")
             )
         )
+
+        shoulderLeft = registerPose(
+                poseType = PoseType.SHOULDER_LEFT,
+                quirks = arrayOf(blink),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("dreepy", "ground_idle")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(shoulderOffset, -2, 0),
+                        rootPart.createTransformation().addRotationDegrees(ModelPartTransformation.Z_AXIS, 12.5)
+                )
+        )
+
+        shoulderRight = registerPose(
+                poseType = PoseType.SHOULDER_RIGHT,
+                quirks = arrayOf(blink),
+                idleAnimations = arrayOf(
+                        singleBoneLook(),
+                        bedrock("dreepy", "ground_idle")
+                ),
+                transformedParts = arrayOf(
+                        rootPart.createTransformation().addPosition(-shoulderOffset, -2, 0),
+                        rootPart.createTransformation().addRotationDegrees(ModelPartTransformation.Z_AXIS, -12.5)
+                )
+        )
     }
 
 //    override fun getFaintAnimation(

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

@@ -222,4 +222,7 @@ class CobblemonConfig {
 
     @NodeCategory(Category.Debug)
     var enableDebugKeys = false
+
+    @NodeCategory(Category.Pokemon)
+    val captureXpMultiplier = 1.0
 }

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

@@ -20,7 +20,6 @@ import com.cobblemon.mod.common.api.events.pokemon.ShoulderMountEvent
 import com.cobblemon.mod.common.api.interaction.PokemonEntityInteraction
 import com.cobblemon.mod.common.api.net.serializers.PoseTypeDataSerializer
 import com.cobblemon.mod.common.api.net.serializers.StringSetDataSerializer
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider
 import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeature
 import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
@@ -105,11 +104,8 @@ import net.minecraft.sound.SoundEvents
 import net.minecraft.text.Text
 import net.minecraft.text.TextContent
 import net.minecraft.util.ActionResult
-import net.minecraft.util.Colors
-import net.minecraft.util.DyeColor
 import net.minecraft.util.Hand
 import net.minecraft.util.Identifier
-import net.minecraft.util.Util
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Vec3d
@@ -121,7 +117,7 @@ import java.util.*
 @Suppress("unused")
 open class PokemonEntity(
     world: World,
-    pokemon: Pokemon = Pokemon(),
+    pokemon: Pokemon = Pokemon().apply { isClient = world.isClient },
     type: EntityType<out PokemonEntity> = CobblemonEntities.POKEMON,
 ) : TameableShoulderEntity(type, world), Poseable, Shearable, Schedulable {
     companion object {
@@ -163,6 +159,7 @@ open class PokemonEntity(
 
     var pokemon: Pokemon = pokemon
         set(value) {
+            value.isClient = this.world.isClient
             field = value
             delegate.changePokemon(value)
             stepHeight = behaviour.moving.stepHeight
@@ -497,15 +494,15 @@ open class PokemonEntity(
                     entityId = id // Doesn't really matter on the entity
                 )
             } else {
-                pokemon = Pokemon()
+                pokemon = this.createSidedPokemon()
                 health = 0F
             }
         } else {
             pokemon = try {
-                Pokemon().loadFromNBT(nbt.getCompound(DataKeys.POKEMON))
+                this.createSidedPokemon().loadFromNBT(nbt.getCompound(DataKeys.POKEMON))
             } catch (_: InvalidSpeciesException) {
                 health = 0F
-                Pokemon()
+                this.createSidedPokemon()
             }
         }
 
@@ -1220,8 +1217,6 @@ open class PokemonEntity(
         return !this.isBusy && !this.pokemon.isFainted() && !feature.enabled
     }
 
-
-
     override fun canUsePortals() = false
 
     override fun setAir(air: Int) {
@@ -1256,4 +1251,11 @@ open class PokemonEntity(
 
     /** Retrieves the battle theme associated with this Pokemon's Species/Form, or the default PVW theme if not found. */
     fun getBattleTheme() = Registries.SOUND_EVENT.get(this.form.battleTheme) ?: CobblemonSounds.PVW_BATTLE
+
+    /**
+     * A utility method to instance a [Pokemon] aware if the [world] is client sided or not.
+     *
+     * @return The side safe [Pokemon] with the [Pokemon.isClient] set.
+     */
+    private fun createSidedPokemon(): Pokemon = Pokemon().apply { isClient = this@PokemonEntity.world.isClient }
 }

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

@@ -235,7 +235,7 @@ class PokemonServerDelegate : PokemonSideDelegate {
         }
 
         if (entity.deathTime == 60) {
-            if (entity.pokemon.isWild()) {
+            if (entity.owner == null) {
                 entity.world.sendEntityStatus(entity, 60.toByte()) // Sends smoke effect
                 if(entity.world.gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) {
                     (entity.drops ?: entity.pokemon.form.drops).drop(entity, entity.world as ServerWorld, entity.pos, entity.killer)

common/src/main/kotlin/com/cobblemon/mod/common/events/CaptureXpHandler.kt

@@ -0,0 +1,61 @@
+/*
+ * 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.events
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.Cobblemon.config
+import com.cobblemon.mod.common.api.events.pokemon.PokemonCapturedEvent
+import com.cobblemon.mod.common.api.pokemon.experience.CaptureExperienceSource
+import com.cobblemon.mod.common.api.tags.CobblemonItemTags
+import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
+
+object CaptureXpHandler {
+    fun handleCaptureInBattle(event: PokemonCapturedEvent) {
+        val battle = Cobblemon.battleRegistry.getBattleByParticipatingPlayer(event.player) ?: return
+        val caughtBattleMonActor = battle.actors.find { it.uuid == event.pokemon.uuid } ?: return
+        val caughtBattleMon = caughtBattleMonActor.pokemonList.find { it.uuid == event.pokemon.uuid } ?: return
+
+        caughtBattleMonActor.getSide().getOppositeSide().actors.forEach { opponentActor ->
+            opponentActor.pokemonList.filter {
+                it.health > 0 && (caughtBattleMon.facedOpponents.contains(it) || it.effectedPokemon.heldItem()
+                    .isIn(CobblemonItemTags.EXPERIENCE_SHARE))
+            }.forEach { opponentMon ->
+                val xpShareOnly = !caughtBattleMon.facedOpponents.contains(opponentMon)
+                val xpShareOnlyModifier =
+                    (if (xpShareOnly) config.experienceShareMultiplier else 1).toDouble()
+                val experience = Cobblemon.experienceCalculator.calculate(
+                    opponentMon, caughtBattleMon, config.captureXpMultiplier * xpShareOnlyModifier
+                )
+                if (experience > 0) {
+                    opponentActor.awardExperience(opponentMon, experience)
+                }
+            }
+        }
+    }
+
+    fun handleCaptureOutOfBattle(event: PokemonCapturedEvent) {
+        val source = CaptureExperienceSource(event.pokemon)
+        val playerParty = Cobblemon.storage.getParty(event.player)
+        val first = playerParty.firstOrNull { it != event.pokemon && it.currentHealth > 0 } ?: return
+        val targetMons = playerParty.filter {
+            it != event.pokemon && it.currentHealth > 0 && (it.uuid == first.uuid || it.heldItem()
+                .isIn(CobblemonItemTags.EXPERIENCE_SHARE))
+        }
+        targetMons.forEach { targetMon ->
+            val xpShareOnly = targetMon.uuid != first.uuid
+            val xpShareOnlyModifier = (if (xpShareOnly) config.experienceShareMultiplier else 1).toDouble()
+            val experience = Cobblemon.experienceCalculator.calculate(
+                BattlePokemon.safeCopyOf(targetMon),
+                BattlePokemon.safeCopyOf(event.pokemon),
+                config.captureXpMultiplier * xpShareOnlyModifier
+            )
+            targetMon.addExperienceWithPlayer(event.player, source, experience)
+        }
+    }
+}

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

@@ -43,7 +43,7 @@ class EnergyRootItem(block: EnergyRootBlock, settings: Settings) : AliasedBlockI
 
     fun getHealAmount() = CobblemonMechanics.remedies.getHealingAmount("root", runtime, 150)
 
-    override fun canUseOnPokemon(pokemon: Pokemon) = !pokemon.isFullHealth()
+    override fun canUseOnPokemon(pokemon: Pokemon) = !pokemon.isFullHealth() && !pokemon.isFainted()
 
     override fun applyToPokemon(player: ServerPlayerEntity, stack: ItemStack, pokemon: Pokemon): TypedActionResult<ItemStack> {
         return if (this.canUseOnPokemon(pokemon)) {

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

@@ -835,9 +835,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)
         if (nbt.contains(DataKeys.POKEMON_ABILITY, COMPOUND_TYPE.toInt())) {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0104_cubone/cubone.animation.json

@@ -169,6 +169,11 @@
 		},
 		"animation.cubone.cry": {
 			"animation_length": 1.16667,
+			"sound_effects": {
+				"0.04": {
+					"effect": "pokemon.cubone.cry"
+				}
+			},
 			"bones": {
 				"upper_torso": {
 					"rotation": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0622_golett/golett.animation.json

@@ -445,6 +445,11 @@
 		},
 		"animation.golett.cry": {
 			"animation_length": 1.5,
+			"sound_effects": {
+				"0.0417": {
+					"effect": "pokemon.golett.cry"
+				}
+			},
 			"bones": {
 				"neck": {
 					"rotation": {

common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0623_golurk/golurk.animation.json

@@ -782,6 +782,11 @@
 		},
 		"animation.golurk.cry": {
 			"animation_length": 1.5,
+			"sound_effects": {
+				"0.0417": {
+					"effect": "pokemon.golurk.cry"
+				}
+			},
 			"bones": {
 				"neck": {
 					"rotation": {

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

@@ -450,6 +450,13 @@
   "itemGroup.cobblemon.evolution_item": "Evolution Items",
   "itemGroup.cobblemon.archaeology": "Archaeology",
 
+  "block.cobblemon.black_apricorn": "Black Apricorn",
+  "block.cobblemon.blue_apricorn": "Blue Apricorn",
+  "block.cobblemon.green_apricorn": "Green Apricorn",
+  "block.cobblemon.pink_apricorn": "Pink Apricorn",
+  "block.cobblemon.red_apricorn": "Red Apricorn",
+  "block.cobblemon.white_apricorn": "White Apricorn",
+  "block.cobblemon.yellow_apricorn": "Yellow Apricorn",
   "block.cobblemon.apricorn_log": "Apricorn Log",
   "block.cobblemon.stripped_apricorn_log": "Stripped Apricorn Log",
   "block.cobblemon.apricorn_wood": "Apricorn Wood",

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

@@ -354,12 +354,56 @@
 	},
 	{
 		"content": 8,
-		"tag": "#minecraft:corals"
+		"item": "minecraft:tube_coral"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:brain_coral"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:bubble_coral"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:fire_coral"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:horn_coral"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:tube_coral_fan"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:brain_coral_fan"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:bubble_coral_fan"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:fire_coral_fan"
+	},
+	{
+		"content": 8,
+		"item": "minecraft:horn_coral_fan"
 	},
 	{
 		"content": 4,
 		"tag": "#minecraft:mushrooms"
 	},
+	{
+		"content": 4,
+		"item": "minecraft:brown_mushroom"
+	},
+	{
+		"content": 4,
+		"item": "minecraft:red_mushroom"
+	},
 	{
 		"content": 16,
 		"item": "minecraft:cake"

common/src/main/resources/data/cobblemon/spawn_pool_world/0355_duskull.json

@@ -35,8 +35,6 @@
             "level": "5-30",
             "weight": 9.0,
             "condition": {
-                "minSkyLight": 8,
-                "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:nether/is_soul_sand"
                 ]

common/src/main/resources/data/cobblemon/spawn_pool_world/0356_dusclops.json

@@ -35,8 +35,6 @@
             "level": "37-46",
             "weight": 0.9,
             "condition": {
-                "minSkyLight": 8,
-                "maxSkyLight": 15,
                 "biomes": [
                     "#cobblemon:nether/is_soul_sand"
                 ]

common/src/main/resources/data/cobblemon/species/generation4/chimchar.json

@@ -26,7 +26,7 @@
   },
   "behaviour": {
     "resting": {
-      "canSleep": true,
+      "canSleep": false,
       "willSleepOnBed": true,
       "depth": "normal",
       "light": "0-4"

common/src/main/resources/data/cobblemon/species/generation4/monferno.json

@@ -27,7 +27,7 @@
   },
   "behaviour": {
     "resting": {
-      "canSleep": true,
+      "canSleep": false,
       "willSleepOnBed": false,
       "depth": "normal",
       "light": "0-4"

common/src/main/resources/data/cobblemon/species/generation8/dreepy.json

@@ -38,7 +38,7 @@
   },
   "catchRate": 45,
   "maleRatio": 0.5,
-  "shoulderMountable": false,
+  "shoulderMountable": true,
   "baseExperienceYield": 54,
   "experienceGroup": "slow",
   "eggCycles": 40,

docs/cobblemon-tags/BlocksTags.md

@@ -15,8 +15,8 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:all_signs</summary>
 
-- #cobblemon:signs
 - #cobblemon:all_hanging_signs
+- #cobblemon:signs
 
 </details>
 
@@ -66,74 +66,74 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:berries</summary>
 
+- cobblemon:aguav_berry
+- cobblemon:apicot_berry
+- cobblemon:aspear_berry
+- cobblemon:babiri_berry
+- cobblemon:belue_berry
+- cobblemon:bluk_berry
+- cobblemon:charti_berry
 - cobblemon:cheri_berry
 - cobblemon:chesto_berry
-- cobblemon:pecha_berry
-- cobblemon:rawst_berry
-- cobblemon:aspear_berry
-- cobblemon:oran_berry
-- cobblemon:persim_berry
-- cobblemon:razz_berry
-- cobblemon:bluk_berry
-- cobblemon:nanab_berry
-- cobblemon:wepear_berry
-- cobblemon:pinap_berry
-- cobblemon:leppa_berry
-- cobblemon:lum_berry
-- cobblemon:figy_berry
-- cobblemon:wiki_berry
-- cobblemon:mago_berry
-- cobblemon:aguav_berry
-- cobblemon:iapapa_berry
-- cobblemon:sitrus_berry
-- cobblemon:touga_berry
-- cobblemon:cornn_berry
-- cobblemon:magost_berry
-- cobblemon:rabuta_berry
-- cobblemon:nomel_berry
-- cobblemon:enigma_berry
-- cobblemon:pomeg_berry
-- cobblemon:kelpsy_berry
-- cobblemon:qualot_berry
-- cobblemon:hondew_berry
-- cobblemon:grepa_berry
-- cobblemon:tamato_berry
-- cobblemon:spelon_berry
-- cobblemon:pamtre_berry
-- cobblemon:watmel_berry
-- cobblemon:durin_berry
-- cobblemon:belue_berry
-- cobblemon:kee_berry
-- cobblemon:maranga_berry
-- cobblemon:hopo_berry
-- cobblemon:liechi_berry
-- cobblemon:ganlon_berry
-- cobblemon:salac_berry
-- cobblemon:petaya_berry
-- cobblemon:apicot_berry
-- cobblemon:lansat_berry
-- cobblemon:starf_berry
-- cobblemon:micle_berry
-- cobblemon:custap_berry
-- cobblemon:jaboca_berry
-- cobblemon:rowap_berry
-- cobblemon:babiri_berry
-- cobblemon:charti_berry
 - cobblemon:chilan_berry
 - cobblemon:chople_berry
 - cobblemon:coba_berry
 - cobblemon:colbur_berry
+- cobblemon:cornn_berry
+- cobblemon:custap_berry
+- cobblemon:durin_berry
+- cobblemon:enigma_berry
+- cobblemon:figy_berry
+- cobblemon:ganlon_berry
+- cobblemon:grepa_berry
 - cobblemon:haban_berry
+- cobblemon:hondew_berry
+- cobblemon:hopo_berry
+- cobblemon:iapapa_berry
+- cobblemon:jaboca_berry
 - cobblemon:kasib_berry
 - cobblemon:kebia_berry
+- cobblemon:kee_berry
+- cobblemon:kelpsy_berry
+- cobblemon:lansat_berry
+- cobblemon:leppa_berry
+- cobblemon:liechi_berry
+- cobblemon:lum_berry
+- cobblemon:mago_berry
+- cobblemon:magost_berry
+- cobblemon:maranga_berry
+- cobblemon:micle_berry
+- cobblemon:nanab_berry
+- cobblemon:nomel_berry
 - cobblemon:occa_berry
+- cobblemon:oran_berry
+- cobblemon:pamtre_berry
 - cobblemon:passho_berry
 - cobblemon:payapa_berry
+- cobblemon:pecha_berry
+- cobblemon:persim_berry
+- cobblemon:petaya_berry
+- cobblemon:pinap_berry
+- cobblemon:pomeg_berry
+- cobblemon:qualot_berry
+- cobblemon:rabuta_berry
+- cobblemon:rawst_berry
+- cobblemon:razz_berry
 - cobblemon:rindo_berry
 - cobblemon:roseli_berry
+- cobblemon:rowap_berry
+- cobblemon:salac_berry
 - cobblemon:shuca_berry
+- cobblemon:sitrus_berry
+- cobblemon:spelon_berry
+- cobblemon:starf_berry
+- cobblemon:tamato_berry
 - cobblemon:tanga_berry
+- cobblemon:touga_berry
 - cobblemon:wacan_berry
+- cobblemon:watmel_berry
+- cobblemon:wepear_berry
+- cobblemon:wiki_berry
 - cobblemon:yache_berry
 
 </details>
@@ -141,51 +141,70 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:berry_replaceable</summary>
 
-- minecraft:air
-- minecraft:grass
-- minecraft:fern
-- minecraft:dead_bush
-- minecraft:fire
-- minecraft:soul_fire
-- minecraft:snow
-- minecraft:vine
-- minecraft:glow_lichen
-- minecraft:light
-- minecraft:tall_grass
-- minecraft:large_fern
-- minecraft:structure_void
-- minecraft:void_air
-- minecraft:cave_air
 - #minecraft:leaves
+- minecraft:air
+- minecraft:cave_air
+- minecraft:dead_bush
+- minecraft:fern
+- minecraft:fire
+- minecraft:glow_lichen
+- minecraft:grass
+- minecraft:large_fern
+- minecraft:light
+- minecraft:snow
+- minecraft:soul_fire
+- minecraft:structure_void
+- minecraft:tall_grass
+- minecraft:vine
+- minecraft:void_air
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:berry_soil</summary>
 
-- minecraft:farmland
 - #c:farmlands
 - #forge:farmlands
+- minecraft:farmland
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:berry_wild_soil</summary>
 
+- #cobblemon:snow_block
 - #minecraft:dirt
 - #minecraft:sand
-- #cobblemon:snow_block
+- #minecraft:terracotta
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:black_tumblestones</summary>
 
-- cobblemon:small_budding_black_tumblestone
-- cobblemon:medium_budding_black_tumblestone
-- cobblemon:large_budding_black_tumblestone
-- cobblemon:black_tumblestone_cluster
 - cobblemon:black_tumblestone_block
+- cobblemon:black_tumblestone_brick_slab
+- cobblemon:black_tumblestone_brick_stairs
+- cobblemon:black_tumblestone_brick_wall
+- cobblemon:black_tumblestone_bricks
+- cobblemon:black_tumblestone_cluster
+- cobblemon:chiseled_black_tumblestone_bricks
+- cobblemon:chiseled_polished_black_tumblestone
+- cobblemon:large_budding_black_tumblestone
+- cobblemon:medium_budding_black_tumblestone
+- cobblemon:polished_black_tumblestone
+- cobblemon:polished_black_tumblestone_slab
+- cobblemon:polished_black_tumblestone_stairs
+- cobblemon:polished_black_tumblestone_wall
+- cobblemon:small_budding_black_tumblestone
+
+</details>
+
+<details>
+<summary><b>Tag:</b> #blocks:black_tumblestone_bricks</summary>
+
+- cobblemon:black_tumblestone_bricks
+- cobblemon:chiseled_black_tumblestone_bricks
 
 </details>
 
@@ -199,10 +218,10 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:crops</summary>
 
+- #cobblemon:mints
+- cobblemon:medicinal_leek
 - cobblemon:revival_herb
 - cobblemon:vivichoke_seeds
-- cobblemon:medicinal_leek
-- #cobblemon:mints
 
 </details>
 
@@ -217,8 +236,8 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:dripstone_growable</summary>
 
-- dripstone_block
 - cobblemon:dripstone_moon_stone_ore
+- dripstone_block
 
 </details>
 
@@ -232,16 +251,16 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:dusk_stone_ores</summary>
 
-- cobblemon:dusk_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
+- cobblemon:dusk_stone_ore
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:fire_stone_ores</summary>
 
-- cobblemon:fire_stone_ore
 - cobblemon:deepslate_fire_stone_ore
+- cobblemon:fire_stone_ore
 - cobblemon:nether_fire_stone_ore
 
 </details>
@@ -256,56 +275,56 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:fossil_machine_parts</summary>
 
-- cobblemon:restoration_tank
-- cobblemon:monitor
 - cobblemon:fossil_analyzer
+- cobblemon:monitor
+- cobblemon:restoration_tank
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:ice_stone_ores</summary>
 
-- cobblemon:ice_stone_ore
 - cobblemon:deepslate_ice_stone_ore
+- cobblemon:ice_stone_ore
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:leaf_stone_ores</summary>
 
-- cobblemon:leaf_stone_ore
 - cobblemon:deepslate_leaf_stone_ore
+- cobblemon:leaf_stone_ore
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:machines</summary>
 
-- cobblemon:healing_machine
-- cobblemon:pc
-- cobblemon:pasture
-- cobblemon:restoration_tank
-- cobblemon:monitor
 - cobblemon:fossil_analyzer
+- cobblemon:healing_machine
+- cobblemon:monitor
+- cobblemon:pasture
+- cobblemon:pc
+- cobblemon:restoration_tank
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:medicinal_leek_plantable</summary>
 
-- minecraft:water
 - #minecraft:slabs
+- minecraft:water
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:mints</summary>
 
-- cobblemon:red_mint
 - cobblemon:blue_mint
 - cobblemon:cyan_mint
-- cobblemon:pink_mint
 - cobblemon:green_mint
+- cobblemon:pink_mint
+- cobblemon:red_mint
 - cobblemon:white_mint
 
 </details>
@@ -313,20 +332,38 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:moon_stone_ores</summary>
 
-- cobblemon:moon_stone_ore
 - cobblemon:deepslate_moon_stone_ore
 - cobblemon:dripstone_moon_stone_ore
+- cobblemon:moon_stone_ore
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:red_tumblestones</summary>
 
-- cobblemon:small_budding_tumblestone
-- cobblemon:medium_budding_tumblestone
+- cobblemon:chiseled_polished_tumblestone
+- cobblemon:chiseled_tumblestone_bricks
 - cobblemon:large_budding_tumblestone
-- cobblemon:tumblestone_cluster
+- cobblemon:medium_budding_tumblestone
+- cobblemon:polished_tumblestone
+- cobblemon:polished_tumblestone_slab
+- cobblemon:polished_tumblestone_stairs
+- cobblemon:polished_tumblestone_wall
+- cobblemon:small_budding_tumblestone
 - cobblemon:tumblestone_block
+- cobblemon:tumblestone_brick_slab
+- cobblemon:tumblestone_brick_stairs
+- cobblemon:tumblestone_brick_wall
+- cobblemon:tumblestone_bricks
+- cobblemon:tumblestone_cluster
+
+</details>
+
+<details>
+<summary><b>Tag:</b> #blocks:red_tumblestone_bricks</summary>
+
+- cobblemon:chiseled_tumblestone_bricks
+- cobblemon:tumblestone_bricks
 
 </details>
 
@@ -341,37 +378,37 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:roots_spreadable</summary>
 
-- #minecraft:dirt
-- minecraft:stone
-- minecraft:infested_stone
-- minecraft:andesite
-- minecraft:diorite
-- minecraft:granite
-- minecraft:deepslate
-- minecraft:infested_deepslate
-- minecraft:tuff
-- minecraft:cobblestone
-- minecraft:mossy_cobblestone
-- minecraft:infested_cobblestone
-- minecraft:cobbled_deepslate
+- #c:cobblestone
 - #c:dirt
 - #c:stone
-- #c:cobblestone
-- #forge:stone
-- #forge:cobblestone/normal
-- #forge:cobblestone/mossy
-- #forge:cobblestone/infested
 - #forge:cobblestone/deepslate
+- #forge:cobblestone/infested
+- #forge:cobblestone/mossy
+- #forge:cobblestone/normal
+- #forge:stone
+- #minecraft:dirt
+- minecraft:andesite
+- minecraft:cobbled_deepslate
+- minecraft:cobblestone
+- minecraft:deepslate
+- minecraft:diorite
+- minecraft:granite
+- minecraft:infested_cobblestone
+- minecraft:infested_deepslate
+- minecraft:infested_stone
+- minecraft:mossy_cobblestone
+- minecraft:stone
+- minecraft:tuff
 
 </details>
 
 <details>
 <summary><b>Tag:</b> #blocks:sees_sky</summary>
 
-- #minecraft:replaceable
-- #minecraft:leaves
 - #minecraft:climbable
 - #minecraft:fences
+- #minecraft:leaves
+- #minecraft:replaceable
 - minecraft:ice
 
 </details>
@@ -379,8 +416,8 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:shiny_stone_ores</summary>
 
-- cobblemon:shiny_stone_ore
 - cobblemon:deepslate_shiny_stone_ore
+- cobblemon:shiny_stone_ore
 
 </details>
 
@@ -395,11 +432,29 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:sky_tumblestones</summary>
 
-- cobblemon:small_budding_sky_tumblestone
-- cobblemon:medium_budding_sky_tumblestone
+- cobblemon:chiseled_polished_sky_tumblestone
+- cobblemon:chiseled_sky_tumblestone_bricks
 - cobblemon:large_budding_sky_tumblestone
-- cobblemon:sky_tumblestone_cluster
+- cobblemon:medium_budding_sky_tumblestone
+- cobblemon:polished_sky_tumblestone
+- cobblemon:polished_sky_tumblestone_slab
+- cobblemon:polished_sky_tumblestone_stairs
+- cobblemon:polished_sky_tumblestone_wall
 - cobblemon:sky_tumblestone_block
+- cobblemon:sky_tumblestone_brick_slab
+- cobblemon:sky_tumblestone_brick_stairs
+- cobblemon:sky_tumblestone_brick_wall
+- cobblemon:sky_tumblestone_bricks
+- cobblemon:sky_tumblestone_cluster
+- cobblemon:small_budding_sky_tumblestone
+
+</details>
+
+<details>
+<summary><b>Tag:</b> #blocks:sky_tumblestone_bricks</summary>
+
+- cobblemon:chiseled_sky_tumblestone_bricks
+- cobblemon:sky_tumblestone_bricks
 
 </details>
 
@@ -427,8 +482,8 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:sun_stone_ores</summary>
 
-- cobblemon:sun_stone_ore
 - cobblemon:deepslate_sun_stone_ore
+- cobblemon:sun_stone_ore
 - cobblemon:terracotta_sun_stone_ore
 
 </details>
@@ -436,8 +491,17 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:thunder_stone_ores</summary>
 
-- cobblemon:thunder_stone_ore
 - cobblemon:deepslate_thunder_stone_ore
+- cobblemon:thunder_stone_ore
+
+</details>
+
+<details>
+<summary><b>Tag:</b> #blocks:tumblestone_bricks</summary>
+
+- #cobblemon:black_tumblestone_bricks
+- #cobblemon:red_tumblestone_bricks
+- #cobblemon:sky_tumblestone_bricks
 
 </details>
 
@@ -466,8 +530,8 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:water_stone_ores</summary>
 
-- cobblemon:water_stone_ore
 - cobblemon:deepslate_water_stone_ore
+- cobblemon:water_stone_ore
 
 </details>
 
@@ -488,8 +552,8 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:bee_growables</summary>
 
-- #cobblemon:crops
 - #cobblemon:apricorns
+- #cobblemon:crops
 
 </details>
 
@@ -531,15 +595,15 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #blocks:guarded_by_piglins</summary>
 
-- cobblemon:gilded_chest
 - cobblemon:black_gilded_chest
 - cobblemon:blue_gilded_chest
+- cobblemon:gilded_chest
 - cobblemon:green_gilded_chest
 - cobblemon:pink_gilded_chest
-- cobblemon:white_gilded_chest
-- cobblemon:yellow_gilded_chest
 - cobblemon:relic_coin_pouch
 - cobblemon:relic_coin_sack
+- cobblemon:white_gilded_chest
+- cobblemon:yellow_gilded_chest
 
 </details>
 
@@ -561,8 +625,8 @@ This file contains tags related to blocks in cobblemon.
 <summary><b>Tag:</b> #blocks:logs</summary>
 
 - cobblemon:apricorn_log
-- cobblemon:stripped_apricorn_log
 - cobblemon:apricorn_wood
+- cobblemon:stripped_apricorn_log
 - cobblemon:stripped_apricorn_wood
 
 </details>
@@ -571,8 +635,8 @@ This file contains tags related to blocks in cobblemon.
 <summary><b>Tag:</b> #blocks:logs_that_burn</summary>
 
 - cobblemon:apricorn_log
-- cobblemon:stripped_apricorn_log
 - cobblemon:apricorn_wood
+- cobblemon:stripped_apricorn_log
 - cobblemon:stripped_apricorn_wood
 
 </details>
@@ -605,6 +669,7 @@ This file contains tags related to blocks in cobblemon.
 <summary><b>Tag:</b> #blocks:needs_stone_tool</summary>
 
 - cobblemon:dawn_stone_ore
+- cobblemon:dripstone_moon_stone_ore
 - cobblemon:dusk_stone_ore
 - cobblemon:fire_stone_ore
 - cobblemon:ice_stone_ore
@@ -614,7 +679,6 @@ This file contains tags related to blocks in cobblemon.
 - cobblemon:sun_stone_ore
 - cobblemon:thunder_stone_ore
 - cobblemon:water_stone_ore
-- cobblemon:dripstone_moon_stone_ore
 
 </details>
 
@@ -645,6 +709,18 @@ This file contains tags related to blocks in cobblemon.
 
 </details>
 
+<details>
+<summary><b>Tag:</b> #blocks:slabs</summary>
+
+- cobblemon:black_tumblestone_brick_slab
+- cobblemon:polished_black_tumblestone_slab
+- cobblemon:polished_sky_tumblestone_slab
+- cobblemon:polished_tumblestone_slab
+- cobblemon:sky_tumblestone_brick_slab
+- cobblemon:tumblestone_brick_slab
+
+</details>
+
 <details>
 <summary><b>Tag:</b> #blocks:small_flowers</summary>
 
@@ -652,6 +728,18 @@ This file contains tags related to blocks in cobblemon.
 
 </details>
 
+<details>
+<summary><b>Tag:</b> #blocks:stairs</summary>
+
+- cobblemon:black_tumblestone_brick_stairs
+- cobblemon:polished_black_tumblestone_stairs
+- cobblemon:polished_sky_tumblestone_stairs
+- cobblemon:polished_tumblestone_stairs
+- cobblemon:sky_tumblestone_brick_stairs
+- cobblemon:tumblestone_brick_stairs
+
+</details>
+
 <details>
 <summary><b>Tag:</b> #blocks:standing_signs</summary>
 
@@ -659,6 +747,18 @@ This file contains tags related to blocks in cobblemon.
 
 </details>
 
+<details>
+<summary><b>Tag:</b> #blocks:walls</summary>
+
+- cobblemon:black_tumblestone_brick_wall
+- cobblemon:polished_black_tumblestone_wall
+- cobblemon:polished_sky_tumblestone_wall
+- cobblemon:polished_tumblestone_wall
+- cobblemon:sky_tumblestone_brick_wall
+- cobblemon:tumblestone_brick_wall
+
+</details>
+
 <details>
 <summary><b>Tag:</b> #blocks:wall_hanging_signs</summary>
 
@@ -726,15 +826,15 @@ This file contains tags related to blocks in cobblemon.
 <summary><b>Tag:</b> #mineable:axe</summary>
 
 - #cobblemon:apricorns
-- cobblemon:pasture
-- cobblemon:gilded_chest
-- cobblemon:blue_gilded_chest
-- cobblemon:yellow_gilded_chest
-- cobblemon:pink_gilded_chest
 - cobblemon:black_gilded_chest
-- cobblemon:white_gilded_chest
-- cobblemon:green_gilded_chest
+- cobblemon:blue_gilded_chest
+- cobblemon:gilded_chest
 - cobblemon:gimmighoul_chest
+- cobblemon:green_gilded_chest
+- cobblemon:pasture
+- cobblemon:pink_gilded_chest
+- cobblemon:white_gilded_chest
+- cobblemon:yellow_gilded_chest
 
 </details>
 
@@ -748,16 +848,19 @@ This file contains tags related to blocks in cobblemon.
 <details>
 <summary><b>Tag:</b> #mineable:pickaxe</summary>
 
+- cobblemon:black_tumblestone_block
+- cobblemon:black_tumblestone_brick_slab
+- cobblemon:black_tumblestone_brick_stairs
+- cobblemon:black_tumblestone_brick_wall
+- cobblemon:black_tumblestone_bricks
+- cobblemon:black_tumblestone_cluster
+- cobblemon:chiseled_black_tumblestone_bricks
+- cobblemon:chiseled_polished_black_tumblestone
+- cobblemon:chiseled_polished_sky_tumblestone
+- cobblemon:chiseled_polished_tumblestone
+- cobblemon:chiseled_sky_tumblestone_bricks
+- cobblemon:chiseled_tumblestone_bricks
 - cobblemon:dawn_stone_ore
-- cobblemon:dusk_stone_ore
-- cobblemon:fire_stone_ore
-- cobblemon:ice_stone_ore
-- cobblemon:leaf_stone_ore
-- cobblemon:moon_stone_ore
-- cobblemon:shiny_stone_ore
-- cobblemon:sun_stone_ore
-- cobblemon:thunder_stone_ore
-- cobblemon:water_stone_ore
 - cobblemon:deepslate_dawn_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
 - cobblemon:deepslate_fire_stone_ore
@@ -769,27 +872,54 @@ This file contains tags related to blocks in cobblemon.
 - cobblemon:deepslate_thunder_stone_ore
 - cobblemon:deepslate_water_stone_ore
 - cobblemon:dripstone_moon_stone_ore
-- cobblemon:nether_fire_stone_ore
-- cobblemon:terracotta_sun_stone_ore
-- cobblemon:healing_machine
-- cobblemon:pc
-- cobblemon:restoration_tank
-- cobblemon:monitor
+- cobblemon:dusk_stone_ore
+- cobblemon:fire_stone_ore
 - cobblemon:fossil_analyzer
-- cobblemon:tumblestone_block
-- cobblemon:black_tumblestone_block
-- cobblemon:sky_tumblestone_block
-- cobblemon:small_budding_tumblestone
-- cobblemon:medium_budding_tumblestone
-- cobblemon:large_budding_tumblestone
-- cobblemon:tumblestone_cluster
-- cobblemon:small_budding_black_tumblestone
-- cobblemon:medium_budding_black_tumblestone
+- cobblemon:healing_machine
+- cobblemon:ice_stone_ore
 - cobblemon:large_budding_black_tumblestone
-- cobblemon:black_tumblestone_cluster
-- cobblemon:small_budding_sky_tumblestone
-- cobblemon:medium_budding_sky_tumblestone
 - cobblemon:large_budding_sky_tumblestone
+- cobblemon:large_budding_tumblestone
+- cobblemon:leaf_stone_ore
+- cobblemon:medium_budding_black_tumblestone
+- cobblemon:medium_budding_sky_tumblestone
+- cobblemon:medium_budding_tumblestone
+- cobblemon:monitor
+- cobblemon:moon_stone_ore
+- cobblemon:nether_fire_stone_ore
+- cobblemon:pc
+- cobblemon:polished_black_tumblestone
+- cobblemon:polished_black_tumblestone_slab
+- cobblemon:polished_black_tumblestone_stairs
+- cobblemon:polished_black_tumblestone_wall
+- cobblemon:polished_sky_tumblestone
+- cobblemon:polished_sky_tumblestone_slab
+- cobblemon:polished_sky_tumblestone_stairs
+- cobblemon:polished_sky_tumblestone_wall
+- cobblemon:polished_tumblestone
+- cobblemon:polished_tumblestone_slab
+- cobblemon:polished_tumblestone_stairs
+- cobblemon:polished_tumblestone_wall
+- cobblemon:restoration_tank
+- cobblemon:shiny_stone_ore
+- cobblemon:sky_tumblestone_block
+- cobblemon:sky_tumblestone_brick_slab
+- cobblemon:sky_tumblestone_brick_stairs
+- cobblemon:sky_tumblestone_brick_wall
+- cobblemon:sky_tumblestone_bricks
 - cobblemon:sky_tumblestone_cluster
+- cobblemon:small_budding_black_tumblestone
+- cobblemon:small_budding_sky_tumblestone
+- cobblemon:small_budding_tumblestone
+- cobblemon:sun_stone_ore
+- cobblemon:terracotta_sun_stone_ore
+- cobblemon:thunder_stone_ore
+- cobblemon:tumblestone_block
+- cobblemon:tumblestone_brick_slab
+- cobblemon:tumblestone_brick_stairs
+- cobblemon:tumblestone_brick_wall
+- cobblemon:tumblestone_bricks
+- cobblemon:tumblestone_cluster
+- cobblemon:water_stone_ore
 
 </details>

docs/cobblemon-tags/EntityTypesTags.md

@@ -15,7 +15,7 @@ This file contains tags related to different types of entities in cobblemon.
 <details>
 <summary><b>Tag:</b> #entity_types:cannot_have_name_tag</summary>
 
-- cobblemon:pokemon
 - cobblemon:empty_pokeball
+- cobblemon:pokemon
 
 </details>

docs/cobblemon-tags/spawnPresetList.md

@@ -13,6 +13,16 @@ This file contains all current spawn presets of cobblemon.
 | **maxY** | `62` |  |
 | **neededNearbyBlocks** | `minecraft:chiseled_deepslate`; `minecraft:cobbled_deepslate_wall`; `minecraft:cracked_deepslate_bricks`; `minecraft:cracked_deepslate_tiles`; `minecraft:deepslate_brick_slab`; `minecraft:deepslate_brick_stairs`; `minecraft:deepslate_brick_wall`; `minecraft:deepslate_bricks`; `minecraft:deepslate_tile_slab`; `minecraft:deepslate_tile_stairs`; `minecraft:deepslate_tile_wall`; `minecraft:deepslate_tiles`; `minecraft:polished_basalt`; `minecraft:polished_deepslate`; `minecraft:polished_deepslate_slab`; `minecraft:polished_deepslate_wall` |  |
 | **structures** | `minecraft:ancient_city` |  |
+## apricorns
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `cobblemon:black_apricorn`; `cobblemon:blue_apricorn`; `cobblemon:green_apricorn`; `cobblemon:pink_apricorn`; `cobblemon:red_apricorn`; `cobblemon:white_apricorn`; `cobblemon:yellow_apricorn` |  |
+## blue_flowers
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `minecraft:blue_orchid`; `minecraft:cornflower`; `aether_redux:pink_prismatic_petals`; `aether_redux:mixed_prismatic_petals`; `aether_redux:teal_prismatic_petals`; `biomesoplenty:blue_hydrangea`; `biomesoplenty:blue_hydrangea_bottom`; `biomesoplenty:blue_hydrangea_top`; `biomesoplenty:icy_iris`; `blue_skies:moonlit_bloom`; `blue_skies:nightcress`; `botania:blue_double_flower`; `botania:blue_floating_flower`; `botania:blue_mystical_flower`; `botania:blue_shiny_flower`; `botania:cyan_double_flower`; `botania:cyan_floating_flower`; `botania:cyan_mystical_flower`; `botania:cyan_shiny_flower`; `botania:floating_hydroangeas`; `botania:floating_labellia`; `botania:floating_manastar`; `botania:floating_marimorphosis`; `botania:floating_marimorphosis_chibi`; `botania:floating_spectrolus`; `botania:floating_tangleberrie`; `botania:floating_tangleberrie_chibi`; `botania:hydroangeas`; `botania:hydroangeas_motif`; `botania:labellia`; `botania:light_blue_double_flower`; `botania:light_blue_floating_flower`; `botania:light_blue_mystical_flower`; `botania:light_blue_shiny_flower`; `botania:manastar`; `botania:marimorphosis`; `botania:marimorphosis_chibi`; `botania:spectrolus`; `botania:tangleberrie`; `botania:tangleberrie_chibi`; `etcetera:bouquet`; `goodending:pastel_wildflowers`; `goodending:twilight_wildflowers`; `mythicbotany:aquapanthus`; `mythicbotany:aquapanthus_floating`; `mythicbotany:raindeletia`; `mythicbotany:raindeletia_floating`; `outer_end:azure_bud`; `wilderwild:blue_giany_glory_of_the_snow` |  |
 ## derelict
 
 | Key | Conditions | Anticonditions |
@@ -39,7 +49,7 @@ This file contains all current spawn presets of cobblemon.
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
-| **neededNearbyBlocks** | `#minecraft:flowers`; `#c:flowers` |  |
+| **neededNearbyBlocks** | `#minecraft:flowers`; `#c:flowers`; `aether_redux:pink_prismatic_petals`; `aether_redux:mixed_prismatic_petals`; `aether_redux:teal_prismatic_petals`; `deep_aether:aerlavender`; `deep_aether:enchanted_blossom`; `deep_aether:golden_flower`; `deep_aether:radiant_orchid`; `deep_aether:tall_aerlavender`; `etcetera:bouquet`; `mythicbotany:aquapanthus`; `mythicbotany:aquapanthus_floating`; `mythicbotany:exoblaze`; `mythicbotany:exoblaze_floating`; `mythicbotany:feysythia`; `mythicbotany:feysythia_floating`; `mythicbotany:hellebore`; `mythicbotany:hellebore_floating`; `mythicbotany:petrunia`; `mythicbotany:petrunia_floating`; `mythicbotany:raindeletia`; `mythicbotany:raindeletia_floating`; `mythicbotany:wither_aconite`; `mythicbotany:wither_aconite_floating`; `twilightforest:thorn_rose` |  |
 ## foliage
 
 | Key | Conditions | Anticonditions |
@@ -60,13 +70,13 @@ This file contains all current spawn presets of cobblemon.
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **minY** | `62` |  |
-| **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:woodland_mansion` |  |
+| **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:mansion` |  |
 ## jungle_pyramid
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **minY** | `62` |  |
-| **neededBaseBlocks** | `#minecraft:cobblestone`; `#minecraft:mossy_cobblestone` |  |
+| **neededBaseBlocks** | `minecraft:cobblestone`; `#minecraft:mossy_cobblestone` |  |
 | **neededNearbyBlocks** | `minecraft:chiseled_stone_bricks`; `minecraft:cobblestone`; `minecraft:cobblestone_stairs`; `minecraft:mossy_cobblestone` |  |
 | **structures** | `minecraft:jungle_pyramid` |  |
 ## lava_surface
@@ -114,6 +124,11 @@ This file contains all current spawn presets of cobblemon.
 | **maxY** | `62` |  |
 | **neededNearbyBlocks** | `minecraft:chiseled_sandstone`; `minecraft:chiseled_stone_bricks`; `minecraft:cracked_stone_bricks`; `minecraft:cut_sandstone`; `minecraft:mossy_cobblestone`; `minecraft:mossy_stone_bricks`; `minecraft:polished_granite`; `minecraft:stone_bricks` |  |
 | **structures** | `#minecraft:ocean_ruin` |  |
+## orange_flowers
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `minecraft:orange_tulip`; `minecraft:torchflower`; `aether_redux:aurum`; `biomemakeover:marigold`; `biomemakeover:moth_blossom`; `biomesoplenty:burning_blossom`; `biomesoplenty:orange_cosmos`; `blue_skies:blaze_bud`; `botania:entropinnyum`; `botania:floating_entropinnyum`; `botania:floating_pollidisiac`; `botania:floating_spectrolus`; `botania:floating_tigerseye`; `botania:floating_thermalily`; `botania:orange_double_flower`; `botania:orange_floating_flower`; `botania:orange_mystical_flower`; `botania:orange_shiny_flower`; `botania:pollidisiac`; `botania:spectrolus`; `botania:tigerseye`; `botania:thermalily`; `deep_aether:golden_flower`; `goodending:spicy_wildflowers` |  |
 ## pillager_outpost
 
 | Key | Conditions | Anticonditions |
@@ -121,11 +136,22 @@ This file contains all current spawn presets of cobblemon.
 | **minY** | `62` |  |
 | **neededNearbyBlocks** | `minecraft:cobblestone`; `minecraft:cobblestone_slab`; `minecraft:cobblestone_stairs`; `minecraft:cobblestone_wall`; `minecraft:dark_oak_fence`; `minecraft:dark_oak_slab`; `minecraft:dark_oak_stairs`; `minecraft:mossy_cobblestone`; `minecraft:mossy_cobblestone_slab`; `minecraft:mossy_cobblestone_stairs`; `minecraft:mossy_cobblestone_wall`; `#minecraft:logs`; `#minecraft:planks` |  |
 | **structures** | `minecraft:pillager_outpost` |  |
+## pink_flowers
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `minecraft:allium`; `minecraft:lilac`; `minecraft:peony`; `minecraft:pink_tulip`; `aether_redux:iridia`; `aether_redux:pink_prismatic_petals`; `aether_redux:mixed_prismatic_petals`; `aether_redux:sweet_blossom`; `ancient_aether:highland_viola`; `biomemakeover:foxglove`; `biomesoplenty:pink_daffodil`; `biomesoplenty:pink_hibiscus`; `biomesoplenty:wildflower`; `blue_skies:blush_blossom`; `blue_skies:briskbloom`; `blue_skies:camellia`; `blue_skies:midday_bayhop`; `botania:floating_hyacidus`; `botania:floating_jaded_amaranthus`; `botania:floating_jiyuulia`; `botania:floating_jiyuulia_chibi`; `botania:floating_marimorphosis`; `botania:floating_marimorphosis_chibi`; `botania:floating_rafflowsia`; `botania:floating_rosa_arcana`; `botania:hyacidus`; `botania:jaded_amaranthus`; `botania:jiyuulia`; `botania:jiyuulia_chibi`; `botania:magenta_double_flower`; `botania:magenta_floating_flower`; `botania:magenta_mystical_flower`; `botania:magenta_shiny_flower`; `botania:marimorphosis`; `botania:marimorphosis_chibi`; `botania:pink_double_flower`; `botania:pink_floating_flower`; `botania:pink_mystical_flower`; `botania:pink_shiny_flower`; `botania:rafflowsia`; `botania:rosa_arcana`; `deep_aether:aerlavender`; `deep_aether:radiant_orchid`; `deep_aether:tall_aerlavender`; `enlightened_end:open_odd_roots`; `etcetera:bouquet`; `farmersdelight:wild_onions`; `overweight_farming:allium_bush` |  |
 ## redstone
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
+| **neededBaseBlocks** |  | `minecraft:activator_rail`; `minecraft:daylight_detector`; `minecraft:detector_rail`; `minecraft:dispenser`; `minecraft:dropper`; `minecraft:hopper`; `minecraft:observer`; `minecraft:piston`; `minecraft:powered_comparator`; `minecraft:powered_rail`; `minecraft:powered_repeater`; `minecraft:redstone_block`; `minecraft:redstone_lamp`; `minecraft:redstone_torch`; `minecraft:redstone_wire`; `minecraft:sticky_piston`; `minecraft:unlit_redstone_torch`; `minecraft:unpowered_comparator`; `minecraft:unpowered_repeater`; `#c:redstone_blocks` |
 | **neededNearbyBlocks** | `minecraft:activator_rail`; `minecraft:daylight_detector`; `minecraft:detector_rail`; `minecraft:dispenser`; `minecraft:dropper`; `minecraft:hopper`; `minecraft:observer`; `minecraft:piston`; `minecraft:powered_comparator`; `minecraft:powered_rail`; `minecraft:powered_repeater`; `minecraft:redstone_block`; `minecraft:redstone_lamp`; `minecraft:redstone_torch`; `minecraft:redstone_wire`; `minecraft:sticky_piston`; `minecraft:unlit_redstone_torch`; `minecraft:unpowered_comparator`; `minecraft:unpowered_repeater`; `#minecraft:redstone_ores`; `#c:redstone_blocks`; `#c:redstone_ores` |  |
+## red_flowers
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `minecraft:poppy`; `minecraft:red_tulip`; `minecraft:rose_bush`; `ancient_aether:sakura_blossoms`; `ancient_aether:trapped_sakura_blossoms`; `biomesoplenty:rose`; `blue_skies:flare_floret`; `botania:bellethorn`; `botania:bellethorn_chibi`; `botania:exoflame`; `botania:floating_bellethorn`; `botania:floating_bellethorn_chibi`; `botania:floating_exoflame`; `botania:floating_kekimurus`; `botania:floating_manastar`; `botania:floating_munchdew`; `botania:floating_orechid_ignem`; `botania:floating_pollidisiac`; `botania:floating_spectrolus`; `botania:kekimurus`; `botania:manastar`; `botania:munchdew`; `botania:orechid_ignem`; `botania:pollidisiac`; `botania:red_double_flower`; `botania:red_floating_flower`; `botania:red_mystical_flower`; `botania:red_shiny_flower`; `botania:spectrolus`; `etcetera:bouquet`; `goodending:balmy_wildflowers`; `mythicbotany:petrunia`; `mythicbotany:petrunia_floating`; `twilightforest:thorn_rose`; `wilderwild:milkweed` |  |
 ## river
 
 | Key | Conditions | Anticonditions |
@@ -137,12 +163,21 @@ This file contains all current spawn presets of cobblemon.
 | --- | ---------- | -------------- |
 | **neededNearbyBlocks** | `minecraft:crying_obsidian`; `minecraft:netherack`; `minecraft:obsidian` |  |
 | **structures** | `#minecraft:ruined_portal` |  |
+## ruins
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **structures** | `cobblemon:ruins/decaying_crypt_ruins`; `cobblemon:ruins/deserted_gimmi_tower`; `cobblemon:ruins/deserted_house_ruins`; `cobblemon:ruins/deserted_tower_ruins`; `cobblemon:ruins/deserted_town_center_ruins`; `cobblemon:ruins/fallen_statue_ruins`; `cobblemon:ruins/frozen_gimmi_tower`; `cobblemon:ruins/hidden_bunker_ruins`; `cobblemon:ruins/lush_gimmi_tower`; `cobblemon:ruins/mossy_oubliette_ruins`; `cobblemon:ruins/rooted_gimmi_tower`; `cobblemon:ruins/sunscorched_gimmi_tower`; `cobblemon:ruins/temperate_gimmi_tower`; `cobblemon:ruins/toppled_pillars_ruins`; `cobblemon:ruins/unstable_cave_ruins` |  |
+## salt
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **biomes** | `biomesoplenty:hot_springs`; `biomesoplenty:wasteland`; `biomesoplenty:wasteland_steppe`; `terralith:amethyst_canyon`; `terralith:amethyst_rainforest`; `terralith:skylands_winter`; `terralith:yellowstone`; `wythers:calcite_caverns`; `wythers:calcite_coast`; `wythers:mediterranean_island_thermal_spring`; `wythers:salt_lakes_pink`; `wythers:salt_lakes_turquoise`; `wythers:salt_lakes_white`; `wythers:thermal_taiga` |  |
 ## shipwreck
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
-| **maxY** | `62` |  |
-| **neededNearbyBlocks** | `#minecraft:logs`; `#minecraft:planks` |  |
+| **structures** | `#minecraft:shipwreck` |  |
 ## stronghold
 
 | Key | Conditions | Anticonditions |
@@ -159,11 +194,21 @@ This file contains all current spawn presets of cobblemon.
 | **neededBaseBlocks** | `minecraft:black_glazed_terracotta`; `minecraft:blue_glazed_terracotta`; `minecraft:bricks`; `minecraft:brown_glazed_terracotta`; `minecraft:cobblestone`; `minecraft:cyan_glazed_terracotta`; `minecraft:gray_glazed_terracotta`; `minecraft:green_glazed_terracotta`; `minecraft:light_blue_glazed_terracotta`; `minecraft:light_gray_glazed_terracotta`; `minecraft:lime_glazed_terracotta`; `minecraft:magenta_glazed_terracotta`; `minecraft:mud_bricks`; `minecraft:orange_glazed_terracotta`; `minecraft:pink_glazed_terracotta`; `minecraft:purple_glazed_terracotta`; `minecraft:red_glazed_terracotta`; `minecraft:stone`; `minecraft:stone_bricks`; `minecraft:suspicious_gravel`; `minecraft:white_glazed_terracotta`; `minecraft:yellow_glazed_terracotta`; `#minecraft:convertable_to_mud`; `#minecraft:sand`; `#minecraft:terracotta`; `#minecraft:trail_ruins_replaceable` |  |
 | **neededNearbyBlocks** | `minecraft:black_glazed_terracotta`; `minecraft:blue_glazed_terracotta`; `minecraft:bricks`; `minecraft:brown_glazed_terracotta`; `minecraft:cyan_glazed_terracotta`; `minecraft:gray_glazed_terracotta`; `minecraft:green_glazed_terracotta`; `minecraft:light_blue_glazed_terracotta`; `minecraft:light_gray_glazed_terracotta`; `minecraft:lime_glazed_terracotta`; `minecraft:magenta_glazed_terracotta`; `minecraft:mud_bricks`; `minecraft:orange_glazed_terracotta`; `minecraft:pink_glazed_terracotta`; `minecraft:purple_glazed_terracotta`; `minecraft:red_glazed_terracotta`; `minecraft:suspicious_gravel`; `minecraft:white_glazed_terracotta`; `minecraft:yellow_glazed_terracotta`; `#minecraft:terracotta` |  |
 | **structures** | `minecraft:trail_ruins` |  |
+## trash
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `minecraft:composter`; `etcetera:prickly_can`; `farmersdelight:organic_compost`; `manatrashcan:mana_trashcan`; `nethersdelight:soul_compost`; `overweight_farming:vegetable_compost`; `rats:trash_can`; `rats:garbage_pile`; `rats:cursed_garbage`; `rats:purified_garbage`; `rats:pied_garbage`; `rats:compressed_garbage`; `trashcans:item_trash_can`; `trashcans:liquid_trash_can`; `trashcans:energy_trash_can`; `trashcans:ultimate_trash_can` |  |
 ## treetop
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **neededBaseBlocks** | `#minecraft:leaves`; `#minecraft:logs`; `#minecraft:overworld_natural_logs`; `#c:leaves`; `#c:logs` |  |
+## underground_ruins
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **structures** | `cobblemon:ruins/crumbling_arch_ruins`; `cobblemon:ruins/rooted_arch_ruins` |  |
 ## underlava
 
 | Key | Conditions | Anticonditions |
@@ -190,17 +235,24 @@ This file contains all current spawn presets of cobblemon.
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **fluid** | `#minecraft:water` |  |
+## webs
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **biomes** | `biomesoplenty:spider_nest`; `terralith:cave/infested_caves`; `wythers:forbidden_forest`; `wythers:phantasmal_forest`; `wythers:phantasmal_swamp` |  |
+## white_flowers
+
+| Key | Conditions | Anticonditions |
+| --- | ---------- | -------------- |
+| **neededNearbyBlocks** | `minecraft:azure_bluet`; `minecraft:lily_of_the_valley`; `minecraft:oxeye_daisy`; `minecraft:white_tulip`; `aether:white_flower`; `aether_redux:frostbud`; `aether_redux:gilded_white_flower`; `biomemakeover:buttonbush`; `biomesoplenty:glowflower`; `blue_skies:crystal_flower`; `blue_skies:snowbloom`; `botania:floating_dandelifeon`; `botania:floating_kekimurus`; `botania:floating_pure_daisy`; `botania:floating_spectrolus`; `botania:spectrolus`; `botania:white_double_flower`; `botania:white_floating_flower`; `botania:white_mystical_flower`; `botania:white_shiny_flower`; `botania:pure_daisy`; `botania:fallen_kanade`; `botania:floating_fallen_kanade`; `botania:spectranthemum`; `botania:floating_spectranthemum`; `botania:kekimurus`; `botania:dandelifeon`; `deep_aether:enchanted_blossom`; `farmersdelight:wild_carrots`; `miners_delight:gossypium`; `miners_delight:wild_cave_carrots`; `wilderwild:alba_giany_glory_of_the_snow`; `wilderwild:datura` |  |
 ## wild
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
 | **neededNearbyBlocks** |  | `minecraft:white_concrete`; `minecraft:orange_concrete`; `minecraft:magenta_concrete`; `minecraft:light_blue_concrete`; `minecraft:yellow_concrete`; `minecraft:lime_concrete`; `minecraft:pink_concrete`; `minecraft:gray_concrete`; `minecraft:light_gray_concrete`; `minecraft:cyan_concrete`; `minecraft:purple_concrete`; `minecraft:blue_concrete`; `minecraft:brown_concrete`; `minecraft:green_concrete`; `minecraft:red_concrete`; `minecraft:black_concrete` |
 | **structures** |  | `#minecraft:village` |
-## woodland_mansion
+## yellow_flowers
 
 | Key | Conditions | Anticonditions |
 | --- | ---------- | -------------- |
-| **minY** | `62` |  |
-| **neededBaseBlocks** | `minecraft:birch_planks`; `minecraft:double_smooth_stone_slab`; `minecraft:oak_planks`; `minecraft:polished_andesite`; `#minecraft:wool`; `#minecraft:wool_carpets` |  |
-| **neededNearbyBlocks** | `minecraft:birch_planks`; `minecraft:cobblestone_stairs`; `minecraft:cobblestone_wall`; `minecraft:dark_oak_planks` |  |
-| **structures** | `minecraft:woodland_mansion` |  |
+| **neededNearbyBlocks** | `minecraft:dandelion`; `minecraft:sunflower`; `biomesoplenty:goldenrod`; `botania:daffomill`; `botania:endoflame`; `botania:floating_daffomill`; `botania:floating_endoflame`; `botania:floating_gourmaryllis`; `botania:floating_labellia`; `botania:floating_marimorphosis`; `botania:floating_marimorphosis_chibi`; `botania:floating_rafflowsia`; `botania:floating_solegnolia`; `botania:floating_solegnolia_chibi`; `botania:floating_spectrolus`; `botania:gourmaryllis`; `botania:labellia`; `botania:marimorphosis`; `botania:marimorphosis_chibi`; `botania:rafflowsia`; `botania:solegnolia`; `botania:solegnolia_chibi`; `botania:spectrolus`; `botania:yellow_double_flower`; `botania:yellow_floating_flower`; `botania:yellow_mystical_flower`; `botania:yellow_shiny_flower`; `etcetera:bouquet`; `farmersdelight:wild_cabbages`; `goodending:balmy_wildflowers`; `goodending:pastel_wildflowers`; `mythicbotany:feysythia`; `mythicbotany:feysythia_floating` |  |

gradle/build-logic/src/main/kotlin/cobblemon.platform-conventions.gradle.kts

@@ -35,6 +35,9 @@ tasks {
         archiveBaseName.set("Cobblemon-${project.name}")
         configurations = listOf(bundle)
         mergeServiceFiles()
+
+        relocate ("org.graalvm", "com.cobblemon.mod.relocations.graalvm")
+        relocate ("com.oracle", "com.cobblemon.mod.relocations.oracle")
     }
 
     remapJar {

utilityscripts/releasescripts/generateTagList.py

@@ -1,16 +1,17 @@
 import os
 import json
+import argparse
 
 # Define constants
 BASE_PATHS = [
-    "../../common/src/main/resources/data/cobblemon/tags",
-    "../../common/src/main/resources/data/minecraft/tags"
+    "{root}/common/src/main/resources/data/cobblemon/tags",
+    "{root}/common/src/main/resources/data/minecraft/tags"
 ]
 OUTPUT_PATHS = {
-    'blocks': "../../docs/cobblemon-tags/BlocksTags.md",
-    'entity_types': "../../docs/cobblemon-tags/EntityTypesTags.md",
-    'items': "../../docs/cobblemon-tags/ItemTags.md",
-    'biome': "../../docs/cobblemon-tags/BiomeTags.md",
+    'blocks': "{root}/docs/cobblemon-tags/BlocksTags.md",
+    'entity_types': "{root}/docs/cobblemon-tags/EntityTypesTags.md",
+    'items': "{root}/docs/cobblemon-tags/ItemTags.md",
+    'biome': "{root}/docs/cobblemon-tags/BiomeTags.md",
 }
 DETAIL_TAGFILE_HEADERS = {
     'blocks': "# Block Tags\n\nThis file contains tags related to blocks in cobblemon.\n\n## Tags:\n",
@@ -49,9 +50,19 @@ def process_json_file(json_path, file_handle):
         tags = [entry['id'] if isinstance(entry, dict) and 'id' in entry else entry for entry in data.get('values', [])]
         tag_directory = os.path.basename(os.path.dirname(json_path))
         json_file_base = os.path.basename(json_path)
-        file_handle.write(f"\n<details>\n<summary><b>Tag:</b> #{tag_directory}:{json_file_base[:-5]}</summary>\n\n")
+
+        # Collect all tag details in a list
+        tag_details = []
         for tag in tags:
-            file_handle.write(f"- {tag}\n")
+            tag_details.append(f"- {tag}\n")
+
+        # Sort the tag details
+        tag_details.sort()
+
+        # Write the sorted tag details to the file
+        file_handle.write(f"\n<details>\n<summary><b>Tag:</b> #{tag_directory}:{json_file_base[:-5]}</summary>\n\n")
+        for tag_detail in tag_details:
+            file_handle.write(tag_detail)
         file_handle.write("\n</details>\n")
 
 
@@ -75,10 +86,23 @@ def generate_detailed_tag_lists():
     output_files = open_files_and_write_headers()
     process_base_paths(output_files)
     close_files(output_files)
+    print("Detailed tag lists generated successfully.")
+
 
 def main():
+    parser = argparse.ArgumentParser(description='Generate detailed tag lists.')
+    parser.add_argument('-r', '--root', type=str, default='../../',
+                        help='Root of the cobblemon repository. Default ../../')
+    args = parser.parse_args()
+
+    # Replace {root} in BASE_PATHS and OUTPUT_PATHS with the user-provided root
+    global BASE_PATHS, OUTPUT_PATHS
+    BASE_PATHS = [path.format(root=args.root) for path in BASE_PATHS]
+    OUTPUT_PATHS = {key: path.format(root=args.root) for key, path in OUTPUT_PATHS.items()}
+
     generate_detailed_tag_lists()
 
 
 if __name__ == "__main__":
     main()
+