添加交互器打开方式选项、添加将假人分数忽略的地毯脚本

DEVDOC.md

@@ -5,14 +5,14 @@
 - `函数`，指数据包`<命名空间>/functions`目录下的`.mcfunction`文件
 - `标签`，指数据包`<命名空间>/tags`目录下的`.json`文件
     - `覆盖标签并填入函数`时，`replace`为`true`
-    ```
+    ``` json
     {
         "replace": true,
         "values": ...
     }
     ```
     - `向标签中注册函数`时，`replace`为`false`
-    ```
+    ``` json
     {
         "replace": false,
         "values": ...
@@ -73,7 +73,9 @@
 ### 配置模块
 
 #### 按钮操作
-1. 定义一个显示按钮时执行的函数，使用形如`tellraw @s {"text": "[按钮]", "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set <触发器分数>"}}`的指令定义按钮。**大多数情况下这里的触发器分数必须是独一无二的**
+1. 定义一个显示按钮时执行的函数，使用形如`tellraw @s {"text": "[按钮]", "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set <触发器分数>"}}`的指令定义按钮。
+    - 大多数情况下这里的触发器分数必须是独一无二的
+    - 建议使用`>10000`的随机数作为自定义按钮的触发器分数
 2. 在[`#fz:module/config/display`](data/fz/tags/functions/module/config/display.json)标签中注册上述函数
 3. 定义一个点击按钮时执行的函数，使用形如`execute if score @s fz.module.config.trigger matches <min>..<max> run ...`的指令判断玩家的触发器分数，并执行你的操作
 4. 如需在点击后重新显示一遍配置页面，请在上述函数中调用一次[`#fz:module/config/display`](data/fz/tags/functions/module/config/display.json)标签，**请不要将此标签直接注册到[`#fz:module/config/on_click`](data/fz/tags/functions/module/config/on_click.json)标签中**

data/fz.admin/tags/functions/preset_carpet.json

@@ -2,7 +2,7 @@
     "replace": false,
     "values": [
         {
-            "id": "fz.admin:autocarpet",
+            "id": "fz.admin:preset_carpet",
             "required": true
         }
     ]

data/fz/advancements/game_event/on_aviate_one_meter.json

@@ -19,6 +19,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_aviate_one_meter"
+        "function": "fz:game_event/advancement/on_aviate_one_meter"
     }
 }

data/fz/advancements/game_event/on_dead.json

@@ -19,6 +19,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_dead"
+        "function": "fz:game_event/advancement/on_dead"
     }
 }

data/fz/advancements/game_event/on_entered_nether_portal.json

@@ -1,21 +1,32 @@
 {
+    "parent": "fz:game_event",
     "criteria": {
         "on_entered_nether_portal": {
             "trigger": "minecraft:changed_dimension",
             "conditions": {
-                "player": {
-                    "location": {
-                        "block": {
-                            "blocks": [
-                                "minecraft:nether_portal"
-                            ]
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "location": {
+                                "block": {
+                                    "blocks": [
+                                        "minecraft:nether_portal"
+                                    ]
+                                }
+                            }
                         }
                     }
-                }
+                ]
             }
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_entered_nether_portal"
+        "function": "fz:game_event/advancement/on_entered_nether_portal"
     }
 }

data/fz/advancements/game_event/on_fished.json

@@ -4,6 +4,12 @@
         "on_fished": {
             "trigger": "minecraft:fishing_rod_hooked",
             "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ],
                 "item": {
                     "tag": "fz:raw_fishes"
                 }
@@ -11,6 +17,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_fished"
+        "function": "fz:game_event/advancement/on_fished"
     }
 }

data/fz/advancements/game_event/on_hurt_entity_with_tools.json

@@ -4,17 +4,27 @@
         "on_hurt_entity_with_tools": {
             "trigger": "minecraft:player_hurt_entity",
             "conditions": {
-                "player": {
-                    "equipment": {
-                        "mainhand": {
-                            "tag": "fz:tools"
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "equipment": {
+                                "mainhand": {
+                                    "tag": "fz:tools"
+                                }
+                            }
                         }
                     }
-                }
+                ]
             }
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_hurt_entity_with_tools"
+        "function": "fz:game_event/advancement/on_hurt_entity_with_tools"
     }
 }

data/fz/advancements/game_event/on_killed_mob_or_player.json

