From 6852545faf71bfaa0225bf64cf2c419c162b1fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <1214946206@qq.com>
Date: Sun, 3 Jul 2022 06:27:45 +0800
Subject: [PATCH] dev.202207030626

---
 data/fz/advancements/piglin_trade.json        | 15 +++++++++++++
 data/fz/advancements/play_one_min.json        | 20 +++++++++++++++++
 data/fz/advancements/villager_trade.json      | 10 +++++++++
 .../event/on_piglin_trade.mcfunction          |  2 ++
 data/fz/functions/event/on_unsneak.mcfunction |  2 +-
 .../event/on_villager_trade.mcfunction        |  2 ++
 ...rigger.mcfunction => on_config.mcfunction} |  2 +-
 .../assign/create_scoreboards.mcfunction      | 15 +++++++++++++
 .../custom_total_name/trade_count.mcfunction  |  2 ++
 .../assign/set_display/trade_count.mcfunction |  3 +++
 .../set_display/placement_count.mcfunction    | 22 +++++++++++++++++++
 .../try_display/placement_count.mcfunction    |  1 +
 ...function => create_scoreboards.mcfunction} |  9 ++++----
 .../scoreboard/display/register_id.mcfunction |  6 ++++-
 .../set_text/placement_count/aqua.mcfunction  |  7 ++++++
 .../set_text/placement_count/black.mcfunction |  7 ++++++
 .../set_text/placement_count/blue.mcfunction  |  7 ++++++
 .../placement_count/dark_aqua.mcfunction      |  7 ++++++
 .../placement_count/dark_blue.mcfunction      |  7 ++++++
 .../placement_count/dark_gray.mcfunction      |  7 ++++++
 .../placement_count/dark_green.mcfunction     |  7 ++++++
 .../placement_count/dark_purple.mcfunction    |  7 ++++++
 .../placement_count/dark_red.mcfunction       |  7 ++++++
 .../set_text/placement_count/gold.mcfunction  |  7 ++++++
 .../set_text/placement_count/gray.mcfunction  |  7 ++++++
 .../set_text/placement_count/green.mcfunction |  7 ++++++
 .../placement_count/light_purple.mcfunction   |  7 ++++++
 .../set_text/placement_count/red.mcfunction   |  7 ++++++
 .../set_text/placement_count/white.mcfunction |  7 ++++++
 .../placement_count/yellow.mcfunction         |  7 ++++++
 .../module/scoreboard/install.mcfunction      |  7 ++++--
 .../module/scoreboard/load.mcfunction         |  9 ++++----
 .../config/on_config.json}                    |  2 +-
 .../event/module/scoreboard/on_trade.json     |  6 +++++
 .../on_piglin_trade.json}                     |  2 +-
 .../functions/event/on_villager_trade.json    |  6 +++++
 .../config/{trigger.json => on_config.json}   |  2 +-
 .../custom_total_name/trade_count.json        |  6 +++++
 .../assign/set_display/trade_count.json       |  6 +++++
 .../display/carousel/try_display.json         |  1 +
 .../carousel/try_display/placement_count.json |  6 +++++
 .../module/scoreboard/display/set_text.json   |  3 ++-
 .../display/set_text/placement_count.json     |  6 +++++
 43 files changed, 267 insertions(+), 18 deletions(-)
 create mode 100644 data/fz/advancements/piglin_trade.json
 create mode 100644 data/fz/advancements/play_one_min.json
 create mode 100644 data/fz/advancements/villager_trade.json
 create mode 100644 data/fz/functions/event/on_piglin_trade.mcfunction
 create mode 100644 data/fz/functions/event/on_villager_trade.mcfunction
 rename data/fz/functions/module/config/{trigger.mcfunction => on_config.mcfunction} (93%)
 create mode 100644 data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/carousel/try_display/placement_count.mcfunction
 rename data/fz/functions/module/scoreboard/display/{create.mcfunction => create_scoreboards.mcfunction} (88%)
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/aqua.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/blue.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_aqua.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_blue.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_gray.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_green.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_purple.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_red.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/gold.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/gray.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/green.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/light_purple.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/red.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/white.mcfunction
 create mode 100644 data/fz/functions/module/scoreboard/display/set_text/placement_count/yellow.mcfunction
 rename data/fz/tags/functions/event/{config/on_trigger.json => module/config/on_config.json} (81%)
 create mode 100644 data/fz/tags/functions/event/module/scoreboard/on_trade.json
 rename data/fz/tags/functions/{module/scoreboard/display/create.json => event/on_piglin_trade.json} (50%)
 create mode 100644 data/fz/tags/functions/event/on_villager_trade.json
 rename data/fz/tags/functions/module/config/{trigger.json => on_config.json} (55%)
 create mode 100644 data/fz/tags/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.json
 create mode 100644 data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json
 create mode 100644 data/fz/tags/functions/module/scoreboard/display/carousel/try_display/placement_count.json
 create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/placement_count.json

