规范了事件系统，完成了实现计分板赋值逻辑

data/fz/advancements/event/on_aviate_one_meter.json

@@ -18,6 +18,6 @@
         }
     },
     "rewards": {
-        "function": "fz:event/on_aviate_one_meter"
+        "function": "fz:event/player/on_aviate_one_meter"
     }
 }

data/fz/advancements/event/on_dead.json

@@ -0,0 +1,23 @@
+{
+    "criteria": {
+        "on_dead": {
+            "trigger": "minecraft:tick",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:entity_scores",
+                        "entity": "this",
+                        "scores": {
+                            "fz.event.death_count": {
+                                "min": 1
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_dead"
+    }
+}

data/fz/advancements/event/on_fished.json

@@ -0,0 +1,15 @@
+{
+    "criteria": {
+        "on_fished": {
+            "trigger": "minecraft:fishing_rod_hooked",
+            "conditions": {
+                "item": {
+                    "tag": "fz:raw_fishes"
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_fished"
+    }
+}

data/fz/advancements/event/on_hurt_entity_with_tools.json

@@ -0,0 +1,19 @@
+{
+    "criteria": {
+        "on_hurt_entity_with_tools": {
+            "trigger": "minecraft:player_hurt_entity",
+            "conditions": {
+                "player": {
+                    "equipment": {
+                        "mainhand": {
+                            "tag": "fz:tools"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_hurt_entity_with_tools"
+    }
+}

data/fz/advancements/event/on_killed_mob_or_player.json

@@ -0,0 +1,27 @@
+{
+    "criteria": {
+        "on_killed_mob_or_player": {
+            "trigger": "minecraft:player_killed_entity",
+            "conditions": {
+                "entity": [
+                    {
+                        "condition": "minecraft:inverted",
+                        "term": {
+                            "condition": "minecraft:entity_properties",
+                            "entity": "this",
+                            "predicate": {
+                                "type": "#fz:ignore_on_player_killed_entity"
+                            }
+                        }
+                    }
+                ],
+                "killing_blow": {
+                    "bypasses_invulnerability": false
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_killed_mob_or_player"
+    }
+}

data/fz/advancements/event/on_login.json

@@ -21,6 +21,6 @@
         }
     },
     "rewards": {
-        "function": "fz:event/on_login"
+        "function": "fz:event/player/on_login"
     }
 }

data/fz/advancements/event/on_piglin_trade.json

@@ -4,12 +4,15 @@
             "trigger": "minecraft:thrown_item_picked_up_by_entity",
             "conditions": {
                 "entity": {
-                    "type": "minecraft:piglin"
+                    "type": "minecraft:piglin",
+                    "flags": {
+                        "is_baby": false
+                    }
                 }
             }
         }
     },
     "rewards": {
-        "function": "fz:event/on_piglin_trade"
+        "function": "fz:event/player/on_piglin_trade"
     }
 }

data/fz/advancements/event/on_placed_block.json

@@ -0,0 +1,10 @@
+{
+    "criteria": {
+        "on_placed_block": {
+            "trigger": "minecraft:placed_block"
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_placed_block"
+    }
+}

data/fz/advancements/event/on_play_one_hour.json

@@ -18,6 +18,6 @@
         }
     },
     "rewards": {
-        "function": "fz:event/on_play_one_hour"
+        "function": "fz:event/player/on_play_one_hour"
     }
 }

data/fz/advancements/event/on_shears_used_on_entity.json

@@ -0,0 +1,18 @@
+{
+    "criteria": {
+        "on_shears_used_on_entity": {
+            "trigger": "minecraft:player_interacted_with_entity",
+            "conditions": {
+                "entity": {
+                    "type": "#fz:shearable"
+                },
+                "item": {
+                    "tag": "fz:tool/shears"
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_shears_used_on_entity"
+    }
+}

data/fz/advancements/event/on_sneak.json

@@ -10,5 +10,8 @@
                 }
             }
         }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_sneak"
     }
 }

data/fz/advancements/event/on_took_damage.json

@@ -1,6 +1,6 @@
 {
     "criteria": {
-        "on_damage_taken": {
+        "on_took_damage": {
             "trigger": "minecraft:tick",
             "conditions": {
                 "player": [
@@ -18,6 +18,6 @@
         }
     },
     "rewards": {
-        "function": "fz:event/on_damage_taken"
+        "function": "fz:event/player/on_took_damage"
     }
 }

data/fz/advancements/event/on_tools_used_on_block.json

@@ -0,0 +1,16 @@
+{
+    "criteria": {
+        "on_tools_used_on_block": {
+            "__comment": "斧子剥树皮会触发两次！",
+            "trigger": "minecraft:item_used_on_block",
+            "conditions": {
+                "item": {
+                    "tag": "fz:tools"
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_tools_used_on_block"
+    }
+}

data/fz/advancements/event/on_unsneak.json

@@ -1,5 +1,5 @@
 {
-    "parent": "fz:sneak",
+    "parent": "fz:event/on_sneak",
     "criteria": {
         "on_unsneak": {
             "trigger": "minecraft:tick",
@@ -11,7 +11,7 @@
                     "type_specific": {
                         "type": "player",
                         "advancements": {
-                            "fz:sneak": true
+                            "fz:event/on_sneak": true
                         }
                     }
                 }
@@ -19,6 +19,6 @@
         }
     },
     "rewards": {
-        "function": "fz:event/on_unsneak"
+        "function": "fz:event/player/on_unsneak"
     }
 }

data/fz/advancements/event/on_used_tool.json

@@ -0,0 +1,19 @@
+{
+    "criteria": {
+        "on_used_tool": {
+            "trigger": "minecraft:tick",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "entity": "this",
+                        "name": "fz:used_tool"
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/player/on_used_tool"
+    }
+}

data/fz/advancements/event/on_villager_trade.json

@@ -5,6 +5,6 @@
         }
     },
     "rewards": {
-        "function": "fz:event/on_villager_trade"
+        "function": "fz:event/player/on_villager_trade"
     }
 }