Skip to content

Commit 3bd2b7c

Browse files
committed
Support for 1.21.3
- Added support for Minecraft 1.21.3 - Added loop entries for scoreboard enables - Updated GitHub workflow
1 parent 9aab63f commit 3bd2b7c

File tree

13 files changed

+40
-16
lines changed

13 files changed

+40
-16
lines changed

.github/workflows/cd.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696

9797
name: "[DP] Release v${{ github.event.inputs.tag }}"
9898
version: ${{ github.event.inputs.tag }}
99-
changelog-file: CHANGES.*
99+
changelog-file: CHANGES.md
100100

101101
loaders: |
102102
datapack
@@ -115,7 +115,7 @@ jobs:
115115

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

120120
dependencies: |
121121
fabric-api(optional){modrinth:P7dR8mSH}
@@ -141,7 +141,7 @@ jobs:
141141

142142
name: "Release v${{ github.event.inputs.tag }}"
143143
version: ${{ github.event.inputs.tag }}
144-
changelog-file: CHANGES.*
144+
changelog-file: CHANGES.md
145145

146146
loaders: |
147147
datapack
@@ -160,7 +160,7 @@ jobs:
160160

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

165165
dependencies: |
166166
catalogue(optional){curseforge:459701}

.github/workflows/test_workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ on:
99
mc_version:
1010
description: 'Minecraft version(s) the data pack runs in (human readable)'
1111
required: true
12-
default: '1.17x-1.20x'
12+
default: '1.17x-1.21x'
1313
mc_version_range:
1414
description: 'Minecraft version(s) the data pack runs in (encoded in version range spec)'
1515
required: true
16-
default: '>=1.17 <=1.20.4'
16+
default: '>=1.17 <=1.21'
1717

1818
jobs:
1919
deploy:

.spyglassrc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"env": {
3+
"gameVersion": "1.21"
4+
},
5+
"lint": {
6+
"idOmitDefaultNamespace": ["warning", false],
7+
"nbtTypeCheck": ["warning", "strictly"]
8+
}
9+
}

CHANGES.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
- Added Curios API and Curios API Continuation support (closes [#52](https://github.com/Tschipcraft/dynamiclights/issues/52))
2-
- Added global and per-player toggle for Dynamic Lights (closes [#56](https://github.com/Tschipcraft/dynamiclights/issues/56), closes [#37](https://github.com/Tschipcraft/dynamiclights/issues/37), closes [#26](https://github.com/Tschipcraft/dynamiclights/issues/26), closes [#47](https://github.com/Tschipcraft/dynamiclights/issues/47))
1+
- **Added support for Minecraft 1.21.3** 💰
2+
- **Added Curios API and Curios API Continuation support** (closes [#52](https://github.com/Tschipcraft/dynamiclights/issues/52))
3+
- **Added global and per-player toggle for Dynamic Lights** (closes [#56](https://github.com/Tschipcraft/dynamiclights/issues/56), closes [#37](https://github.com/Tschipcraft/dynamiclights/issues/37), closes [#26](https://github.com/Tschipcraft/dynamiclights/issues/26), closes [#47](https://github.com/Tschipcraft/dynamiclights/issues/47))
34
- Added mod support for Lucky's Wardrobe
45
- Fixed ominous item spawners not being parsed for light emitting items
56
- Fixed Dynamic Lights breaking after some time on paper servers (closes [#45](https://github.com/Tschipcraft/dynamiclights/issues/45), closes [#21](https://github.com/Tschipcraft/dynamiclights/issues/21))

data/dynamiclights/function/install.mcfunction

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,6 @@ scoreboard players set dynamiclights load.status 18
7474
advancement revoke @a only tschipcraft:menu
7575
advancement revoke @a only dynamiclights:toggle_enable
7676

77-
## Schedule main function
77+
## Schedule main and loop function
7878
schedule function dynamiclights:internal/main 5t
79+
schedule function dynamiclights:internal/loop 10s
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
##by Tschipcraft
2+
# Loop to ensure all new players can run the triggers
3+
4+
schedule function dynamiclights:internal/loop 4s
5+
6+
scoreboard players enable @a ts.dl.toggle
7+
scoreboard players enable @a tschipcraft.menu

data/dynamiclights/function/internal/main.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## by Tschipcraft
1+
##by Tschipcraft
22

33
# Schedule for next tick
44
schedule function dynamiclights:internal/main 1t

data/dynamiclights/function/internal/version_checker/start.mcfunction

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
scoreboard objectives add ts.dl.version dummy
44
execute store result score $global ts.dl.version run data get entity @r DataVersion
5-
execute unless score $global tvc_ignore matches 1 if score $global ts.dl.version matches 4000.. run tellraw @a [{"text":"[Dynamic Lights] ","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"}]
5+
execute unless score $global tvc_ignore matches 1 if score $global ts.dl.version matches 4100.. run tellraw @a [{"text":"[Dynamic Lights] ","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"}]
6+
# Note: 1.17x-1.20x uses the old folder names (function -> functions)
67

78
# Curios Compatibility
89
scoreboard players reset $curios_install ts.dl.version

data/dynamiclights/functions/install.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ scoreboard players set dynamiclights load.status 18
7575
advancement revoke @a only dynamiclights:interacted_with_item_frame
7676
advancement revoke @a only dynamiclights:toggle_enable
7777

78-
## Schedule functions
78+
## Schedule main and loop function
7979
schedule function dynamiclights:internal/main 5t
8080
schedule function dynamiclights:internal/loop 4t
8181

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
##by Tschipcraft
2-
# Resets dynamic item holders such as item frames
32

3+
schedule function dynamiclights:internal/loop 4s
4+
5+
# Reset dynamic item holders such as item frames
46
scoreboard players reset @e[type=#dynamiclights:reparse] ts.dl.i.type
57

6-
schedule function dynamiclights:internal/loop 4s
8+
# Ensure all new players can run the triggers
9+
scoreboard players enable @a ts.dl.toggle
10+
scoreboard players enable @a tschipcraft.menu

data/dynamiclights/functions/internal/main.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## by Tschipcraft
1+
##by Tschipcraft
22

33
# Schedule for next tick
44
schedule function dynamiclights:internal/main 1t

data/dynamiclights/functions/internal/version_checker/start.mcfunction

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
scoreboard objectives add ts.dl.version dummy
44
execute store result score $global ts.dl.version run data get entity @r DataVersion
5+
# Note: 1.21+ uses the new folder names (functions -> function)
56
#execute if score $global ts.dl.version matches 2976..3106 run say 1.19 detected!
67
#execute if score $global ts.dl.version matches 2731..2975 run say 1.18 detected!
78
#execute if score $global ts.dl.version matches 2587..2730 run say 1.17 detected!

pack.mcmeta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "dynamiclights",
33
"pack": {
44
"pack_format": 15,
5-
"supported_formats": [7,48],
5+
"supported_formats": [7,57],
66
"description": "Tschipcraft's Dynamic Lights \n└ v${version} ● mc${mc_version}"
77
},
88
"overlays": {

0 commit comments

Comments
 (0)