diff --git a/data/fz/advancements/piglin_trade.json b/data/fz/advancements/piglin_trade.json
new file mode 100644
index 0000000..6fedb96
--- /dev/null
+++ b/data/fz/advancements/piglin_trade.json
@@ -0,0 +1,15 @@
+{
+    "criteria": {
+        "piglin_trade": {
+            "trigger": "minecraft:thrown_item_picked_up_by_entity",
+            "conditions": {
+                "entity": {
+                    "type": "minecraft:piglin"
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:event/on_piglin_trade"
+    }
+}
\ No newline at end of file
diff --git a/data/fz/advancements/play_one_min.json b/data/fz/advancements/play_one_min.json
new file mode 100644
index 0000000..f25ba92
--- /dev/null
+++ b/data/fz/advancements/play_one_min.json
@@ -0,0 +1,20 @@
+{
+    "criteria": {
+        "play_one_min": {
+            "trigger": "minecraft:tick",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:entity_scores",
+                        "entity": "this",
+                        "scores": {
+                            "fz.module.scoreboard.assign.activation": {
+                                "min": 
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/fz/advancements/villager_trade.json b/data/fz/advancements/villager_trade.json
new file mode 100644
index 0000000..058bb49
--- /dev/null
+++ b/data/fz/advancements/villager_trade.json
@@ -0,0 +1,10 @@
+{
+    "criteria": {
+        "villager_trade": {
+            "trigger": "minecraft:villager_trade"
+        }
+    },
+    "rewards": {
+        "function": "fz:event/on_villager_trade"
+    }
+}
\ No newline at end of file
diff --git a/data/fz/functions/event/on_piglin_trade.mcfunction b/data/fz/functions/event/on_piglin_trade.mcfunction
new file mode 100644
index 0000000..ae4c7d5
--- /dev/null
+++ b/data/fz/functions/event/on_piglin_trade.mcfunction
@@ -0,0 +1,2 @@
+function #fz:event/on_piglin_trade
+advancement revoke @s only fz:piglin_trade
\ No newline at end of file
diff --git a/data/fz/functions/event/on_unsneak.mcfunction b/data/fz/functions/event/on_unsneak.mcfunction
index 789980e..b45cab2 100644
--- a/data/fz/functions/event/on_unsneak.mcfunction
+++ b/data/fz/functions/event/on_unsneak.mcfunction
@@ -6,7 +6,7 @@ execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @
 
 ## 运行事件
 function #fz:event/on_unsneak
-execute if entity @s[x_rotation = -90] run function #fz:event/config/on_trigger
+execute if entity @s[x_rotation = -90] run function #fz:event/module/config/on_config
 
 ## 复位进度触发器
 advancement revoke @s until fz:unsneak
\ No newline at end of file
diff --git a/data/fz/functions/event/on_villager_trade.mcfunction b/data/fz/functions/event/on_villager_trade.mcfunction
new file mode 100644
index 0000000..9680929
--- /dev/null
+++ b/data/fz/functions/event/on_villager_trade.mcfunction
@@ -0,0 +1,2 @@
+function #fz:event/on_villager_trade
+advancement revoke @s only fz:villager_trade
\ No newline at end of file
diff --git a/data/fz/functions/module/config/trigger.mcfunction b/data/fz/functions/module/config/on_config.mcfunction
similarity index 93%
rename from data/fz/functions/module/config/trigger.mcfunction
rename to data/fz/functions/module/config/on_config.mcfunction
index d2e8b3c..257fa43 100644
--- a/data/fz/functions/module/config/trigger.mcfunction
+++ b/data/fz/functions/module/config/on_config.mcfunction
@@ -1,4 +1,4 @@
-# 调用者：#fz:module/config/trigger
+# 调用者：#fz:module/config/on_config
 ##### 玩家抬头到最高角度并蹲起后，触发此函数
 
 ## 调试
diff --git a/data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction b/data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction
new file mode 100644
index 0000000..f15df0c
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/assign/create_scoreboards.mcfunction
@@ -0,0 +1,15 @@
+# 源计分板
+## 总榜
+scoreboard objectives add fz.module.scoreboard.assign.general dummy
+
+### 活跃度
+scoreboard objectives add fz.module.scoreboard.assign.activation minecraft.custom:play_time
+
+### 飞行距离
+scoreboard objectives add fz.module.scoreboard.assign.aviating_distance minecraft.custom:aviate_one_cm
+
+### 抖M榜
+scoreboard objectives add fz.module.scoreboard.assign.damage_taken minecraft.custom:damage_taken
+
+### 钓鱼榜
+scoreboard objectives add fz.module.scoreboard.assign.fishing_count minecraft.custom:fish_caught
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.mcfunction
new file mode 100644
index 0000000..818e96d
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.mcfunction
@@ -0,0 +1,2 @@
+scoreboard players operation 总交易量 fz.module.scoreboard.display.general = fz.module.scoreboard.total.trade_count fz.module.scoreboard.assign.general
+scoreboard players operation 总交易量 fz.module.scoreboard.display.trade_count = fz.module.scoreboard.total.trade_count fz.module.scoreboard.assign.general
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction b/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction
new file mode 100644
index 0000000..015103b
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/assign/set_display/trade_count.mcfunction
@@ -0,0 +1,3 @@
+scoreboard players add @s fz.module.scoreboard.display.trade_count 1
+scoreboard players add fz.module.scoreboard.total.trade_count fz.module.scoreboard.assign.general 1
+function #fz:module/scoreboard/assign/set_display/custom_total_name/trade_count
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction
new file mode 100644
index 0000000..ab84018
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction
@@ -0,0 +1,22 @@
+# 调用者：fz:module/scoreboard/carousel/try_display/~
+
+## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.placement_count
+execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.placement_count
+
+## 详细
+execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.placement_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}]
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/placement_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/placement_count.mcfunction
new file mode 100644
index 0000000..ec5f923
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/placement_count.mcfunction
@@ -0,0 +1 @@
+execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.placement_count fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/placement_count
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/create.mcfunction b/data/fz/functions/module/scoreboard/display/create_scoreboards.mcfunction
similarity index 88%
rename from data/fz/functions/module/scoreboard/display/create.mcfunction
rename to data/fz/functions/module/scoreboard/display/create_scoreboards.mcfunction
index 9d3df25..5d74cd9 100644
--- a/data/fz/functions/module/scoreboard/display/create.mcfunction
+++ b/data/fz/functions/module/scoreboard/display/create_scoreboards.mcfunction
@@ -37,9 +37,10 @@ team add fz.module.scoreboard.display.fishing_count
 scoreboard objectives add fz.module.scoreboard.display.kill_count dummy
 team add fz.module.scoreboard.display.kill_count
 
+### 放置榜
+scoreboard objectives add fz.module.scoreboard.placement_count dummy
+team add fz.module.scoreboard.display.placement_count
+
 ### 交易榜
 scoreboard objectives add fz.module.scoreboard.display.trade_count dummy
-team add fz.module.scoreboard.display.trade_count
-
-### 放置榜
-##### scoreboard objectives add fz.module.scoreboard.placement_count 需要穷举，暂不考虑
\ No newline at end of file
+team add fz.module.scoreboard.display.trade_count
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/register_id.mcfunction b/data/fz/functions/module/scoreboard/display/register_id.mcfunction
index e2db4d7..9e368e2 100644
--- a/data/fz/functions/module/scoreboard/display/register_id.mcfunction
+++ b/data/fz/functions/module/scoreboard/display/register_id.mcfunction
@@ -32,4 +32,8 @@ scoreboard players operation fz.module.scoreboard.display.id.kill_count fz.varia
 
 #### 注册交易榜计分板id
 function #fz:calculation/highest_id_add_1
-scoreboard players operation fz.module.scoreboard.display.id.trade_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer
\ No newline at end of file
+scoreboard players operation fz.module.scoreboard.display.id.trade_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer
+
+#### 注册放置榜计分板id
+function #fz:calculation/highest_id_add_1
+scoreboard players operation fz.module.scoreboard.display.id.placement_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/aqua.mcfunction
new file mode 100644
index 0000000..3fd355e
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/aqua.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "aqua"}'
+scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "aqua"}
+team modify fz.module.scoreboard.display.placement_count color aqua
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "aqua"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction
new file mode 100644
index 0000000..63e5ef3
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "black"}'
+scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "black"}
+team modify fz.module.scoreboard.display.placement_count color black
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "black"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/blue.mcfunction
new file mode 100644
index 0000000..940f1c1
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/blue.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "blue"}'
+scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "blue"}
+team modify fz.module.scoreboard.display.placement_count color blue
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "blue"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_aqua.mcfunction
new file mode 100644
index 0000000..ebe35dc
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_aqua.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "dark_aqua"}'
+scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "dark_aqua"}
+team modify fz.module.scoreboard.display.placement_count color dark_aqua
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "dark_aqua"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_blue.mcfunction
new file mode 100644
index 0000000..cf45c76
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_blue.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "dark_blue"}'
+scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "dark_blue"}
+team modify fz.module.scoreboard.display.placement_count color dark_blue
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "dark_blue"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_gray.mcfunction
new file mode 100644
index 0000000..c78095b
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_gray.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "dark_gray"}'
+scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "dark_gray"}
+team modify fz.module.scoreboard.display.placement_count color dark_gray
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "dark_gray"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_green.mcfunction
new file mode 100644
index 0000000..fb11325
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_green.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "dark_green"}'
+scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "dark_green"}
+team modify fz.module.scoreboard.display.placement_count color dark_green
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "dark_green"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_purple.mcfunction
new file mode 100644
index 0000000..4da1ae9
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_purple.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "dark_purple"}'
+scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "dark_purple"}
+team modify fz.module.scoreboard.display.placement_count color dark_purple
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "dark_purple"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_red.mcfunction
new file mode 100644
index 0000000..0e8a0f7
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/dark_red.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "dark_red"}'
+scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "dark_red"}
+team modify fz.module.scoreboard.display.placement_count color dark_red
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "dark_red"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/gold.mcfunction
new file mode 100644
index 0000000..69e7d5d
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/gold.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "gold"}'
+scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "gold"}
+team modify fz.module.scoreboard.display.placement_count color gold
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "gold"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/gray.mcfunction
new file mode 100644
index 0000000..5d070a6
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/gray.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "gray"}'
+scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "gray"}
+team modify fz.module.scoreboard.display.placement_count color gray
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "gray"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/green.mcfunction
new file mode 100644
index 0000000..2dab7e4
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/green.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "green"}'
+scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "green"}
+team modify fz.module.scoreboard.display.placement_count color green
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "green"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/light_purple.mcfunction
new file mode 100644
index 0000000..2b97571
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/light_purple.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "light_purple"}'
+scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "light_purple"}
+team modify fz.module.scoreboard.display.placement_count color light_purple
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "light_purple"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/red.mcfunction
new file mode 100644
index 0000000..6efde08
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/red.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "red"}'
+scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "red"}
+team modify fz.module.scoreboard.display.placement_count color red
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "red"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/white.mcfunction
new file mode 100644
index 0000000..3a73623
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/white.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "white"}'
+scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "white"}
+team modify fz.module.scoreboard.display.placement_count color white
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "white"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/display/set_text/placement_count/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/placement_count/yellow.mcfunction
new file mode 100644
index 0000000..ba351ba
--- /dev/null
+++ b/data/fz/functions/module/scoreboard/display/set_text/placement_count/yellow.mcfunction
@@ -0,0 +1,7 @@
+# 调用者：#fz:module/scoreboard/display/set_text/placement_count
+
+data modify storage fz:module fz.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "yellow"}'
+scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.placement_count
+scoreboard objectives modify fz.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "yellow"}
+team modify fz.module.scoreboard.display.placement_count color yellow
+team modify fz.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "yellow"}
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/install.mcfunction b/data/fz/functions/module/scoreboard/install.mcfunction
index 4b39308..3167bf5 100644
--- a/data/fz/functions/module/scoreboard/install.mcfunction
+++ b/data/fz/functions/module/scoreboard/install.mcfunction
@@ -1,9 +1,12 @@
 # 调用者：#fz:module/scoreboard/install
 
