Split entity execution logic

- Split entity execution logic between players and non-players, capping non-player entities at 1000, and reducing dynamic light radius around players from 65 to 55 blocks to include fewer entities (#84)
- Fixed an issue where a structure void item would sometimes flicker below players with an equipped Curios slot by offsetting the armor stand used for parsing vertically (closes #85)
- Moved some Fabric mod recommendations to 'suggests'
- Hardcoded Forge version range to [1.17,1.21.5]
- Adjusted CD workflow to upload Forge version separately
- Updated README

Author: Tschipcraft

.github/workflows/cd.yml

@@ -250,6 +250,29 @@ jobs:
             datapack
           files: |
             ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
+
+      - name: Upload Forge mod version to Modrinth # Forge mod version is uploaded separately atm due to it not being compatible with Minecraft 1.21.6 or above
+        id: upload_forge_modrinth_mod
+        uses: Kir-Antipov/mc-publish@v3.3
+        if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
+        with:
+          modrinth-id: 7YjclEGc
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          game-versions: |
+            >=1.17 <=1.21.5
+          game-version-filter: any
+          fail-mode: skip
+
+          name: "[Mod] Release v${{ github.event.inputs.tag }}"
+          version: ${{ github.event.inputs.tag }}+mod
+          changelog-file: CHANGES.md
+
+          dependencies: |
+            midnightlib(optional){modrinth:codAaoxh}
+          loaders: |
+            forge
+          files: |
+            ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
       
       - name: Upload mod version to Modrinth
         id: upload_modrinth_mod
@@ -275,7 +298,6 @@ jobs:
           loaders: |
             fabric
             quilt
-            forge
             neoforge
           files: |
             ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-mod.jar
@@ -300,7 +322,7 @@ jobs:
           files: |
             ./${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ env.MC_HUMAN_VERSION_RANGE }}-datapack.zip
 
-      - name: Upload mod version to CurseForge
+      - name: Upload mod version to CurseForge # Duplicate uploads sadly don't work on CurseForge
         id: upload_curseforge_mod
         uses: Kir-Antipov/mc-publish@v3.3
         if: steps.check_mod_folder.outputs.files_exists == 'true' && github.event.inputs.dry_run == 'false'
@@ -355,42 +377,43 @@ jobs:
         run: |
           echo "Building summary..."
           if [ "${{ job.status }}" == "success" ]; then
-            SUMMARY_CONTENT="<picture>
-              <source media=\"(prefers-color-scheme: light)\" srcset=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg\">
-              <img alt=\"✅ Success\" src=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg\">
-            </picture><br>
+          SUMMARY_CONTENT="<picture>
+            <source media=\"(prefers-color-scheme: light)\" srcset=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg\">
+            <img alt=\"✅ Success\" src=\"https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg\">
+          </picture><br>
 
-            **${{ github.event.repository.name }} v${{ github.event.inputs.tag }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** published successfully!
+          **${{ github.event.repository.name }} v${{ github.event.inputs.tag }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** published successfully!
 
-            [View Changelog](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.tag }}/CHANGES.md)
+          [View Changelog](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.tag }}/CHANGES.md)
 
-            **Downloads:**
-            "
+          **Downloads:**
+          "
 
-            if [ -n "${{ steps.upload_modrinth_dp.outputs.modrinth-url }}" ]; then
-              SUMMARY_CONTENT+="- [Modrinth (Data Pack)](${{ steps.upload_modrinth_dp.outputs.modrinth-url }})
-              "
-            fi
-            if [ -n "${{ steps.upload_modrinth_mod.outputs.modrinth-url }}" ]; then
-              SUMMARY_CONTENT+="- [Modrinth (Mod)](${{ steps.upload_modrinth_mod.outputs.modrinth-url }})
-              "
-            fi
-            if [ -n "${{ steps.upload_curseforge_dp.outputs.curseforge-url }}" ]; then
-              SUMMARY_CONTENT+="- [CurseForge (Data Pack)](${{ steps.upload_curseforge_dp.outputs.curseforge-url }})
-              "
-            fi
-            if [ -n "${{ steps.upload_curseforge_mod.outputs.curseforge-url }}" ]; then
-              SUMMARY_CONTENT+="- [CurseForge (Mod)](${{ steps.upload_curseforge_mod.outputs.curseforge-url }})
-              "
-            fi
-            if [ -n "${{ steps.upload_github.outputs.github-url }}" ]; then
-              SUMMARY_CONTENT+="- [GitHub Releases](${{ steps.upload_github.outputs.github-url }})
-              "
-            fi
+          if [ -n "${{ steps.upload_modrinth_dp.outputs.modrinth-url }}" ]; then
+            SUMMARY_CONTENT+="- [Modrinth (Data Pack)](${{ steps.upload_modrinth_dp.outputs.modrinth-url }})
+          "
+          fi
+          if [ -n "${{ steps.upload_modrinth_mod.outputs.modrinth-url }}" ]; then
+            SUMMARY_CONTENT+="- [Modrinth (Mod)](${{ steps.upload_modrinth_mod.outputs.modrinth-url }})
+          "
+          fi
+          if [ -n "${{ steps.upload_curseforge_dp.outputs.curseforge-url }}" ]; then
+            SUMMARY_CONTENT+="- [CurseForge (Data Pack)](${{ steps.upload_curseforge_dp.outputs.curseforge-url }})
+          "
+          fi
+          if [ -n "${{ steps.upload_curseforge_mod.outputs.curseforge-url }}" ]; then
+            SUMMARY_CONTENT+="- [CurseForge (Mod)](${{ steps.upload_curseforge_mod.outputs.curseforge-url }})
+          "
+          fi
+          if [ -n "${{ steps.upload_github.outputs.github-url }}" ]; then
+            SUMMARY_CONTENT+="- [GitHub Releases](${{ steps.upload_github.outputs.github-url }})
+          "
+          fi
+
+          echo -e "$SUMMARY_CONTENT" >> $GITHUB_STEP_SUMMARY
 
