3.0.4

Signed-off-by: 延皓 <1214946206@qq.com>

README.md

@@ -11,7 +11,7 @@
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 支持 `Minecraft 1.19.x`（*由于使用了1.18.x不支持的操作，撤销对MC1.18.x的支持*）
+     - `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x`
      - `数据包 v2.2.x` 支持 `Minecraft 1.19.x`
      - `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x`
      - `数据包 v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
@@ -25,7 +25,7 @@
 
 # FZ生存数据包 3.0
 
-[![数据包版本](https://img.shields.io/badge/正式版-3.0.1-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.12) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
+[![数据包版本](https://img.shields.io/badge/正式版-3.0.3-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
@@ -68,13 +68,20 @@
 - 脚本：
   - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）：
     - 可避免Carpet假人污染计分板
-    - 执行 `reload` 指令后自动生效
+    - 可以标记哪些玩家是假人
+    - *注：请不要使用为假人名添加“bot”前缀的carpet扩展，本插件不支持此类假人！*
     - 子命令（ `/fzsd_score <子命令>` ）：
       - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
       - `recalculate`：重新计算所有计分板总分
       - `recalculate <scoreboardID>`：重新计算该计分板总分
+      - `set <player> <scoreboardID> <score>`：设置该玩家该计分板的分数
       - `reset <player>`：重置该玩家的所有分数
       - `reset <player> <scoreboardID>`：重置该玩家该计分板的分数
+      - `restore player <玩家名> <计分板ID>`：恢复该玩家的该计分板分数
+      - `restore player <玩家名>`：恢复该玩家的所有计分板分数
+      - `restore whitelist <玩家名> <计分板ID>`：恢复所有白名单玩家的该计分板分数
+      - `restore whitelist <玩家名>`：恢复所有白名单玩家的所有计分板分数
+        - *副作用：恢复完成后玩家会被放置在出生点，请确保出生点完全安全*
       - `commandPlayer <permissionType>`：设置player命令权限类型
 
 ### 其他

data/fzsd/functions/boot.mcfunction

@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0'}}
+execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.4'}}
 execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load

data/fzsd/functions/module/here/get_dimension_message/if_overworld.mcfunction

@@ -3,4 +3,4 @@ execute store result storage fzsd:here fzsd.nether.x int 0.125 run data get enti
 execute store result storage fzsd:here fzsd.nether.z int 0.125 run data get entity @s Pos[2]
 data modify storage fzsd:global fzsd.api.dimension.id set value "minecraft:the_nether"
 function #fzsd:api/get_dimension_name
-data modify storage fzsd:here fzsd.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.nether.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.nether.z", "storage": "fzsd:here"}, {"text": "]"}]]'
+data modify storage fzsd:here fzsd.message.append set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.nether.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.nether.z", "storage": "fzsd:here"}, {"text": "]"}]]'

data/fzsd/functions/module/here/get_dimension_message/if_the_nether.mcfunction

@@ -3,4 +3,4 @@ execute store result storage fzsd:here fzsd.overworld.x int 8 run data get entit
 execute store result storage fzsd:here fzsd.overworld.z int 8 run data get entity @s Pos[2]
 data modify storage fzsd:global fzsd.api.dimension.id set value "minecraft:overworld"
 function #fzsd:api/get_dimension_name
-data modify storage fzsd:here fzsd.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.overworld.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.overworld.z", "storage": "fzsd:here"}, {"text": "]"}]]'
+data modify storage fzsd:here fzsd.message.append set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.overworld.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.overworld.z", "storage": "fzsd:here"}, {"text": "]"}]]'

scripts/fzsd_score.sc

@@ -1,7 +1,7 @@
 // 计分板模块扩展插件
 // 忽略假人分数
 // **请勿修改文件名！！**
-global_app_version = '1.0-beta.12';
+global_app_version = '1.0-beta.13';
 global_current_scoreboard_list =  [
     'fzsd.module.scoreboard.display.activation',
     'fzsd.module.scoreboard.display.damage_taken',
@@ -103,21 +103,37 @@ __on_player_connects(player) -> (
     player_type = player ~ 'player_type';
     player_team = player ~ 'team';
     player_name = player ~ 'name';
-    if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
+    if(player_type == 'fake',
         (
+            if(player_team != 'fzsd.module.scoreboard.fake',
                 global_team_cache:player_name = player_team;
+            );
             team_add('fzsd.module.scoreboard.fake', player);
+            print(player('all'), '↑假的');
         ),
-        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
+        player_type == 'shadow',
         (
+            if(player_team != 'fzsd.module.scoreboard.shadow',
                 global_team_cache:player_name = player_team;
+            );
             team_add('fzsd.module.scoreboard.shadow', player);
+            print(player('all'), '↑挂机');
         ),
         try_restore_team_from_cache(player);
     );
 );
 
 __on_player_disconnects(player, reason) -> (
+    player_type = player ~ 'player_type';
+    if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
+        (
+            print(player('all'), '↓假的');
+        ),
+        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
+        (
+            print(player('all'), '↓挂机');
+        )
+    );
     try_restore_team_from_cache(player);
 );
 
@@ -377,27 +393,68 @@ display_total_score(scoreboard) -> (
 // 恢复计分板分数，player == null 时恢复所有玩家分数，scoreboard == null 时恢复所有计分板分数
 command_restore(player, scoreboard) -> (
     if(player == null,
-        for(keys(system_info('server_whitelist')), restore_score(_, scoreboard));
+        i = 0;
+        for(keys(system_info('server_whitelist')),
+            i += 1;
+            if(i > 10,
+                game_tick(50);
+                i = 0;
+            );
+            restore_score(_, scoreboard);
+        );
         if(scoreboard == null,
-            print('已恢复所有玩家的所有分数')
+            (
+                print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
+                print('无法还原破基岩榜，已忽略');
+                print('已恢复所有玩家的所有分数');
+            ),
+            if(scoreboard == 'fzsd.module.scoreboard.display.trade_count',
+                print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
+                ,
+                scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
+                print('无法还原破基岩榜，已忽略');
                 ,
                 print('已恢复所有玩家的' + scoreboard + '分数');
             );
+        );
         return();
     );
     if(scoreboard == null,
         for(global_current_scoreboard_list, restore_score(player, _));
+        print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm player <playerName> fzsd.module.scoreboard.display.trade_count”继续执行');
+        print('无法还原破基岩榜，已忽略');
         print('已恢复' + player + '的所有分数');
         return();
     );
     if(restore_score(player, scoreboard),
         print('已恢复' + player + '的' + scoreboard + '分数');
+        ,
+        if(scoreboard == 'fzsd.module.scoreboard.display.trade_count',
+            print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
+            ,
+            scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
+            print('无法还原破基岩榜，已忽略');
+        );
     );
     return();
 );
 
 // 恢复玩家的计分板分数
-restore_score(player, scoreboard) -> (
+restore_score(player_name, scoreboard) -> (
+    require_not_null(player_name);
+    if(scoreboard == null,
+        for(global_current_scoreboard_list, restore_score(player_name, _));
+        return();
+    );
+    player = player(player_name);
+    player_is_offline = false;
+    if(player == null,
+        (
+            run('player ' + player_name + ' spawn at ~ ~ ~ facing 0 0 in minecraft:overworld in survival');
+            player_is_offline = true;
+            player = player(player_name);
+        )
+    );
     if(scoreboard == 'fzsd.module.scoreboard.display.activation',
         (
             play_ticks = statistic(player, 'custom', 'play_time');
@@ -405,7 +462,7 @@ restore_score(player, scoreboard) -> (
             scoreboard(scoreboard, player, play_ticks/72000);
         ),
         scoreboard == 'fzsd.module.scoreboard.display.damage_taken',
-        restore_from_stat(scoreboard, player, 'custom', 'damage_taken');
+        scoreboard(scoreboard, player, statistic(player, 'custom', 'damage_taken')/10);
         ,
         scoreboard == 'fzsd.module.scoreboard.display.death_count',
         restore_from_stat(scoreboard, player, 'custom', 'deaths');
@@ -428,15 +485,11 @@ restore_score(player, scoreboard) -> (
             );
         ),
         scoreboard == 'fzsd.module.scoreboard.display.trade_count',
-        (
-            print('此操作会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”或\n“/' + global_app_name + ' restore confirm player <playerName> fzsd.module.scoreboard.display.trade_count”继续执行');
         return(false);
-        ),
+        ,
         scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
-        (
-            print('无法还原破基岩榜，已忽略');
         return(false);
-        ),
+        ,
         scoreboard == 'fzsd.module.scoreboard.display.aviating_distance',
         scoreboard(scoreboard, player, statistic(player, 'custom', 'aviate_one_cm')/200);
         ,
@@ -447,10 +500,15 @@ restore_score(player, scoreboard) -> (
                 append_from_stat(scoreboard, player, 'used', _);
             );
         ),
-        print('未识别的计分板ID！');
+        print('未识别的计分板ID！' + scoreboard);
         return(false);
     );
     recalculate_total_score(scoreboard);
+    if(player_is_offline,
+        world_spawn = system_info('world_spawn_point');
+        run('spreadplayers ' + world_spawn:0 + ' ' + world_spawn:2 + ' 0 10 false ' + player);
+        run('player ' + player + ' kill');
+    );
     return(true);
 );
 
@@ -504,3 +562,8 @@ debug(msg) -> (
     logger('debug', msg);
     return();
 );
+
+require_not_null(value) -> (
+    if(value == null, throw('空指针异常！'));
+    return(value);
+);