Merge pull request #67 from Tschipcraft/dev

Tschipcraft · web-flow · commit b7f5bcfe9216 · 2024-12-03T22:28:56.000+01:00
v1.8.5
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
-/unused
+/unused
+
+# Package Files #
+*.jar
+*.zip
diff --git a/.spyglassrc.json b/.spyglassrc.json
@@ -1,6 +1,6 @@
 {
   "env": {
-    "gameVersion": "1.21"
+    "gameVersion": "1.21.4"
   },
   "lint": {
     "idOmitDefaultNamespace": ["warning", false],
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,2 @@
-- **Added support for Minecraft 1.21.3** 💰
-- **Added Curios API and Curios API Continuation support** (closes [#52](https://github.com/Tschipcraft/dynamiclights/issues/52))
-- **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))
-- Added mod support for Lucky's Wardrobe
-- Fixed ominous item spawners not being parsed for light emitting items
-- 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))
-- Fixed tschipcraft.menu trigger not being enabled in 1.21+
+- **Added support for Minecraft 1.21.4** 🪵
+- Fixed crash when loading or creating a world in Forge 52.0.0 or newer (1.21.1+) (closes [#65](https://github.com/Tschipcraft/dynamiclights/issues/65))
diff --git a/data/dynamiclights/advancement/toggle_enable.json b/data/dynamiclights/advancement/toggle_enable.json
@@ -1,6 +1,6 @@
 {
   "criteria": {
-    "trigger_menu": {
+    "trigger_toggle": {
       "trigger": "minecraft:tick",
       "conditions": {
         "player": [
diff --git a/data/dynamiclights/advancements/toggle_enable.json b/data/dynamiclights/advancements/toggle_enable.json
@@ -1,6 +1,6 @@
 {
   "criteria": {
-    "trigger_menu": {
+    "trigger_toggle": {
       "trigger": "minecraft:tick",
       "conditions": {
         "player": [
diff --git a/data/dynamiclights/function/install.mcfunction b/data/dynamiclights/function/install.mcfunction
@@ -39,26 +39,11 @@ scoreboard objectives add ts.dl.l.level dummy
 # Scoreboard for any temporary values
 scoreboard objectives add ts.dl.temp dummy
 
+# Settings
 scoreboard objectives add ts.dl.settings dummy
+function dynamiclights:settings/defaults
 
-# defaults
-execute unless score $enable ts.dl.settings matches -1..2 run scoreboard players set $enable ts.dl.settings 1
-execute unless score $enable_on_fire ts.dl.settings matches -1..2 run scoreboard players set $enable_on_fire ts.dl.settings 1
-execute unless score $enable_glowing ts.dl.settings matches -1..2 run scoreboard players set $enable_glowing ts.dl.settings 0
-execute unless score $fire_aspect ts.dl.settings matches -1..2 run scoreboard players set $fire_aspect ts.dl.settings 1
-execute unless score $riptide ts.dl.settings matches -1..2 run scoreboard players set $riptide ts.dl.settings 1
-execute unless score $channeling ts.dl.settings matches -1..2 run scoreboard players set $channeling ts.dl.settings 1
-execute unless score $enchanted_items ts.dl.settings matches -1..2 run scoreboard players set $enchanted_items ts.dl.settings 1
-execute unless score $amethyst_trimmed ts.dl.settings matches -1..2 run scoreboard players set $amethyst_trimmed ts.dl.settings 1
-execute unless score $enable_ghast ts.dl.settings matches -1..2 run scoreboard players set $enable_ghast ts.dl.settings 1
-
-execute unless score $water_sensitive ts.dl.settings matches -1..2 run scoreboard players set $water_sensitive ts.dl.settings 1
-execute unless score $enable_sound ts.dl.settings matches -1..2 run scoreboard players set $enable_sound ts.dl.settings 1
-execute unless score $rain_sensitive ts.dl.settings matches -1..2 run scoreboard players set $rain_sensitive ts.dl.settings 1
-
-# Hidden
-execute unless score $unlimited ts.dl.settings matches -1..2 run scoreboard players set $unlimited ts.dl.settings 0
-
+# Menu/Other
 scoreboard objectives add tschipcraft.menu trigger
 scoreboard objectives add ts.dl.toggle trigger
 scoreboard players enable @a tschipcraft.menu
@@ -70,7 +55,7 @@ scoreboard objectives add tvc_ignore dummy
 # 18 for v1.8
 scoreboard players set dynamiclights load.status 18
 
-# Reset advancements
+## Reset advancements
 advancement revoke @a only tschipcraft:menu
 advancement revoke @a only dynamiclights:toggle_enable
 
diff --git 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 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"}]
+execute unless score $global tvc_ignore matches 1 if score $global ts.dl.version matches 4200.. run tellraw @a [{"text":"[Dynamic Lights] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.4 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.17x-1.20x uses the old folder names (function -> functions)
 
 # Curios Compatibility
diff --git a/data/dynamiclights/function/reset.mcfunction b/data/dynamiclights/function/reset.mcfunction
@@ -11,8 +11,10 @@ function dynamiclights:internal/explosion_detection/reset
 # Reset advancements
 advancement revoke @a only tschipcraft:menu
 scoreboard players enable @a tschipcraft.menu
+scoreboard players reset @a tschipcraft.menu
 advancement revoke @a only dynamiclights:toggle_enable
 scoreboard players enable @a ts.dl.toggle
+scoreboard players reset @a ts.dl.toggle
 
 # Reset parsed data
 scoreboard objectives remove ts.dl.i.type
diff --git a/data/dynamiclights/function/settings/defaults.mcfunction b/data/dynamiclights/function/settings/defaults.mcfunction
@@ -0,0 +1,20 @@
+##by Tschipcraft
+# Sets default settings during installation or if entry is incorrect
+# Called by install.mcfunction
+
+execute unless score $enable ts.dl.settings matches -1..2 run scoreboard players set $enable ts.dl.settings 1
+execute unless score $enable_on_fire ts.dl.settings matches -1..2 run scoreboard players set $enable_on_fire ts.dl.settings 1
+execute unless score $enable_glowing ts.dl.settings matches -1..2 run scoreboard players set $enable_glowing ts.dl.settings 0
+execute unless score $fire_aspect ts.dl.settings matches -1..2 run scoreboard players set $fire_aspect ts.dl.settings 1
+execute unless score $riptide ts.dl.settings matches -1..2 run scoreboard players set $riptide ts.dl.settings 1
+execute unless score $channeling ts.dl.settings matches -1..2 run scoreboard players set $channeling ts.dl.settings 1
+execute unless score $enchanted_items ts.dl.settings matches -1..2 run scoreboard players set $enchanted_items ts.dl.settings 1
+execute unless score $amethyst_trimmed ts.dl.settings matches -1..2 run scoreboard players set $amethyst_trimmed ts.dl.settings 1
+execute unless score $enable_ghast ts.dl.settings matches -1..2 run scoreboard players set $enable_ghast ts.dl.settings 1
+
+execute unless score $water_sensitive ts.dl.settings matches -1..2 run scoreboard players set $water_sensitive ts.dl.settings 1
+execute unless score $enable_sound ts.dl.settings matches -1..2 run scoreboard players set $enable_sound ts.dl.settings 1
+execute unless score $rain_sensitive ts.dl.settings matches -1..2 run scoreboard players set $rain_sensitive ts.dl.settings 1
+
+# Hidden
+execute unless score $unlimited ts.dl.settings matches -1..2 run scoreboard players set $unlimited ts.dl.settings 0
diff --git a/data/dynamiclights/functions/install.mcfunction b/data/dynamiclights/functions/install.mcfunction
@@ -39,27 +39,12 @@ scoreboard objectives add ts.dl.l.level dummy
 # Scoreboard for any temporary values
 scoreboard objectives add ts.dl.temp dummy
 
-scoreboard objectives add ts.dl.mess.welc dummy
+# Settings
 scoreboard objectives add ts.dl.settings dummy
+function dynamiclights:settings/defaults
 
-# defaults
-execute unless score $enable ts.dl.settings matches -1..2 run scoreboard players set $enable ts.dl.settings 1
-execute unless score $enable_on_fire ts.dl.settings matches -1..2 run scoreboard players set $enable_on_fire ts.dl.settings 1
-execute unless score $enable_glowing ts.dl.settings matches -1..2 run scoreboard players set $enable_glowing ts.dl.settings 0
-execute unless score $fire_aspect ts.dl.settings matches -1..2 run scoreboard players set $fire_aspect ts.dl.settings 1
-execute unless score $riptide ts.dl.settings matches -1..2 run scoreboard players set $riptide ts.dl.settings 1
-execute unless score $channeling ts.dl.settings matches -1..2 run scoreboard players set $channeling ts.dl.settings 1
-execute unless score $enchanted_items ts.dl.settings matches -1..2 run scoreboard players set $enchanted_items ts.dl.settings 1
-execute unless score $amethyst_trimmed ts.dl.settings matches -1..2 run scoreboard players set $amethyst_trimmed ts.dl.settings 1
-execute unless score $enable_ghast ts.dl.settings matches -1..2 run scoreboard players set $enable_ghast ts.dl.settings 1
-
-execute unless score $water_sensitive ts.dl.settings matches -1..2 run scoreboard players set $water_sensitive ts.dl.settings 1
-execute unless score $enable_sound ts.dl.settings matches -1..2 run scoreboard players set $enable_sound ts.dl.settings 1
-execute unless score $rain_sensitive ts.dl.settings matches -1..2 run scoreboard players set $rain_sensitive ts.dl.settings 1
-
-# Hidden
-execute unless score $unlimited ts.dl.settings matches -1..2 run scoreboard players set $unlimited ts.dl.settings 0
-
+# Menu/Other
+scoreboard objectives add ts.dl.mess.welc dummy
 scoreboard objectives add tschipcraft.menu trigger
 scoreboard objectives add ts.dl.toggle trigger
 scoreboard players enable @a tschipcraft.menu
@@ -71,7 +56,7 @@ scoreboard objectives add tvc_ignore dummy
 # 18 for v1.8
 scoreboard players set dynamiclights load.status 18
 
-# Reset advancements
+## Reset advancements
 advancement revoke @a only dynamiclights:interacted_with_item_frame
 advancement revoke @a only dynamiclights:toggle_enable
 
diff --git a/data/dynamiclights/functions/reset.mcfunction b/data/dynamiclights/functions/reset.mcfunction
@@ -12,6 +12,7 @@ function dynamiclights:internal/explosion_detection/reset
 advancement revoke @a only dynamiclights:interacted_with_item_frame
 advancement revoke @a only dynamiclights:toggle_enable
 scoreboard players enable @a ts.dl.toggle
+scoreboard players reset @a ts.dl.toggle
 
 # Reset parsed data
 scoreboard objectives remove ts.dl.i.type
diff --git a/data/dynamiclights/functions/settings/defaults.mcfunction b/data/dynamiclights/functions/settings/defaults.mcfunction
@@ -0,0 +1,20 @@
+##by Tschipcraft
+# Sets default settings during installation or if entry is incorrect
+# Called by install.mcfunction
+
+execute unless score $enable ts.dl.settings matches -1..2 run scoreboard players set $enable ts.dl.settings 1
+execute unless score $enable_on_fire ts.dl.settings matches -1..2 run scoreboard players set $enable_on_fire ts.dl.settings 1
+execute unless score $enable_glowing ts.dl.settings matches -1..2 run scoreboard players set $enable_glowing ts.dl.settings 0
+execute unless score $fire_aspect ts.dl.settings matches -1..2 run scoreboard players set $fire_aspect ts.dl.settings 1
+execute unless score $riptide ts.dl.settings matches -1..2 run scoreboard players set $riptide ts.dl.settings 1
+execute unless score $channeling ts.dl.settings matches -1..2 run scoreboard players set $channeling ts.dl.settings 1
+execute unless score $enchanted_items ts.dl.settings matches -1..2 run scoreboard players set $enchanted_items ts.dl.settings 1
+execute unless score $amethyst_trimmed ts.dl.settings matches -1..2 run scoreboard players set $amethyst_trimmed ts.dl.settings 1
+execute unless score $enable_ghast ts.dl.settings matches -1..2 run scoreboard players set $enable_ghast ts.dl.settings 1
+
+execute unless score $water_sensitive ts.dl.settings matches -1..2 run scoreboard players set $water_sensitive ts.dl.settings 1
+execute unless score $enable_sound ts.dl.settings matches -1..2 run scoreboard players set $enable_sound ts.dl.settings 1
+execute unless score $rain_sensitive ts.dl.settings matches -1..2 run scoreboard players set $rain_sensitive ts.dl.settings 1
+
+# Hidden
+execute unless score $unlimited ts.dl.settings matches -1..2 run scoreboard players set $unlimited ts.dl.settings 0
diff --git a/data/dynamiclights/tags/item/mod_support/light_level/15.json b/data/dynamiclights/tags/item/mod_support/light_level/15.json
@@ -4,6 +4,7 @@
   "values": [
     {"id": "#c:lanterns", "required": false},
     {"id": "#c:lava_buckets", "required": false},
+    {"id": "#c:buckets/lava", "required": false},
     {"id": "wardrobe:lantern_on_a_stick", "required": false}
   ]
 }
diff --git a/data/dynamiclights/tags/item/mod_support/light_level/3.json b/data/dynamiclights/tags/item/mod_support/light_level/3.json
@@ -4,6 +4,6 @@
   "values": [
     {"id": "#c:amethysts", "required": false},
     {"id": "#c:glowing_calamari", "required": false},
-    {"id": "#forge:gems/amethyst", "required": false}
+    {"id": "#c:gems/amethyst", "required": false}
   ]
 }
diff --git a/data/dynamiclights/tags/item/mod_support/light_level/6.json b/data/dynamiclights/tags/item/mod_support/light_level/6.json
@@ -2,8 +2,5 @@
   "//comment": "Items listed here will emit light level 6 - Intended to get populated by mods",
   "replace": false,
   "values": [
-    {"id": "#c:amethyst_blocks", "required": false},
-    {"id": "#forge:storage_blocks/amethyst", "required": false},
-    {"id": "#forge:nether_stars", "required": false}
   ]
 }
diff --git a/data/dynamiclights/tags/item/mod_support/light_level/9.json b/data/dynamiclights/tags/item/mod_support/light_level/9.json
@@ -4,7 +4,9 @@
   "values": [
     {"id": "#c:glow_berries", "required": false},
     {"id": "#c:glowstone_dusts", "required": false},
-    {"id": "#forge:rods/blaze", "required": false},
+    {"id": "#c:dusts/glowstone", "required": false},
+    {"id": "#c:rods/blaze", "required": false},
+    {"id": "#c:obsidians/crying", "required": false},
     {"id": "wardrobe:soul_lantern_on_a_stick", "required": false}
   ]
 }
diff --git a/data/dynamiclights/tags/items/mod_support/light_level/6.json b/data/dynamiclights/tags/items/mod_support/light_level/6.json
@@ -2,8 +2,6 @@
   "//comment": "Items listed here will emit light level 6 - Intended to get populated by mods",
   "replace": false,
   "values": [
-    {"id": "#c:amethyst_blocks", "required": false},
-    {"id": "#forge:storage_blocks/amethyst", "required": false},
     {"id": "#forge:nether_stars", "required": false}
   ]
 }
diff --git a/pack.mcmeta b/pack.mcmeta
@@ -2,7 +2,7 @@
   "id": "dynamiclights",
   "pack": {
     "pack_format": 15,
-    "supported_formats": [7,57],
+    "supported_formats": [7,61],
     "description": "Tschipcraft's Dynamic Lights \n└ v${version} ● mc${mc_version}"
   },
   "overlays": {

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 -/unused
 +/unused
++
 +# Package Files #
 +*.jar
 +*.zip
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"env": {`
`3`		`- "gameVersion": "1.21"`
	`3`	`+ "gameVersion": "1.21.4"`
`4`	`4`	`},`
`5`	`5`	`"lint": {`
`6`	`6`	`"idOmitDefaultNamespace": ["warning", false],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"criteria": {`
`3`		`- "trigger_menu": {`
	`3`	`+ "trigger_toggle": {`
`4`	`4`	`"trigger": "minecraft:tick",`
`5`	`5`	`"conditions": {`
`6`	`6`	`"player": [`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"values": [`
`5`	`5`	`{"id": "#c:lanterns", "required": false},`
`6`	`6`	`{"id": "#c:lava_buckets", "required": false},`
	`7`	`+ {"id": "#c:buckets/lava", "required": false},`
`7`	`8`	`{"id": "wardrobe:lantern_on_a_stick", "required": false}`
`8`	`9`	`]`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"values": [`
`5`	`5`	`{"id": "#c:amethysts", "required": false},`
`6`	`6`	`{"id": "#c:glowing_calamari", "required": false},`
`7`		`- {"id": "#forge:gems/amethyst", "required": false}`
	`7`	`+ {"id": "#c:gems/amethyst", "required": false}`
`8`	`8`	`]`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,5 @@`
`2`	`2`	`"//comment": "Items listed here will emit light level 6 - Intended to get populated by mods",`
`3`	`3`	`"replace": false,`
`4`	`4`	`"values": [`
`5`		`- {"id": "#c:amethyst_blocks", "required": false},`
`6`		`- {"id": "#forge:storage_blocks/amethyst", "required": false},`
`7`		`- {"id": "#forge:nether_stars", "required": false}`
`8`	`5`	`]`
`9`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`	`"values": [`
`5`	`5`	`{"id": "#c:glow_berries", "required": false},`
`6`	`6`	`{"id": "#c:glowstone_dusts", "required": false},`
`7`		`- {"id": "#forge:rods/blaze", "required": false},`
	`7`	`+ {"id": "#c:dusts/glowstone", "required": false},`
	`8`	`+ {"id": "#c:rods/blaze", "required": false},`
	`9`	`+ {"id": "#c:obsidians/crying", "required": false},`
`8`	`10`	`{"id": "wardrobe:soul_lantern_on_a_stick", "required": false}`
`9`	`11`	`]`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`"//comment": "Items listed here will emit light level 6 - Intended to get populated by mods",`
`3`	`3`	`"replace": false,`
`4`	`4`	`"values": [`
`5`		`- {"id": "#c:amethyst_blocks", "required": false},`
`6`		`- {"id": "#forge:storage_blocks/amethyst", "required": false},`
`7`	`5`	`{"id": "#forge:nether_stars", "required": false}`
`8`	`6`	`]`
`9`	`7`	`}`