Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .spyglassrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"env": {
"gameVersion": "1.21.9"
"gameVersion": "1.21.11"
},
"lint": {
"idOmitDefaultNamespace": ["warning", false],
Expand Down
15 changes: 5 additions & 10 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
- **Added support for Minecraft 1.21.9** 🥉
- Added Copper Torches and Copper Lanterns to light level 15 items
- Updated to work with the new pack.mcmeta syntax
- **Expanded the search area for dynamic light placement**
This fixes dynamic lights not searching for space under their eye level, and generally improves the checking order including short-circuiting opportunities
- Improved piston detection to search for slime or honey blocks in corners and behind other blocks
This resolves an issue when using [Gnembon's Gold Farm](https://www.youtube.com/watch?v=DLe5-THpQ6I) (closes [#75](https://github.com/Tschipcraft/dynamiclights/issues/75))
- Fixed Curios slot parsing issues (closes [#76](https://github.com/Tschipcraft/dynamiclights/issues/76))
- Added Firefly Bushes to light level 3 items
- Added mod support for [TerraFirmaCraft](https://modrinth.com/project/JaCEZUhg) (closes [#72](https://github.com/Tschipcraft/dynamiclights/issues/72)), [Bone Torch](https://www.curseforge.com/minecraft/mc-mods/sbm-bone-torch), and [Aquatic Torches](https://modrinth.com/project/yJR377od) (closes [#38](https://github.com/Tschipcraft/dynamiclights/issues/38))
- **Added support for Minecraft 1.21.11** 🐎
- Updated rain detection to use our own `#is_dry` biome tag combo instead of the now removed `#snow_golem_melts` tag
- Removed broken hide feedback code for 1.21+
- Bumped pack format and protocol version
- Reduced non-player entity cap from 1000 to 750 ([#91](https://github.com/Tschipcraft/dynamiclights/issues/91))
2 changes: 1 addition & 1 deletion data/dynamiclights/function/internal/main.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ execute as @e[type=minecraft:tnt,limit=10] at @s run function dynamiclights:inte
# Core
execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @a[gamemode=!spectator,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore] at @s run function dynamiclights:internal/main_exec_pass

execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @e[type=!minecraft:player,type=!#dynamiclights:dyn_ignore,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore,tag=!ts.sa.hidden,limit=1000] at @s run function dynamiclights:internal/main_exec
execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @e[type=!minecraft:player,type=!#dynamiclights:dyn_ignore,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore,tag=!ts.sa.hidden,limit=750] at @s run function dynamiclights:internal/main_exec

# Clear old lights
execute as @e[type=minecraft:marker,tag=ts.dl.remove] at @s run function dynamiclights:internal/remove_light
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

scoreboard objectives add ts.dl.version dummy
execute store result score $global ts.dl.version run data get entity @r DataVersion
execute unless score $global tvc_ignore matches 1 if score $global ts.dl.version matches 4600.. run tellraw @a [{"text":"[Dynamic Lights] ","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"}]
execute unless score $global tvc_ignore matches 1 if score $global ts.dl.version matches 4700.. run tellraw @a [{"text":"[Dynamic Lights] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.11 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
##by Tschipcraft
# Completes the rain check started in main_exec_pass.mcfunction (mc1.19.4+)

execute if dimension minecraft:overworld unless biome ~ ~ ~ #minecraft:snow_golem_melts positioned over motion_blocking if entity @s[dy=999] run scoreboard players set @s ts.dl.in_rain 1
execute if dimension minecraft:overworld unless biome ~ ~ ~ #dynamiclights:is_dry positioned over motion_blocking if entity @s[dy=999] run scoreboard players set @s ts.dl.in_rain 1
1 change: 0 additions & 1 deletion data/dynamiclights/function/settings/core.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,4 @@ execute if score $global ts.dl.version matches 3337.. if score $water_sensitive
execute if score $global ts.dl.version matches 3337.. if score $water_sensitive ts.dl.settings matches 1..2 if score $rain_sensitive ts.dl.settings matches 2 run tellraw @s [{"text":" └[✔] Rain Check","bold":false,"color":"gray","hover_event":{"action":"show_text","value":[{"text":"This setting is getting controlled globally and can't be changed here."}]}}]
execute if score $global ts.dl.version matches 3337.. if score $water_sensitive ts.dl.settings matches -1..0 run tellraw @s [{"text":" └[❌] Rain Check","bold":false,"color":"gray","hover_event":{"action":"show_text","value":[{"text":"Please enable the water sensitivity check first."}]}}]

function dynamiclights:settings/hide_feedback/main
playsound minecraft:block.dispenser.dispense master @s ~ ~ ~ 0.2 2

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion data/dynamiclights/functions/internal/main.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ execute as @e[type=minecraft:tnt,limit=10] at @s run function dynamiclights:inte
# Core
execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @a[gamemode=!spectator,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore] at @s run function dynamiclights:internal/main_exec_pass

execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @e[type=!minecraft:player,type=!#dynamiclights:dyn_ignore,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore,tag=!ts.sa.hidden,limit=1000] at @s run function dynamiclights:internal/main_exec
execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @e[type=!minecraft:player,type=!#dynamiclights:dyn_ignore,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore,tag=!ts.sa.hidden,limit=750] at @s run function dynamiclights:internal/main_exec

# Clear old lights
execute as @e[type=minecraft:marker,tag=ts.dl.remove] at @s run function dynamiclights:internal/remove_light
11 changes: 11 additions & 0 deletions data/dynamiclights/tags/worldgen/biome/is_dry.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"replace": false,
"values": [
"minecraft:desert",
"#minecraft:is_badlands",
"#minecraft:is_savanna",
"#minecraft:is_nether",
{"id": "#c:is_dry", "required": false},
{"id": "#minecraft:snow_golem_melts", "required": false}
]
}
1 change: 0 additions & 1 deletion data/tschipcraft/function/menu_header.mcfunction
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
##by Tschipcraft

tellraw @s {"text":"The following packs are installed:","color":"gold"}
function dynamiclights:settings/hide_feedback/main
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,4 @@ execute if score $global ts.dl.version matches 3337.. if score $water_sensitive
execute if score $global ts.dl.version matches 3337.. if score $water_sensitive ts.dl.settings matches 1..2 if score $rain_sensitive ts.dl.settings matches 2 run tellraw @s [{"text":" └[✔] Rain Check","bold":false,"color":"gray","hoverEvent":{"action":"show_text","contents":[{"text":"This setting is getting controlled globally and can't be changed here."}]}}]
execute if score $global ts.dl.version matches 3337.. if score $water_sensitive ts.dl.settings matches -1..0 run tellraw @s [{"text":" └[❌] Rain Check","bold":false,"color":"gray","hoverEvent":{"action":"show_text","contents":[{"text":"Please enable the water sensitivity check first."}]}}]

function dynamiclights:settings/hide_feedback/main
playsound minecraft:block.dispenser.dispense master @s ~ ~ ~ 0.2 2
4 changes: 2 additions & 2 deletions pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"id": "dynamiclights",
"pack": {
"pack_format": 15,
"supported_formats": [7,88],
"supported_formats": [7,94],
"min_format": 7,
"max_format": 88,
"max_format": 94,
"description": "Tschipcraft's Dynamic Lights \n└ v${version} ● mc${mc_human_version_range}"
},
"overlays": {
Expand Down