update README.md.

Signed-off-by: 延皓 <harvey_husky@foxmail.com>
upload vscode settings
2023-07-24 12:45:29 +00:00 · 2022-08-16 21:27:38 +08:00 · 2022-05-29 16:12:29 +00:00 · 2022-05-11 13:50:04 +00:00 · 2022-05-11 12:13:29 +00:00 · 2021-11-23 03:14:17 +00:00
52 changed files with 1111 additions and 1171 deletions
@@ -0,0 +1,5 @@
 {
    "datapack.env.cmdVersion": "1.18.2",
    "datapack.env.jsonVersion": "1.18.2",
    "datapack.env.dataVersion": "1.18.2"
 }
@@ -0,0 +1,143 @@
 # 更新记录
 >所有可查阅的更改记录皆可在此处找到
 ### v2.2 pre1
 - `census`地毯脚本更新至1.3.1版本
  - 修复一些显示bug
  - 现在基本可以正常使用**仍然不能保证稳定性(数据安全性)**
 - 添加了可以用来`迁移`数据的Python脚本 `score_move`
  - 使用时与`server`文件夹同级
    - `score_move.py`
    - `server`
      - `server.jar`
      - ······
      - ······
    - ······
 - 更改了文件结构,将地毯脚本移动到`脚本`文件夹中
 - 可能会有release
 - 以后准备要重写整个Datapack了
  - 3.0!
 ### v2.1.3 pre1
 - 添加`census`地毯脚本
 - `census`脚本**不稳定**，请谨慎使用，本版本无release
 - 在 readme 里添加了一些badge
 ### v2.1.2 & 2.0.10
 - 添加鞘翅滑翔距离榜单 [#I40PFS](https://gitee.com/harvey-husky/FZ-sDatapack/issues/I40PFS)
 ## v2.1.0
 - 仅支持 **Minecraft 1.17 +**
 - 修复使用部分工具和方块交互时挖掘榜会减分的 BUG
 - 为榜单恢复插件新增新版本的新方块
 ## v2.0.8
 - 修复在末地使用 `/here` 时，世界名称显示为世界 ID 的 BUG
 - 修复 `tagplayer` 可以随意传送玩家的 BUG
 - 修复记分板轮播时不显示击杀榜的 BUG
 - 修复没有破基岩榜时依然会轮播破基岩榜的 BUG
 - 为 `/tagplayer tp` 指令添加了配置文件
 ## v2.0.3
 - 修复在不添加 `tagplayer` 工具时记分板不加分的 BUG
 ## v2.0.2
 - 修复在使用 Carpet 1.4.22及以上版本时，`tagplayer` 的玩家名错乱的 BUG
 ## v2.0.1.8
 - 修复使用金斧头挖掘会导致总量 +2 的 BUG
 - 修复使用金锄头挖掘不会给挖掘榜加分
 - 修复主手有铲子，斧头，锄头时，副手放置方块会导致挖掘榜 -1 的 BUG (原版 BUG，通过 toolsfix2 成就修复) [#I2DJDC](https://gitee.com/harvey-husky/FZ-sDatapack/issues/I2DJDC)
 ## v2.0.1.7
 - 修复有时设置界面打不开的 BUG
 - 修复交易榜只加一次分的 BUG..
 - 修复 `tagplayer` 中的事件多次触发的 BUG
 ## v2.0.1.6
 - `tagplayer` 现在可以通过自定义文件名来自定义游戏内命令
 - 修复铁制工具依然不统计记分板的 BUG...
 ## v2.0.1.3
 - 修复部分铁质工具不统计挖掘榜的 BUG
 ## v2.0.1.1
 - 为设置界面的计分板添加悬浮文本
 - 无需配置即可支持该铁头功破基岩榜 Mod：[FZ-BBL](https://gitee.com/harvey-husky/FZ-BBL/releases)
  - 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于 `0` 时显示，以免未添加该 Mod 的服务器显示破基岩榜
 ## v2.0.0.11
 - `/tagplayer spawn xxx`后面现在可以追加`at`、`facing`、`in`参数
 ## v2.0.0.10
 - 扫地机添加了位于怪物血条栏的文字提示，同时添加了各种提示的开关功能
 ## v2.0.0.9
 - 修复矿车白名单状态反了的 BUG
 ## v2.0.0.8
 - 添加 `c.sc`、`s.sc`、`here.sc` 工具
 ## v2.0.0.7
 - `tagplayer` 添加了新版 Carpet 新指令，可以为假人切换热键栏
 - 现在 `tagplayer` 需要 Carpet **1.4.21** 及以上版本运行！
 - 现在 `tagplayer` 可以给自己设置动作了
 - 添加`/tagplayer shadow`指令将自己变为前缀为`挂机`的假人
 ## v2.0.0.6
 - 修复 `restore_scores.sc` 工具不能恢复受伤害榜(抖M榜)的 BUG
 ## v2.0.0.5
 - 修复挖掘榜部分工具不起作用的 BUG
 - 添加 `restore_scores.sc` 工具便于恢复或从 `1.0` 版本升级记分板
 ## v2.0.0.4
 - 添加彩色字体
 ## v2.0.0.3
 - `tagplayer` 需要 Carpet **1.4.18** 及以上版本来运行
 - 优化了 `tagplayer` 体验及修复若干 BUG
 ## v2.0.0.2
 - 重写
@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
+MIT License
-                       Version 3, 29 June 2007
+
-
+Copyright (c) 2022 延皓
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
- Everyone is permitted to copy and distribute verbatim copies
+Permission is hereby granted, free of charge, to any person obtaining a copy
- of this license document, but changing it is not allowed.
+of this software and associated documentation files (the "Software"), to deal
-
+in the Software without restriction, including without limitation the rights
-                            Preamble
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-
+copies of the Software, and to permit persons to whom the Software is
-  The GNU General Public License is a free, copyleft license for
+furnished to do so, subject to the following conditions:
-software and other kinds of works.
+
-
+The above copyright notice and this permission notice shall be included in all
-  The licenses for most software and other practical works are designed
+copies or substantial portions of the Software.
-to take away your freedom to share and change the works.  By contrast,
+
-the GNU General Public License is intended to guarantee your freedom to
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-share and change all versions of a program--to make sure it remains free
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-software for all its users.  We, the Free Software Foundation, use the
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-GNU General Public License for most of our software; it applies also to
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-any other work released this way by its authors.  You can apply it to
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-your programs, too.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -1,103 +1,146 @@
 # FZ-sDataPack
 A Minecraft Datapack
 [![mc版本](https://img.shields.io/badge/Minecraft-1.17+-blue.svg)](https://minecraft.net/)
 [![carpet版本](https://img.shields.io/badge/fabric_carpet-1.4.24+-blue.svg)](https://github.com/gnembon/fabric-carpet/releases)
 #### @Author: Harvey_Husky
-#### This project is licensed under the terms of the GNU General Public License v3.0.
+#### This project is licensed under the terms of the GNU General Public License v3.0
 #### Copyright (C) 2019-2021 Harvey_Husky
-### 总览
+
- v2.1.x支持Minecraft1.17+
+[B站链接](https://www.bilibili.com/read/cv4267319)
- v2.0.x支持Minecraft1.16.3-1.16.5
+
- 抬头并按一下shift来打开设置界面
+## 说明太长不想看·直接安装教程
- 提供一些地毯脚本：*请在升级数据包的同时替换这些工具！！*
+
-	- 安装方法：
+- 1.前往 [发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases) 下载此数据包
-		- 需要carpet mod 1.4.24+：https://github.com/gnembon/fabric-carpet/releases
+- 2.从zip文件中挑选你需要的`.sc`文件
-		- 将其放入“world/scripts”中(在客户端位于“.minecraft/saves/存档名/scripts”或“.minecraft/config/carpet/scripts”)
+- 3.在`world`文件夹中创建`datapacks`和`scripts`两个文件夹
-	- here.sc：
+- 4.将主体`zip`文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
-		- “/here”向所有人发送自己的位置和所在维度
+- 5.将挑选出来的`.sc`文件放到 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts`）
-			- 发送的消息使用voxelmap可识别的数组格式
+- 6.在控制台输入`/reload`（客户端则是重新进入世界）
-			- 安装voxelmap mod后，左键高亮该坐标，ctrl+左键新建坐标点
+
-	- c.sc
+## 总览
-		- “/c”修改玩家模式为旁观模式
+
-	- s.sc
+[![release版本](https://img.shields.io/badge/发行版-2.1.2-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/2.1)
-		- “/s”修改玩家模式为生存模式
+
-	- tagplayer.sc：
+![设置界面](./图片示例：设置界面.png)
-		- 这个工具可以防止将地毯mod生成的假人计入记分板
+
 - 抬头并按一下 `Shift` 来打开设置界面
 - 提供玩家挖掘、死亡、击杀、受伤、交易、钓鱼、滑翔和（破基岩）的数据榜单
 - 提供扫地机
 - 无需配置即可支持该铁头功破基岩榜 Mod：[FZ-BBL](https://gitee.com/harvey-husky/FZ-BBL/releases)
  - 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于 0 时显示，以免未添加该 Mod 的服务器显示破基岩榜
  - [B站链接](https://www.bilibili.com/read/cv9178207)
 - 记分板对照表：
  | Object Name | 内容 |
 	| - | - |
 	| activation | 活跃时间(h) |
  | damageTaken | 受伤害榜 |
  | deathCounter | 死亡榜 |
  | digCounter | 挖掘榜 |
  | fishingCounter | 钓鱼榜 |
  | killCounter | 击杀榜 |
  | tradingCounter | 交易榜 |
  | totalList | 总 量 |
  | bedrockBreaked（最开始拼错了，后来不方便改了，不要在意） | [铁头功破基岩](https://www.bilibili.com/video/BV1KJ411b73z) |
  | fz.aviate1m | 滑翔距离 |
 - 提供一些[地毯脚本](#地毯脚本)（`.sc` 文件）：***请在升级数据包的同时替换这些工具！！！***
 - 还有一个用于`census`脚本转移数据的python脚本`score_move`
 ## 更新记录
 更新记录可在[此处](./CHANGELOG.md)找到
 ## 使用
 ### 注意事项
 - 需要 [Carpet](https://github.com/gnembon/fabric-carpet/releases) Mod **1.4.24** 及以上版本
 - **版本的兼容性**
  - `v2.1.x` 支持 `Minecraft 1.17+`
  - `v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
 ### 安装
 - 前往 [发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases) 下载此数据包
 >请下载以 `FZ'sDatapack` 开头的 `.zip` 文件
 - **将其放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）**
 - 载入数据包
  - 如果是单人存档，请保存并退出，再打开存档
  - 如果是服务器，可使用 `/reload` 指令或重启服务器以载入数据包
 - 计分板的数据迁移
  - 请使用 [restore_scores.sc](#restore_scoressc) 地毯脚本
 ## 地毯脚本
 - **以下脚本皆在数据包（`.zip` 文件）中，请将其（`.sc` 文件）提取，并将其放入 `world/scripts` （在客户端位于 `.minecraft/saves/<存档名>/scripts`） **  
 - 可使用 `/reload` 指令或重启服务器以载入脚本（或使用 Carpet Mod 的指令 `/script load <脚本名>` 载入）
 ### `here.sc`
 - `/here` 向所有人发送自己的位置和所在维度
  - 发送的消息使用 [VoxelMap](https://www.curseforge.com/minecraft/mc-mods/voxelmap) 可识别的数组格式
  - 安装 [VoxelMap](https://www.curseforge.com/minecraft/mc-mods/voxelmap/files) Mod 后，左键高亮该坐标，`Ctrl+左键` 新建坐标点
 ### `c.sc`
 - `/c` 修改玩家模式为旁观模式
 ### `s.sc`
 - `/s` 修改玩家模式为生存模式
 ### `tagplayer.sc`
 - 这个工具可以防止将地毯 Mod 生成的假人计入记分板
 - 可以通过自定义文件名来自定义游戏内命令
 - 配置文件：
-            - “allow_bot_tp”：用于控制是否允许tp假人
+  - `allow_bot_tp`：用于控制是否允许传送假人
-            - “allow_spawning_whitelist_players”：用于控制是否允许生成白名单内的玩家
+  - `allow_spawning_whitelist_players`：用于控制是否允许生成白名单内的玩家
 - 使用方法：
-			- 输入“/script load tagplayer”加载工具
+  - 安装 [Carpet](https://github.com/gnembon/fabric-carpet/releases) Mod
-			- 包含全部地毯假人自带的功能，以及新功能，如：
+  - 输入`/script load tagplayer`加载工具
-				- “/tagplayer check xxx”：检查玩家的状态
+  - 包含全部地毯假人自带的功能，如：
-				- “/tagplayer checkall”：检查所有玩家的状态
+    - `/tagplayer use xxx once`让假人xxx按一次使用键
-				- “/tagplayer killall”：清除所有假人
+  - 包含新功能，如：
-				- 其他用法可以在游戏内输入“/tagplayer”查看
+    - `/tagplayer check xxx`：检查玩家的状态
-	- restore_scores.sc：
+    - `/tagplayer checkall`：检查所有玩家的状态
-		- 从数据包1.4升级时也需要使用这个工具
+    - `/tagplayer killall`：清除所有假人
  - 其他用法可以在游戏内输入 `/tagplayer` 查看
 ### `restore_scores.sc`
 - 从数据包 `v1.4` 升级时也需要使用这个工具
 - 这个工具可以从白名单读取玩家列表，逐一召唤假人，读取统计信息并赋值给记分板
-			- 悄悄说一句没白名单的服把usercache.json复制一份改成whitelist.json就可以啦
+  - 如未开启白名单，请把 `usercache.json` 复制一份改成 `whitelist.json` 再进行操作
-		- *注意：原有的记分板会被删除*
+- ***注意：原有的记分板会被删除***
 - 使用方法：
-			- 输入“/script load restore_scores”加载工具
+  - 输入 `/script load restore_scores` 加载工具
-			- 输入“/restore_scores by_whitelist”开始恢复
+  - 输入 `/restore_scores by_whitelist` 开始数据迁移
-			- 输入“/script unload restore_scores”卸载工具
+  - 输入 `/script unload restore_scores` 卸载工具
  - 记得用完就删掉它！
- 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
+
-	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
+### `Census.sc`
-##### v2.1.0
+
- 仅支持1.17+
+- `/census`
- 修复使用部分工具和方块交互时挖掘榜会减分的bug
+- 一个还在测试的脚本，可以输出挖掘榜
 - 为榜单恢复插件新增新版本的新方块
 ##### v2.0.8
 - 修复在末地使用/here时，世界名称显示为世界id的bug
 - 修复tagplayer可以随意传送玩家的bug
 - 修复记分板轮播时不显示击杀榜的bug
 - 修复没有破基岩榜时依然会轮播破基岩榜的bug
 - 为/tagplayer tp指令添加了配置文件
 ##### v2.0.3
 - 修复在不添加tagplayer工具时记分板不加分的bug
 ##### v2.0.2
 - 修复在使用carpet-1.4.22或以上版本时，tagplayer的玩家名错乱的bug
 ##### v2.0.1.8
 - 修复使用金斧头挖掘会导致总量+2的bug
 - 修复使用金锄头挖掘不会给挖掘榜加分
 - 修复主手有铲子，斧头，锄头时，副手放置方块会导致挖掘榜-1的bug(原版bug，通过toolsfix2成就修复)
 ##### v2.0.1.7
 - 修复有时设置界面打不开的bug
 - 修复交易榜只加一次分的bug..
 - 修复tagplayer中的事件多次触发的bug
 ##### v2.0.1.6
 - tagplayer现在可以通过自定义文件名来自定义游戏内命令
 - 修复铁制工具依然不统计记分板的bug...
 ##### v2.0.1.3
 - 修复部分铁质工具不统计挖掘榜的bug
 ##### v2.0.1.1
 - 为设置界面的计分板添加悬浮文本
 - 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
 	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
 ##### v2.0.0.11
 - “/tagplayer spawn xxx”后面现在可以追加“at”、“facing”、“in”参数
 ##### v2.0.0.10
 - 扫地机添加了位于怪物血条栏的文字提示，同时添加了各种提示的开关功能
 ##### v2.0.0.9
 - 修复矿车白名单状态反了的bug
 ##### v2.0.0.8
 - 添加c.sc、s.sc、here.sc工具
 ##### v2.0.0.7
 - tagplayer添加了新版carpet新指令，可以为假人切换热键栏
 - 现在tagplayer需要carpet1.4.21或以上版本运行！
 - 现在tagplayer可以给自己设置动作了
 - 添加“/tagplayer shadow”指令将自己变为前缀为“挂机”的假人
 ##### v2.0.0.6
 - 修复restore_scores.sc工具不能恢复受伤害榜(抖M榜)的bug
 ##### v2.0.0.5
 - 修复挖掘榜部分工具不起作用的bug
 - 添加restore_scores.sc工具便于恢复或从1.0版本升级记分板
 ##### v2.0.0.4
 - 添加彩色字体
 ##### v2.0.0.3
 - tagplayer需要地毯mod1.4.18或以上版本来运行
 - 优化了tagplayer体验及修复若干bug
 ##### v2.0.0.2
 - 重写
@@ -9,7 +9,6 @@
                        "entity": "this",
                        "scores": {
                            "actimeCounter": {
                                "max": 3600,
                                "min": 3600
                            }
                        }
@@ -0,0 +1,23 @@
 {
    "criteria": {
        "activation": {
            "trigger": "minecraft:tick",
            "conditions": {
                "player": [
                    {
                        "condition": "minecraft:entity_scores",
                        "entity": "this",
                        "scores": {
                            "fz.aviateCounter": {
                                "min": 200
                            }
                        }
                    }
                ]
            }
        }
    },
    "rewards": {
        "function": "fz:scoreboards/aviate1m/calculator"
    }
 }
@@ -10,10 +10,7 @@
                            "condition": "minecraft:entity_scores",
                            "entity": "this",
                            "scores": {
-                                "carpetBot": {
+                                "carpetBot": 1
                                    "max": 1,
                                    "min": 1
                                }
                            }
                        }
                    }
@@ -10,10 +10,7 @@
                            "condition": "minecraft:entity_scores",
                            "entity": "this",
                            "scores": {
-                                "carpetBot": {
+                                "carpetBot": 1
                                    "max": 1,
                                    "min": 1
                                }
                            }
                        }
                    }
@@ -2,26 +2,27 @@
 schedule function fz:config/timeout 300s
 #输出玩家可见的设置页面
 ##扫地机
-execute if data storage fz.installed {sweeper: 1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"}
+execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"}
    ##扫地机时间，对应分数1478966210-1478966215
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s [{"text": "- "},{"text": "[关]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966210"}},{"text": "[30秒]","color": "#5fff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966211"}},{"text": "[1分钟]","color": "#d7ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966212"}},{"text": "[2分钟]","color": "#ffd900","clickEvent": {"action": "run_command","value": "/trigger config set 1478966213"}},{"text": "[3分钟]","color": "#ff6100","clickEvent": {"action": "run_command","value": "/trigger config set 1478966214"}},{"text": "[4分钟]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966215"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s [{"text": "- "},{"text": "[关]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966210"}},{"text": "[30秒]","color": "#5fff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966211"}},{"text": "[1分钟]","color": "#d7ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966212"}},{"text": "[2分钟]","color": "#ffd900","clickEvent": {"action": "run_command","value": "/trigger config set 1478966213"}},{"text": "[3分钟]","color": "#ff6100","clickEvent": {"action": "run_command","value": "/trigger config set 1478966214"}},{"text": "[4分钟]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966215"}}]
    ##开启矿车白名单1478966216
-    execute if data storage fz.installed {sweeper: 1b} unless score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} unless score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}]
    ##关闭矿车白名单1478966217
-    execute if data storage fz.installed {sweeper: 1b} if score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966217"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} if score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966217"}}]
    ##声音提示
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966209"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=!fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966209"}}]
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966208"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966208"}}]
    ##消息提示
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966205"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=!fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966205"}}]
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966204"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966204"}}]
    ##血条栏提示
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966207"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=!fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966207"}}]
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966206"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966206"}}]
 ##记分板
