Compare commits

..

6 Commits

Author SHA1 Message Date
Harvey_Husky b2f455cbb6 3.1.10 2024-08-24 22:18:55 +08:00
Harvey_Husky bdb5c0a8da 添加假人前缀开关 2024-08-24 22:12:24 +08:00
Harvey_Husky 1bf367ce12 忘了改.. 2024-08-24 21:31:56 +08:00
Harvey_Husky 9b99a8e836 版本号.. 2024-08-24 21:26:36 +08:00
Harvey_Husky c9270ef8bb Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1 2024-08-24 21:24:15 +08:00
Harvey_Husky bca530269a 修复 建造榜未忽略细雪桶 2024-08-24 21:20:56 +08:00
21 changed files with 69 additions and 20 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
为FZ服务器写的Minecraft生存辅助数据包
[![数据包版本](https://img.shields.io/badge/正式版-3.1.7-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
[![数据包版本](https://img.shields.io/badge/正式版-3.1.10-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
@@ -13,7 +13,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#fzsd:liquid"
"blocks": "#fzsd:placed_liquid_ignore"
}
}
}
@@ -16,7 +16,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#fzsd:liquid"
"blocks": "#fzsd:placed_liquid_ignore"
}
}
}
+2 -1
View File
@@ -1,8 +1,9 @@
tellraw @s {"text": "管理员页面:", "color": "red"}
tellraw @s [{"text": "全局"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装:", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载:", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装:", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载:", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
tellraw @s [{"text": "数据包"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装:", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载:", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装:", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载:", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
tellraw @s [{"text": "假人前缀:"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "启用假人前缀", "color": "green"}}}, {"text": "启用", "color": "green"}, {"text": "]"}],[{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "禁用假人前缀", "color": "dark_red"}}}, {"text": "禁用", "color": "dark_red"}, {"text": "]"}]]]
tellraw @s [{"text": "日志等级:"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/fine"}, "hoverEvent": {"action": "show_text", "contents": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/debug"}, "hoverEvent": {"action": "show_text", "contents": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/info"}, "hoverEvent": {"action": "show_text", "contents": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]
@@ -0,0 +1,3 @@
team modify fzsd.module.scoreboard.fake prefix ""
team modify fzsd.module.scoreboard.shadow prefix ""
data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value false
@@ -0,0 +1,3 @@
team modify fzsd.module.scoreboard.fake prefix "假的"
team modify fzsd.module.scoreboard.shadow prefix "挂机"
data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value true
+2 -1
View File
@@ -1,8 +1,9 @@
tellraw @s {"text": "管理员页面:", "color": "red"}
tellraw @s [{"text": "全局"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装:", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载:", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装:", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载:", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
tellraw @s [{"text": "数据包"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装:", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载:", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装:", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载:", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装:", "color": "gold"}, {"text": "可能可以修复一些奇怪问题,", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
tellraw @s [{"text": "假人前缀:"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "启用假人前缀", "color": "green"}}}, {"text": "启用", "color": "green"}, {"text": "]"}],[{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "禁用假人前缀", "color": "dark_red"}}}, {"text": "禁用", "color": "dark_red"}, {"text": "]"}]]]
tellraw @s [{"text": "日志等级:"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/fine"}, "hoverEvent": {"action": "show_text", "contents": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/debug"}, "hoverEvent": {"action": "show_text", "contents": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/info"}, "hoverEvent": {"action": "show_text", "contents": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]
@@ -0,0 +1,3 @@
team modify fzsd.module.scoreboard.fake prefix ""
team modify fzsd.module.scoreboard.shadow prefix ""
data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value true
@@ -0,0 +1,3 @@
team modify fzsd.module.scoreboard.fake prefix ""
team modify fzsd.module.scoreboard.shadow prefix ""
data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value false
@@ -13,7 +13,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#fzsd:liquid"
"blocks": "#fzsd:placed_liquid_ignore"
}
}
}
@@ -16,7 +16,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": "#fzsd:liquid"
"blocks": "#fzsd:placed_liquid_ignore"
}
}
}
@@ -13,7 +13,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "fzsd:liquid"
"tag": "fzsd:placed_liquid_ignore"
}
}
}
@@ -16,7 +16,7 @@
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "fzsd:liquid"
"tag": "fzsd:placed_liquid_ignore"
}
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.9-beta.2'}}
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.10'}}
execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
function fzsd:system/carpet/try_load_fzsd_score
function #fzsd:load
@@ -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
@@ -53,8 +53,8 @@ team add fzsd.module.scoreboard.display.trade_count
team add fzsd.module.scoreboard.fake
team add fzsd.module.scoreboard.shadow
team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
##
data modify storage fzsd:install fzsd.module.scoreboard set value 1b
+1 -1
View File
@@ -1,4 +1,4 @@
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.9-alpha.1'}}
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.10'}}
execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
function fzsd:system/carpet/try_load_fzsd_score
function #fzsd:load
@@ -53,8 +53,8 @@ team add fzsd.module.scoreboard.display.trade_count
team add fzsd.module.scoreboard.fake
team add fzsd.module.scoreboard.shadow
team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
##
data modify storage fzsd:install fzsd.module.scoreboard set value 1b
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#fzsd:liquid",
"minecraft:powder_snow"
]
}
@@ -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"
]
}
+15 -3
View File
@@ -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 = {
@@ -148,7 +149,10 @@ __on_player_connects(player) -> (
global_team_cache:player_name = player_team;
);
team_add('fzsd.module.scoreboard.fake', player);
if(nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
|| nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null,
print(player('all'), '↑假的');
);
),
player_type == 'shadow',
(
@@ -158,7 +162,10 @@ __on_player_connects(player) -> (
global_team_cache:player_name = player_team;
);
team_add('fzsd.module.scoreboard.shadow', player);
if(nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
|| nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null,
print(player('all'), '↑挂机');
);
),
try_restore_team_from_cache(player);
);
@@ -166,11 +173,16 @@ __on_player_connects(player) -> (
__on_player_disconnects(player, reason) -> (
player_type = player ~ 'player_type';
if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
if(player_type == 'fake'
&& player_team != 'fzsd.module.scoreboard.fake'
&& (nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
|| nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null),
(
print(player('all'), '↓假的');
),
player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow'
&& (nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
|| nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null),
(
print(player('all'), '↓挂机');
)