3.0.5

data/fzsd/advancements/game_event/on_used_tool.json

@@ -7,7 +7,6 @@
                 "player": [
                     {
                         "condition": "minecraft:reference",
-                        "entity": "this",
                         "name": "fzsd:used_tool"
                     }
                 ]

data/fzsd/functions/api/get_dimension_name/default.mcfunction

@@ -1 +1 @@
-data modify storage fzsd:global fzsd.api.dimension.name set value '{"nbt": "fzsd.cache.dimension.id", "storage": "fzsd:global"}'
+data modify storage fzsd:global fzsd.api.dimension.name set value '{"nbt": "fzsd.api.dimension.id", "storage": "fzsd:global"}'

data/fzsd/functions/boot.mcfunction

@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.4'}}
+execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.5'}}
 execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load

data/fzsd/functions/game_event/advancement/on_aviate_one_meter.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.aviating_distance %= 200 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_aviate_one_meter
+advancement revoke @s from fzsd:game_event/on_aviate_one_meter

data/fzsd/functions/game_event/advancement/on_dead.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players set @s fzsd.event.death_count 0
-advancement revoke @s only fzsd:game_event/on_dead
+advancement revoke @s from fzsd:game_event/on_dead

data/fzsd/functions/game_event/advancement/on_entered_nether_portal.mcfunction

@@ -4,4 +4,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_entered_nether_portal
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_entered_nether_portal
+advancement revoke @s from fzsd:game_event/on_entered_nether_portal

data/fzsd/functions/game_event/advancement/on_fished.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_fished
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_fished
+advancement revoke @s from fzsd:game_event/on_fished

data/fzsd/functions/game_event/advancement/on_hurt_entity_with_tools.mcfunction

@@ -10,4 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_hurt_entity_with_tools
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_hurt_entity_with_tools
+advancement revoke @s from fzsd:game_event/on_hurt_entity_with_tools

data/fzsd/functions/game_event/advancement/on_killed_mob_or_player.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_killed_mob_or_player
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_killed_mob_or_player
+advancement revoke @s from fzsd:game_event/on_killed_mob_or_player

data/fzsd/functions/game_event/advancement/on_piglin_trade.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_piglin_trade
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_piglin_trade
+advancement revoke @s from fzsd:game_event/on_piglin_trade

data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_placed_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_placed_block
+advancement revoke @s from fzsd:game_event/on_placed_block

data/fzsd/functions/game_event/advancement/on_play_one_hour.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.play_ticks %= 72000 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_play_one_hour
+advancement revoke @s from fzsd:game_event/on_play_one_hour

data/fzsd/functions/game_event/advancement/on_shears_used_on_entity.mcfunction

@@ -10,4 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_shears_used_on_entity
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_shears_used_on_entity
+advancement revoke @s from fzsd:game_event/on_shears_used_on_entity

data/fzsd/functions/game_event/advancement/on_took_damage.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.damage_taken %= 10 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_took_damage
+advancement revoke @s from fzsd:game_event/on_took_damage

data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction

@@ -10,5 +10,5 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_tools_used_on_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_tool_axes_used_on_block
+advancement revoke @s from fzsd:game_event/on_tool_axes_used_on_block
-advancement revoke @s only fzsd:game_event/on_tools_exclude_axes_used_on_block
+advancement revoke @s from fzsd:game_event/on_tools_exclude_axes_used_on_block

data/fzsd/functions/game_event/advancement/on_unsneak.mcfunction

@@ -10,4 +10,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_unsneak
 
 ## 重置事件进度
-advancement revoke @s until fzsd:game_event/on_unsneak
+advancement revoke @s through fzsd:game_event/on_unsneak

data/fzsd/functions/game_event/advancement/on_used_tool.mcfunction

@@ -6,4 +6,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 function #fzsd:game_event/player/on_used_tool/reset_used_tool
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_used_tool
+advancement revoke @s from fzsd:game_event/on_used_tool

data/fzsd/functions/game_event/advancement/on_villager_trade.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_villager_trade
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_villager_trade
+advancement revoke @s from fzsd:game_event/on_villager_trade

data/fzsd/functions/game_event/player/on_broke_block_with_tool/calculate_dig_score.mcfunction

@@ -30,7 +30,4 @@ scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.eve
 scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_pickaxe
 scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_shovel
 scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_sword
-scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.dig_offset
+scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.dig_offset
-
-## 判断分数
-execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool

data/fzsd/functions/game_event/player/on_broke_block_with_tool/try_trigger.mcfunction

@@ -0,0 +1,2 @@
+## 判断分数
+execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool

