Merge pull request #15 from Tschipcraft/dev

v1.5.3

.github/workflows/cd.yml

@@ -91,11 +91,12 @@ jobs:
           modrinth-id: HJR6V0I2
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "[DP] Release v${{ github.event.inputs.tag }}"
           version: ${{ github.event.inputs.tag }}
-          changelog-file: CHANGES.*
+          changelog-file: CHANGES.md
 
           loaders: |
             datapack
@@ -109,11 +110,12 @@ jobs:
           modrinth-id: HJR6V0I2
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "[Mod] Release v${{ github.event.inputs.tag }}"
           version: ${{ github.event.inputs.tag }}+mod
-          changelog-file: CHANGES.*
+          changelog-file: CHANGES.md
 
           dependencies: |
             fabric-api(optional){modrinth:P7dR8mSH}
@@ -134,11 +136,12 @@ jobs:
           curseforge-id: 811791
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "Release v${{ github.event.inputs.tag }}"
           version: ${{ github.event.inputs.tag }}
-          changelog-file: CHANGES.*
+          changelog-file: CHANGES.md
 
           loaders: |
             datapack
@@ -152,11 +155,12 @@ jobs:
           curseforge-id: 909654
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "Release v${{ github.event.inputs.tag }}"
           version: ${{ github.event.inputs.tag }}+mod
-          changelog-file: CHANGES.*
+          changelog-file: CHANGES.md
 
           dependencies: |
             catalogue(optional){curseforge:459701}

CHANGES.md

