Add support for 1.21.6

- Bumped pack format and protocol version to mark 1.21.6 support
- Fixed 1.21.5 NeoForge crash when installed alongside MidnightLib
- Added Spawn Animations Compats by Fyoncle as an optional dependency
- Updated README
- Updated GitHub workflow

Author: Tschipcraft

.github/workflows/cd.yml

@@ -246,6 +246,8 @@ jobs:
           version: ${{ github.event.inputs.tag }}
           changelog-file: CHANGES.md
 
+          dependencies: |
+            mr_spawn_animationscompats(optional){modrinth:ofDka6PS}
           loaders: |
             datapack
           files: |
@@ -269,6 +271,7 @@ jobs:
           dependencies: |
             fabric-api(required){modrinth:P7dR8mSH}
             qsl(required){modrinth:qvIfYCYJ}
+            mr_spawn_animationscompats(optional){modrinth:ofDka6PS}
             modmenu(optional){modrinth:mOgUt4GM}
             modmenu-badges-lib(optional){modrinth:eUw8l2Vi}
             midnightlib(optional){modrinth:codAaoxh}

.github/workflows/ci.yml

@@ -296,7 +296,7 @@ jobs:
             <img alt="✅ Success" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg">
           </picture><br>
 
-          **${{ github.event.repository.name }} v${{ env.TAG }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** built successfully! [See changes since last release](https://github.com/${{ github.repository }}/blob/${{ github.ref_name }}/CHANGES.md).
+          **${{ github.event.repository.name }} v${{ env.TAG }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** built successfully! [See changes since last release](https://github.com/${{ github.repository }}/blob/${{ github.sha }}/CHANGES.md).
 
           [Download via nightly.link](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }})
 

CHANGES.md

@@ -1,10 +1,2 @@
-- **Added support for Minecraft 1.21.5** 🌸
-  - Updated to work with new equipment NBT format, new text component format, FallDistance NBT renaming, and potion entity ID renaming
-  - Hide worn armor and tools now uses the unified `armor.body` slot instead of `armor.feet` in 1.21.5 and above to allow better late loot recovery
-- **Added native NeoForge support** (closes [#32](https://github.com/Tschipcraft/spawnanimations/issues/32), [#18](https://github.com/Tschipcraft/spawnanimations/issues/18))
-- Hardened the Play animation on unsupported blocks option
-  - Fixed incompatibility with [PandaAntiPermanentBlockBreak](https://modrinth.com/mod/Tb16z0yT) mod (closes [#38](https://github.com/Tschipcraft/spawnanimations/issues/38))
-- Added `is_riding` and `has_passengers` exclusion checks to the loop, fixing zombies not being excluded when riding zombie horses from the [Zombie Horse Spawn](https://modrinth.com/mod/owDBGfRd) mod in 1.20.1
-- Fixed mobs not adjusting their animation speed during their animation
-- Fixed version checker messages not being displayed
-- Annotated required java version for mod versions
+- **Added support for Minecraft 1.21.6** ☁️
+- Fixed 1.21.5 NeoForge crash when installed alongside MidnightLib

META-INF/mods.toml

@@ -39,5 +39,13 @@ features={ java_version = "[17,)" }
     side="BOTH"
     referralUrl="https://modrinth.com/mod/codAaoxh/versions?l=forge"
 
+[[dependencies.spawnanimations]]
+    modId="mr_spawn_animationscompats"
+    mandatory=false
+    versionRange="[1.0,)"
+    ordering="NONE"
+    side="BOTH"
+    referralUrl="https://modrinth.com/mod/ofDka6PS/versions?l=forge"
+
 [modproperties.spawnanimations]
     catalogueItemIcon="minecraft:zombie_spawn_egg"

META-INF/neoforge.mods.toml

@@ -40,5 +40,14 @@ features={ java_version = "[21,)" }
     referralUrl="https://modrinth.com/mod/codAaoxh/versions?l=neoforge"
     reason="Global settings across all worlds"
 
+[[dependencies.spawnanimations]]
+    modId="mr_spawn_animationscompats"
+    type="optional"
+    versionRange="[1.0,)"
+    ordering="NONE"
+    side="BOTH"
+    referralUrl="https://modrinth.com/mod/ofDka6PS/versions?l=neoforge"
+    reason="Compatibility with other mods"
+
 [modproperties.spawnanimations]
     catalogueItemIcon="minecraft:zombie_spawn_egg"

README.md

@@ -1,10 +1,10 @@
 <h1 align="center">
   <img alt="Icon" src="pack.png" width="128" height="128" style="image-rendering: pixelated"><br/>
-  Spawn Animations
+  Tschipcraft's Spawn Animations
 </h1>
 <p align="center">
   <a href="https://github.com/Tschipcraft/spawnanimations/stargazers"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/Tschipcraft/spawnanimations?colorA=151513&colorB=e3e1ce&style=for-the-badge"></a>
-  <a href="https://www.curseforge.com/minecraft/texture-packs/spawn-animations"><img alt="CurseForge Downloads" src="https://img.shields.io/curseforge/dt/811803?label=CurseForge&colorA=151513&colorB=e3e1ce&style=for-the-badge&logo=curseforge"></a>
+  <a href="https://www.curseforge.com/minecraft/mc-mods/spawn-animations-mod"><img alt="CurseForge Downloads" src="https://img.shields.io/curseforge/dt/1223719?label=CurseForge&colorA=151513&colorB=e3e1ce&style=for-the-badge&logo=curseforge"></a>
   <a href="https://modrinth.com/datapack/spawn-animations"><img alt="Modrinth Downloads" src="https://img.shields.io/modrinth/dt/spawn-animations?label=Modrinth&colorA=151513&colorB=e3e1ce&style=for-the-badge&logo=modrinth"></a>
   <a href="https://github.com/Tschipcraft/spawnanimations/releases/latest"><img alt="GitHub Downloads" src="https://img.shields.io/github/downloads/Tschipcraft/spawnanimations/total?logo=github&colorA=151513&colorB=e3e1ce&style=for-the-badge"></a>
 </p>
@@ -20,7 +20,7 @@ Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Spiders, Cave Spiders, Creep
 
 This data pack/mod is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.
 
-This data pack/mod is completely server-side, but can also be installed on the client for singleplayer worlds!
+This project is completely server-side, but can also be installed on the client for single-player worlds!
 
 [➜ For available settings and customization, take a look at the wiki](https://github.com/Tschipcraft/spawnanimations/wiki)
 
@@ -34,14 +34,16 @@ More sophisticated animations with Animated Java are planned for v2.0.
 <img alt="Enderman digging up" src="https://i.imgur.com/0rLJakI.gif" width=55%>
 </details>
 
-
 ## Installation
 
-Download the latest release from [here](https://github.com/Tschipcraft/spawnanimations/releases/latest) and put the data pack .zip file into the `datapacks` folder of your Minecraft world.
+[Download the latest release](https://github.com/Tschipcraft/spawnanimations/releases/latest) and install either as:
+
+* **Data Pack** ➜ Place `.zip` in your world's `datapacks` folder
+* **Mod** ➜ Drop into your `mods` folder and optionally install [MidnightLib](https://modrinth.com/project/codAaoxh) for a global config file and UI
 
 For Minecraft 1.14, 1.15 and 1.16 use [a legacy edition](https://github.com/Tschipcraft/spawnanimations/tree/master/other_editions).
 
-This data pack is also available as a mod with an additional global config file and settings menu when installed alongside [MidnightLib](https://modrinth.com/mod/midnightlib). Download the latest release and put the mod .jar file into your `.minecraft/mods` folder.
+To manage settings, reset, or uninstall the pack, use `/trigger tschipcraft.menu` or `/function #tschipcraft:menu`.
 
 Also available on Modrinth and CurseForge!
 
@@ -52,7 +54,7 @@ Also available on Modrinth and CurseForge!
   <img height="72px" alt="Download on Modrinth" src="https://raw.githubusercontent.com/Tschipcraft/badges/main/assets/modrinth-badge-dark.svg">
 </picture>
 </a>
-<a href="https://www.curseforge.com/minecraft/texture-packs/spawn-animations">
+<a href="https://www.curseforge.com/minecraft/data-packs/spawn-animations">
 <picture>
   <source height="72px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/Tschipcraft/badges/main/assets/curseforge-badge-dark.svg">
   <source height="72px" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Tschipcraft/badges/main/assets/curseforge-badge-light.svg">
@@ -64,6 +66,6 @@ Also available on Modrinth and CurseForge!
 
 Development builds are available on [GitHub Actions](https://github.com/Tschipcraft/spawnanimations/actions/workflows/ci.yml). These builds are not guaranteed to be stable and may contain bugs. Please always back up your world before using them.
 
-## Manage
+## Compatibility
 
-To open the ingame menu, execute `/trigger tschipcraft.menu` or `/function #tschipcraft:menu`. There is a **Reset** and an **Uninstall** button.
+This data pack implements the [Smithed](https://wiki.smithed.dev/conventions/) and essential [MC Datapacks Discord Server](https://mc-datapacks.github.io/en/conventions/index.html) Conventions to ensure data pack compatibility.

data/spawnanimations/function/internal/version_checker/start.mcfunction

@@ -1,7 +1,7 @@
 ##by Tschipcraft
 
 execute store result score $version ts.sa.settings run data get entity @r DataVersion
-execute unless score $global tvc_ignore matches 1 if score $version ts.sa.settings matches 4400.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.4 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger tschipcraft.menu","underlined":true,"color":"gold","click_event":{"action":"run_command","command":"trigger tschipcraft.menu"},"hover_event":{"action":"show_text","value":"Click here","text":"Click here"}},{"text":")","color":"gold"}]
+execute unless score $global tvc_ignore matches 1 if score $version ts.sa.settings matches 4500.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.6 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger tschipcraft.menu","underlined":true,"color":"gold","click_event":{"action":"run_command","command":"trigger tschipcraft.menu"},"hover_event":{"action":"show_text","value":"Click here","text":"Click here"}},{"text":")","color":"gold"}]
 # Note: 1.17x-1.20x uses the old folder names (function -> functions)
 
 # Announce escape sequence handling changes

fabric.mod.json

@@ -28,7 +28,8 @@
   "recommends": {
     "modmenu": "*",
     "modmenu-badges-lib": "*",
-    "midnightlib": "*"
+    "midnightlib": "*",
+    "mr_spawn_animationscompats": "*"
   },
   "custom": {
     "modmenu": {

net/tschipcraft/spawnanimations/neoforge/Init.class

@@ -2,7 +2,7 @@
   "id": "spawnanimations",
   "pack": {
     "pack_format": 15,
-    "supported_formats": [7, 71],
+    "supported_formats": [7, 80],
     "description": "Tschipcraft's Spawn Animations\n└ v${version} ● mc${mc_human_version_range}"
   },
   "overlays": {