@@ -4,6 +4,12 @@
         "on_killed_mob_or_player": {
             "trigger": "minecraft:player_killed_entity",
             "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ],
                 "entity": [
                     {
                         "condition": "minecraft:inverted",
@@ -23,6 +29,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_killed_mob_or_player"
+        "function": "fz:game_event/advancement/on_killed_mob_or_player"
     }
 }

data/fz/advancements/game_event/on_login.json

@@ -22,6 +22,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_login"
+        "function": "fz:game_event/advancement/on_login"
     }
 }

data/fz/advancements/game_event/on_piglin_trade.json

@@ -4,6 +4,12 @@
         "on_piglin_trade": {
             "trigger": "minecraft:thrown_item_picked_up_by_entity",
             "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ],
                 "entity": {
                     "type": "minecraft:piglin",
                     "flags": {
@@ -14,6 +20,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_piglin_trade"
+        "function": "fz:game_event/advancement/on_piglin_trade"
     }
 }

data/fz/advancements/game_event/on_placed_block.json

@@ -2,10 +2,18 @@
     "parent": "fz:game_event",
     "criteria": {
         "on_placed_block": {
-            "trigger": "minecraft:placed_block"
+            "trigger": "minecraft:placed_block",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ]
+            }
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_placed_block"
+        "function": "fz:game_event/advancement/on_placed_block"
     }
 }

data/fz/advancements/game_event/on_play_one_hour.json

@@ -19,6 +19,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_play_one_hour"
+        "function": "fz:game_event/advancement/on_play_one_hour"
     }
 }

data/fz/advancements/game_event/on_shears_used_on_entity.json

@@ -4,6 +4,12 @@
         "on_shears_used_on_entity": {
             "trigger": "minecraft:player_interacted_with_entity",
             "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ],
                 "entity": {
                     "type": "#fz:shearable"
                 },
@@ -14,6 +20,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_shears_used_on_entity"
+        "function": "fz:game_event/advancement/on_shears_used_on_entity"
     }
 }

data/fz/advancements/game_event/on_sneak.json

@@ -4,15 +4,25 @@
         "on_sneak": {
             "trigger": "minecraft:tick",
             "conditions": {
-                "player": {
-                    "flags": {
-                        "is_sneaking": true
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "flags": {
+                                "is_sneaking": true
+                            }
+                        }
                     }
-                }
+                ]
             }
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_sneak"
+        "function": "fz:game_event/advancement/on_sneak"
     }
 }

data/fz/advancements/game_event/on_took_damage.json

@@ -19,6 +19,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_took_damage"
+        "function": "fz:game_event/advancement/on_took_damage"
     }
 }

data/fz/advancements/game_event/on_tools_used_on_block.json

@@ -5,6 +5,12 @@
             "__comment": "斧子剥树皮会触发两次！",
             "trigger": "minecraft:item_used_on_block",
             "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ],
                 "item": {
                     "tag": "fz:tools"
                 }
@@ -12,6 +18,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_tools_used_on_block"
+        "function": "fz:game_event/advancement/on_tools_used_on_block"
     }
 }

data/fz/advancements/game_event/on_unsneak.json

@@ -4,21 +4,31 @@
         "on_unsneak": {
             "trigger": "minecraft:tick",
             "conditions": {
-                "player": {
-                    "flags": {
-                        "is_sneaking": false
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
                     },
-                    "type_specific": {
-                        "type": "player",
-                        "advancements": {
-                            "fz:game_event/on_sneak": true
+                    {
+                        "condition": "minecraft:entity_properties",
+                        "entity": "this",
+                        "predicate": {
+                            "flags": {
+                                "is_sneaking": false
+                            },
+                            "type_specific": {
+                                "type": "player",
+                                "advancements": {
+                                    "fz:game_event/on_sneak": true
+                                }
+                            }
                         }
                     }
-                }
+                ]
             }
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_unsneak"
+        "function": "fz:game_event/advancement/on_unsneak"
     }
 }

data/fz/advancements/game_event/on_used_tool.json

@@ -15,6 +15,6 @@
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_used_tool"
+        "function": "fz:game_event/advancement/on_used_tool"
     }
 }

data/fz/advancements/game_event/on_villager_trade.json

@@ -2,10 +2,18 @@
     "parent": "fz:game_event",
     "criteria": {
         "on_villager_trade": {
-            "trigger": "minecraft:villager_trade"
+            "trigger": "minecraft:villager_trade",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fz:is_real_player"
+                    }
+                ]
+            }
         }
     },
     "rewards": {
-        "function": "fz:game_event/player/on_villager_trade"
+        "function": "fz:game_event/advancement/on_villager_trade"
     }
 }

