From 76f467dd38881d4a93566154856460fee927305e Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 18:04:40 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=88=20merge=20bossfight=20`type`=20tag?= =?UTF-8?q?=20into=20each=20tag's=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/telemetry/bossfight/tag/end.mcfunction | 2 +- .../function/telemetry/bossfight/tag/instant.mcfunction | 2 +- .../function/telemetry/bossfight/tag/root/end.mcfunction | 2 +- .../function/telemetry/bossfight/tag/root/start.mcfunction | 2 +- .../function/telemetry/bossfight/tag/root/to_string.mcfunction | 1 - .../function/telemetry/bossfight/tag/start.mcfunction | 2 +- .../function/telemetry/bossfight/tag/to_string.mcfunction | 1 - 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/end.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/end.mcfunction index 34141e1b6..aff564129 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/end.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/end.mcfunction @@ -2,5 +2,5 @@ execute unless score #omegaflowey.telemetry.enabled omegaflowey.global.flag matc execute if score #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag matches -1 run return 0 -$data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "$(name)", "type": "end" } +$data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "$(name).end" } function omegaflowey.main:telemetry/bossfight/tag/shared diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/instant.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/instant.mcfunction index a208d09cf..40106a370 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/instant.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/instant.mcfunction @@ -2,5 +2,5 @@ execute unless score #omegaflowey.telemetry.enabled omegaflowey.global.flag matc execute if score #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag matches -1 run return 0 -$data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "$(name)", type: "instant" } +$data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "$(name)" } function omegaflowey.main:telemetry/bossfight/tag/shared diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/end.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/end.mcfunction index 856a8e897..16648796d 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/end.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/end.mcfunction @@ -2,7 +2,7 @@ execute unless score #omegaflowey.telemetry.enabled omegaflowey.global.flag matc execute if score #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag matches -1 run return 0 -data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "root", "type": "end" } +data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "root.end" } function omegaflowey.main:telemetry/bossfight/tag/shared scoreboard players set #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag -1 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/start.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/start.mcfunction index 2a135c586..f771828ae 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/start.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/start.mcfunction @@ -1,6 +1,6 @@ execute unless score #omegaflowey.telemetry.enabled omegaflowey.global.flag matches 1 run return 0 -data modify storage omegaflowey:telemetry.temp bossfight_root_next set value { name: "root", "type": "start" } +data modify storage omegaflowey:telemetry.temp bossfight_root_next set value { name: "root.end" } execute store result score #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag run time query gametime execute store result storage omegaflowey:telemetry.temp bossfight_root_next.tick int 1 run \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/to_string.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/to_string.mcfunction index bad609f9e..f108d83cf 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/to_string.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/root/to_string.mcfunction @@ -1,6 +1,5 @@ $data modify storage omegaflowey:telemetry data.bossfight[-1] append value "\ $(name);\ - $(type);\ $(tick);\ $(player_id);\ $(player_gamemode);\ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/start.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/start.mcfunction index a4a4217a0..f39059790 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/start.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/start.mcfunction @@ -2,5 +2,5 @@ execute unless score #omegaflowey.telemetry.enabled omegaflowey.global.flag matc execute if score #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag matches -1 run return 0 -$data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "$(name)", "type": "start" } +$data modify storage omegaflowey:telemetry.temp bossfight_next set value { name: "$(name).start" } function omegaflowey.main:telemetry/bossfight/tag/shared diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/to_string.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/to_string.mcfunction index bd15bbe55..c0c87bcb8 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/to_string.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/tag/to_string.mcfunction @@ -1,6 +1,5 @@ $data modify storage omegaflowey:telemetry data.bossfight[-1] append value "\ $(name);\ - $(type);\ $(tick);\ $(data);\ "