-execute if data storage fz.installed {scoreboards: 1b} run tellraw @s {"text": "记分板：","color": "#ccff00"}
+execute if data storage fz:survival installed{scoreboards: 1b} run tellraw @s {"text": "记分板：","color": "#ccff00"}
    ##计分板显示，对应分数1838019370-1838019379
-    execute if data storage fz.installed {scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
+    execute if data storage fz:survival installed{scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
    execute if data storage fz:survival installed{scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[滑翔距离]", "color": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}}]
    ##计分板显示，对应分数1838019369-1838019379(有破基岩榜)
-    execute if data storage fz.installed {scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
+    execute if data storage fz:survival installed{scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
-    execute if data storage fz.installed {scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[铁头功]","color": "dark_green","hoverEvent": {"action": "show_text","contents": {"text": "破基岩榜","color": "dark_green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019369"}}]
+    execute if data storage fz:survival installed{scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[滑翔距离]", "color": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}},{"text": "[铁头功]","color": "dark_green","hoverEvent": {"action": "show_text","contents": {"text": "破基岩榜","color": "dark_green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019369"}}]
@@ -2,7 +2,7 @@
 #初始化触发器记分板
 scoreboard objectives add config trigger
 #存入已安装信息
-data merge storage fz.installed {config: 1b}
+data modify storage fz:survival installed.config set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]设置功能已安装","color": "#5fff00"}
 #开始运行
@@ -3,6 +3,6 @@
 scoreboard players enable @a config
 #每条子函数都要reset config分数和function fz:config/display
 execute if data storage fz.installed {sweeper: 1b} as @a if score @s config matches 1478966200..1478966217 run function fz:sweeper/config/trigger
-execute if data storage fz.installed {scoreboards: 1b} as @a if score @s config matches 1838019369..1838019379 run function fz:scoreboards/config
+execute if data storage fz.installed {scoreboards: 1b} as @a if score @s config matches 1838019368..1838019379 run function fz:scoreboards/config
 #循环执行本函数
 schedule function fz:config/main 1t
@@ -4,6 +4,6 @@ schedule clear fz:config/main
 schedule clear fz:config/timeout
 data remove storage fz.config is_open
 #写入已卸载的信息
-data merge storage fz.installed {config: 0b}
+data modify storage fz:survival installed.config set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]设置功能已卸载","color": "#5fff00"}
@@ -1,6 +1,6 @@
 #由config/sneak和config/unsneak成就触发
 #判断玩家视角是否指向正上方，是则运行turnon函数
-execute if data storage fz.installed {config: 1b} if entity @s[x_rotation=-90] run function fz:config/turnon
+execute if data storage fz:survival installed{config: 1b} if entity @s[x_rotation=-90] run function fz:config/turnon
 #重置该玩家的两个成就
 advancement revoke @s only fz:config/sneak
 advancement revoke @s only fz:config/unsneak
@@ -5,6 +5,6 @@ scoreboard objectives modify Health rendertype hearts
 scoreboard objectives setdisplay list Health
 scoreboard objectives setdisplay belowName Health
 #写入已安装的信息
-data merge storage fz.installed {health: 1b}
+data modify storage fz:survival installed.health set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]血量显示已安装","color": "#5fff00"}
@@ -2,6 +2,6 @@
 #删除计分板
 scoreboard objectives remove Health
 #写入已卸载的信息
-data merge storage fz.installed {health: 0b}
+data modify storage fz:survival installed.health set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]血量显示已卸载","color": "#5fff00"}
@@ -3,6 +3,8 @@
 scoreboard objectives add parameter dummy
 #用于数学计算的记分板
 scoreboard objectives add calculator dummy
 scoreboard players set 200 calculator 200
 scoreboard players set 100 calculator 100
 scoreboard players set 10 calculator 10
 scoreboard players set 1 calculator 1
 #检测玩家退出游戏的记分板
@@ -15,16 +17,26 @@ function fz:health/install
 function fz:login/logintips/install
 function fz:carpet/carpet
 #版本信息
-data merge storage fz.installed {installed: 1b}
+data modify storage fz:survival version set from storage fz:survival newVersion
-data merge storage fz {version: 2.1.0}
+data modify storage fz:survival date set value "2020-7.21"
-data merge storage fz {date: 2020-7.1}
+data modify storage fz:survival time set value "1:14"
 data merge storage fz {time: "02:43"}
 ##data merge storage fz {snapshot: -SNAPSHOT}
 data remove storage fz snapshot
 tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
 #提示已安装
 data modify storage fz:survival installed.datapack set value 1b
 tellraw @a {"text": "[信息]安装完成！","color": "#5fff00"}
 tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
 #info: #5fff00 信息
 #alert: #d7ff00 提醒
 #warn: #ffd900 警告
 #error: #ff6100 错误
 #抖M名单 - 受伤害榜
 #钩直饵咸 - 钓鱼榜
 #交♂易榜 - 交易榜
 #铁头功 - 破基岩榜
 #群p抖M - 总受伤害量
 #全部木大 - 总死亡数
 #总交♂易数 - 总交易数
 #全员头铁 - 总破基岩数
 #{"text": "cm","color": "yellow"} - {"text": "HP"}
@@ -1,8 +1,22 @@
 #新版本号
 data modify storage fz:survival newVersion set value [2,1,3,2]
 execute if data storage fz:survival newVersion[3] run data modify storage fz:survival snapshot set value 1b
 execute unless data storage fz:survival newVersion[3] run data remove storage fz:survival snapshot
 ##data remove storage fz:survival snapshot
 #版本号识别
 scoreboard objectives add fz.cache dummy
 execute store result score version1 fz.cache run data get storage fz:survival version[1]
 execute store result score version2 fz.cache run data get storage fz:survival version[2]
 execute store result score version3 fz.cache run data get storage fz:survival version[3]
 execute store result score newVersion1 fz.cache run data get storage fz:survival newVersion[1]
 execute store result score newVersion2 fz.cache run data get storage fz:survival newVersion[2]
 execute store result score newVersion3 fz.cache run data get storage fz:survival newVersion[3]
 #版本号比较
 execute if data storage fz:survival installed{datapack: 1b} unless score version1 fz.cache = newVersion1 fz.cache run function fz:start/update
 execute if data storage fz:survival installed{datapack: 1b} if score version1 fz.cache = newVersion1 fz.cache run function fz:start/00xx
 scoreboard objectives remove fz.cache
 #如果未安装且未卸载则安装
-execute unless data storage fz.installed {installed: 1b} unless data storage fz.installed {installed: 0b} run function fz:install
+execute unless data storage fz:survival installed{datapack: 1b} unless data storage fz:survival installed{datapack: 0b} run function fz:install
 #如果版本正确且已安装则开始运行
 execute if data storage fz {version: 2.1.0} if data storage fz.installed {installed: 1b} run function fz:start
 #如果版本不符则更新
 execute unless data storage fz {version: 2.1.0} run function fz:update
 #输出版本信息
-tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}]
+execute unless data storage fz:survival {snapshot:1b} unless data storage fz:survival installed{datapack: 0b} run tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version[0]","storage":"fz:survival","color": "#ffd900"},{"text":".","color": "#ffd900"},{"nbt":"version[1]","storage":"fz:survival","color": "#ffd900"},{"text": ".","color": "#ffd900"},{"nbt":"version[2]","storage":"fz:survival","color": "#ffd900"}]
 execute if data storage fz:survival {snapshot:1b} unless data storage fz:survival installed{datapack: 0b} run tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version[0]","storage":"fz:survival","color": "#ffd900"},{"text":".","color": "#ffd900"},{"nbt":"version[1]","storage":"fz:survival","color": "#ffd900"},{"text": ".","color": "#ffd900"},{"nbt":"version[2]","storage":"fz:survival","color": "#ffd900"},{"text": ".","color": "#ffd900"},{"nbt":"version[3]","storage":"fz:survival","color": "#ffd900"},{"text": "-SNAPSHOT","color": "red"}]
@@ -1,4 +1,4 @@
 #安装登陆提示
-data merge storage fz.installed {logintips: 1b}
+data modify storage fz:survival installed.logintips set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]登陆提示已安装","color": "#5fff00"}
@@ -1,4 +1,4 @@
 #卸载登陆提示