data/fz/advancements/module/interactor.json

@@ -0,0 +1,7 @@
+{
+    "criteria": {
+        "interactor": {
+            "trigger": "minecraft:impossible"
+        }
+    }
+}

data/fz/advancements/module/interactor/on_click.json

@@ -0,0 +1,25 @@
+{
+    "parent": "fz:module/interactor",
+    "criteria": {
+        "on_click": {
+            "trigger": "minecraft:tick",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:inverted",
+                        "term": {
+                            "condition": "minecraft:entity_scores",
+                            "entity": "this",
+                            "scores": {
+                                "fz.module.interactor.trigger": 0
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:module/interactor/event/on_click"
+    }
+}

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

@@ -0,0 +1,7 @@
+# 调用者：advancements/fz:~
+
+execute if predicate fz:is_real_player run function fz:game_event/player/on_aviate_one_meter
+
+## 重置事件
+scoreboard players operation @s fz.event.aviating_distance %= 200 fz.variable.integer
+advancement revoke @s only fz:game_event/on_aviate_one_meter

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

@@ -0,0 +1,7 @@
+# 调用者：advancements/fz:~
+
+execute if predicate fz:is_real_player run function fz:game_event/player/on_dead
+
+## 重置事件
+scoreboard players set @s fz.event.death_count 0
+advancement revoke @s only fz:game_event/on_dead

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

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

data/fz/functions/game_event/advancement/on_login.mcfunction

@@ -0,0 +1,7 @@
+# 调用者：advancements/fz:~
+
+execute if predicate fz:is_real_player run function fz:game_event/player/on_login
+
+## 重制所有触发器、事件进度
+scoreboard players set @s fz.event.leave_game 0
+function #fz:game_event/reset_all

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

@@ -0,0 +1,7 @@
+# 调用者：advancements/fz:~
+
+execute if predicate fz:is_real_player run function fz:game_event/player/on_play_one_hour
+
+## 重置事件
+scoreboard players operation @s fz.event.play_ticks %= 72000 fz.variable.integer
+advancement revoke @s only fz:game_event/on_play_one_hour

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

@@ -0,0 +1,7 @@
+# 调用者：advancements/fz:~
+
+execute if predicate fz:is_real_player run function fz:game_event/player/on_took_damage
+
+## 重置事件
+scoreboard players operation @s fz.event.damage_taken %= 10 fz.variable.integer
+advancement revoke @s only fz:game_event/on_took_damage

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

@@ -0,0 +1,9 @@
+# 调用者：advancements/fz:~
+
+execute if predicate fz:is_real_player run function fz:game_event/player/on_used_tool
+
+## 重置事件计分板
+function #fz:game_event/player/on_used_tool/reset_used_tool
+
+## 重置事件进度
+advancement revoke @s only fz:game_event/on_used_tool

data/fz/functions/game_event/advancement/reset_advancements.mcfunction

@@ -3,4 +3,4 @@
 advancement revoke @s from fz:game_event
 
 ## 调试
-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": "的所有事件进度"}]
+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": "的游戏事件进度"}]

data/fz/functions/game_event/carpet_player/tick/tick.mcfunction

@@ -0,0 +1 @@
+scoreboard players remove @s fz.event.play_ticks 1

data/fz/functions/game_event/load.mcfunction

@@ -1,4 +1,4 @@
-execute as @a run function #fz:game_event/reset_all
+execute as @a run function #fz:game_event/player/on_login
 
 ## 调试
 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "已加载系统组件：游戏事件"}]

data/fz/functions/game_event/player/on_aviate_one_meter.mcfunction

@@ -1,15 +1,9 @@
-# 调用者：advancements/fz:~
-
 ## 详细
 execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "飞行了1m"}]
 
-## 将事件数据缓存，并重置事件计分板
+## 将事件数据缓存
 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
-scoreboard players operation @s fz.event.aviating_distance %= 200 fz.variable.integer
 
 ## 运行事件
 function #fz:game_event/player/on_aviate_one_meter
-
-## 重置事件进度 
-advancement revoke @s only fz:game_event/on_aviate_one_meter

data/fz/functions/game_event/player/on_broke_block.mcfunction

@@ -3,38 +3,5 @@
 ## 调试
 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": "挖掘了方块"}]
 
