Merge pull request #3 from Harveykang/1.4-pre

Add files via upload

data/fz/functions/carpet/install.mcfunction

@@ -1,5 +1,5 @@
 scoreboard objectives add carpet dummy
-scoreboard players reset carpet carpet
+scoreboard players reset script carpet
 team add fakePlayer
-team modify fakePlayer prefix [{"text":"假的"}]
-function fz:carpet/carpet
+team modify fakePlayer prefix [{"text":"假的 "}]
+function fz:carpet/script

data/fz/functions/carpet/script.mcfunction

@@ -0,0 +1,2 @@
+execute store result score script carpet run script run null
+execute if score script carpet matches 1 run function fz:carpet/scarpettagplayer

data/fz/functions/carpet/scriptplayer.mcfunction

@@ -0,0 +1,9 @@
+tellraw @s [{"text":"- 查看帮助："},{"text":"/script invoke help","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke help"},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 生成假人："},{"text":"/script invoke summon 玩家名","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke summon "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 删除假人："},{"text":"/script invoke kill 玩家名","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke kill "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 删除全部假人："},{"text":"/script invoke killall","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke killall"},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 传送假人："},{"text":"/script invoke tp xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke tp "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"，xyz可替换为\"s\"来代表你的位置","color":"white"}]
+tellraw @s [{"text":"- 以玩家为原点传送假人："},{"text":"/script invoke tp_at_player xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke tp_at_player "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 以假人为原点传送假人："},{"text":"/script invoke tp_at_bot xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke tp_at_bot "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 查看假人信息："},{"text":"/script invoke check xxx","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke check "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 查看全部假人信息："},{"text":"/script invoke checkall","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke checkall"},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]

data/fz/functions/carpet/tagplayer.mcfunction

@@ -0,0 +1,9 @@
+tellraw @s [{"text":"- 查看帮助："},{"text":"/tagplayer","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer"},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 生成假人："},{"text":"/tagplayer summon 玩家名","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer summon "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 删除假人："},{"text":"/tagplayer kill 玩家名","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer kill "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 删除全部假人："},{"text":"/tagplayer killall","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer killall"},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 传送假人："},{"text":"/tagplayer tp xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer tp "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"，xyz可替换为\"s\"来代表你的位置","color":"white"}]
+tellraw @s [{"text":"- 以玩家为原点传送假人："},{"text":"/tagplayer tp_at_player xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer tp_at_player "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 以假人为原点传送假人："},{"text":"/tagplayer tp_at_bot xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer tp_at_bot "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 查看假人信息："},{"text":"/tagplayer check xxx","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer check "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+tellraw @s [{"text":"- 查看全部假人信息："},{"text":"/tagplayer checkall","color":"green","clickEvent":{"action":"suggest_command","value":"/tagplayer checkall"},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]

data/fz/functions/cleaner/cleaneron.mcfunction

@@ -2,7 +2,7 @@ scoreboard players operation cleaner displayCleanTime = @s cleaner
 scoreboard players operation cleaner setCleanTime = @s cleaner
 scoreboard players operation cleaner setCleanTime *= 20 20
 scoreboard players operation cleaner timeCounter = cleaner setCleanTime
-tellraw @a [{"text":"扫地姬已开启~","color":"green"},{"score":{"objective":"displayCleanTime","name":"cleaner"},"color":"dark_aqua","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false},{"text":"游戏秒后清理掉落物~","color":"yellow"}]
+tellraw @a [{"selector":"@s"},{"text":"已开启扫地姬~","color":"green"},{"score":{"objective":"displayCleanTime","name":"cleaner"},"color":"dark_aqua","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false},{"text":"游戏秒后清理掉落物~","color":"yellow"}]
 scoreboard players set cleaner cleanerBooleans 1
 execute if score cleaner setCleanTime matches 5401.. run function fz:cleaner/time/5min
 execute if score cleaner setCleanTime matches 4801..5400 run function fz:cleaner/time/4min30s

data/fz/functions/cleaner/cleanersoundoff.mcfunction

@@ -0,0 +1,2 @@
+tag @s add noCleanerSound
+tellraw @s {"text":"您已关闭扫地姬的声音提示"}

data/fz/functions/cleaner/cleanersoundon.mcfunction

@@ -0,0 +1,2 @@
+tag @s remove noCleanerSound
+tellraw @s {"text":"您已开启扫地姬的声音提示"}

data/fz/functions/cleaner/install.mcfunction

@@ -4,7 +4,7 @@ scoreboard objectives add cleanerBooleans dummy
 scoreboard objectives add setCleanTime dummy
 scoreboard objectives add displayCleanTime dummy
 scoreboard objectives add secondsCounter dummy
-scoreboard objectives add cleanerBar trigger
-scoreboard objectives add cleanerChat trigger
+scoreboard objectives add cleanerMessage trigger
 bossbar add cleaner 1
-bossbar set cleaner max 60
+bossbar set cleaner max 60
+scoreboard players set cleaner installed 1

data/fz/functions/cleaner/subclean.mcfunction

@@ -11,4 +11,5 @@ execute if score cleaner setCleanTime matches 1801..2400 run function fz:cleaner
 execute if score cleaner setCleanTime matches 1201..1800 run function fz:cleaner/time/1min30s
 execute if score cleaner setCleanTime matches 601..1200 run function fz:cleaner/time/60s
 execute if score cleaner setCleanTime matches ..600 run function fz:cleaner/time/30s
-scoreboard players operation cleaner timeCounter = cleaner setCleanTime
+scoreboard players operation cleaner timeCounter = cleaner setCleanTime
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2

data/fz/functions/cleaner/time/10s.mcfunction

@@ -1,4 +1,5 @@
 tellraw @a[tag=!noDisplayCleanerChat] [{"text":"注意!","color":"dark_red","bold":false,"underlined":false},{"text":"10","color":"red","bold":true,"underlined":true},{"text":"游戏秒后清理掉落物~准备干活咯！","color":"dark_red","bold":false,"underlined":false}]
 bossbar set cleaner style notched_6
 bossbar set cleaner color red
-bossbar set cleaner value 60
+bossbar set cleaner value 60
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.bit player @s ~ ~ ~ 1 1

data/fz/functions/cleaner/time/1s.mcfunction

@@ -1,4 +1,5 @@
 tellraw @a[tag=!noDisplayCleanerChat] [{"text":"注意!","color":"dark_red","bold":false,"underlined":false},{"text":"1","color":"red","bold":true,"underlined":true},{"text":"游戏秒后清理掉落物~准备干活咯！","color":"dark_red","bold":false,"underlined":false}]
 bossbar set cleaner style notched_6
 bossbar set cleaner color red
-bossbar set cleaner value 10
+bossbar set cleaner value 10
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.bit player @s ~ ~ ~ 1 1

data/fz/functions/cleaner/time/2min.mcfunction

@@ -1,3 +1,4 @@
 bossbar set cleaner style notched_10
 bossbar set cleaner color green
-bossbar set cleaner value 24
+bossbar set cleaner value 24
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2

data/fz/functions/cleaner/time/2s.mcfunction

@@ -1,4 +1,5 @@
 tellraw @a[tag=!noDisplayCleanerChat] [{"text":"注意!","color":"dark_red","bold":false,"underlined":false},{"text":"2","color":"red","bold":true,"underlined":true},{"text":"游戏秒后清理掉落物~准备干活咯！","color":"dark_red","bold":false,"underlined":false}]
 bossbar set cleaner style notched_6
 bossbar set cleaner color red
-bossbar set cleaner value 20
+bossbar set cleaner value 20
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.bit player @s ~ ~ ~ 1 1

data/fz/functions/cleaner/time/30s.mcfunction

@@ -1,4 +1,5 @@
 bossbar set cleaner style notched_10
 bossbar set cleaner color yellow
 bossbar set cleaner value 6
-bossbar set cleaner visible true
+bossbar set cleaner visible true
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2

data/fz/functions/cleaner/time/3min.mcfunction

@@ -1,3 +1,4 @@
 bossbar set cleaner style notched_10
 bossbar set cleaner color green
-bossbar set cleaner value 36
+bossbar set cleaner value 36
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2

data/fz/functions/cleaner/time/3s.mcfunction

@@ -1,4 +1,5 @@
 tellraw @a[tag=!noDisplayCleanerChat] [{"text":"注意!","color":"dark_red","bold":false,"underlined":false},{"text":"3","color":"red","bold":true,"underlined":true},{"text":"游戏秒后清理掉落物~准备干活咯！","color":"dark_red","bold":false,"underlined":false}]
 bossbar set cleaner style notched_6
 bossbar set cleaner color red
-bossbar set cleaner value 30
+bossbar set cleaner value 30
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.bit player @s ~ ~ ~ 1 1

data/fz/functions/cleaner/time/4s.mcfunction

@@ -1,4 +1,5 @@
 tellraw @a[tag=!noDisplayCleanerChat] [{"text":"注意!","color":"dark_red","bold":false,"underlined":false},{"text":"4","color":"red","bold":true,"underlined":true},{"text":"游戏秒后清理掉落物~准备干活咯！","color":"dark_red","bold":false,"underlined":false}]
 bossbar set cleaner style notched_6
 bossbar set cleaner color red
-bossbar set cleaner value 40
+bossbar set cleaner value 40
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.bit player @s ~ ~ ~ 1 1

data/fz/functions/cleaner/time/5min.mcfunction

@@ -1,3 +1,4 @@
 bossbar set cleaner style notched_10
 bossbar set cleaner color green
-bossbar set cleaner value 60
+bossbar set cleaner value 60
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2

data/fz/functions/cleaner/time/5s.mcfunction

@@ -1,4 +1,5 @@
 tellraw @a[tag=!noDisplayCleanerChat] [{"text":"注意!","color":"dark_red","bold":false,"underlined":false},{"text":"5","color":"red","bold":true,"underlined":true},{"text":"游戏秒后清理掉落物~准备干活咯！","color":"dark_red","bold":false,"underlined":false}]
 bossbar set cleaner style notched_6
 bossbar set cleaner color red
-bossbar set cleaner value 50
+bossbar set cleaner value 50
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.bit player @s ~ ~ ~ 1 1

data/fz/functions/cleaner/time/60s.mcfunction

@@ -1,3 +1,4 @@
 bossbar set cleaner style notched_10
 bossbar set cleaner color yellow
-bossbar set cleaner value 12
+bossbar set cleaner value 12
+execute as @a[tag=!noCleanerSound] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 1 2

data/fz/functions/cleaner/trigger.mcfunction

@@ -1,17 +1,14 @@
 scoreboard players enable @a cleaner
-scoreboard players enable @a cleanerBar
-scoreboard players enable @a cleanerChat
+scoreboard players enable @a cleanerMessage
 execute as @a[scores={cleaner=..-1}] run function fz:cleaner/cleaneroff
 execute as @a[scores={cleaner=1..29}] run tellraw @s [{"text":"请输入>=30的时间(单位:秒)","color":"dark_red"}]
 execute as @a[scores={cleaner=30..}] run function fz:cleaner/cleaneron
-execute as @a[scores={cleanerChat=1..},tag=noDisplayCleanerChat] run function fz:cleaner/cleanerchaton
-execute as @a[scores={cleanerBar=1..},tag=!displayCleanerBossBar] run function fz:cleaner/cleanerbaron
-execute as @a[scores={cleanerChat=..-1},tag=!noDisplayCleanerChat] run function fz:cleaner/cleanerchatoff
-execute as @a[scores={cleanerBar=..-1},tag=displayCleanerBossBar] run function fz:cleaner/cleanerbaroff
-scoreboard players reset @a[scores={cleanerChat=1..}] cleanerChat
-scoreboard players reset @a[scores={cleanerBar=1..}] cleanerBar
-scoreboard players reset @a[scores={cleanerChat=..-1}] cleanerChat
-scoreboard players reset @a[scores={cleanerBar=..-1}] cleanerBar
+execute as @a[scores={cleanerMessage=1},tag=noDisplayCleanerChat] run function fz:cleaner/cleanerchaton
+execute as @a[scores={cleanerMessage=-1},tag=!noDisplayCleanerChat] run function fz:cleaner/cleanerchatoff
+execute as @a[scores={cleanerMessage=2},tag=!displayCleanerBossBar] run function fz:cleaner/cleanerbaron
+execute as @a[scores={cleanerMessage=-2},tag=displayCleanerBossBar] run function fz:cleaner/cleanerbaroff
+execute as @a[scores={cleanerMessage=3},tag=noCleanerSound] run function fz:cleaner/cleanersoundon
+execute as @a[scores={cleanerMessage=-3},tag=!noCleanerSound] run function fz:cleaner/cleanersoundoff
 scoreboard players reset @a[scores={cleaner=..-1}] cleaner
 scoreboard players reset @a[scores={cleaner=1..}] cleaner
 execute if score cleaner cleanerBooleans matches 1 run function fz:cleaner/main

data/fz/functions/cleaner/uninstall.mcfunction

@@ -3,6 +3,5 @@ scoreboard objectives remove cleaned
 scoreboard objectives remove cleanerBooleans
 scoreboard objectives remove setCleanTime
 scoreboard objectives remove displayCleanTime
-scoreboard objectives remove cleanerBar
-scoreboard objectives remove cleanerChat
+scoreboard objectives remove cleanerMessage
 bossbar remove cleaner

data/fz/functions/config/configs.mcfunction

@@ -1,18 +1,18 @@
 scoreboard players reset @s options
 function fz:noai/configs
-execute if score carpet carpet matches 1.. run tellraw @s {"text":"--不计入计分板总分的假人--","color":"dark_green","bold":true}
-execute if score carpet carpet matches 1.. run tellraw @s [{"text":"- 生成假人："},{"text":"/script invoke summon 玩家名","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke summon "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
-execute if score carpet carpet matches 1.. run tellraw @s [{"text":"- 删除假人："},{"text":"/script invoke kill 玩家名","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke kill "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
-execute if score carpet carpet matches 1.. run tellraw @s [{"text":"- 删除全部假人："},{"text":"/script invoke killall","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke kill "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
-execute if score carpet carpet matches 1.. run tellraw @s [{"text":"- 传送假人："},{"text":"/script invoke tp xxx x y z","color":"green","clickEvent":{"action":"suggest_command","value":"/script invoke tp "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"，xyz可替换为\"s\"来代表你的位置","color":"white"}]
-tellraw @s [{"text":"--扫地姬--"}]
-tellraw @s [{"text":"- 显示方式"}]
-tellraw @s [{"text":"  - 血条栏："},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger cleanerBar set 1"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger cleanerBar set -1"}}]
-tellraw @s [{"text":"    - 指令："},{"text":"/trigger cleanerBar set -1为关/1为开","color":"green","clickEvent":{"action":"suggest_command","value":"/trigger cleanerBar set "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
-tellraw @s [{"text":"  - 聊天栏："},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger cleanerChat set 1"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger cleanerChat set -1"}}]
-tellraw @s [{"text":"    - 指令："},{"text":"/trigger cleanerChat set -1为关/1为开","color":"green","clickEvent":{"action":"suggest_command","value":"/trigger cleanerChat set "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
+execute if score script carpet matches 1 run tellraw @s {"text":"不计入计分板总分的假人：","color":"dark_green","bold":true}
+execute if score tagplayer carpet matches 1 run function fz:carpet/tagplayer
+execute unless score tagplayer carpet matches 1 run function fz:carpet/scriptplayer
+tellraw @s [{"text":"扫地姬：","color":"dark_green","bold":true}]
+tellraw @s [{"text":"- 提示方式"}]
+tellraw @s[tag=noDisplayCleanerChat] [{"text":"  - "},{"text":"聊天栏:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger cleanerMessage set 1"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+tellraw @s[tag=!noDisplayCleanerChat] [{"text":"  - "},{"text":"聊天栏:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger cleanerMessage set -1"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+tellraw @s[tag=!displayCleanerBossBar] [{"text":"  - "},{"text":"血条栏:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger cleanerMessage set 2"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+tellraw @s[tag=displayCleanerBossBar] [{"text":"  - "},{"text":"血条栏:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger cleanerMessage set -2"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+tellraw @s[tag=noCleanerSound] [{"text":"  - "},{"text":"声音:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger cleanerMessage set 3"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+tellraw @s[tag=!noCleanerSound] [{"text":"  - "},{"text":"声音:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger cleanerMessage set -3"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
 tellraw @s [{"text":"- 指令："},{"text":"/trigger cleaner set -1为关/秒数(≥30)为开","color":"green","clickEvent":{"action":"suggest_command","value":"/trigger cleaner set "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
 tellraw @s [{"text":"- 预设："},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger cleaner set -1"}},{"text":"[30s]","color":"red","clickEvent":{"action":"run_command","value":"/trigger cleaner set 30"}},{"text":"[1min]","color":"gold","clickEvent":{"action":"run_command","value":"/trigger cleaner set 60"}},{"text":"[2min]","color":"yellow","clickEvent":{"action":"run_command","value":"/trigger cleaner set 120"}},{"text":"[3min]","color":"green","clickEvent":{"action":"run_command","value":"/trigger cleaner set 180"}},{"text":"[5min]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger cleaner set 300"}}]
-tellraw @s {"text":"--记分板--","color":"dark_green","bold":true}
+tellraw @s {"text":"记分板：","color":"dark_green","bold":true}
 tellraw @s [{"text":"- 指令："},{"text":"/trigger scoreSwitch set -1为关/1-9为开","color":"green","clickEvent":{"action":"suggest_command","value":"/trigger scoreSwitch set "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}}]
 tellraw @s [{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set -1"}},{"text":"[轮播]","color":"dark_green","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 1"}},{"text":"[击杀榜]","color":"red","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 2"}},{"text":"[挖掘榜]","color":"gray","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 3"}},{"text":"[死亡榜]","color":"dark_red","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 4"}},{"text":"[交易榜]","color":"green","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 5"}},{"text":"[钓鱼榜]","color":"blue","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 6"}},{"text":"[奥里给！]","color":"yellow","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 7"}},{"text":"[活跃度]","color":"aqua","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 8"}},{"text":"[统计总量]","color":"light_purple","clickEvent":{"action":"run_command","value":"/trigger scoreSwitch set 9"}}]

data/fz/functions/config/install.mcfunction

@@ -1 +1,2 @@
-scoreboard objectives add options trigger
+scoreboard objectives add options trigger
+scoreboard players set config installed 1

data/fz/functions/install.mcfunction

@@ -1,21 +1,18 @@
 # @Author: Harvey.Kang
 # @Date: 2019-10-01
-# @Last Modified by: Harvey.Kang
-# @Last Modified time: 2019-12-15 03:53:27
 # @License: GNU General Public License, version 3 (GPL-3.0)
 
 # This project is licensed under the terms of the GNU General Public License v3.0
 # Copyright (C)2019-2020 Harvey.Kang
-#升级用#
-scoreboard objectives add versionMajor dummy
-scoreboard objectives add versionMinor dummy
-scoreboard objectives add versionPatch dummy
+#升级用before#
+scoreboard objectives add version dummy
 scoreboard players operation version version = version version
-execute if score version version matches ..132 run function fz:update/before/1.3.3
+execute if score version version matches 132 run function fz:update/before/1.3.3
 execute if score version version matches 133 run function fz:update/before/1.3.3d
+execute if score versionMinor version matches 4 if score versionPatch version matches 0 if score dev1 version matches ..20200118 run function fz:update/before/1.4.0-dev
+execute if score versionMinor version matches 4 if score versionPatch version matches 0 if score dev1 version matches ..20200111 unless score dev2 version matches 2241.. run function fz:update/before/1.4.0-dev5
 ####
 scoreboard objectives add installed dummy
-scoreboard players set installed installed 1
 gamerule disableElytraMovementCheck true
 scoreboard objectives add leaveGame minecraft.custom:minecraft.leave_game
 scoreboard objectives add timeCounter dummy
@@ -30,12 +27,13 @@ function fz:sleep/install
 function fz:cleaner/install
 function fz:logintips/install
 function fz:config/install
-#升级用#
-execute if score version version matches ..132 run function fz:update/after/1.3.3
-execute if score version version matches 133 run function fz:update/after/1.3.3d
-function fz:update/after/1.4
-scoreboard players set version versionMajor 1
-scoreboard players set version versionMinor 4
-scoreboard players set version versionPatch 0
+#升级用after#
+###1.4.0-dev2
+scoreboard players set versionMajor version 1
+scoreboard players set versionMinor version 4
+scoreboard players set versionPatch version 0
+scoreboard players set dev1 version 20200121
+scoreboard players set dev2prefix version 0
+scoreboard players set dev2 version 838
 ####
-tellraw @a [{"text":"[Datapack]"},{"text":" FZ'sDatapack-","color":"gold"},{"score":{"objective":"versionMajor","name":"version"},"color":"gold"},{"text":".","color":"gold"},{"score":{"objective":"versionMinor","name":"version"},"color":"gold"},{"text":".","color":"gold"},{"score":{"objective":"versionPatch","name":"version"},"color":"gold"},{"text":"-dev.20200109.1743 installed successfully","color":"gold"}]
+tellraw @a [{"text":"[Datapack]"},{"text":" FZ'sDatapack-","color":"gold"},{"score":{"objective":"version","name":"versionMajor"},"color":"gold"},{"text":".","color":"gold"},{"score":{"objective":"version","name":"versionMinor"},"color":"gold"},{"text":".","color":"gold"},{"score":{"objective":"version","name":"versionPatch"},"color":"gold"},{"text":"-dev.","color":"gold"},{"score":{"objective":"version","name":"dev1"},"color":"gold"},{"text":".","color":"gold"},{"score":{"objective":"version","name":"dev2prefix"},"color":"gold"},{"score":{"objective":"version","name":"dev2"},"color":"gold"},{"text":" installed successfully","color":"gold"}]

data/fz/functions/logintips/install.mcfunction

@@ -1 +1 @@
-scoreboard objectives add leaveGame minecraft.custom:minecraft.leave_game
+scoreboard players set logintips installed 1

data/fz/functions/logintips/main.mcfunction

@@ -1,7 +1,3 @@
 execute as @a unless score @s leaveGame matches -2147483648..2147483647 run scoreboard players operation @s leaveGame = @s leaveGame
-tellraw @a[scores={leaveGame=0..}] [{"text":"使用"},{"text":"/trigger cleaner set -1或≥30(单位:秒)","underlined":true,"clickEvent":{"action":"suggest_command","value":"/trigger cleaner set "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"来关/开扫地姬"}]
-tellraw @a[scores={leaveGame=0..}] [{"text":"使用"},{"text":"/trigger scoreswitch set -1或1-9","underlined":true,"clickEvent":{"action":"suggest_command","value":"/trigger scoreswitch set "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"来关/开记分板"}]
-execute if score carpet carpet matches 1.. run tellraw @a[scores={leaveGame=0..}] [{"text":"务必使用","color":"dark_red"},{"text":"/script invoke summon 玩家名","underlined":true,"color":"red","clickEvent":{"action":"suggest_command","value":"/script invoke summon "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"召唤假人，可以避免将他们计入记分板总分！","color":"dark_red"}]
-execute if score carpet carpet matches 1.. run tellraw @a[scores={leaveGame=0..}] [{"text":"务必使用","color":"dark_red"},{"text":"/script invoke kill 玩家名","underlined":true,"color":"red","clickEvent":{"action":"suggest_command","value":"/script invoke kill "},"hoverEvent":{"action":"show_text","value":"点击以写入聊天栏"}},{"text":"删除假人，否则其标签无法删除！","color":"dark_red"}]
-tellraw @a[scores={leaveGame=0..}] [{"text":"使用","color":"gold"},{"text":"/trigger options","underlined":true,"clickEvent":{"action":"run_command","value":"/trigger options"},"hoverEvent":{"action":"show_text","value":"点击以访问全部设置"}},{"text":"以访问全部设置"}]
+tellraw @a[scores={leaveGame=0..}] [{"text":"使用","color":"gold"},{"text":"/trigger options","underlined":true,"clickEvent":{"action":"run_command","value":"/trigger options"},"hoverEvent":{"action":"show_text","value":"点击以访问全部设置"}},{"text":"以访问帮助和全部设置"}]
 scoreboard players set @a[scores={leaveGame=0..}] leaveGame -1

data/fz/functions/logintips/uninstall.mcfunction

@@ -1 +1 @@
-scoreboard objectives remove leaveGame
+scoreboard players reset logintips installed

data/fz/functions/main.mcfunction

@@ -1,6 +1,6 @@
-function fz:score/main
-function fz:sleep/main
-function fz:cleaner/trigger
-function fz:logintips
-function fz:noai/main
-function fz:config/main
+execute if score scoreboard installed matches 1 run function fz:score/main
+execute if score sleep installed matches 1 run function fz:sleep/main
+execute if score cleaner installed matches 1 run function fz:cleaner/trigger
+execute if score logintips installed matches 1 run function fz:logintips/main
+execute if score noai installed matches 1 run function fz:noai/main
+execute if score config installed matches 1 run function fz:config/main

data/fz/functions/noai/configs.mcfunction

@@ -2,22 +2,26 @@
 tellraw @s {"text":"--卡顿生物AI开关(本项仅op可用)--","color":"dark_green","bold":true}
 tellraw @s {"text":"注意！无AI的实体不会自然下落且不会因流体或实体挤压而运动！","color":"dark_red"}
 #除非鳕鱼ai为关否则显示关闭按钮
-execute unless data storage minecraft:cod {ai:0b} run tellraw @s [{"text":"- "},{"text":"鳕鱼[minecraft:cod]","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":" "},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:cod ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+execute unless data storage minecraft:cod {ai:0b} run tellraw @s [{"text":"- "},{"text":"鳕鱼[minecraft:cod]:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:cod ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
 #如果鳕鱼ai为开则显示开启按钮
-execute if data storage minecraft:cod {ai:0b} run tellraw @s [{"text":"- "},{"text":"鳕鱼[minecraft:cod]","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:cod ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+execute if data storage minecraft:cod {ai:0b} run tellraw @s [{"text":"- "},{"text":"鳕鱼[minecraft:cod]:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:cod ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
 #除非鲑鱼ai为关否则显示关闭按钮
-execute unless data storage minecraft:salmon {ai:0b} run tellraw @s [{"text":"- "},{"text":"鲑鱼[minecraft:salmon]","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":" "},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:salmon ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+execute unless data storage minecraft:salmon {ai:0b} run tellraw @s [{"text":"- "},{"text":"鲑鱼[minecraft:salmon]:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:salmon ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
 #如果鲑鱼ai为开则显示开启按钮
-execute if data storage minecraft:salmon {ai:0b} run tellraw @s [{"text":"- "},{"text":"鲑鱼[minecraft:salmon]","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:salmon ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+execute if data storage minecraft:salmon {ai:0b} run tellraw @s [{"text":"- "},{"text":"鲑鱼[minecraft:salmon]:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:salmon ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
 #除非热带鱼ai为关否则显示关闭按钮
-execute unless data storage minecraft:tropical_fish {ai:0b} run tellraw @s [{"text":"- "},{"text":"热带鱼[minecraft:tropical_fish]","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":" "},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:tropical_fish ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+execute unless data storage minecraft:tropical_fish {ai:0b} run tellraw @s [{"text":"- "},{"text":"热带鱼[minecraft:tropical_fish]:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:tropical_fish ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
 #如果热带鱼ai为开则显示开启按钮
-execute if data storage minecraft:tropical_fish {ai:0b} run tellraw @s [{"text":"- "},{"text":"热带鱼[minecraft:tropical_fish]","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:tropical_fish ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+execute if data storage minecraft:tropical_fish {ai:0b} run tellraw @s [{"text":"- "},{"text":"热带鱼[minecraft:tropical_fish]:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:tropical_fish ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
 #除非河豚ai为关否则显示关闭按钮
-execute unless data storage minecraft:pufferfish {ai:0b} run tellraw @s [{"text":"- "},{"text":"河豚[minecraft:pufferfish]","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":" "},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:pufferfish ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+execute unless data storage minecraft:pufferfish {ai:0b} run tellraw @s [{"text":"- "},{"text":"河豚[minecraft:pufferfish]:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:pufferfish ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
 #如果河豚ai为开则显示开启按钮
-execute if data storage minecraft:pufferfish {ai:0b} run tellraw @s [{"text":"- "},{"text":"河豚[minecraft:pufferfish]","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:pufferfish ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+execute if data storage minecraft:pufferfish {ai:0b} run tellraw @s [{"text":"- "},{"text":"河豚[minecraft:pufferfish]:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:pufferfish ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
 #除非蝙蝠ai为关否则显示关闭按钮
-execute unless data storage minecraft:bat {ai:0b} run tellraw @s [{"text":"- "},{"text":"蝙蝠[minecraft:bat]","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":" "},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:bat ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+execute unless data storage minecraft:bat {ai:0b} run tellraw @s [{"text":"- "},{"text":"蝙蝠[minecraft:bat]:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:bat ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
 #如果蝙蝠ai为开则显示开启按钮
-execute if data storage minecraft:bat {ai:0b} run tellraw @s [{"text":"- "},{"text":"蝙蝠[minecraft:bat]","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:bat ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+execute if data storage minecraft:bat {ai:0b} run tellraw @s [{"text":"- "},{"text":"蝙蝠[minecraft:bat]:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:bat ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]
+#除非兔子ai为关否则显示关闭按钮
+execute unless data storage minecraft:rabbit {ai:0b} run tellraw @s [{"text":"- "},{"text":"兔子[minecraft:rabbit]:","hoverEvent":{"action":"show_text","value":"状态：开启"}},{"text":" "},{"text":"[✔]","color":"gray","hoverEvent":{"action":"show_text","value":"已开启"}},{"text":"[✘]","color":"dark_red","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:rabbit ai set value 0b"},"hoverEvent":{"action":"show_text","value":"点击以关闭"}}]
+#如果兔子ai为开则显示开启按钮
+execute if data storage minecraft:rabbit {ai:0b} run tellraw @s [{"text":"- "},{"text":"兔子[minecraft:rabbit]:","hoverEvent":{"action":"show_text","value":"状态：关闭"}},{"text":" "},{"text":"[✔]","color":"dark_green","clickEvent":{"action":"run_command","value":"/data modify storage minecraft:rabbit ai set value 1b"},"hoverEvent":{"action":"show_text","value":"点击以开启"}},{"text":" "},{"text":"[✘]","color":"gray","hoverEvent":{"action":"show_text","value":"已关闭"}}]

data/fz/functions/noai/install.mcfunction

@@ -0,0 +1 @@
+scoreboard players set noai installed 1

data/fz/functions/noai/main.mcfunction

@@ -3,8 +3,10 @@ execute if data storage minecraft:salmon {ai:0b} as @e[type=minecraft:salmon,nbt
 execute if data storage minecraft:tropical_fish {ai:0b} as @e[type=minecraft:tropical_fish,nbt={}] run data modify entity @s NoAI set value 1b
 execute if data storage minecraft:pufferfish {ai:0b} as @e[type=minecraft:pufferfish,nbt={}] run data modify entity @s NoAI set value 1b
 execute if data storage minecraft:bat {ai:0b} as @e[type=minecraft:bat,nbt={}] run data modify entity @s NoAI set value 1b
+execute if data storage minecraft:rabbit {ai:0b} as @e[type=minecraft:rabbit,nbt={}] run data modify entity @s NoAI set value 1b
 execute if data storage minecraft:cod {ai:1b} as @e[type=minecraft:cod,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b
 execute if data storage minecraft:salmon {ai:1b} as @e[type=minecraft:salmon,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b
 execute if data storage minecraft:tropical_fish {ai:1b} as @e[type=minecraft:tropical_fish,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b
 execute if data storage minecraft:pufferfish {ai:1b} as @e[type=minecraft:pufferfish,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b
-execute if data storage minecraft:bat {ai:1b} as @e[type=minecraft:bat,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b
+execute if data storage minecraft:bat {ai:1b} as @e[type=minecraft:bat,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b
+execute if data storage minecraft:rabbit {ai:1b} as @e[type=minecraft:rabbit,nbt={NoAI:1b}] run data modify entity @s NoAI set value 0b

data/fz/functions/noai/uninstall.mcfunction

@@ -0,0 +1 @@
+scoreboard players reset noai installed

data/fz/functions/score/install.mcfunction

@@ -98,4 +98,6 @@ scoreboard objectives add tFishC dummy
 scoreboard objectives add tTradeC dummy
 scoreboard objectives add tHurtC dummy
 scoreboard objectives add tActC dummy
-####
+####
+#安装完成
+scoreboard players set scoreboard installed 1

data/fz/functions/score/main.mcfunction

@@ -52,13 +52,13 @@ execute as @a[tag=!carpetBot] unless score @s tFishC matches -2147483648..214748
 execute as @a[tag=!carpetBot] unless score @s tHurtC matches -2147483648..2147483647 run scoreboard players operation @s tHurtC = @s tHurtC
 execute as @a[tag=!carpetBot] unless score @s tActC matches -2147483648..2147483647 run scoreboard players operation @s tActC = @s tActC
 #两板分数不等时运行计算函数
-execute as @a[tag=!carpetBot] unless score @s tDigC = @s digCounter run function fz:score/totalcalculator/tdigc
-execute as @a[tag=!carpetBot] unless score @s tKillC = @s killCounter run function fz:score/totalcalculator/tkillc
-execute as @a[tag=!carpetBot] unless score @s tDeathC = @s deathCounter run function fz:score/totalcalculator/tdeathc
-execute as @a[tag=!carpetBot] unless score @s tTradeC = @s tradingCounter run function fz:score/totalcalculator/ttradec
-execute as @a[tag=!carpetBot] unless score @s tFishC = @s fishingCounter run function fz:score/totalcalculator/tfishc
-execute as @a[tag=!carpetBot] unless score @s tHurtC = @s damageTaken run function fz:score/totalcalculator/thurtc
-execute as @a[tag=!carpetBot] unless score @s tActC = @s activation run function fz:score/totalcalculator/tactc
+execute as @a unless score @s tDigC = @s digCounter run function fz:score/totalcalculator/tdigc
+execute as @a unless score @s tKillC = @s killCounter run function fz:score/totalcalculator/tkillc
+execute as @a unless score @s tDeathC = @s deathCounter run function fz:score/totalcalculator/tdeathc
+execute as @a unless score @s tTradeC = @s tradingCounter run function fz:score/totalcalculator/ttradec
+execute as @a unless score @s tFishC = @s fishingCounter run function fz:score/totalcalculator/tfishc
+execute as @a unless score @s tHurtC = @s damageTaken run function fz:score/totalcalculator/thurtc
+execute as @a unless score @s tActC = @s activation run function fz:score/totalcalculator/tactc
 #总榜在分榜中显示开=1
 execute if score 总挖掘数 totalDug matches 1.. run scoreboard players operation 总挖掘数 digCounter = 总挖掘数 totalList
 execute if score 总击杀数 totalKilled matches 1.. run scoreboard players operation 总击杀数 killCounter = 总击杀数 totalList
@@ -76,7 +76,7 @@ execute if score 总活跃时间 totalActivation matches 1.. run scoreboard play
 #execute if score totalHurt totalHurt matches ..0 run function fz:score/totalnodisplay/damagetaken
 #execute if score totalActivation totalActivation matches ..0 run function fz:score/activation/totalnodisplay
 ####
-#假人模块#
+#假人模块#重置死亡榜在死亡榜计算其中
 execute as @a[tag=carpetBot,team=!fakePlayer] run function fz:score/runaddprefix
-execute as @a[tag=carpetBot,tag=!newCarpetBot] if score @s leaveGame matches 0 run function fz:score/runbotdead
+execute as @a[team=fakePlayer,tag=!carpetBot] run function fz:score/runbotdead
 ####

data/fz/functions/score/runaddprefix.mcfunction

@@ -1,2 +1,2 @@
 team join fakePlayer @s
-execute if entity @s[tag=newCarpetBot] run tellraw @a {"text":"↑假的"}
+tellraw @a {"text":"↑假的"}

data/fz/functions/score/runbotdead.mcfunction

@@ -1,4 +1,2 @@
-tag @s remove carpetBot
 team leave @s
-execute if score @s botDeath matches 1.. run scoreboard players operation @s deathCounter -= 1 1
-execute if score @s botDeath matches 1.. run scoreboard players reset @s botDeath
+tellraw @a {"text":"↑真的"}

data/fz/functions/score/totalcalculator/tactc.mcfunction

@@ -1,6 +1,6 @@
 #计算每个玩家本游戏刻活跃度和上一游戏刻活跃度的差
 scoreboard players operation @s tActC -= @s activation
 #将两游戏刻活跃度的差之和加在总榜上
-scoreboard players operation 总活跃时间 totalList -= @s tActC
+scoreboard players operation 总活跃时间 totalList -= @s[tag=!carpetBot] tActC
 #储存当前游戏刻的活跃度
 scoreboard players operation @s tActC = @s activation

data/fz/functions/score/totalcalculator/tdeathc.mcfunction

@@ -1,6 +1,8 @@
 #计算每个玩家本游戏刻死亡数和上一游戏刻死亡数的差
 scoreboard players operation @s tDeathC -= @s deathCounter
+#重置假人分数
+scoreboard players operation @s[tag=carpetBot] deathCounter += @s tDeathC
 #将两游戏刻玩家死亡数的差之和加在总榜上
-scoreboard players operation 总死亡数 totalList -= @s tDeathC
+scoreboard players operation 总死亡数 totalList -= @s[tag=!carpetBot] tDeathC
 #储存当前游戏刻的玩家死亡数
 scoreboard players operation @s tDeathC = @s deathCounter

data/fz/functions/score/totalcalculator/tdigc.mcfunction

@@ -1,6 +1,8 @@
 #计算每个玩家本游戏刻挖掘量和上一游戏刻挖掘量的差
 scoreboard players operation @s tDigC -= @s digCounter
+#重置假人分数
+scoreboard players operation @s[tag=carpetBot] digCounter += @s tDigC
 #将两游戏刻玩家挖掘量的差之和加在总榜上
-scoreboard players operation 总挖掘数 totalList -= @s tDigC
+scoreboard players operation 总挖掘数 totalList -= @s[tag=!carpetBot] tDigC
 #储存当前游戏刻的玩家挖掘量
 scoreboard players operation @s tDigC = @s digCounter

data/fz/functions/score/totalcalculator/tfishc.mcfunction

@@ -1,6 +1,8 @@
 #计算每个玩家本游戏刻钓鱼数和上一游戏刻钓鱼数的差
 scoreboard players operation @s tFishC -= @s fishingCounter
+#重置假人分数
+scoreboard players operation @s[tag=carpetBot] fishingCounter += @s tFishC
 #将两游戏刻玩家钓鱼数的差之和加在总榜上
-scoreboard players operation 总钓鱼数 totalList -= @s tFishC
+scoreboard players operation 总钓鱼数 totalList -= @s[tag=!carpetBot] tFishC
 #储存当前游戏刻的玩家钓鱼数
 scoreboard players operation @s tFishC = @s fishingCounter

data/fz/functions/score/totalcalculator/thurtc.mcfunction

@@ -1,6 +1,8 @@
 #计算每个玩家本游戏刻玩家受伤害量和上一游戏刻受伤害量的差
 scoreboard players operation @s tHurtC -= @s damageTaken
+#重置假人分数
+scoreboard players operation @s[tag=carpetBot] damageTaken += @s tHurtC
 #将两游戏刻玩家受伤害量的差之和加在总榜上
-scoreboard players operation 总受伤害量 totalList -= @s tHurtC
+scoreboard players operation 总受伤害量 totalList -= @s[tag=!carpetBot] tHurtC
 #储存当前游戏刻的玩家受伤害量
 scoreboard players operation @s tHurtC = @s damageTaken

data/fz/functions/score/totalcalculator/tkillc.mcfunction

@@ -1,6 +1,8 @@
 #计算每个玩家本游戏刻玩家击杀数和上一游戏刻击杀数的差
 scoreboard players operation @s tKillC -= @s killCounter
+#重置假人分数
+scoreboard players operation @s[tag=carpetBot] killCounter += @s tKillC
 #将两游戏刻玩家击杀数的差之和加在总榜上
-scoreboard players operation 总击杀数 totalList -= @s tKillC
+scoreboard players operation 总击杀数 totalList -= @s[tag=!carpetBot] tKillC
 #储存当前游戏刻的玩家击杀数
 scoreboard players operation @s tKillC = @s killCounter

data/fz/functions/score/totalcalculator/ttradec.mcfunction

@@ -1,6 +1,8 @@
 #计算每个玩家本游戏刻玩家交易数和上一游戏刻交易数的差
 scoreboard players operation @s tTradeC -= @s tradingCounter
+#重置假人分数
+scoreboard players operation @s[tag=carpetBot] tradingCounter += @s tTradeC
 #将两游戏刻玩家交易数的差之和加在总榜上
-scoreboard players operation 总交易数 totalList -= @s tTradeC
+scoreboard players operation 总交易数 totalList -= @s[tag=!carpetBot] tTradeC
 #储存当前游戏刻的玩家交易数
 scoreboard players operation @s tTradeC = @s tradingCounter

data/fz/functions/update/before/1.3.3.mcfunction

@@ -6,14 +6,15 @@ scoreboard players operation 总交易数 totalList = totalTraded totalList
 scoreboard players operation 总钓鱼数 totalList = totalFished totalList
 scoreboard players operation 总受伤害量 totalList = totalHurt totalList
 scoreboard players operation 总活跃时间 totalList = totalActivation totalList
-scoreboard players reset totalDug
-scoreboard players reset totalKilled
-scoreboard players reset totalDeath
-scoreboard players reset totalTraded
-scoreboard players reset totalFished
-scoreboard players reset totalHurt
-scoreboard players reset totalActivation
+execute if score 总挖掘数 totalList = totalDug totalList run scoreboard players reset totalDug
+execute if score 总击杀数 totalList = totalKilled totalList run scoreboard players reset totalKilled
+execute if score 总死亡数 totalList = totalDeath totalList run scoreboard players reset totalDeath
+execute if score 总交易数 totalList = totalTraded totalList run scoreboard players reset totalTraded
+execute if score 总钓鱼数 totalList = totalFished totalList run scoreboard players reset totalFished
+execute if score 总受伤害量 totalList = totalHurt totalList run scoreboard players reset totalHurt
+execute if score 总活跃时间 totalList = totalActivation totalList run scoreboard players reset totalActivation
 scoreboard objectives remove scoreswitch
 scoreboard objectives remove actCounter
 scoreboard objectives setdisplay sidebar.team.dark_purple
-team remove displayScoresOff
+team remove displayScoresOff
+scoreboard players reset version version

data/fz/functions/update/before/1.3.3d.mcfunction

@@ -1,2 +1,3 @@
 scoreboard objectives setdisplay sidebar.team.dark_purple
-team remove displayScoresOff
+team remove displayScoresOff
+scoreboard players reset version version

data/fz/functions/update/before/1.4.0-dev.mcfunction

@@ -0,0 +1,6 @@
+scoreboard objectives remove botDeath
+scoreboard objectives remove cleanerBar
+scoreboard objectives remove cleanerChat
+scoreboard objectives remove versionMajor
+scoreboard objectives remove versionMinor
+scoreboard objectives remove versionPatch

data/fz/functions/update/before/1.4.0-dev5.mcfunction

@@ -0,0 +1,21 @@
+scoreboard players reset 总挖掘数 totalList
+scoreboard players reset 总击杀数 totalList
+scoreboard players reset 总死亡数 totalList
+scoreboard players reset 总交易数 totalList
+scoreboard players reset 总钓鱼数 totalList
+scoreboard players reset 总受伤害量 totalList
+scoreboard players reset 总活跃时间 totalList
+scoreboard objectives remove tActC
+scoreboard objectives remove tDeathC
+scoreboard objectives remove tDigC
+scoreboard objectives remove tFishC
+scoreboard objectives remove tHurtC
+scoreboard objectives remove tKillC
+scoreboard objectives remove tTradeC
+scoreboard objectives add tActC dummy
+scoreboard objectives add tDeathC dummy
+scoreboard objectives add tDigC dummy
+scoreboard objectives add tFishC dummy
+scoreboard objectives add tHurtC dummy
+scoreboard objectives add tKillC dummy
+scoreboard objectives add tTradeC dummy