data/fzsd/functions/module/here/get_dimension_message/if_the_nether.mcfunction

@@ -3,4 +3,5 @@ execute store result storage fzsd:here fzsd.overworld.x int 8 run data get entit
 execute store result storage fzsd:here fzsd.overworld.z int 8 run data get entity @s Pos[2]
 data modify storage fzsd:global fzsd.api.dimension.id set value "minecraft:overworld"
 function #fzsd:api/get_dimension_name
-data modify storage fzsd:here fzsd.message.append set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.overworld.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.overworld.z", "storage": "fzsd:here"}, {"text": "]"}]]'
+data modify storage fzsd:here fzsd.message.append set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.overworld.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.overworld.z", "storage": "fzsd:here"}, {"text": "]"}]]'
+## 恢复用于判断的维度id

data/fzsd/functions/module/here/get_dimension_message/overworld.mcfunction

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:"minecraft:overworld"} run function fzsd:module/here/get_dimension_message/if_overworld
+execute if data entity @s {Dimension:"minecraft:overworld"} run function fzsd:module/here/get_dimension_message/if_overworld

data/fzsd/functions/module/here/get_dimension_message/the_nether.mcfunction

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:"minecraft:the_nether"} run function fzsd:module/here/get_dimension_message/if_the_nether
+execute if data entity @s {Dimension:"minecraft:the_nether"} run function fzsd:module/here/get_dimension_message/if_the_nether

data/fzsd/functions/module/here/get_message.mcfunction

@@ -1,8 +1,8 @@
-## fzsd.cache.pos已在install中初始化
+
 execute store result storage fzsd:here fzsd.x int 1 run data get entity @s Pos[0]
 execute store result storage fzsd:here fzsd.y int 1 run data get entity @s Pos[1]
 execute store result storage fzsd:here fzsd.z int 1 run data get entity @s Pos[2]
 data modify storage fzsd:here fzsd.message.append set value ''
-
+data modify storage fzsd:here fzsd.dimension.name set from storage fzsd:global fzsd.api.dimension.name
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "获取了位置信息"}]

data/fzsd/functions/module/here/global_message.mcfunction

@@ -1 +1 @@
-tellraw @a [{"selector": "@s"}, [{"text": "说：我在", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]]
+tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说：我在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]]

data/fzsd/functions/module/here/private_message.mcfunction

@@ -1 +1 @@
-tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]
+tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]

data/fzsd/functions/module/last_nether_portal/global_message.mcfunction

@@ -1,2 +1,2 @@
-execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"selector": "@s"}, [{"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]]
+execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]]
 execute unless score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s {"text": "你从未穿出过下界传送门！"}

data/fzsd/functions/system/uninstall/after.mcfunction

@@ -2,4 +2,4 @@
 data modify storage fzsd:install fzsd.global set value 0b
 
 ## 日志
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "卸载完成！"}]
+tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "卸载完成！"}]

data/fzsd/tags/functions/game_event/install.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:game_event/install"
+    ]
+}

data/fzsd/tags/functions/game_event/player/on_broke_block_with_tool/calculate_dig_score.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:game_event/player/on_broke_block_with_tool/calculate_dig_score"
+    ]
+}

data/fzsd/tags/functions/game_event/player/on_used_tool.json

@@ -1,6 +1,7 @@
 {
     "replace": false,
     "values": [
-        "fzsd:game_event/player/on_broke_block_with_tool/on_used_tool"
+        "#fzsd:game_event/player/on_broke_block_with_tool/calculate_dig_score",
+        "fzsd:game_event/player/on_broke_block_with_tool/try_trigger"
     ]
 }

data/fzsd/tags/functions/game_event/uninstall.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:game_event/uninstall"
+    ]
+}

data/fzsd/tags/functions/logger/install.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:logger/install"
+    ]
+}

data/fzsd/tags/functions/logger/uninstall.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:logger/uninstall"
+    ]
+}

data/fzsd/tags/functions/system/install/system.json

@@ -2,7 +2,7 @@
     "replace": false,
     "values": [
         "fzsd:system/install/install",
-        "fzsd:logger/install",
+        "#fzsd:logger/install",
-        "fzsd:game_event/install"
+        "#fzsd:game_event/install"
     ]
 }

data/fzsd/tags/functions/system/uninstall/system.json

@@ -1,8 +1,8 @@
 {
     "replace": false,
     "values": [
-        "fzsd:game_event/uninstall",
+        "#fzsd:game_event/uninstall",
-        "fzsd:logger/uninstall",
+        "#fzsd:logger/uninstall",
         "fzsd:system/uninstall/uninstall"
     ]
 }