@@ -1,12 +1 @@
-- **Support for Minecraft 1.20.6** 🐺 **and 1.21** ⚔️ (closes [#12](https://github.com/Tschipcraft/more_mobs/issues/12))
-  - New sub-version mob heads and items using item components
-  - Support for new particle syntax
-  - Switched to using player_head loot table instead of parsing every mob head to reset its custom name when placed and broken in 1.20.6+
-  - Updated menu trigger to use advancements instead and added menu message header in 1.21+
-  - Switched from using custom_name to item_name for head items to preserve their names when renamed in anvils in 1.21+
-- Fixed reset_heads clearing not only the heads but all armor
-- Fixed trying to set mobs on fire even when they are standing in water in 1.19.4 and above
-- Fixed some additional loot ignoring the setting
-- Switched from using data modify merge to data modify set
-- Fixed using quotes for the value false when setting the italic option
-- Updated LICENSE
+- **Added support for Minecraft 1.21.3** 💰

data/minecraft/loot_table/blocks/player_head.json

@@ -1,5 +1,5 @@
 {
-  "//comment": "This loot table appends the now saved custom_data component in the block entity to the player head item. Parsing and modifying dropped head items is therefore not neccessary anymore since 24w13a.",
+  "//comment": "This loot table appends the now saved custom_data component in the block entity to the player head item. Parsing and modifying dropped head items is therefore not necessary anymore since 24w13a.",
   "type": "minecraft:block",
   "pools": [
     {

data/more_mobs/function/reset.mcfunction

@@ -12,4 +12,4 @@ function more_mobs:install
 
 say ⏏ Successfully resetted More Mobs by Tschipcraft! [Initiated by @s]
 
-tellraw @s {"text":"[Click here, if you want to additionally reset worn custom heads from loaded entities]","color":"yellow","clickEvent":{"action":"run_command","value":"/function more_mobs:reset_heads"},"hoverEvent":{"action":"show_text","contents":{"text":"\u26a0 Warning: This will clear all already obtained custom heads in entity form as well, excluding placed down custom heads or heads stored in containers! This will not remove any additional given loot like armor and tools.","color":"red"}}}
+tellraw @s {"text":"[Click here, if you want to additionally clear worn custom heads from loaded entities]","color":"yellow","clickEvent":{"action":"run_command","value":"/function more_mobs:reset_heads"},"hoverEvent":{"action":"show_text","contents":{"text":"\u26a0 Warning: This will clear all already obtained custom heads in entity form as well, excluding placed down custom heads or heads stored in containers! This will not remove any additional given loot like armor or tools.","color":"red"}}}

data/more_mobs/function/reset_heads.mcfunction

@@ -5,4 +5,4 @@ execute as @e[nbt={ArmorItems:[{},{},{},{id:"minecraft:player_head",count:1,comp
 
 tag @e[tag=ts.mm.parsed] remove ts.mm.parsed
 
-say ⏏ Successfully resetted custom player heads!
+say ⏏ Successfully cleared custom player heads!

data/more_mobs/function/version_checker.mcfunction

@@ -2,6 +2,7 @@
 
 scoreboard objectives add ts.mm.version dummy
 execute store result score $global ts.mm.version run data get entity @r DataVersion
-execute unless score $global tvc_ignore matches 1 if score $global ts.mm.version matches 4000.. run tellraw @a [{"text":"[More Mobs] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21 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","clickEvent":{"action":"run_command","value":"/trigger tschipcraft.menu"},"hoverEvent":{"action":"show_text","contents":"Click here"}},{"text":")","color":"gold"}]
+execute unless score $global tvc_ignore matches 1 if score $global ts.mm.version matches 4100.. run tellraw @a [{"text":"[More Mobs] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.3 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","clickEvent":{"action":"run_command","value":"/trigger tschipcraft.menu"},"hoverEvent":{"action":"show_text","contents":"Click here"}},{"text":")","color":"gold"}]
+# Note: 1.14x-1.20x uses the old folder names (function -> functions)
 
 execute unless score $global ts.mm.version matches 1.. run function more_mobs:version_checker/try_again

data/more_mobs/functions/reset.mcfunction

@@ -12,5 +12,4 @@ function more_mobs:install
 
 say ⏏ Successfully resetted More Mobs by Tschipcraft! [Initiated by @s]
 
-tellraw @s {"text":"Resetting More Mobs by Tschipcraft..."}
-tellraw @s {"text":"[Click here, if you want to additionally reset worn custom heads from loaded entities]","color":"yellow","clickEvent":{"action":"run_command","value":"/function more_mobs:reset_heads"},"hoverEvent":{"action":"show_text","contents":{"text":"\u26a0 Warning: This will clear all already obtained custom heads in entity form as well, excluding placed down custom heads or heads stored in containers! This will not remove any additional given loot like armor and tools.","color":"red"}}}
+tellraw @s {"text":"[Click here, if you want to additionally clear worn custom heads from loaded entities]","color":"yellow","clickEvent":{"action":"run_command","value":"/function more_mobs:reset_heads"},"hoverEvent":{"action":"show_text","contents":{"text":"\u26a0 Warning: This will clear all already obtained custom heads in entity form as well, excluding placed down custom heads or heads stored in containers! This will not remove any additional given loot like armor or tools.","color":"red"}}}

data/more_mobs/functions/reset_heads.mcfunction

@@ -6,4 +6,4 @@ execute if score $global ts.mm.version matches 3819.. as @e[nbt={ArmorItems:[{},
 
 tag @e[tag=ts.mm.parsed] remove ts.mm.parsed
 
-say ⏏ Successfully resetted custom player heads!
+say ⏏ Successfully cleared custom player heads!

data/more_mobs/functions/version_checker.mcfunction

@@ -2,7 +2,7 @@
 
 scoreboard objectives add ts.mm.version dummy
 execute store result score $global ts.mm.version run data get entity @r DataVersion
-# Note: 1.21+ versions use the new folder names (functions -> function)
+# Note: 1.21+ uses the new folder names (functions -> function)
 #execute if score $global ts.mm.version matches 2976..3218 run say 1.19 detected!
 #execute if score $global ts.mm.version matches 2731..2975 run say 1.18 detected!
 #execute if score $global ts.mm.version matches 2587..2730 run say 1.17 detected!

overlay_39/data/minecraft/loot_tables/blocks/player_head.json

@@ -1,5 +1,5 @@
 {
-  "//comment": "This loot table appends the now saved custom_data component in the block entity to the player head item. Parsing and modifying dropped head items is therefore not neccessary anymore since 24w13a.",
+  "//comment": "This loot table appends the now saved custom_data component in the block entity to the player head item. Parsing and modifying dropped head items is therefore not necessary anymore since 24w13a.",
   "type": "minecraft:block",
   "pools": [
     {

pack.mcmeta

@@ -2,7 +2,7 @@
   "id": "moremobs",
   "pack": {
     "pack_format": 15,
-    "supported_formats": [4,48],
+    "supported_formats": [4,57],
     "description": "Tschipcraft's More Mobs \n└ v${version} ● mc${mc_version}"
   },
   "overlays": {