Skip to content

Commit

Permalink
(0.14.24) minor changes to compatabilities checking
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated-Programmer committed Jan 21, 2025
1 parent 8c4ac99 commit 1ec4a6b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 11 deletions.
6 changes: 1 addition & 5 deletions Brilliance Datapack/TODO.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Other TODO:
- Allows right/left to be personalized and not affect EVERYONE (is easy, just x2 of all gui maps)
- finish the custom images for the GUI buttons. Just 0.5 left to be done. (waiting on vote)
- config for deck limit.
- Legendaries currently cannot be bought or could be available to be purchased, should this change:
Expand All @@ -9,18 +10,13 @@
- When going from zoneless to zoned, Z4 and Z5 ravagers still exist.
- When random TP is off, ravagers can be in the wrong zones as well, need to force TP when swapping.
- Disentangle weather/daytime cycle configs
- Set gui map tag based on Tango's existence, prompt for scale
- Config to replace 'retired' hermits.
- Need new artifacts
- On game end, CHECK stat tracking containers. Notify if ever full
- List of stat containers are in FR reset containers
- Check berry/extra item disposal in ravager gauntlet
- Add FR config to completely reset hermit's impact to the dungeon.
- Add INTERFACE for config of number of shop cards always available
- Add pre-emptive legendary stat tracking
- Update vanilla compatability configs,
- GUI needs to auto apply
- Signs need to allow disable/enable & descriptions
- Add is_waxed:1b to all non-clickable signs
- ```
* -575 110 2010
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,7 @@ scoreboard players set $dungeon do2.run.players 0
function do2:scoreboard/config/config_lock

# Make sure that the redstone block keeping the iron door open is removed
setblock -551 119 1977 air
setblock -551 119 1977 air

# Make sure all players are able to have map enabled
execute as @e[team=do2.players] run function do2:vanilla_compatability/gui/interface/detect
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ execute positioned -524 103 2167 if entity @s[distance=..10] at @s run tp @s ~ ~
# If game hasn't started. Swap the difficulty, to the user's last used difficulty.
execute if score $dungeon do2.utility.onInstance matches 1 unless score $dungeon do2.run.active matches 1.. as @p[tag=do2.received_shulker] run function do2:dungeon_setup/preset_difficulty

# Check if player needs any compatability
# Check if player needs AUDIO compatability
function do2:vanilla_compatability/audio/interface/detect
function do2:vanilla_compatability/gui/interface/detect
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ function do2:external/voice_chat/check
# If they have VoiceChat mod, do nothing.
execute if score @s do2.utility.voiceChat matches 1 run return 0

# If they already have the tag, do nothing.
execute if entity @s[tag=do2.tags.audio.enabled] run return 0

# Else, apply the compatability feature and give them option to disable.
tag @s add do2.tags.audio.enabled
playsound minecraft:ui.toast.in master @s ~ ~ ~ 1 0.75
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ execute if entity @s[gamemode=spectator] run return 0
# If a fake player exists (TangoCam), do nothing.
execute if entity @e[tag=do2.fakePlayer] run return 0

# If already has the tag, do nothing
execute if entity @s[tag=do2.tags.gui.enabled] run return 0

# Else, apply the compatability feature and give them option to disable.
tag @s add do2.tags.gui.enabled
execute if entity @s[tag=!do2.tags.gui.level1,tag=!do2.tags.gui.level2,tag=!do2.tags.gui.level3,tag=!do2.tags.gui.level4] run tag @s add do2.tags.gui.level1
playsound minecraft:ui.toast.in master @s ~ ~ ~ 1 0.75
tellraw @s ["",{"text":"§6-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n §r§o§lVanilla Compatability §8GUI map§r §r§o§lFeature: §r§a[ENABLED]§r\n\n§rWe've noticed you do not have the VoiceChat mod installed on your client. We have automatically tagged you to receive sounds via §n§o/playsound§r §rin command blocks.\n\nYou may change this at any time by running \n§r§o§n/trigger do2.trigger.playsound§r\n§r§6-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"}]
tellraw @s ["",{"text":"§6-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n §r§o§lVanilla Compatability §8GUI map§r §r§o§lFeature: §r§a[ENABLED]§r\n\n§rWe've noticed you do not have the Carpet mod installed on your client. We have automatically tagged you to receive a custom GUI via command blocks.\n\nYou may change this at any time by running \n§r§o§n/trigger do2.trigger.gui§r\n§r§6-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"}]
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ tag @s add do2.tags.gui.enabled
playsound minecraft:ui.button.click master @s ~ ~ ~ 1 1.7
tellraw @s ["",{"text":"§6-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n\n§r§l§aENABLED §r§oVanilla Compatability §8GUI map§r §r§oFeature§r\n\nWould you like to customize the size of the GUI's display?\n\n"}]

# Todo: add underlines to the CURRENTlY scaled option
#[tag=do2.tags.gui.level1]
execute if entity @s run tellraw @s ["",{"text":"§3[ SCALE x0.5 ]","clickEvent":{"action":"run_command","value":"/function do2:vanilla_compatability/gui/interface/scale4"}}," ",{"text":"§3[ SCALE x1 ]","clickEvent":{"action":"run_command","value":"/function do2:vanilla_compatability/gui/interface/scale3"}}," ",{"text":"§3[ SCALE x2 ]","clickEvent":{"action":"run_command","value":"/function do2:vanilla_compatability/gui/interface/scale2"}}," ",{"text":"§3[ SCALE x4 ]","clickEvent":{"action":"run_command","value":"/function do2:vanilla_compatability/gui/interface/scale1"}}]

Expand Down
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DATAPACK VERSION NUMBER: 0.14.23
# DATAPACK VERSION NUMBER: 0.14.24

tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.23§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.24§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]

0 comments on commit 1ec4a6b

Please sign in to comment.