-            echo -e "$SUMMARY_CONTENT" >> $GITHUB_STEP_SUMMARY
           else
-            cat << EOF >> $GITHUB_STEP_SUMMARY
+          cat << EOF >> $GITHUB_STEP_SUMMARY
           <picture>
             <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/error.svg">
             <img alt="❌ Error" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/error.svg">

.github/workflows/ci.yml

@@ -290,7 +290,7 @@ jobs:
         run: |
           echo "Building summary..."
           if [ "${{ job.status }}" == "success" ]; then
-            cat << EOF >> $GITHUB_STEP_SUMMARY
+          cat << EOF >> $GITHUB_STEP_SUMMARY
           <picture>
             <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/success.svg">
             <img alt="✅ Success" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/success.svg">
@@ -304,12 +304,12 @@ jobs:
           EOF
 
           else
-            cat << EOF >> $GITHUB_STEP_SUMMARY
+          cat << EOF >> $GITHUB_STEP_SUMMARY
           <picture>
             <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/light-theme/error.svg">
             <img alt="❌ Error" src="https://raw.githubusercontent.com/Mqxx/GitHub-Markdown/main/blockquotes/badge/dark-theme/error.svg">
           </picture><br>
 
-          The build v${{ env.TAG }} for mc${{ env.MC_HUMAN_VERSION_RANGE }} failed! Please check the action logs for details.
+          The build **v${{ env.TAG }}** for **Minecraft ${{ env.MC_HUMAN_VERSION_RANGE }}** failed! Please check the action logs for details.
           EOF
           fi

CHANGES.md

