Merge pull request #42 from Tschipcraft/dev

v1.10.2

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

@@ -290,21 +290,21 @@ jobs:
         run: |
           echo "Building summary..."
           if [ "${{ job.status }}" == "success" ]; then
-            cat << EOF >> $GITHUB_STEP_SUMMARY
+          cat << EOF >> $GITHUB_STEP_SUMMARY
           <picture>
             <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg">
             <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 }})
 
           Make sure to always back up your world before using development builds!
           EOF
 
           else
-            cat << EOF >> $GITHUB_STEP_SUMMARY
+          cat << EOF >> $GITHUB_STEP_SUMMARY
           <picture>
             <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/error.svg">
             <img alt="❌ Error" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/error.svg">

.gitignore

@@ -1,247 +1,10 @@
-# Created by https://www.toptal.com/developers/gitignore/api/java,kotlin,gradle,forgegradle,intellij+all,visualstudiocode,eclipse
-# Edit at https://www.toptal.com/developers/gitignore?templates=java,kotlin,gradle,forgegradle,intellij+all,visualstudiocode,eclipse
+# Project-specific #
+upgrade_save_format
+wiki/pages
 
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-.apt_generated_test/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-# Uncomment this line if you wish to ignore the project description file.
-# Typically, this file would be tracked if it contains build/dependency configurations:
-#.project
-
-### Eclipse Patch ###
-# Spring Boot Tooling
-.sts4-cache/
-
-### ForgeGradle ###
-# Minecraft client/server files
-run/
-
-### Intellij+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-.idea/artifacts
-.idea/compiler.xml
-.idea/jarRepositories.xml
-.idea/modules.xml
-.idea/*.iml
-.idea/modules
-*.iml
-*.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Intellij+all Patch ###
-# Ignore everything but code style settings and run configurations
-# that are supposed to be shared within teams.
-
-.idea/*
-
-!.idea/codeStyles
-!.idea/runConfigurations
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# VSCode #
+.vscode
 
 # Package Files #
 *.jar
-*.war
-*.nar
-*.ear
 *.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-replay_pid*
-
-### Kotlin ###
-# Compiled class file
-
-# Log file
-
-# BlueJ files
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-
-### VisualStudioCode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-!.vscode/*.code-snippets
-
-# Local History for Visual Studio Code
-.history/
-
-# Built Visual Studio Code Extensions
-*.vsix
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-### Gradle ###
-.gradle
-**/build/
-!src/**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Avoid ignore Gradle wrappper properties
-!gradle-wrapper.properties
-
-# Cache of project
-.gradletasknamecache
-
-# Eclipse Gradle plugin generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-### Gradle Patch ###
-# Java heap dump
-*.hprof
-
-# End of https://www.toptal.com/developers/gitignore/api/java,kotlin,gradle,forgegradle,intellij+all,visualstudiocode,eclipse

CHANGES.md

@@ -1,10 +1,3 @@
-- **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
+- Slightly lowered the volume of dig up sounds ([#39](https://github.com/Tschipcraft/spawnanimations/issues/39))

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

@@ -35,10 +35,19 @@ features={ java_version = "[21,)" }
     modId="midnightlib"
     type="optional"
     versionRange="[1.0.0,)"
-    ordering="NONE"
+    ordering="AFTER"
     side="BOTH"
     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"