diff --git a/data/fzsd/advancements/game_event/on_sleeping.json b/data/fzsd/advancements/game_event/on_sleeping.json new file mode 100644 index 0000000..8b546d7 --- /dev/null +++ b/data/fzsd/advancements/game_event/on_sleeping.json @@ -0,0 +1,19 @@ +{ + "parent": "fzsd:game_event", + "criteria": { + "on_sleeping": { + "trigger": "minecraft:slept_in_bed", + "conditions": { + "player": [ + { + "condition": "minecraft:reference", + "name": "fzsd:is_real_player" + } + ] + } + } + }, + "rewards": { + "function": "fzsd:game_event/advancement/on_sleeping" + } +} \ No newline at end of file diff --git a/data/fzsd/functions/api/get_current_daytime.mcfunction b/data/fzsd/functions/api/get_current_daytime.mcfunction new file mode 100644 index 0000000..2811846 --- /dev/null +++ b/data/fzsd/functions/api/get_current_daytime.mcfunction @@ -0,0 +1,2 @@ +# 游戏时间范围:0-2147483647 +execute store result score fzsd.var.cache fzsd.variable.integer run time query daytime \ No newline at end of file diff --git a/data/fzsd/functions/api/get_current_gametime.mcfunction b/data/fzsd/functions/api/get_current_gametime.mcfunction new file mode 100644 index 0000000..54829d4 --- /dev/null +++ b/data/fzsd/functions/api/get_current_gametime.mcfunction @@ -0,0 +1,2 @@ +# 游戏时间范围:0-2147483647 +execute store result score fzsd.var.cache fzsd.variable.integer run time query gametime \ No newline at end of file diff --git a/data/fzsd/functions/api/get_time_since_rest.mcfunction b/data/fzsd/functions/api/get_time_since_rest.mcfunction new file mode 100644 index 0000000..cdd641f --- /dev/null +++ b/data/fzsd/functions/api/get_time_since_rest.mcfunction @@ -0,0 +1 @@ +scoreboard players operation fzsd.var.cache fzsd.variable.integer = @s fzsd.api.time_since_rest \ No newline at end of file diff --git a/data/fzsd/functions/api/install.mcfunction b/data/fzsd/functions/api/install.mcfunction new file mode 100644 index 0000000..d7bcc13 --- /dev/null +++ b/data/fzsd/functions/api/install.mcfunction @@ -0,0 +1,5 @@ +## 距上次睡觉时间 +scoreboard objectives add fzsd.api.time_since_rest minecraft.custom:time_since_rest + +## 调试 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装系统组件:API"}] \ No newline at end of file diff --git a/data/fzsd/functions/api/uninstall.mcfunction b/data/fzsd/functions/api/uninstall.mcfunction new file mode 100644 index 0000000..37606d2 --- /dev/null +++ b/data/fzsd/functions/api/uninstall.mcfunction @@ -0,0 +1,5 @@ +## 距上次睡觉时间 +scoreboard objectives remove fzsd.api.time_since_rest + +## 调试 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载系统组件:API"}] \ No newline at end of file diff --git a/data/fzsd/functions/boot.mcfunction b/data/fzsd/functions/boot.mcfunction index 1a9031c..557f5e0 100644 --- a/data/fzsd/functions/boot.mcfunction +++ b/data/fzsd/functions/boot.mcfunction @@ -1,5 +1,5 @@ -execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.1.0.rc.1'}} -execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update +execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.1.rc.1'}} +execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update function fzsd:system/carpet/try_load_fzsd_score function #fzsd:load execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack,当前版本:", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "red"}] diff --git a/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction index ce86674..90f3ea9 100644 --- a/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction +++ b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction @@ -1,5 +1,8 @@ # 调用者:advancements/fzsd:~ +## 调试 +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": "放置了流体"}] + function #fzsd:game_event/player/on_placed_liquid ## 重置事件进度 diff --git a/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction index 4bc0a6c..1d98643 100644 --- a/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction +++ b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction @@ -1,5 +1,8 @@ # 调用者:advancements/fzsd:~ +## 调试 +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": "放置了方块"}] + function #fzsd:game_event/player/on_placed_solid ## 重置事件进度 diff --git a/data/fzsd/functions/game_event/advancement/on_sleeping.mcfunction b/data/fzsd/functions/game_event/advancement/on_sleeping.mcfunction new file mode 100644 index 0000000..8bd3b59 --- /dev/null +++ b/data/fzsd/functions/game_event/advancement/on_sleeping.mcfunction @@ -0,0 +1,10 @@ +# 调用者:advancements/fzsd:~ + +## 调试 +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": "正在睡觉"}] + +## 运行事件 +function #fzsd:game_event/player/on_sleeping + +## 重置事件进度 +advancement revoke @s from fzsd:game_event/on_sleeping \ No newline at end of file diff --git a/data/fzsd/functions/game_event/callback/on_placed_liquid.mcfunction b/data/fzsd/functions/game_event/callback/on_placed_liquid.mcfunction deleted file mode 100644 index 70a52a1..0000000 --- a/data/fzsd/functions/game_event/callback/on_placed_liquid.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -## 调试 -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/game_event/callback/on_placed_solid.mcfunction b/data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction deleted file mode 100644 index e9c1a2e..0000000 --- a/data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -## 调试 -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/game_event/game/on_night.mcfunction b/data/fzsd/functions/game_event/game/on_night.mcfunction new file mode 100644 index 0000000..53bfb00 --- /dev/null +++ b/data/fzsd/functions/game_event/game/on_night.mcfunction @@ -0,0 +1,7 @@ +# 调用者:fzsd:game_event/game/on_night/on_tick + +## 调试 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发:夜幕降临"}] + +## 运行事件 +function #fzsd:game_event/game/on_night \ No newline at end of file diff --git a/data/fzsd/functions/game_event/game/on_night/on_tick.mcfunction b/data/fzsd/functions/game_event/game/on_night/on_tick.mcfunction new file mode 100644 index 0000000..9b82f55 --- /dev/null +++ b/data/fzsd/functions/game_event/game/on_night/on_tick.mcfunction @@ -0,0 +1,3 @@ +# 由fzsd:game_event/on_tick事件调用 +function #fzsd:api/get_current_daytime +execute if score fzsd.var.cache fzsd.variable.integer matches 12516 run function fzsd:game_event/game/on_night \ No newline at end of file diff --git a/data/fzsd/functions/game_event/player/on_broke_block_with_tool.mcfunction b/data/fzsd/functions/game_event/player/on_broke_block_with_tool.mcfunction index 805c9dc..dae942d 100644 --- a/data/fzsd/functions/game_event/player/on_broke_block_with_tool.mcfunction +++ b/data/fzsd/functions/game_event/player/on_broke_block_with_tool.mcfunction @@ -1,4 +1,4 @@ -# 调用者:fzsd:game_event/player/on_used_tool +# 调用者:fzsd:game_event/player/on_broke_block_with_tool/try_trigger ## 调试 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": "挖掘了方块"}] diff --git a/data/fzsd/functions/game_event/player/on_broke_block_with_tool/try_trigger.mcfunction b/data/fzsd/functions/game_event/player/on_broke_block_with_tool/try_trigger.mcfunction index 5d65686..dbbae2c 100644 --- a/data/fzsd/functions/game_event/player/on_broke_block_with_tool/try_trigger.mcfunction +++ b/data/fzsd/functions/game_event/player/on_broke_block_with_tool/try_trigger.mcfunction @@ -1,2 +1,4 @@ +# 调用者:#fzsd:game_event/player/on_used_tool + ## 判断分数 execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool \ No newline at end of file diff --git a/data/fzsd/functions/game_event/player/on_used_tool.mcfunction b/data/fzsd/functions/game_event/player/on_used_tool.mcfunction index 25b3ab2..43aed40 100644 --- a/data/fzsd/functions/game_event/player/on_used_tool.mcfunction +++ b/data/fzsd/functions/game_event/player/on_used_tool.mcfunction @@ -1,5 +1,5 @@ -## 详细 -execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发:玩家"}, {"selector": "@s"}, {"text": "使用了工具"}] +## 调试 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发:玩家"}, {"selector": "@s"}, {"text": "使用了工具"}] ## 运行事件 function #fzsd:game_event/player/on_used_tool \ No newline at end of file diff --git a/data/fzsd/functions/game_event/player/on_used_tool/reset_used_tool.mcfunction b/data/fzsd/functions/game_event/player/on_used_tool/reset_used_tool.mcfunction index 5033b05..ad4bc6c 100644 --- a/data/fzsd/functions/game_event/player/on_used_tool/reset_used_tool.mcfunction +++ b/data/fzsd/functions/game_event/player/on_used_tool/reset_used_tool.mcfunction @@ -31,5 +31,5 @@ scoreboard players set @s fzsd.event.used_tool.wooden_pickaxe 0 scoreboard players set @s fzsd.event.used_tool.wooden_shovel 0 scoreboard players set @s fzsd.event.used_tool.wooden_sword 0 -## 调试 -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": "的used_tool计分板"}] \ No newline at end of file +## 详细 +execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "重置了玩家"}, {"selector": "@s"}, {"text": "的used_tool计分板"}] \ No newline at end of file diff --git a/data/fzsd/functions/module/phantom_warning/check_time_since_rest.mcfunction b/data/fzsd/functions/module/phantom_warning/check_time_since_rest.mcfunction new file mode 100644 index 0000000..25cc528 --- /dev/null +++ b/data/fzsd/functions/module/phantom_warning/check_time_since_rest.mcfunction @@ -0,0 +1,3 @@ +# TODO: 数字有待商榷 +function #fzsd:api/get_time_since_rest +execute if score fzsd.var.cache fzsd.variable.integer matches 61766.. run function #fzsd:module/phantom_warning/send_phantom_warning \ No newline at end of file diff --git a/data/fzsd/functions/module/phantom_warning/event/on_night.mcfunction b/data/fzsd/functions/module/phantom_warning/event/on_night.mcfunction new file mode 100644 index 0000000..fafcae3 --- /dev/null +++ b/data/fzsd/functions/module/phantom_warning/event/on_night.mcfunction @@ -0,0 +1 @@ +execute if data storage fzsd:install fzsd.module{phantom_warning:1b} as @a[predicate=fzsd:is_real_player] run function #fzsd:module/phantom_warning/check_time_since_rest \ No newline at end of file diff --git a/data/fzsd/functions/module/phantom_warning/install.mcfunction b/data/fzsd/functions/module/phantom_warning/install.mcfunction new file mode 100644 index 0000000..39efec2 --- /dev/null +++ b/data/fzsd/functions/module/phantom_warning/install.mcfunction @@ -0,0 +1,5 @@ +## 标记为已安装 +data modify storage fzsd:install fzsd.module.phantom_warning 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/phantom_warning/send_phantom_warning.mcfunction b/data/fzsd/functions/module/phantom_warning/send_phantom_warning.mcfunction new file mode 100644 index 0000000..32ac924 --- /dev/null +++ b/data/fzsd/functions/module/phantom_warning/send_phantom_warning.mcfunction @@ -0,0 +1,5 @@ +## 对当前玩家发送提醒 +execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼,建议睡觉!"}] + +## 调试 +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/phantom_warning/try_install.mcfunction b/data/fzsd/functions/module/phantom_warning/try_install.mcfunction new file mode 100644 index 0000000..2038deb --- /dev/null +++ b/data/fzsd/functions/module/phantom_warning/try_install.mcfunction @@ -0,0 +1 @@ +execute unless data storage fzsd:install fzsd.module{phantom_warning:0b} run function #fzsd:module/phantom_warning/install diff --git a/data/fzsd/functions/module/phantom_warning/uninstall.mcfunction b/data/fzsd/functions/module/phantom_warning/uninstall.mcfunction new file mode 100644 index 0000000..4369721 --- /dev/null +++ b/data/fzsd/functions/module/phantom_warning/uninstall.mcfunction @@ -0,0 +1,5 @@ +## 标记为已卸载 +data modify storage fzsd:install fzsd.module.phantom_warning 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/functions/system/load/load.mcfunction b/data/fzsd/functions/system/load/load.mcfunction index bcb3016..5473280 100644 --- a/data/fzsd/functions/system/load/load.mcfunction +++ b/data/fzsd/functions/system/load/load.mcfunction @@ -2,4 +2,5 @@ scoreboard players set -1 fzsd.variable.integer -1 scoreboard players set 10 fzsd.variable.integer 10 scoreboard players set 200 fzsd.variable.integer 200 +scoreboard players set 24000 fzsd.variable.integer 24000 scoreboard players set 72000 fzsd.variable.integer 72000 \ No newline at end of file diff --git a/data/fzsd/tags/functions/api/get_current_daytime.json b/data/fzsd/tags/functions/api/get_current_daytime.json new file mode 100644 index 0000000..ea94533 --- /dev/null +++ b/data/fzsd/tags/functions/api/get_current_daytime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:api/get_current_daytime" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/api/get_current_gametime.json b/data/fzsd/tags/functions/api/get_current_gametime.json new file mode 100644 index 0000000..5d34e09 --- /dev/null +++ b/data/fzsd/tags/functions/api/get_current_gametime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:api/get_current_gametime" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/api/get_time_since_rest.json b/data/fzsd/tags/functions/api/get_time_since_rest.json new file mode 100644 index 0000000..c336391 --- /dev/null +++ b/data/fzsd/tags/functions/api/get_time_since_rest.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:api/get_time_since_rest" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/api/install.json b/data/fzsd/tags/functions/api/install.json new file mode 100644 index 0000000..c9849a6 --- /dev/null +++ b/data/fzsd/tags/functions/api/install.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:api/install" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/api/uninstall.json b/data/fzsd/tags/functions/api/uninstall.json new file mode 100644 index 0000000..e20ddcc --- /dev/null +++ b/data/fzsd/tags/functions/api/uninstall.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:api/uninstall" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/deep_reinstall.json b/data/fzsd/tags/functions/deep_reinstall.json index a2a9c44..826d6b1 100644 --- a/data/fzsd/tags/functions/deep_reinstall.json +++ b/data/fzsd/tags/functions/deep_reinstall.json @@ -2,7 +2,8 @@ "__comment": "本标签将强制重装所有模块", "replace": false, "values": [ - "#fzsd:uninstall", - "#fzsd:deep_install" + "#fzsd:deep_uninstall", + "#fzsd:deep_install", + "#fzsd:load" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/game_event/game/on_night.json b/data/fzsd/tags/functions/game_event/game/on_night.json new file mode 100644 index 0000000..365d15d --- /dev/null +++ b/data/fzsd/tags/functions/game_event/game/on_night.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#fzsd:module/phantom_warning/event/on_night" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/game_event/on_tick.json b/data/fzsd/tags/functions/game_event/on_tick.json index 907e30b..413e722 100644 --- a/data/fzsd/tags/functions/game_event/on_tick.json +++ b/data/fzsd/tags/functions/game_event/on_tick.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - + "fzsd:game_event/game/on_night/on_tick" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/game_event/player/on_placed_liquid.json b/data/fzsd/tags/functions/game_event/player/on_placed_liquid.json index a4f2eea..a1dc310 100644 --- a/data/fzsd/tags/functions/game_event/player/on_placed_liquid.json +++ b/data/fzsd/tags/functions/game_event/player/on_placed_liquid.json @@ -1,6 +1,5 @@ { "replace": false, "values": [ - "fzsd:game_event/callback/on_placed_liquid" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/game_event/player/on_placed_solid.json b/data/fzsd/tags/functions/game_event/player/on_placed_solid.json index 1b6d87d..5210f29 100644 --- a/data/fzsd/tags/functions/game_event/player/on_placed_solid.json +++ b/data/fzsd/tags/functions/game_event/player/on_placed_solid.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "fzsd:game_event/callback/on_placed_solid", "#fzsd:module/scoreboard/assign/scoreboard/placement_count" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/game_event/player/on_sleeping.json b/data/fzsd/tags/functions/game_event/player/on_sleeping.json new file mode 100644 index 0000000..907e30b --- /dev/null +++ b/data/fzsd/tags/functions/game_event/player/on_sleeping.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/phantom_warning/check_time_since_rest.json b/data/fzsd/tags/functions/module/phantom_warning/check_time_since_rest.json new file mode 100644 index 0000000..4aff0ac --- /dev/null +++ b/data/fzsd/tags/functions/module/phantom_warning/check_time_since_rest.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:module/phantom_warning/check_time_since_rest" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/phantom_warning/event/on_night.json b/data/fzsd/tags/functions/module/phantom_warning/event/on_night.json new file mode 100644 index 0000000..e871e8e --- /dev/null +++ b/data/fzsd/tags/functions/module/phantom_warning/event/on_night.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:module/phantom_warning/event/on_night" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/phantom_warning/install.json b/data/fzsd/tags/functions/module/phantom_warning/install.json new file mode 100644 index 0000000..2358954 --- /dev/null +++ b/data/fzsd/tags/functions/module/phantom_warning/install.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:module/phantom_warning/install" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/phantom_warning/send_phantom_warning.json b/data/fzsd/tags/functions/module/phantom_warning/send_phantom_warning.json new file mode 100644 index 0000000..2f230df --- /dev/null +++ b/data/fzsd/tags/functions/module/phantom_warning/send_phantom_warning.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:module/phantom_warning/send_phantom_warning" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/phantom_warning/uninstall.json b/data/fzsd/tags/functions/module/phantom_warning/uninstall.json new file mode 100644 index 0000000..a6d1d7a --- /dev/null +++ b/data/fzsd/tags/functions/module/phantom_warning/uninstall.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd:module/phantom_warning/uninstall" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/reinstall.json b/data/fzsd/tags/functions/reinstall.json index 1ee9520..3a11a9f 100644 --- a/data/fzsd/tags/functions/reinstall.json +++ b/data/fzsd/tags/functions/reinstall.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#fzsd:uninstall", - "#fzsd:install" + "#fzsd:install", + "#fzsd:load" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/system/install/module/force.json b/data/fzsd/tags/functions/system/install/module/force.json index 9d74698..4849e2b 100644 --- a/data/fzsd/tags/functions/system/install/module/force.json +++ b/data/fzsd/tags/functions/system/install/module/force.json @@ -1,13 +1,15 @@ { "replace": false, "values": [ - "#fzsd:module/health/install", - "#fzsd:module/here/install", - "#fzsd:module/interactor/install", - "#fzsd:module/last_death/install", - "#fzsd:module/last_nether_portal/install", - "#fzsd:module/last_spawn_point/install", - "#fzsd:module/scoreboard/install", - "#fzsd:module/sweeper/install" + "fzsd:module/health/install", + "fzsd:module/here/install", + "fzsd:module/interactor/install", + "fzsd:module/join_message/install", + "fzsd:module/last_death/install", + "fzsd:module/last_nether_portal/install", + "fzsd:module/last_spawn_point/install", + "fzsd:module/phantom_warning/install", + "fzsd:module/scoreboard/install", + "fzsd:module/sweeper/install" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/system/install/module/try.json b/data/fzsd/tags/functions/system/install/module/try.json index 50074ff..fd24f16 100644 --- a/data/fzsd/tags/functions/system/install/module/try.json +++ b/data/fzsd/tags/functions/system/install/module/try.json @@ -8,6 +8,7 @@ "fzsd:module/last_death/try_install", "fzsd:module/last_nether_portal/try_install", "fzsd:module/last_spawn_point/try_install", + "fzsd:module/phantom_warning/try_install", "fzsd:module/scoreboard/try_install", "fzsd:module/sweeper/try_install" ] diff --git a/data/fzsd/tags/functions/system/install/system.json b/data/fzsd/tags/functions/system/install/system.json index 4811786..4621f86 100644 --- a/data/fzsd/tags/functions/system/install/system.json +++ b/data/fzsd/tags/functions/system/install/system.json @@ -3,6 +3,7 @@ "values": [ "fzsd:system/install/install", "#fzsd:logger/install", + "#fzsd:api/install", "#fzsd:game_event/install" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/system/uninstall/system.json b/data/fzsd/tags/functions/system/uninstall/system.json index 5184c13..93a4713 100644 --- a/data/fzsd/tags/functions/system/uninstall/system.json +++ b/data/fzsd/tags/functions/system/uninstall/system.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "#fzsd:api/uninstall", "#fzsd:game_event/uninstall", "#fzsd:logger/uninstall", "fzsd:system/uninstall/uninstall"