diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1999315..456cd56 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,7 +8,7 @@ on: required: true default: '1.0' mc_upper: - description: 'Upper bound of Minecraft version range (exact version), e.g. "1.21.5". Leave empty to use the latest version from pack.mcmeta.' + description: 'Upper bound of Minecraft version range (exact version), e.g. "26.2". Leave empty to use the latest version from pack.mcmeta.' required: false mc_lower: description: 'Lower bound of Minecraft version range (exact version), e.g. "1.17"' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c145dd..9488f85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: description: 'Version tag to build (if omitted, latest --describe tag from git is used)' required: false mc_upper: - description: 'Upper bound of Minecraft version range (exact version), e.g. "1.21.5"' + description: 'Upper bound of Minecraft version range (exact version), e.g. "26.2"' required: false mc_lower: description: 'Lower bound of Minecraft version range (exact version), e.g. "1.17"' @@ -23,7 +23,7 @@ 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: "26.1" + FALLBACK_MC_UPPER: "26.2" jobs: deploy: diff --git a/.spyglassrc.json b/.spyglassrc.json index 827c25a..891c6ef 100644 --- a/.spyglassrc.json +++ b/.spyglassrc.json @@ -1,6 +1,6 @@ { "env": { - "gameVersion": "1.21.11", + "gameVersion": "26.2", "exclude": [] } } diff --git a/CHANGES.md b/CHANGES.md index b0a9219..3216134 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,2 @@ -- **Added support for Minecraft 26.1** 🐤 - - Migrated `#bamboo_plantable_on` references to `#supports_vegetation` - - Added router to handle [unobfuscated code](https://www.minecraft.net/en-us/article/removing-obfuscation-in-java-edition) +- **Added support for Minecraft 26.2.x** ♨️ - Bumped pack format and protocol version diff --git a/README.md b/README.md index 04d526b..e85c695 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ GitHub Downloads

-> A data pack/mod for Minecraft 1.14x-1.21x +> A data pack/mod for Minecraft 1.14.x-26.2.x ## Features diff --git a/data/spawnanimations/function/internal/version_checker/start.mcfunction b/data/spawnanimations/function/internal/version_checker/start.mcfunction index 1469e16..4e63872 100644 --- a/data/spawnanimations/function/internal/version_checker/start.mcfunction +++ b/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 4800.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 26.1 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 5000.. run tellraw @a [{"text":"[Spawn Animations] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 26.2 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates! (","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 to open the menu","text":"Click here to open the menu"}},{"text":")","color":"gold"}] # Note: 1.17x-1.20x uses the old folder names (function -> functions) # Announce escape sequence handling changes diff --git a/pack.mcmeta b/pack.mcmeta index 0678d69..6900504 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -2,9 +2,9 @@ "id": "spawnanimations", "pack": { "pack_format": 15, - "supported_formats": [7, 101], + "supported_formats": [7, 107], "min_format": 7, - "max_format": 101, + "max_format": 107, "description": "Tschipcraft's Spawn Animations\n└ v${version} ● mc${mc_human_version_range}" }, "overlays": {