Skip to content

Commit d883f5e

Browse files
TschipcraftTschipcraft
authored
Merge pull request #44 from Tschipcraft/dev
v1.11
2 parents e03f846 + 27208da commit d883f5e

File tree

130 files changed

+1015
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1015
-218
lines changed

‎.github/workflows/cd.yml‎

Lines changed: 91 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,37 @@ jobs:
248248

249249
dependencies: |
250250
mr_spawn_animationscompats(optional){modrinth:ofDka6PS}
251+
pehkui(optional){modrinth:t5W7Jfwy}
251252
loaders: |
252253
datapack
253254
files: |
254255
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
255-
256+
257+
- 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
258+
id: upload_forge_modrinth_mod
259+
uses: Kir-Antipov/mc-publish@v3.3
260+
if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
261+
with:
262+
modrinth-id: zrzYrlm0
263+
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
264+
game-versions: |
265+
>=1.17 <=1.21.5
266+
game-version-filter: any
267+
fail-mode: skip
268+
269+
name: "[Mod] Release v${{ github.event.inputs.tag }}"
270+
version: ${{ github.event.inputs.tag }}+mod
271+
changelog-file: CHANGES.md
272+
273+
dependencies: |
274+
mr_spawn_animationscompats(optional){modrinth:ofDka6PS}
275+
midnightlib(optional){modrinth:codAaoxh}
276+
pehkui(optional){modrinth:t5W7Jfwy}
277+
loaders: |
278+
forge
279+
files: |
280+
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
281+
256282
- name: Upload mod version to Modrinth
257283
id: upload_modrinth_mod
258284
uses: Kir-Antipov/mc-publish@v3.3
@@ -275,10 +301,10 @@ jobs:
275301
modmenu(optional){modrinth:mOgUt4GM}
276302
modmenu-badges-lib(optional){modrinth:eUw8l2Vi}
277303
midnightlib(optional){modrinth:codAaoxh}
304+
pehkui(optional){modrinth:t5W7Jfwy}
278305
loaders: |
279306
fabric
280307
quilt
281-
forge
282308
neoforge
283309
files: |
284310
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
@@ -298,11 +324,41 @@ jobs:
298324
version: ${{ github.event.inputs.tag }}
299325
changelog-file: CHANGES.md
300326