-data merge storage fz.installed {logintips: 0b}
+data modify storage fz:survival installed.logintips set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]登陆提示已卸载","color": "#5fff00"}
@@ -1,4 +1,4 @@
-execute if data storage fz.installed {logintips: 1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}
+execute if data storage fz:survival installed{logintips: 1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}
 scoreboard players set @s leaveGame 0
@@ -14,4 +14,4 @@ advancement revoke @s only fz:scoreboards/digcounter/toolsfix2
 advancement revoke @s only fz:config/sneak
 advancement revoke @s only fz:config/unsneak
-advancement revoke @s from fz:leavegame
+execute if data storage fz:survival installed{datapack: 1b} run advancement revoke @s from fz:leavegame
@@ -0,0 +1,11 @@
 #计算滑翔距离和总榜
 #判断条件用于排除地毯小人
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s fz.aviateOneTime = @s fz.aviateCounter
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s fz.aviateOneTime /= 200 calculator
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s fz.aviate1m += @s fz.aviateOneTime
 execute unless score @s carpetBot matches 1 run scoreboard players operation 总滑翔距离 fz.aviate1m += @s fz.aviateOneTime
 execute unless score @s carpetBot matches 1 run scoreboard players operation 总滑翔距离 totalList += @s fz.aviateOneTime
 #重置滑翔探测记分板
 scoreboard players operation @s fz.aviateCounter %= 200 calculator
 #重置触发该函数的成就
 advancement revoke @s only fz:scoreboards/aviate1m
