Finalize v1.10.1

- Fixed CI/CD pipeline oversights
- 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 mod by Serilum in 1.20.1
- Added `#minecraft:inside_step_sound_blocks` (leaf litter and other similar blocks) to the nonsolid tag
- Fixed version checker messages not being displayed
- Annotated required java version for mod versions

Author: Tschipcraft

.github/workflows/cd.yml

@@ -59,28 +59,33 @@ jobs:
               LOWER_DP=$(jq -r '.pack.supported_formats[0]' pack.mcmeta)
               UPPER_DP=$(jq -r '.pack.supported_formats[1]' pack.mcmeta)
             else
-              echo "::error:: pack.mcmeta not found!"
+              echo "::error:: pack.mcmeta file not found!"
               exit 1
             fi
             echo "Lower data pack format: $LOWER_DP, Upper: $UPPER_DP"
 
             echo "Fetching versions from Spyglass API..."
             API_JSON=$(curl -s https://api.spyglassmc.com/mcje/versions || true)
-            if [ -z "$API_JSON" ]; then
+            if [ -z "$API_JSON" ] || ! echo "$API_JSON" | jq empty > /dev/null 2>&1; then
               echo "::error:: Spyglass API unreachable!"
+              echo " Response: $API_JSON"
               exit 1
             fi
 
             # Determine MC_LOWER: oldest version matching LOWER_DP
             # LIMITATION: Mod loaders don't accept snapshot versions, so we assume lower pack format is a release (and not a snapshot)
             MC_LOWER=$(echo "$API_JSON" | jq -r --argjson lower_dp "$LOWER_DP" '[.[] | select(.data_pack_version == $lower_dp and .type == "release")] | sort_by(.release_time | sub("\\+00:00$"; "Z") | fromdateiso8601) | .[0].id')
-            if [ "$MC_LOWER" = "null" ]; then
+            if [ -z "$MC_LOWER" ] || [ "$MC_LOWER" = "null" ]; then
               echo "::error:: Expected a release version for pack format ($LOWER_DP), but none was found!"
               exit 1
             fi
 
             # Determine MC_UPPER: newest version matching UPPER_DP
             CHOSEN_UPPER_OBJ=$(echo "$API_JSON" | jq -c --argjson upper_dp "$UPPER_DP" '[.[] | select(.data_pack_version == $upper_dp)] | sort_by(.release_time | sub("\\+00:00$"; "Z") | fromdateiso8601) | reverse | .[0]')
+            if [ -z "$CHOSEN_UPPER_OBJ" ] || [ "$CHOSEN_UPPER_OBJ" = "null" ]; then
+              echo "::error:: Expected a version for pack format ($UPPER_DP), but none was found!"
+              exit 1
+            fi
             MC_UPPER=$(echo "$CHOSEN_UPPER_OBJ" | jq -r '.id')
 
             echo "Found MC_LOWER=$MC_LOWER, MC_UPPER=$MC_UPPER"
@@ -217,19 +222,19 @@ jobs:
       - name: Upload artifacts
         id: upload
         uses: actions/upload-artifact@v4
-        if: github.event.inputs.dry_run == true
+        if: github.event.inputs.dry_run == 'true'
         with:
-          name: "${{ github.event.repository.name }} v${{ env.TAG }} Test Builds (Unzip Me)"
+          name: "${{ github.event.repository.name }} v${{ github.event.inputs.tag }} Test Builds (Unzip Me)"
           path: |
-            ./${{ github.event.repository.name }}-v${{ env.TAG }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
-            ./${{ github.event.repository.name }}-v${{ env.TAG }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
-            ./${{ github.event.repository.name }}-v${{ env.TAG }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-resourcepack.zip
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-resourcepack.zip
 
       # Upload
       - name: Upload data pack version to Modrinth
         id: upload_modrinth_dp
         uses: Kir-Antipov/mc-publish@v3.3
-        if: steps.check_datapack_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == false
+        if: steps.check_datapack_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
         with:
           modrinth-id: zrzYrlm0
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -244,12 +249,12 @@ jobs:
           loaders: |
             datapack
           files: |
-            ./${{ github.event.repository.name }}-*.zip
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
       
       - name: Upload mod version to Modrinth
         id: upload_modrinth_mod
         uses: Kir-Antipov/mc-publish@v3.3
-        if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == false
+        if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
         with:
           modrinth-id: zrzYrlm0
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -269,16 +274,16 @@ jobs:
             midnightlib(optional){modrinth:codAaoxh}
           loaders: |
             fabric
-            forge
             quilt
+            forge
             neoforge
           files: |
-            ./${{ github.event.repository.name }}-*-mod.jar
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
 
       - name: Upload data pack version to CurseForge
         id: upload_curseforge_dp
         uses: Kir-Antipov/mc-publish@v3.3
-        if: steps.check_datapack_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == false
+        if: steps.check_datapack_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
         with:
           curseforge-id: 811803
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -293,12 +298,12 @@ jobs:
           loaders: |
             datapack
           files: |
-            ./${{ github.event.repository.name }}-*.zip
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
 
       - name: Upload mod version to CurseForge
         id: upload_curseforge_mod
         uses: Kir-Antipov/mc-publish@v3.3
-        if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == false
+        if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
         with:
           curseforge-id: 1223719
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -322,15 +327,15 @@ jobs:
             forge
             neoforge
           files: |
-            ./${{ github.event.repository.name }}-*-mod.jar
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
 
       - name: Add changelog header for GitHub release
-        if: github.event.inputs.dry_run == false
+        if: github.event.inputs.dry_run == 'false'
         run: sed -i '1i_Changelog:_' CHANGES.md
       - name: Upload outputs to GitHub releases
         id: upload_github
         uses: Kir-Antipov/mc-publish@v3.3
-        if: github.event.inputs.dry_run == false
+        if: github.event.inputs.dry_run == 'false'
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           github-tag: v${{ github.event.inputs.tag }}
@@ -341,7 +346,7 @@ jobs:
           changelog-file: CHANGES.md
 
           files: |
-           ./${{ github.event.repository.name }}-*.@(zip|jar)
+           ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}*.@(zip|jar)
 
       # Build summary
       - name: Set job summary
@@ -355,7 +360,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${{ github.event.inputs.tag }}** for **mc${{ env.MC_HUMAN_VERSION_RANGE }}** published successfully!
+            **${{ github.event.repository.name }} v${{ github.event.inputs.tag }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** published successfully!
 
             [View Changelog](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.tag }}/CHANGES.md)
 

.github/workflows/ci.yml

@@ -79,15 +79,16 @@ jobs:
               LOWER_DP=$(jq -r '.pack.supported_formats[0]' pack.mcmeta)
               UPPER_DP=$(jq -r '.pack.supported_formats[1]' pack.mcmeta)
             else
-              echo "::error:: pack.mcmeta not found!"
+              echo "::error:: pack.mcmeta file not found!"
               exit 1
             fi
             echo "Lower data pack format: $LOWER_DP, Upper: $UPPER_DP"
 
             echo "Fetching versions from Spyglass API..."
             API_JSON=$(curl -s https://api.spyglassmc.com/mcje/versions || true)
-            if [ -z "$API_JSON" ]; then
+            if [ -z "$API_JSON" ] || ! echo "$API_JSON" | jq empty > /dev/null 2>&1; then
               echo "::warning:: Spyglass API unreachable, using fallback values. The annotated Minecraft versions may not be accurate."
+              echo " Response: $API_JSON"
               ENDPOINT_DOWN=true
             else
               ENDPOINT_DOWN=false
@@ -110,13 +111,17 @@ jobs:
               # Determine MC_LOWER: oldest version matching LOWER_DP
               # LIMITATION: Mod loaders don't accept snapshot versions, so we assume lower pack format is a release (and not a snapshot)
               MC_LOWER=$(echo "$API_JSON" | jq -r --argjson lower_dp "$LOWER_DP" '[.[] | select(.data_pack_version == $lower_dp and .type == "release")] | sort_by(.release_time | sub("\\+00:00$"; "Z") | fromdateiso8601) | .[0].id')
-              if [ "$MC_LOWER" = "null" ]; then
+              if [ -z "$MC_LOWER" ] || [ "$MC_LOWER" = "null" ]; then
                 echo "::error:: Expected a release version for pack format ($LOWER_DP), but none was found!"
                 exit 1
               fi
 
               # Determine MC_UPPER: newest version matching UPPER_DP
               CHOSEN_UPPER_OBJ=$(echo "$API_JSON" | jq -c --argjson upper_dp "$UPPER_DP" '[.[] | select(.data_pack_version == $upper_dp)] | sort_by(.release_time | sub("\\+00:00$"; "Z") | fromdateiso8601) | reverse | .[0]')
+              if [ -z "$CHOSEN_UPPER_OBJ" ] || [ "$CHOSEN_UPPER_OBJ" = "null" ]; then
+                # If no version is found, use the latest version from the API
+                CHOSEN_UPPER_OBJ=$(echo "$API_JSON" | jq -c 'sort_by(.release_time | sub("\\+00:00$"; "Z") | fromdateiso8601) | reverse | .[0]')
+              fi
               MC_UPPER=$(echo "$CHOSEN_UPPER_OBJ" | jq -r '.id')
 
               echo "Found MC_LOWER=$MC_LOWER, MC_UPPER=$MC_UPPER"
@@ -291,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 mc${{ env.MC_HUMAN_VERSION_RANGE }} built successfully! [See changelog](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.ref_name }}/CHANGES.md).
 
           [Download via nightly.link](https://nightly.link/${{ github.repository }}/actions/runs/${{ github.run_id }})
 

CHANGES.md

@@ -1,6 +1,10 @@
-- **Added support for Minecraft 1.21.5** 📔
-  - Updated to work with the new equipment NBT format, new text component format, FallDistance NBT rename, and potion entity ID renames
-  - Hide worn armor and tools now uses the unified armor.body slot instead of armor.feet for 1.21.5 and above to allow better late loot recovery
+- **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 mod (closes [#38](https://github.com/Tschipcraft/spawnanimations/issues/38))
+  - 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

META-INF/mods.toml

@@ -22,6 +22,7 @@ displayURL="https://modrinth.com/mod/zrzYrlm0"
 issueTrackerURL="https://github.com/Tschipcraft/spawnanimations/issues"
 updateJSONURL="https://api.modrinth.com/updates/zrzYrlm0/forge_updates.json?forge=only"
 displayTest="IGNORE_SERVER_VERSION"
+features={ java_version = "[17,)" }
 
 [[dependencies.spawnanimations]]
     modId="minecraft"
@@ -36,6 +37,7 @@ displayTest="IGNORE_SERVER_VERSION"
     versionRange="[1.0.0,)"
     ordering="NONE"
     side="BOTH"
+    referralUrl="https://modrinth.com/mod/codAaoxh/versions?l=forge"
 
 [modproperties.spawnanimations]
     catalogueItemIcon="minecraft:zombie_spawn_egg"

META-INF/neoforge.mods.toml

@@ -22,6 +22,7 @@ displayURL="https://modrinth.com/mod/zrzYrlm0"
 issueTrackerURL="https://github.com/Tschipcraft/spawnanimations/issues"
 updateJSONURL="https://api.modrinth.com/updates/zrzYrlm0/forge_updates.json?neoforge=only"
 displayTest="IGNORE_SERVER_VERSION"
+features={ java_version = "[21,)" }
 
 [[dependencies.spawnanimations]]
     modId="minecraft"
@@ -37,7 +38,7 @@ displayTest="IGNORE_SERVER_VERSION"
     ordering="NONE"
     side="BOTH"
     referralUrl="https://modrinth.com/mod/codAaoxh/versions?l=neoforge"
-    reason="For global settings across all worlds."
+    reason="Global settings across all worlds"
 
 [modproperties.spawnanimations]
     catalogueItemIcon="minecraft:zombie_spawn_egg"

data/spawnanimations/function/install.mcfunction

@@ -1,20 +1,14 @@
 ## by Tschipcraft
 
+## Initalise scoreboards
 scoreboard objectives add ts.sa.timer dummy
 scoreboard objectives add ts.sa.count dummy
-scoreboard objectives add tschipcraft.menu trigger
 scoreboard objectives add ts.sa.welcome trigger
 
 scoreboard objectives add ts.sa.x dummy
 scoreboard objectives add ts.sa.y dummy
 scoreboard objectives add ts.sa.z dummy
 
-scoreboard objectives add ts.sa.settings dummy
-scoreboard objectives add ts.sa.distance dummy
-
-# Default settings
-function spawnanimations:settings/defaults
-
 # Entity properties
 scoreboard objectives add ts.sa.e.y dummy
 scoreboard objectives add ts.sa.e.speed dummy
@@ -24,12 +18,26 @@ scoreboard objectives add ts.sa.e.nbt.Inv dummy
 scoreboard objectives add ts.sa.e.nbt.Sil dummy
 scoreboard objectives add ts.sa.e.nbt.CrCh dummy
 
-# Initalise storage
+# Settings
+scoreboard objectives add ts.sa.settings dummy
+scoreboard objectives add ts.sa.distance dummy
+
+function spawnanimations:settings/defaults
+
+# Menu/Other
+scoreboard objectives add tschipcraft.menu trigger
+scoreboard players enable @a tschipcraft.menu
+
+scoreboard objectives add tvc_ignore dummy
+
+## Initalise storage
 data merge storage spawnanimations:temp {ArmorItems:[{},{},{},{}],HandItems:[{},{}]}
 
-# Schedule loop
+## Reset advancements
+advancement revoke @a only tschipcraft:menu
+
+## Schedule loop and execute version checker
 schedule clear spawnanimations:loop
 schedule function spawnanimations:loop 1s
 
-# Initalise mc version checker
 function spawnanimations:internal/version_checker/start

data/spawnanimations/function/reset.mcfunction

@@ -11,8 +11,13 @@ execute as @e[tag=ts.sa.verify] at @s run function spawnanimations:internal/anim
 # Reset checked items
 tag @e[type=minecraft:item,tag=ts.sa.i.checked] remove ts.sa.i.checked
 
+# Reset advancements
+scoreboard players reset @a tschipcraft.menu
+scoreboard players enable @a tschipcraft.menu
+advancement revoke @a only tschipcraft:menu
+
 # Reschedule loop
 schedule clear spawnanimations:loop
 schedule function spawnanimations:loop 2s
 
-say ⏏ Successfully resetted Spawn Animations!
+say ⏏ Spawn Animations successfully reset!

data/spawnanimations/function/uninstall.mcfunction

@@ -22,6 +22,7 @@ scoreboard objectives remove ts.sa.settings
 scoreboard objectives remove ts.sa.distance
 
 scoreboard objectives remove tschipcraft.menu
+execute unless score $global tvc_ignore matches 1 run scoreboard objectives remove tvc_ignore
 
 scoreboard objectives remove ts.sa.e.y
 scoreboard objectives remove ts.sa.e.speed

data/spawnanimations/functions/install.mcfunction

@@ -1,20 +1,14 @@
 ## by Tschipcraft
 
+## Initalise scoreboards
 scoreboard objectives add ts.sa.timer dummy
 scoreboard objectives add ts.sa.count dummy
-scoreboard objectives add tschipcraft.menu trigger
 scoreboard objectives add ts.sa.welcome trigger
 
 scoreboard objectives add ts.sa.x dummy
 scoreboard objectives add ts.sa.y dummy
 scoreboard objectives add ts.sa.z dummy
 
-scoreboard objectives add ts.sa.settings dummy
-scoreboard objectives add ts.sa.distance dummy
-
-# Default settings
-function spawnanimations:settings/defaults
-
 # Entity properties
 scoreboard objectives add ts.sa.e.y dummy
 scoreboard objectives add ts.sa.e.speed dummy
@@ -24,12 +18,23 @@ scoreboard objectives add ts.sa.e.nbt.Inv dummy
 scoreboard objectives add ts.sa.e.nbt.Sil dummy
 scoreboard objectives add ts.sa.e.nbt.CrCh dummy
 
-# Initalise storage
+# Settings
+scoreboard objectives add ts.sa.settings dummy
+scoreboard objectives add ts.sa.distance dummy
+
+function spawnanimations:settings/defaults
+
+# Menu/Other
+scoreboard objectives add tschipcraft.menu trigger
+scoreboard players enable @a tschipcraft.menu
+
+scoreboard objectives add tvc_ignore dummy
+
+## Initalise storage
 data merge storage spawnanimations:temp {ArmorItems:[{},{},{},{}],HandItems:[{},{}]}
 
-# Schedule loop
+## Schedule loop and execute version checker
 schedule clear spawnanimations:loop
 schedule function spawnanimations:loop 1s
 
-# Initalise mc version checker
 function spawnanimations:internal/version_checker/start

data/spawnanimations/functions/reset.mcfunction

@@ -15,4 +15,4 @@ tag @e[type=minecraft:item,tag=ts.sa.i.checked] remove ts.sa.i.checked
 schedule clear spawnanimations:loop
 schedule function spawnanimations:loop 2s
 
-say ⏏ Successfully resetted Spawn Animations!
+say ⏏ Spawn Animations successfully reset!