-function #fz:module/scoreboard/display/create
+## 源计分板
+function fz:module/scoreboard/assign/create_scoreboards
+## 显示计分板
+function fz:module/scoreboard/display/create_scoreboards
 
 ## 标记为已安装
 data modify storage fz:install_manager fz.module.scoreboard set value 1b
 
 ## 日志
-execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装组件：计分板"}] 
\ No newline at end of file
+execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装组件：计分板"}]
\ No newline at end of file
diff --git a/data/fz/functions/module/scoreboard/load.mcfunction b/data/fz/functions/module/scoreboard/load.mcfunction
index 43b29c3..7b03d03 100644
--- a/data/fz/functions/module/scoreboard/load.mcfunction
+++ b/data/fz/functions/module/scoreboard/load.mcfunction
@@ -15,17 +15,16 @@ execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @
 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.kill_count - "}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}]
 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.trade_count - "}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}]
 
-## 初始化计分板
+## 初始化计分板显示
 ### 重置计分板最大id计数
 scoreboard players set fz.module.scoreboard.display.highest_id fz.variable.integer -1
 ### 设置颜色、名称
 function #fz:module/scoreboard/display/set_text
 ### 设置运行时计分板id，同时会计算最大id数
-function #fz:module/scoreboard/display/register_id
-
-## 重置轮播计分板ID
+function fz:module/scoreboard/display/register_id
+### 重置轮播计分板ID
 scoreboard players set fz.module.scoreboard.display.current_id fz.variable.integer 0