-## 收集挖掘数据
-scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.used_tool.diamond_axe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_hoe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_pickaxe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_shovel
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_sword
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_axe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_hoe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_pickaxe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_shovel
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_sword
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_axe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_hoe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_pickaxe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_shovel
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_sword
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_axe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_hoe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_pickaxe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_shovel
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_sword
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.shears
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_axe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_hoe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_pickaxe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_shovel
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_sword
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_axe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_hoe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_pickaxe
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_shovel
-scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_sword
-
 ## 运行事件
 function #fz:game_event/player/on_broke_block

data/fz/functions/game_event/player/on_broke_block/on_used_tool.mcfunction

@@ -0,0 +1,36 @@
+## 收集挖掘数据
+scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.used_tool.diamond_axe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_hoe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_pickaxe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_shovel
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.diamond_sword
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_axe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_hoe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_pickaxe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_shovel
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.golden_sword
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_axe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_hoe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_pickaxe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_shovel
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.iron_sword
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_axe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_hoe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_pickaxe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_shovel
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.netherite_sword
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.shears
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_axe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_hoe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_pickaxe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_shovel
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.stone_sword
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_axe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_hoe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_pickaxe
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_shovel
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.wooden_sword
+scoreboard players operation fz.var.score fz.variable.integer += @s fz.event.used_tool.offset
+
+## 判断分数
+execute unless score fz.var.score fz.variable.integer matches ..0 run function fz:game_event/player/on_broke_block

data/fz/functions/game_event/player/on_dead.mcfunction

@@ -1,14 +1,8 @@
-# 调用者：advancements/fz:~
-
 ## 调试
 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": "死亡"}]
 
-## 将事件数据缓存，并重置事件计分板
+## 将事件数据缓存
 # scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.death_count
-scoreboard players set @s fz.event.death_count 0
 
 ## 运行事件
 function #fz:game_event/player/on_dead
-
-## 重置事件进度
-advancement revoke @s only fz:game_event/on_dead

data/fz/functions/game_event/player/on_login.mcfunction

@@ -1,10 +1,5 @@
-# 调用者：advancements/fz:~
-
 ## 调试
 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": "登录游戏"}]
 
-scoreboard players set @s fz.event.leave_game 0
-
 ## 运行事件
-### 会调用reset_events标签，故本函数内不需要再重置事件进度
 function #fz:game_event/player/on_login

data/fz/functions/game_event/player/on_play_one_hour.mcfunction

@@ -1,15 +1,9 @@
-# 调用者：advancements/fz:~
-
 ## 调试
 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": "游玩了1h"}]
 
-## 将事件数据缓存，并重置事件计分板
+## 将事件数据缓存
 # scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.play_ticks
 # scoreboard players operation fz.var.score fz.variable.integer /= 3600 fz.variable.integer
-scoreboard players operation @s fz.event.play_ticks %= 72000 fz.variable.integer
 
 ## 运行事件
 function #fz:game_event/player/on_play_one_hour
-
-## 重置事件进度
-advancement revoke @s only fz:game_event/on_play_one_hour

data/fz/functions/game_event/player/on_took_damage.mcfunction

@@ -1,15 +1,9 @@
-# 调用者：advancements/fz:~
-
 ## 调试
 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": "受到了伤害"}]
 
-## 将事件数据缓存，并重置事件计分板
+## 将事件数据缓存
 scoreboard players operation fz.var.score fz.variable.integer = @s fz.event.damage_taken
 scoreboard players operation fz.var.score fz.variable.integer /= 10 fz.variable.integer
-scoreboard players operation @s fz.event.damage_taken %= 10 fz.variable.integer
 
 ## 运行事件
 function #fz:game_event/player/on_took_damage
-
-## 重置事件进度
-advancement revoke @s only fz:game_event/on_took_damage

data/fz/functions/game_event/player/on_used_tool.mcfunction

@@ -1,18 +1,5 @@
-# 调用者：advancements/fz:~
-
 ## 详细
 execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}]
 
 ## 运行事件
 function #fz:game_event/player/on_used_tool
-
-## 判断并触发挖掘事件
-### 挖掘偏移量可以被fz:game_event/[on_tools_used_on_block, on_shears_used_on_entity, on_hurt_entity_with_tools]改变
-### 用于忽略非挖掘事件造成的工具使用分数
-execute unless score @s fz.event.used_tool.offset matches ..-1 run function fz:game_event/player/on_broke_block
-
-## 重置事件计分板
-function #fz:game_event/player/on_used_tool/reset_used_tool
-
-## 重置事件进度
-advancement revoke @s only fz:game_event/on_used_tool