@@ -0,0 +1,2 @@
 #将交易榜显示给轮播记分板的队伍（金队）
 scoreboard objectives setdisplay sidebar.team.gold fz.aviate1m
@@ -3,6 +3,6 @@
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s bedrockBreaked += @s fz.bbl
 execute unless score @s carpetBot matches 1 run scoreboard players operation 全员头铁 bedrockBreaked += @s fz.bbl
 execute unless score @s carpetBot matches 1 run scoreboard players operation 全员头铁 totalList += @s fz.bbl
-execute unless score @s carpetBot matches 1 run scoreboard players reset @s fz.bbl
+scoreboard players reset @s fz.bbl
 #重置触发该函数的成就
 advancement revoke @s only fz:scoreboards/bedrockbreaked
@@ -1,2 +1,2 @@
 #将破基岩榜显示给轮播计分板的队伍（金队）
-scoreboard objectives setdisplay sidebar.team.dark_gray bedrockBreaked
+scoreboard objectives setdisplay sidebar.team.gold bedrockBreaked
@@ -10,6 +10,7 @@ execute if score @s config matches 1838019377 run team join red
 execute if score @s config matches 1838019378 run team join green
 execute if score @s config matches 1838019379 run team join dark_aqua
 execute if score @s config matches 1838019369 run team join dark_green
 execute if score @s config matches 1838019368 run team join light_purple
 #每条子函数都要reset config分数和function fz:config/display
 scoreboard players reset @s config
 function fz:config/display
@@ -8,5 +8,6 @@ scoreboard objectives remove damageTaken
 scoreboard objectives remove activation
 scoreboard objectives remove totalList
 scoreboard objectives remove bedrockBreaked
 scoreboard objectives remove fz.aviate1m
 #提示已删除
 tellraw @a {"text": "[信息]计分板数据已删除","color": "#5fff00"}
@@ -40,6 +40,9 @@ scoreboard objectives add activation dummy
 scoreboard objectives add totalList dummy
 scoreboard objectives add bedrockBreaked dummy
    scoreboard objectives add fz.bbl dummy
 scoreboard objectives add fz.aviate1m dummy
    scoreboard objectives add fz.aviateCounter minecraft.custom:aviate_one_cm
    scoreboard objectives add fz.aviateOneTime dummy
 scoreboard objectives modify activation displayname {"text": "活跃时间(h)","color": "aqua"}
 scoreboard objectives modify damageTaken displayname {"text": "抖M名单","color": "yellow"}
@@ -50,6 +53,7 @@ scoreboard objectives modify killCounter displayname {"text": "击杀榜","color
 scoreboard objectives modify tradingCounter displayname {"text": "交♂易榜","color": "green"}
 scoreboard objectives modify totalList displayname {"text": "总 量","color": "dark_aqua"}
 scoreboard objectives modify bedrockBreaked displayname {"text": "铁头功","color": "dark_green"}
 scoreboard objectives modify fz.aviate1m displayname {"text": "滑翔距离","color": "light_purple"}
 team add gold
 team add aqua
@@ -61,6 +65,8 @@ team add red
 team add green
 team add dark_aqua
 team add dark_green
 team add light_purple
 team modify gold color gold
 team modify aqua color aqua
 team modify yellow color yellow
@@ -71,6 +77,7 @@ team modify red color red
 team modify dark_aqua color dark_aqua
 team modify green color green
 team modify dark_green color dark_green
 team modify light_purple color light_purple
 team join aqua 总在线时间(h)
 team join yellow 群p抖M
@@ -80,6 +87,7 @@ team join blue 总钓鱼数
 team join red 总击杀数
 team join green 总交♂易数
 team join dark_green 全员头铁
 team join light_purple 总滑翔距离
 #各计分板的总量
 scoreboard players operation 总在线时间(h) activation = 总在线时间(h) activation
 scoreboard players operation 群p抖M damageTaken = 群p抖M damageTaken
@@ -88,6 +96,7 @@ scoreboard players operation 总挖掘量 digCounter = 总挖掘量 digCounter
 scoreboard players operation 总钓鱼数 fishingCounter = 总钓鱼数 fishingCounter
 scoreboard players operation 总击杀数 killCounter = 总击杀数 killCounter
 scoreboard players operation 总交♂易数 tradingCounter = 总交♂易数 tradingCounter
 scoreboard players operation 总滑翔距离 fz.aviate1m = 总滑翔距离 fz.aviate1m
 #总榜的总量
 scoreboard players operation 总在线时间(h) totalList = 总在线时间(h) totalList
 scoreboard players operation 群p抖M totalList = 群p抖M totalList
@@ -96,6 +105,7 @@ scoreboard players operation 总挖掘量 totalList = 总挖掘量 totalList
 scoreboard players operation 总钓鱼数 totalList = 总钓鱼数 totalList
 scoreboard players operation 总击杀数 totalList = 总击杀数 totalList
 scoreboard players operation 总交♂易数 totalList = 总交♂易数 totalList
 scoreboard players operation 总滑翔距离 totalList = 总滑翔距离 totalList
 scoreboard objectives setdisplay sidebar.team.aqua activation
 scoreboard objectives setdisplay sidebar.team.yellow damageTaken
@@ -106,8 +116,9 @@ scoreboard objectives setdisplay sidebar.team.red killCounter
 scoreboard objectives setdisplay sidebar.team.dark_aqua totalList
 scoreboard objectives setdisplay sidebar.team.green tradingCounter
 scoreboard objectives setdisplay sidebar.team.dark_green bedrockBreaked
 scoreboard objectives setdisplay sidebar.team.light_purple fz.aviate1m
-data merge storage fz.installed {scoreboards:1b}
+data modify storage fz:survival installed.scoreboards set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]记分板已安装","color": "#5fff00"}
@@ -5,7 +5,8 @@ schedule function fz:scoreboards/tradingcounter/setdisplay 30s replace
 schedule function fz:scoreboards/fishingcounter/setdisplay 40s replace
 schedule function fz:scoreboards/damagetaken/setdisplay 50s replace
 schedule function fz:scoreboards/activation/setdisplay 60s replace
