支持1.20-1.20.4；修复血量显示失效

2023-12-09 09:19:14 +08:00
parent 78451c559e
commit 52f182a02f
12 changed files with 29 additions and 10 deletions
@@ -17,6 +17,6 @@
        "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}",
        "ifInstalled": "execute if data storage fzsd:installed fzsd.module{${1:module_name}:1b} run ${tellraw}"
    },
-    "datapack.env.cmdVersion": "1.20",
-    "datapack.env.dataVersion": "1.20"
+    "datapack.env.cmdVersion": "1.20.2",
+    "datapack.env.dataVersion": "1.20.4"
 }
@@ -23,7 +23,7 @@

 # FZ生存数据包 3.1

-[![数据包版本](https://img.shields.io/badge/正式版-3.1.4-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.6-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)

@@ -0,0 +1,7 @@
+execute unless data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay below_name fzsd.module.health
+execute if data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay below_name
+execute unless data storage fzsd:config fzsd.module.health.display{list: 0b} run scoreboard objectives setdisplay list fzsd.module.health
+execute if data storage fzsd:config fzsd.module.health.display{list: 0b} run scoreboard objectives setdisplay list
+
+## 日志
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已加载组件：玩家血量显示"}]
@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.below_name set value 0b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load
@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.below_name set value 1b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load
@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.list set value 0b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load
@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.list set value 1b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load
@@ -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.4'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.6'}}
 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
@@ -1,3 +1,4 @@
+## @see compat_16
 execute unless data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay belowName fzsd.module.health
 execute if data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay belowName
 execute unless data storage fzsd:config fzsd.module.health.display{list: 0b} run scoreboard objectives setdisplay list fzsd.module.health
@@ -2,7 +2,7 @@
    "replace": false,
    "values": [
        "fzsd:module/sweeper/clear",
-        "fzsd:module/sweeper/post_loop",
+        "fzsd:module/sweeper/pre_loop",
        "fzsd:module/sweeper/start_timer",
        "fzsd:module/sweeper/bossbar"
    ]
@@ -4,7 +4,18 @@
        "pack_format": 15,
        "supported_formats": {
            "min_inclusive": 15,
-            "max_inclusive": 18
+            "max_inclusive": 26
        }
+    },
+    "overlays": {
+        "entries": [
+            {
+                "formats": {
+                    "min_inclusive": 16,
+                    "max_inclusive": 26
+                },
+                "directory": "compat_16"
+            }
+        ]
    }
 }