data/fz/functions/module/interactor/event/on_click.mcfunction

@@ -0,0 +1,5 @@
+## 运行事件
+function #fz:module/interactor/event/on_click/on_click
+
+## 重置进度
+advancement revoke @s only fz:module/interactor/on_click

data/fz/functions/module/interactor/event/on_unsneak.mcfunction

@@ -1,3 +0,0 @@
-# 本目录用于存放向事件中注册的函数，并不用来新建事件
-
-execute if entity @s[x_rotation = -90] run function #fz:module/interactor/on_interact

data/fz/functions/module/interactor/event/on_unsneak/on_unsneak.mcfunction

@@ -0,0 +1,3 @@
+# 本目录用于存放向事件中注册的函数，并不用来新建事件
+
+execute if score @s fz.module.interactor.player.config matches 1 if entity @s[x_rotation = -90] run function #fz:module/interactor/display

data/fz/functions/module/interactor/event/reset_advancements.mcfunction

@@ -1,2 +1,4 @@
 ## 调试
-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": "触发了配置页面"}]
+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": "重置了交互器事件进度"}]
+
+advancement revoke @s from fz:module/interactor/on_click

data/fz/functions/module/interactor/install.mcfunction

@@ -1,4 +1,5 @@
 scoreboard objectives add fz.module.interactor.trigger trigger
+scoreboard objectives add fz.module.interactor.player.config dummy
 
 ## 标记为已安装
 data modify storage fz:installed fz.module.interactor set value 1b

data/fz/functions/module/interactor/interactor/display.mcfunction

@@ -0,0 +1,7 @@
+## 调试
+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": "显示了交互器"}]
+
+execute if data storage fz:installed fz.module{last_death:1b} run tellraw @s {"text": "交互器打开方式："}
+
+execute if data storage fz:installed fz.module{last_death:1b} if score @s fz.module.interactor.player.config matches 1 run tellraw @s [{"text": "- 抬头+蹲起："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 900"}},{"text": "已开启", "color": "green"},{"text": "]"}]]
+execute if data storage fz:installed fz.module{last_death:1b} unless score @s fz.module.interactor.player.config matches 1 run tellraw @s [{"text": "- 抬头+蹲起："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击开启"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 910"}},{"text": "已关闭", "color": "red"},{"text": "]"}]]

data/fz/functions/module/interactor/interactor/on_click.mcfunction

@@ -0,0 +1,8 @@
+# 调用者：#fz:module/interactor/on_click
+
+## 调试
+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.interactor.trigger"}}]
+
+execute if score @s fz.module.interactor.trigger matches 900 run scoreboard players set @s fz.module.interactor.player.config 0
+
+execute if score @s fz.module.interactor.trigger matches 910 run scoreboard players set @s fz.module.interactor.player.config 1

data/fz/functions/module/interactor/load.mcfunction

@@ -1,4 +1,3 @@
-schedule clear fz:module/interactor/loop
 execute as @a run function #fz:module/interactor/reset_trigger
 
 ## 日志

data/fz/functions/module/interactor/loop.mcfunction

@@ -1,6 +0,0 @@
-# 调用者：fz:module/interactor/trigger
-
-## 如果分数大于0说明玩家点击了按钮
-execute as @a if score @s fz.module.interactor.trigger matches 1.. run function #fz:module/interactor/on_click/on_click
-
-schedule function fz:module/interactor/loop 1t replace

data/fz/functions/module/interactor/on_click.mcfunction

@@ -1,4 +0,0 @@
-# 调用者：#fz:module/interactor/on_click
-
-## 调试
-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.interactor.trigger"}}]

data/fz/functions/module/interactor/reset_timeout.mcfunction

@@ -1,2 +0,0 @@
-## 设置或重制超时时间
-schedule function #fz:module/interactor/timeout 300s replace

data/fz/functions/module/interactor/timeout.mcfunction

@@ -1,4 +0,0 @@
-schedule clear fz:module/interactor/loop
-
-## 日志
-execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "五分钟无人回应，已关闭配置按钮监听，再次使用时需重新唤起"}]

data/fz/functions/module/scoreboard/interactor/display.mcfunction

@@ -1,3 +1,5 @@
 # 调用者：#fz:module/scoreboard/interactor/display
 