-schedule function fz:scoreboards/totallist 70s replace
+schedule function fz:scoreboards/aviate1m/setdisplay 70s replace
-execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/bedrockbreaked/setdisplay 80s replace
+schedule function fz:scoreboards/totallist 80s replace
-execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 90s replace
+execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/bedrockbreaked/setdisplay 90s replace
-execute unless score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 80s replace
+execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 100s replace
 execute unless score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 90s replace
@@ -35,11 +35,13 @@ scoreboard objectives remove usedNetAxe
 scoreboard objectives remove usedNetPickaxe
 scoreboard objectives remove usedNetShovel
 scoreboard objectives remove usedNetHoe
 scoreboard objectives remove fz.bbl
 scoreboard objectives remove fz.bbl
 scoreboard objectives remove deathTester
 scoreboard objectives remove fishingTester
 scoreboard objectives remove 10xDamageTaken
 scoreboard objectives remove fz.aviateCounter
 scoreboard objectives remove fz.aviateOneTime
 scoreboard objectives setdisplay sidebar.team.aqua
 scoreboard objectives setdisplay sidebar.team.yellow
@@ -51,8 +53,8 @@ scoreboard objectives setdisplay sidebar.team.light_purple
 scoreboard objectives setdisplay sidebar.team.green
 scoreboard objectives setdisplay sidebar.team.gold
 data modify storage fz:survival installed.scoreboards set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]记分板已卸载","color": "#5fff00"}
 tellraw @s [{"text": "[警告]您要删除计分板数据吗，它将会永久失去！(真的很久！)", "color": "#ffd900"},{"text": "[确定]","clickEvent": {"action": "run_command", "value": "/function fz:scoreboards/delscore"}, "color": "#00ff00"}]
 data merge storage fz.installed {scoreboards:0b}
@@ -1,7 +0,0 @@
 #判断各功能是否已安装并运行
 execute if data storage fz.installed {scoreboards: 1b} run function fz:scoreboards/start
 execute if data storage fz.installed {sweeper: 1b} run function fz:sweeper/start
 execute if data storage fz.installed {config: 1b} run function fz:config/start
 function fz:carpet/carpet
 #测试用的输出
 tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
@@ -0,0 +1,2 @@
 execute unless score version3 fz.cache = newVersion3 fz.cache run function fz:start/update
 execute if score version3 fz.cache = newVersion3 fz.cache run function fz:start/start
@@ -0,0 +1,3 @@
 execute unless score version2 fz.cache = newVersion2 fz.cache run function fz:start/update
 execute if data storage fz:survival {snapshot: 1b} if score version2 fz.cache = newVersion2 fz.cache run function fz:start/000x
 execute unless data storage fz:survival {snapshot: 1b} run function fz:start/start
@@ -0,0 +1,7 @@
 #判断各功能是否已安装并运行
 execute if data storage fz:survival installed{scoreboards: 1b} run function fz:scoreboards/start
 execute if data storage fz:survival installed{sweeper: 1b} run function fz:sweeper/start
 execute if data storage fz:survival installed{config: 1b} run function fz:config/start
 function fz:carpet/carpet
 #测试用的输出
 tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
@@ -0,0 +1,13 @@
 data modify storage fz:cache survival.installed set from storage fz:survival installed
 #卸载
 function fz:uninstall
 #安装
 function fz:install
 execute if data storage fz:cache survival.installed{scoreboards: 0b} run function fz:scoreboards/uninstall
 execute if data storage fz:cache survival.installed{sweeper: 0b} run function fz:sweeper/uninstall
 execute if data storage fz:cache survival.installed{logintips: 0b} run function fz:login/logintips/uninstall
 execute if data storage fz:cache survival.installed{health: 0b} run function fz:health/uninstall
 execute if data storage fz:cache survival.installed{config: 0b} run function fz:config/uninstall
 data remove storage fz:cache survival.installed
 #提示已安装
 tellraw @a {"text": "[信息]升级完成","color": "#5fff00"}
@@ -1,4 +1,4 @@
-bossbar set fz.sweeper name [{"score": {"name": "sweeperBossbar","objective": "parameter"},"color": "#ff6100","underlined": true,"bold": true},{"text": "秒后清理垃圾","color": "#ffd900","bold": false}]
+bossbar set fz:sweeper name [{"score": {"name": "sweeperBossbar","objective": "parameter"},"color": "#ff6100","underlined": true,"bold": true},{"text": "秒后清理垃圾","color": "#ffd900","bold": false}]
-bossbar set fz.sweeper players @a[tag=!fz.sweeperBossbarOff]
+bossbar set fz:sweeper players @a[tag=!fz.sweeperBossbarOff]
 scoreboard players remove sweeperBossbar parameter 1
 schedule function fz:sweeper/bossbar 1s
@@ -13,7 +13,7 @@ schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
 #设置怪物血条
-bossbar set minecraft:fz.sweeper visible false
+bossbar set fz:sweeper visible false
 tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[信息]扫地机已关闭","color": "#5fff00"}
 execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2
@@ -17,7 +17,7 @@ schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
 #设置怪物血条
-bossbar set minecraft:fz.sweeper visible true
+bossbar set fz:sweeper visible true
 function fz:sweeper/main
 function fz:sweeper/bossbar
@@ -13,7 +13,7 @@ execute if score @s config matches 1478966205 run tag @s add fz.sweeperMessageOf
 execute if score @s config matches 1478966216 run scoreboard players set keepMinecart parameter 1
 execute if score @s config matches 1478966217 run scoreboard players reset keepMinecart parameter
-bossbar set minecraft:fz.sweeper players @a[tag=!fz.sweeperBossbarOff]
+bossbar set fz:sweeper players @a[tag=!fz.sweeperBossbarOff]
 scoreboard players reset @s config
 function fz:config/display
@@ -1,6 +1,6 @@
-data merge storage fz.installed {sweeper: 1b}
+data modify storage fz:survival installed.sweeper set value 1b
-bossbar add fz.sweeper {"text":"null"}
+bossbar add fz:sweeper {"text":"null"}
-bossbar set fz.sweeper value 0
+bossbar set fz:sweeper value 0
 #提示已安装
 tellraw @a {"text": "[信息]扫地机已安装","color": "#5fff00"}
 function fz:sweeper/start
@@ -1,5 +1,5 @@
-execute if score keepMinecart parameter matches 1 run execute store result score sweeperItem parameter run kill @e[type=item,predicate=!fz:sweeper/minecart]
+execute if score keepMinecart parameter matches 1 store result score sweeperItem parameter run kill @e[type=item,predicate=!fz:sweeper/minecart]
-execute unless score keepMinecart parameter matches 1 run execute store result score sweeperItem parameter run kill @e[type=item]
+execute unless score keepMinecart parameter matches 1 store result score sweeperItem parameter run kill @e[type=item]
 tellraw @a [{"text": "[信息]本次清理了","color": "#5fff00"},{"score": {"objective": "parameter", "name": "sweeperItem"},"color": "#5fff00"},{"text": "堆物品","color": "#5fff00"}]
 execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2
 execute if score sweeperTime parameter matches 30 run function fz:sweeper/timer/30s