-## 开启轮播循环
+### 开启轮播循环
 function fz:module/scoreboard/display/carousel/loop
 
 ## 日志
diff --git a/data/fz/tags/functions/event/config/on_trigger.json b/data/fz/tags/functions/event/module/config/on_config.json
similarity index 81%
rename from data/fz/tags/functions/event/config/on_trigger.json
rename to data/fz/tags/functions/event/module/config/on_config.json
index fa110b1..c6b733f 100644
--- a/data/fz/tags/functions/event/config/on_trigger.json
+++ b/data/fz/tags/functions/event/module/config/on_config.json
@@ -2,6 +2,6 @@
     "__comment": "调用者：fz:event/on_unsneak，当玩家抬头到最高角度并蹲起后，触发此事件",
     "replace": false,
     "values": [
-        "#fz:module/config/trigger"
+        "#fz:module/config/on_config"
     ]
 }
\ No newline at end of file
diff --git a/data/fz/tags/functions/event/module/scoreboard/on_trade.json b/data/fz/tags/functions/event/module/scoreboard/on_trade.json
new file mode 100644
index 0000000..492297f
--- /dev/null
+++ b/data/fz/tags/functions/event/module/scoreboard/on_trade.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "#fz:module/scoreboard/assign/set_display/trade_count"
+    ]
+}
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/display/create.json b/data/fz/tags/functions/event/on_piglin_trade.json
similarity index 50%
rename from data/fz/tags/functions/module/scoreboard/display/create.json
rename to data/fz/tags/functions/event/on_piglin_trade.json
index 88bca84..5bcea5f 100644
--- a/data/fz/tags/functions/module/scoreboard/display/create.json
+++ b/data/fz/tags/functions/event/on_piglin_trade.json
@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fz:module/scoreboard/display/create"
+        "#fz:event/module/scoreboard/on_trade"
     ]
 }
