diff --git a/data/fz/functions/event/init.mcfunction b/data/fz/functions/event/init.mcfunction index 932851f..040f505 100644 --- a/data/fz/functions/event/init.mcfunction +++ b/data/fz/functions/event/init.mcfunction @@ -1,12 +1,14 @@ -scoreboard objectives add fz.event.play_seconds minecraft.custom:play_time - -scoreboard objectives add fz.event.leave_game minecraft.custom:leave_game - scoreboard objectives add fz.event.aviating_distance minecraft.custom:aviate_one_cm scoreboard objectives add fz.event.damage_taken minecraft.custom:damage_taken scoreboard objectives add fz.event.fishing_count minecraft.custom:fish_caught +scoreboard objectives add fz.event.leave_game minecraft.custom:leave_game + +scoreboard objectives add fz.event.play_seconds minecraft.custom:play_time + +scoreboard objectives add fz.event.villager_trade minecraft.custom:traded_with_villager + ## 调试 execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已初始化系统组件：事件"}] \ No newline at end of file diff --git a/data/fz/functions/event/on_aviate_one_meter.mcfunction b/data/fz/functions/event/on_aviate_one_meter.mcfunction index 8756964..7d28827 100644 --- a/data/fz/functions/event/on_aviate_one_meter.mcfunction +++ b/data/fz/functions/event/on_aviate_one_meter.mcfunction @@ -1,4 +1,5 @@ scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.aviating_distance +scoreboard players operation fz.var.score fz.variable.integer /= 200 fz.variable.integer function #fz:event/on_aviate_one_meter diff --git a/data/fz/functions/event/on_play_one_hour.mcfunction b/data/fz/functions/event/on_play_one_hour.mcfunction index 596ebef..cb7f81f 100644 --- a/data/fz/functions/event/on_play_one_hour.mcfunction +++ b/data/fz/functions/event/on_play_one_hour.mcfunction @@ -1,4 +1,5 @@ scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.play_seconds +scoreboard players operation fz.var.score fz.variable.integer /= 3600 fz.variable.integer function #fz:event/on_play_one_hour diff --git a/data/fz/functions/module/scoreboard/assign/set_display/activation.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/activation.mcfunction index 9711bf8..db7e219 100644 --- a/data/fz/functions/module/scoreboard/assign/set_display/activation.mcfunction +++ b/data/fz/functions/module/scoreboard/assign/set_display/activation.mcfunction @@ -1,3 +1,2 @@ scoreboard players add @s fz.module.scoreboard.display.activation 1 -scoreboard players add fz.module.scoreboard.total.activation fz.module.scoreboard.assign.general 1 -function #fz:module/scoreboard/assign/set_display/total_name/activation \ No newline at end of file +scoreboard players add fz.module.scoreboard.total.activation fz.module.scoreboard.assign.general 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/aviating_distance.mcfunction index 3715f8d..a07113b 100644 --- a/data/fz/functions/module/scoreboard/assign/set_display/aviating_distance.mcfunction +++ b/data/fz/functions/module/scoreboard/assign/set_display/aviating_distance.mcfunction @@ -1,4 +1,2 @@ -scoreboard players operation fz.var.score fz.variable.integer /= 200 fz.variable.integer scoreboard players operation @s fz.module.scoreboard.display.aviating_distance += fz.var.score fz.variable.integer -scoreboard players operation fz.module.scoreboard.total.aviating_distance fz.module.scoreboard.assign.general += fz.var.score fz.variable.integer -function #fz:module/scoreboard/assign/set_display/total_name/aviating_distance \ No newline at end of file +scoreboard players operation fz.module.scoreboard.total.aviating_distance fz.module.scoreboard.assign.general += fz.var.score fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/damage_taken.mcfunction index 3ae6b7c..5048651 100644 --- a/data/fz/functions/module/scoreboard/assign/set_display/damage_taken.mcfunction +++ b/data/fz/functions/module/scoreboard/assign/set_display/damage_taken.mcfunction @@ -1,3 +1,2 @@ scoreboard players operation @s fz.module.scoreboard.display.damage_taken += fz.var.score fz.variable.integer -scoreboard players operation fz.module.scoreboard.total.damage_taken fz.module.scoreboard.assign.general += fz.var.score fz.variable.integer -function #fz:module/scoreboard/assign/set_display/total_name/damage_taken \ No newline at end of file +scoreboard players operation fz.module.scoreboard.total.damage_taken fz.module.scoreboard.assign.general += fz.var.score fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/death_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/death_count.mcfunction new file mode 100644 index 0000000..ae84c17 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/death_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players add @s fz.module.scoreboard.display.death_count 1 +scoreboard players add fz.module.scoreboard.total.death_count fz.module.scoreboard.assign.general 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/dig_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/dig_count.mcfunction new file mode 100644 index 0000000..1a6f884 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/dig_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players operation @s fz.module.scoreboard.display.dig_count += fz.var.score fz.variable.integer +scoreboard players operation fz.module.scoreboard.total.dig_count fz.module.scoreboard.assign.general += fz.var.score fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/fishing_count.mcfunction new file mode 100644 index 0000000..07e4703 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/fishing_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players add @s fz.module.scoreboard.display.fishing_count 1 +scoreboard players add fz.module.scoreboard.total.fishing_count fz.module.scoreboard.assign.general 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/total_name/activation.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/activation.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/total_name/activation.mcfunction rename to data/fz/functions/module/scoreboard/assign/set_display/general/activation.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/total_name/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/aviating_distance.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/total_name/aviating_distance.mcfunction rename to data/fz/functions/module/scoreboard/assign/set_display/general/aviating_distance.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/total_name/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/damage_taken.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/total_name/damage_taken.mcfunction rename to data/fz/functions/module/scoreboard/assign/set_display/general/damage_taken.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/death_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/death_count.mcfunction new file mode 100644 index 0000000..7d24f8c --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/general/death_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players operation 总死亡次数 fz.module.scoreboard.display.general = fz.module.scoreboard.total.death_count fz.module.scoreboard.assign.general +scoreboard players operation 总死亡次数 fz.module.scoreboard.display.death_count = fz.module.scoreboard.total.death_count fz.module.scoreboard.assign.general \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/dig_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/dig_count.mcfunction new file mode 100644 index 0000000..9fcd274 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/general/dig_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players operation 总挖掘量 fz.module.scoreboard.display.general = fz.module.scoreboard.total.dig_count fz.module.scoreboard.assign.general +scoreboard players operation 总挖掘量 fz.module.scoreboard.display.dig_count = fz.module.scoreboard.total.dig_count fz.module.scoreboard.assign.general \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/fishing_count.mcfunction new file mode 100644 index 0000000..71842f5 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/general/fishing_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players operation 总受伤害量 fz.module.scoreboard.display.general = fz.module.scoreboard.total.fishing_count fz.module.scoreboard.assign.general +scoreboard players operation 总受伤害量 fz.module.scoreboard.display.fishing_count = fz.module.scoreboard.total.fishing_count fz.module.scoreboard.assign.general \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/kill_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/kill_count.mcfunction new file mode 100644 index 0000000..0b29dd5 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/general/kill_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players operation 总交易量 fz.module.scoreboard.display.general = fz.module.scoreboard.total.kill_count fz.module.scoreboard.assign.general +scoreboard players operation 总交易量 fz.module.scoreboard.display.kill_count = fz.module.scoreboard.total.kill_count fz.module.scoreboard.assign.general \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/general/placement_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/placement_count.mcfunction new file mode 100644 index 0000000..1585136 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/general/placement_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players operation 总交易量 fz.module.scoreboard.display.general = fz.module.scoreboard.total.placement_count fz.module.scoreboard.assign.general +scoreboard players operation 总交易量 fz.module.scoreboard.display.placement_count = fz.module.scoreboard.total.placement_count fz.module.scoreboard.assign.general \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/total_name/trade_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/general/trade_count.mcfunction similarity index 100% rename from data/fz/functions/module/scoreboard/assign/set_display/total_name/trade_count.mcfunction rename to data/fz/functions/module/scoreboard/assign/set_display/general/trade_count.mcfunction diff --git a/data/fz/functions/module/scoreboard/assign/set_display/kill_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/kill_count.mcfunction new file mode 100644 index 0000000..0908f09 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/kill_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players add @s fz.module.scoreboard.display.kill_count 1 +scoreboard players add fz.module.scoreboard.total.kill_count fz.module.scoreboard.assign.general 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/placement_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/placement_count.mcfunction new file mode 100644 index 0000000..e7d83d3 --- /dev/null +++ b/data/fz/functions/module/scoreboard/assign/set_display/placement_count.mcfunction @@ -0,0 +1,2 @@ +scoreboard players add @s fz.module.scoreboard.display.placement_count 1 +scoreboard players add fz.module.scoreboard.total.placement_count fz.module.scoreboard.assign.general 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction index be7385d..102b451 100644 --- a/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction +++ b/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction @@ -1,3 +1,2 @@ scoreboard players add @s fz.module.scoreboard.display.trade_count 1 -scoreboard players add fz.module.scoreboard.total.trade_count fz.module.scoreboard.assign.general 1 -function #fz:module/scoreboard/assign/set_display/total_name/trade_count \ No newline at end of file +scoreboard players add fz.module.scoreboard.total.trade_count fz.module.scoreboard.assign.general 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction index dacf8df..b93360f 100644 --- a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction +++ b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction @@ -1,3 +1,3 @@ # 调用者：#fz:module/scoreboard/config/display/buttons -tellraw @s [[{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "]"}]] \ No newline at end of file +tellraw @s [[{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1100"}}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/on_click.mcfunction b/data/fz/functions/module/scoreboard/config/on_click.mcfunction index e0fa7c5..242ceb4 100644 --- a/data/fz/functions/module/scoreboard/config/on_click.mcfunction +++ b/data/fz/functions/module/scoreboard/config/on_click.mcfunction @@ -1,3 +1,14 @@ +execute if score @s fz.module.config.trigger matches 1000 run function #fz:module/scoreboard/config/subscribe/off +execute if score @s fz.module.config.trigger matches 1010 run function #fz:module/scoreboard/config/subscribe/carousel +execute if score @s fz.module.config.trigger matches 1020 run function #fz:module/scoreboard/config/subscribe/general +execute if score @s fz.module.config.trigger matches 1030 run function #fz:module/scoreboard/config/subscribe/activation +execute if score @s fz.module.config.trigger matches 1040 run function #fz:module/scoreboard/config/subscribe/aviating_distance +execute if score @s fz.module.config.trigger matches 1050 run function #fz:module/scoreboard/config/subscribe/damage_taken +execute if score @s fz.module.config.trigger matches 1060 run function #fz:module/scoreboard/config/subscribe/death_count +execute if score @s fz.module.config.trigger matches 1070 run function #fz:module/scoreboard/config/subscribe/dig_count +execute if score @s fz.module.config.trigger matches 1080 run function #fz:module/scoreboard/config/subscribe/fishing_count +execute if score @s fz.module.config.trigger matches 1090 run function #fz:module/scoreboard/config/subscribe/kill_count +execute if score @s fz.module.config.trigger matches 1100 run function #fz:module/scoreboard/config/subscribe/trade_count ## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "点击了计分板配置按钮，触发器分数为："}, {"score": {"name": "@s", "objective": "fz.module.config.trigger"}}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction index a61dc35..3c0df14 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.activation @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction index 9f4a6cc..3ecde40 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.aviating_distance @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction index a5d940e..8840592 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.carousel @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction index 77483b4..5355695 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.damage_taken @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction index c5b32b5..343352a 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.death_count @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction index 72a5660..b7b0c27 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.dig_count @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction index 36f034c..47e96cf 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.fishing_count @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction index acfa32c..6c059e0 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.general @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction index 801bdeb..cb58444 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.kill_count @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction index 5af9164..02f0fca 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：#fz:module/scoreboard/config/subscribe/~ team leave @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/placement_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/placement_count.mcfunction new file mode 100644 index 0000000..488d5a1 --- /dev/null +++ b/data/fz/functions/module/scoreboard/config/subscribe/placement_count.mcfunction @@ -0,0 +1,6 @@ +# 调用者：fz:module/scoreboard/config/subscribe/~ + +team join fz.module.scoreboard.display.placement_count @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.placement_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction index ea5c41d..019db3d 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/on_click +# 调用者：fz:module/scoreboard/config/subscribe/~ team join fz.module.scoreboard.display.trade_count @s diff --git a/data/fz/tags/functions/event/module/scoreboard/on_trade.json b/data/fz/tags/functions/event/module/scoreboard/on_trade.json deleted file mode 100644 index 492297f..0000000 --- a/data/fz/tags/functions/event/module/scoreboard/on_trade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/scoreboard/assign/set_display/trade_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_piglin_trade.json b/data/fz/tags/functions/event/on_piglin_trade.json index 5bcea5f..8c1fc89 100644 --- a/data/fz/tags/functions/event/on_piglin_trade.json +++ b/data/fz/tags/functions/event/on_piglin_trade.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#fz:event/module/scoreboard/on_trade" + "#fz:module/scoreboard/assign/set_display/trade_count/piglin" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/event/on_villager_trade.json b/data/fz/tags/functions/event/on_villager_trade.json index 5bcea5f..7be6563 100644 --- a/data/fz/tags/functions/event/on_villager_trade.json +++ b/data/fz/tags/functions/event/on_villager_trade.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#fz:event/module/scoreboard/on_trade" + "#fz:module/scoreboard/assign/set_display/trade_count/villager" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json index dfc44ab..c365321 100644 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json +++ b/data/fz/tags/functions/module/scoreboard/assign/set_display/activation.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "fz:module/scoreboard/assign/set_display/activation" + "fz:module/scoreboard/assign/set_display/activation", + "#fz:module/scoreboard/assign/set_display/general/activation" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json index fa5bd13..3e78cbc 100644 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json +++ b/data/fz/tags/functions/module/scoreboard/assign/set_display/aviating_distance.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "fz:module/scoreboard/assign/set_display/aviating_distance" + "fz:module/scoreboard/assign/set_display/aviating_distance", + "#fz:module/scoreboard/assign/set_display/general/aviating_distance" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json index c3a4aab..ca201a7 100644 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json +++ b/data/fz/tags/functions/module/scoreboard/assign/set_display/damage_taken.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "fz:module/scoreboard/assign/set_display/damage_taken" + "fz:module/scoreboard/assign/set_display/damage_taken", + "#fz:module/scoreboard/assign/set_display/general/damage_taken" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/activation.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/activation.json similarity index 100% rename from data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/activation.json rename to data/fz/tags/functions/module/scoreboard/assign/set_display/general/activation.json diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/aviating_distance.json similarity index 100% rename from data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/aviating_distance.json rename to data/fz/tags/functions/module/scoreboard/assign/set_display/general/aviating_distance.json diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/damage_taken.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/damage_taken.json similarity index 100% rename from data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/damage_taken.json rename to data/fz/tags/functions/module/scoreboard/assign/set_display/general/damage_taken.json diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/general/trade_count.json similarity index 100% rename from data/fz/tags/functions/module/scoreboard/assign/set_display/total_name/trade_count.json rename to data/fz/tags/functions/module/scoreboard/assign/set_display/general/trade_count.json diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json index efd269d..ce18bd0 100644 --- a/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json +++ b/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "fz:module/scoreboard/assign/set_display/trade_count" + "fz:module/scoreboard/assign/set_display/trade_count", + "#fz:module/scoreboard/assign/set_display/general/trade_count" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json new file mode 100644 index 0000000..bfe2d31 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/activation" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json new file mode 100644 index 0000000..9f4b399 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/aviating_distance" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json new file mode 100644 index 0000000..1a5937d --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/carousel" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json new file mode 100644 index 0000000..761ea98 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/damage_taken" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json new file mode 100644 index 0000000..5dc3c0c --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/death_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json new file mode 100644 index 0000000..edc4440 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/dig_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json new file mode 100644 index 0000000..963e48e --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/fishing_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/general.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/general.json new file mode 100644 index 0000000..98807dc --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/general.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/general" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json new file mode 100644 index 0000000..c7103a7 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/kill_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/off.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/off.json new file mode 100644 index 0000000..7446a17 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/off.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/off" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json new file mode 100644 index 0000000..3bd4c36 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/placement_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json new file mode 100644 index 0000000..b79835d --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/config/subscribe/trade_count" + ] +} \ No newline at end of file