@@ -11,6 +11,6 @@ schedule clear fz:sweeper/timer/1min
 schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
-bossbar set fz.sweeper visible false
+bossbar set fz:sweeper visible false
 tellraw @a {"text": "[信息]扫地机已启用","color": "#5fff00"}
@@ -12,6 +12,8 @@ schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
-data merge storage fz.installed {sweeper: 0b}
+bossbar remove fz:sweeper
 data modify storage fz:survival installed.sweeper set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]扫地机已卸载","color": "#5fff00"}
@@ -9,6 +9,6 @@ scoreboard objectives remove parameter
 scoreboard objectives remove calculator
 scoreboard objectives remove leaveGame
 #存入已卸载信息，下次启动不会重新安装
-data merge storage fz.installed {installed: 0b}
+data modify storage fz:survival installed.datapack set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]FZ'sDatapack已卸载","color": "#5fff00"}
@@ -1,12 +0,0 @@
 #卸载
 function fz:uninstall
 #安装
 function fz:install
 #再卸载已经被卸载的项目
 execute if data storage fz.installed {config: 0b} run function fz:config/uninstall
 execute if data storage fz.installed {sweeper: 0b} run function fz:sweeper/uninstall
 execute if data storage fz.installed {scoreboards: 0b} run function fz:scoreboards/uninstall
 execute if data storage fz.installed {health: 0b} run function fz:health/uninstall
 execute if data storage fz.installed {logintips: 0b} run function fz:login/logintips/uninstall
 #提示已安装
 tellraw @a {"text": "[信息]升级完成","color": "#5fff00"}
@@ -0,0 +1,260 @@
 // by shenjack
 // write at carpet 1.16.5 1.4.44
 // with carpet-extra-1.16.5-1.4.30
 // with carpet-tis-addition-mc1.16.4-1.15.0+build.492
 // with fabric-api-0.26.0+1.16 (because on server Api Version > 0.26 will cause bug)
 global_version = '1.3.3';
 global_carpet_version = split('\\+v',system_info('scarpet_version'));
 global_require_carpet_version = ['1.4.30', 210407];
 global_filename = system_info('app_name');
 global_score_path = 'census/';
 // debug级别
 global_debug_level = 2;
 // 0 -> show all message
 // 1 -> show most debug
 // 2 -> show all info
 // 3 -> show all warn
 // 4 -> show all error
 global_score = {};
 global_player_name = [];
 // 分数相关初始化
 __config() -> {
    'stay_loaded' -> true,
    'scope' -> 'global',
 	// 'allow_command_conflicts' -> true,
    'legacy_command_type_support' -> true,
    'requires' -> {
        'minecraft' -> '>=1.16',  // best at 1.16+  haven't test in 1.15.2 and 1.14.4
        'carpet' -> '>=1.4.31' // best at 1.4.31 because fix issue of read_file()
    },
    'commands' -> {
        '' -> 'help',
        'help' -> 'help',
        'print' -> ['print_score', 'mined'],
        'reload' -> 'reload_script',
        'score load' -> 'load_scores',
        'score save' -> 'save_scores',
        'score print' -> ['print_score', 'mined'],
        'debug level' -> ['debug_level', null],
        'debug level <debug_level>' -> 'debug_level',
        'debug add_mine <player> <block>' -> 'add_mine',
    },
    'arguments' -> {
 		'player' -> {
 			'type' -> 'players',
        },
        'block' -> {
            'type' -> 'string',
        },
        'debug_level' -> {
            'type' -> 'int',
            'min' -> 0,
            'max' -> 4,
            'suggest' -> [0, 1, 2, 3, 4]
        }
    };
 };
 // import('lib', 'callme');
 help_message = {
    'name': 'census',
    'version': global_version,
    'information': 'census 是一个用于统计玩家各类数据的 script',
    'commands': {
        'info': '同 /{app_name} help 显示帮助信息',
        'hint': '然而并没有什么隐藏信息(确信)',
        'run': '{app_name} help',
        'sub_command': {
            'help': {
                'info': '显示你现在在看的这条帮助信息!',
                'hint': 'g 你就在看着我呢~',
                'run': '{command}',
            },
            'reload': {
                'info': '重新加载script',
                'hint': 'g 获得成就:我重载我自己',
                'run': '{command}',
            },
            'score': {
                'sub_command': {
                    'load': {
                        'info': '从数据文件夹中加载数据并覆盖现有数据',
                        'hint': 'rub 本操作会覆盖现有数据，所以请自行输入命令',
                        'copy': '{command}'
                    },
                    'save': {
                        'info': '保存现有数据',
                        'hint': 'ub 提醒:这个操作会覆盖文件数据(虽说其实没啥事)',
                        'run': '{command}',
                    },
                    'print': {
                        'info': '打印分数',
                        'hint': '获得成就:我打印了分数',
                        'run': '{command}',
                    }
                }
            }
        }
    }
 };
 __on_close() -> (
    // 保存一些debug信息
    debug_info = {'debug_level' -> global_debug_level};
    write_file('main', 'json', debug_info);
    // 保存分数
    save_scores();
 );
 printl(message, level = 2, say = false, reply = true) -> (
    if(global_debug_level <= level,
        if(reply, print(message));
        if(say, run('say ' + message)));
 );
 debug_level(level) -> (
    if(level == null,
        print('目前DEBUG等级为: ' + global_debug_level);
        return(0));
    global_debug_level = level;
    print('DEBUG等级已经设置为: ' + global_debug_level);
    logger(type = 'info', 'DEBUG等级已经设置为: ' + global_debug_level);
 );
 // fmt_cmd(cmd, msg, hint, do = false) -> (
 //     if(do,
 //         command = '!/' + global_filename + cmd,
 //         command = '/' + global_filename + cmd);
 //     return(command);
 // );
 gloal_help_config = {};
 help() -> (
    print(format('y ' + '-'*10 + '帮助信息' + '-'*10));
    print(format('m 提醒:大部分信息都可以点击来执行相对应的命令,所以请小心点击', '^g 包括我! 点我来执行 /' + global_filename, '!/' + global_filename));
    print(format('e /' + global_filename + ' -> ', 'c 同 /' + global_filename + ' help'));
    print(format('e /' + global_filename + ' help -> ', 'c 显示这条帮助信息', '^g 你就在看着我呢!', '!/' + global_filename + ' help'));
    print(format('e /' + global_filename + ' reload -> ', 'c 重新加载script', '^g 获得成就:我重载我自己', '!/' + global_filename + ' reload'));
    print(format('e /' + global_filename + ' score load -> ', 'c 加载各项榜单', '^rub 警告:这会覆盖游戏内的现有数据(所以请自行输入命令)'));
    print(format('e /' + global_filename + ' score save -> ', 'c 保存各项榜单', '^ub 提醒:这会覆盖文件数据', '!/' + global_filename + ' score save'));
    print(format('e /' + global_filename + ' score print -> ', 'c 输出各项榜单数据', '^gs 吐槽一下,scarpet的字符串处理真的麻烦死了', '!/' + global_filename + ' score print'));
    print(format('e /' + global_filename + ' debug level -> ', 'c 显示DEBUG信息等级', '^g (没啥可吐槽的)', '!/' + global_filename + ' debug level'));
    print(format('e /' + global_filename + ' debug level <debug_level> -> ', 'c 设置DEBUG信息等级为<debug_level>   ', '^g <debug_level> 为 0-4的正整数,默认为2', '?/' + global_filename + ' debug level '));
    print(format('y [系统信息]' + global_filename + ' 版本: ' + global_version));
    print(format('y [系统信息]' + global_filename + ' 文件名: ' + global_filename));
    print(format('y [插件信息]' + global_filename + ' 数据存储路径: ' + global_score_path));
    print(format('e 感谢 @Harvey_Husky 延皓 的支持！ script中一部分源码就来自哈姥姥！', '^g 哈姥姥真好用(', '?https://gitee.com/harvey-husky/FZ-sDatapack'));
 );
 reload_script() -> (
    save_scores();
    print('script ' + global_filename + ' 重载中···');
    run(str('script load ' + global_filename));
 );
 load_scores() -> (
    print('重新加载计分数据中···');
    global_score = {}; // 重置分数
    files = list_files(global_score_path, 'shared_json'); // 列出所有文件
    printl(files, 1, true, true); // DEBUG 输出
    for(files,
        data = read_file(_, 'shared_json'); // 获取文件内json
        name = split('/', _):1; // 获取文件名（玩家名称
        global_score:name = data; // 存储进计分表
        printl(data + '\n\n' + _, 1, false, true)); // DEBUG 输出
    print('计分板数据加载完成');
 );
 score_print(type) -> ( 
    // 目前只会输出挖掘榜
    printl(global_score, 0, false, true);
    print('§7' + '-'*10 + '挖掘榜' + '-'*10); // 输出标题
    mine = [];
    max_len = 1;
    // 初始化两个数据
    for(global_score,
        if(global_score:_:'mined':'total' == null || global_score:_:'mined':'total' == '0',
            continue(););
        max_len = max(max_len, length(_));
        // 如果这个名字的长度大于之前的，就把最大长度换成这个名字的
        put(mine, 0, [_, global_score:_:'mined':'total'], 'insert'));
        // 把所有的数据加到mine里备用，等待排序
    mine = sort_key(mine, -_:1);  // 根据每个挖掘数据的挖掘量进行排序(排序用的分数是挖掘量的倒数,这样可以倒序排列)
    printl(mine, 1, false, true);
    for(mine,
        print(format(' ' + _:0 + ': ' + ' '*(max_len-length(_:0))+ _:1 + ' block')));
        // 依次输出数据
 );
 print_score(type) -> (
    // 输出指定类型的榜单
    mapper = {
        'mined' -> '挖掘',
        'killed' -> '击杀'
    };
    maped_type = mapper:type;
    task_thread('temp', 'score_print', type);
 );
 save_scores() -> (
    print('计分数据保存中');
    for(global_score,
        write_file(global_score_path + _, 'shared_json', global_score:_);
        printl(_ + '\n' + global_score_path + _, 1, false, true));
    print('计分数据保存完毕');
 );
 make_player_score(player) -> (
    score = {'mined'-> {'total'-> 0},
             'kill'-> {}}; // 基本信息
    put(global_score, player, score); // 加到列表里
 );
 __on_player_dies(player) -> (
 	pos = query(player, 'pos');
 	dim = query(player, 'dimension');
    die_pos = str('[x: %d, y:%d, z:%d]', pos);
    if(dim == 'the_nether', dim = '地狱');
    if(dim == 'overworld', dim = '主世界');
    run(str('say ' + str(player) + '在' + dim + ' ' + die_pos + '死亡'));
 );
 __on_player_breaks_block(player, block) -> (
    add_mine(player, block);
 );
 add_mine(player, block) -> (
    block = str(block);
    splayer = query(player, 'name');
    if(!player(splayer),
        return());
    // 如果玩家列表里没有输入的玩家就返回
    if(!has(global_score:splayer),
        make_player_score(splayer));
    // 如果榜单里没有玩家就加入玩家的榜单
    if(!has(global_score:splayer:'mined', block),
        put(global_score:splayer:'mined':block, 1),
        // 如果玩家的记录里没有这个方块就把这个方块加到挖掘列表里
        score = get(global_score:splayer:'mined':block);
        put(global_score:splayer:'mined':block, score + 1));
        // 如果记录里有就 += 1
    full_score = get(global_score:splayer:'mined':'total');
    put(global_score:splayer:'mined':'total', full_score + 1);
    // print(global_score);
 );
 // 加载debug信息
 debug_info = read_file('main', 'json');
 if(debug_info,
    global_debug_level = debug_info:'debug_level');
 // 基本信息初始化
 // 加载分数
 load_scores();
