Fix issues with camera bob when FPS is unstable (still WIP, needs cleanup)

CHANGELOG.md

@@ -127,7 +127,6 @@
 - Fixed Pokémon marked as silent still playing shiny sounds and effects.
 - Fixed an issue with newer versions of Fabric API where underground Pokémon were spawning in The End.
 - Fixed spawning not working well when you're at high points surrounded by lower altitude spawning areas, such as flying.
-- Fixed swapping held items with wild Pokémon under certain circumstances causing duplicate items
 
 ### Developer
 - A finished battle now has winners and losers set inside of `PokemonBattle` instead of them always being empty.
@@ -145,7 +144,6 @@
 - Updated NPCEntity beam positioning to properly account for the baseScale property.
 - Updated NPCEntity pokeball throw positioning to properly account for the baseScale property.
 - Fixed `[Pokemon].copyFrom` error causing forms, IVs, and EVs to not be applied properly when using `[Pokemon].loadFromJSON` or `[Pokemon].loadFromNBT`
-- Added new item class, `WearableItem`. Instances of this class should have a corresponding 3D model. These models render when the items display context is `HEAD`.
 
 ### MoLang & Datapacks
 - The following usages for item predicates can now use item conditions like advancements do, you can learn about them in the [Minecraft wiki](https://minecraft.wiki/w/Advancement_definition#minecraft:filled_bucket)
@@ -159,8 +157,6 @@
 - Added Molang functions for rendering items `render_item(item_id, locator_name)` and `clear_items()`.
 - Fixed location spawn filter components causing crashes
 - Added `pokemon` as an available Molang function for the `battleActor` functions.
-- Fixed `heldItem` property inside spawn files not working and causing crashes
-- Fixed `spawn_bedrock_particles` MoLang causing crashes when used in a server environment
 
 ## [1.6.1 (January 26th, 2025)](#1-6-1)
 

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

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.api.riding.Rideable;
 import com.cobblemon.mod.common.api.riding.Seat;
+import com.cobblemon.mod.common.client.Test;
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate;
 import com.cobblemon.mod.common.client.render.MatrixWrapper;
 import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState;
@@ -26,6 +27,7 @@ import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.phys.HitResult;
@@ -60,6 +62,10 @@ public abstract class CameraMixin {
 
     @Shadow
     private BlockGetter level;
+
+    @Shadow public abstract float getPartialTickTime();
+
+    @Shadow private float partialTickTime;
     @Unique private float returnTimer = 0;
     @Unique private float rollAngleStart = 0;
     @Unique Minecraft minecraft = Minecraft.getInstance();
@@ -115,20 +121,48 @@ public abstract class CameraMixin {
                 return;
             }
 
-            int seatIndex = pokemon.getPassengers().indexOf(entity);
-            Seat seat = pokemon.getSeats().get(seatIndex);
-
+            PokemonClientDelegate delegate = (PokemonClientDelegate) pokemon.getDelegate();
             Vec3 entityPos = new Vec3(
                     Mth.lerp(instance.getPartialTickTime(), pokemon.xOld, pokemon.getX()),
                     Mth.lerp(instance.getPartialTickTime(), pokemon.yOld, pokemon.getY()),
                     Mth.lerp(instance.getPartialTickTime(), pokemon.zOld, pokemon.getZ())
             );
+            if (delegate.getCurrentModel() != null) {
+
+                float f = Mth.rotLerp(partialTickTime, pokemon.yBodyRotO, pokemon.yBodyRot);
+                float g = Mth.rotLerp(partialTickTime, pokemon.yHeadRotO, pokemon.yHeadRot);
+                float h = g - f;
+                float j = Mth.lerp(partialTickTime, entity.xRotO, entity.getXRot());
+                h = Mth.wrapDegrees(h);
+
+                float l = 0.0F;
+                float m = 0.0F;
+                if (!pokemon.isPassenger() && pokemon.isAlive()) {
+                    l = pokemon.walkAnimation.speed(partialTickTime);
+                    m = pokemon.walkAnimation.position(partialTickTime);
+                    if (pokemon.isBaby()) {
+                        m *= 3.0F;
+                    }
+
+                    if (l > 1.0F) {
+                        l = 1.0F;
+                    }
+                }
+
+                Test.INSTANCE.setLocked(false);
+                delegate.updatePartialTicks(partialTickTime);
+                delegate.updateLocatorPosition(entityPos);
+                delegate.getCurrentModel().applyAnimations(pokemon, delegate, l, m, partialTickTime, j, h);
+                Test.INSTANCE.setLocked(true);
+            }
+
+            int seatIndex = pokemon.getPassengers().indexOf(entity);
+            Seat seat = pokemon.getSeats().get(seatIndex);
 
             OrientationControllable rollable = (OrientationControllable) entity;
             OrientationController controller = rollable.getOrientationController();
 
             if (!instance.isDetached() || Cobblemon.config.getThirdPartyViewBobbing()) {
-                PokemonClientDelegate delegate = (PokemonClientDelegate) pokemon.getDelegate();
                 MatrixWrapper locator = delegate.getLocatorStates().get(seat.getLocator());
 
                 if (locator == null) {
@@ -139,10 +173,12 @@ public abstract class CameraMixin {
                 Vec3 locatorOffset = new Vec3(locator.getMatrix().getTranslation(new Vector3f()));
 
                 float currEyeHeight = Mth.lerp(instance.getPartialTickTime(), eyeHeightOld, eyeHeight);
-                Matrix3f orientation = controller.isActive() && controller.getOrientation() != null ? controller.getOrientation() : new Matrix3f();
-                Vec3 rotatedEyeHeight = new Vec3(orientation.transform(new Vector3f(0f, currEyeHeight - (entity.getBbHeight() / 2), 0f)));
+                var rotatedEyeHeight = new Vector3f(0f, currEyeHeight - (entity.getBbHeight() / 2), 0f);
+                if (controller.isActive()) {
+                    rotatedEyeHeight = controller.getRenderOrientation(partialTickTime).transform(rotatedEyeHeight);
+                }
 
-                Vec3 position = locatorOffset.add(entityPos).add(rotatedEyeHeight);
+                Vec3 position = locatorOffset.add(entityPos).add(new Vec3(rotatedEyeHeight));
                 setPosition(position);
             } else {
                 Vector3f pos = entityPos.add(new Vec3(0, pokemon.getBbHeight() / 2, 0)).toVector3f();

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

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.ModAPI;
 import com.cobblemon.mod.common.item.PokeBallItem;
 import com.cobblemon.mod.common.item.PokedexItem;
-import com.cobblemon.mod.common.item.WearableItem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.ItemModelShaper;
@@ -55,18 +54,17 @@ public abstract class ItemRendererMixin {
     )
     private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) {
         boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED;
-        ResourceLocation resourceLocation = null;
         if (shouldBe2d) {
+            ResourceLocation resourceLocation = null;
             if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d();
             else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath();
-        }
-        if (renderMode != ItemDisplayContext.HEAD && stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel2d();
 
-        if (resourceLocation != null) {
-            BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
-            if (!cobblemon$isSameModel(model, replacementModel)) {
-                ci.cancel();
-                render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+            if (resourceLocation != null) {
+                BakedModel replacementModel = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, "inventory"));
+                if (!cobblemon$isSameModel(model, replacementModel)) {
+                    ci.cancel();
+                    render(stack, renderMode, leftHanded, matrices, multiBufferSource, light, overlay, replacementModel);
+                }
             }
         }
     }
@@ -80,7 +78,6 @@ public abstract class ItemRendererMixin {
             boolean canOpenScreen = entity != null && ((entity.getOffhandItem() == stack && !(entity.getMainHandItem().getItem() instanceof PokedexItem)) || entity.getMainHandItem() == stack);
             resourceLocation = pokedexItem.getType().getItemModelPath(isScanModel ? "scanning" : (canOpenScreen ? null : "off"));
         }
-        else if (stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel3d();
 
         if (resourceLocation != null) {
             BakedModel model = this.itemModelShaper.getModelManager().getModel(new ModelResourceLocation(resourceLocation, MODEL_PATH));

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

@@ -281,6 +281,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     // Evolution items
     @JvmField val LINK_CABLE = create("link_cable", LinkCableItem())
     @JvmField val DRAGON_SCALE = noSettingsItem("dragon_scale")
+    @JvmField val KINGS_ROCK = noSettingsItem("kings_rock")
     @JvmField val METAL_COAT = noSettingsItem("metal_coat")
     @JvmField val UPGRADE = noSettingsItem("upgrade")
     @JvmField val DUBIOUS_DISC = noSettingsItem("dubious_disc")
@@ -659,19 +660,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val WATER_STONE = noSettingsItem("water_stone")
 
-    val wearables = mutableListOf<WearableItem>()
-    //Wearable items (these items should have a corresponding 3D model)
-    @JvmField val BLACK_GLASSES = wearableItem("black_glasses")
-    @JvmField val CHOICE_BAND = wearableItem("choice_band")
-    @JvmField val CHOICE_SPECS = wearableItem("choice_specs")
-    @JvmField val EXP_SHARE = wearableItem("exp_share")
-    @JvmField val FOCUS_BAND = wearableItem("focus_band")
-    @JvmField val KINGS_ROCK = wearableItem("kings_rock")
-    @JvmField val MUSCLE_BAND = wearableItem("muscle_band")
-    @JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
-    @JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
-    @JvmField val WISE_GLASSES = wearableItem("wise_glasses")
-
     // Held Items
     @JvmField
     val ABILITY_SHIELD = heldItem("ability_shield")
@@ -688,6 +676,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @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")
@@ -696,8 +686,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
     @JvmField
+    val CHOICE_BAND = heldItem("choice_band")
+    @JvmField
     val CHOICE_SCARF = heldItem("choice_scarf")
     @JvmField
+    val CHOICE_SPECS = heldItem("choice_specs")
+    @JvmField
     val CLEANSE_TAG = heldItem("cleanse_tag")
    // @JvmField
    // val CLEAR_AMULET = heldItem("clear_amulet")
@@ -718,6 +712,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @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")
@@ -726,6 +722,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val FLOAT_STONE = heldItem("float_stone")
     @JvmField
+    val FOCUS_BAND = heldItem("focus_band")
+    @JvmField
     val FOCUS_SASH = heldItem("focus_sash")
     @JvmField
     val GRASSY_SEED = heldItem("grassy_seed")
@@ -760,6 +758,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val MIRACLE_SEED = heldItem("miracle_seed")
     @JvmField
+    val MUSCLE_BAND = heldItem("muscle_band")
+    @JvmField
     val MYSTIC_WATER = heldItem("mystic_water")
     @JvmField
     val NEVER_MELT_ICE = heldItem("never_melt_ice")
@@ -790,8 +790,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @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")
@@ -828,6 +832,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @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)
@@ -1257,16 +1263,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
-    private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
-        name,
-        WearableItem(name).also {
-            wearables.add(it)
-            if (heldItemRemappedName != null) {
-                CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
-            }
-        }
-    )
-
     private fun heldItem(name: String, remappedName: String? = null): CobblemonItem = create(
         name,
         CobblemonItem(Item.Properties()).also {

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

@@ -42,6 +42,8 @@ import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.BattleRegistry
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
+import com.cobblemon.mod.common.client.particle.BedrockParticleOptionsRepository
+import com.cobblemon.mod.common.client.particle.ParticleStorm
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions
 import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.entity.npc.NPCBattleActor
@@ -61,6 +63,7 @@ import com.cobblemon.mod.common.pokemon.evolution.variants.LevelUpEvolution
 import com.cobblemon.mod.common.pokemon.evolution.variants.TradeEvolution
 import com.cobblemon.mod.common.util.*
 import com.mojang.datafixers.util.Either
+import net.minecraft.client.multiplayer.ClientLevel
 import net.minecraft.commands.arguments.EntityAnchorArgument
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Holder
@@ -286,11 +289,16 @@ object MoLangFunctions {
                 } as? ServerPlayer
                 val pos = Vec3(x, y, z)
 
-                val packet = SpawnSnowstormParticlePacket(particle, pos)
-                if (player != null) {
-                    packet.sendToPlayer(player)
+                if (world !is ClientLevel) {
+                    val packet = SpawnSnowstormParticlePacket(particle, pos)
+                    if (player != null) {
+                        packet.sendToPlayer(player)
+                    } else {
+                        packet.sendToPlayersAround(x, y, z, 64.0, world.dimension())
+                    }
                 } else {
-                    packet.sendToPlayersAround(x, y, z, 64.0, world.dimension())
+                    val effect = BedrockParticleOptionsRepository.getEffect(particle) ?: return@put DoubleValue.ZERO
+                    ParticleStorm.createAtPosition(world, effect, pos).spawn()
                 }
             }
             map.put("get_entities_around") { params ->

common/src/main/kotlin/com/cobblemon/mod/common/client/Test.kt

@@ -0,0 +1,5 @@
+package com.cobblemon.mod.common.client
+
+object Test {
+    var locked: Boolean = true
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/config/variable/CobblemonConfigEditBoxVariable.kt

@@ -98,13 +98,13 @@ class CobblemonConfigIntVariable(
     override fun getConfigValueAsString(): String = (config.getter.call(parent.parent.clonedConfig) as Int?).toString()
 
     init {
-        editBox.setFilter { value -> value.toIntOrNull() != null || value.isBlank() || value == "-" }
+        editBox.setFilter { value -> value.toIntOrNull() != null || value.isBlank() }
         editBox.setResponder { value ->
             if (value.isBlank()) {
                 return@setResponder
             }
 
-            val intValue = value.toIntOrNull() ?: return@setResponder
+            val intValue = value.toInt()
             setConfigValue(intValue, false)
 
             if (intConstraintAnnotation != null) {
@@ -129,7 +129,7 @@ class CobblemonConfigFloatVariable(
     override fun getConfigValueAsString(): String = (config.getter.call(parent.parent.clonedConfig) as Float?).toString()
 
     init {
-        editBox.setFilter { value -> value.toFloatOrNull() != null || value.isBlank() || value == "." || value == "-" }
+        editBox.setFilter { value -> value.toFloatOrNull() != null || value.isBlank() }
         editBox.setResponder { value ->
             if (value.toFloatOrNull() != null) {
                 setConfigValue(value.toFloat(), false)
@@ -145,7 +145,7 @@ class CobblemonConfigDoubleVariable(
     override fun getConfigValueAsString(): String = (config.getter.call(parent.parent.clonedConfig) as Double?).toString()
 
     init {
-        editBox.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() || value == "." || value == "-" }
+        editBox.setFilter { value -> value.toDoubleOrNull() != null || value.isBlank() }
         editBox.setResponder { value ->
             if (value.toDoubleOrNull() != null) {
                 setConfigValue(value.toDouble(), false)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt

@@ -125,7 +125,6 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
     private lateinit var markingsWidget: MarkingsWidget
     private val summaryTabs = mutableListOf<SummaryTab>()
     private var showCosmeticItem = false
-    private lateinit var heldItemVisibilityButton: SummaryButton
     private var mainScreenIndex = INFO
     var sideScreenIndex = PARTY
     private val party = ArrayList(party)
@@ -182,7 +181,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         )
 
         //Item Visibility Button
-        heldItemVisibilityButton = SummaryButton(
+        val HeldItemVisibilityButton = SummaryButton(
             buttonX = x + 3F,
             buttonY = y + 104F,
             buttonWidth = 32,
@@ -192,7 +191,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
             activeResource = itemHiddenResource,
             clickAction = {
                 selectedPokemon.heldItemVisible = !selectedPokemon.heldItemVisible
-                heldItemVisibilityButton.buttonActive = !selectedPokemon.heldItemVisible
+                (it as SummaryButton).buttonActive = !selectedPokemon.heldItemVisible
                 modelWidget.heldItem = if (selectedPokemon.heldItemVisible) selectedPokemon.heldItem else null
                 // Send item visibility update to server
                 sendToServer(SetItemHiddenPacket(selectedPokemon.uuid, selectedPokemon.heldItemVisible))
@@ -200,8 +199,8 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
             renderRequirement = { !selectedPokemon.heldItemNoCopy().isEmpty && !showCosmeticItem },
             clickRequirement = { !selectedPokemon.heldItemNoCopy().isEmpty && !showCosmeticItem }
         )
-        heldItemVisibilityButton.buttonActive = !selectedPokemon.heldItemVisible
-        addRenderableWidget(heldItemVisibilityButton)
+
+        addRenderableWidget(HeldItemVisibilityButton)
 
         // Held/Cosmetic Item Button
         addRenderableWidget(
@@ -332,7 +331,6 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         if (::modelWidget.isInitialized) {
             modelWidget.pokemon = selectedPokemon.asRenderablePokemon()
             modelWidget.heldItem = if (selectedPokemon.heldItemVisible) selectedPokemon.heldItem else null
-            heldItemVisibilityButton.buttonActive = !selectedPokemon.heldItemVisible
         }
 
         if (::nicknameEntryWidget.isInitialized) nicknameEntryWidget.setSelectedPokemon(selectedPokemon)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/ModelWidget.kt

@@ -18,6 +18,7 @@ import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
 import org.joml.Quaternionf
 import org.joml.Vector3f
 
@@ -113,13 +114,12 @@ class ModelWidget(
         )
 
         heldItemRenderer.renderOnModel(
-            heldItem?: ItemStack.EMPTY,
             state.currentModel!!,
+            heldItem?: ItemStack.EMPTY,
             state,
             matrices,
             context.bufferSource(),
-            light = 0xF000F0,
-            true
+            Vec3(0.0,-90.0,-90.0)
         )
 
         matrices.popPose()

common/src/main/kotlin/com/cobblemon/mod/common/client/render/item/HeldItemRenderer.kt

@@ -11,12 +11,9 @@ package com.cobblemon.mod.common.client.render.item
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags.WEARABLE_FACE_ITEMS
 import com.cobblemon.mod.common.api.tags.CobblemonItemTags.WEARABLE_HAT_ITEMS
-import com.cobblemon.mod.common.client.entity.NPCClientDelegate
-import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
-import com.cobblemon.mod.common.client.render.models.blockbench.FloatingState
+import com.cobblemon.mod.common.client.render.MatrixWrapper
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableModel
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import net.minecraft.client.Minecraft
@@ -27,7 +24,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.item.ItemStack
-import org.joml.Vector3f
+import net.minecraft.world.phys.Vec3
 
 class HeldItemRenderer {
     private val itemRenderer: ItemRenderer = Minecraft.getInstance().itemRenderer
@@ -37,91 +34,133 @@ class HeldItemRenderer {
         const val ITEM_FACE = "item_face"
         const val ITEM_HAT = "item_hat"
         const val ITEM = "item"
-
-        private fun PoseStack.setOriginAndScale(x:Float,y:Float,z:Float,scale:Float=1f) {
-            this.translate(x*.0625*scale, y*.0625*scale, z*.0625*scale)
-            this.scale(scale, scale, scale)
-        }
     }
 
-    fun renderOnModel(
-        item: ItemStack,
-        model: PosableModel,
-        state: PosableState,
-        poseStack: PoseStack,
-        buffer: MultiBufferSource,
-        light: Int = LightTexture.pack(11, 7),
-        frontLight: Boolean = false,
-        entity: LivingEntity? = null
-    ) {
-        if (!item.`is`(CobblemonItemTags.HIDDEN_ITEMS)) renderAtLocator(item, model, state, entity, poseStack, buffer, light, 0, frontLight)
-        state.animationItems.forEach { (targetLocator, item) -> renderAtLocator(item, model, state, entity, poseStack, buffer, light, 0, frontLight, targetLocator) }
-    }
-
-    private fun renderAtLocator(
-        item: ItemStack,
-        model: PosableModel,
-        state: PosableState,
+    fun render(
         entity: LivingEntity?,
+        model: PosableModel,
+        item: ItemStack,
+        locators: Map<String, MatrixWrapper>,
         poseStack: PoseStack,
         buffer: MultiBufferSource,
         light: Int,
         seed: Int,
-        frontLight: Boolean = false,
-        targetLocator: String =
-            if (item.`is`(WEARABLE_FACE_ITEMS) && state.locatorStates.containsKey(ITEM_FACE)) ITEM_FACE
-            else if (item.`is`(WEARABLE_HAT_ITEMS) && state.locatorStates.containsKey(ITEM_HAT)) ITEM_HAT
-            else ITEM
+        rotation: Vec3
     ) {
         if (item.isEmpty) return
+        displayContext = ItemDisplayContext.FIXED
 
-        if (state.locatorStates.containsKey(targetLocator)) {
+        poseStack.pushPose()
+        when {
+            //item_face locator
+            (locators.containsKey(ITEM_FACE) && item.`is`(WEARABLE_FACE_ITEMS)) -> {
+                displayContext = model.getLocatorDisplayContext(ITEM_FACE) ?: ItemDisplayContext.HEAD
+                poseStack.mulPose(locators[ITEM_FACE]!!.matrix)
+                poseStack.translate(0f, 0f, .28f)
+                poseStack.scale(0.7f, 0.7f, 0.7f)
+            }
+            //item_hat locator
+            (locators.containsKey(ITEM_HAT) && item.`is`(WEARABLE_HAT_ITEMS)) -> {
+                displayContext = model.getLocatorDisplayContext(ITEM_HAT) ?: ItemDisplayContext.HEAD
+                poseStack.mulPose(locators[ITEM_HAT]!!.matrix)
+                poseStack.translate(0f, -0.26f, 0f)
+                poseStack.scale(.68f, .68f, .68f)
+            }
+            //item locator
+            (locators.containsKey(ITEM)) -> {
+                displayContext = model.getLocatorDisplayContext(ITEM) ?: ItemDisplayContext.FIXED
+                poseStack.mulPose(locators[ITEM]!!.matrix)
+                applyContextTransformation(poseStack, rotation)
+            }
+            // Don't render any item
+            else -> {
+                poseStack.popPose()
+                return
+            }
+        }
+
+        itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, seed)
+        poseStack.popPose()
+    }
+
+    private fun renderAnimationItem(
+        model: PosableModel,
+        state: PosableState,
+        locators: Map<String, MatrixWrapper>,
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        light: Int,
+        entity: LivingEntity?,
+        rotation: Vec3
+    ) {
+        state.itemRenderingLocations.forEach { (locatorName, item) ->
             poseStack.pushPose()
-            RenderSystem.applyModelViewMatrix()
-
-            displayContext = model.getLocatorDisplayContext(targetLocator)?:
-                if ((item.`is`(WEARABLE_FACE_ITEMS) && targetLocator==ITEM_FACE) || (item.`is`(WEARABLE_HAT_ITEMS) && targetLocator== ITEM_HAT)) ItemDisplayContext.HEAD
-                else ItemDisplayContext.FIXED
-
-            poseStack.mulPose(state.locatorStates[targetLocator]!!.matrix)
-            when (displayContext) {
-                ItemDisplayContext.FIXED -> {
-                    poseStack.setOriginAndScale(0f,.5f,0f, .5f)
-                    poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
-                }
-                ItemDisplayContext.THIRD_PERSON_RIGHT_HAND, ItemDisplayContext.THIRD_PERSON_LEFT_HAND -> {
-                    //For Minecraft player models
-                    if (state is NPCClientDelegate) {
-                        poseStack.mulPose(Axis.XP.rotationDegrees(-90.0F))
-                    }
-                    //for T-Posing Models
-                    else if (state is PokemonClientDelegate || state is FloatingState) {
-                        poseStack.mulPose(Axis.YP.rotationDegrees(-90.0F))
-                        poseStack.mulPose(Axis.ZP.rotationDegrees(90.0F))
-                    }
-                    poseStack.translate(0.025f * if (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND) 1 else -1 , 0.0f, 0.0f)
-                }
-                ItemDisplayContext.HEAD -> {
-                    if (state is NPCClientDelegate) {
-                        if (item.`is`(WEARABLE_FACE_ITEMS)) poseStack.setOriginAndScale(0f,-2f,7.25f, 0.62f)
-                        else if (item.`is`(WEARABLE_HAT_ITEMS)) poseStack.setOriginAndScale(0f,-10.25f,0f, 0.62f)
-                    }
-                    else {
-                        if (item.`is`(WEARABLE_FACE_ITEMS)) poseStack.setOriginAndScale(0f,1f,(7.25f)-.5f, 0.62f)
-                        else if (item.`is`(WEARABLE_HAT_ITEMS)) poseStack.setOriginAndScale(0f,(-7.25f)+.5f,0f, 0.62f)
-                    }
-                }
-                else -> {}
+            if (locators.containsKey(locatorName)) {
+                displayContext = model.getLocatorDisplayContext(locatorName)?: ItemDisplayContext.FIXED
+                poseStack.mulPose(locators[locatorName]!!.matrix)
+                applyContextTransformation(poseStack, rotation)
             }
-
-            //Render front lighting for UI Models
-            if (frontLight) {
-                RenderSystem.setShaderLights(Vector3f(0F,0F,1F), Vector3f(0F,0F,1F))
-            }
-
-            itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, seed)
-
+            itemRenderer.renderStatic(entity, item, displayContext, (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND), poseStack, buffer, null, light, OverlayTexture.NO_OVERLAY, 0)
             poseStack.popPose()
         }
     }
+
+    fun renderOnModel(
+        model: PosableModel,
+        item: ItemStack,
+        state: PosableState,
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        rotation: Vec3 = Vec3(0.0,0.0,0.0),
+        light: Int = LightTexture.pack(11, 7),
+    ) {
+        val locators: Map<String, MatrixWrapper> = state.locatorStates
+        if (state.itemRenderingLocations.isNotEmpty()) {
+            renderAnimationItem(model, state, locators, poseStack, buffer, light, null, rotation)
+        }
+        else if (!item.`is`(CobblemonItemTags.HIDDEN_ITEMS)) {
+            render(null, model, item, locators, poseStack, buffer, light, 0, rotation)
+        }
+    }
+
+    fun renderOnEntity(
+        entity: LivingEntity,
+        item: ItemStack,
+        model: PosableModel,
+        state: PosableState,
+        poseStack: PoseStack,
+        buffer: MultiBufferSource,
+        light: Int,
+        rotation: Vec3 = Vec3(0.0,0.0,0.0)
+    ) {
+        val locators: Map<String, MatrixWrapper> = state.locatorStates
+        if (state.itemRenderingLocations.isNotEmpty()) {
+            renderAnimationItem(model, state, locators, poseStack, buffer, light, entity, rotation)
+        }
+        else {
+            render(entity, model, item, locators, poseStack, buffer, light, 0, rotation)
+        }
+    }
+
+    private fun applyContextTransformation(poseStack: PoseStack, rotation: Vec3) {
+        when (displayContext) {
+            ItemDisplayContext.FIXED -> {
+                poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
+                poseStack.scale(.5f, .5f, .5f )
+                poseStack.translate(0f, 0.01666f, 0f)
+            }
+            ItemDisplayContext.THIRD_PERSON_RIGHT_HAND, ItemDisplayContext.THIRD_PERSON_LEFT_HAND -> {
+                poseStack.mulPose(Axis.XP.rotationDegrees((rotation.x).toFloat()))
+                poseStack.mulPose(Axis.YP.rotationDegrees((rotation.y).toFloat()))
+                poseStack.mulPose(Axis.ZP.rotationDegrees((rotation.z).toFloat()))
+                poseStack.translate(0.025f * if (displayContext==ItemDisplayContext.THIRD_PERSON_LEFT_HAND) 1 else -1 , 0.0f, 0.0f)
+            }
+            ItemDisplayContext.HEAD -> {
+                poseStack.mulPose(Axis.XP.rotationDegrees(90.0f))
+                poseStack.scale(.6f, .6f, .6f)
+                poseStack.translate(0f, -0.6f, 0f)
+            }
+            else -> {}
+        }
+    }
 }

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

@@ -37,6 +37,7 @@ import net.minecraft.nbt.Tag
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.phys.Vec3
 
 class PokemonOnShoulderRenderer<T : Player>(renderLayerParent: RenderLayerParent<T, PlayerModel<T>>) : RenderLayer<T, PlayerModel<T>>(renderLayerParent) {
 
@@ -161,12 +162,12 @@ class PokemonOnShoulderRenderer<T : Player>(renderLayerParent: RenderLayerParent
             }
 
             heldItemRenderer.renderOnModel(
-                shoulderData.shownItem,
                 model,
+                shoulderData.shownItem,
                 state,
                 matrixStack,
                 buffer,
-                packedLight
+                Vec3(0.0,-90.0,-90.0)
             )
 
             model.setDefault()

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt

@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.animationFunctions
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
+import com.cobblemon.mod.common.client.Test
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.AnimatedModelTextureSupplier
 import com.cobblemon.mod.common.client.render.ModelLayer
@@ -48,6 +49,7 @@ import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.blaze3d.vertex.VertexFormat
 import com.mojang.math.Axis
+import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderStateShard
@@ -589,6 +591,9 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
         headYaw: Float,
         headPitch: Float
     ) {
+        if (entity is PokemonEntity && entity.passengers.contains(Minecraft.getInstance().player) && Test.locked) {
+            return
+        }
         context.put(RenderContext.ENTITY, entity)
         setupEntityTypeContext(entity)
         state.currentModel = this

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableState.kt

@@ -46,6 +46,7 @@ import net.minecraft.sounds.SoundSource
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.phys.Vec3
+import org.joml.Matrix4f
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue
 
@@ -127,8 +128,9 @@ abstract class PosableState : Schedulable {
     /** This gets called 500 million times so use a mutable value for runtime */
     private val reusableAnimTime = DoubleValue(0.0)
 
-    /** A list of items to be rendered on a PosableModel during an animation */
-    val animationItems = mutableMapOf<String, ItemStack>()
+    val itemRenderingLocations = mutableMapOf<String, ItemStack>()
+//    var itemRenderingLocation = ""
+//    var animationItem : ItemStack? = null
 
     /** All of the MoLang functions that can be applied to something with this state. */
     val functions = QueryStruct(hashMapOf())
@@ -165,13 +167,13 @@ abstract class PosableState : Schedulable {
             val renderLocation = if (params.contains(1)) params.getString(1) else "item"
 
             if (!item.isEmpty && locatorStates.containsKey(renderLocation)) {
-                animationItems.put(renderLocation, item)
+                itemRenderingLocations.put(renderLocation, item)
             } else {
-                if (animationItems.containsKey(renderLocation)) animationItems.remove(renderLocation)
+                if (itemRenderingLocations.containsKey(renderLocation)) itemRenderingLocations.remove(renderLocation)
                 return@addFunction Unit
             }
         }
-        .addFunction("clear_items") { animationItems.clear() }
+        .addFunction("clear_items") { itemRenderingLocations.clear() }
         .addFunction("play_animation") { params ->
             val animationParameter = params.get<MoValue>(0)
             val animation = if (animationParameter is ObjectValue<*>) {

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench
 
+import com.cobblemon.mod.common.client.Test
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.entity.PosableEntity
@@ -17,6 +18,7 @@ import net.minecraft.client.renderer.RenderType
 import com.mojang.blaze3d.vertex.VertexConsumer
 import net.minecraft.client.renderer.entity.LivingEntityRenderer
 import com.mojang.blaze3d.vertex.PoseStack
+import net.minecraft.client.Minecraft
 import net.minecraft.client.model.EntityModel
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.LivingEntity
@@ -92,4 +94,4 @@ abstract class PosableEntityModel<T : Entity>(
             }
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt

@@ -20,6 +20,7 @@ import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.entity.EntityRendererProvider.Context
 import net.minecraft.client.renderer.entity.LivingEntityRenderer
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.phys.Vec3
 import kotlin.math.min
 
 class NPCRenderer(context: Context) : LivingEntityRenderer<NPCEntity, PosableEntityModel<NPCEntity>>(context, PosableNPCModel(), 0.5f) {
@@ -59,17 +60,17 @@ class NPCRenderer(context: Context) : LivingEntityRenderer<NPCEntity, PosableEnt
         model.blue = 1F
         model.resetLayerContext()
 
-        if (entity.deathTime < 1) {
+        if (entity.deathTime < 1){
             //Render Held Item
-            heldItemRenderer.renderOnModel(
+            heldItemRenderer.renderOnEntity(
+                entity,
                 entity.mainHandItem,
                 model,
                 clientDelegate,
                 poseMatrix,
                 buffer,
                 packedLight,
-                false,
-                entity
+                Vec3(-90.0,0.0,0.0)
             )
         }
 

common/src/main/kotlin/com/cobblemon/mod/common/client/render/player/MountedPlayerRenderer.kt

@@ -11,11 +11,13 @@ package com.cobblemon.mod.common.client.render.player
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.cobblemon.mod.common.OrientationControllable
 import com.cobblemon.mod.common.api.riding.Rideable
+import com.cobblemon.mod.common.client.Test
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
+import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.player.AbstractClientPlayer
 import net.minecraft.util.Mth

common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokemon/PokemonRenderer.kt

@@ -159,15 +159,15 @@ class PokemonRenderer(
 //        Minecraft.getInstance().bufferBuilders.entityVertexConsumers.draw()
 
         //Render Held Item
-        heldItemRenderer.renderOnModel(
+        heldItemRenderer.renderOnEntity(
+            entity,
             entity.shownItem,
-            modelNow,
+            model.posableModel,
             clientDelegate,
             poseMatrix,
             buffer,
             packedLight,
-            false,
-            entity
+            Vec3(0.0,-90.0,90.0)
         )
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/item/WearableItem.kt

@@ -1,25 +0,0 @@
-/*
- * 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.item
-
-import com.cobblemon.mod.common.util.cobblemonResource
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.entity.EquipmentSlot
-import net.minecraft.world.item.Equipable
-
-class WearableItem(val name: String): CobblemonItem(Properties()), Equipable {
-    companion object {
-        const val MODEL_PATH = "item/wearable"
-    }
-
-    fun getModel3d(): ResourceLocation = cobblemonResource("${MODEL_PATH}/${this.name}")
-    fun getModel2d(): ResourceLocation = cobblemonResource(this.name)
-
-    override fun getEquipmentSlot(): EquipmentSlot { return EquipmentSlot.HEAD }
-}

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt

@@ -20,7 +20,6 @@ import com.cobblemon.mod.common.util.battleLang
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.network.chat.Component
-import net.minecraft.world.item.Items
 import java.util.function.Function
 
 /**
@@ -131,14 +130,7 @@ object CobblemonHeldItemManager : BaseCobblemonHeldItemManager() {
         }
         // if items aren't consumed, then we don't want to give them to wild pokemon (dupe)
         if (this.giveItemEffect.contains(effectId) && (pokemon.actor is PlayerBattleActor || consumeHeldItems)) {
-            // extra check for item swapping abuse
-            // checks if the pokemon whose item is being taken away (wild pokemon) has its held item tampered with in any way
-            // this assumes its always moves causing the swaps
-            // I still think this is a bit brittle and can cause false positives, but for now this should do the trick I hope
-            var fromBattlePokemon = battle.majorBattleActions[pokemon.uuid]?.battlePokemon(2, battle)
-            if(showdownIdOf(fromBattlePokemon?.originalPokemon?.heldItem?.item ?: Items.AIR) == itemID) {
-                this.give(pokemon, itemID)
-            }
+            this.give(pokemon, itemID)
         }
         // allow players to steal wild held items
         if (this.takeItemEffect.contains(effectId) && (pokemon.actor !is PlayerBattleActor || consumeHeldItems)) {

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/PossibleHeldItemAdapter.kt

@@ -16,7 +16,6 @@ import com.google.gson.JsonObject
 import com.mojang.serialization.JsonOps
 import net.minecraft.core.component.DataComponentMap
 import java.lang.reflect.Type
-import kotlin.jvm.optionals.getOrNull
 
 /**
  * A JSON deserializer for [PossibleHeldItem].
@@ -33,7 +32,9 @@ object PossibleHeldItemAdapter : JsonDeserializer<PossibleHeldItem> {
             )
         } else {
             json as JsonObject
-            val componentMap = JsonOps.INSTANCE.withDecoder(DataComponentMap.CODEC).apply(json.get("nbt")).result().getOrNull()?.first
+            val componentMap = JsonOps.INSTANCE.withDecoder(DataComponentMap.CODEC).apply(json.get("nbt")).getOrThrow {
+                return@getOrThrow IllegalStateException("Cant serialize components for held item")
+            }.first
             val item = json.get("item").asString
             val percentage = json.get("percentage")?.asDouble ?: 100.0
             return PossibleHeldItem(

common/src/main/resources/assets/cobblemon/models/item/wearable/black_glasses.json

@@ -1,36 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/black_glasses",
-		"particle": "cobblemon:item/wearable/black_glasses"
-	},
-	"elements": [
-		{
-			"from": [0, 0, 8],
-			"to": [16, 16, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 8], "texture": "#missing"},
-				"south": {"uv": [0, 8, 8, 16], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 8], "texture": "#missing"},
-				"up": {"uv": [8, 0, 0, 0], "texture": "#missing"},
-				"down": {"uv": [8, 0, 0, 0], "texture": "#missing"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, -1, -7.25]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [0, 0, 8],
-			"color": 0,
-			"children": [0]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/choice_band.json

@@ -1,89 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/choice_band",
-		"particle": "cobblemon:item/wearable/choice_band"
-	},
-	"elements": [
-		{
-			"from": [4, 6.45, 12],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 4, 1], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [4, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [4, 0, 4, 1], "texture": "#0"},
-				"up": {"uv": [4, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [8, 0, 4, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 3.6, 12.75],
-			"to": [11, 8.6, 12.75],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 6.6, 12.75]},
-			"faces": {
-				"north": {"uv": [0, 4, 3, 6.5], "texture": "#0"},
-				"east": {"uv": [0, 4, 0, 6.5], "texture": "#0"},
-				"south": {"uv": [0, 4, 3, 6.5], "texture": "#0"},
-				"west": {"uv": [3, 4, 3, 6.5], "texture": "#0"},
-				"up": {"uv": [3, 4, 0, 4], "texture": "#0"},
-				"down": {"uv": [6, 4, 3, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [12, 8.45, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 1, 0, 2], "texture": "#0"},
-				"east": {"uv": [4, 1, 4, 2], "texture": "#0"},
-				"south": {"uv": [0, 1, 4, 2], "texture": "#0"},
-				"west": {"uv": [0, 1, 0, 2], "texture": "#0"},
-				"up": {"uv": [0, 1, 4, 1], "texture": "#0"},
-				"down": {"uv": [4, 1, 8, 1], "texture": "#0"}
-			}
-		},
-		{
-			"from": [12, 6.45, 4],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 2, 4, 3], "texture": "#0"},
-				"east": {"uv": [4, 2, 0, 3], "texture": "#0"},
-				"south": {"uv": [8, 2, 8, 3], "texture": "#0"},
-				"west": {"uv": [0, 2, 4, 3], "texture": "#0"},
-				"up": {"uv": [4, 2, 4, -2], "texture": "#0"},
-				"down": {"uv": [4, -2, 4, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [4, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 3, 4, 4], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 3], "texture": "#0"},
-				"south": {"uv": [8, 3, 8, 4], "texture": "#0"},
-				"west": {"uv": [4, 4, 0, 3], "texture": "#0"},
-				"up": {"uv": [4, 3, 4, -1], "texture": "#0"},
-				"down": {"uv": [4, -1, 4, 3], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, 4.75, 0],
-			"scale": [1.82, 1.82, 1.82]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/choice_specs.json

@@ -1,36 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/choice_specs",
-		"particle": "cobblemon:item/wearable/choice_specs"
-	},
-	"elements": [
-		{
-			"from": [0, 0, 8],
-			"to": [16, 16, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 8], "texture": "#0"},
-				"south": {"uv": [0, 8, 8, 16], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 8], "texture": "#0"},
-				"up": {"uv": [8, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [8, 0, 0, 0], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, -1, -7.25]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/exp_share.json

@@ -1,310 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/expshare",
-		"particle": "cobblemon:item/wearable/expshare"
-	},
-	"elements": [
-		{
-			"from": [10.75, 9.75, 7.5],
-			"to": [11.75, 10.75, 8.5],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [11.25, 10.25, 8]},
-			"faces": {
-				"north": {"uv": [8, 3, 8.5, 3.5], "texture": "#0"},
-				"east": {"uv": [8, 3.5, 8.5, 4], "texture": "#0"},
-				"south": {"uv": [4, 8, 4.5, 8.5], "texture": "#0"},
-				"west": {"uv": [8, 4, 8.5, 4.5], "texture": "#0"},
-				"up": {"uv": [5, 8.5, 4.5, 8], "texture": "#0"},
-				"down": {"uv": [8.5, 4.5, 8, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 8, 4],
-			"to": [9, 9.9, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 7]},
-			"faces": {
-				"north": {"uv": [3, 7, 4, 8], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [7, 6, 8, 7], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"up": {"uv": [1, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [1, 0, 0, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 8, 12],
-			"to": [9, 9.9, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 8]},
-			"faces": {
-				"north": {"uv": [7, 7, 8, 8], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [2, 7.5, 3, 8.5], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"up": {"uv": [1, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [1, 0, 0, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [12, 6, 4],
-			"to": [12, 8, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"east": {"uv": [4, 1, 8, 2], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [4, 2, 8, 3], "texture": "#0"},
-				"up": {"uv": [0, 4, 0, 0], "texture": "#0"},
-				"down": {"uv": [0, 0, 0, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6, 12],
-			"to": [12, 8, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 7]},
-			"faces": {
-				"north": {"uv": [0, 4, 4, 5], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [4, 0, 8, 1], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"up": {"uv": [4, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [4, 0, 0, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6, 4],
-			"to": [4, 8, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"east": {"uv": [0, 2, 4, 3], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [0, 3, 4, 4], "texture": "#0"},
-				"up": {"uv": [0, 4, 0, 0], "texture": "#0"},
-				"down": {"uv": [0, 0, 0, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6, 4],
-			"to": [12, 8, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 4, 1], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [0, 1, 4, 2], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"up": {"uv": [4, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [4, 0, 0, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 10, 4],
-			"to": [9, 10, 7],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 0], "texture": "#0"},
-				"east": {"uv": [0, 0, 1.5, 0], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 0], "texture": "#0"},
-				"west": {"uv": [0, 0, 1.5, 0], "texture": "#0"},
-				"up": {"uv": [1, 6.5, 0, 5], "texture": "#0"},
-				"down": {"uv": [2, 5, 1, 6.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 9.9, 4],
-			"to": [9, 9.9, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8.9, 12]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 0], "texture": "#0"},
-				"east": {"uv": [0, 0, 1.5, 0], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 0], "texture": "#0"},
-				"west": {"uv": [0, 0, 1.5, 0], "texture": "#0"},
-				"up": {"uv": [2, 8, 1, 6.5], "texture": "#0"},
-				"down": {"uv": [5.5, 6.5, 4.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [12, 8, 7],
-			"to": [12, 10, 9],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"east": {"uv": [7.5, 5, 8.5, 6], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [5.5, 7.5, 6.5, 8.5], "texture": "#0"},
-				"up": {"uv": [0, 1, 0, 0], "texture": "#0"},
-				"down": {"uv": [0, 0, 0, 1], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 10, 7],
-			"to": [12, 10, 9],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 4, 0], "texture": "#0"},
-				"east": {"uv": [0, 0, 1, 0], "texture": "#0"},
-				"south": {"uv": [0, 0, 4, 0], "texture": "#0"},
-				"west": {"uv": [0, 0, 1, 0], "texture": "#0"},
-				"up": {"uv": [8, 4, 4, 3], "texture": "#0"},
-				"down": {"uv": [8, 4, 4, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 8, 7],
-			"to": [4, 10, 9],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 7]},
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"east": {"uv": [0, 8, 1, 9], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [8, 0, 9, 1], "texture": "#0"},
-				"up": {"uv": [0, 1, 0, 0], "texture": "#0"},
-				"down": {"uv": [0, 0, 0, 1], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4.25, 9.75, 7.5],
-			"to": [5.25, 10.75, 8.5],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [4.75, 10.25, 8]},
-			"faces": {
-				"north": {"uv": [4.5, 6, 5, 6.5], "texture": "#0"},
-				"east": {"uv": [5.5, 6.5, 6, 7], "texture": "#0"},
-				"south": {"uv": [4, 7, 4.5, 7.5], "texture": "#0"},
-				"west": {"uv": [5.5, 7, 6, 7.5], "texture": "#0"},
-				"up": {"uv": [4.5, 8, 4, 7.5], "texture": "#0"},
-				"down": {"uv": [7, 7.5, 6.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 7, 1.95],
-			"to": [9, 9, 3.95],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 1.95]},
-			"faces": {
-				"north": {"uv": [9.5, 3, 10.5, 4], "texture": "#0"},
-				"east": {"uv": [4, 9.5, 5, 10.5], "texture": "#0"},
-				"south": {"uv": [9.5, 4, 10.5, 5], "texture": "#0"},
-				"west": {"uv": [5, 9.5, 6, 10.5], "texture": "#0"},
-				"up": {"uv": [10.5, 6, 9.5, 5], "texture": "#0"},
-				"down": {"uv": [10.5, 8, 9.5, 9], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 9.75, 5],
-			"to": [9, 11.75, 7],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9.75, 5]},
-			"faces": {
-				"north": {"uv": [8, 6, 9, 7], "texture": "#0"},
-				"east": {"uv": [6.5, 8, 7.5, 9], "texture": "#0"},
-				"south": {"uv": [8, 7, 9, 8], "texture": "#0"},
-				"west": {"uv": [7.5, 8, 8.5, 9], "texture": "#0"},
-				"up": {"uv": [3, 9.5, 2, 8.5], "texture": "#0"},
-				"down": {"uv": [9.5, 3, 8.5, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.25, 10.5, 7],
-			"to": [5.25, 12.5, 9],
-			"rotation": {"angle": 22.5, "axis": "z", "origin": [4.25, 11.5, 8]},
-			"faces": {
-				"north": {"uv": [4, 8.5, 5, 9.5], "texture": "#0"},
-				"east": {"uv": [8.5, 4, 9.5, 5], "texture": "#0"},
-				"south": {"uv": [5, 8.5, 6, 9.5], "texture": "#0"},
-				"west": {"uv": [8.5, 5, 9.5, 6], "texture": "#0"},
-				"up": {"uv": [9.5, 9, 8.5, 8], "texture": "#0"},
-				"down": {"uv": [1, 9, 0, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [10.75, 10.5, 7],
-			"to": [12.75, 12.5, 9],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [11.75, 11.5, 8]},
-			"faces": {
-				"north": {"uv": [9, 6, 10, 7], "texture": "#0"},
-				"east": {"uv": [7, 9, 8, 10], "texture": "#0"},
-				"south": {"uv": [9, 7, 10, 8], "texture": "#0"},
-				"west": {"uv": [8, 9, 9, 10], "texture": "#0"},
-				"up": {"uv": [10, 10, 9, 9], "texture": "#0"},
-				"down": {"uv": [3, 9.5, 2, 10.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 9.75, 9],
-			"to": [9, 11.75, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 9.75, 9]},
-			"faces": {
-				"north": {"uv": [9, 0, 10, 1], "texture": "#0"},
-				"east": {"uv": [1, 9, 2, 10], "texture": "#0"},
-				"south": {"uv": [9, 1, 10, 2], "texture": "#0"},
-				"west": {"uv": [9, 2, 10, 3], "texture": "#0"},
-				"up": {"uv": [4, 10, 3, 9], "texture": "#0"},
-				"down": {"uv": [7, 9, 6, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 7, 12.025],
-			"to": [9, 9, 14.025],
-			"rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 12.025]},
-			"faces": {
-				"north": {"uv": [0, 10, 1, 11], "texture": "#0"},
-				"east": {"uv": [10, 0, 11, 1], "texture": "#0"},
-				"south": {"uv": [1, 10, 2, 11], "texture": "#0"},
-				"west": {"uv": [10, 1, 11, 2], "texture": "#0"},
-				"up": {"uv": [11, 3, 10, 2], "texture": "#0"},
-				"down": {"uv": [4, 10, 3, 11], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3, 5, 7],
-			"to": [5, 7, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 8]},
-			"faces": {
-				"north": {"uv": [1, 8, 2, 9], "texture": "#0"},
-				"east": {"uv": [2, 5, 3.5, 6], "texture": "#0"},
-				"south": {"uv": [8, 1, 9, 2], "texture": "#0"},
-				"west": {"uv": [3.5, 5, 5, 6], "texture": "#0"},
-				"up": {"uv": [6, 6.5, 5, 5], "texture": "#0"},
-				"down": {"uv": [3, 6, 2, 7.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [11, 5, 7],
-			"to": [13, 7, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 7]},
-			"faces": {
-				"north": {"uv": [8, 2, 9, 3], "texture": "#0"},
-				"east": {"uv": [3, 6, 4.5, 7], "texture": "#0"},
-				"south": {"uv": [3, 8, 4, 9], "texture": "#0"},
-				"west": {"uv": [6, 5, 7.5, 6], "texture": "#0"},
-				"up": {"uv": [7, 7.5, 6, 6], "texture": "#0"},
-				"down": {"uv": [1, 6.5, 0, 8], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, 5.5, 0],
-			"scale": [1.82, 1.82, 1.82]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [
-				{
-					"name": "group",
-					"origin": [4.75, 10.25, 8],
-					"color": 0,
-					"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-				},
-				{
-					"name": "group",
-					"origin": [8, 8, 8],
-					"color": 0,
-					"children": [13, 14, 15, 16, 17, 18, 19, 20]
-				}
-			]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/focus_band.json

@@ -1,89 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/focus_band",
-		"particle": "cobblemon:item/wearable/focus_band"
-	},
-	"elements": [
-		{
-			"from": [4, 6.45, 12],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 4, 1], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [4, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [4, 0, 4, 1], "texture": "#0"},
-				"up": {"uv": [4, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [8, 0, 4, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 3.6, 12.75],
-			"to": [11, 8.6, 12.75],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 6.6, 12.75]},
-			"faces": {
-				"north": {"uv": [0, 4, 3, 6.5], "texture": "#0"},
-				"east": {"uv": [0, 4, 0, 6.5], "texture": "#0"},
-				"south": {"uv": [0, 4, 3, 6.5], "texture": "#0"},
-				"west": {"uv": [3, 4, 3, 6.5], "texture": "#0"},
-				"up": {"uv": [3, 4, 0, 4], "texture": "#0"},
-				"down": {"uv": [6, 4, 3, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [12, 8.45, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 1, 0, 2], "texture": "#0"},
-				"east": {"uv": [4, 1, 4, 2], "texture": "#0"},
-				"south": {"uv": [0, 1, 4, 2], "texture": "#0"},
-				"west": {"uv": [0, 1, 0, 2], "texture": "#0"},
-				"up": {"uv": [0, 1, 4, 1], "texture": "#0"},
-				"down": {"uv": [4, 1, 8, 1], "texture": "#0"}
-			}
-		},
-		{
-			"from": [12, 6.45, 4],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 2, 4, 3], "texture": "#0"},
-				"east": {"uv": [4, 2, 0, 3], "texture": "#0"},
-				"south": {"uv": [8, 2, 8, 3], "texture": "#0"},
-				"west": {"uv": [0, 2, 4, 3], "texture": "#0"},
-				"up": {"uv": [4, 2, 4, -2], "texture": "#0"},
-				"down": {"uv": [4, -2, 4, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [4, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 3, 4, 4], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 3], "texture": "#0"},
-				"south": {"uv": [8, 3, 8, 4], "texture": "#0"},
-				"west": {"uv": [4, 4, 0, 3], "texture": "#0"},
-				"up": {"uv": [4, 3, 4, -1], "texture": "#0"},
-				"down": {"uv": [4, -1, 4, 3], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, 4.75, 0],
-			"scale": [1.82, 1.82, 1.82]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/kings_rock.json

@@ -1,206 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/kings_rock",
-		"particle": "cobblemon:item/wearable/kings_rock"
-	},
-	"elements": [
-		{
-			"from": [4, 7.45, 11],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [3, 0, 7, 0.5], "texture": "#0"},
-				"east": {"uv": [7, 6, 7.5, 6.5], "texture": "#0"},
-				"south": {"uv": [3, 0.5, 7, 1], "texture": "#0"},
-				"west": {"uv": [7, 6.5, 7.5, 7], "texture": "#0"},
-				"up": {"uv": [7, 1.5, 3, 1], "texture": "#0"},
-				"down": {"uv": [7, 1.5, 3, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 7.45, 4],
-			"to": [12, 8.45, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [3, 2, 7, 2.5], "texture": "#0"},
-				"east": {"uv": [7, 7, 7.5, 7.5], "texture": "#0"},
-				"south": {"uv": [3, 2.5, 7, 3], "texture": "#0"},
-				"west": {"uv": [0, 7.5, 0.5, 8], "texture": "#0"},
-				"up": {"uv": [7, 3.5, 3, 3], "texture": "#0"},
-				"down": {"uv": [7, 3.5, 3, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 6.45, 4],
-			"to": [12, 7.45, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [2, 4, 4.5, 4.5], "texture": "#0"},
-				"east": {"uv": [0.5, 8, 1, 8.5], "texture": "#0"},
-				"south": {"uv": [2, 4.5, 4.5, 5], "texture": "#0"},
-				"west": {"uv": [8, 0.5, 8.5, 1], "texture": "#0"},
-				"up": {"uv": [7, 4.5, 4.5, 4], "texture": "#0"},
-				"down": {"uv": [7, 4.5, 4.5, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [6, 7.45, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [7, 3.5, 8, 4], "texture": "#0"},
-				"east": {"uv": [1, 8, 1.5, 8.5], "texture": "#0"},
-				"south": {"uv": [4, 7, 5, 7.5], "texture": "#0"},
-				"west": {"uv": [8, 1, 8.5, 1.5], "texture": "#0"},
-				"up": {"uv": [8, 4.5, 7, 4], "texture": "#0"},
-				"down": {"uv": [8, 4.5, 7, 5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [10, 6.45, 11],
-			"to": [12, 7.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [5, 7, 6, 7.5], "texture": "#0"},
-				"east": {"uv": [2, 8, 2.5, 8.5], "texture": "#0"},
-				"south": {"uv": [7, 5, 8, 5.5], "texture": "#0"},
-				"west": {"uv": [8, 2, 8.5, 2.5], "texture": "#0"},
-				"up": {"uv": [8, 6, 7, 5.5], "texture": "#0"},
-				"down": {"uv": [7, 7, 6, 7.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 11],
-			"to": [9, 7.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [2, 5, 4.5, 5.5], "texture": "#0"},
-				"east": {"uv": [1.5, 8, 2, 8.5], "texture": "#0"},
-				"south": {"uv": [4.5, 5, 7, 5.5], "texture": "#0"},
-				"west": {"uv": [8, 1.5, 8.5, 2], "texture": "#0"},
-				"up": {"uv": [4.5, 6, 2, 5.5], "texture": "#0"},
-				"down": {"uv": [7, 5.5, 4.5, 6], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 8.45, 4],
-			"to": [9, 10.45, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [2, 6, 3, 7], "texture": "#0"},
-				"east": {"uv": [6, 6, 6.5, 7], "texture": "#0"},
-				"south": {"uv": [3, 6, 4, 7], "texture": "#0"},
-				"west": {"uv": [6.5, 6, 7, 7], "texture": "#0"},
-				"up": {"uv": [1, 7.5, 0, 7], "texture": "#0"},
-				"down": {"uv": [8, 0, 7, 0.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [11, 8.45, 8],
-			"to": [12, 9.45, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 2.5, 8, 3], "texture": "#0"},
-				"east": {"uv": [7, 0.5, 8, 1], "texture": "#0"},
-				"south": {"uv": [3, 7.5, 3.5, 8], "texture": "#0"},
-				"west": {"uv": [1, 7, 2, 7.5], "texture": "#0"},
-				"up": {"uv": [7.5, 2, 7, 1], "texture": "#0"},
-				"down": {"uv": [2.5, 7, 2, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [11, 8.45, 5],
-			"to": [12, 9.45, 6],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4.5, 7.5, 5, 8], "texture": "#0"},
-				"east": {"uv": [5, 7.5, 5.5, 8], "texture": "#0"},
-				"south": {"uv": [5.5, 7.5, 6, 8], "texture": "#0"},
-				"west": {"uv": [6, 7.5, 6.5, 8], "texture": "#0"},
-				"up": {"uv": [8, 6.5, 7.5, 6], "texture": "#0"},
-				"down": {"uv": [7, 7.5, 6.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 8.45, 4],
-			"to": [6, 9.45, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 6.5, 8, 7], "texture": "#0"},
-				"east": {"uv": [7, 7.5, 7.5, 8], "texture": "#0"},
-				"south": {"uv": [7.5, 7, 8, 7.5], "texture": "#0"},
-				"west": {"uv": [7.5, 7.5, 8, 8], "texture": "#0"},
-				"up": {"uv": [0.5, 8.5, 0, 8], "texture": "#0"},
-				"down": {"uv": [8.5, 0, 8, 0.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 8.45, 6],
-			"to": [5, 9.45, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [7.5, 3, 8, 3.5], "texture": "#0"},
-				"east": {"uv": [7, 2, 8, 2.5], "texture": "#0"},
-				"south": {"uv": [4, 7.5, 4.5, 8], "texture": "#0"},
-				"west": {"uv": [2.5, 7, 3.5, 7.5], "texture": "#0"},
-				"up": {"uv": [7.5, 3.5, 7, 2.5], "texture": "#0"},
-				"down": {"uv": [4, 7, 3.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [8, 10.45, 4],
-			"to": [9, 11.45, 5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [0.5, 7.5, 1, 8], "texture": "#0"},
-				"east": {"uv": [1, 7.5, 1.5, 8], "texture": "#0"},
-				"south": {"uv": [7.5, 1, 8, 1.5], "texture": "#0"},
-				"west": {"uv": [1.5, 7.5, 2, 8], "texture": "#0"},
-				"up": {"uv": [8, 2, 7.5, 1.5], "texture": "#0"},
-				"down": {"uv": [3, 7.5, 2.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [11, 6.45, 5],
-			"to": [12, 8.45, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 6, 4.5, 7], "texture": "#0"},
-				"east": {"uv": [0, 0, 3, 1], "texture": "#0"},
-				"south": {"uv": [4.5, 6, 5, 7], "texture": "#0"},
-				"west": {"uv": [0, 1, 3, 2], "texture": "#0"},
-				"up": {"uv": [0.5, 7, 0, 4], "texture": "#0"},
-				"down": {"uv": [1, 4, 0.5, 7], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 5],
-			"to": [5, 8.45, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [5, 6, 5.5, 7], "texture": "#0"},
-				"east": {"uv": [0, 2, 3, 3], "texture": "#0"},
-				"south": {"uv": [5.5, 6, 6, 7], "texture": "#0"},
-				"west": {"uv": [0, 3, 3, 4], "texture": "#0"},
-				"up": {"uv": [1.5, 7, 1, 4], "texture": "#0"},
-				"down": {"uv": [2, 4, 1.5, 7], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, 4.75, 0],
-			"scale": [1.82, 1.82, 1.82]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/muscle_band.json

@@ -1,89 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/muscleband",
-		"particle": "cobblemon:item/wearable/muscleband"
-	},
-	"elements": [
-		{
-			"from": [4, 6.45, 12],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 4, 1], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
-				"south": {"uv": [4, 0, 0, 1], "texture": "#0"},
-				"west": {"uv": [4, 0, 4, 1], "texture": "#0"},
-				"up": {"uv": [4, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [8, 0, 4, 0], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5, 3.6, 12.75],
-			"to": [11, 8.6, 12.75],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 6.6, 12.75]},
-			"faces": {
-				"north": {"uv": [0, 4, 3, 6.5], "texture": "#0"},
-				"east": {"uv": [0, 4, 0, 6.5], "texture": "#0"},
-				"south": {"uv": [0, 4, 3, 6.5], "texture": "#0"},
-				"west": {"uv": [3, 4, 3, 6.5], "texture": "#0"},
-				"up": {"uv": [3, 4, 0, 4], "texture": "#0"},
-				"down": {"uv": [6, 4, 3, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [12, 8.45, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 1, 0, 2], "texture": "#0"},
-				"east": {"uv": [4, 1, 4, 2], "texture": "#0"},
-				"south": {"uv": [0, 1, 4, 2], "texture": "#0"},
-				"west": {"uv": [0, 1, 0, 2], "texture": "#0"},
-				"up": {"uv": [0, 1, 4, 1], "texture": "#0"},
-				"down": {"uv": [4, 1, 8, 1], "texture": "#0"}
-			}
-		},
-		{
-			"from": [12, 6.45, 4],
-			"to": [12, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 2, 4, 3], "texture": "#0"},
-				"east": {"uv": [4, 2, 0, 3], "texture": "#0"},
-				"south": {"uv": [8, 2, 8, 3], "texture": "#0"},
-				"west": {"uv": [0, 2, 4, 3], "texture": "#0"},
-				"up": {"uv": [4, 2, 4, -2], "texture": "#0"},
-				"down": {"uv": [4, -2, 4, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 6.45, 4],
-			"to": [4, 8.45, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6.45, 8]},
-			"faces": {
-				"north": {"uv": [4, 3, 4, 4], "texture": "#0"},
-				"east": {"uv": [0, 4, 4, 3], "texture": "#0"},
-				"south": {"uv": [8, 3, 8, 4], "texture": "#0"},
-				"west": {"uv": [4, 4, 0, 3], "texture": "#0"},
-				"up": {"uv": [4, 3, 4, -1], "texture": "#0"},
-				"down": {"uv": [4, -1, 4, 3], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, 4.75, 0],
-			"scale": [1.82, 1.82, 1.82]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/rocky_helmet.json

@@ -1,102 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/rocky_helmet",
-		"particle": "cobblemon:item/wearable/rocky_helmet"
-	},
-	"elements": [
-		{
-			"from": [4, 6, 4],
-			"to": [12, 10, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]},
-			"faces": {
-				"north": {"uv": [9, 2, 13, 4], "texture": "#0"},
-				"east": {"uv": [9, 0, 13, 2], "texture": "#0"},
-				"south": {"uv": [5, 8, 9, 10], "texture": "#0"},
-				"west": {"uv": [9, 4, 13, 6], "texture": "#0"},
-				"up": {"uv": [9, 4, 5, 0], "texture": "#0"},
-				"down": {"uv": [9, 4, 5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3, 6, 3],
-			"to": [13, 6, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 5, 0], "texture": "#0"},
-				"east": {"uv": [0, 0, 5, 0], "texture": "#0"},
-				"south": {"uv": [0, 0, 5, 0], "texture": "#0"},
-				"west": {"uv": [0, 0, 5, 0], "texture": "#0"},
-				"up": {"uv": [5, 5, 0, 0], "texture": "#0"},
-				"down": {"uv": [5, 5, 0, 10], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.48976, 8.79932, 5],
-			"to": [7.48976, 11.79932, 9],
-			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 6, 8]},
-			"faces": {
-				"north": {"uv": [7, 10, 8, 11.5], "texture": "#0"},
-				"east": {"uv": [1, 10, 3, 11.5], "texture": "#0"},
-				"south": {"uv": [8, 10, 9, 11.5], "texture": "#0"},
-				"west": {"uv": [3, 10, 5, 11.5], "texture": "#0"},
-				"up": {"uv": [6, 12, 5, 10], "texture": "#0"},
-				"down": {"uv": [7, 10, 6, 12], "texture": "#0"}
-			}
-		},
-		{
-			"from": [10.12132, 8.55, 6.58579],
-			"to": [12.12132, 10.55, 8.58579],
-			"rotation": {"angle": -45, "axis": "y", "origin": [8, 6, 8]},
-			"faces": {
-				"north": {"uv": [10, 9, 11, 10], "texture": "#0"},
-				"east": {"uv": [10, 10, 11, 11], "texture": "#0"},
-				"south": {"uv": [10.5, 6, 11.5, 7], "texture": "#0"},
-				"west": {"uv": [10.5, 7, 11.5, 8], "texture": "#0"},
-				"up": {"uv": [11.5, 9, 10.5, 8], "texture": "#0"},
-				"down": {"uv": [10, 10.5, 9, 11.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4.61628, 8.05, 6.92911],
-			"to": [5.61628, 11.05, 9.92911],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 6, 8]},
-			"faces": {
-				"north": {"uv": [9, 9, 9.5, 10.5], "texture": "#0"},
-				"east": {"uv": [9, 6, 10.5, 7.5], "texture": "#0"},
-				"south": {"uv": [9.5, 9, 10, 10.5], "texture": "#0"},
-				"west": {"uv": [9, 7.5, 10.5, 9], "texture": "#0"},
-				"up": {"uv": [0.5, 11.5, 0, 10], "texture": "#0"},
-				"down": {"uv": [1, 10, 0.5, 11.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [5.5, 8.55, 4.5],
-			"to": [6.5, 10.55, 5.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]},
-			"faces": {
-				"north": {"uv": [11, 9, 11.5, 10], "texture": "#0"},
-				"east": {"uv": [10, 11, 10.5, 12], "texture": "#0"},
-				"south": {"uv": [11, 10, 11.5, 11], "texture": "#0"},
-				"west": {"uv": [10.5, 11, 11, 12], "texture": "#0"},
-				"up": {"uv": [11.5, 11.5, 11, 11], "texture": "#0"},
-				"down": {"uv": [0.5, 11.5, 0, 12], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, 5.5, 0],
-			"scale": [1.82, 1.82, 1.82]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4, 5]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/safety_goggles.json

@@ -1,36 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/safety_goggles",
-		"particle": "cobblemon:item/wearable/safety_goggles"
-	},
-	"elements": [
-		{
-			"from": [0, 0, 8],
-			"to": [16, 16, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 8], "texture": "#0"},
-				"south": {"uv": [0, 8, 8, 16], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 8], "texture": "#0"},
-				"up": {"uv": [8, 0, 0, 0], "texture": "#0"},
-				"down": {"uv": [8, 0, 0, 0], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, -1, -7.25]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0]
-		}
-	]
-}

common/src/main/resources/assets/cobblemon/models/item/wearable/wise_glasses.json

@@ -1,36 +0,0 @@
-{
-	"texture_size": [32, 32],
-	"textures": {
-		"0": "cobblemon:item/wearable/wise_glasses",
-		"particle": "cobblemon:item/wearable/wise_glasses"
-	},
-	"elements": [
-		{
-			"from": [0, 0, 8],
-			"to": [16, 16, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 8], "texture": "#missing"},
-				"south": {"uv": [0, 8, 8, 16], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 8], "texture": "#missing"},
-				"up": {"uv": [8, 0, 0, 0], "texture": "#missing"},
-				"down": {"uv": [8, 0, 0, 0], "texture": "#missing"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"head": {
-			"translation": [0, -1, -7.25]
-		}
-	},
-	"groups": [
-		{
-			"name": "group",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0]
-		}
-	]
-}

docs/cobblemon-tags/1.4.1/BiomeTags.md

@@ -5,7 +5,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_arid</summary>
+<summary><b>Tag:</b> #biome:is_arid</summary>
 
 - #cobblemon:is_sandy
 - #cobblemon:is_savanna
@@ -13,7 +13,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_autumn</summary>
+<summary><b>Tag:</b> #biome:is_autumn</summary>
 
 - #cobblemon:is_arid
 - #cobblemon:is_cold_ocean
@@ -33,7 +33,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_badlands</summary>
+<summary><b>Tag:</b> #biome:is_badlands</summary>
 
 - #c:mesa
 - #minecraft:is_badlands
@@ -46,7 +46,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_bamboo</summary>
+<summary><b>Tag:</b> #biome:is_bamboo</summary>
 
 - minecraft:bamboo_jungle
 - wythers:bamboo_jungle_canyon
@@ -61,7 +61,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_beach</summary>
+<summary><b>Tag:</b> #biome:is_beach</summary>
 
 - #minecraft:is_beach
 - wythers:guelta
@@ -70,7 +70,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cave</summary>
+<summary><b>Tag:</b> #biome:is_cave</summary>
 
 - #c:caves
 - #c:underground
@@ -103,7 +103,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_coast</summary>
+<summary><b>Tag:</b> #biome:is_coast</summary>
 
 - #c:stony_shores
 - #cobblemon:is_beach
@@ -128,7 +128,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cold</summary>
+<summary><b>Tag:</b> #biome:is_cold</summary>
 
 - #byg:is_cold
 - #c:climate_cold
@@ -143,7 +143,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cold_ocean</summary>
+<summary><b>Tag:</b> #biome:is_cold_ocean</summary>
 
 - #cobblemon:is_frozen_ocean
 - minecraft:cold_ocean
@@ -152,7 +152,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_deep_dark</summary>
+<summary><b>Tag:</b> #biome:is_deep_dark</summary>
 
 - minecraft:deep_dark
 - terralith:cave/crystal_caves
@@ -166,7 +166,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_deep_ocean</summary>
+<summary><b>Tag:</b> #biome:is_deep_ocean</summary>
 
 - #c:deep_ocean
 - #minecraft:is_deep_ocean
@@ -175,7 +175,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_dense</summary>
+<summary><b>Tag:</b> #biome:is_dense</summary>
 
 - #c:vegetation_dense
 - #cobblemon:is_jungle
@@ -187,7 +187,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_desert</summary>
+<summary><b>Tag:</b> #biome:is_desert</summary>
 
 - #byg:is_desert
 - #c:desert
@@ -211,7 +211,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_dripstone</summary>
+<summary><b>Tag:</b> #biome:is_dripstone</summary>
 
 - minecraft:dripstone_caves
 - terralith:fractured_savanna
@@ -225,7 +225,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_floral</summary>
+<summary><b>Tag:</b> #biome:is_floral</summary>
 
 - #byg:is_floral
 - #c:floral
@@ -257,7 +257,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_forest</summary>
+<summary><b>Tag:</b> #biome:is_forest</summary>
 
 - #c:flower_forests
 - #c:tree_deciduous
@@ -284,7 +284,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_freezing</summary>
+<summary><b>Tag:</b> #biome:is_freezing</summary>
 
 - #byg:is_snowy
 - #c:snowy
@@ -312,7 +312,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_freshwater</summary>
+<summary><b>Tag:</b> #biome:is_freshwater</summary>
 
 - #cobblemon:is_river
 - #cobblemon:is_swamp
@@ -323,7 +323,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_frozen_ocean</summary>
+<summary><b>Tag:</b> #biome:is_frozen_ocean</summary>
 
 - minecraft:deep_frozen_ocean
 - minecraft:frozen_ocean
@@ -334,7 +334,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_glacial</summary>
+<summary><b>Tag:</b> #biome:is_glacial</summary>
 
 - #byg:is_icy
 - #c:icy
@@ -351,7 +351,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_grassland</summary>
+<summary><b>Tag:</b> #biome:is_grassland</summary>
 
 - #cobblemon:is_plains
 - #cobblemon:is_savanna
@@ -359,7 +359,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_highlands</summary>
+<summary><b>Tag:</b> #biome:is_highlands</summary>
 
 - minecraft:meadow
 - terralith:alpine_highlands
@@ -378,7 +378,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_hills</summary>
+<summary><b>Tag:</b> #biome:is_hills</summary>
 
 - #c:mountain_slope
 - #cobblemon:is_highlands
@@ -405,7 +405,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_island</summary>
+<summary><b>Tag:</b> #biome:is_island</summary>
 
 - #cobblemon:is_tropical_island
 - byg:lush_stacks
@@ -428,7 +428,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_jungle</summary>
+<summary><b>Tag:</b> #biome:is_jungle</summary>
 
 - #minecraft:is_jungle
 - terralith:cave/underground_jungle
@@ -449,7 +449,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_lukewarm_ocean</summary>
+<summary><b>Tag:</b> #biome:is_lukewarm_ocean</summary>
 
 - minecraft:deep_lukewarm_ocean
 - minecraft:lukewarm_ocean
@@ -460,7 +460,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_lush</summary>
+<summary><b>Tag:</b> #biome:is_lush</summary>
 
 - #forge:is_lush
 - byg:lush_stacks
@@ -475,7 +475,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_magical</summary>
+<summary><b>Tag:</b> #biome:is_magical</summary>
 
 - #byg:is_magical
 - #wythers:is_dark_forest
@@ -493,7 +493,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_mountain</summary>
+<summary><b>Tag:</b> #biome:is_mountain</summary>
 
 - #cobblemon:is_hills
 - #forge:is_mountain
@@ -510,7 +510,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_mushroom</summary>
+<summary><b>Tag:</b> #biome:is_mushroom</summary>
 
 - #c:mushroom
 - #forge:is_mushroom
@@ -524,7 +524,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_basalt</summary>
+<summary><b>Tag:</b> #biome:is_nether_basalt</summary>
 
 - cinderscapes:blackstone_shales
 - incendium:ash_barrens
@@ -535,7 +535,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_crimson</summary>
+<summary><b>Tag:</b> #biome:is_nether_crimson</summary>
 
 - betternether:crimson_glowing_woods
 - betternether:crimson_pinewood
@@ -548,7 +548,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_desert</summary>
+<summary><b>Tag:</b> #biome:is_nether_desert</summary>
 
 - betternether:gravel_desert
 - byg:quartz_desert
@@ -560,7 +560,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_forest</summary>
+<summary><b>Tag:</b> #biome:is_nether_forest</summary>
 
 - betternether:nether_jungle
 - betternether:nether_swampland
@@ -571,14 +571,14 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_frozen</summary>
+<summary><b>Tag:</b> #biome:is_nether_frozen</summary>
 
 - byg:subzero_hypogeal
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_fungus</summary>
+<summary><b>Tag:</b> #biome:is_nether_fungus</summary>
 
 - betternether:crimson_glowing_woods
 - betternether:crimson_pinewood
@@ -600,7 +600,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_mountain</summary>
+<summary><b>Tag:</b> #biome:is_nether_mountain</summary>
 
 - incendium:volcanic_deltas
 - minecraft:basalt_deltas
@@ -608,7 +608,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_overgrowth</summary>
+<summary><b>Tag:</b> #biome:is_nether_overgrowth</summary>
 
 - betternether:bone_reef
 - betternether:nether_grasslands
@@ -619,7 +619,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_quartz</summary>
+<summary><b>Tag:</b> #biome:is_nether_quartz</summary>
 
 - byg:quartz_desert
 - cinderscapes:quartz_cavern
@@ -628,7 +628,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_soul_fire</summary>
+<summary><b>Tag:</b> #biome:is_nether_soul_fire</summary>
 
 - byg:subzero_hypogeal
 - byg:warped_desert
@@ -639,7 +639,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_soul_sand</summary>
+<summary><b>Tag:</b> #biome:is_nether_soul_sand</summary>
 
 - betternether:soul_plain
 - betternether:wart_forest
@@ -655,7 +655,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_toxic</summary>
+<summary><b>Tag:</b> #biome:is_nether_toxic</summary>
 
 - byg:brimstone_caverns
 - byg:wailing_garth
@@ -664,7 +664,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_warped</summary>
+<summary><b>Tag:</b> #biome:is_nether_warped</summary>
 
 - betternether:nether_jungle
 - betternether:old_warped_woods
@@ -675,7 +675,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_nether_wasteland</summary>
+<summary><b>Tag:</b> #biome:is_nether_wasteland</summary>
 
 - betternether:magma_land
 - betternether:poor_nether_grasslands
@@ -690,7 +690,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_ocean</summary>
+<summary><b>Tag:</b> #biome:is_ocean</summary>
 
 - #cobblemon:is_coast
 - #cobblemon:is_cold_ocean
@@ -703,7 +703,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_overworld</summary>
+<summary><b>Tag:</b> #biome:is_overworld</summary>
 
 - #cobblemon:is_arid
 - #cobblemon:is_cave
@@ -731,7 +731,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_peak</summary>
+<summary><b>Tag:</b> #biome:is_peak</summary>
 
 - #c:mountain_peak
 - #forge:is_peak
@@ -749,7 +749,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_plains</summary>
+<summary><b>Tag:</b> #biome:is_plains</summary>
 
 - #byg:is_plain
 - #c:plains
@@ -771,7 +771,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_plateau</summary>
+<summary><b>Tag:</b> #biome:is_plateau</summary>
 
 - #byg:is_plateau
 - #forge:is_plateau
@@ -781,7 +781,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_river</summary>
+<summary><b>Tag:</b> #biome:is_river</summary>
 
 - #minecraft:is_river
 - terralith:warm_river
@@ -791,7 +791,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_salt</summary>
+<summary><b>Tag:</b> #biome:is_salt</summary>
 
 - wythers:calcite_caverns
 - wythers:calcite_coast
@@ -804,7 +804,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_sandy</summary>
+<summary><b>Tag:</b> #biome:is_sandy</summary>
 
 - #byg:is_sandy
 - #cobblemon:is_badlands
@@ -813,7 +813,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_savanna</summary>
+<summary><b>Tag:</b> #biome:is_savanna</summary>
 
 - #minecraft:is_savanna
 - terralith:arid_highlands
@@ -833,7 +833,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_sky</summary>
+<summary><b>Tag:</b> #biome:is_sky</summary>
 
 - terralith:skylands_autumn
 - terralith:skylands_spring
@@ -843,7 +843,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_snowy_forest</summary>
+<summary><b>Tag:</b> #biome:is_snowy_forest</summary>
 
 - minecraft:grove
 - minecraft:snowy_taiga
@@ -864,7 +864,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_sparse</summary>
+<summary><b>Tag:</b> #biome:is_sparse</summary>
 
 - #c:vegetation_sparse
 - #cobblemon:is_arid
@@ -876,7 +876,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_spooky</summary>
+<summary><b>Tag:</b> #biome:is_spooky</summary>
 
 - #byg:is_spooky
 - #forge:is_spooky
@@ -890,7 +890,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_spring</summary>
+<summary><b>Tag:</b> #biome:is_spring</summary>
 
 - #cobblemon:is_floral
 - #cobblemon:is_lukewarm_ocean
@@ -904,7 +904,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_summer</summary>
+<summary><b>Tag:</b> #biome:is_summer</summary>
 
 - #cobblemon:is_forest
 - #cobblemon:is_jungle
@@ -916,7 +916,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_swamp</summary>
+<summary><b>Tag:</b> #biome:is_swamp</summary>
 
 - #byg:is_swamp
 - #c:swamp
@@ -931,7 +931,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_taiga</summary>
+<summary><b>Tag:</b> #biome:is_taiga</summary>
 
 - #c:tree_coniferous
 - #forge:is_coniferous
@@ -973,7 +973,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_temperate</summary>
+<summary><b>Tag:</b> #biome:is_temperate</summary>
 
 - #cobblemon:is_forest
 - #cobblemon:is_plains
@@ -981,7 +981,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_thermal</summary>
+<summary><b>Tag:</b> #biome:is_thermal</summary>
 
 - terralith:caldera
 - terralith:cave/thermal_caves
@@ -997,7 +997,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_tropical</summary>
+<summary><b>Tag:</b> #biome:is_tropical</summary>
 
 - wythers:tropical_beach
 - wythers:tropical_island
@@ -1006,7 +1006,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_tropical_island</summary>
+<summary><b>Tag:</b> #biome:is_tropical_island</summary>
 
 - wythers:tropical_beach
 - wythers:tropical_island
@@ -1015,7 +1015,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_tundra</summary>
+<summary><b>Tag:</b> #biome:is_tundra</summary>
 
 - #c:snowy_plains
 - byg:cardinal_tundra
@@ -1036,7 +1036,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_volcanic</summary>
+<summary><b>Tag:</b> #biome:is_volcanic</summary>
 
 - terralith:cave/mantle_caves
 - terralith:volcanic_crater
@@ -1050,7 +1050,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_warm_ocean</summary>
+<summary><b>Tag:</b> #biome:is_warm_ocean</summary>
 
 - byg:lush_stacks
 - minecraft:warm_ocean
@@ -1058,7 +1058,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_winter</summary>
+<summary><b>Tag:</b> #biome:is_winter</summary>
 
 - #cobblemon:is_freezing
 - terralith:skylands_winter

docs/cobblemon-tags/1.4.1/BlocksTags.md

@@ -5,7 +5,7 @@ This file contains tags related to block in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:all_hanging_signs</summary>
 
 - #cobblemon:ceiling_hanging_signs
 - #cobblemon:wall_hanging_signs
@@ -13,7 +13,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_signs</summary>
+<summary><b>Tag:</b> #blocks:all_signs</summary>
 
 - #cobblemon:all_hanging_signs
 - #cobblemon:signs
@@ -21,7 +21,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorns</summary>
+<summary><b>Tag:</b> #blocks:apricorns</summary>
 
 - cobblemon:black_apricorn
 - cobblemon:blue_apricorn
@@ -34,14 +34,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_leaves</summary>
+<summary><b>Tag:</b> #blocks:apricorn_leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_logs</summary>
+<summary><b>Tag:</b> #blocks:apricorn_logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -51,7 +51,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_saplings</summary>
+<summary><b>Tag:</b> #blocks:apricorn_saplings</summary>
 
 - cobblemon:black_apricorn_sapling
 - cobblemon:blue_apricorn_sapling
@@ -64,7 +64,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berries</summary>
+<summary><b>Tag:</b> #blocks:berries</summary>
 
 - cobblemon:aguav_berry
 - cobblemon:apicot_berry
@@ -139,7 +139,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_replaceable</summary>
+<summary><b>Tag:</b> #blocks:berry_replaceable</summary>
 
 - #minecraft:leaves
 - minecraft:air
@@ -161,7 +161,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_soil</summary>
+<summary><b>Tag:</b> #blocks:berry_soil</summary>
 
 - #c:farmlands
 - #forge:farmlands
@@ -170,7 +170,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_wild_soil</summary>
+<summary><b>Tag:</b> #blocks:berry_wild_soil</summary>
 
 - #cobblemon:snow_block
 - #minecraft:dirt
@@ -179,14 +179,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ceiling_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:ceiling_hanging_signs</summary>
 
 - cobblemon:apricorn_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:crops</summary>
+<summary><b>Tag:</b> #blocks:crops</summary>
 
 - #cobblemon:mints
 - cobblemon:medicinal_leek
@@ -196,7 +196,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dripstone_growable</summary>
+<summary><b>Tag:</b> #blocks:dripstone_growable</summary>
 
 - cobblemon:dripstone_moon_stone_ore
 - dripstone_block
@@ -204,21 +204,21 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dripstone_replaceables</summary>
+<summary><b>Tag:</b> #blocks:dripstone_replaceables</summary>
 
 - dripstone_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #blocks:flowers</summary>
 
 - #cobblemon:small_flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:medicinal_leek_plantable</summary>
+<summary><b>Tag:</b> #blocks:medicinal_leek_plantable</summary>
 
 - #minecraft:slabs
 - minecraft:water
@@ -226,7 +226,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mints</summary>
+<summary><b>Tag:</b> #blocks:mints</summary>
 
 - cobblemon:blue_mint
 - cobblemon:cyan_mint
@@ -238,7 +238,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:roots</summary>
+<summary><b>Tag:</b> #blocks:roots</summary>
 
 - cobblemon:big_root
 - cobblemon:energy_root
@@ -246,7 +246,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:roots_spreadable</summary>
+<summary><b>Tag:</b> #blocks:roots_spreadable</summary>
 
 - #c:cobblestone
 - #c:dirt
@@ -273,7 +273,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sees_sky</summary>
+<summary><b>Tag:</b> #blocks:sees_sky</summary>
 
 - #minecraft:climbable
 - #minecraft:fences
@@ -284,7 +284,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #blocks:signs</summary>
 
 - #cobblemon:standing_signs
 - #cobblemon:wall_signs
@@ -292,56 +292,56 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:small_flowers</summary>
+<summary><b>Tag:</b> #blocks:small_flowers</summary>
 
 - cobblemon:pep_up_flower
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:snow_block</summary>
+<summary><b>Tag:</b> #blocks:snow_block</summary>
 
 - minecraft:snow_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:standing_signs</summary>
+<summary><b>Tag:</b> #blocks:standing_signs</summary>
 
 - cobblemon:apricorn_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_hanging_signs</summary>
 
 - cobblemon:apricorn_wall_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_signs</summary>
 
 - cobblemon:apricorn_wall_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:all_hanging_signs</summary>
 
 - #cobblemon:all_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_signs</summary>
+<summary><b>Tag:</b> #blocks:all_signs</summary>
 
 - #cobblemon:all_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:bee_growables</summary>
+<summary><b>Tag:</b> #blocks:bee_growables</summary>
 
 - #cobblemon:apricorns
 - #cobblemon:crops
@@ -349,56 +349,56 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ceiling_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:ceiling_hanging_signs</summary>
 
 - #cobblemon:ceiling_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:drip_stone_replaceables</summary>
+<summary><b>Tag:</b> #blocks:drip_stone_replaceables</summary>
 
 - dripstone_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fences</summary>
+<summary><b>Tag:</b> #blocks:fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fence_gates</summary>
+<summary><b>Tag:</b> #blocks:fence_gates</summary>
 
 - cobblemon:apricorn_fence_gate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #blocks:flowers</summary>
 
 - #cobblemon:flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hoes</summary>
+<summary><b>Tag:</b> #blocks:hoes</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaves</summary>
+<summary><b>Tag:</b> #blocks:leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs</summary>
+<summary><b>Tag:</b> #blocks:logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -408,7 +408,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs_that_burn</summary>
+<summary><b>Tag:</b> #blocks:logs_that_burn</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -418,7 +418,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:maintains_farmland</summary>
+<summary><b>Tag:</b> #blocks:maintains_farmland</summary>
 
 - #cobblemon:berries
 - #cobblemon:crops
@@ -426,7 +426,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:needs_iron_tool</summary>
+<summary><b>Tag:</b> #blocks:needs_iron_tool</summary>
 
 - cobblemon:deepslate_dawn_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
@@ -442,7 +442,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:needs_stone_tool</summary>
+<summary><b>Tag:</b> #blocks:needs_stone_tool</summary>
 
 - cobblemon:dawn_stone_ore
 - cobblemon:dripstone_moon_stone_ore
@@ -459,14 +459,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:planks</summary>
+<summary><b>Tag:</b> #blocks:planks</summary>
 
 - cobblemon:apricorn_planks
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:saplings</summary>
+<summary><b>Tag:</b> #blocks:saplings</summary>
 
 - cobblemon:black_apricorn_sapling
 - cobblemon:blue_apricorn_sapling
@@ -479,84 +479,84 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #blocks:signs</summary>
 
 - #cobblemon:signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:small_flowers</summary>
+<summary><b>Tag:</b> #blocks:small_flowers</summary>
 
 - #cobblemon:small_flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:standing_signs</summary>
+<summary><b>Tag:</b> #blocks:standing_signs</summary>
 
 - #cobblemon:standing_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_hanging_signs</summary>
 
 - #cobblemon:wall_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_signs</summary>
 
 - #cobblemon:wall_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_buttons</summary>
+<summary><b>Tag:</b> #blocks:wooden_buttons</summary>
 
 - cobblemon:apricorn_button
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_doors</summary>
+<summary><b>Tag:</b> #blocks:wooden_doors</summary>
 
 - cobblemon:apricorn_door
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_fences</summary>
+<summary><b>Tag:</b> #blocks:wooden_fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_pressure_plates</summary>
+<summary><b>Tag:</b> #blocks:wooden_pressure_plates</summary>
 
 - cobblemon:apricorn_pressure_plate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_slabs</summary>
+<summary><b>Tag:</b> #blocks:wooden_slabs</summary>
 
 - cobblemon:apricorn_slab
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_stairs</summary>
+<summary><b>Tag:</b> #blocks:wooden_stairs</summary>
 
 - cobblemon:apricorn_stairs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_trapdoors</summary>
+<summary><b>Tag:</b> #blocks:wooden_trapdoors</summary>
 
 - cobblemon:apricorn_trapdoor
 

docs/cobblemon-tags/1.4.1/EntityTypesTags.md

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

docs/cobblemon-tags/1.4.1/ItemTags.md

@@ -5,7 +5,7 @@ This file contains tags related to items in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorns</summary>
+<summary><b>Tag:</b> #items:apricorns</summary>
 
 - cobblemon:black_apricorn
 - cobblemon:blue_apricorn
@@ -18,7 +18,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_logs</summary>
+<summary><b>Tag:</b> #items:apricorn_logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -28,7 +28,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_sprouts</summary>
+<summary><b>Tag:</b> #items:apricorn_sprouts</summary>
 
 - cobblemon:black_apricorn_seed
 - cobblemon:blue_apricorn_seed
@@ -41,7 +41,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:azalea_tree</summary>
+<summary><b>Tag:</b> #items:azalea_tree</summary>
 
 - minecraft:azalea
 - minecraft:flowering_azalea
@@ -49,7 +49,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berries</summary>
+<summary><b>Tag:</b> #items:berries</summary>
 
 - cobblemon:aguav_berry
 - cobblemon:apicot_berry
@@ -124,7 +124,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:boats</summary>
+<summary><b>Tag:</b> #items:boats</summary>
 
 - cobblemon:apricorn_boat
 - cobblemon:apricorn_chest_boat
@@ -132,7 +132,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:cobblemon_seeds</summary>
+<summary><b>Tag:</b> #items:cobblemon_seeds</summary>
 
 - cobblemon:blue_mint_seeds
 - cobblemon:cyan_mint_seeds
@@ -145,7 +145,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:evolution_items</summary>
+<summary><b>Tag:</b> #items:evolution_items</summary>
 
 - #cobblemon:evolution_stones
 - cobblemon:berry_sweet
@@ -183,7 +183,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:evolution_stones</summary>
+<summary><b>Tag:</b> #items:evolution_stones</summary>
 
 - cobblemon:dawn_stone
 - cobblemon:dusk_stone
@@ -199,7 +199,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:experience_candies</summary>
+<summary><b>Tag:</b> #items:experience_candies</summary>
 
 - cobblemon:exp_candy_l
 - cobblemon:exp_candy_m
@@ -211,14 +211,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hanging_signs</summary>
+<summary><b>Tag:</b> #items:hanging_signs</summary>
 
 - cobblemon:apricorn_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:herbs</summary>
+<summary><b>Tag:</b> #items:herbs</summary>
 
 - cobblemon:mental_herb
 - cobblemon:mirror_herb
@@ -229,7 +229,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mints</summary>
+<summary><b>Tag:</b> #items:mints</summary>
 
 - cobblemon:adamant_mint
 - cobblemon:bold_mint
@@ -256,7 +256,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mint_leaf</summary>
+<summary><b>Tag:</b> #items:mint_leaf</summary>
 
 - cobblemon:blue_mint_leaf
 - cobblemon:cyan_mint_leaf
@@ -268,7 +268,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mutated_berries</summary>
+<summary><b>Tag:</b> #items:mutated_berries</summary>
 
 - cobblemon:aguav_berry
 - cobblemon:apicot_berry
@@ -313,7 +313,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:plants</summary>
+<summary><b>Tag:</b> #items:plants</summary>
 
 - #cobblemon:apricorn_sprouts
 - #cobblemon:apricorns
@@ -330,7 +330,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:poke_balls</summary>
+<summary><b>Tag:</b> #items:poke_balls</summary>
 
 - cobblemon:azure_ball
 - cobblemon:beast_ball
@@ -368,7 +368,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:protein_ingredients</summary>
+<summary><b>Tag:</b> #items:protein_ingredients</summary>
 
 - minecraft:beef
 - minecraft:chicken
@@ -379,7 +379,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:seeds</summary>
+<summary><b>Tag:</b> #items:seeds</summary>
 
 - #cobblemon:cobblemon_seeds
 - minecraft:beetroot_seeds
@@ -390,14 +390,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #items:signs</summary>
 
 - cobblemon:apricorn_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:zinc_ingredients</summary>
+<summary><b>Tag:</b> #items:zinc_ingredients</summary>
 
 - minecraft:cod
 - minecraft:salmon
@@ -557,35 +557,35 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fences</summary>
+<summary><b>Tag:</b> #items:fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #items:flowers</summary>
 
 - cobblemon:pep_up_flower
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hanging_signs</summary>
+<summary><b>Tag:</b> #items:hanging_signs</summary>
 
 - #cobblemon:hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaves</summary>
+<summary><b>Tag:</b> #items:leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs</summary>
+<summary><b>Tag:</b> #items:logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -595,7 +595,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs_that_burn</summary>
+<summary><b>Tag:</b> #items:logs_that_burn</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -605,21 +605,21 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:planks</summary>
+<summary><b>Tag:</b> #items:planks</summary>
 
 - cobblemon:apricorn_planks
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #items:signs</summary>
 
 - #cobblemon:signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:villager_plantable_seeds</summary>
+<summary><b>Tag:</b> #items:villager_plantable_seeds</summary>
 
 - cobblemon:blue_mint_seeds
 - cobblemon:cyan_mint_seeds
@@ -633,49 +633,49 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_buttons</summary>
+<summary><b>Tag:</b> #items:wooden_buttons</summary>
 
 - cobblemon:apricorn_button
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_doors</summary>
+<summary><b>Tag:</b> #items:wooden_doors</summary>
 
 - cobblemon:apricorn_door
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_fences</summary>
+<summary><b>Tag:</b> #items:wooden_fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_pressure_plates</summary>
+<summary><b>Tag:</b> #items:wooden_pressure_plates</summary>
 
 - cobblemon:apricorn_pressure_plate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_slabs</summary>
+<summary><b>Tag:</b> #items:wooden_slabs</summary>
 
 - cobblemon:apricorn_slab
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_stairs</summary>
+<summary><b>Tag:</b> #items:wooden_stairs</summary>
 
 - cobblemon:apricorn_stairs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_trapdoors</summary>
+<summary><b>Tag:</b> #items:wooden_trapdoors</summary>
 
 - cobblemon:apricorn_trapdoor
 

docs/cobblemon-tags/1.5.2/BiomeTags.md

@@ -5,7 +5,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_arid</summary>
+<summary><b>Tag:</b> #biome:is_arid</summary>
 
 - #cobblemon:is_sandy
 - #cobblemon:is_savanna
@@ -13,7 +13,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_badlands</summary>
+<summary><b>Tag:</b> #biome:is_badlands</summary>
 
 - #minecraft:is_badlands
 - #c:mesa
@@ -26,7 +26,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_bamboo</summary>
+<summary><b>Tag:</b> #biome:is_bamboo</summary>
 
 - minecraft:bamboo_jungle
 - biomesoplenty:bamboo_grove
@@ -45,7 +45,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_beach</summary>
+<summary><b>Tag:</b> #biome:is_beach</summary>
 
 - #minecraft:is_beach
 - biomesoplenty:dune_beach
@@ -55,7 +55,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cave</summary>
+<summary><b>Tag:</b> #biome:is_cave</summary>
 
 - minecraft:dripstone_caves
 - minecraft:lush_caves
@@ -90,7 +90,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cherry_blossom</summary>
+<summary><b>Tag:</b> #biome:is_cherry_blossom</summary>
 
 - minecraft:cherry_grove
 - biomesoplenty:bamboo_grove
@@ -103,7 +103,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_coast</summary>
+<summary><b>Tag:</b> #biome:is_coast</summary>
 
 - minecraft:stony_shore
 - #cobblemon:is_beach
@@ -128,7 +128,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cold</summary>
+<summary><b>Tag:</b> #biome:is_cold</summary>
 
 - #cobblemon:is_cold_ocean
 - #cobblemon:is_freezing
@@ -153,7 +153,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_cold_ocean</summary>
+<summary><b>Tag:</b> #biome:is_cold_ocean</summary>
 
 - minecraft:cold_ocean
 - minecraft:deep_cold_ocean
@@ -161,7 +161,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_deep_dark</summary>
+<summary><b>Tag:</b> #biome:is_deep_dark</summary>
 
 - minecraft:deep_dark
 - terralith:cave/crystal_caves
@@ -175,7 +175,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_deep_ocean</summary>
+<summary><b>Tag:</b> #biome:is_deep_ocean</summary>
 
 - #minecraft:is_deep_ocean
 - #c:deep_ocean
@@ -184,7 +184,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_desert</summary>
+<summary><b>Tag:</b> #biome:is_desert</summary>
 
 - minecraft:desert
 - #byg:is_desert
@@ -210,7 +210,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_dripstone</summary>
+<summary><b>Tag:</b> #biome:is_dripstone</summary>
 
 - minecraft:dripstone_caves
 - terralith:fractured_savanna
@@ -226,7 +226,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_floral</summary>
+<summary><b>Tag:</b> #biome:is_floral</summary>
 
 - minecraft:cherry_grove
 - minecraft:flower_forest
@@ -268,7 +268,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_forest</summary>
+<summary><b>Tag:</b> #biome:is_forest</summary>
 
 - #minecraft:is_forest
 - minecraft:cherry_grove
@@ -308,7 +308,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_freezing</summary>
+<summary><b>Tag:</b> #biome:is_freezing</summary>
 
 - minecraft:frozen_river
 - minecraft:jagged_peaks
@@ -336,7 +336,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_freshwater</summary>
+<summary><b>Tag:</b> #biome:is_freshwater</summary>
 
 - #cobblemon:is_river
 - #cobblemon:is_swamp
@@ -347,7 +347,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_frozen_ocean</summary>
+<summary><b>Tag:</b> #biome:is_frozen_ocean</summary>
 
 - minecraft:deep_frozen_ocean
 - minecraft:frozen_ocean
@@ -358,7 +358,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_glacial</summary>
+<summary><b>Tag:</b> #biome:is_glacial</summary>
 
 - minecraft:frozen_peaks
 - minecraft:ice_spikes
@@ -375,7 +375,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_grassland</summary>
+<summary><b>Tag:</b> #biome:is_grassland</summary>
 
 - #cobblemon:is_plains
 - #cobblemon:is_savanna
@@ -383,7 +383,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_highlands</summary>
+<summary><b>Tag:</b> #biome:is_highlands</summary>
 
 - minecraft:meadow
 - biomesoplenty:highland
@@ -404,7 +404,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_hills</summary>
+<summary><b>Tag:</b> #biome:is_hills</summary>
 
 - #minecraft:is_hill
 - #cobblemon:is_highlands
@@ -433,7 +433,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_island</summary>
+<summary><b>Tag:</b> #biome:is_island</summary>
 
 - minecraft:mushroom_fields
 - #cobblemon:is_tropical_island
@@ -456,7 +456,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_jungle</summary>
+<summary><b>Tag:</b> #biome:is_jungle</summary>
 
 - #minecraft:is_jungle
 - terralith:cave/underground_jungle
@@ -479,7 +479,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_lukewarm_ocean</summary>
+<summary><b>Tag:</b> #biome:is_lukewarm_ocean</summary>
 
 - minecraft:deep_lukewarm_ocean
 - minecraft:lukewarm_ocean
@@ -490,7 +490,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_lush</summary>
+<summary><b>Tag:</b> #biome:is_lush</summary>
 
 - minecraft:lush_caves
 - #forge:is_lush
@@ -506,7 +506,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_magical</summary>
+<summary><b>Tag:</b> #biome:is_magical</summary>
 
 - minecraft:dark_forest
 - #byg:is_magical
@@ -526,7 +526,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_mountain</summary>
+<summary><b>Tag:</b> #biome:is_mountain</summary>
 
 - #minecraft:is_mountain
 - #cobblemon:is_hills
@@ -544,7 +544,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_mushroom</summary>
+<summary><b>Tag:</b> #biome:is_mushroom</summary>
 
 - minecraft:dark_forest
 - minecraft:mushroom_fields
@@ -569,7 +569,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_ocean</summary>
+<summary><b>Tag:</b> #biome:is_ocean</summary>
 
 - #minecraft:is_ocean
 - #cobblemon:is_coast
@@ -583,7 +583,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_overworld</summary>
+<summary><b>Tag:</b> #biome:is_overworld</summary>
 
 - #cobblemon:is_arid
 - #cobblemon:is_cave
@@ -611,7 +611,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_peak</summary>
+<summary><b>Tag:</b> #biome:is_peak</summary>
 
 - minecraft:frozen_peaks
 - minecraft:jagged_peaks
@@ -629,7 +629,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_plains</summary>
+<summary><b>Tag:</b> #biome:is_plains</summary>
 
 - minecraft:plains
 - minecraft:sunflower_plains
@@ -662,7 +662,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_plateau</summary>
+<summary><b>Tag:</b> #biome:is_plateau</summary>
 
 - minecraft:savanna_plateau
 - #byg:is_plateau
@@ -672,7 +672,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_river</summary>
+<summary><b>Tag:</b> #biome:is_river</summary>
 
 - #minecraft:is_river
 - terralith:warm_river
@@ -682,7 +682,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_sandy</summary>
+<summary><b>Tag:</b> #biome:is_sandy</summary>
 
 - #cobblemon:is_badlands
 - #cobblemon:is_desert
@@ -691,7 +691,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_savanna</summary>
+<summary><b>Tag:</b> #biome:is_savanna</summary>
 
 - #minecraft:is_savanna
 - biomesoplenty:lush_desert
@@ -713,7 +713,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_shrubland</summary>
+<summary><b>Tag:</b> #biome:is_shrubland</summary>
 
 - #cobblemon:is_plains
 - #cobblemon:is_savanna
@@ -751,7 +751,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_sky</summary>
+<summary><b>Tag:</b> #biome:is_sky</summary>
 
 - terralith:skylands_autumn
 - terralith:skylands_spring
@@ -761,7 +761,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_snowy</summary>
+<summary><b>Tag:</b> #biome:is_snowy</summary>
 
 - minecraft:jagged_peaks
 - minecraft:snowy_beach
@@ -787,7 +787,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_snowy_forest</summary>
+<summary><b>Tag:</b> #biome:is_snowy_forest</summary>
 
 - biomesoplenty:auroral_garden
 - biomesoplenty:muskeg
@@ -804,7 +804,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_snowy_taiga</summary>
+<summary><b>Tag:</b> #biome:is_snowy_taiga</summary>
 
 - minecraft:grove
 - minecraft:snowy_taiga
@@ -825,7 +825,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_spooky</summary>
+<summary><b>Tag:</b> #biome:is_spooky</summary>
 
 - minecraft:dark_forest
 - #byg:is_spooky
@@ -840,7 +840,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_swamp</summary>
+<summary><b>Tag:</b> #biome:is_swamp</summary>
 
 - minecraft:mangrove_swamp
 - minecraft:swamp
@@ -860,7 +860,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_taiga</summary>
+<summary><b>Tag:</b> #biome:is_taiga</summary>
 
 - #minecraft:is_taiga
 - #cobblemon:is_snowy_taiga
@@ -906,7 +906,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_temperate</summary>
+<summary><b>Tag:</b> #biome:is_temperate</summary>
 
 - #cobblemon:is_forest
 - #cobblemon:is_plains
@@ -914,7 +914,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_temperate_ocean</summary>
+<summary><b>Tag:</b> #biome:is_temperate_ocean</summary>
 
 - minecraft:ocean
 - minecraft:deep_ocean
@@ -922,7 +922,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_thermal</summary>
+<summary><b>Tag:</b> #biome:is_thermal</summary>
 
 - biomesoplenty:hot_springs
 - terralith:caldera
@@ -939,7 +939,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_tropical_island</summary>
+<summary><b>Tag:</b> #biome:is_tropical_island</summary>
 
 - biomesoplenty:tropics
 - wythers:tropical_beach
@@ -949,7 +949,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_tundra</summary>
+<summary><b>Tag:</b> #biome:is_tundra</summary>
 
 - minecraft:ice_spikes
 - minecraft:snowy_plains
@@ -974,7 +974,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_volcanic</summary>
+<summary><b>Tag:</b> #biome:is_volcanic</summary>
 
 - biomesoplenty:volcanic_plains
 - biomesoplenty:volcano
@@ -991,7 +991,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:is_warm_ocean</summary>
+<summary><b>Tag:</b> #biome:is_warm_ocean</summary>
 
 - minecraft:warm_ocean
 - byg:lush_stacks

docs/cobblemon-tags/1.5.2/BlocksTags.md

@@ -5,7 +5,7 @@ This file contains tags related to blocks in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:all_hanging_signs</summary>
 
 - #cobblemon:ceiling_hanging_signs
 - #cobblemon:wall_hanging_signs
@@ -13,7 +13,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_signs</summary>
+<summary><b>Tag:</b> #blocks:all_signs</summary>
 
 - #cobblemon:signs
 - #cobblemon:all_hanging_signs
@@ -21,7 +21,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorns</summary>
+<summary><b>Tag:</b> #blocks:apricorns</summary>
 
 - cobblemon:black_apricorn
 - cobblemon:blue_apricorn
@@ -34,14 +34,14 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_leaves</summary>
+<summary><b>Tag:</b> #blocks:apricorn_leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_logs</summary>
+<summary><b>Tag:</b> #blocks:apricorn_logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -51,7 +51,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_saplings</summary>
+<summary><b>Tag:</b> #blocks:apricorn_saplings</summary>
 
 - cobblemon:black_apricorn_sapling
 - cobblemon:blue_apricorn_sapling
@@ -64,7 +64,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berries</summary>
+<summary><b>Tag:</b> #blocks:berries</summary>
 
 - cobblemon:cheri_berry
 - cobblemon:chesto_berry
@@ -139,7 +139,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_replaceable</summary>
+<summary><b>Tag:</b> #blocks:berry_replaceable</summary>
 
 - minecraft:air
 - minecraft:grass
@@ -161,7 +161,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_soil</summary>
+<summary><b>Tag:</b> #blocks:berry_soil</summary>
 
 - minecraft:farmland
 - #c:farmlands
@@ -170,7 +170,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_wild_soil</summary>
+<summary><b>Tag:</b> #blocks:berry_wild_soil</summary>
 
 - #minecraft:dirt
 - #minecraft:sand
@@ -180,7 +180,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:black_tumblestones</summary>
+<summary><b>Tag:</b> #blocks:black_tumblestones</summary>
 
 - cobblemon:small_budding_black_tumblestone
 - cobblemon:medium_budding_black_tumblestone
@@ -191,14 +191,14 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ceiling_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:ceiling_hanging_signs</summary>
 
 - cobblemon:apricorn_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:crops</summary>
+<summary><b>Tag:</b> #blocks:crops</summary>
 
 - cobblemon:revival_herb
 - cobblemon:vivichoke_seeds
@@ -208,7 +208,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dawn_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:dawn_stone_ores</summary>
 
 - cobblemon:dawn_stone_ore
 - cobblemon:deepslate_dawn_stone_ore
@@ -216,7 +216,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dripstone_growable</summary>
+<summary><b>Tag:</b> #blocks:dripstone_growable</summary>
 
 - dripstone_block
 - cobblemon:dripstone_moon_stone_ore
@@ -224,14 +224,14 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dripstone_replaceables</summary>
+<summary><b>Tag:</b> #blocks:dripstone_replaceables</summary>
 
 - dripstone_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dusk_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:dusk_stone_ores</summary>
 
 - cobblemon:dusk_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
@@ -239,7 +239,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fire_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:fire_stone_ores</summary>
 
 - cobblemon:fire_stone_ore
 - cobblemon:deepslate_fire_stone_ore
@@ -248,14 +248,14 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #blocks:flowers</summary>
 
 - #cobblemon:small_flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fossil_machine_parts</summary>
+<summary><b>Tag:</b> #blocks:fossil_machine_parts</summary>
 
 - cobblemon:restoration_tank
 - cobblemon:monitor
@@ -264,7 +264,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ice_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:ice_stone_ores</summary>
 
 - cobblemon:ice_stone_ore
 - cobblemon:deepslate_ice_stone_ore
@@ -272,7 +272,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaf_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:leaf_stone_ores</summary>
 
 - cobblemon:leaf_stone_ore
 - cobblemon:deepslate_leaf_stone_ore
@@ -280,7 +280,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:machines</summary>
+<summary><b>Tag:</b> #blocks:machines</summary>
 
 - cobblemon:healing_machine
 - cobblemon:pc
@@ -292,7 +292,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:medicinal_leek_plantable</summary>
+<summary><b>Tag:</b> #blocks:medicinal_leek_plantable</summary>
 
 - minecraft:water
 - #minecraft:slabs
@@ -300,7 +300,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mints</summary>
+<summary><b>Tag:</b> #blocks:mints</summary>
 
 - cobblemon:red_mint
 - cobblemon:blue_mint
@@ -312,7 +312,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:moon_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:moon_stone_ores</summary>
 
 - cobblemon:moon_stone_ore
 - cobblemon:deepslate_moon_stone_ore
@@ -321,7 +321,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:red_tumblestones</summary>
+<summary><b>Tag:</b> #blocks:red_tumblestones</summary>
 
 - cobblemon:small_budding_tumblestone
 - cobblemon:medium_budding_tumblestone
@@ -332,7 +332,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:roots</summary>
+<summary><b>Tag:</b> #blocks:roots</summary>
 
 - cobblemon:big_root
 - cobblemon:energy_root
@@ -340,7 +340,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:roots_spreadable</summary>
+<summary><b>Tag:</b> #blocks:roots_spreadable</summary>
 
 - #minecraft:dirt
 - minecraft:stone
@@ -367,7 +367,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sees_sky</summary>
+<summary><b>Tag:</b> #blocks:sees_sky</summary>
 
 - #minecraft:replaceable
 - #minecraft:leaves
@@ -378,7 +378,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:shiny_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:shiny_stone_ores</summary>
 
 - cobblemon:shiny_stone_ore
 - cobblemon:deepslate_shiny_stone_ore
@@ -386,7 +386,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #blocks:signs</summary>
 
 - #cobblemon:standing_signs
 - #cobblemon:wall_signs
@@ -394,7 +394,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sky_tumblestones</summary>
+<summary><b>Tag:</b> #blocks:sky_tumblestones</summary>
 
 - cobblemon:small_budding_sky_tumblestone
 - cobblemon:medium_budding_sky_tumblestone
@@ -405,28 +405,28 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:small_flowers</summary>
+<summary><b>Tag:</b> #blocks:small_flowers</summary>
 
 - cobblemon:pep_up_flower
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:snow_block</summary>
+<summary><b>Tag:</b> #blocks:snow_block</summary>
 
 - minecraft:snow_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:standing_signs</summary>
+<summary><b>Tag:</b> #blocks:standing_signs</summary>
 
 - cobblemon:apricorn_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sun_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:sun_stone_ores</summary>
 
 - cobblemon:sun_stone_ore
 - cobblemon:deepslate_sun_stone_ore
@@ -435,7 +435,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:thunder_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:thunder_stone_ores</summary>
 
 - cobblemon:thunder_stone_ore
 - cobblemon:deepslate_thunder_stone_ore
@@ -443,7 +443,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tumblestone_heat_source</summary>
+<summary><b>Tag:</b> #blocks:tumblestone_heat_source</summary>
 
 - minecraft:lava
 - minecraft:magma_block
@@ -451,21 +451,21 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_hanging_signs</summary>
 
 - cobblemon:apricorn_wall_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_signs</summary>
 
 - cobblemon:apricorn_wall_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:water_stone_ores</summary>
+<summary><b>Tag:</b> #blocks:water_stone_ores</summary>
 
 - cobblemon:water_stone_ore
 - cobblemon:deepslate_water_stone_ore
@@ -473,21 +473,21 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:all_hanging_signs</summary>
 
 - #cobblemon:all_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_signs</summary>
+<summary><b>Tag:</b> #blocks:all_signs</summary>
 
 - #cobblemon:all_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:bee_growables</summary>
+<summary><b>Tag:</b> #blocks:bee_growables</summary>
 
 - #cobblemon:crops
 - #cobblemon:apricorns
@@ -495,42 +495,42 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ceiling_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:ceiling_hanging_signs</summary>
 
 - #cobblemon:ceiling_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:drip_stone_replaceables</summary>
+<summary><b>Tag:</b> #blocks:drip_stone_replaceables</summary>
 
 - dripstone_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fences</summary>
+<summary><b>Tag:</b> #blocks:fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fence_gates</summary>
+<summary><b>Tag:</b> #blocks:fence_gates</summary>
 
 - cobblemon:apricorn_fence_gate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #blocks:flowers</summary>
 
 - #cobblemon:flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:guarded_by_piglins</summary>
+<summary><b>Tag:</b> #blocks:guarded_by_piglins</summary>
 
 - cobblemon:gilded_chest
 - cobblemon:black_gilded_chest
@@ -545,21 +545,21 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hoes</summary>
+<summary><b>Tag:</b> #blocks:hoes</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaves</summary>
+<summary><b>Tag:</b> #blocks:leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs</summary>
+<summary><b>Tag:</b> #blocks:logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:stripped_apricorn_log
@@ -569,7 +569,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs_that_burn</summary>
+<summary><b>Tag:</b> #blocks:logs_that_burn</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:stripped_apricorn_log
@@ -579,7 +579,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:maintains_farmland</summary>
+<summary><b>Tag:</b> #blocks:maintains_farmland</summary>
 
 - #cobblemon:berries
 - #cobblemon:crops
@@ -587,7 +587,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:needs_iron_tool</summary>
+<summary><b>Tag:</b> #blocks:needs_iron_tool</summary>
 
 - cobblemon:deepslate_dawn_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
@@ -603,7 +603,7 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:needs_stone_tool</summary>
+<summary><b>Tag:</b> #blocks:needs_stone_tool</summary>
 
 - cobblemon:dawn_stone_ore
 - cobblemon:dusk_stone_ore
@@ -620,14 +620,14 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:planks</summary>
+<summary><b>Tag:</b> #blocks:planks</summary>
 
 - cobblemon:apricorn_planks
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:saplings</summary>
+<summary><b>Tag:</b> #blocks:saplings</summary>
 
 - cobblemon:black_apricorn_sapling
 - cobblemon:blue_apricorn_sapling
@@ -640,84 +640,84 @@ This file contains tags related to blocks in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #blocks:signs</summary>
 
 - #cobblemon:signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:small_flowers</summary>
+<summary><b>Tag:</b> #blocks:small_flowers</summary>
 
 - #cobblemon:small_flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:standing_signs</summary>
+<summary><b>Tag:</b> #blocks:standing_signs</summary>
 
 - #cobblemon:standing_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_hanging_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_hanging_signs</summary>
 
 - #cobblemon:wall_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_signs</summary>
+<summary><b>Tag:</b> #blocks:wall_signs</summary>
 
 - #cobblemon:wall_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_buttons</summary>
+<summary><b>Tag:</b> #blocks:wooden_buttons</summary>
 
 - cobblemon:apricorn_button
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_doors</summary>
+<summary><b>Tag:</b> #blocks:wooden_doors</summary>
 
 - cobblemon:apricorn_door
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_fences</summary>
+<summary><b>Tag:</b> #blocks:wooden_fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_pressure_plates</summary>
+<summary><b>Tag:</b> #blocks:wooden_pressure_plates</summary>
 
 - cobblemon:apricorn_pressure_plate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_slabs</summary>
+<summary><b>Tag:</b> #blocks:wooden_slabs</summary>
 
 - cobblemon:apricorn_slab
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_stairs</summary>
+<summary><b>Tag:</b> #blocks:wooden_stairs</summary>
 
 - cobblemon:apricorn_stairs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_trapdoors</summary>
+<summary><b>Tag:</b> #blocks:wooden_trapdoors</summary>
 
 - cobblemon:apricorn_trapdoor
 

docs/cobblemon-tags/1.5.2/EntityTypesTags.md

@@ -5,7 +5,7 @@ This file contains tags related to different types of entities in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:boats</summary>
+<summary><b>Tag:</b> #entity_type:boats</summary>
 
 - cobblemon:boat
 - cobblemon:chest_boat
@@ -13,7 +13,7 @@ This file contains tags related to different types of entities in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:cannot_have_name_tag</summary>
+<summary><b>Tag:</b> #entity_type:cannot_have_name_tag</summary>
 
 - cobblemon:empty_pokeball
 - cobblemon:pokemon

docs/cobblemon-tags/1.5.2/ItemTags.md

@@ -5,7 +5,7 @@ This file contains tags related to items in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ability_changers</summary>
+<summary><b>Tag:</b> #items:ability_changers</summary>
 
 - cobblemon:ability_capsule
 - cobblemon:ability_patch
@@ -13,7 +13,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ancient_poke_balls</summary>
+<summary><b>Tag:</b> #items:ancient_poke_balls</summary>
 
 - cobblemon:ancient_poke_ball
 - cobblemon:ancient_citrine_ball
@@ -35,7 +35,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apples</summary>
+<summary><b>Tag:</b> #items:apples</summary>
 
 - cobblemon:tart_apple
 - cobblemon:sweet_apple
@@ -43,7 +43,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorns</summary>
+<summary><b>Tag:</b> #items:apricorns</summary>
 
 - cobblemon:black_apricorn
 - cobblemon:blue_apricorn
@@ -56,7 +56,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_logs</summary>
+<summary><b>Tag:</b> #items:apricorn_logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -66,7 +66,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_poke_balls</summary>
+<summary><b>Tag:</b> #items:apricorn_poke_balls</summary>
 
 - cobblemon:fast_ball
 - cobblemon:friend_ball
@@ -79,7 +79,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_sprouts</summary>
+<summary><b>Tag:</b> #items:apricorn_sprouts</summary>
 
 - cobblemon:black_apricorn_seed
 - cobblemon:blue_apricorn_seed
@@ -92,7 +92,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:azalea_tree</summary>
+<summary><b>Tag:</b> #items:azalea_tree</summary>
 
 - minecraft:azalea
 - minecraft:flowering_azalea
@@ -100,7 +100,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berries</summary>
+<summary><b>Tag:</b> #items:berries</summary>
 
 - cobblemon:cheri_berry
 - cobblemon:chesto_berry
@@ -175,7 +175,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:black_tumblestones</summary>
+<summary><b>Tag:</b> #items:black_tumblestones</summary>
 
 - cobblemon:small_budding_black_tumblestone
 - cobblemon:medium_budding_black_tumblestone
@@ -187,7 +187,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:boats</summary>
+<summary><b>Tag:</b> #items:boats</summary>
 
 - cobblemon:apricorn_boat
 - cobblemon:apricorn_chest_boat
@@ -195,7 +195,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:cobblemon_seeds</summary>
+<summary><b>Tag:</b> #items:cobblemon_seeds</summary>
 
 - cobblemon:vivichoke_seeds
 - #cobblemon:mint_seeds
@@ -203,7 +203,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:cooked_meat</summary>
+<summary><b>Tag:</b> #items:cooked_meat</summary>
 
 - minecraft:cooked_beef
 - minecraft:cooked_porkchop
@@ -216,7 +216,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dawn_stone_ores</summary>
+<summary><b>Tag:</b> #items:dawn_stone_ores</summary>
 
 - cobblemon:dawn_stone_ore
 - cobblemon:deepslate_dawn_stone_ore
@@ -224,7 +224,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:decorated_pot_sherds</summary>
+<summary><b>Tag:</b> #items:decorated_pot_sherds</summary>
 
 - cobblemon:bygone_sherd
 - cobblemon:capture_sherd
@@ -236,7 +236,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:deep_seas</summary>
+<summary><b>Tag:</b> #items:deep_seas</summary>
 
 - cobblemon:deep_sea_tooth
 - cobblemon:deep_sea_scale
@@ -244,7 +244,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dusk_stone_ores</summary>
+<summary><b>Tag:</b> #items:dusk_stone_ores</summary>
 
 - cobblemon:dusk_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
@@ -252,7 +252,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ethers</summary>
+<summary><b>Tag:</b> #items:ethers</summary>
 
 - cobblemon:ether
 - cobblemon:max_ether
@@ -262,7 +262,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:evolution_items</summary>
+<summary><b>Tag:</b> #items:evolution_items</summary>
 
 - cobblemon:link_cable
 - cobblemon:dragon_scale
@@ -304,7 +304,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:evolution_stones</summary>
+<summary><b>Tag:</b> #items:evolution_stones</summary>
 
 - cobblemon:dawn_stone
 - cobblemon:dusk_stone
@@ -320,7 +320,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:experience_candies</summary>
+<summary><b>Tag:</b> #items:experience_candies</summary>
 
 - cobblemon:rare_candy
 - cobblemon:exp_candy_xs
@@ -332,7 +332,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:feathers</summary>
+<summary><b>Tag:</b> #items:feathers</summary>
 
 - cobblemon:health_feather
 - cobblemon:muscle_feather
@@ -344,7 +344,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fire_stone_ores</summary>
+<summary><b>Tag:</b> #items:fire_stone_ores</summary>
 
 - cobblemon:fire_stone_ore
 - cobblemon:deepslate_fire_stone_ore
@@ -353,7 +353,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fossils</summary>
+<summary><b>Tag:</b> #items:fossils</summary>
 
 - cobblemon:helix_fossil
 - cobblemon:dome_fossil
@@ -374,7 +374,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fossil_machine_parts</summary>
+<summary><b>Tag:</b> #items:fossil_machine_parts</summary>
 
 - cobblemon:restoration_tank
 - cobblemon:monitor
@@ -383,14 +383,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hanging_signs</summary>
+<summary><b>Tag:</b> #items:hanging_signs</summary>
 
 - cobblemon:apricorn_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:herbs</summary>
+<summary><b>Tag:</b> #items:herbs</summary>
 
 - cobblemon:revival_herb
 - cobblemon:mirror_herb
@@ -401,7 +401,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ice_stone_ores</summary>
+<summary><b>Tag:</b> #items:ice_stone_ores</summary>
 
 - cobblemon:ice_stone_ore
 - cobblemon:deepslate_ice_stone_ore
@@ -409,7 +409,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaf_stone_ores</summary>
+<summary><b>Tag:</b> #items:leaf_stone_ores</summary>
 
 - cobblemon:leaf_stone_ore
 - cobblemon:deepslate_leaf_stone_ore
@@ -417,7 +417,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:machines</summary>
+<summary><b>Tag:</b> #items:machines</summary>
 
 - cobblemon:healing_machine
 - cobblemon:pc
@@ -429,7 +429,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mints</summary>
+<summary><b>Tag:</b> #items:mints</summary>
 
 - cobblemon:lonely_mint
 - cobblemon:adamant_mint
@@ -456,7 +456,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mint_leaf</summary>
+<summary><b>Tag:</b> #items:mint_leaf</summary>
 
 - cobblemon:red_mint_leaf
 - cobblemon:blue_mint_leaf
@@ -468,7 +468,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mint_seeds</summary>
+<summary><b>Tag:</b> #items:mint_seeds</summary>
 
 - cobblemon:red_mint_seeds
 - cobblemon:blue_mint_seeds
@@ -480,7 +480,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:moon_stone_ores</summary>
+<summary><b>Tag:</b> #items:moon_stone_ores</summary>
 
 - cobblemon:moon_stone_ore
 - cobblemon:deepslate_moon_stone_ore
@@ -489,7 +489,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mutated_berries</summary>
+<summary><b>Tag:</b> #items:mutated_berries</summary>
 
 - cobblemon:leppa_berry
 - cobblemon:lum_berry
@@ -534,7 +534,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:plants</summary>
+<summary><b>Tag:</b> #items:plants</summary>
 
 - #cobblemon:cobblemon_seeds
 - #cobblemon:apricorns
@@ -551,7 +551,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:poke_balls</summary>
+<summary><b>Tag:</b> #items:poke_balls</summary>
 
 - cobblemon:poke_ball
 - cobblemon:slate_ball
@@ -590,7 +590,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:potions</summary>
+<summary><b>Tag:</b> #items:potions</summary>
 
 - cobblemon:potion
 - cobblemon:super_potion
@@ -601,7 +601,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:protein_ingredients</summary>
+<summary><b>Tag:</b> #items:protein_ingredients</summary>
 
 - minecraft:beef
 - minecraft:chicken
@@ -612,7 +612,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:raw_meat</summary>
+<summary><b>Tag:</b> #items:raw_meat</summary>
 
 - minecraft:beef
 - minecraft:porkchop
@@ -625,7 +625,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:red_tumblestones</summary>
+<summary><b>Tag:</b> #items:red_tumblestones</summary>
 
 - cobblemon:small_budding_tumblestone
 - cobblemon:medium_budding_tumblestone
@@ -637,7 +637,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:remedies</summary>
+<summary><b>Tag:</b> #items:remedies</summary>
 
 - cobblemon:remedy
 - cobblemon:fine_remedy
@@ -647,7 +647,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:restores</summary>
+<summary><b>Tag:</b> #items:restores</summary>
 
 - cobblemon:antidote
 - cobblemon:awakening
@@ -660,7 +660,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:revives</summary>
+<summary><b>Tag:</b> #items:revives</summary>
 
 - cobblemon:revive
 - cobblemon:max_revive
@@ -668,7 +668,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:seeds</summary>
+<summary><b>Tag:</b> #items:seeds</summary>
 
 - minecraft:wheat_seeds
 - minecraft:melon_seeds
@@ -680,7 +680,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:shiny_stone_ores</summary>
+<summary><b>Tag:</b> #items:shiny_stone_ores</summary>
 
 - cobblemon:shiny_stone_ore
 - cobblemon:deepslate_shiny_stone_ore
@@ -688,14 +688,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #items:signs</summary>
 
 - cobblemon:apricorn_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sky_tumblestones</summary>
+<summary><b>Tag:</b> #items:sky_tumblestones</summary>
 
 - cobblemon:small_budding_sky_tumblestone
 - cobblemon:medium_budding_sky_tumblestone
@@ -707,7 +707,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sun_stone_ores</summary>
+<summary><b>Tag:</b> #items:sun_stone_ores</summary>
 
 - cobblemon:sun_stone_ore
 - cobblemon:deepslate_sun_stone_ore
@@ -715,7 +715,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sweets</summary>
+<summary><b>Tag:</b> #items:sweets</summary>
 
 - cobblemon:strawberry_sweet
 - cobblemon:love_sweet
@@ -728,7 +728,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:teacups</summary>
+<summary><b>Tag:</b> #items:teacups</summary>
 
 - cobblemon:masterpiece_teacup
 - cobblemon:unremarkable_teacup
@@ -736,7 +736,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:teapots</summary>
+<summary><b>Tag:</b> #items:teapots</summary>
 
 - cobblemon:cracked_pot
 - cobblemon:chipped_pot
@@ -744,7 +744,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:thunder_stone_ores</summary>
+<summary><b>Tag:</b> #items:thunder_stone_ores</summary>
 
 - cobblemon:thunder_stone_ore
 - cobblemon:deepslate_thunder_stone_ore
@@ -752,7 +752,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_1_poke_balls</summary>
+<summary><b>Tag:</b> #items:tier_1_poke_balls</summary>
 
 - cobblemon:poke_ball
 - cobblemon:citrine_ball
@@ -776,14 +776,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_1_poke_ball_materials</summary>
+<summary><b>Tag:</b> #items:tier_1_poke_ball_materials</summary>
 
 - minecraft:copper_ingot
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_2_poke_balls</summary>
+<summary><b>Tag:</b> #items:tier_2_poke_balls</summary>
 
 - cobblemon:great_ball
 - cobblemon:fast_ball
@@ -804,14 +804,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_2_poke_ball_materials</summary>
+<summary><b>Tag:</b> #items:tier_2_poke_ball_materials</summary>
 
 - minecraft:iron_ingot
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_3_poke_balls</summary>
+<summary><b>Tag:</b> #items:tier_3_poke_balls</summary>
 
 - cobblemon:ultra_ball
 - cobblemon:love_ball
@@ -827,14 +827,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_3_poke_ball_materials</summary>
+<summary><b>Tag:</b> #items:tier_3_poke_ball_materials</summary>
 
 - minecraft:gold_ingot
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_4_poke_balls</summary>
+<summary><b>Tag:</b> #items:tier_4_poke_balls</summary>
 
 - cobblemon:dream_ball
 - cobblemon:beast_ball
@@ -842,14 +842,14 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_4_poke_ball_materials</summary>
+<summary><b>Tag:</b> #items:tier_4_poke_ball_materials</summary>
 
 - minecraft:diamond
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tier_5_poke_balls</summary>
+<summary><b>Tag:</b> #items:tier_5_poke_balls</summary>
 
 - cobblemon:master_ball
 - cobblemon:ancient_origin_ball
@@ -857,7 +857,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tumblestones</summary>
+<summary><b>Tag:</b> #items:tumblestones</summary>
 
 - cobblemon:tumblestone
 - cobblemon:black_tumblestone
@@ -866,7 +866,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:type_gems</summary>
+<summary><b>Tag:</b> #items:type_gems</summary>
 
 - cobblemon:normal_gem
 - cobblemon:fire_gem
@@ -890,7 +890,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:vitamins</summary>
+<summary><b>Tag:</b> #items:vitamins</summary>
 
 - cobblemon:hp_up
 - cobblemon:protein
@@ -904,7 +904,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:water_stone_ores</summary>
+<summary><b>Tag:</b> #items:water_stone_ores</summary>
 
 - cobblemon:water_stone_ore
 - cobblemon:deepslate_water_stone_ore
@@ -912,7 +912,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:x_items</summary>
+<summary><b>Tag:</b> #items:x_items</summary>
 
 - cobblemon:x_attack
 - cobblemon:x_defence
@@ -926,7 +926,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:zinc_ingredients</summary>
+<summary><b>Tag:</b> #items:zinc_ingredients</summary>
 
 - minecraft:cod
 - minecraft:salmon
@@ -1145,63 +1145,63 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:boats</summary>
+<summary><b>Tag:</b> #items:boats</summary>
 
 - #cobblemon:boats
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:chest_boats</summary>
+<summary><b>Tag:</b> #items:chest_boats</summary>
 
 - cobblemon:apricorn_chest_boat
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:decorated_pot_sherds</summary>
+<summary><b>Tag:</b> #items:decorated_pot_sherds</summary>
 
 - #cobblemon:decorated_pot_sherds
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fences</summary>
+<summary><b>Tag:</b> #items:fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fence_gates</summary>
+<summary><b>Tag:</b> #items:fence_gates</summary>
 
 - cobblemon:apricorn_fence_gate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #items:flowers</summary>
 
 - cobblemon:pep_up_flower
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hanging_signs</summary>
+<summary><b>Tag:</b> #items:hanging_signs</summary>
 
 - #cobblemon:hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaves</summary>
+<summary><b>Tag:</b> #items:leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs</summary>
+<summary><b>Tag:</b> #items:logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:stripped_apricorn_log
@@ -1211,7 +1211,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs_that_burn</summary>
+<summary><b>Tag:</b> #items:logs_that_burn</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:stripped_apricorn_log
@@ -1221,7 +1221,7 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:piglin_loved</summary>
+<summary><b>Tag:</b> #items:piglin_loved</summary>
 
 - cobblemon:relic_coin_pouch
 - cobblemon:relic_coin_sack
@@ -1230,28 +1230,28 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:planks</summary>
+<summary><b>Tag:</b> #items:planks</summary>
 
 - cobblemon:apricorn_planks
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #items:signs</summary>
 
 - #cobblemon:signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:trim_templates</summary>
+<summary><b>Tag:</b> #items:trim_templates</summary>
 
 - cobblemon:automaton_armor_trim_smithing_template
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:villager_plantable_seeds</summary>
+<summary><b>Tag:</b> #items:villager_plantable_seeds</summary>
 
 - cobblemon:blue_mint_seeds
 - cobblemon:cyan_mint_seeds
@@ -1265,49 +1265,49 @@ This file contains tags related to items in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_buttons</summary>
+<summary><b>Tag:</b> #items:wooden_buttons</summary>
 
 - cobblemon:apricorn_button
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_doors</summary>
+<summary><b>Tag:</b> #items:wooden_doors</summary>
 
 - cobblemon:apricorn_door
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_fences</summary>
+<summary><b>Tag:</b> #items:wooden_fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_pressure_plates</summary>
+<summary><b>Tag:</b> #items:wooden_pressure_plates</summary>
 
 - cobblemon:apricorn_pressure_plate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_slabs</summary>
+<summary><b>Tag:</b> #items:wooden_slabs</summary>
 
 - cobblemon:apricorn_slab
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_stairs</summary>
+<summary><b>Tag:</b> #items:wooden_stairs</summary>
 
 - cobblemon:apricorn_stairs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_trapdoors</summary>
+<summary><b>Tag:</b> #items:wooden_trapdoors</summary>
 
 - cobblemon:apricorn_trapdoor
 

docs/cobblemon-tags/1.6.1/BlocksTags.md

@@ -5,7 +5,7 @@ This file contains tags related to block in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_hanging_signs</summary>
+<summary><b>Tag:</b> #block:all_hanging_signs</summary>
 
 - #cobblemon:ceiling_hanging_signs
 - #cobblemon:wall_hanging_signs
@@ -13,7 +13,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_signs</summary>
+<summary><b>Tag:</b> #block:all_signs</summary>
 
 - #cobblemon:all_hanging_signs
 - #cobblemon:signs
@@ -21,7 +21,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ancient_city_blocks</summary>
+<summary><b>Tag:</b> #block:ancient_city_blocks</summary>
 
 - minecraft:chiseled_deepslate
 - minecraft:cobbled_deepslate_wall
@@ -43,7 +43,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorns</summary>
+<summary><b>Tag:</b> #block:apricorns</summary>
 
 - cobblemon:black_apricorn
 - cobblemon:blue_apricorn
@@ -56,14 +56,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_leaves</summary>
+<summary><b>Tag:</b> #block:apricorn_leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_logs</summary>
+<summary><b>Tag:</b> #block:apricorn_logs</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -73,7 +73,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_saplings</summary>
+<summary><b>Tag:</b> #block:apricorn_saplings</summary>
 
 - cobblemon:black_apricorn_sapling
 - cobblemon:blue_apricorn_sapling
@@ -86,7 +86,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berries</summary>
+<summary><b>Tag:</b> #block:berries</summary>
 
 - cobblemon:aguav_berry
 - cobblemon:apicot_berry
@@ -161,7 +161,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_replaceable</summary>
+<summary><b>Tag:</b> #block:berry_replaceable</summary>
 
 - #minecraft:leaves
 - minecraft:air
@@ -182,7 +182,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_soil</summary>
+<summary><b>Tag:</b> #block:berry_soil</summary>
 
 - #c:farmland
 - #c:farmlands
@@ -192,7 +192,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:berry_wild_soil</summary>
+<summary><b>Tag:</b> #block:berry_wild_soil</summary>
 
 - #cobblemon:snow_block
 - #minecraft:dirt
@@ -202,7 +202,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:black_tumblestones</summary>
+<summary><b>Tag:</b> #block:black_tumblestones</summary>
 
 - cobblemon:black_tumblestone_block
 - cobblemon:black_tumblestone_brick_slab
@@ -226,7 +226,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:black_tumblestone_bricks</summary>
+<summary><b>Tag:</b> #block:black_tumblestone_bricks</summary>
 
 - cobblemon:black_tumblestone_bricks
 - cobblemon:chiseled_black_tumblestone_bricks
@@ -234,7 +234,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:blue_flowers</summary>
+<summary><b>Tag:</b> #block:blue_flowers</summary>
 
 - aether_redux:mixed_prismatic_petals
 - aether_redux:pink_prismatic_petals
@@ -289,14 +289,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ceiling_hanging_signs</summary>
+<summary><b>Tag:</b> #block:ceiling_hanging_signs</summary>
 
 - cobblemon:apricorn_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:concrete_blocks</summary>
+<summary><b>Tag:</b> #block:concrete_blocks</summary>
 
 - minecraft:black_concrete
 - minecraft:blue_concrete
@@ -318,7 +318,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:crops</summary>
+<summary><b>Tag:</b> #block:crops</summary>
 
 - #cobblemon:mints
 - cobblemon:medicinal_leek
@@ -328,7 +328,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dawn_stone_ores</summary>
+<summary><b>Tag:</b> #block:dawn_stone_ores</summary>
 
 - cobblemon:dawn_stone_ore
 - cobblemon:deepslate_dawn_stone_ore
@@ -336,7 +336,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:desert_pyramid_blocks</summary>
+<summary><b>Tag:</b> #block:desert_pyramid_blocks</summary>
 
 - minecraft:chiseled_sandstone
 - minecraft:cut_sandstone
@@ -348,7 +348,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dripstone_growable</summary>
+<summary><b>Tag:</b> #block:dripstone_growable</summary>
 
 - cobblemon:dripstone_moon_stone_ore
 - dripstone_block
@@ -356,14 +356,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dripstone_replaceables</summary>
+<summary><b>Tag:</b> #block:dripstone_replaceables</summary>
 
 - dripstone_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dusk_stone_ores</summary>
+<summary><b>Tag:</b> #block:dusk_stone_ores</summary>
 
 - cobblemon:deepslate_dusk_stone_ore
 - cobblemon:dusk_stone_ore
@@ -371,7 +371,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:end_city_blocks</summary>
+<summary><b>Tag:</b> #block:end_city_blocks</summary>
 
 - minecraft:end_stone_bricks
 - minecraft:purpur_block
@@ -382,7 +382,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:evolution_stone_blocks</summary>
+<summary><b>Tag:</b> #block:evolution_stone_blocks</summary>
 
 - cobblemon:dawn_stone_block
 - cobblemon:dusk_stone_block
@@ -398,7 +398,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fire_stone_ores</summary>
+<summary><b>Tag:</b> #block:fire_stone_ores</summary>
 
 - cobblemon:deepslate_fire_stone_ore
 - cobblemon:fire_stone_ore
@@ -407,7 +407,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #block:flowers</summary>
 
 - #c:flowers
 - #cobblemon:small_flowers
@@ -440,7 +440,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fossil_machine_parts</summary>
+<summary><b>Tag:</b> #block:fossil_machine_parts</summary>
 
 - cobblemon:fossil_analyzer
 - cobblemon:monitor
@@ -449,7 +449,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:gemstones</summary>
+<summary><b>Tag:</b> #block:gemstones</summary>
 
 - #c:amethyst_ores
 - #c:diamond_ores
@@ -467,7 +467,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:gilded_chests</summary>
+<summary><b>Tag:</b> #block:gilded_chests</summary>
 
 - cobblemon:black_gilded_chest
 - cobblemon:blue_gilded_chest
@@ -480,7 +480,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:glazed_terracotta_blocks</summary>
+<summary><b>Tag:</b> #block:glazed_terracotta_blocks</summary>
 
 - minecraft:black_glazed_terracotta
 - minecraft:blue_glazed_terracotta
@@ -502,7 +502,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ice_stone_ores</summary>
+<summary><b>Tag:</b> #block:ice_stone_ores</summary>
 
 - cobblemon:deepslate_ice_stone_ore
 - cobblemon:ice_stone_ore
@@ -510,7 +510,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:jungle_pyramid_blocks</summary>
+<summary><b>Tag:</b> #block:jungle_pyramid_blocks</summary>
 
 - minecraft:chiseled_stone_bricks
 - minecraft:cobblestone
@@ -520,7 +520,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaf_stone_ores</summary>
+<summary><b>Tag:</b> #block:leaf_stone_ores</summary>
 
 - cobblemon:deepslate_leaf_stone_ore
 - cobblemon:leaf_stone_ore
@@ -528,7 +528,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:machines</summary>
+<summary><b>Tag:</b> #block:machines</summary>
 
 - cobblemon:fossil_analyzer
 - cobblemon:healing_machine
@@ -540,7 +540,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mansion_blocks</summary>
+<summary><b>Tag:</b> #block:mansion_blocks</summary>
 
 - minecraft:birch_planks
 - minecraft:cobblestone_stairs
@@ -550,7 +550,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:medicinal_leek_plantable</summary>
+<summary><b>Tag:</b> #block:medicinal_leek_plantable</summary>
 
 - #minecraft:slabs
 - minecraft:water
@@ -558,7 +558,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mints</summary>
+<summary><b>Tag:</b> #block:mints</summary>
 
 - cobblemon:blue_mint
 - cobblemon:cyan_mint
@@ -570,7 +570,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:moon_stone_ores</summary>
+<summary><b>Tag:</b> #block:moon_stone_ores</summary>
 
 - cobblemon:deepslate_moon_stone_ore
 - cobblemon:dripstone_moon_stone_ore
@@ -579,7 +579,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:natural</summary>
+<summary><b>Tag:</b> #block:natural</summary>
 
 - #c:adamantite_ores
 - #c:aetherium_ores
@@ -706,7 +706,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:nether_structure_blocks</summary>
+<summary><b>Tag:</b> #block:nether_structure_blocks</summary>
 
 - minecraft:blackstone_slab
 - minecraft:blackstone_stairs
@@ -724,7 +724,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ocean_ruin_blocks</summary>
+<summary><b>Tag:</b> #block:ocean_ruin_blocks</summary>
 
 - minecraft:chiseled_sandstone
 - minecraft:chiseled_stone_bricks
@@ -738,7 +738,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:orange_flowers</summary>
+<summary><b>Tag:</b> #block:orange_flowers</summary>
 
 - aether_redux:aurum
 - biomemakeover:marigold
@@ -768,7 +768,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:pillager_outpost_blocks</summary>
+<summary><b>Tag:</b> #block:pillager_outpost_blocks</summary>
 
 - #minecraft:logs
 - #minecraft:planks
@@ -787,7 +787,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:pink_flowers</summary>
+<summary><b>Tag:</b> #block:pink_flowers</summary>
 
 - aether_redux:iridia
 - aether_redux:mixed_prismatic_petals
@@ -841,7 +841,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:redstone_blocks</summary>
+<summary><b>Tag:</b> #block:redstone_blocks</summary>
 
 - #c:redstone_blocks
 - minecraft:activator_rail
@@ -864,7 +864,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:red_flowers</summary>
+<summary><b>Tag:</b> #block:red_flowers</summary>
 
 - ancient_aether:sakura_blossoms
 - ancient_aether:trapped_sakura_blossoms
@@ -905,7 +905,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:red_tumblestones</summary>
+<summary><b>Tag:</b> #block:red_tumblestones</summary>
 
 - cobblemon:chiseled_polished_tumblestone
 - cobblemon:chiseled_tumblestone_bricks
@@ -929,7 +929,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:red_tumblestone_bricks</summary>
+<summary><b>Tag:</b> #block:red_tumblestone_bricks</summary>
 
 - cobblemon:chiseled_tumblestone_bricks
 - cobblemon:tumblestone_bricks
@@ -937,7 +937,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:roots</summary>
+<summary><b>Tag:</b> #block:roots</summary>
 
 - cobblemon:big_root
 - cobblemon:energy_root
@@ -945,7 +945,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:roots_spreadable</summary>
+<summary><b>Tag:</b> #block:roots_spreadable</summary>
 
 - #c:cobblestone
 - #c:dirt
@@ -972,7 +972,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ruined_portal_blocks</summary>
+<summary><b>Tag:</b> #block:ruined_portal_blocks</summary>
 
 - minecraft:crying_obsidian
 - minecraft:netherrack
@@ -981,7 +981,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sees_sky</summary>
+<summary><b>Tag:</b> #block:sees_sky</summary>
 
 - #minecraft:climbable
 - #minecraft:fences
@@ -992,7 +992,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:shiny_stone_ores</summary>
+<summary><b>Tag:</b> #block:shiny_stone_ores</summary>
 
 - cobblemon:deepslate_shiny_stone_ore
 - cobblemon:shiny_stone_ore
@@ -1000,7 +1000,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #block:signs</summary>
 
 - #cobblemon:standing_signs
 - #cobblemon:wall_signs
@@ -1008,7 +1008,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sky_tumblestones</summary>
+<summary><b>Tag:</b> #block:sky_tumblestones</summary>
 
 - cobblemon:chiseled_polished_sky_tumblestone
 - cobblemon:chiseled_sky_tumblestone_bricks
@@ -1032,7 +1032,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sky_tumblestone_bricks</summary>
+<summary><b>Tag:</b> #block:sky_tumblestone_bricks</summary>
 
 - cobblemon:chiseled_sky_tumblestone_bricks
 - cobblemon:sky_tumblestone_bricks
@@ -1040,28 +1040,28 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:small_flowers</summary>
+<summary><b>Tag:</b> #block:small_flowers</summary>
 
 - cobblemon:pep_up_flower
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:snow_block</summary>
+<summary><b>Tag:</b> #block:snow_block</summary>
 
 - minecraft:snow_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:standing_signs</summary>
+<summary><b>Tag:</b> #block:standing_signs</summary>
 
 - cobblemon:apricorn_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sun_stone_ores</summary>
+<summary><b>Tag:</b> #block:sun_stone_ores</summary>
 
 - cobblemon:deepslate_sun_stone_ore
 - cobblemon:sun_stone_ore
@@ -1070,7 +1070,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:thunder_stone_ores</summary>
+<summary><b>Tag:</b> #block:thunder_stone_ores</summary>
 
 - cobblemon:deepslate_thunder_stone_ore
 - cobblemon:thunder_stone_ore
@@ -1078,7 +1078,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:trail_ruins_blocks</summary>
+<summary><b>Tag:</b> #block:trail_ruins_blocks</summary>
 
 - #cobblemon:glazed_terracotta_blocks
 - #minecraft:terracotta
@@ -1089,7 +1089,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:trash</summary>
+<summary><b>Tag:</b> #block:trash</summary>
 
 - etcetera:prickly_can
 - farmersdelight:organic_compost
@@ -1111,7 +1111,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:trees</summary>
+<summary><b>Tag:</b> #block:trees</summary>
 
 - #c:leaves
 - #c:logs
@@ -1122,7 +1122,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tumblestone_bricks</summary>
+<summary><b>Tag:</b> #block:tumblestone_bricks</summary>
 
 - #cobblemon:black_tumblestone_bricks
 - #cobblemon:red_tumblestone_bricks
@@ -1131,7 +1131,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:tumblestone_heat_source</summary>
+<summary><b>Tag:</b> #block:tumblestone_heat_source</summary>
 
 - minecraft:lava
 - minecraft:magma_block
@@ -1139,21 +1139,21 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_hanging_signs</summary>
+<summary><b>Tag:</b> #block:wall_hanging_signs</summary>
 
 - cobblemon:apricorn_wall_hanging_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_signs</summary>
+<summary><b>Tag:</b> #block:wall_signs</summary>
 
 - cobblemon:apricorn_wall_sign
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:water_stone_ores</summary>
+<summary><b>Tag:</b> #block:water_stone_ores</summary>
 
 - cobblemon:deepslate_water_stone_ore
 - cobblemon:water_stone_ore
@@ -1161,7 +1161,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:white_flowers</summary>
+<summary><b>Tag:</b> #block:white_flowers</summary>
 
 - aether:white_flower
 - aether_redux:frostbud
@@ -1201,7 +1201,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:yellow_flowers</summary>
+<summary><b>Tag:</b> #block:yellow_flowers</summary>
 
 - biomesoplenty:goldenrod
 - botania:daffomill
@@ -1240,7 +1240,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:acacia_log</summary>
+<summary><b>Tag:</b> #has_block:acacia_log</summary>
 
 - #c:tree/savanna
 - biomesoplenty:amethyst_canyon
@@ -1298,7 +1298,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:apricorn_log</summary>
+<summary><b>Tag:</b> #has_block:apricorn_log</summary>
 
 - #cobblemon:is_badlands
 - #cobblemon:is_desert
@@ -1315,7 +1315,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:birch_log</summary>
+<summary><b>Tag:</b> #has_block:birch_log</summary>
 
 - #c:is_birch_forest
 - #clifftree:birch_forests
@@ -1376,7 +1376,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:cherry_log</summary>
+<summary><b>Tag:</b> #has_block:cherry_log</summary>
 
 - minecraft:cherry_grove
 - terralith:sakura_grove
@@ -1386,7 +1386,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:crimson_log</summary>
+<summary><b>Tag:</b> #has_block:crimson_log</summary>
 
 - betternether:crimson_glowing_woods
 - betternether:crimson_pinewood
@@ -1397,7 +1397,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:dark_oak_log</summary>
+<summary><b>Tag:</b> #has_block:dark_oak_log</summary>
 
 - biomesoplenty:mystic_grove
 - biomesoplenty:pumpkin_patch
@@ -1429,7 +1429,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowering_azalea_leaves</summary>
+<summary><b>Tag:</b> #has_block:flowering_azalea_leaves</summary>
 
 - minecraft:lush_caves
 - terralith:amethyst_canyon
@@ -1457,7 +1457,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:gravel</summary>
+<summary><b>Tag:</b> #has_block:gravel</summary>
 
 - biomesoplenty:cold_desert
 - clifftree:gravelly_beach
@@ -1470,7 +1470,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:jungle_log</summary>
+<summary><b>Tag:</b> #has_block:jungle_log</summary>
 
 - #c:tree/jungle
 - #minecraft:is_jungle
@@ -1506,7 +1506,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mangrove_log</summary>
+<summary><b>Tag:</b> #has_block:mangrove_log</summary>
 
 - minecraft:mangrove_swamp
 - terralith:cave/underground_jungle
@@ -1532,7 +1532,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:mud</summary>
+<summary><b>Tag:</b> #has_block:mud</summary>
 
 - clifftree:bog
 - minecraft:mangrove_swamp
@@ -1543,7 +1543,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:oak_log</summary>
+<summary><b>Tag:</b> #has_block:oak_log</summary>
 
 - biomesoplenty:bamboo_grove
 - biomesoplenty:cherry_blossom_grove
@@ -1644,7 +1644,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:red_sand</summary>
+<summary><b>Tag:</b> #has_block:red_sand</summary>
 
 - #minecraft:is_badlands
 - byg:atacama_desert
@@ -1668,7 +1668,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:sand</summary>
+<summary><b>Tag:</b> #has_block:sand</summary>
 
 - byg:mojave_desert
 - clifftree:oasis
@@ -1694,7 +1694,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:spruce_log</summary>
+<summary><b>Tag:</b> #has_block:spruce_log</summary>
 
 - biomesoplenty:dead_forest
 - biomesoplenty:field
@@ -1778,7 +1778,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:warped_log</summary>
+<summary><b>Tag:</b> #has_block:warped_log</summary>
 
 - betternether:old_warped_woods
 - byg:crimson_gardens
@@ -1790,21 +1790,21 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_hanging_signs</summary>
+<summary><b>Tag:</b> #block:all_hanging_signs</summary>
 
 - #cobblemon:all_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:all_signs</summary>
+<summary><b>Tag:</b> #block:all_signs</summary>
 
 - #cobblemon:all_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:bee_growables</summary>
+<summary><b>Tag:</b> #block:bee_growables</summary>
 
 - #cobblemon:apricorns
 - #cobblemon:crops
@@ -1812,42 +1812,42 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:ceiling_hanging_signs</summary>
+<summary><b>Tag:</b> #block:ceiling_hanging_signs</summary>
 
 - #cobblemon:ceiling_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:drip_stone_replaceables</summary>
+<summary><b>Tag:</b> #block:drip_stone_replaceables</summary>
 
 - dripstone_block
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fences</summary>
+<summary><b>Tag:</b> #block:fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:fence_gates</summary>
+<summary><b>Tag:</b> #block:fence_gates</summary>
 
 - cobblemon:apricorn_fence_gate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:flowers</summary>
+<summary><b>Tag:</b> #block:flowers</summary>
 
 - cobblemon:pep_up_flower
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:guarded_by_piglins</summary>
+<summary><b>Tag:</b> #block:guarded_by_piglins</summary>
 
 - cobblemon:black_gilded_chest
 - cobblemon:blue_gilded_chest
@@ -1862,28 +1862,28 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hoes</summary>
+<summary><b>Tag:</b> #block:hoes</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:leaves</summary>
+<summary><b>Tag:</b> #block:leaves</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs</summary>
+<summary><b>Tag:</b> #block:logs</summary>
 
 - #cobblemon:apricorn_logs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:logs_that_burn</summary>
+<summary><b>Tag:</b> #block:logs_that_burn</summary>
 
 - cobblemon:apricorn_log
 - cobblemon:apricorn_wood
@@ -1893,7 +1893,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:maintains_farmland</summary>
+<summary><b>Tag:</b> #block:maintains_farmland</summary>
 
 - #cobblemon:berries
 - #cobblemon:crops
@@ -1901,7 +1901,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:needs_iron_tool</summary>
+<summary><b>Tag:</b> #block:needs_iron_tool</summary>
 
 - cobblemon:deepslate_dawn_stone_ore
 - cobblemon:deepslate_dusk_stone_ore
@@ -1917,7 +1917,7 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:needs_stone_tool</summary>
+<summary><b>Tag:</b> #block:needs_stone_tool</summary>
 
 - cobblemon:dawn_stone_block
 - cobblemon:dawn_stone_ore
@@ -1944,14 +1944,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:planks</summary>
+<summary><b>Tag:</b> #block:planks</summary>
 
 - cobblemon:apricorn_planks
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:saplings</summary>
+<summary><b>Tag:</b> #block:saplings</summary>
 
 - cobblemon:black_apricorn_sapling
 - cobblemon:blue_apricorn_sapling
@@ -1964,14 +1964,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:signs</summary>
+<summary><b>Tag:</b> #block:signs</summary>
 
 - #cobblemon:signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:slabs</summary>
+<summary><b>Tag:</b> #block:slabs</summary>
 
 - cobblemon:black_tumblestone_brick_slab
 - cobblemon:polished_black_tumblestone_slab
@@ -1986,14 +1986,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:small_flowers</summary>
+<summary><b>Tag:</b> #block:small_flowers</summary>
 
 - #cobblemon:small_flowers
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:stairs</summary>
+<summary><b>Tag:</b> #block:stairs</summary>
 
 - cobblemon:black_tumblestone_brick_stairs
 - cobblemon:polished_black_tumblestone_stairs
@@ -2008,14 +2008,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:standing_signs</summary>
+<summary><b>Tag:</b> #block:standing_signs</summary>
 
 - #cobblemon:standing_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:walls</summary>
+<summary><b>Tag:</b> #block:walls</summary>
 
 - cobblemon:black_tumblestone_brick_wall
 - cobblemon:polished_black_tumblestone_wall
@@ -2027,70 +2027,70 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_hanging_signs</summary>
+<summary><b>Tag:</b> #block:wall_hanging_signs</summary>
 
 - #cobblemon:wall_hanging_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wall_signs</summary>
+<summary><b>Tag:</b> #block:wall_signs</summary>
 
 - #cobblemon:wall_signs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_buttons</summary>
+<summary><b>Tag:</b> #block:wooden_buttons</summary>
 
 - cobblemon:apricorn_button
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_doors</summary>
+<summary><b>Tag:</b> #block:wooden_doors</summary>
 
 - cobblemon:apricorn_door
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_fences</summary>
+<summary><b>Tag:</b> #block:wooden_fences</summary>
 
 - cobblemon:apricorn_fence
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_pressure_plates</summary>
+<summary><b>Tag:</b> #block:wooden_pressure_plates</summary>
 
 - cobblemon:apricorn_pressure_plate
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_slabs</summary>
+<summary><b>Tag:</b> #block:wooden_slabs</summary>
 
 - cobblemon:apricorn_slab
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_stairs</summary>
+<summary><b>Tag:</b> #block:wooden_stairs</summary>
 
 - cobblemon:apricorn_stairs
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:wooden_trapdoors</summary>
+<summary><b>Tag:</b> #block:wooden_trapdoors</summary>
 
 - cobblemon:apricorn_trapdoor
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:axe</summary>
+<summary><b>Tag:</b> #mineable:axe</summary>
 
 - #cobblemon:apricorns
 - cobblemon:black_gilded_chest
@@ -2107,14 +2107,14 @@ This file contains tags related to block in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:hoe</summary>
+<summary><b>Tag:</b> #mineable:hoe</summary>
 
 - cobblemon:apricorn_leaves
 
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:pickaxe</summary>
+<summary><b>Tag:</b> #mineable:pickaxe</summary>
 
 - cobblemon:black_tumblestone_block
 - cobblemon:black_tumblestone_brick_slab

docs/cobblemon-tags/1.6.1/EntityTypesTags.md

@@ -5,7 +5,7 @@ This file contains tags related to different types of entities in cobblemon.
 ## Tags:
 
 <details>
-<summary><b>Tag:</b> #cobblemon:boats</summary>
+<summary><b>Tag:</b> #entity_type:boats</summary>
 
 - cobblemon:boat
 - cobblemon:chest_boat
@@ -13,7 +13,7 @@ This file contains tags related to different types of entities in cobblemon.
 </details>
 
 <details>
-<summary><b>Tag:</b> #cobblemon:cannot_have_name_tag</summary>
+<summary><b>Tag:</b> #entity_type:cannot_have_name_tag</summary>
 
 - cobblemon:empty_pokeball
 - cobblemon:pokemon

fabric/src/main/kotlin/com/cobblemon/mod/fabric/client/CobblemonFabricClient.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.fabric.client
 
 import com.cobblemon.mod.common.CobblemonClientImplementation
-import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonClient.pokedexUsageContext
@@ -90,7 +89,6 @@ class CobblemonFabricClient: ClientModInitializer, CobblemonClientImplementation
                     pokedex.getItemModelPath("off")
                 )
             }
-            CobblemonItems.wearables.forEach { wearable -> it.addModels(wearable.getModel3d()) }
         }
 
         CobblemonFabric.networkManager.registerClientHandlers()

neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt

@@ -10,7 +10,6 @@ package com.cobblemon.mod.neoforge.client
 
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonClientImplementation
-import com.cobblemon.mod.common.CobblemonItems
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonClient.pokedexUsageContext
@@ -182,9 +181,6 @@ object CobblemonNeoForgeClient : CobblemonClientImplementation {
             event.register(ModelResourceLocation(pokedex.getItemModelPath("flat_off"), "standalone"))
             event.register(ModelResourceLocation(pokedex.getItemModelPath("off"), "standalone"))
         }
-        CobblemonItems.wearables.forEach { wearable ->
-            event.register(ModelResourceLocation(wearable.getModel3d(),"standalone"))
-        }
     }
 
     private fun onKeyMappingRegister(event: RegisterKeyMappingsEvent) {

utilityscripts/releasescripts/generateTagList.py

@@ -60,7 +60,7 @@ def process_json_file(json_path, file_handle):
         tag_details.sort()
 
         # Write the sorted tag details to the file
-        file_handle.write(f"\n<details>\n<summary><b>Tag:</b> #cobblemon:{json_file_base[:-5]}</summary>\n\n")
+        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")