\ No newline at end of file
diff --git a/data/fz/tags/functions/event/on_villager_trade.json b/data/fz/tags/functions/event/on_villager_trade.json
new file mode 100644
index 0000000..5bcea5f
--- /dev/null
+++ b/data/fz/tags/functions/event/on_villager_trade.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "#fz:event/module/scoreboard/on_trade"
+    ]
+}
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/config/trigger.json b/data/fz/tags/functions/module/config/on_config.json
similarity index 55%
rename from data/fz/tags/functions/module/config/trigger.json
rename to data/fz/tags/functions/module/config/on_config.json
index 367f8e9..09d3d17 100644
--- a/data/fz/tags/functions/module/config/trigger.json
+++ b/data/fz/tags/functions/module/config/on_config.json
@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fz:module/config/trigger"
+        "fz:module/config/on_config"
     ]
 }
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.json
new file mode 100644
index 0000000..243f68a
--- /dev/null
+++ b/data/fz/tags/functions/module/scoreboard/assign/set_display/custom_total_name/trade_count.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:module/scoreboard/assign/set_display/custom_total_name/trade_count"
+    ]
+}
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json b/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json
new file mode 100644
index 0000000..efd269d
--- /dev/null
+++ b/data/fz/tags/functions/module/scoreboard/assign/set_display/trade_count.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:module/scoreboard/assign/set_display/trade_count"
+    ]
+}
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json
index c1f168b..aa567f6 100644
--- a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json
+++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json
@@ -9,6 +9,7 @@
         "#fz:module/scoreboard/display/carousel/try_display/fishing_count",
         "#fz:module/scoreboard/display/carousel/try_display/general",
         "#fz:module/scoreboard/display/carousel/try_display/kill_count",
