-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fixed sculk sensors getting triggered upon dynamic light removal (closes #8), location changes and item frame updates - Fixed overwriting player placed blocks (closes #7) - Fixed ghast desync when no player is near - Added new custom license - Updated curseforge badge
- Loading branch information
1 parent
3706bb4
commit 0f3984c
Showing
27 changed files
with
148 additions
and
74 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 |
|---|---|---|
| @@ -1,21 +1,52 @@ | ||
| MIT License | ||
|
|
||
| Copyright (c) 2023 Tschipcraft | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. | ||
| Tschipcraft's Custom License for Minecraft Mods, Data Packs and Resource Packs | ||
| Version 1.0 - 2023 | ||
|
|
||
| TL;DR - Not exhaustive, please read the whole license for detailed information: | ||
| - Don't steal, don't re-upload, don't spread misinformation. | ||
| - Monetized videos, livestreams with this or about this pack and inclusion in modpacks are allowed, as long as credit is given by linking back to official download locations. | ||
| - Only use parts or the entire pack in your project, if you ask me and I say yes. | ||
|
|
||
| Copyright © 2023 Tschipcraft | ||
|
|
||
| This license shall be included in all copies or substantial portions of this project. | ||
|
|
||
|
|
||
| Permitted Uses: | ||
|
|
||
| 1. You are PERMITTED to freely use this project on singleplayer worlds and multiplayer worlds/servers in your Minecraft game. | ||
|
|
||
| 2. You are PERMITTED to modify this project's code for personal use or on your own private servers. | ||
|
|
||
| 3. You are PERMITTED to view this project's code, take reference, and learn from it. | ||
|
|
||
| 4. You are PERMITTED to create content (e.g., videos, livestreams) covering and showcasing this project on websites such as YouTube, Twitch, Instagram, TikTok, etc., or on your own website, IF you provide a prominent link back to at least one of the official download locations ([GitHub](https://github.com/Tschipcraft/dynamiclights), [CurseForge](https://www.curseforge.com/minecraft/texture-packs/tschipcrafts-dynamic-lights), [Modrinth](https://modrinth.com/datapack/dynamic-lights)) in the description or an easily accessible place. You may also monetize this content. | ||
|
|
||
| 5. You are PERMITTED to include this project in your modpack, IF you link back to at least one of the official download locations ([GitHub](https://github.com/Tschipcraft/dynamiclights), [CurseForge](https://www.curseforge.com/minecraft/texture-packs/tschipcrafts-dynamic-lights), [Modrinth](https://modrinth.com/datapack/dynamic-lights)), or by simply adding this project in the embedded or included mods sections directly on Modrinth and/or CurseForge. | ||
|
|
||
| 6. You are PERMITTED to use parts or the whole project in your own project (Mod, Data Pack, Resource Pack, Map, Server, etc.), IF you obtain explicit permission from the creator (Tschipcraft) first. To request permission, please contact me via email at tschipcraft@gmail.com or message me directly on Planet Minecraft (https://www.planetminecraft.com/account/pms/new/tschipo), or Discord (@tschipo) and include detailed information about your intentions. | ||
|
|
||
|
|
||
| Prohibited Uses: | ||
|
|
||
| 1. You may NOT redistribute or re-upload this project, modified or unmodified. | ||
|
|
||
| 2. You may NOT redistribute single parts, files, or standalones of this project. | ||
|
|
||
| 3. You may NOT claim that this project was made by you. | ||
|
|
||
| 4. You may NOT spread misinformation about this project, including but not limited to promising not implemented features or support for an unsupported Minecraft version. | ||
|
|
||
|
|
||
| Liability and Warranty: | ||
|
|
||
| This project is provided "as is," without warranty of any kind, expressed or implied. In no event shall the creator (Tschipcraft) be held liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the project or the use or other dealings in the project. | ||
|
|
||
| All works of Tschipcraft are of and owned by Tschipcraft. | ||
|
|
||
| By using this project, you agree to abide by the terms of this license. Any violation of the terms will result in the termination of the rights granted hereunder. | ||
|
|
||
| Exceptions to this license may be granted, if you have a special case, contact me via email at tschipcraft@gmail.com or message me directly on Planet Minecraft (https://www.planetminecraft.com/account/pms/new/tschipo), or Discord (@tschipo) and include detailed information about your intentions. | ||
|
|
||
| This license shall be governed by and construed in accordance with the laws of Germany. Any legal action or proceeding arising under or in connection with this license shall be brought exclusively in the courts of Germany. | ||
|
|
||
| This license is subject to change. The latest version of this license will be available at https://github.com/Tschipcraft/dynamiclights/blob/master/LICENSE, and your continued use of the project after changes happen, will constitute your acceptance of the changes. |
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,5 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| # Prevent vibrations | ||
| tp @s ~ 320 ~ | ||
| kill @s |
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
27 changes: 4 additions & 23 deletions
27
data/dynamiclights/functions/internal/main_exec.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,28 +1,9 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| ## In water? | ||
| scoreboard players add @s ts.dl.in_water 0 | ||
| execute if score $water_sensitive ts.dl.settings matches 1 as @s[scores={ts.dl.in_water=0}] anchored eyes positioned ^ ^ ^ if predicate dynamiclights:in_water run function dynamiclights:internal/water/enter | ||
| execute as @s[scores={ts.dl.in_water=1},type=!minecraft:item] anchored eyes positioned ^ ^ ^ unless predicate dynamiclights:in_water run function dynamiclights:internal/water/exit | ||
| execute as @s[scores={ts.dl.in_water=1},type=minecraft:item] anchored eyes positioned ^ ^ ^ positioned ~ ~-0.1 ~ unless predicate dynamiclights:in_water run function dynamiclights:internal/water/exit | ||
|
|
||
| ## Sound cues for trident enchants | ||
| scoreboard players add @s ts.dl.sound 0 | ||
| execute as @s[scores={ts.dl.sound=0},predicate=dynamiclights:entity/has_riptide_trident] run function dynamiclights:internal/enchantments/activate/riptide | ||
| execute as @s[scores={ts.dl.sound=1},predicate=!dynamiclights:entity/has_riptide_trident] run function dynamiclights:internal/enchantments/deactivate/riptide | ||
|
|
||
| execute as @s[scores={ts.dl.sound=0},predicate=dynamiclights:entity/has_channeling_trident] run function dynamiclights:internal/enchantments/activate/channeling | ||
| execute as @s[scores={ts.dl.sound=2},predicate=!dynamiclights:entity/has_channeling_trident] run function dynamiclights:internal/enchantments/deactivate/channeling | ||
|
|
||
| ## Dispatch light | ||
| function dynamiclights:internal/sources/core | ||
|
|
||
| # Light block sadly blocks explosion damage | ||
| #execute as @s[type=minecraft:creeper,nbt={ignited:1b},tag=!global.ignore,tag=!smithed.strict] at @s run function dynamiclights:summon_light | ||
|
|
||
| ## Ghast | ||
| # Ghasts are excluded from the limited range, since shoot timer desynchronizes | ||
| execute as @s[type=minecraft:ghast] at @s run function dynamiclights:internal/ghast | ||
|
|
||
| ## Extension for More Mobs | ||
| execute as @s[type=minecraft:wither_skeleton,tag=ts.mm.magma_1] at @s run function dynamiclights:internal/place_light/6/summon | ||
| execute as @s[type=minecraft:wither_skeleton,tag=ts.mm.magma_2] at @s run function dynamiclights:internal/place_light/9/summon | ||
| ## Range limit | ||
| execute if score $unlimited ts.dl.settings matches 1..2 run function dynamiclights:internal/main_exec_pass | ||
| execute unless score $unlimited ts.dl.settings matches 1..2 if entity @a[gamemode=!spectator,distance=..65] run function dynamiclights:internal/main_exec_pass |
25 changes: 25 additions & 0 deletions
25
data/dynamiclights/functions/internal/main_exec_pass.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,25 @@ | ||
| ##by Tschipcraft | ||
|
|
||
| ## In water? | ||
| scoreboard players add @s ts.dl.in_water 0 | ||
| execute if score $water_sensitive ts.dl.settings matches 1..2 as @s[scores={ts.dl.in_water=0}] anchored eyes positioned ^ ^ ^ if predicate dynamiclights:in_water run function dynamiclights:internal/water/enter | ||
| execute as @s[scores={ts.dl.in_water=1},type=!minecraft:item] anchored eyes positioned ^ ^ ^ unless predicate dynamiclights:in_water run function dynamiclights:internal/water/exit | ||
| execute as @s[scores={ts.dl.in_water=1},type=minecraft:item] anchored eyes positioned ^ ^ ^ positioned ~ ~-0.1 ~ unless predicate dynamiclights:in_water run function dynamiclights:internal/water/exit | ||
|
|
||
| ## Sound cues for trident enchants | ||
| scoreboard players add @s ts.dl.sound 0 | ||
| execute as @s[scores={ts.dl.sound=0},predicate=dynamiclights:entity/has_riptide_trident] run function dynamiclights:internal/enchantments/activate/riptide | ||
| execute as @s[scores={ts.dl.sound=1},predicate=!dynamiclights:entity/has_riptide_trident] run function dynamiclights:internal/enchantments/deactivate/riptide | ||
|
|
||
| execute as @s[scores={ts.dl.sound=0},predicate=dynamiclights:entity/has_channeling_trident] run function dynamiclights:internal/enchantments/activate/channeling | ||
| execute as @s[scores={ts.dl.sound=2},predicate=!dynamiclights:entity/has_channeling_trident] run function dynamiclights:internal/enchantments/deactivate/channeling | ||
|
|
||
| ## Dispatch light | ||
| function dynamiclights:internal/sources/core | ||
|
|
||
| # Light block sadly blocks explosion damage | ||
| #execute as @s[type=minecraft:creeper,nbt={ignited:1b},tag=!global.ignore,tag=!smithed.strict] at @s run function dynamiclights:summon_light | ||
|
|
||
| ## Extension for More Mobs | ||
| execute as @s[type=minecraft:wither_skeleton,tag=ts.mm.magma_1] at @s run function dynamiclights:internal/place_light/6/summon | ||
| execute as @s[type=minecraft:wither_skeleton,tag=ts.mm.magma_2] at @s run function dynamiclights:internal/place_light/9/summon |
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
5 changes: 4 additions & 1 deletion
5
data/dynamiclights/functions/internal/place_light/15/summon.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
1 change: 1 addition & 0 deletions
1
data/dynamiclights/functions/internal/place_light/15/summon_exec.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
4 changes: 2 additions & 2 deletions
4
data/dynamiclights/functions/internal/place_light/15/summon_new.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,5 +1,5 @@ | ||
| ##by Tschipcraft | ||
| # Summons a new marker entity | ||
|
|
||
| execute align xyz positioned ~ ~ ~ run summon minecraft:marker ~ ~ ~ {Tags:["ts.dl.light","global.ignore","global.ignore.kill","global.ignore.pos","smithed.block"],Invulnerable:1b} | ||
| execute as @e[type=minecraft:marker,tag=ts.dl.light,sort=nearest,limit=1] at @s run function dynamiclights:internal/place_light/15/summon_exec | ||
| execute align xyz run summon minecraft:marker ~ ~ ~ {Tags:["ts.dl.light","ts.dl.new_light","global.ignore","global.ignore.kill","global.ignore.pos","smithed.block"],Invulnerable:1b} | ||
| execute align xyz as @e[type=minecraft:marker,tag=ts.dl.new_light,sort=nearest,limit=1] at @s run function dynamiclights:internal/place_light/15/summon_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
5 changes: 4 additions & 1 deletion
5
data/dynamiclights/functions/internal/place_light/6/summon.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
1 change: 1 addition & 0 deletions
1
data/dynamiclights/functions/internal/place_light/6/summon_exec.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
4 changes: 2 additions & 2 deletions
4
data/dynamiclights/functions/internal/place_light/6/summon_new.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,5 +1,5 @@ | ||
| ##by Tschipcraft | ||
| # Summons a new marker entity | ||
|
|
||
| execute align xyz positioned ~ ~ ~ run summon minecraft:marker ~ ~ ~ {Tags:["ts.dl.light","global.ignore","global.ignore.kill","global.ignore.pos","smithed.block"],Invulnerable:1b} | ||
| execute as @e[type=minecraft:marker,tag=ts.dl.light,sort=nearest,limit=1] at @s run function dynamiclights:internal/place_light/6/summon_exec | ||
| execute align xyz positioned ~ ~ ~ run summon minecraft:marker ~ ~ ~ {Tags:["ts.dl.light","ts.dl.new_light","global.ignore","global.ignore.kill","global.ignore.pos","smithed.block"],Invulnerable:1b} | ||
| execute align xyz as @e[type=minecraft:marker,tag=ts.dl.new_light,sort=nearest,limit=1] at @s run function dynamiclights:internal/place_light/6/summon_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
5 changes: 4 additions & 1 deletion
5
data/dynamiclights/functions/internal/place_light/9/summon.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
Oops, something went wrong.