Add support for 1.21.9

- Added support for Minecraft 1.21.9
  - Updated to work with the new pack.mcmeta syntax
  - Bumped pack format and protocol version
- Fixed Vanilla activation mode behaving the same way as Classic for activation distances below 25 (closes #46)
- Removed mentions of the Hoglin being supported from mod descriptions

Author: Tschipcraft

.spyglassrc.json

@@ -1,6 +1,6 @@
 {
   "env": {
-    "gameVersion": "1.21.5",
+    "gameVersion": "1.21.9",
     "exclude": []
   }
 }

CHANGES.md

@@ -1 +1,3 @@
-- Raised entity processing limits to resolve mob farm complications
+- **Added support for Minecraft 1.21.9** 🥉
+- Raised entity processing limits to resolve mob farm complications (Thanks @Fyoncle)
+- Fixed Vanilla activation mode behaving the same way as Classic for activation distances below 25 (closes [#46](https://github.com/Tschipcraft/spawnanimations/issues/46))

META-INF/mods.toml

@@ -11,7 +11,7 @@ version="${version}+mod"
 displayName="Spawn Animations"
 description='''Hostile mobs dig out of the ground or poof into existence when they spawn!
 
-§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Spiders, Cave Spiders, Creepers, Slimes, Magma Cubes, Wither Skeletons, Hoglins, Zombified Piglins, Striders, Enderman and Giants.
+§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Wither Skeletons, Spiders, Cave Spiders, Creepers, Endermen, Slimes, Magma Cubes, Zombified Piglins, Striders and Giants.
 
 This data pack is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.
 

META-INF/neoforge.mods.toml

@@ -11,7 +11,7 @@ version="${version}+mod"
 displayName="Spawn Animations"
 description='''Hostile mobs dig out of the ground or poof into existence when they spawn!
 
-§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Spiders, Cave Spiders, Creepers, Slimes, Magma Cubes, Wither Skeletons, Hoglins, Zombified Piglins, Striders, Enderman and Giants.
+§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Wither Skeletons, Spiders, Cave Spiders, Creepers, Endermen, Slimes, Magma Cubes, Zombified Piglins, Striders and Giants.
 
 This data pack is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.
 

README.md

@@ -16,7 +16,7 @@
 Hostile mobs dig out of the ground or poof into existence when they spawn.
 
 **Works with:**
-Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Spiders, Cave Spiders, Creepers, Slimes, Magma Cubes, Wither Skeletons, Hoglins, Zombified Piglins, Striders, Enderman and Giants.
+Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Wither Skeletons, Spiders, Cave Spiders, Creepers, Endermen, Slimes, Magma Cubes, Zombified Piglins, Striders and Giants.
 
 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.
 

assets/spawnanimations/lang/en_us.json

@@ -1,7 +1,7 @@
 {
   "modmenu.summaryTranslation.spawnanimations": "Hostile mobs dig out of the ground or poof into existence when they spawn!",
-  "modmenu.descriptionTranslation.spawnanimations": "Hostile mobs dig out of the ground or poof into existence when they spawn!\n§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Spiders, Cave Spiders, Creepers, Slimes, Magma Cubes, Wither Skeletons, Hoglins, Zombified Piglins, Striders, Enderman and Giants.\nThis data pack is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.\nExecute the command §o/function §ospawnanimations:settings§r for a world-specific settings menu and/or install MidnightLib for global settings across all worlds.",
-  "fml.menu.mods.info.description.spawnanimations": "Hostile mobs dig out of the ground or poof into existence when they spawn!\n\n§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Spiders, Cave Spiders, Creepers, Slimes, Magma Cubes, Wither Skeletons, Hoglins, Zombified Piglins, Striders, Enderman and Giants.\n\nThis data pack is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.\n\nExecute the command §o/function §ospawnanimations:settings§r for a world-specific settings menu and/or install MidnightLib for global settings across all worlds.",
+  "modmenu.descriptionTranslation.spawnanimations": "Hostile mobs dig out of the ground or poof into existence when they spawn!\n§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Wither Skeletons, Spiders, Cave Spiders, Creepers, Endermen, Slimes, Magma Cubes, Zombified Piglins, Striders and Giants.\nThis data pack is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.\nExecute the command §o/function §ospawnanimations:settings§r for a world-specific settings menu and/or install MidnightLib for global settings across all worlds.",
+  "fml.menu.mods.info.description.spawnanimations": "Hostile mobs dig out of the ground or poof into existence when they spawn!\n\n§lWorks with:§r Zombies, Husks, Drowned, Skeletons, Strays, Bogged, Wither Skeletons, Spiders, Cave Spiders, Creepers, Endermen, Slimes, Magma Cubes, Zombified Piglins, Striders and Giants.\n\nThis data pack is designed to be as unintrusive as possible. Hidden entities including their worn armor and tools will only be invisible and silent.\n\nExecute the command §o/function §ospawnanimations:settings§r for a world-specific settings menu and/or install MidnightLib for global settings across all worlds.",
 
   "spawnanimations.midnightconfig.title": "Spawn Animations Configuration",
   "spawnanimations.midnightconfig.empty": "",
@@ -17,7 +17,7 @@
   "spawnanimations.midnightconfig.activation_distance": "Activation Distance",
   "spawnanimations.midnightconfig.activation_distance.tooltip": "Default: §a20 blocks§f\nMobs closer to a player than this value will play the animation.\nSetting this to 0 will use the world-specific value.",
   "spawnanimations.midnightconfig.activation_mode": "Activation Mode",
-  "spawnanimations.midnightconfig.activation_mode.tooltip": "Default: §aClassic§f\n§nClassic§r: Mobs outside the activation range remain hidden until a player is in range.\n§nVanilla§r: Mobs outside the activation range spawn normally.\n§9ℹ Info:§f When set to Vanilla, it is recommended to set the activation distance to at least 25 blocks to see the animation.",
+  "spawnanimations.midnightconfig.activation_mode.tooltip": "Default: §aClassic§f\n§nClassic§r: Mobs outside the activation range remain hidden until a player is in range.\n§nVanilla§r: Mobs outside the activation range spawn normally.\n§9ℹ Info:§f When set to Vanilla, it is recommended to set the activation distance to at least 25 blocks to see the animation for naturally spawned mobs.",
   "spawnanimations.midnightconfig.enable_poof_animation": "Enable Poof Animation",
   "spawnanimations.midnightconfig.enable_poof_animation.tooltip": "Default: §aYes§f\nIf enabled, some mobs, or mobs without a block to dig up from, will play the poof animation instead.",
   "spawnanimations.midnightconfig.play_animation_sounds": "Play Animation Sounds",

data/spawnanimations/function/internal/animation/dig_up/prepare.mcfunction

@@ -6,12 +6,16 @@ execute as @s[scores={ts.sa.timer=-300..99}] run function spawnanimations:intern
 execute as @s[scores={ts.sa.e.nbt.Sil=0},tag=!ts.sa.verify] run function spawnanimations:internal/animation/dig_up/recover_tags/hidden
 tag @s[scores={ts.sa.timer=100}] add ts.sa.verified
 
+# Exclude out of range entities in Vanilla activation mode
+execute if score $activation_mode ts.sa.settings matches -1..0 if score $activation_dist ts.sa.settings matches 1..24 as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify] unless entity @a[gamemode=!spectator,distance=..25] run tag @s add ts.sa.verified
+execute if score $activation_mode ts.sa.settings matches -1..0 if score $activation_dist ts.sa.settings matches 25.. as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify] unless entity @a[gamemode=!spectator,distance=..100] run tag @s add ts.sa.verified
+
 # Exclude entities that have the glowing, levitation or invisibility potion effect, are riding another entity, or are burning
-execute as @s[tag=!ts.sa.verify,tag=!ts.sa.to_verify,predicate=!spawnanimations:exclude] run tag @s add ts.sa.verified
+tag @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,predicate=!spawnanimations:exclude] add ts.sa.verified
 
 # Exclude silent or no AI mobs
-execute as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={Silent:1b}] run tag @s add ts.sa.verified
-execute as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={NoAI:1b}] run tag @s add ts.sa.verified
+tag @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={Silent:1b}] add ts.sa.verified
+tag @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={NoAI:1b}] add ts.sa.verified
 
 # Hide the entity
 execute as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify] run function spawnanimations:internal/entity/hide