+execute if data storage fz:installed fz.module{scoreboard:1b} run tellraw @s {"text": "计分板："}
+
 execute if data storage fz:installed fz.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.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.interactor.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.interactor.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.interactor.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.interactor.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.interactor.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.interactor.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.interactor.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.interactor.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.interactor.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.interactor.trigger set 1100"}}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "]"}]]

data/fz/functions/module/scoreboard/interactor/display/1.mcfunction

@@ -1,3 +0,0 @@
-# 调用者：#fz:module/scoreboard/interactor/display
-
-execute if data storage fz:installed fz.module{scoreboard:1b} run tellraw @s {"text": "计分板："}

data/fz/functions/system/carpet/try_load_fzsd_ignore_fakeplayer_scores.mcfunction

@@ -0,0 +1 @@
+script run if (system_info('app_list') ~ 'fzsd_ignore_fakeplayer_scores' == null, run('script load fzsd_ignore_fakeplayer_scores'))

data/fz/functions/system/entry.mcfunction

@@ -1,5 +1,5 @@
 
-
+function fz:system/carpet/try_load_fzsd_ignore_fakeplayer_scores
 function #fz:uninstall
 function #fz:install
 function #fz:load

data/fz/functions/system/tick.mcfunction

@@ -0,0 +1 @@
+execute as @a if predicate fz:not_real_player run function #fz:game_event/carpet_player/tick

data/fz/predicates/is_fake_player.json

@@ -0,0 +1,7 @@
+{
+    "condition": "minecraft:entity_properties",
+    "entity": "this",
+    "predicate": {
+        "team": "fake"
+    }
+}

data/fz/predicates/is_real_player.json

@@ -0,0 +1,7 @@
+{
+    "condition": "minecraft:inverted",
+    "term": {
+        "condition": "minecraft:reference",
+        "name": "fz:not_real_player"
+    }
+}

data/fz/predicates/is_shadow_player.json

@@ -0,0 +1,7 @@
+{
+    "condition": "minecraft:entity_properties",
+    "entity": "this",
+    "predicate": {
+        "team": "shadow"
+    }
+}

data/fz/predicates/not_real_player.json

@@ -0,0 +1,13 @@
+{
+    "condition": "minecraft:alternative",
+    "terms": [
+        {
+            "condition": "minecraft:reference",
+            "name": "fz:is_fake_player"
+        },
+        {
+            "condition": "minecraft:reference",
+            "name": "fz:is_shadow_player"
+        }
+    ]
+}

data/fz/tags/functions/game_event/advancement/reset_advancements.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:game_event/advancement/reset_advancements"
+    ]
+}

data/fz/tags/functions/game_event/carpet_player/tick.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:game_event/carpet_player/tick/tick"
+    ]
+}

data/fz/tags/functions/game_event/player/on_login.json

@@ -1,7 +1,9 @@
 {
     "replace": false,
     "values": [
-        "#fz:game_event/reset_all",
-        "#fz:module/interactor/reset_trigger"
+        "#fz:game_event/advancement/reset_advancements",
+        "#fz:game_event/player/on_used_tool/reset_used_tool",
+        "#fz:module/interactor/reset_trigger",
+        "#fz:module/interactor/event/reset_advancements"
     ]
 }

data/fz/tags/functions/game_event/player/on_unsneak.json

@@ -2,6 +2,6 @@
     "__comment": "调用者：fz:game_event/on_unsneaked，当玩家蹲起后触发此事件",
     "replace": false,
     "values": [
-        "fz:module/interactor/event/on_unsneak"
+        "fz:module/interactor/event/on_unsneak/on_unsneak"
     ]
 }

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

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        
+        "fz:game_event/player/on_broke_block/on_used_tool"
     ]
 }

data/fz/tags/functions/game_event/player/reset_advancements.json

@@ -1,6 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fz:game_event/player/reset_advancements"
-    ]
-}

data/fz/tags/functions/game_event/reset_all.json

@@ -1,7 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "#fz:game_event/player/reset_advancements",
-        "#fz:game_event/player/on_used_tool/reset_used_tool"
-    ]
-}

data/fz/tags/functions/module/interactor/display.json

