From e082444cd645dbd1d93349cfb8f3a6b42e2c3051 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Sat, 26 Oct 2024 21:23:04 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20add=20telem?= =?UTF-8?q?etry=20trigger=20to=20force=20create=20a=20new=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/setup/objectives.mcfunction | 2 ++ .../function/telemetry/admin/help.mcfunction | 19 +++++++++++++++++++ .../telemetry/admin/new_page/booth.mcfunction | 11 +++++++++++ .../admin/new_page/bossfight.mcfunction | 15 +++++++++++++++ .../telemetry/admin/reset_triggers.mcfunction | 4 ++++ .../function/telemetry/admin/tick.mcfunction | 4 ++++ 6 files changed, 55 insertions(+) create mode 100644 datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction index 8a243c57..caa8be77 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction @@ -122,6 +122,8 @@ scoreboard objectives add omegaflowey.player.telemetry.id dummy scoreboard objectives add omegaflowey.player.telemetry.trigger.disable trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.enable trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.help trigger +scoreboard objectives add omegaflowey.player.telemetry.trigger.new_page.booth trigger +scoreboard objectives add omegaflowey.player.telemetry.trigger.new_page.bossfight trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.pop.booth trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.pop.bossfight trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.show.booth trigger diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction index c738f5fd..668e48d3 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction @@ -42,6 +42,25 @@ function omegaflowey.utils:log/self { text_component: '[ \ } \ }, \ "\\n", \ + { "text": "new_page: ", "color": "aqua" }, \ + { \ + "text": "booth", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/trigger omegaflowey.player.telemetry.trigger.new_page.booth" \ + } \ + }, \ + " ", \ + { \ + "text": "bossfight", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/trigger omegaflowey.player.telemetry.trigger.new_page.bossfight" \ + } \ + }, \ + "\\n", \ "\\n", \ { \ "text": "stats", \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction new file mode 100644 index 00000000..33dc8a20 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction @@ -0,0 +1,11 @@ +execute if entity @s[name=!TheAfroOfDoom] run return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Only ", "color": "red" }, \ + { "text": "TheAfroOfDoom ", "color": "yellow" }, \ + { "text": "can start a new page in booth telemetry", "color": "red" } \ +]'} + +function omegaflowey.main:telemetry/booth/add_tag/new_page + +function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Started a new page in booth telemetry ", "color": "yellow" } \ +]'} diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction new file mode 100644 index 00000000..a285ec04 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction @@ -0,0 +1,15 @@ +execute if entity @s[name=!TheAfroOfDoom] run return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Only ", "color": "red" }, \ + { "text": "TheAfroOfDoom ", "color": "yellow" }, \ + { "text": "can start a new page in bossfight telemetry", "color": "red" } \ +]'} + +$execute if entity $(boss_fight_uuid) run return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Cannot start a new page in bossfight telemetry: a bossfight is currently active", "color": "red" } \ +]'} + +function omegaflowey.main:telemetry/bossfight/tag/root/start/new_page + +function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Started a new page in bossfight telemetry ", "color": "yellow" } \ +]'} diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction index c08f1166..8f5c4cd1 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction @@ -1,6 +1,8 @@ scoreboard players enable @s omegaflowey.player.telemetry.trigger.disable scoreboard players enable @s omegaflowey.player.telemetry.trigger.enable scoreboard players enable @s omegaflowey.player.telemetry.trigger.help +scoreboard players enable @s omegaflowey.player.telemetry.trigger.new_page.booth +scoreboard players enable @s omegaflowey.player.telemetry.trigger.new_page.bossfight scoreboard players enable @s omegaflowey.player.telemetry.trigger.pop.booth scoreboard players enable @s omegaflowey.player.telemetry.trigger.pop.bossfight scoreboard players enable @s omegaflowey.player.telemetry.trigger.show.booth @@ -10,6 +12,8 @@ scoreboard players enable @s omegaflowey.player.telemetry.trigger.stats scoreboard players set @s omegaflowey.player.telemetry.trigger.disable 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.enable 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.help 0 +scoreboard players set @s omegaflowey.player.telemetry.trigger.new_page.booth 0 +scoreboard players set @s omegaflowey.player.telemetry.trigger.new_page.bossfight 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.pop.booth 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.pop.bossfight 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.show.booth 0 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction index 0ebccd94..e7820056 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction @@ -4,6 +4,10 @@ execute if score @s omegaflowey.player.telemetry.trigger.enable matches 1 run \ function omegaflowey.main:telemetry/admin/enable execute if score @s omegaflowey.player.telemetry.trigger.help matches 1 run \ function omegaflowey.main:telemetry/admin/help +execute if score @s omegaflowey.player.telemetry.trigger.new_page.booth matches 1 run \ + function omegaflowey.main:telemetry/admin/new_page/booth +execute if score @s omegaflowey.player.telemetry.trigger.new_page.bossfight matches 1 run \ + function omegaflowey.main:telemetry/admin/new_page/bossfight with storage omegaflowey:bossfight execute if score @s omegaflowey.player.telemetry.trigger.pop.booth matches 1 run \ function omegaflowey.main:telemetry/admin/pop/booth execute if score @s omegaflowey.player.telemetry.trigger.pop.bossfight matches 1 run \