data/spawnanimations/function/internal/run_activation_batch.mcfunction

@@ -9,3 +9,4 @@ execute store result score $global ts.sa.z run data get storage spawnanimations:
 # Activate entities
 execute if score $activation_dist ts.sa.settings matches 25..100 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..100,limit=10,sort=random] at @s run function spawnanimations:internal/calc_activation
 execute if score $activation_dist ts.sa.settings matches 1..24 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=..25,limit=5,sort=random] at @s run function spawnanimations:internal/calc_activation
+execute if score $activation_mode ts.sa.settings matches -1..0 if score $activation_dist ts.sa.settings matches 1..24 as @e[type=!#spawnanimations:exclude,tag=ts.sa.to_verify,distance=25..,limit=1,sort=random] at @s unless entity @a[gamemode=!spectator,distance=..25] run function spawnanimations:internal/animation/dig_up/check_failed

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 4500.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.7 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 4600.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.9 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

data/spawnanimations/functions/internal/animation/dig_up/prepare.mcfunction

@@ -6,12 +6,16 @@ execute as @s[scores={ts.sa.timer=-300..99}] run function spawnanimations:intern
 execute as @s[scores={ts.sa.e.nbt.Sil=0},tag=!ts.sa.verify] run function spawnanimations:internal/animation/dig_up/recover_tags/hidden
 tag @s[scores={ts.sa.timer=100}] add ts.sa.verified
 
+# Exclude out of range entities in Vanilla activation mode
+execute if score $activation_mode ts.sa.settings matches -1..0 if score $activation_dist ts.sa.settings matches 1..24 as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify] unless entity @a[gamemode=!spectator,distance=..25] run tag @s add ts.sa.verified
+execute if score $activation_mode ts.sa.settings matches -1..0 if score $activation_dist ts.sa.settings matches 25.. as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify] unless entity @a[gamemode=!spectator,distance=..100] run tag @s add ts.sa.verified
+
 # Exclude entities that have the glowing, levitation or invisibility potion effect, are riding another entity, or are burning
-execute as @s[tag=!ts.sa.verify,tag=!ts.sa.to_verify,predicate=!spawnanimations:exclude] run tag @s add ts.sa.verified
+tag @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,predicate=!spawnanimations:exclude] add ts.sa.verified
 
 # Exclude silent or no AI mobs
-execute as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={Silent:1b}] run tag @s add ts.sa.verified
-execute as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={NoAI:1b}] run tag @s add ts.sa.verified
+tag @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={Silent:1b}] add ts.sa.verified
+tag @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify,nbt={NoAI:1b}] add ts.sa.verified
 
 # Hide the entity
 execute as @s[tag=!ts.sa.verified,tag=!ts.sa.verify,tag=!ts.sa.to_verify] run function spawnanimations:internal/entity/hide