Merge pull request #77 from Tschipcraft/dev

v1.8.7

Author: Tschipcraft

CHANGES.md

@@ -1,11 +1,2 @@
-- **Added support for Minecraft 1.21.5** 🌸
-  - Updated to work with the new text component format
-  - Updated block placement commands to use the new `strict` argument, removing the restriction to avoid most block update affected blocks, such as falling blocks
-- **Added native NeoForge support**
-- Improved piston detection to search for slime blocks in all directions. This resolves an issue where some zero-tick piston contraptions would break (closes [#51](https://github.com/Tschipcraft/dynamiclights/issues/51))
-- Fixed chat flooding when triggering the menu in Minecraft 1.20.6 or below (closes [#66](https://github.com/Tschipcraft/dynamiclights/issues/66))
-- Added additional data to Dynamic Lights' marker entities to display a name when [Axiom](https://modrinth.com/mod/N6n5dqoA) is installed ([#19](https://github.com/Tschipcraft/dynamiclights/issues/19))
-- Added additional failsafes for menu interactions ([#70](https://github.com/Tschipcraft/dynamiclights/issues/70))
-- Improved performance slightly by switching to `sort=arbitrary` to allow entity selector short-circuiting
-- Annotated the required Java version for mod versions
-- Added Argentine Spanish (`es_ar`) language support (Thanks @Texaliuz)
+- **Added support for Minecraft 1.21.6** ☁️
+- Fixed 1.21.5 NeoForge crash when installed alongside MidnightLib

README.md

@@ -1,40 +1,40 @@
 <h1 align="center">
   <img alt="Icon" src="pack.png" width="96" height="96" style="image-rendering: pixelated"><br/>
-  Dynamic Lights
+  Tschipcraft's Dynamic Lights
 </h1>
 <p align="center">
   <a href="https://github.com/Tschipcraft/dynamiclights/stargazers"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/Tschipcraft/dynamiclights?colorA=0c0906&colorB=fbc703&style=for-the-badge"></a>
-  <a href="https://www.curseforge.com/minecraft/texture-packs/tschipcrafts-dynamic-lights"><img alt="CurseForge Downloads" src="https://img.shields.io/curseforge/dt/831385?logo=curseforge&label=CurseForge&colorA=0c0906&colorB=fbc703&style=for-the-badge"></a>
+  <a href="https://www.curseforge.com/minecraft/mc-mods/tschipcrafts-dynamic-lights-mod"><img alt="CurseForge Downloads" src="https://img.shields.io/curseforge/dt/910095?logo=curseforge&label=CurseForge&colorA=0c0906&colorB=fbc703&style=for-the-badge"></a>
   <a href="https://modrinth.com/datapack/dynamic-lights"><img alt="Modrinth Downloads" src="https://img.shields.io/modrinth/dt/dynamic-lights?label=Modrinth&colorA=0c0906&colorB=fbc703&style=for-the-badge&logo=modrinth"></a>
   <a href="https://github.com/Tschipcraft/dynamiclights/releases/latest"><img alt="GitHub Downloads" src="https://img.shields.io/github/downloads/Tschipcraft/dynamiclights/total?logo=github&colorA=0c0906&colorB=fbc703&style=for-the-badge"></a>
 </p>
 
-> A server-side data pack/mod for Minecraft 1.17x-1.21x
-
-<details>
-<summary>YouTube showcase</summary>
-<a href="http://www.youtube.com/watch?v=bzmqpgfQ7jo">
-  <img alt="Dynamic Lights thumbnail" width=50% src="https://tschipcraft.ddns.net/mod_resources/youtube_preview.php?id=bzmqpgfQ7jo" title="Watch on YouTube">
-</a>
-</details>
+> Server-side dynamic lighting for Minecraft 1.17-1.21x, available as a data pack or mod
 
 ## Features
 
-Supported entities and items such as torches or lanterns will emit light by using the light block added in 21w13a. Because of this, the dynamic lights are limited to the block grid. (see [#9](https://github.com/Tschipcraft/dynamiclights/issues/9) for more information)
+This data pack/mod brings **dynamic lighting** to Minecraft without any client-side requirements. Supported entities and items (like torches, glowstone, or enchanted gear), held or worn by players, mobs, or placed in item frames, will emit real light as they move, using the [light block](https://minecraft.wiki/w/Light_(block)) added in Snapshot 21w13a. Because of this, the dynamic lights are limited to the block grid. (see [#9](https://github.com/Tschipcraft/dynamiclights/issues/9) for more information)
 
-Some items are water sensitive and only turn off or on inside water. Additionally, all enchanted items will emit light level 6 while some enchants under certain conditions emit light level 9.
-For a detailed overview of all supported items and entities, take a look at the wiki pages linked below.
+* [**47+ supported vanilla items**](https://github.com/Tschipcraft/dynamiclights/wiki/Supported-Items) out of the box
+* **Multiple light levels**: 3, 6, 9, 12, and 15
+* **Water-sensitive behavior** for some items
+* **Enchanted items** glow by default (light level 6), with special cases for Fire Aspect, Riptide, Channeling (light level 9)
+* **Amethyst-trimmed armor** emits light
+* **Mobs, falling blocks, and display entities** can emit light if carrying a supported item
+* **Curios API support** for modded inventory slots
 
 Since this project is completely server-side, players joining a server with Dynamic Lights installed will not need to install anything on their end for it to work! However, you can still use the mod version on the client for single-player worlds only. Joining a server that does not have Dynamic Lights installed will have no effect.
 
-[➜ For a detailed overview and available settings, take a look at the wiki](https://github.com/Tschipcraft/dynamiclights/wiki)
-
+[➜ For a complete list of supported items & entities, and available settings, take a look at the wiki](https://github.com/Tschipcraft/dynamiclights/wiki)
 
 ## Installation
 
-Download the latest release from [here](https://github.com/Tschipcraft/dynamiclights/releases/latest) and put the datapack zip file into the `datapacks` folder of your Minecraft world.
+[Download the latest release](https://github.com/Tschipcraft/dynamiclights/releases/latest) and install either as:
 
-This data pack is also available as a mod with an additional global config file and settings menu when installed alongside [MidnightLib](https://modrinth.com/mod/midnightlib). Download the latest release and put the mod .jar file into your `.minecraft/mods` folder.
+* **Data Pack** ➜ Place `.zip` in your world's `datapacks` folder
+* **Mod** ➜ Drop into your `mods` folder and optionally install [MidnightLib](https://modrinth.com/project/codAaoxh) for a global config file and UI
+
+To manage settings, reset, or uninstall the pack, use `/trigger tschipcraft.menu` or `/function #tschipcraft:menu`.
 
 Also available on Modrinth and CurseForge!
 
@@ -45,7 +45,7 @@ Also available on Modrinth and CurseForge!
   <img height="72px" alt="Download on Modrinth" src="https://raw.githubusercontent.com/Tschipcraft/badges/main/assets/modrinth-badge-dark.svg">
 </picture>
 </a>
-<a href="https://www.curseforge.com/minecraft/texture-packs/tschipcrafts-dynamic-lights">
+<a href="https://www.curseforge.com/minecraft/data-packs/tschipcrafts-dynamic-lights">
 <picture>
   <source height="72px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/Tschipcraft/badges/main/assets/curseforge-badge-dark.svg">
   <source height="72px" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Tschipcraft/badges/main/assets/curseforge-badge-light.svg">
@@ -57,6 +57,8 @@ Also available on Modrinth and CurseForge!
 
 Development builds are available on [GitHub Actions](https://github.com/Tschipcraft/dynamiclights/actions/workflows/ci.yml). These builds are not guaranteed to be stable and may contain bugs. Please always back up your world before using them.
 
-## Manage
+## Compatibility
+
+This data pack implements the [Smithed](https://wiki.smithed.dev/conventions/) and essential [MC Datapacks Discord Server](https://mc-datapacks.github.io/en/conventions/index.html) Conventions to ensure data pack compatibility.
 
-To open the ingame menu, execute `/trigger tschipcraft.menu` or `/function #tschipcraft:menu`. There is a **Reset** and an **Uninstall** button.
+Light blocks used for dynamic lighting may conflict with **piston mechanics** in some redstone contraptions. Please [report issues](https://github.com/Tschipcraft/dynamiclights/issues) if you find any.

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 4400.. run tellraw @a [{"text":"[Dynamic Lights] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.5 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 4500.. run tellraw @a [{"text":"[Dynamic Lights] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 1.21.6 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

net/tschipcraft/dynamiclights/neoforge/Init.class

@@ -2,7 +2,7 @@
   "id": "dynamiclights",
   "pack": {
     "pack_format": 15,
-    "supported_formats": [7,71],
+    "supported_formats": [7,80],
     "description": "Tschipcraft's Dynamic Lights \n└ v${version} ● mc${mc_human_version_range}"
   },
   "overlays": {

pack.mcmeta

@@ -51,7 +51,7 @@ public void onServerStarted(ServerStartedEvent event) {
 				// Use MidnightLib features
 				LOGGER.info("[Dynamic Lights] MidnightLib detected!");
 				// Build config class
-				Config.init(MODID, Config.class);
+				MidnightConfig.init(MODID, Config.class);
 				// Initialize config screen
 				modContainer.registerExtensionPoint(IConfigScreenFactory.class,
 						(Supplier<IConfigScreenFactory>) () -> (client, parent) ->