@@ -2,6 +2,7 @@
     "__comment": "调用者：fz:module/interactor/on_click、fz:module/interactor/trigger",
     "replace": false,
     "values": [
+        "fz:module/interactor/interactor/display",
         "#fz:module/scoreboard/interactor/display",
         "#fz:module/here/interactor/display",
         "#fz:module/last_death/interactor/display",

data/fz/tags/functions/module/interactor/event/on_click.json

@@ -1,7 +1,7 @@
 {
     "replace": false,
     "values": [
-        "fz:module/interactor/on_click",
+        "fz:module/interactor/interactor/on_click",
         "#fz:module/scoreboard/interactor/on_click",
         "#fz:module/here/interactor/on_click",
         "#fz:module/last_death/interactor/on_click",

data/fz/tags/functions/module/interactor/event/on_click/on_click.json

@@ -1,8 +1,8 @@
 {
     "replace": false,
     "values": [
+        "#fz:module/interactor/event/on_click",
         "#fz:module/interactor/display",
-        "#fz:module/interactor/on_click",
         "#fz:module/interactor/reset_trigger"
     ]
 }

data/fz/tags/functions/module/interactor/event/reset_advancements.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:module/interactor/event/reset_advancements"
+    ]
+}

data/fz/tags/functions/module/interactor/on_interact.json

@@ -1,9 +0,0 @@
-{
-    "__comment": "调用者：fz:event/on_unsneak，当玩家抬头到最高角度并蹲起后，触发此事件",
-    "replace": false,
-    "values": [
-        "fz:module/interactor/on_interact",
-        "fz:module/interactor/loop",
-        "#fz:module/interactor/display"
-    ]
-}

data/fz/tags/functions/module/scoreboard/interactor/display.json

@@ -1,7 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fz:module/scoreboard/interactor/display/1",
-        "fz:module/scoreboard/interactor/display/2"
+        "fz:module/scoreboard/interactor/display"
     ]
 }

data/minecraft/tags/functions/load.json

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fz:entry"
+        "fz:system/entry"
     ]
 }

data/minecraft/tags/functions/tick.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:system/tick"
+    ]
+}

scripts/fzsd_ignore_fakeplayer_scores.sc

@@ -0,0 +1,77 @@
+// 计分板模块扩展插件
+// 忽略假人分数
+// **请勿修改文件名！！**
+global_app_version = '1.0-beta.1';
+
+__config() -> {
+    'scope' -> 'global',
+    'requires' -> {
+        'carpet' -> '>=1.4.45',
+        'minecraft' -> '>=1.17'
+    }
+};
+
+__on_start() -> (
+    global_team_cache = read_file('team_cache', 'json');
+    debug(global_team_cache);
+    team_add('fake');
+    team_add('shadow');
+    print(player('all'), '已忽略计分板模块假人分数');
+);
+
+__on_close() -> (
+    debug(global_team_cache);
+    delete_file('team_cache', 'json');
+    write_file('team_cache', 'json', global_team_cache);
+);
+
+__on_player_connects(player) -> (
+    debug(player ~ 'name');
+    debug(player ~ 'player_type');
+    debug(player ~ 'team');
+    debug(global_team_cache);
+    if (player ~ 'player_type' == 'fake' && player ~ 'team' != 'fake',
+        (
+            global_team_cache:(player ~ 'name') = player ~ 'team';
+            team_add('fake', player);
+        ),
+        player ~ 'player_type' == 'shadow' && player ~ 'team' != 'shadow',
+        (
+            global_team_cache:(player ~ 'name') = player ~ 'team';
+            team_add('shadow', player);
+        ),
+        if (player ~ 'team' == 'fake' 
+                || player ~ 'team' == 'shadow',
+            if (global_team_cache:(player ~ 'name') != null,
+                (
+                    team_add(global_team_cache:(player ~ 'name'), player);
+                    delete(global_team_cache, player);
+                ),
+                team_leave(player);
+            );
+        );
+    );
+);
+
+__on_player_disconnects(player, reason) -> (
+    debug(player ~ 'name');
+    debug(player ~ 'player_type');
+    debug(player ~ 'team');
+    debug(global_team_cache);
+    if (player ~ 'team' == 'fake' 
+            || player ~ 'team' == 'shadow',
+        debug(global_team_cache);
+        if (global_team_cache:(player ~ 'name') != null,
+            (
+                team_add(global_team_cache:(player ~ 'name') , player);
+                delete(global_team_cache:(player ~ 'name'));
+            ),
+            team_leave(player);
+        );
+    );
+);
+
+debug(msg) -> (
+    logger('debug', msg);
+    return();
+);