@@ -1,5 +1,14 @@
 __config() -> {
-	'stay_loaded' -> true
+	'stay_loaded' -> true,
 	'commands' -> {
 	    '' -> 'my_pos',
 	    '<player>' -> 'print_pos'
 	},
    'arguments' -> {
 		'player' -> {
 			'type' -> 'players'
        },
    }
 };
 __command() -> (
 	s_player = player();
@@ -34,4 +43,18 @@ __command() -> (
 		))
 	);
 	exit()
-)
+);
 print_pos(request_player) -> (
    name = request_player ~ 'name';
    pos = query(request_player, 'pos');
    dim = query(request_player, 'dimension');
    if(dim == 'overworld',
        o_dim = '主世界';
        run('say ' + name + ' 在主世界的 [x:' + pos:0 + ',y:' + pos:1 + ',z:' + pos:2 + ']向你说话'))
 );
 my_pos() -> (
    print_pos(player())
 );
@@ -1,4 +1,4 @@
-global_version = '1.2.0';
+global_version = '1.4.1';
 __config() -> {
 	'scope' -> 'global',
 	'stay_loaded' -> false
@@ -123,7 +123,7 @@ global_bl = ['stone', 'granite', 'polished_granite', 'diorite', 'polished_diorit
    'magenta_candle', 'light_blue_candle', 'yellow_candle', 'lime_candle', 'pink_candle', 'gray_candle', 'light_gray_candle', 
    'cyan_candle', 'purple_candle', 'blue_candle', 'brown_candle', 'green_candle', 'red_candle', 'black_candle'
 ];
-__restore(pl, s_player) ->(
+__restore(pl) ->(
 	scoreboard_remove('killCounter');
 	scoreboard_remove('digCounter');
 	scoreboard_remove('deathCounter');
@@ -131,6 +131,7 @@ __restore(pl, s_player) ->(
 	scoreboard_remove('fishingCounter');
 	scoreboard_remove('damageTaken');
 	scoreboard_remove('activation');
 	scoreboard_remove('fz.aviate1m');
 	scoreboard_remove('totalList');
 	scoreboard_add('killCounter');
 	scoreboard_add('digCounter');
@@ -139,6 +140,7 @@ __restore(pl, s_player) ->(
 	scoreboard_add('fishingCounter');
 	scoreboard_add('damageTaken');
 	scoreboard_add('activation');
 	scoreboard_add('fz.aviate1m');
 	scoreboard_add('totalList');
 	total_actime = 0;
 	total_death = 0;
@@ -147,11 +149,21 @@ __restore(pl, s_player) ->(
 	total_killed = 0;
 	total_traded = 0;
 	total_hurt = 0;
    failed_list = [];
 	c_for(i = 0, i < length(pl), i += 1,
 		run('player ' + pl:i + ' spawn');
 		game_tick(50);
        if(player(pl:i) != pl:i,
            put(failed_list, length(failed_list), pl:i);
        );
 		//滑翔距离
        //mc会统计多一倍的数据，所以除以200
 		aviate = statistic(pl:i, 'custom', 'aviate_one_cm')/200;
 		print(aviate);
 		scoreboard('fz.aviate1m', pl:i, aviate);
 		total_aviate += aviate;
 		//活跃时间
-		actime = statistic(pl:i, 'custom', 'play_one_minute')/72000;
+		actime = statistic(pl:i, 'custom', 'play_time')/72000;
 		print(actime);
 		scoreboard('activation', pl:i, actime);
 		total_actime += actime;
@@ -205,14 +217,19 @@ __restore(pl, s_player) ->(
 	scoreboard('totalList', '总在线时间(h)', total_actime);
 	scoreboard('damageTaken', '群p抖M', total_hurt);
 	scoreboard('totalList', '群p抖M', total_hurt);
 	scoreboard('fz.aviate1m', '总滑翔距离', total_aviate);
 	scoreboard('totalList', '总滑翔距离', total_aviate);
 	game_tick(50);
-    print('完成！');
+	run('function fz:scoreboards/install');
-	run('function fz:scoreboards/install')
+    return(failed_list);
 );
 by_whitelist() ->(
 	pl = keys(system_info('server_whitelist'));
 	s_player = player();
 	game_tick(50);
-	__restore(pl, s_player);
+    failed_list = __restore(pl);
 	if(failed_list != [],
        print(' : ( 这些玩家恢复失败了：' + failed_list);
    );
    print('完成！');
 	return()
 )
@@ -0,0 +1,56 @@
 """
 writen by shenjackyuanjie
 mail:   3695888@qq.com
 github: @shenjackyuanjie
 gitee:  @shenjackyuanjie
 """
 #  -------------------------------
 #  Census loader
 #  Copyright © 2021 by shenjackyuanjie
 #  All rights reserved
 #  -------------------------------
 import os
 import json
 USERCACHE_PATH = os.path.join('server', 'usercache.json')
 STATS_DIR = os.path.join('server', 'world', 'stats')
 DATA_DIR = os.path.join('server', 'world', 'scripts')
 CENSUS_DIR = os.path.join('server', 'world', 'scripts', 'shared', 'census')
 # 引号内字符匹配错误
 # text in the quote is not matched
 if __name__ == '__main__':
    # 加载玩家名列表
    with open(USERCACHE_PATH, 'r') as cache_file:
        uuid_cache = json.load(cache_file)  # type: list
    uuid_list = {}
    # 如果玩家名称不是bot就存进列表里
    for name in uuid_cache:
        if name['name'][:3].lower() == 'bot':
            continue
        uuid_list[name['name']] = name['uuid']
    # 检测是否存在census的文件夹
    if 'shared' not in os.listdir(DATA_DIR):
        os.mkdir(DATA_DIR + '/shared')
    if 'census' not in os.listdir(DATA_DIR + '/shared'):
        os.mkdir(CENSUS_DIR)
    for uuid in uuid_list:
        # 加载玩家的统计数据
        with open(os.path.join(STATS_DIR, uuid_list[uuid] + '.json'), 'r') as stats_file:
            stats = json.load(stats_file)  # type: dict
        # 计算玩家的分数
        player_score = {}
        for score_type in stats['stats']:  # 类型,比如 mined
            player_score[score_type[10:]] = {}  # 创建字典套娃
            count = 0
            for score in stats['stats'][score_type]:  # 类型中的每一种"东西"
                count += stats['stats'][score_type][score]  # 统计每种东西的数量
                player_score[score_type[10:]][score[10:]] = stats['stats'][score_type][score]
            player_score[score_type[10:]]['total'] = count
        # pprint(player_score)
        file_name = f'{CENSUS_DIR}/{uuid}.json'
        with open(file_name, 'w') as census_file:
            json.dump(player_score, census_file)
Author	SHA1	Message	Date
延皓	f282dd764d	update README.md. Signed-off-by: 延皓 <harvey_husky@foxmail.com>	2023-07-24 12:45:29 +00:00
延皓	3547afe136	upload vscode settings	2022-08-16 21:27:38 +08:00
延皓	80633006d5	update LICENSE.	2022-05-29 16:12:29 +00:00
shenjack	1a6995573f	加了计分板加载完成提示	2022-05-11 13:50:04 +00:00
shenjack	7500264600	更新一下census	2022-05-11 12:13:29 +00:00
延皓	4befe7ba98	update README.md.	2021-11-23 03:14:17 +00:00
延皓	8d8aff29f7	update README.md.	2021-11-19 13:12:53 +00:00
延皓	192bc00801	update README.md.	2021-11-19 13:11:19 +00:00
延皓	776c28eb99	update README.md.	2021-11-17 03:34:12 +00:00
沈瑗杰	6b5ae5bb7d	rua	2021-11-16 17:49:46 +08:00
延皓	9a3a04c390	删除文件 census.sc	2021-11-16 06:09:25 +00:00
延皓	0004f87a2f	删除文件脚本/s.sc	2021-11-16 06:03:33 +00:00
延皓	ae5f248a6c	删除文件脚本/c.sc	2021-11-16 06:03:22 +00:00
沈瑗杰	7672c27feb	rua	2021-11-16 00:10:49 +08:00
沈瑗杰	bcee791238	更新啦！	2021-11-16 00:10:00 +08:00
沈瑗杰	8cab44655a	2.2 pre1	2021-11-16 00:04:08 +08:00
延皓	ad21d9e25b	!19 【轻量级 PR】：加了一行 Merge pull request !19 from shenjack/N/A	2021-10-02 01:15:59 +00:00
shenjack	0c4e64bcb9	加了一行	2021-10-01 09:39:31 +00:00
延皓	12d1b54b9e	!18 【轻量级 PR】：我真的受不了了（太长不看直接安装教程） Merge pull request !18 from shenjack/N/A	2021-10-01 09:35:13 +00:00
shenjack	34ab86a3fc	我真的受不了了（太长不看直接安装教程）	2021-10-01 09:34:03 +00:00
延皓	89e30ed035	!17 一些文档上的修改 Merge pull request !17 from shenjack/N/A	2021-09-20 09:29:50 +00:00
shenjack	886690f883	一些文档上的修改	2021-09-20 09:26:07 +00:00
shenjack	eaf299bae9	!16 census的添加！ * 一些小改动，添加了census	2021-09-19 06:06:49 +00:00
沈瑗杰	41b2cf8fcc	一些小改动，添加了census	2021-09-16 23:52:32 +08:00
延皓	7df5c34da2	update CHANGELOG.md.	2021-09-11 05:33:30 +00:00
延皓	17ee74a97f	update README.md.	2021-09-05 17:22:43 +00:00
延皓	073e697bc6	!15 README 严重错误使用指引修正以及脚本安装指引 Merge pull request !15 from MSDNicrosoft/2.1-dev	2021-08-12 08:33:01 +00:00
MSDNicrosoft	f930ac4c67	符号统一	2021-08-12 08:26:47 +00:00
MSDNicrosoft	dbe89fa202	地毯脚本安装提示美化	2021-08-12 08:25:44 +00:00
MSDNicrosoft	b2e2756cc4	地毯脚本安装提示添加	2021-08-12 08:22:43 +00:00
MSDNicrosoft	8945fa535f	错误的指引修正	2021-08-12 08:17:05 +00:00
延皓	b663eab823	tagplayer2.5.0	2021-08-07 01:01:57 +08:00
延皓	187c4e7cdf	tagplayer2.5.0	2021-08-07 01:00:36 +08:00
延皓	bca65157bb	tagplayer 2.5.0	2021-08-07 00:44:59 +08:00
延皓	de2d8d51d1	Merge branch '2.1-dev' of https://gitee.com/harvey-husky/FZ-sDatapack into 2.1-dev	2021-08-05 22:19:52 +08:00
延皓	3e2e94b29a	restore_scores1.4.1	2021-08-05 22:19:29 +08:00
延皓	31d243e4d0	!14 README 美化和更新记录与 README 分离 Merge pull request !14 from MSDNicrosoft/2.1-dev	2021-08-05 14:05:55 +00:00
延皓	87ac15a68d	restore_scores 1.4.0	2021-08-05 20:49:51 +08:00
MSDNicrosoft	0c08be3917	链接修正	2021-08-03 10:57:12 +08:00
MSDNicrosoft	18bea49a60	链接格式修正	2021-08-03 10:29:20 +08:00
MSDNicrosoft	25ba70fe8c	CHANGELOG.md 错别字修改	2021-08-03 10:28:42 +08:00
MSDNicrosoft	44780a9693	链接错误修正	2021-08-03 10:25:58 +08:00
MSDNicrosoft	be8ceb6cf9	CHANGELOG.md 错别字修改	2021-08-03 10:21:26 +08:00
MSDNicrosoft	65ad314162	链接格式修正	2021-08-03 10:20:01 +08:00
MSDNicrosoft	8d44a20c95	CHANGELOG.md 错别字修改	2021-08-03 10:14:12 +08:00
MSDNicrosoft	fd48b203b0	CHANGELOG.md 错别字修改	2021-08-03 10:14:05 +08:00
MSDNicrosoft	c6b67e3b71	README 美化和更新记录与 README 分离	2021-08-03 10:07:17 +08:00
延皓	4d7dbe3805	2.1.3	2021-08-03 07:08:35 +08:00
延皓	fd1543bce0	完善更新模块	2021-08-03 06:52:38 +08:00
延皓	13ec1d9b9a	更新restore_score \| 美化README，作者：Max_小葵 \| 实验性：重新设计版本更新功能	2021-08-03 06:30:28 +08:00
延皓	e3a7b02a63	2.1.2	2021-07-26 05:55:34 +08:00
延皓	d9ee3053dc	2.1.2	2021-07-21 01:44:21 +08:00
延皓	42407cb282	2.1.2	2021-07-21 01:36:25 +08:00
延皓	0e1d861251	2.1.2	2021-07-21 01:25:21 +08:00
延皓	bdd29fe6e4	2.1.2	2021-07-21 01:16:48 +08:00
延皓	20f5e2f4b7	2.1.1	2021-07-20 02:03:08 +08:00
延皓	be13adae4e	2.1.1	2021-07-20 01:59:08 +08:00
延皓	a116ba2931	2.1.1	2021-07-20 01:52:26 +08:00
		`@@ -0,0 +1,2 @@`
							`#将交易榜显示给轮播记分板的队伍（金队）`
							`scoreboard objectives setdisplay sidebar.team.gold fz.aviate1m`
`@@ -1,2 +1,2 @@`
	`#将破基岩榜显示给轮播计分板的队伍（金队）`	`#将破基岩榜显示给轮播计分板的队伍（金队）`
	`scoreboard objectives setdisplay sidebar.team.dark_gray bedrockBreaked`	`scoreboard objectives setdisplay sidebar.team.gold bedrockBreaked`
		`@@ -0,0 +1,2 @@`
							`execute unless score version3 fz.cache = newVersion3 fz.cache run function fz:start/update`
							`execute if score version3 fz.cache = newVersion3 fz.cache run function fz:start/start`