@@ -1 +1,2 @@
-- **Added support for Minecraft 1.21.7** 💿
+- **Fixed an issue where a structure void item would sometimes flicker below players with an equipped Curios slot** 🔧 (closes [#85](https://github.com/Tschipcraft/dynamiclights/issues/85))
+- Optimized execution by separating logic for players and non-players, capping non-player entities at 1000, and reducing the dynamic light radius around players from 65 to 55 blocks to include fewer entities ([#84](https://github.com/Tschipcraft/dynamiclights/issues/84))

META-INF/mods.toml

@@ -31,7 +31,7 @@ features={ java_version = "[17,)" }
 [[dependencies.dynamiclights]]
     modId="minecraft"
     mandatory=true
-    versionRange="${mc_version_range_forge}"
+    versionRange="[1.17,1.21.5]"
     ordering="NONE"
     side="BOTH"
 

README.md

@@ -13,7 +13,7 @@
 
 ## Features
 
-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)
+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 light 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)
 
 * [**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

data/dynamiclights/function/internal/main.mcfunction

@@ -7,10 +7,12 @@ schedule function dynamiclights:internal/main 1t
 tag @e[type=minecraft:marker,tag=ts.dl.light] add ts.dl.remove
 
 # Detect explosions
-execute as @e[type=minecraft:tnt] at @s run function dynamiclights:internal/explosion_detection/tnt
+execute as @e[type=minecraft:tnt,limit=10] at @s run function dynamiclights:internal/explosion_detection/tnt
 
 # Core
-execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @e[type=!#dynamiclights:dyn_ignore,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore] unless entity @s[type=minecraft:player,gamemode=spectator] 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 @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
 
 # Clear old lights
 execute as @e[type=minecraft:marker,tag=ts.dl.remove] at @s run function dynamiclights:internal/remove_light

data/dynamiclights/function/internal/main_exec.mcfunction

@@ -2,11 +2,11 @@
 
 ## Ghast
 # Ghasts are excluded from the limited range, since shoot timer desynchronizes
-execute if score $enable_ghast ts.dl.settings matches 1..2 if entity @s[type=minecraft:ghast] at @s run function dynamiclights:internal/ghast
+execute if score $enable_ghast ts.dl.settings matches 1..2 as @s[type=minecraft:ghast] at @s run function dynamiclights:internal/ghast
 
 ## Check to avoid placing inside shulkers (#20)
-execute if entity @s[type=minecraft:shulker_bullet] align xyz positioned ~0.5 ~ ~0.5 store result score @s ts.dl.shulker if entity @e[type=minecraft:shulker,distance=..0.1]
+execute as @s[type=minecraft:shulker_bullet] align xyz positioned ~0.5 ~ ~0.5 store result score @s ts.dl.shulker if entity @e[type=minecraft:shulker,distance=..0.1,limit=1]
 
 ## Range limit
 execute if score $unlimited ts.dl.settings matches 1..2 unless entity @s[type=minecraft:shulker_bullet,scores={ts.dl.shulker=1}] run function dynamiclights:internal/main_exec_pass
-execute unless score $unlimited ts.dl.settings matches 1..2 unless entity @s[type=minecraft:shulker_bullet,scores={ts.dl.shulker=1}] if entity @p[gamemode=!spectator,distance=..65] run function dynamiclights:internal/main_exec_pass
+execute unless score $unlimited ts.dl.settings matches 1..2 unless entity @s[type=minecraft:shulker_bullet,scores={ts.dl.shulker=1}] if entity @p[gamemode=!spectator,distance=..55] run function dynamiclights:internal/main_exec_pass

data/dynamiclights/function/internal/sources/mod_support/curios/parse.mcfunction

@@ -1,6 +1,6 @@
 ##by Tschipcraft
 
-summon armor_stand ~ ~ ~ {UUID:[I;-1030365714,1276464731,-2084950084,-395075115],NoGravity:1b,Silent:1b,Invulnerable:1b,Small:1b,Marker:1b,Invisible:1b,NoBasePlate:1b,Tags:["ts.dl.i.parser"],HandItems:[{id:"minecraft:structure_void",Count:1b},{}],DisabledSlots:4144959}
+summon armor_stand ~ -65 ~ {UUID:[I;-1030365714,1276464731,-2084950084,-395075115],NoGravity:1b,Silent:1b,Invulnerable:1b,Small:1b,Marker:1b,Invisible:1b,NoBasePlate:1b,Tags:["ts.dl.i.parser"],HandItems:[{id:"minecraft:structure_void",Count:1b},{}],DisabledSlots:4144959}
 
 # Copy NBT data
 data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0] set from storage dynamiclights:curios stacks[0].StacksHandler.Stacks.Items[0]

data/dynamiclights/function/internal/sources/parse/main.mcfunction

@@ -1,6 +1,6 @@
 ##by Tschipcraft
 
-summon armor_stand ~ ~ ~ {UUID:[I;-1030365714,1276464731,-2084950084,-395075115],NoGravity:1b,Silent:1b,Invulnerable:1b,Small:1b,Marker:1b,Invisible:1b,NoBasePlate:1b,Tags:["ts.dl.i.parser"],equipment:{mainhand:{id:"minecraft:structure_void",count:1}},DisabledSlots:4144959}
+summon armor_stand ~ -65 ~ {UUID:[I;-1030365714,1276464731,-2084950084,-395075115],NoGravity:1b,Silent:1b,Invulnerable:1b,Small:1b,Marker:1b,Invisible:1b,NoBasePlate:1b,Tags:["ts.dl.i.parser"],equipment:{mainhand:{id:"minecraft:structure_void",count:1}},DisabledSlots:4144959}
 
 # Copy NBT data
 execute as @s[type=minecraft:falling_block] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 equipment.mainhand.id set from entity @s BlockState.Name

data/dynamiclights/functions/internal/main.mcfunction

@@ -10,10 +10,12 @@ schedule function dynamiclights:internal/main 1t
 tag @e[type=minecraft:marker,tag=ts.dl.light] add ts.dl.remove
 
 # Detect explosions
-execute as @e[type=minecraft:tnt] at @s run function dynamiclights:internal/explosion_detection/tnt
+execute as @e[type=minecraft:tnt,limit=10] at @s run function dynamiclights:internal/explosion_detection/tnt
 
 # Core
-execute if score $enable ts.dl.settings matches 1..2 unless score $global ts.dl.tnt.fuse matches 1 as @e[type=!#dynamiclights:dyn_ignore,tag=!smithed.strict,tag=!global.ignore,tag=!global.ignore.gui,tag=!ts.dl.ignore] unless entity @s[type=minecraft:player,gamemode=spectator] 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 @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
 
 # Clear old lights
 execute as @e[type=minecraft:marker,tag=ts.dl.remove] at @s run function dynamiclights:internal/remove_light