Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1

data/fzsd/advancement/game_event/on_placed_block/on_placed_liquid.json

@@ -13,7 +13,7 @@
                         "condition": "minecraft:location_check",
                         "predicate": {
                             "block": {
-                                "blocks": "#fzsd:liquid"
+                                "blocks": "#fzsd:placed_liquid_ignore"
                             }
                         }
                     }

data/fzsd/advancement/game_event/on_placed_block/on_placed_solid.json

@@ -16,7 +16,7 @@
                             "condition": "minecraft:location_check",
                             "predicate": {
                                 "block": {
-                                    "blocks": "#fzsd:liquid"
+                                    "blocks": "#fzsd:placed_liquid_ignore"
                                 }
                             }
                         }

data/fzsd/advancements/game_event/on_placed_block/on_placed_liquid.json

@@ -13,7 +13,7 @@
                         "condition": "minecraft:location_check",
                         "predicate": {
                             "block": {
-                                "tag": "fzsd:liquid"
+                                "tag": "fzsd:placed_liquid_ignore"
                             }
                         }
                     }

data/fzsd/advancements/game_event/on_placed_block/on_placed_solid.json

@@ -16,7 +16,7 @@
                             "condition": "minecraft:location_check",
                             "predicate": {
                                 "block": {
-                                    "tag": "fzsd:liquid"
+                                    "tag": "fzsd:placed_liquid_ignore"
                                 }
                             }
                         }

data/fzsd/function/module/scoreboard/assign/scoreboard/piglin_trade_count.mcfunction

@@ -0,0 +1 @@
+execute if data storage fzsd:module fzsd.module.scoreboard.config{trade_count_includes_piglin:1b} run function fzsd:module/scoreboard/assign/scoreboard/trade_count

data/fzsd/tags/block/placed_liquid_ignore.json

@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:liquid",
+        "minecraft:powder_snow"
+    ]
+}

data/fzsd/tags/function/module/scoreboard/assign/scoreboard/general.json

@@ -0,0 +1,15 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:module/scoreboard/assign/scoreboard/general/activation",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/aviating_distance",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/bedrock_broke_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/damage_taken",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/death_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/dig_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/fishing_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/kill_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/placement_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/trade_count"
+    ]
+}

scripts/fzsd_score.sc

@@ -46,7 +46,8 @@ global_current_scoreboard_list =  [
 global_generals_old = {
     'fzsd.module.scoreboard.display.damage_taken' -> '总受伤害量',
     'fzsd.module.scoreboard.display.dig_count' -> '总挖掘量',
-    'fzsd.module.scoreboard.display.placement_count' -> '总放置方块数',
+    'fzsd.module.scoreboard.display.placement_count' -> '总方块放置数',
+    'fzsd.module.scoreboard.display.death_count' -> '总死亡次数',
     'fzsd.module.scoreboard.display.trade_count' -> '总交易量'
 };
 global_current_generals = {