From 5cf37f359efba2f21c08ff8f5177540efeaa2fa5 Mon Sep 17 00:00:00 2001
From: Tschipcraft <78470530+Tschipcraft@users.noreply.github.com>
Date: Sat, 6 Dec 2025 14:16:03 +0100
Subject: [PATCH 1/2] Add support for 1.21.11

- 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
---
 .spyglassrc.json                                   |  2 +-
 CHANGES.md                                         | 14 ++++----------
 .../internal/version_checker/start.mcfunction      |  2 +-
 .../internal/water/rain_check_1194.mcfunction      |  2 +-
 .../function/settings/core.mcfunction              |  1 -
 .../settings/hide_feedback/hide.mcfunction         |  4 ----
 .../settings/hide_feedback/main.mcfunction         |  6 ------
 .../settings/hide_feedback/unhide.mcfunction       |  3 ---
 data/dynamiclights/tags/worldgen/biome/is_dry.json | 11 +++++++++++
 data/tschipcraft/function/menu_header.mcfunction   |  1 -
 .../function/settings/core.mcfunction              |  1 -
 pack.mcmeta                                        |  4 ++--
 12 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 data/dynamiclights/function/settings/hide_feedback/hide.mcfunction
 delete mode 100644 data/dynamiclights/function/settings/hide_feedback/main.mcfunction
 delete mode 100644 data/dynamiclights/function/settings/hide_feedback/unhide.mcfunction
 create mode 100644 data/dynamiclights/tags/worldgen/biome/is_dry.json

diff --git a/.spyglassrc.json b/.spyglassrc.json
index fd768c6..614d50f 100644
--- a/.spyglassrc.json
+++ b/.spyglassrc.json
@@ -1,6 +1,6 @@
 {
   "env": {
-    "gameVersion": "1.21.9"
+    "gameVersion": "1.21.11"
   },
   "lint": {
     "idOmitDefaultNamespace": ["warning", false],
diff --git a/CHANGES.md b/CHANGES.md
index 2711e88..5978e87 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,10 +1,4 @@
-- **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
diff --git a/data/dynamiclights/function/internal/version_checker/start.mcfunction b/data/dynamiclights/function/internal/version_checker/start.mcfunction
index e2e7eb8..383ed58 100644
--- a/data/dynamiclights/function/internal/version_checker/start.mcfunction
+++ b/data/dynamiclights/function/internal/version_checker/start.mcfunction
@@ -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
diff --git a/data/dynamiclights/function/internal/water/rain_check_1194.mcfunction b/data/dynamiclights/function/internal/water/rain_check_1194.mcfunction
index 15422ea..0627a49 100644
--- a/data/dynamiclights/function/internal/water/rain_check_1194.mcfunction
+++ b/data/dynamiclights/function/internal/water/rain_check_1194.mcfunction
@@ -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
diff --git a/data/dynamiclights/function/settings/core.mcfunction b/data/dynamiclights/function/settings/core.mcfunction
index 2b20e0f..d263be6 100644
--- a/data/dynamiclights/function/settings/core.mcfunction
+++ b/data/dynamiclights/function/settings/core.mcfunction
@@ -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
diff --git a/data/dynamiclights/function/settings/hide_feedback/hide.mcfunction b/data/dynamiclights/function/settings/hide_feedback/hide.mcfunction
deleted file mode 100644
index a45d564..0000000
--- a/data/dynamiclights/function/settings/hide_feedback/hide.mcfunction
+++ /dev/null
@@ -1,4 +0,0 @@
-##by Tschipcraft
-
-gamerule sendCommandFeedback false
-schedule function dynamiclights:settings/hide_feedback/unhide 1t
diff --git a/data/dynamiclights/function/settings/hide_feedback/main.mcfunction b/data/dynamiclights/function/settings/hide_feedback/main.mcfunction
deleted file mode 100644
index 5793ea9..0000000
--- a/data/dynamiclights/function/settings/hide_feedback/main.mcfunction
+++ /dev/null
@@ -1,6 +0,0 @@
-##by Tschipcraft
-# This doesn't seem to work anymore :(
-
-execute store result score $gamerule.send_feedback ts.dl.settings run gamerule sendCommandFeedback
-
-execute if score $gamerule.send_feedback ts.dl.settings matches 1 run function dynamiclights:settings/hide_feedback/hide
diff --git a/data/dynamiclights/function/settings/hide_feedback/unhide.mcfunction b/data/dynamiclights/function/settings/hide_feedback/unhide.mcfunction
deleted file mode 100644
index 5620e7c..0000000
--- a/data/dynamiclights/function/settings/hide_feedback/unhide.mcfunction
+++ /dev/null
@@ -1,3 +0,0 @@
-##by Tschipcraft
-
-gamerule sendCommandFeedback true
diff --git a/data/dynamiclights/tags/worldgen/biome/is_dry.json b/data/dynamiclights/tags/worldgen/biome/is_dry.json
new file mode 100644
index 0000000..8d78826
--- /dev/null
+++ b/data/dynamiclights/tags/worldgen/biome/is_dry.json
@@ -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}
+  ]
+}
diff --git a/data/tschipcraft/function/menu_header.mcfunction b/data/tschipcraft/function/menu_header.mcfunction
index 6e37692..35ef9b3 100644
--- a/data/tschipcraft/function/menu_header.mcfunction
+++ b/data/tschipcraft/function/menu_header.mcfunction
@@ -1,4 +1,3 @@
 ##by Tschipcraft
 
 tellraw @s {"text":"The following packs are installed:","color":"gold"}
-function dynamiclights:settings/hide_feedback/main
diff --git a/overlay_pre_62/data/dynamiclights/function/settings/core.mcfunction b/overlay_pre_62/data/dynamiclights/function/settings/core.mcfunction
index 7595e4a..7eb2432 100644
--- a/overlay_pre_62/data/dynamiclights/function/settings/core.mcfunction
+++ b/overlay_pre_62/data/dynamiclights/function/settings/core.mcfunction
@@ -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
diff --git a/pack.mcmeta b/pack.mcmeta
index 5043d81..d969e9f 100644
--- a/pack.mcmeta
+++ b/pack.mcmeta
@@ -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": {

From 67f29b03b251770e1082ee3133509ae3adab4af8 Mon Sep 17 00:00:00 2001
From: Tschipcraft <78470530+Tschipcraft@users.noreply.github.com>
Date: Tue, 9 Dec 2025 20:10:18 +0100
Subject: [PATCH 2/2] Reduce non-player entity cap

Reduced non-player entity cap from 1000 to 750 (#91)
---
 CHANGES.md                                            | 1 +
 data/dynamiclights/function/internal/main.mcfunction  | 2 +-
 data/dynamiclights/functions/internal/main.mcfunction | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5978e87..01a22e8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,3 +2,4 @@
   - 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))
diff --git a/data/dynamiclights/function/internal/main.mcfunction b/data/dynamiclights/function/internal/main.mcfunction
index bf62c78..93392b3 100644
--- a/data/dynamiclights/function/internal/main.mcfunction
+++ b/data/dynamiclights/function/internal/main.mcfunction
@@ -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
diff --git a/data/dynamiclights/functions/internal/main.mcfunction b/data/dynamiclights/functions/internal/main.mcfunction
index beea9bf..2b79822 100644
--- a/data/dynamiclights/functions/internal/main.mcfunction
+++ b/data/dynamiclights/functions/internal/main.mcfunction
@@ -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