327+
dependencies: |
328+
pehkui(optional){curseforge:319596}
301329
loaders: |
302330
datapack
303331
files: |
304332
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
305333
334+
- name: Upload Forge mod version to CurseForge # Same reason as above
335+
id: upload_forge_curseforge_mod
336+
uses: Kir-Antipov/mc-publish@v3.3
337+
if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
338+
with:
339+
curseforge-id: 1223719
340+
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
341+
game-versions: |
342+
>=1.17 <=1.21.5
343+
game-version-filter: any
344+
fail-mode: skip
345+
346+
name: "Release v${{ github.event.inputs.tag }}"
347+
version: ${{ github.event.inputs.tag }}+mod
348+
changelog-file: CHANGES.md
349+
350+
dependencies: |
351+
catalogue(optional){curseforge:459701}
352+
midnightlib(optional){curseforge:488090}
353+
pehkui(optional){curseforge:319596}
354+
java: |
355+
Java 21
356+
Java 17
357+
loaders: |
358+
forge
359+
files: |
360+
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
361+
306362
- name: Upload mod version to CurseForge
307363
id: upload_curseforge_mod
308364
uses: Kir-Antipov/mc-publish@v3.3
@@ -321,13 +377,13 @@ jobs:
321377
dependencies: |
322378
catalogue(optional){curseforge:459701}
323379
midnightlib(optional){curseforge:488090}
380+
pehkui(optional){curseforge:319596}
324381
java: |
325382
Java 21
326383
Java 17
327384
loaders: |
328385
fabric
329386
quilt
330-
forge
331387
neoforge
332388
files: |
333389
./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
@@ -358,47 +414,48 @@ jobs:
358414
run: |
359415
echo "Building summary..."
360416
if [ "${{ job.status }}" == "success" ]; then
361-
SUMMARY_CONTENT="<picture>
362-
<source media=\"(prefers-color-scheme: light)\" srcset=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg\">
363-
<img alt=\"✅ Success\" src=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg\">
364-
</picture><br>
417+
SUMMARY_CONTENT="<picture>
418+
<source media=\"(prefers-color-scheme: light)\" srcset=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg\">
419+
<img alt=\"✅ Success\" src=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg\">
420+
</picture><br>
365421
366-
**${{ github.event.repository.name }} v${{ github.event.inputs.tag }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** published successfully!
422+
**${{ github.event.repository.name }} v${{ github.event.inputs.tag }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** published successfully!
367423
368-
[View Changelog](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.tag }}/CHANGES.md)
424+
[View Changelog](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.tag }}/CHANGES.md)
369425
370-
**Downloads:**
371-
"
426+
**Downloads:**
427+
"
372428
373-
if [ -n "${{ steps.upload_modrinth_dp.outputs.modrinth-url }}" ]; then
374-
SUMMARY_CONTENT+="- [Modrinth (Data Pack)](${{ steps.upload_modrinth_dp.outputs.modrinth-url }})
375-
"
376-
fi
377-
if [ -n "${{ steps.upload_modrinth_mod.outputs.modrinth-url }}" ]; then
378-
SUMMARY_CONTENT+="- [Modrinth (Mod)](${{ steps.upload_modrinth_mod.outputs.modrinth-url }})
379-
"
380-
fi
381-
if [ -n "${{ steps.upload_curseforge_dp.outputs.curseforge-url }}" ]; then
382-
SUMMARY_CONTENT+="- [CurseForge (Data Pack)](${{ steps.upload_curseforge_dp.outputs.curseforge-url }})
383-
"
384-
fi
385-
if [ -n "${{ steps.upload_curseforge_mod.outputs.curseforge-url }}" ]; then
386-
SUMMARY_CONTENT+="- [CurseForge (Mod)](${{ steps.upload_curseforge_mod.outputs.curseforge-url }})
387-
"
388-
fi
389-
if [ -n "${{ steps.upload_github.outputs.github-url }}" ]; then
390-
SUMMARY_CONTENT+="- [GitHub Releases](${{ steps.upload_github.outputs.github-url }})
391-
"
392-
fi
429+
if [ -n "${{ steps.upload_modrinth_dp.outputs.modrinth-url }}" ]; then
430+
SUMMARY_CONTENT+="- [Modrinth (Data Pack)](${{ steps.upload_modrinth_dp.outputs.modrinth-url }})
431+
"
432+
fi
433+
if [ -n "${{ steps.upload_modrinth_mod.outputs.modrinth-url }}" ]; then
434+
SUMMARY_CONTENT+="- [Modrinth (Mod)](${{ steps.upload_modrinth_mod.outputs.modrinth-url }})
435+
"
436+
fi
437+
if [ -n "${{ steps.upload_curseforge_dp.outputs.curseforge-url }}" ]; then
438+
SUMMARY_CONTENT+="- [CurseForge (Data Pack)](${{ steps.upload_curseforge_dp.outputs.curseforge-url }})
439+
"
440+
fi
441+
if [ -n "${{ steps.upload_curseforge_mod.outputs.curseforge-url }}" ]; then
442+
SUMMARY_CONTENT+="- [CurseForge (Mod)](${{ steps.upload_curseforge_mod.outputs.curseforge-url }})
443+
"
444+
fi
445+
if [ -n "${{ steps.upload_github.outputs.github-url }}" ]; then
446+
SUMMARY_CONTENT+="- [GitHub Releases](${{ steps.upload_github.outputs.github-url }})
447+
"
448+
fi
449+
450+
echo -e "$SUMMARY_CONTENT" >> $GITHUB_STEP_SUMMARY
393451
394-
echo -e "$SUMMARY_CONTENT" >> $GITHUB_STEP_SUMMARY
395452
else
396-
cat << EOF >> $GITHUB_STEP_SUMMARY
453+
cat << EOF >> $GITHUB_STEP_SUMMARY
397454
<picture>
398455
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/error.svg">
399456
<img alt="❌ Error" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/error.svg">
400457
</picture><br>
401458
402-
The publish job for v${{ github.event.inputs.tag }} (mc${{ env.MC_HUMAN_VERSION_RANGE }}) failed! Please check the action logs for details.
459+
The publish job for **v${{ github.event.inputs.tag }}** (Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}) failed! Please check the action logs for details.
403460
EOF
404461
fi

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ on:
1717
description: 'Set to true to skip command validation'
1818
required: false
1919
type: boolean
20-
default: false
20+
default: true
2121

