-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from Tschipcraft/dev
- Loading branch information
Showing
252 changed files
with
5,260 additions
and
256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,14 +13,17 @@ on: | |
| mc_version_range: | ||
| description: 'Minecraft version(s) the data pack runs in (encoded in version range spec)' | ||
| required: true | ||
| default: '[1.17,1.20.4]' | ||
| default: '>=1.17 <=1.20.4' | ||
|
|
||
| jobs: | ||
| build: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| name: Build and publish project | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/[email protected] | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| show-progress: false | ||
| - name: Extract tag | ||
| id: tag_version | ||
| run: echo "TAG_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV | ||
|
|
@@ -39,21 +42,27 @@ jobs: | |
| find: "${version}" | ||
| replace: ${{ github.event.inputs.tag }} | ||
| regex: false | ||
| - name: Find and replace supported mc versions | ||
| uses: jacobtomlinson/gha-find-replace@v3 | ||
| with: | ||
| find: "${mc_version}" | ||
| replace: ${{ github.event.inputs.mc_version }} | ||
| regex: false | ||
|
|
||
| # Check for existence of datapack, mod and/or resourcepack folders. | ||
| - name: Check for data folder | ||
| id: check_datapack_folder | ||
| uses: andstor/file-existence-action@v2 | ||
| uses: andstor/file-existence-action@v3 | ||
| with: | ||
| files: "data" | ||
| - name: Check for mod folders | ||
| id: check_mod_folder | ||
| uses: andstor/file-existence-action@v2 | ||
| uses: andstor/file-existence-action@v3 | ||
| with: | ||
| files: "META-INF, net, fabric.mod.json, assets" | ||
| - name: Check for resource pack folder | ||
| id: check_assets_folder | ||
| uses: andstor/file-existence-action@v2 | ||
| uses: andstor/file-existence-action@v3 | ||
| with: | ||
| files: "assets/minecraft" | ||
|
|
||
|
|
@@ -75,20 +84,6 @@ jobs: | |
| args: zip -qq "${{ github.event.repository.name }}-v${{ github.event.inputs.tag }}-mc${{ github.event.inputs.mc_version }}-resourcepack.zip" -r assets pack.mcmeta pack.png LICENSE README.md | ||
|
|
||
| # Upload | ||
| - name: Upload outputs to GitHub releases | ||
| uses: Kir-Antipov/[email protected] | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| github-tag: v${{ github.event.inputs.tag }} | ||
| game-versions: ${{ github.event.inputs.mc_version_range }} | ||
|
|
||
| name: Release v${{ github.event.inputs.tag }} | ||
| version: v${{ github.event.inputs.tag }} | ||
| changelog-file: CHANGELOG.* | ||
|
|
||
| files: | | ||
| ./${{ github.event.repository.name }}-*.@(zip|jar) | ||
| - name: Upload data pack version to Modrinth | ||
| uses: Kir-Antipov/[email protected] | ||
| if: steps.check_datapack_folder.outputs.files_exists == 'true' | ||
|
|
@@ -174,3 +169,19 @@ jobs: | |
| quilt | ||
| files: | | ||
| ./${{ github.event.repository.name }}-*-mod.jar | ||
| - name: Add changelog header for GitHub release | ||
| run: sed -i '1i_Changelog:_' CHANGELOG.md | ||
| - name: Upload outputs to GitHub releases | ||
| uses: Kir-Antipov/[email protected] | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| github-tag: v${{ github.event.inputs.tag }} | ||
| game-versions: ${{ github.event.inputs.mc_version_range }} | ||
|
|
||
| name: Release v${{ github.event.inputs.tag }} | ||
| version: v${{ github.event.inputs.tag }} | ||
| changelog-file: CHANGELOG.md | ||
|
|
||
| files: | | ||
| ./${{ github.event.repository.name }}-*.@(zip|jar) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,31 @@ | ||
| - **Update to Minecraft 1.20.4** 🦇 | ||
| - **Improved performance of light placement checks** | ||
| - Moved dynamic light spawn location to eye level | ||
| - Added global function api calls for placing dynamic lights | ||
| - Added a check before removing light markers to make sure the light block itself got removed first | ||
| - Added interaction entities to the ignore tag list | ||
| - **Update to Minecraft 1.20.6 🐺** | ||
| These changes utilize overlays to maintain backwards compatibility | ||
| - Switched to testing components rather than NBT in predicates | ||
| - Added support for the newly added contents slot in predicates | ||
| - **Added intermediate light levels 3 and 12** ([#14](https://github.com/Tschipcraft/dynamiclights/issues/14)) | ||
| - Magma cubes, magma blocks, magma cream, all remaining amethyst buds, heart of the sea and totem of undying (closes [#23](https://github.com/Tschipcraft/dynamiclights/issues/23)) now emit light level 3 | ||
| - Dragon fireballs now emit light level 12 instead of 15 | ||
| - **Implemented a new system for finding valid locations for dynamic lights.** | ||
| Checks now actively avoid blocking paths of fluids and pistons (closes [#15](https://github.com/Tschipcraft/dynamiclights/issues/15)), interfering with other redstone components and triggering certain block updates (closes [#12](https://github.com/Tschipcraft/dynamiclights/issues/12)) | ||
| - **Added support for parsing item displays, block displays and falling blocks** | ||
| - **Added support for parsing tridents, arrows and ominous item spawners in versions 1.20.5 and up** | ||
| - Simplified light block placement and removal | ||
| - Fixed shulkers teleporting away when shooting (closes [#20](https://github.com/Tschipcraft/dynamiclights/issues/20)) | ||
| - Eventified item frame reparsing in versions before 1.20.5 | ||
| Item frame reparsing is now triggered when a player right-clicks on an item frame or when an item drops nearby in versions prior to 24w11a | ||
| This should improve performance in regions with a high number of item frames while also improving responsiveness (first steps for [#13](https://github.com/Tschipcraft/dynamiclights/issues/13)) | ||
| - Improved dynamic light explosion avoidance performance by checking a global score instead of scanning for nearby area effect clouds | ||
| - Fixed dynamic lights overwriting cave_air with air | ||
| - Fixed dynamic light position offset for item entities | ||
| - Added separate mod support tag lists for modded items | ||
| - Added additional overlay that should slightly improve performance when placing dynamic lights in 1.20.2 and above | ||
| - Gave dynamic light marker entities a custom name ([#19](https://github.com/Tschipcraft/dynamiclights/issues/19)) | ||
| - Some light level changes | ||
| - Added conduit to light level 15 items | ||
| - Moved glowstone dust from light level 15 to light level 9 | ||
| - Added crying obsidian to light level 9 items | ||
| - Added small_fireball to light level 9 entities | ||
| - Moved allay from 9 to light level 6 entities | ||
| - Added enchanted golden apple, enchanting table, enchanted book, sculk catalyst and the upcoming vault to light level 6 items | ||
| - Added paintings to the ignore tag list | ||
| - Added tnt minecarts to the may_block_explosion_damage tag list |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
data/dynamiclights/advancements/interacted_with_item_frame.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "criteria": { | ||
| "player_interacted": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "entity": { | ||
| "type": "#dynamiclights:reparse_interactible" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "player_interacted" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "function": "dynamiclights:internal/item_frame/interacted" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ##by Tschipcraft | ||
| # Places a dynamic light block with light level 12 near the provided location (~ ~ ~) that will disappear after 1 tick | ||
| # Additionally sets the score #check_passed ts.dl.temp to 1 | ||
|
|
||
| scoreboard players set #check_passed ts.dl.temp 1 | ||
|
|
||
| function dynamiclights:internal/place_light/12/exec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ##by Tschipcraft | ||
| # Places a dynamic light block with light level 3 near the provided location (~ ~ ~) that will disappear after 1 tick | ||
| # Additionally sets the score #check_passed ts.dl.temp to 1 | ||
|
|
||
| scoreboard players set #check_passed ts.dl.temp 1 | ||
|
|
||
| function dynamiclights:internal/place_light/3/exec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
data/dynamiclights/functions/internal/enchantments/activate/channeling.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| execute if score $enable_sound ts.dl.settings matches 1..2 run playsound minecraft:block.beacon.power_select player @a ~ ~ ~ 0.3 | ||
| playsound minecraft:block.beacon.power_select player @a ~ ~ ~ 0.3 | ||
| scoreboard players set @s ts.dl.sound 2 |
2 changes: 1 addition & 1 deletion
2
data/dynamiclights/functions/internal/enchantments/activate/riptide.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| execute if score $enable_sound ts.dl.settings matches 1..2 run playsound minecraft:block.conduit.activate player @a ~ ~ ~ 0.8 | ||
| playsound minecraft:block.conduit.activate player @a ~ ~ ~ 0.8 | ||
| scoreboard players set @s ts.dl.sound 1 |
2 changes: 1 addition & 1 deletion
2
data/dynamiclights/functions/internal/enchantments/deactivate/channeling.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| execute if score $enable_sound ts.dl.settings matches 1..2 run playsound minecraft:block.beacon.deactivate player @a ~ ~ ~ 0.3 | ||
| playsound minecraft:block.beacon.deactivate player @a ~ ~ ~ 0.3 | ||
| scoreboard players set @s ts.dl.sound 0 |
2 changes: 1 addition & 1 deletion
2
data/dynamiclights/functions/internal/enchantments/deactivate/riptide.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| execute if score $enable_sound ts.dl.settings matches 1..2 run playsound minecraft:block.conduit.deactivate player @a ~ ~ ~ 0.3 | ||
| playsound minecraft:block.conduit.deactivate player @a ~ ~ ~ 0.3 | ||
| scoreboard players set @s ts.dl.sound 0 |
4 changes: 4 additions & 0 deletions
4
data/dynamiclights/functions/internal/explosion_detection/reset.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| ##by Tschipcraft | ||
| # Resets the global explosion alarm | ||
|
|
||
| scoreboard players reset $global ts.dl.tnt.fuse |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.