+        "#fz:module/scoreboard/display/carousel/try_display/placement_count",
         "#fz:module/scoreboard/display/carousel/try_display/trade_count"
     ]
 }
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/placement_count.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/placement_count.json
new file mode 100644
index 0000000..3a91330
--- /dev/null
+++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/placement_count.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:module/scoreboard/display/carousel/try_display/placement_count"
+    ]
+}
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text.json b/data/fz/tags/functions/module/scoreboard/display/set_text.json
index 4fbe06a..4af081e 100644
--- a/data/fz/tags/functions/module/scoreboard/display/set_text.json
+++ b/data/fz/tags/functions/module/scoreboard/display/set_text.json
@@ -5,15 +5,16 @@
     ],
     "replace": false,
     "values": [
-        "#fz:module/scoreboard/display/set_text/carousel",
         "#fz:module/scoreboard/display/set_text/activation",
         "#fz:module/scoreboard/display/set_text/aviating_distance",
+        "#fz:module/scoreboard/display/set_text/carousel",
         "#fz:module/scoreboard/display/set_text/damage_taken",
         "#fz:module/scoreboard/display/set_text/death_count",
         "#fz:module/scoreboard/display/set_text/dig_count",
         "#fz:module/scoreboard/display/set_text/fishing_count",
         "#fz:module/scoreboard/display/set_text/general",
         "#fz:module/scoreboard/display/set_text/kill_count",
+        "#fz:module/scoreboard/display/set_text/placement_count",
         "#fz:module/scoreboard/display/set_text/trade_count"
     ]
 }
\ No newline at end of file
diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/placement_count.json b/data/fz/tags/functions/module/scoreboard/display/set_text/placement_count.json
new file mode 100644
index 0000000..0c514e7
--- /dev/null
+++ b/data/fz/tags/functions/module/scoreboard/display/set_text/placement_count.json
@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fz:module/scoreboard/display/set_text/placement_count/dark_blue"
+    ]
+}
\ No newline at end of file