2222
env:
2323
# Fallback Lower: when Spyglass API is unreachable
2424
FALLBACK_MC_LOWER: "1.17"
2525
# Fallback Upper: when Spyglass API and Mojang API are unreachable
26-
FALLBACK_MC_UPPER: "1.21.5"
26+
FALLBACK_MC_UPPER: "1.21.8"
2727

2828
jobs:
2929
deploy:
@@ -189,9 +189,9 @@ jobs:
189189
echo " NeoForge range: $MACHINE_RANGE_NEOFORGE"
190190
echo " Validator version: $CMD_VALIDATOR_MC"
191191
192-
# Optionally validate commands
192+
# Optionally validate commands (disabled by default upon push due to unrecognized Pehkui commands)
193193
- name: Validate commands
194-
if: ${{ github.event.inputs.skip_check != 'true' }}
194+
if: ${{ github.event.inputs.skip_check == 'false' }}
195195
uses: mcbeet/check-commands@v1
196196
with:
197197
source: .
@@ -310,6 +310,6 @@ jobs:
310310
<img alt="❌ Error" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/error.svg">
311311
</picture><br>
312312
313-
The build v${{ env.TAG }} for mc${{ env.MC_HUMAN_VERSION_RANGE }} failed! Please check the action logs for details.
313+
The build **v${{ env.TAG }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** failed! Please check the action logs for details.
314314
EOF
315315
fi

‎CHANGES.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
- **Added support for Minecraft 1.21.7** 💿
1+
- **Entities with emissive layers are now properly hidden** 👻 (Endermen, Spiders, and Cave Spiders) (closes [#25](https://github.com/Tschipcraft/spawnanimations/issues/25))
2+
- 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
3+
- 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))
4+
- 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!
5+
- 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
6+
- Added an activation distance recommendation message when using the Vanilla activation mode
7+
- Removed the Hoglin from the dig up animation
8+
- 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))
9+
- Fixed poof animation playing multiple times when "Play Animation on Unsupported Blocks" is off
10+
- Fixed possibility of hidden falling mobs losing their fall distance NBT when appearing
11+
- Fixed v0 save format not correctly upgrading to v1 in 1.20.5 and 1.20.6 (precisely from 24w11a to 24w20a)
12+
- Changed exclude tag from `exclude` to `ts.sa.exclude`

‎META-INF/mods.toml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ features={ java_version = "[17,)" }
2727
[[dependencies.spawnanimations]]
2828
modId="minecraft"
2929
mandatory=true
30-
versionRange="${mc_version_range_forge}"
30+
versionRange="[1.17,1.21.5]"
3131
ordering="NONE"
3232
side="BOTH"
3333

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

50+
[[dependencies.spawnanimations]]
51+
modId="pehkui"
52+
mandatory=false
53+
versionRange="[3.4.0,)"
54+
ordering="NONE"
55+
side="BOTH"
56+
referralUrl="https://modrinth.com/mod/t5W7Jfwy/versions?l=forge"
57+
5058
[modproperties.spawnanimations]
5159
catalogueItemIcon="minecraft:zombie_spawn_egg"

‎META-INF/neoforge.mods.toml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,18 @@ features={ java_version = "[21,)" }
4545
type="optional"
4646
versionRange="[1.0,)"
4747
ordering="NONE"
48-
side="BOTH"
48+
side="SERVER"
4949
referralUrl="https://modrinth.com/mod/ofDka6PS/versions?l=neoforge"
5050
reason="Compatibility with other mods"
5151

52+
[[dependencies.spawnanimations]]
53+
modId="pehkui"
54+
type="optional"
55+
versionRange="[3.4.0,)"
56+
ordering="NONE"
57+
side="BOTH"
58+
referralUrl="https://modrinth.com/mod/t5W7Jfwy/versions?l=neoforge"
59+
reason="Completely hiding entities with an emissive layer"
60+
5261
[modproperties.spawnanimations]
5362
catalogueItemIcon="minecraft:zombie_spawn_egg"

0 commit comments

Comments
 (0)