Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 91 additions & 34 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,37 @@ jobs:

dependencies: |
mr_spawn_animationscompats(optional){modrinth:ofDka6PS}
pehkui(optional){modrinth:t5W7Jfwy}
loaders: |
datapack
files: |
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip


- name: Upload Forge mod version to Modrinth # Forge mod version is uploaded separately atm due to it not being compatible with Minecraft 1.21.6 or above
id: upload_forge_modrinth_mod
uses: Kir-Antipov/mc-publish@v3.3
if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
with:
modrinth-id: zrzYrlm0
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
game-versions: |
>=1.17 <=1.21.5
game-version-filter: any
fail-mode: skip

name: "[Mod] Release v${{ github.event.inputs.tag }}"
version: ${{ github.event.inputs.tag }}+mod
changelog-file: CHANGES.md

dependencies: |
mr_spawn_animationscompats(optional){modrinth:ofDka6PS}
midnightlib(optional){modrinth:codAaoxh}
pehkui(optional){modrinth:t5W7Jfwy}
loaders: |
forge
files: |
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar

- name: Upload mod version to Modrinth
id: upload_modrinth_mod
uses: Kir-Antipov/mc-publish@v3.3
Expand All @@ -275,10 +301,10 @@ jobs:
modmenu(optional){modrinth:mOgUt4GM}
modmenu-badges-lib(optional){modrinth:eUw8l2Vi}
midnightlib(optional){modrinth:codAaoxh}
pehkui(optional){modrinth:t5W7Jfwy}
loaders: |
fabric
quilt
forge
neoforge
files: |
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
Expand All @@ -298,11 +324,41 @@ jobs:
version: ${{ github.event.inputs.tag }}
changelog-file: CHANGES.md

dependencies: |
pehkui(optional){curseforge:319596}
loaders: |
datapack
files: |
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip

- name: Upload Forge mod version to CurseForge # Same reason as above
id: upload_forge_curseforge_mod
uses: Kir-Antipov/mc-publish@v3.3
if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
with:
curseforge-id: 1223719
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
game-versions: |
>=1.17 <=1.21.5
game-version-filter: any
fail-mode: skip

name: "Release v${{ github.event.inputs.tag }}"
version: ${{ github.event.inputs.tag }}+mod
changelog-file: CHANGES.md

dependencies: |
catalogue(optional){curseforge:459701}
midnightlib(optional){curseforge:488090}
pehkui(optional){curseforge:319596}
java: |
Java 21
Java 17
loaders: |
forge
files: |
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar

- name: Upload mod version to CurseForge
id: upload_curseforge_mod
uses: Kir-Antipov/mc-publish@v3.3
Expand All @@ -321,13 +377,13 @@ jobs:
dependencies: |
catalogue(optional){curseforge:459701}
midnightlib(optional){curseforge:488090}
pehkui(optional){curseforge:319596}
java: |
Java 21
Java 17
loaders: |
fabric
quilt
forge
neoforge
files: |
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
Expand Down Expand Up @@ -358,47 +414,48 @@ jobs:
run: |
echo "Building summary..."
if [ "${{ job.status }}" == "success" ]; then
SUMMARY_CONTENT="<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>
SUMMARY_CONTENT="<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${{ github.event.inputs.tag }}** for **Minecraft ${{ 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)
[View Changelog](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.tag }}/CHANGES.md)

**Downloads:**
"
**Downloads:**
"

if [ -n "${{ steps.upload_modrinth_dp.outputs.modrinth-url }}" ]; then
SUMMARY_CONTENT+="- [Modrinth (Data Pack)](${{ steps.upload_modrinth_dp.outputs.modrinth-url }})
"
fi
if [ -n "${{ steps.upload_modrinth_mod.outputs.modrinth-url }}" ]; then
SUMMARY_CONTENT+="- [Modrinth (Mod)](${{ steps.upload_modrinth_mod.outputs.modrinth-url }})
"
fi
if [ -n "${{ steps.upload_curseforge_dp.outputs.curseforge-url }}" ]; then
SUMMARY_CONTENT+="- [CurseForge (Data Pack)](${{ steps.upload_curseforge_dp.outputs.curseforge-url }})
"
fi
if [ -n "${{ steps.upload_curseforge_mod.outputs.curseforge-url }}" ]; then
SUMMARY_CONTENT+="- [CurseForge (Mod)](${{ steps.upload_curseforge_mod.outputs.curseforge-url }})
"
fi
if [ -n "${{ steps.upload_github.outputs.github-url }}" ]; then
SUMMARY_CONTENT+="- [GitHub Releases](${{ steps.upload_github.outputs.github-url }})
"
fi
if [ -n "${{ steps.upload_modrinth_dp.outputs.modrinth-url }}" ]; then
SUMMARY_CONTENT+="- [Modrinth (Data Pack)](${{ steps.upload_modrinth_dp.outputs.modrinth-url }})
"
fi
if [ -n "${{ steps.upload_modrinth_mod.outputs.modrinth-url }}" ]; then
SUMMARY_CONTENT+="- [Modrinth (Mod)](${{ steps.upload_modrinth_mod.outputs.modrinth-url }})
"
fi
if [ -n "${{ steps.upload_curseforge_dp.outputs.curseforge-url }}" ]; then
SUMMARY_CONTENT+="- [CurseForge (Data Pack)](${{ steps.upload_curseforge_dp.outputs.curseforge-url }})
"
fi
if [ -n "${{ steps.upload_curseforge_mod.outputs.curseforge-url }}" ]; then
SUMMARY_CONTENT+="- [CurseForge (Mod)](${{ steps.upload_curseforge_mod.outputs.curseforge-url }})
"
fi
if [ -n "${{ steps.upload_github.outputs.github-url }}" ]; then
SUMMARY_CONTENT+="- [GitHub Releases](${{ steps.upload_github.outputs.github-url }})
"
fi

