From a91675e75e300e10a3675061146cde0eccb84a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <1214946206@qq.com> Date: Sun, 25 Sep 2022 13:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA1.18=E5=88=A0=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 6 +++--- .../functions/module/last_death/get_death_point.mcfunction | 7 ------- data/fzsd/functions/module/last_death/install.mcfunction | 5 ----- .../module/last_death/interactor/display.mcfunction | 1 - .../module/last_death/interactor/on_click.mcfunction | 1 - .../functions/module/last_death/private_message.mcfunction | 2 -- data/fzsd/functions/module/last_death/uninstall.mcfunction | 7 ------- data/fzsd/tags/functions/module/interactor/display.json | 1 - .../tags/functions/module/interactor/event/on_click.json | 1 - 9 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 data/fzsd/functions/module/last_death/get_death_point.mcfunction delete mode 100644 data/fzsd/functions/module/last_death/install.mcfunction delete mode 100644 data/fzsd/functions/module/last_death/interactor/display.mcfunction delete mode 100644 data/fzsd/functions/module/last_death/interactor/on_click.mcfunction delete mode 100644 data/fzsd/functions/module/last_death/private_message.mcfunction delete mode 100644 data/fzsd/functions/module/last_death/uninstall.mcfunction diff --git a/.vscode/settings.json b/.vscode/settings.json index 34c531a..6237c28 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,7 +17,7 @@ "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}", "ifInstalled": "execute if data storage fzsd:installed fzsd.module{${1:module_name}:1b} run ${tellraw}" }, - "datapack.env.cmdVersion": "1.19", - "datapack.env.jsonVersion": "1.19", - "datapack.env.dataVersion": "1.19" + "datapack.env.cmdVersion": "1.18.2", + "datapack.env.jsonVersion": "1.18.2", + "datapack.env.dataVersion": "1.18.2" } \ No newline at end of file diff --git a/data/fzsd/functions/module/last_death/get_death_point.mcfunction b/data/fzsd/functions/module/last_death/get_death_point.mcfunction deleted file mode 100644 index 641a188..0000000 --- a/data/fzsd/functions/module/last_death/get_death_point.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -data modify storage fzsd:global fzsd.api.dimension.id set from entity @s LastDeathLocation.dimension -execute store result storage fzsd:last_death fzsd.x int 1 run data get entity @s LastDeathLocation.pos[0] -execute store result storage fzsd:last_death fzsd.y int 1 run data get entity @s LastDeathLocation.pos[1] -execute store result storage fzsd:last_death fzsd.z int 1 run data get entity @s LastDeathLocation.pos[2] - -## 调试 -execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "获取了死亡点"}] \ No newline at end of file diff --git a/data/fzsd/functions/module/last_death/install.mcfunction b/data/fzsd/functions/module/last_death/install.mcfunction deleted file mode 100644 index 94d6724..0000000 --- a/data/fzsd/functions/module/last_death/install.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -## 标记为已安装 -data modify storage fzsd:install fzsd.module.last_death set value 1b - -## 日志 -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：上一死亡点"}] \ No newline at end of file diff --git a/data/fzsd/functions/module/last_death/interactor/display.mcfunction b/data/fzsd/functions/module/last_death/interactor/display.mcfunction deleted file mode 100644 index 8f3a1ad..0000000 --- a/data/fzsd/functions/module/last_death/interactor/display.mcfunction +++ /dev/null @@ -1 +0,0 @@ -execute if data storage fzsd:install fzsd.module{last_death:1b} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction b/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction deleted file mode 100644 index 5ce5872..0000000 --- a/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction +++ /dev/null @@ -1 +0,0 @@ -execute if score @s fzsd.module.interactor.trigger matches -2100 run function #fzsd:module/last_death/private_message \ No newline at end of file diff --git a/data/fzsd/functions/module/last_death/private_message.mcfunction b/data/fzsd/functions/module/last_death/private_message.mcfunction deleted file mode 100644 index 4fe4c42..0000000 --- a/data/fzsd/functions/module/last_death/private_message.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -execute if data entity @s LastDeathLocation run tellraw @s [{"text": "你上次死亡于"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:last_death"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:last_death"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:last_death"}, {"text": "]"}]] -execute unless data entity @s LastDeathLocation run tellraw @s {"text": "你从未死亡！"} \ No newline at end of file diff --git a/data/fzsd/functions/module/last_death/uninstall.mcfunction b/data/fzsd/functions/module/last_death/uninstall.mcfunction deleted file mode 100644 index 6de53dd..0000000 --- a/data/fzsd/functions/module/last_death/uninstall.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -data remove storage fzsd:last_death fzsd - -## 标记为已卸载 -data modify storage fzsd:install fzsd.module.last_death set value 0b - -## 日志 -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：上一死亡点"}] \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/interactor/display.json b/data/fzsd/tags/functions/module/interactor/display.json index 008f19e..35790fb 100644 --- a/data/fzsd/tags/functions/module/interactor/display.json +++ b/data/fzsd/tags/functions/module/interactor/display.json @@ -5,7 +5,6 @@ "fzsd:module/interactor/interactor/display", "#fzsd:module/scoreboard/interactor/display", "#fzsd:module/here/interactor/display", - "#fzsd:module/last_death/interactor/display", "#fzsd:module/last_nether_portal/interactor/display", "#fzsd:module/last_spawn_point/interactor/display" ] diff --git a/data/fzsd/tags/functions/module/interactor/event/on_click.json b/data/fzsd/tags/functions/module/interactor/event/on_click.json index 7e4edb7..3701e08 100644 --- a/data/fzsd/tags/functions/module/interactor/event/on_click.json +++ b/data/fzsd/tags/functions/module/interactor/event/on_click.json @@ -4,7 +4,6 @@ "fzsd:module/interactor/interactor/on_click", "#fzsd:module/scoreboard/interactor/on_click", "#fzsd:module/here/interactor/on_click", - "#fzsd:module/last_death/interactor/on_click", "#fzsd:module/last_nether_portal/interactor/on_click", "#fzsd:module/last_spawn_point/interactor/on_click" ]