2.0.0.5

2020-12-07 04:25:40 +08:00
parent 4526f5541d
commit 4f1a8b74f9
30 changed files with 417 additions and 131 deletions
@@ -1,7 +1,7 @@
 #关闭主进程
 schedule clear fz:config/main
 #输出给打开过设置界面的玩家的消息
-tellraw @a[scores={openingConfig=1}] {"text": "[提醒]5分钟无任何人回应，为节省性能，已关闭设置功能，请重新唤起","color": "#d7ff00"}
+tellraw @a[scores={openingConfig=1}] {"text": "[提醒]5分钟无任何人回应，为节省性能，已关闭设置功能，请重新唤起","color": "#66ffff"}
 #重置打开过设置界面的玩家的列表
 scoreboard objectives remove openingConfig
 #移除设置界面被打开的信息
@@ -1,3 +1,4 @@
+
 #用于储存参数的记分板
 scoreboard objectives add parameter dummy
 #用于数学计算的记分板
@@ -15,11 +16,12 @@ function fz:login/logintips/install
 function fz:carpet/carpet
 #版本信息
 data merge storage fz.installed {installed:1b}
-data merge storage fz {version:Alpha-2.0.0.4}
-data merge storage fz {date:2020-12.25}
-data merge storage fz {time:"07:01"}
+data merge storage fz {version:Beta-2.0.0.5}
+data merge storage fz {date:2020-12.7}
+data merge storage fz {time:"04:06"}
 data merge storage fz {snapshot:-SNAPSHOT}
 ##data remove storage fz snapshot
+tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
 #提示已安装
 tellraw @a {"text": "[信息]安装完成！","color": "#5fff00"}
 #info: #5fff00
@@ -1,8 +1,8 @@
 #如果未安装且未卸载则安装
 execute unless data storage fz.installed {installed:1b} unless data storage fz.installed {installed:0b} run function fz:install
 #如果版本正确且已安装则开始运行
-execute if data storage fz {version:Alpha-2.0.0.4} if data storage fz.installed {installed:1b} run function fz:start
+execute if data storage fz {version:Alpha-2.0.0.5} if data storage fz.installed {installed:1b} run function fz:start
 #如果版本不符则更新
-execute unless data storage fz {version:Alpha-2.0.0.4} run function fz:update
+execute unless data storage fz {version:Alpha-2.0.0.5} run function fz:update
 #输出版本信息
 tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}]
@@ -1,4 +1,4 @@
-execute if data storage fz.installed {logintips:1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#d7ff00"}
+execute if data storage fz.installed {logintips:1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}

 scoreboard players set @s leaveGame 0

@@ -24,5 +24,6 @@ execute if score @s usedWooAxe matches 1.. run function fz:scoreboards/digcounte
 execute if score @s usedWooHoe matches 1.. run function fz:scoreboards/digcounter/tools/woohoe
 execute if score @s usedWooPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/woopickaxe
 execute if score @s usedWooShovel matches 1.. run function fz:scoreboards/digcounter/tools/wooshovel
+execute if score @s usedShears matches 1.. run function fz:scoreboards/digcounter/tools/shears
 #重置探测使用工具的记分板的成就
 advancement revoke @s only fz:scoreboards/digcounter/digtrigger
@@ -1,6 +1,6 @@
 #计算挖掘榜和总榜
 #判断条件用于排除地毯小人
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedStoShovel
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedStoShovel
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedStoShovel
+execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetAxe
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetAxe
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetAxe
 scoreboard players reset @s usedNetAxe
@@ -1,6 +1,6 @@
 #计算挖掘榜和总榜
 #判断条件用于排除地毯小人
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetPickaxe
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetPickaxe
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetPickaxe
+execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetHoe
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetHoe
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetHoe
 scoreboard players reset @s usedNetHoe
@@ -1,6 +1,6 @@
 #计算挖掘榜和总榜
 #判断条件用于排除地毯小人
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetHoe
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetHoe
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetHoe
+execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetPickaxe
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetPickaxe
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetPickaxe
 scoreboard players reset @s usedNetPickaxe
@@ -0,0 +1,6 @@
+#计算挖掘榜和总榜
+#判断条件用于排除地毯小人
+execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedShears
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedShears
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedShears
+scoreboard players reset @s usedShears
@@ -1,6 +1,6 @@
 #计算挖掘榜和总榜
 #判断条件用于排除地毯小人
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetAxe
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetAxe
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetAxe
+execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedStoShovel
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedStoShovel
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedStoShovel
 scoreboard players reset @s usedStoShovel
@@ -4,4 +4,4 @@ execute unless score @s carpetBot matches 1 run scoreboard players remove @s dig
 execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 digCounter 1
 execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 totalList 1
 #重置探测右键使用工具的成就
-advancement revoke 2333 only fz:scoreboards/digcounter/toolsfix
+advancement revoke @s only fz:scoreboards/digcounter/toolsfix
@@ -27,6 +27,7 @@ scoreboard objectives add digCounter dummy
    scoreboard objectives add usedNetPickaxe minecraft.used:minecraft.netherite_pickaxe
    scoreboard objectives add usedNetShovel minecraft.used:minecraft.netherite_shovel
    scoreboard objectives add usedNetHoe minecraft.used:minecraft.netherite_hoe
+    scoreboard objectives add usedShears minecraft.used:minecraft.shears
 scoreboard objectives add deathCounter dummy
    scoreboard objectives add deathTester deathCount
 scoreboard objectives add tradingCounter dummy
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]10s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]10s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/5s 5s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]1min后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]1min后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/30s 30s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]1s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]1s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/main 1s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]2min后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]2min后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/1min 60s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]2s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]2s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/1s 1s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]30s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]30s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/10s 20s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]3min后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]3min后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/2min 60s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]3s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]3s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/2s 1s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]4min后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]4min后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/3min 60s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]4s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]4s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/3s 1s
@@ -1,3 +1,3 @@
-tellraw @a {"text": "[提醒]5s后清理掉落物","color": "#d7ff00"}
+tellraw @a {"text": "[提醒]5s后清理掉落物","color": "#66ffff"}
 execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
 schedule function fz:sweeper/timer/4s 1s