echo -e "$SUMMARY_CONTENT" >> $GITHUB_STEP_SUMMARY

echo -e "$SUMMARY_CONTENT" >> $GITHUB_STEP_SUMMARY
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">
</picture><br>

The publish job for v${{ github.event.inputs.tag }} (mc${{ env.MC_HUMAN_VERSION_RANGE }}) failed! Please check the action logs for details.
The publish job for **v${{ github.event.inputs.tag }}** (Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}) failed! Please check the action logs for details.
EOF
fi
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ on:
description: 'Set to true to skip command validation'
required: false
type: boolean
default: false
default: true

env:
# Fallback Lower: when Spyglass API is unreachable
FALLBACK_MC_LOWER: "1.17"
# Fallback Upper: when Spyglass API and Mojang API are unreachable
FALLBACK_MC_UPPER: "1.21.5"
FALLBACK_MC_UPPER: "1.21.8"

jobs:
deploy:
Expand Down Expand Up @@ -189,9 +189,9 @@ jobs:
echo " NeoForge range: $MACHINE_RANGE_NEOFORGE"
echo " Validator version: $CMD_VALIDATOR_MC"

# Optionally validate commands
# Optionally validate commands (disabled by default upon push due to unrecognized Pehkui commands)
- name: Validate commands
if: ${{ github.event.inputs.skip_check != 'true' }}
if: ${{ github.event.inputs.skip_check == 'false' }}
uses: mcbeet/check-commands@v1
with:
source: .
Expand Down Expand Up @@ -310,6 +310,6 @@ jobs:
<img alt="❌ Error" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/error.svg">
</picture><br>

The build v${{ env.TAG }} for mc${{ env.MC_HUMAN_VERSION_RANGE }} failed! Please check the action logs for details.
The build **v${{ env.TAG }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** failed! Please check the action logs for details.
EOF
fi
13 changes: 12 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
- **Added support for Minecraft 1.21.7** 💿
- **Entities with emissive layers are now properly hidden** 👻 (Endermen, Spiders, and Cave Spiders) (closes [#25](https://github.com/Tschipcraft/spawnanimations/issues/25))
- For this feature to work in Minecraft 1.20.4 and below, [Pehkui](https://modrinth.com/project/t5W7Jfwy) must be installed. Pehkui can still be installed in newer versions for smoother poof animations
- Added config options to enable/disable the poof animation ([#40](https://github.com/Tschipcraft/spawnanimations/issues/40)), animation sounds (closes [#39](https://github.com/Tschipcraft/spawnanimations/issues/39)), reducing the number of particles emitted by hidden Endermen, and hiding emissive mob layers ([#25](https://github.com/Tschipcraft/spawnanimations/issues/25))
- Improved performance by refactoring entity activation distance calculations to bundle and cache position data retrieval calls and by updating batch activation logic. The whole project is now up to 45% faster per tick!
- Modified the attack predicate of the secondary dig-up requirements so that it disregards the Y-distance. This allows mobs to, for example, appear at the bottom of pillars if a player decides to build up during the night
- Added an activation distance recommendation message when using the Vanilla activation mode
- Removed the Hoglin from the dig up animation
- Fixed most compatibility issues with [Hostile Mobs Improve Over Time](https://modrinth.com/project/ku4JD9TH) by adding missing tag recovery logic when preparing an entity for hiding. This should generally improve compatibility with other packs that override entity tags (closes [#26](https://github.com/Tschipcraft/spawnanimations/issues/26))
- Fixed poof animation playing multiple times when "Play Animation on Unsupported Blocks" is off
- Fixed possibility of hidden falling mobs losing their fall distance NBT when appearing
- Fixed v0 save format not correctly upgrading to v1 in 1.20.5 and 1.20.6 (precisely from 24w11a to 24w20a)
- Changed exclude tag from `exclude` to `ts.sa.exclude`
12 changes: 10 additions & 2 deletions META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ features={ java_version = "[17,)" }
[[dependencies.spawnanimations]]
modId="minecraft"
mandatory=true
versionRange="${mc_version_range_forge}"
versionRange="[1.17,1.21.5]"
ordering="NONE"
side="BOTH"

Expand All @@ -44,8 +44,16 @@ features={ java_version = "[17,)" }
mandatory=false
versionRange="[1.0,)"
ordering="NONE"
side="BOTH"
side="SERVER"
referralUrl="https://modrinth.com/mod/ofDka6PS/versions?l=forge"

[[dependencies.spawnanimations]]
modId="pehkui"
mandatory=false
versionRange="[3.4.0,)"
ordering="NONE"
side="BOTH"
referralUrl="https://modrinth.com/mod/t5W7Jfwy/versions?l=forge"

[modproperties.spawnanimations]
catalogueItemIcon="minecraft:zombie_spawn_egg"
11 changes: 10 additions & 1 deletion META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,18 @@ features={ java_version = "[21,)" }
type="optional"
versionRange="[1.0,)"
ordering="NONE"
side="BOTH"
side="SERVER"
referralUrl="https://modrinth.com/mod/ofDka6PS/versions?l=neoforge"
reason="Compatibility with other mods"

[[dependencies.spawnanimations]]
modId="pehkui"
type="optional"
versionRange="[3.4.0,)"
ordering="NONE"
side="BOTH"
referralUrl="https://modrinth.com/mod/t5W7Jfwy/versions?l=neoforge"
reason="Completely hiding entities with an emissive layer"

[modproperties.spawnanimations]
catalogueItemIcon="minecraft:zombie_spawn_egg"
Loading