diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 9ae9417..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,143 +0,0 @@ -# 更新记录 - ->所有可查阅的更改记录皆可在此处找到 - -### 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 - -- 重写 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 94a9ed0..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -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 -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. diff --git a/README.md b/README.md deleted file mode 100644 index 8d8f650..0000000 --- a/README.md +++ /dev/null @@ -1,148 +0,0 @@ -# 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://fabricmc.net/) - -#### @Author: Harvey_Husky - -#### This project is licensed under the terms of the GNU General Public License v3.0 - -#### Copyright (C) 2019-2021 Harvey_Husky - -[B站链接](https://www.bilibili.com/read/cv4267319) - -## 说明太长不想看·直接安装教程 - -- 1.前往 [发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases) 下载此数据包 -- 2.从zip文件中提取出几个`.sc`文件 -- 3.在`world`文件夹中创建`datapacks`和`scripts`两个文件夹 -- 4.将主体`zip`文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`） -- 5.将提取出来的`.sc`文件放到 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts`） -- 6.在控制台输入`/reload`（客户端则是重新进入世界） - -## 总览 - -![release版本](https://img.shields.io/badge/发行版-2.1.2-blue.svg) - -![开发版本](https://img.shields.io/badge/开发中-2.2_pre1-blue.svg) - -![设置界面](./图片示例：设置界面.png) - -- 抬头并按一下 `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`：用于控制是否允许传送假人 - - `allow_spawning_whitelist_players`：用于控制是否允许生成白名单内的玩家 -- 使用方法： - - 安装 [Carpet](https://github.com/gnembon/fabric-carpet/releases) Mod - - 输入`/script load tagplayer`加载工具 - - 包含全部地毯假人自带的功能，如： - - `/tagplayer use xxx once`让假人xxx按一次使用键 - - 包含新功能，如： - - `/tagplayer check xxx`：检查玩家的状态 - - `/tagplayer checkall`：检查所有玩家的状态 - - `/tagplayer killall`：清除所有假人 - - 其他用法可以在游戏内输入 `/tagplayer` 查看 - -### `restore_scores.sc` - -- 从数据包 `v1.4` 升级时也需要使用这个工具 -- 这个工具可以从白名单读取玩家列表，逐一召唤假人，读取统计信息并赋值给记分板 - - 如未开启白名单，请把 `usercache.json` 复制一份改成 `whitelist.json` 再进行操作 -- ***注意：原有的记分板会被删除*** -- 使用方法： - - 输入 `/script load restore_scores` 加载工具 - - 输入 `/restore_scores by_whitelist` 开始数据迁移 - - 输入 `/script unload restore_scores` 卸载工具 - - 记得用完就删掉它！ - -### `Census.sc` - -- `/census` -- 一个还在测试的脚本，可以输出挖掘榜 diff --git a/data/fz/advancements/config/sneak.json b/data/fz/advancements/config/sneak.json deleted file mode 100644 index 198a225..0000000 --- a/data/fz/advancements/config/sneak.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "criteria": { - "config_check_sneak":{ - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_sneaking": true - } - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/data/fz/advancements/config/unsneak.json b/data/fz/advancements/config/unsneak.json deleted file mode 100644 index a6e6f8d..0000000 --- a/data/fz/advancements/config/unsneak.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "criteria": { - "config_check_sneak":{ - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "player": { - "advancements": { - "fz:config/sneak": true - } - }, - "flags": { - "is_sneaking": false - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:config/unsneak" - } -} \ No newline at end of file diff --git a/data/fz/advancements/leavegame.json b/data/fz/advancements/leavegame.json deleted file mode 100644 index b52bc49..0000000 --- a/data/fz/advancements/leavegame.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "criteria": { - "leave_game": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "leaveGame": { - "max": 0 - } - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:login/onlogin" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/activation.json b/data/fz/advancements/scoreboards/activation.json deleted file mode 100644 index 3107c34..0000000 --- a/data/fz/advancements/scoreboards/activation.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "criteria": { - "activation": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "actimeCounter": { - "min": 3600 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/activation/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/aviate1m.json b/data/fz/advancements/scoreboards/aviate1m.json deleted file mode 100644 index 662b02c..0000000 --- a/data/fz/advancements/scoreboards/aviate1m.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "criteria": { - "activation": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "fz.aviateCounter": { - "min": 200 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/aviate1m/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/bedrockbreaked.json b/data/fz/advancements/scoreboards/bedrockbreaked.json deleted file mode 100644 index c7b54e5..0000000 --- a/data/fz/advancements/scoreboards/bedrockbreaked.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "criteria": { - "damage_taken": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "fz.bbl": { - "min": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/bedrockbreaked/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/damagetaken.json b/data/fz/advancements/scoreboards/damagetaken.json deleted file mode 100644 index 783a077..0000000 --- a/data/fz/advancements/scoreboards/damagetaken.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "criteria": { - "damage_taken": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "10xDamageTaken": { - "min": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/damagetaken/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/deathcounter.json b/data/fz/advancements/scoreboards/deathcounter.json deleted file mode 100644 index af2b7e4..0000000 --- a/data/fz/advancements/scoreboards/deathcounter.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "criteria": { - "death_counter": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "deathTester": { - "min": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/deathcounter/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/digcounter/digtrigger.json b/data/fz/advancements/scoreboards/digcounter/digtrigger.json deleted file mode 100644 index 10de185..0000000 --- a/data/fz/advancements/scoreboards/digcounter/digtrigger.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "criteria": { - "used_tools": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:entity_scores", - "scores": { - "usedWooShovel": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedWooPickaxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedWooHoe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedWooAxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedStoShovel": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedStoPickaxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedStoHoe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedStoAxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedNetShovel": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedNetPickaxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedNetHoe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedNetAxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedIroShovel": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedIroPickaxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedIroHoe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedIroAxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedGolShovel": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedGolPickaxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedGolHoe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedGolAxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedDiaShovel": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedDiaPickaxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedDiaHoe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedDiaAxe": { - "min": 1 - } - }, - "entity": "this" - }, - { - "condition": "minecraft:entity_scores", - "scores": { - "usedShears": { - "min": 1 - } - }, - "entity": "this" - } - ] - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/digcounter/digtrigger" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/digcounter/toolsfix.json b/data/fz/advancements/scoreboards/digcounter/toolsfix.json deleted file mode 100644 index 0fba25b..0000000 --- a/data/fz/advancements/scoreboards/digcounter/toolsfix.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "criteria": { - "right_click_tools": { - "trigger": "minecraft:item_used_on_block", - "conditions": { - "item": { - "items": [ - "golden_axe", - "golden_hoe", - "golden_shovel", - "wooden_axe", - "wooden_hoe", - "wooden_shovel", - "diamond_axe", - "diamond_hoe", - "diamond_shovel", - "iron_axe", - "iron_hoe", - "iron_shovel", - "stone_axe", - "stone_hoe", - "stone_shovel", - "netherite_axe", - "netherite_hoe", - "netherite_shovel" - ] - }, - "location": { - "block": { - "blocks": [ - "dirt_path", - "farmland", - "oak_log", - "stripped_birch_log", - "stripped_acacia_log", - "stripped_jungle_log", - "stripped_spruce_log", - "stripped_dark_oak_log", - "stripped_warped_stem", - "stripped_crimson_stem", - "stripped_oak_wood", - "stripped_birch_wood", - "stripped_acacia_wood", - "stripped_jungle_wood", - "stripped_spruce_wood", - "stripped_dark_oak_wood", - "stripped_warped_hyphae", - "stripped_crimson_hyphae" - ] - } - } - } - } - }, - "rewards": { - "function": "fz:scoreboards/digcounter/toolsfix" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/digcounter/toolsfix2.json b/data/fz/advancements/scoreboards/digcounter/toolsfix2.json deleted file mode 100644 index 633f1a7..0000000 --- a/data/fz/advancements/scoreboards/digcounter/toolsfix2.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "criteria": { - "tools_hit_entities": { - "trigger": "minecraft:player_hurt_entity", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "iron_axe", - "stone_axe", - "golden_axe", - "wooden_axe", - "diamond_axe", - "netherite_axe", - "iron_shovel", - "stone_shovel", - "golden_shovel", - "wooden_shovel", - "diamond_shovel", - "netherite_shovel", - "iron_hoe", - "stone_hoe", - "golden_hoe", - "wooden_hoe", - "diamond_hoe", - "netherite_hoe", - "iron_pickaxe", - "stone_pickaxe", - "golden_pickaxe", - "wooden_pickaxe", - "diamond_pickaxe", - "netherite_pickaxe" - ] - } - } - } - } - ] - } - } - }, - "rewards": {"function": "fz:scoreboards/digcounter/toolsfix2"} -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/fishingcounter.json b/data/fz/advancements/scoreboards/fishingcounter.json deleted file mode 100644 index a8e658d..0000000 --- a/data/fz/advancements/scoreboards/fishingcounter.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "criteria": { - "fishing_counter": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "fishingTester": { - "min": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/fishingcounter/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/killcounter.json b/data/fz/advancements/scoreboards/killcounter.json deleted file mode 100644 index 813a1bb..0000000 --- a/data/fz/advancements/scoreboards/killcounter.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "criteria": { - "kill_counter": { - "trigger": "minecraft:player_killed_entity", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "carpetBot": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/killcounter/calculator" - } -} \ No newline at end of file diff --git a/data/fz/advancements/scoreboards/tradingcounter.json b/data/fz/advancements/scoreboards/tradingcounter.json deleted file mode 100644 index c38c72d..0000000 --- a/data/fz/advancements/scoreboards/tradingcounter.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "criteria": { - "trading_counter": { - "trigger": "minecraft:villager_trade", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "carpetBot": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "fz:scoreboards/tradingcounter/calculator" - } -} \ No newline at end of file diff --git a/data/fz/functions/carpet/autosetup.mcfunction b/data/fz/functions/carpet/autosetup.mcfunction deleted file mode 100644 index 2f956a3..0000000 --- a/data/fz/functions/carpet/autosetup.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#给萌新辅助自动配置地毯优化和功能的函数 -carpet setDefault language zh_cn -carpet setDefault antiCheatDisabled true -carpet setDefault combineXPOrbs true -carpet setDefault persistentParrots true -carpet setDefault stackableShulkerBoxes true -carpet setDefault lagFreeSpawning true -carpet setDefault ctrlQCraftingFix true -carpet setDefault flippinCactus true -carpet setDefault missingTools true -carpet setDefault smoothClientAnimations true -carpet setDefault optimizedTNT true -carpet setDefault leadFix true -carpet setDefault placementRotationFix true -carpet setDefault xpNoCooldown true -carpet setDefault defaultLoggers mobcaps,tps -carpet setDefault commandTick true -carpet setDefault commandTrackAI true \ No newline at end of file diff --git a/data/fz/functions/carpet/carpet.mcfunction b/data/fz/functions/carpet/carpet.mcfunction deleted file mode 100644 index 315580e..0000000 --- a/data/fz/functions/carpet/carpet.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#初始化tagplayer -carpet setDefault commandScript true -carpet setDefault commandScriptACE ops -script run carpet_rules = system_info('world_carpet_rules'); if(carpet_rules:'scriptsAutoload' != 'true', run('carpet setDefault scriptsAutoload true'); run('tellraw @a {"text":"[错误]假人插件未正确加载，已自动将“scriptsAutoload”设为true。正在重载，如仍未加载，请手动加载...", "color":"#ff6100"}'); run('reload')) -script unload player diff --git a/data/fz/functions/config/display.mcfunction b/data/fz/functions/config/display.mcfunction deleted file mode 100644 index 2705174..0000000 --- a/data/fz/functions/config/display.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#设置或重设超时时间为300s，超时后运行timeout函数 -schedule function fz:config/timeout 300s -#输出玩家可见的设置页面 -##扫地机 -execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"} - ##扫地机时间，对应分数1478966210-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: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: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: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: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: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: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: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: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:survival installed{scoreboards: 1b} run tellraw @s {"text": "记分板：","color": "#ccff00"} - ##计分板显示，对应分数1838019370-1838019379 - 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: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: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"}}] \ No newline at end of file diff --git a/data/fz/functions/config/install.mcfunction b/data/fz/functions/config/install.mcfunction deleted file mode 100644 index e44be2e..0000000 --- a/data/fz/functions/config/install.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#安装设置功能 -#初始化触发器记分板 -scoreboard objectives add config trigger -#存入已安装信息 -data modify storage fz:survival installed.config set value 1b -#提示已安装 -tellraw @a {"text": "[信息]设置功能已安装","color": "#5fff00"} -#开始运行 -function fz:config/start \ No newline at end of file diff --git a/data/fz/functions/config/main.mcfunction b/data/fz/functions/config/main.mcfunction deleted file mode 100644 index 4b87f9b..0000000 --- a/data/fz/functions/config/main.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#主函数 -#允许玩家操作config记分板 -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 1838019368..1838019379 run function fz:scoreboards/config -#循环执行本函数 -schedule function fz:config/main 1t \ No newline at end of file diff --git a/data/fz/functions/config/start.mcfunction b/data/fz/functions/config/start.mcfunction deleted file mode 100644 index 4ec825f..0000000 --- a/data/fz/functions/config/start.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#删除进程残留 -schedule clear fz:config/main -schedule clear fz:config/timeout -data remove storage fz.config is_open -scoreboard players enable @a config -advancement revoke @a only fz:config/sneak -advancement revoke @a only fz:config/unsneak -#测试用的输出 -tellraw @a {"text": "[信息]设置功能已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/config/timeout.mcfunction b/data/fz/functions/config/timeout.mcfunction deleted file mode 100644 index 82b3025..0000000 --- a/data/fz/functions/config/timeout.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#关闭主进程 -schedule clear fz:config/main -#输出给打开过设置界面的玩家的消息 -tellraw @a[scores={openingConfig=1}] {"text": "[提醒]5分钟无任何人回应，为节省性能，已关闭设置功能，请重新唤起","color": "#66ffff"} -#重置打开过设置界面的玩家的列表 -scoreboard objectives remove openingConfig -#移除设置界面被打开的信息 -data remove storage fz.config is_open \ No newline at end of file diff --git a/data/fz/functions/config/turnon.mcfunction b/data/fz/functions/config/turnon.mcfunction deleted file mode 100644 index f322ebc..0000000 --- a/data/fz/functions/config/turnon.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#触发函数，由成就和unsneak函数控制 -#重置玩家的config分数，避免开启设置功能后，由于该玩家先前的分数而直接运行某些功能 -scoreboard players reset @s config -#判断设置功能是否已经开启，如果未开启则运行主函数 -execute unless data storage fz.config {is_open: 1b} run function fz:config/main -execute unless data storage fz.config {is_open: 1b} run scoreboard objectives add openingConfig dummy -execute unless data storage fz.config {is_open: 1b} run data merge storage fz.config {is_open: 1b} -#将该玩家加入打开设置页面的玩家的列表 -scoreboard players set @s openingConfig 1 -#将设置内容输出给玩家 -function fz:config/display \ No newline at end of file diff --git a/data/fz/functions/config/uninstall.mcfunction b/data/fz/functions/config/uninstall.mcfunction deleted file mode 100644 index 14483b4..0000000 --- a/data/fz/functions/config/uninstall.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#卸载设置功能 -#移除进程残留 -schedule clear fz:config/main -schedule clear fz:config/timeout -data remove storage fz.config is_open -#写入已卸载的信息 -data modify storage fz:survival installed.config set value 0b -#提示已卸载 -tellraw @a {"text": "[信息]设置功能已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/config/unsneak.mcfunction b/data/fz/functions/config/unsneak.mcfunction deleted file mode 100644 index 02cca45..0000000 --- a/data/fz/functions/config/unsneak.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#由config/sneak和config/unsneak成就触发 -#判断玩家视角是否指向正上方，是则运行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 \ No newline at end of file diff --git a/data/fz/functions/health/install.mcfunction b/data/fz/functions/health/install.mcfunction deleted file mode 100644 index 0e5bcce..0000000 --- a/data/fz/functions/health/install.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#安装血量显示 -#初始化 -scoreboard objectives add Health health {"text": "cm","color": "yellow"} -scoreboard objectives modify Health rendertype hearts -scoreboard objectives setdisplay list Health -scoreboard objectives setdisplay belowName Health -#写入已安装的信息 -data modify storage fz:survival installed.health set value 1b -#提示已安装 -tellraw @a {"text": "[信息]血量显示已安装","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/health/uninstall.mcfunction b/data/fz/functions/health/uninstall.mcfunction deleted file mode 100644 index 0f06464..0000000 --- a/data/fz/functions/health/uninstall.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#卸载血量显示 -#删除计分板 -scoreboard objectives remove Health -#写入已卸载的信息 -data modify storage fz:survival installed.health set value 0b -#提示已卸载 -tellraw @a {"text": "[信息]血量显示已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/install.mcfunction b/data/fz/functions/install.mcfunction deleted file mode 100644 index b882c47..0000000 --- a/data/fz/functions/install.mcfunction +++ /dev/null @@ -1,42 +0,0 @@ - -#用于储存参数的记分板 -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 -#检测玩家退出游戏的记分板 -scoreboard objectives add leaveGame minecraft.custom:minecraft.leave_game -#安装各功能 -function fz:config/install -function fz:sweeper/install -function fz:scoreboards/install -function fz:health/install -function fz:login/logintips/install -function fz:carpet/carpet -#版本信息 -data modify storage fz:survival version set from storage fz:survival newVersion -data modify storage fz:survival date set value "2020-7.21" -data modify storage fz:survival time set value "1:14" -#提示已安装 -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"} \ No newline at end of file diff --git a/data/fz/functions/load.mcfunction b/data/fz/functions/load.mcfunction deleted file mode 100644 index 456fc1e..0000000 --- a/data/fz/functions/load.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#新版本号 -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:survival installed{datapack: 1b} unless data storage fz:survival installed{datapack: 0b} run function fz:install -#输出版本信息 -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"}] \ No newline at end of file diff --git a/data/fz/functions/login/logintips/install.mcfunction b/data/fz/functions/login/logintips/install.mcfunction deleted file mode 100644 index 63a3b7f..0000000 --- a/data/fz/functions/login/logintips/install.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#安装登陆提示 -data modify storage fz:survival installed.logintips set value 1b -#提示已安装 -tellraw @a {"text": "[信息]登陆提示已安装","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/login/logintips/uninstall.mcfunction b/data/fz/functions/login/logintips/uninstall.mcfunction deleted file mode 100644 index 3799ce9..0000000 --- a/data/fz/functions/login/logintips/uninstall.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#卸载登陆提示 -data modify storage fz:survival installed.logintips set value 0b -#提示已卸载 -tellraw @a {"text": "[信息]登陆提示已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/login/onlogin.mcfunction b/data/fz/functions/login/onlogin.mcfunction deleted file mode 100644 index a80ee2b..0000000 --- a/data/fz/functions/login/onlogin.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -execute if data storage fz:survival installed{logintips: 1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"} - -scoreboard players set @s leaveGame 0 - -advancement revoke @s only fz:scoreboards/activation -advancement revoke @s only fz:scoreboards/damagetaken -advancement revoke @s only fz:scoreboards/deathcounter -advancement revoke @s only fz:scoreboards/fishingcounter -advancement revoke @s only fz:scoreboards/killcounter -advancement revoke @s only fz:scoreboards/tradingcounter -advancement revoke @s only fz:scoreboards/digcounter/digtrigger -advancement revoke @s only fz:scoreboards/digcounter/toolsfix -advancement revoke @s only fz:scoreboards/digcounter/toolsfix2 -advancement revoke @s only fz:config/sneak -advancement revoke @s only fz:config/unsneak - -execute if data storage fz:survival installed{datapack: 1b} run advancement revoke @s from fz:leavegame \ No newline at end of file diff --git a/data/fz/functions/scoreboards/activation/calculator.mcfunction b/data/fz/functions/scoreboards/activation/calculator.mcfunction deleted file mode 100644 index 286ceee..0000000 --- a/data/fz/functions/scoreboards/activation/calculator.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#计算在线时间和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s activation += 1 calculator -execute unless score @s carpetBot matches 1 run scoreboard players operation 总在线时间(h) activation += 1 calculator -execute unless score @s carpetBot matches 1 run scoreboard players operation 总在线时间(h) totalList += 1 calculator -#重置玩家计时器 -scoreboard players reset @s actimeCounter -#重置触发该函数的成就 -advancement revoke @s only fz:scoreboards/activation \ No newline at end of file diff --git a/data/fz/functions/scoreboards/activation/main.mcfunction b/data/fz/functions/scoreboards/activation/main.mcfunction deleted file mode 100644 index f3f95d8..0000000 --- a/data/fz/functions/scoreboards/activation/main.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#主函数给在线玩家的计时器1s+1分 -scoreboard players add @a actimeCounter 1 -schedule function fz:scoreboards/activation/main 1s \ No newline at end of file diff --git a/data/fz/functions/scoreboards/activation/setdisplay.mcfunction b/data/fz/functions/scoreboards/activation/setdisplay.mcfunction deleted file mode 100644 index 1076882..0000000 --- a/data/fz/functions/scoreboards/activation/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将在线时间榜显示给轮播计分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold activation \ No newline at end of file diff --git a/data/fz/functions/scoreboards/aviate1m/calculator.mcfunction b/data/fz/functions/scoreboards/aviate1m/calculator.mcfunction deleted file mode 100644 index df423a4..0000000 --- a/data/fz/functions/scoreboards/aviate1m/calculator.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#计算滑翔距离和总榜 -#判断条件用于排除地毯小人 -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 \ No newline at end of file diff --git a/data/fz/functions/scoreboards/aviate1m/setdisplay.mcfunction b/data/fz/functions/scoreboards/aviate1m/setdisplay.mcfunction deleted file mode 100644 index 84c3cdf..0000000 --- a/data/fz/functions/scoreboards/aviate1m/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将交易榜显示给轮播记分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold fz.aviate1m \ No newline at end of file diff --git a/data/fz/functions/scoreboards/bedrockbreaked/calculator.mcfunction b/data/fz/functions/scoreboards/bedrockbreaked/calculator.mcfunction deleted file mode 100644 index fbcef61..0000000 --- a/data/fz/functions/scoreboards/bedrockbreaked/calculator.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#计算受破基岩量和总榜 -#判断条件用于排除地毯小人 -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 -scoreboard players reset @s fz.bbl -#重置触发该函数的成就 -advancement revoke @s only fz:scoreboards/bedrockbreaked \ No newline at end of file diff --git a/data/fz/functions/scoreboards/bedrockbreaked/setdisplay.mcfunction b/data/fz/functions/scoreboards/bedrockbreaked/setdisplay.mcfunction deleted file mode 100644 index 3097ddc..0000000 --- a/data/fz/functions/scoreboards/bedrockbreaked/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将破基岩榜显示给轮播计分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold bedrockBreaked \ No newline at end of file diff --git a/data/fz/functions/scoreboards/config.mcfunction b/data/fz/functions/scoreboards/config.mcfunction deleted file mode 100644 index d427da6..0000000 --- a/data/fz/functions/scoreboards/config.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#应用计分板显示，对应分数1838019369-1838019379 -execute if score @s config matches 1838019370 run team leave @s -execute if score @s config matches 1838019371 run team join gold -execute if score @s config matches 1838019372 run team join aqua -execute if score @s config matches 1838019373 run team join yellow -execute if score @s config matches 1838019374 run team join dark_red -execute if score @s config matches 1838019375 run team join gray -execute if score @s config matches 1838019376 run team join blue -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 \ No newline at end of file diff --git a/data/fz/functions/scoreboards/damagetaken/calculator.mcfunction b/data/fz/functions/scoreboards/damagetaken/calculator.mcfunction deleted file mode 100644 index 46d90fb..0000000 --- a/data/fz/functions/scoreboards/damagetaken/calculator.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#计算受伤害量和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s 10xDamageTaken /= 10 calculator -execute unless score @s carpetBot matches 1 run scoreboard players operation @s damageTaken += @s 10xDamageTaken -execute unless score @s carpetBot matches 1 run scoreboard players operation 群p抖M damageTaken += @s 10xDamageTaken -execute unless score @s carpetBot matches 1 run scoreboard players operation 群p抖M totalList += @s 10xDamageTaken -#重置伤害探测记分板 -scoreboard players reset @s 10xDamageTaken -#重置触发该函数的成就 -advancement revoke @s only fz:scoreboards/damagetaken \ No newline at end of file diff --git a/data/fz/functions/scoreboards/damagetaken/setdisplay.mcfunction b/data/fz/functions/scoreboards/damagetaken/setdisplay.mcfunction deleted file mode 100644 index 28dc770..0000000 --- a/data/fz/functions/scoreboards/damagetaken/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将抖M榜显示给轮播记分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold damageTaken \ No newline at end of file diff --git a/data/fz/functions/scoreboards/deathcounter/calculator.mcfunction b/data/fz/functions/scoreboards/deathcounter/calculator.mcfunction deleted file mode 100644 index ca06270..0000000 --- a/data/fz/functions/scoreboards/deathcounter/calculator.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#计算死亡数和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s deathCounter += @s deathTester -execute unless score @s carpetBot matches 1 run scoreboard players operation 全部木大 deathCounter += @s deathTester -execute unless score @s carpetBot matches 1 run scoreboard players operation 全部木大 totalList += @s deathTester -#重置死亡探测记分板 -scoreboard players reset @s deathTester -#重置触发该函数的成就 -advancement revoke @s only fz:scoreboards/deathcounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/deathcounter/setdisplay.mcfunction b/data/fz/functions/scoreboards/deathcounter/setdisplay.mcfunction deleted file mode 100644 index 9799976..0000000 --- a/data/fz/functions/scoreboards/deathcounter/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将死亡榜显示给轮播计分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold deathCounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/delscore.mcfunction b/data/fz/functions/scoreboards/delscore.mcfunction deleted file mode 100644 index 65e356d..0000000 --- a/data/fz/functions/scoreboards/delscore.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#计分板数据将永久失去（真的很久！） -scoreboard objectives remove killCounter -scoreboard objectives remove digCounter -scoreboard objectives remove deathCounter -scoreboard objectives remove tradingCounter -scoreboard objectives remove fishingCounter -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"} \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/digtrigger.mcfunction b/data/fz/functions/scoreboards/digcounter/digtrigger.mcfunction deleted file mode 100644 index a319a23..0000000 --- a/data/fz/functions/scoreboards/digcounter/digtrigger.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -#判断各工具是否被使用并运行相应函数计算挖掘榜（左右键都会探测） -#需要配合修正函数toolfix修正右键使用带来的加分 -execute if score @s usedDiaAxe matches 1.. run function fz:scoreboards/digcounter/tools/diaaxe -execute if score @s usedDiaHoe matches 1.. run function fz:scoreboards/digcounter/tools/diahoe -execute if score @s usedDiaPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/diapickaxe -execute if score @s usedDiaShovel matches 1.. run function fz:scoreboards/digcounter/tools/diashovel -execute if score @s usedGolAxe matches 1.. run function fz:scoreboards/digcounter/tools/golaxe -execute if score @s usedGolHoe matches 1.. run function fz:scoreboards/digcounter/tools/golhoe -execute if score @s usedGolHoe matches 1.. run kill @s -execute if score @s usedGolPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/golpickaxe -execute if score @s usedGolShovel matches 1.. run function fz:scoreboards/digcounter/tools/golshovel -execute if score @s usedIroAxe matches 1.. run function fz:scoreboards/digcounter/tools/iroaxe -execute if score @s usedIroHoe matches 1.. run function fz:scoreboards/digcounter/tools/irohoe -execute if score @s usedIroHoe matches 1.. run kill @s -execute if score @s usedIroPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/iropickaxe -execute if score @s usedIroShovel matches 1.. run function fz:scoreboards/digcounter/tools/iroshovel -execute if score @s usedNetAxe matches 1.. run function fz:scoreboards/digcounter/tools/netaxe -execute if score @s usedNetHoe matches 1.. run function fz:scoreboards/digcounter/tools/nethoe -execute if score @s usedNetPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/netpickaxe -execute if score @s usedNetShovel matches 1.. run function fz:scoreboards/digcounter/tools/netshovel -execute if score @s usedStoAxe matches 1.. run function fz:scoreboards/digcounter/tools/stoaxe -execute if score @s usedStoHoe matches 1.. run function fz:scoreboards/digcounter/tools/stohoe -execute if score @s usedStoPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/stopickaxe -execute if score @s usedStoShovel matches 1.. run function fz:scoreboards/digcounter/tools/stoshovel -execute if score @s usedWooAxe matches 1.. run function fz:scoreboards/digcounter/tools/wooaxe -execute if score @s usedWooHoe matches 1.. run function fz:scoreboards/digcounter/tools/woohoe -execute if score @s usedWooPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/woopickaxe -execute if score @s usedWooShovel matches 1.. run function fz:scoreboards/digcounter/tools/wooshovel -execute if score @s usedShears matches 1.. run function fz:scoreboards/digcounter/tools/shears -#重置探测使用工具的记分板的成就 -advancement revoke @s only fz:scoreboards/digcounter/digtrigger \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/setdisplay.mcfunction b/data/fz/functions/scoreboards/digcounter/setdisplay.mcfunction deleted file mode 100644 index 6de8eff..0000000 --- a/data/fz/functions/scoreboards/digcounter/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将挖掘榜显示给轮播记分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold digCounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/diaaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/diaaxe.mcfunction deleted file mode 100644 index e1db1c1..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/diaaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedDiaAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedDiaAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedDiaAxe -scoreboard players reset @s usedDiaAxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/diahoe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/diahoe.mcfunction deleted file mode 100644 index 5370df0..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/diahoe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedDiaHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedDiaHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedDiaHoe -scoreboard players reset @s usedDiaHoe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/diapickaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/diapickaxe.mcfunction deleted file mode 100644 index 0ff4e77..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/diapickaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedDiaPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedDiaPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedDiaPickaxe -scoreboard players reset @s usedDiaPickaxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/diashovel.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/diashovel.mcfunction deleted file mode 100644 index a64f4df..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/diashovel.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedDiaShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedDiaShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedDiaShovel -scoreboard players reset @s usedDiaShovel \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/golaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/golaxe.mcfunction deleted file mode 100644 index 2539d27..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/golaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedGolAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedGolAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedGolAxe -scoreboard players reset @s usedGolAxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/golhoe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/golhoe.mcfunction deleted file mode 100644 index 43c0d36..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/golhoe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedGolHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedGolHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedGolHoe -scoreboard players reset @s usedGolHoe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/golpickaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/golpickaxe.mcfunction deleted file mode 100644 index aa30907..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/golpickaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedGolPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedGolPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedGolPickaxe -scoreboard players reset @s usedGolPickaxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/golshovel.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/golshovel.mcfunction deleted file mode 100644 index e809157..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/golshovel.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedGolShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedGolShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedGolShovel -scoreboard players reset @s usedGolShovel \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/iroaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/iroaxe.mcfunction deleted file mode 100644 index 65cc56c..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/iroaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedIroAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedIroAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedIroAxe -scoreboard players reset @s usedIroAxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/irohoe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/irohoe.mcfunction deleted file mode 100644 index 01f236b..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/irohoe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedIroHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedIroHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedIroHoe -scoreboard players reset @s usedIroHoe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/iropickaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/iropickaxe.mcfunction deleted file mode 100644 index d8fc182..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/iropickaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedIroPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedIroPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedIroPickaxe -scoreboard players reset @s usedIroPickaxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/iroshovel.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/iroshovel.mcfunction deleted file mode 100644 index b8c0d2b..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/iroshovel.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedIroShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedIroShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedIroShovel -scoreboard players reset @s usedIroShovel \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/netaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/netaxe.mcfunction deleted file mode 100644 index 300d5fe..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/netaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetAxe -scoreboard players reset @s usedNetAxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/nethoe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/nethoe.mcfunction deleted file mode 100644 index 544a35a..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/nethoe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetHoe -scoreboard players reset @s usedNetHoe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/netpickaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/netpickaxe.mcfunction deleted file mode 100644 index 5a0fce4..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/netpickaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetPickaxe -scoreboard players reset @s usedNetPickaxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/netshovel.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/netshovel.mcfunction deleted file mode 100644 index 1f93374..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/netshovel.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedNetShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedNetShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedNetShovel -scoreboard players reset @s usedNetShovel \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/shears.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/shears.mcfunction deleted file mode 100644 index eec6202..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/shears.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedShears -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedShears -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedShears -scoreboard players reset @s usedShears \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/stoaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/stoaxe.mcfunction deleted file mode 100644 index 2a8ff60..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/stoaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedStoAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedStoAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedStoAxe -scoreboard players reset @s usedStoAxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/stohoe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/stohoe.mcfunction deleted file mode 100644 index e552f56..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/stohoe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedStoHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedStoHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedStoHoe -scoreboard players reset @s usedStoHoe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/stopickaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/stopickaxe.mcfunction deleted file mode 100644 index b80c61a..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/stopickaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedStoPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedStoPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedStoPickaxe -scoreboard players reset @s usedStoPickaxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/stoshovel.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/stoshovel.mcfunction deleted file mode 100644 index 8791b85..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/stoshovel.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedStoShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedStoShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedStoShovel -scoreboard players reset @s usedStoShovel \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/wooaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/wooaxe.mcfunction deleted file mode 100644 index 7b460d8..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/wooaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedWooAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedWooAxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedWooAxe -scoreboard players reset @s usedWooAxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/woohoe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/woohoe.mcfunction deleted file mode 100644 index 9f135e5..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/woohoe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedWooHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedWooHoe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedWooHoe -scoreboard players reset @s usedWooHoe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/woopickaxe.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/woopickaxe.mcfunction deleted file mode 100644 index 317eccb..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/woopickaxe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedWooPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedWooPickaxe -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedWooPickaxe -scoreboard players reset @s usedWooPickaxe \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/tools/wooshovel.mcfunction b/data/fz/functions/scoreboards/digcounter/tools/wooshovel.mcfunction deleted file mode 100644 index 65b91c3..0000000 --- a/data/fz/functions/scoreboards/digcounter/tools/wooshovel.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算挖掘榜和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedWooShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedWooShovel -execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedWooShovel -scoreboard players reset @s usedWooShovel \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/toolsfix.mcfunction b/data/fz/functions/scoreboards/digcounter/toolsfix.mcfunction deleted file mode 100644 index 9427f96..0000000 --- a/data/fz/functions/scoreboards/digcounter/toolsfix.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#为digtrigger函数修正非挖掘的使用带来的加分(对一些方块使用工具) -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1 -execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 digCounter 1 -execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 totalList 1 -advancement revoke @s only fz:scoreboards/digcounter/toolsfix -#铲子和锄头的方块判断居然只响应产物不响应原方块，更离谱的是斧头两者会同时相应 \ No newline at end of file diff --git a/data/fz/functions/scoreboards/digcounter/toolsfix2.mcfunction b/data/fz/functions/scoreboards/digcounter/toolsfix2.mcfunction deleted file mode 100644 index de1fd51..0000000 --- a/data/fz/functions/scoreboards/digcounter/toolsfix2.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#为digtrigger函数修正非挖掘的使用带来的加分(使用工具攻击实体) -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1 -execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 digCounter 1 -execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 totalList 1 -advancement revoke @s only fz:scoreboards/digcounter/toolsfix2 \ No newline at end of file diff --git a/data/fz/functions/scoreboards/fishingcounter/calculator.mcfunction b/data/fz/functions/scoreboards/fishingcounter/calculator.mcfunction deleted file mode 100644 index c43765b..0000000 --- a/data/fz/functions/scoreboards/fishingcounter/calculator.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#计算钓鱼数和总榜 -#判断条件用于排除地毯小人 -execute unless score @s carpetBot matches 1 run scoreboard players operation @s fishingCounter += @s fishingTester -execute unless score @s carpetBot matches 1 run scoreboard players operation 总钓鱼数 fishingCounter += @s fishingTester -execute unless score @s carpetBot matches 1 run scoreboard players operation 总钓鱼数 totalList += @s fishingTester -#重置钓鱼探测记分板 -scoreboard players reset @s fishingTester -#重置出发该函数的成就 -advancement revoke @s only fz:scoreboards/fishingcounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/fishingcounter/setdisplay.mcfunction b/data/fz/functions/scoreboards/fishingcounter/setdisplay.mcfunction deleted file mode 100644 index e56e857..0000000 --- a/data/fz/functions/scoreboards/fishingcounter/setdisplay.mcfunction +++ /dev/null @@ -1 +0,0 @@ -scoreboard objectives setdisplay sidebar.team.gold fishingCounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/install.mcfunction b/data/fz/functions/scoreboards/install.mcfunction deleted file mode 100644 index b0faa7a..0000000 --- a/data/fz/functions/scoreboards/install.mcfunction +++ /dev/null @@ -1,125 +0,0 @@ -scoreboard objectives add carpetBot dummy -#在线时间计数器记分板，用于activation/main函数 -scoreboard objectives add actimeCounter dummy - -scoreboard objectives add killCounter dummy -scoreboard objectives add digCounter dummy - scoreboard objectives add usedDiaAxe minecraft.used:minecraft.diamond_axe - scoreboard objectives add usedDiaPickaxe minecraft.used:minecraft.diamond_pickaxe - scoreboard objectives add usedDiaShovel minecraft.used:minecraft.diamond_shovel - scoreboard objectives add usedDiaHoe minecraft.used:minecraft.diamond_hoe - scoreboard objectives add usedIroAxe minecraft.used:minecraft.iron_axe - scoreboard objectives add usedIroPickaxe minecraft.used:minecraft.iron_pickaxe - scoreboard objectives add usedIroShovel minecraft.used:minecraft.iron_shovel - scoreboard objectives add usedIroHoe minecraft.used:minecraft.iron_hoe - scoreboard objectives add usedStoAxe minecraft.used:minecraft.stone_axe - scoreboard objectives add usedStoPickaxe minecraft.used:minecraft.stone_pickaxe - scoreboard objectives add usedStoShovel minecraft.used:minecraft.stone_shovel - scoreboard objectives add usedStoHoe minecraft.used:minecraft.stone_hoe - scoreboard objectives add usedWooAxe minecraft.used:minecraft.wooden_axe - scoreboard objectives add usedWooPickaxe minecraft.used:minecraft.wooden_pickaxe - scoreboard objectives add usedWooShovel minecraft.used:minecraft.wooden_shovel - scoreboard objectives add usedWooHoe minecraft.used:minecraft.wooden_hoe - scoreboard objectives add usedGolAxe minecraft.used:minecraft.golden_axe - scoreboard objectives add usedGolPickaxe minecraft.used:minecraft.golden_pickaxe - scoreboard objectives add usedGolShovel minecraft.used:minecraft.golden_shovel - scoreboard objectives add usedGolHoe minecraft.used:minecraft.golden_hoe - scoreboard objectives add usedNetAxe minecraft.used:minecraft.netherite_axe - scoreboard objectives add usedNetPickaxe minecraft.used:minecraft.netherite_pickaxe - scoreboard objectives add usedNetShovel minecraft.used:minecraft.netherite_shovel - scoreboard objectives add usedNetHoe minecraft.used:minecraft.netherite_hoe - scoreboard objectives add usedShears minecraft.used:minecraft.shears -scoreboard objectives add deathCounter dummy - scoreboard objectives add deathTester deathCount -scoreboard objectives add tradingCounter dummy -scoreboard objectives add fishingCounter dummy - scoreboard objectives add fishingTester minecraft.custom:fish_caught -scoreboard objectives add damageTaken dummy - scoreboard objectives add 10xDamageTaken minecraft.custom:damage_taken -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"} -scoreboard objectives modify deathCounter displayname {"text": "死亡榜","color": "dark_red"} -scoreboard objectives modify digCounter displayname {"text": "挖掘榜","color": "gray"} -scoreboard objectives modify fishingCounter displayname {"text": "钩直饵咸","color": "blue"} -scoreboard objectives modify killCounter displayname {"text": "击杀榜","color": "red"} -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 -team add yellow -team add dark_red -team add gray -team add blue -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 -team modify dark_red color dark_red -team modify gray color gray -team modify blue color blue -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 -team join dark_red 全部木大 -team join gray 总挖掘量 -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 -scoreboard players operation 全部木大 deathCounter = 全部木大 deathCounter -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 -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 players operation 总滑翔距离 totalList = 总滑翔距离 totalList - -scoreboard objectives setdisplay sidebar.team.aqua activation -scoreboard objectives setdisplay sidebar.team.yellow damageTaken -scoreboard objectives setdisplay sidebar.team.dark_red deathCounter -scoreboard objectives setdisplay sidebar.team.gray digCounter -scoreboard objectives setdisplay sidebar.team.blue fishingCounter -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 modify storage fz:survival installed.scoreboards set value 1b - -#提示已安装 -tellraw @a {"text": "[信息]记分板已安装","color": "#5fff00"} -function fz:scoreboards/start \ No newline at end of file diff --git a/data/fz/functions/scoreboards/killcounter/calculator.mcfunction b/data/fz/functions/scoreboards/killcounter/calculator.mcfunction deleted file mode 100644 index a476e0a..0000000 --- a/data/fz/functions/scoreboards/killcounter/calculator.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算击杀榜和总榜 -scoreboard players add @s killCounter 1 -scoreboard players add 总击杀数 killCounter 1 -scoreboard players add 总击杀数 totalList 1 -#重置触发该函数的成就，地毯小人已在成就里排除 -advancement revoke @s only fz:scoreboards/killcounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/killcounter/setdisplay.mcfunction b/data/fz/functions/scoreboards/killcounter/setdisplay.mcfunction deleted file mode 100644 index 05ede4c..0000000 --- a/data/fz/functions/scoreboards/killcounter/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将击杀榜显示给轮播记分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold killCounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/main.mcfunction b/data/fz/functions/scoreboards/main.mcfunction deleted file mode 100644 index 3fa7146..0000000 --- a/data/fz/functions/scoreboards/main.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -function fz:scoreboards/killcounter/setdisplay -schedule function fz:scoreboards/deathcounter/setdisplay 10s replace -schedule function fz:scoreboards/digcounter/setdisplay 20s replace -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/aviate1m/setdisplay 70s replace -schedule function fz:scoreboards/totallist 80s replace -execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/bedrockbreaked/setdisplay 90s 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 \ No newline at end of file diff --git a/data/fz/functions/scoreboards/start.mcfunction b/data/fz/functions/scoreboards/start.mcfunction deleted file mode 100644 index bfc34bb..0000000 --- a/data/fz/functions/scoreboards/start.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -function fz:scoreboards/main -function fz:scoreboards/activation/main - -advancement revoke @a only fz:scoreboards/activation -advancement revoke @a only fz:scoreboards/damagetaken -advancement revoke @a only fz:scoreboards/deathcounter -advancement revoke @a only fz:scoreboards/fishingcounter -advancement revoke @a only fz:scoreboards/killcounter -advancement revoke @a only fz:scoreboards/tradingcounter -advancement revoke @a only fz:scoreboards/digcounter/digtrigger -advancement revoke @a only fz:scoreboards/digcounter/toolsfix - -tellraw @a {"text": "[信息]记分板已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/scoreboards/totallist.mcfunction b/data/fz/functions/scoreboards/totallist.mcfunction deleted file mode 100644 index ef72da7..0000000 --- a/data/fz/functions/scoreboards/totallist.mcfunction +++ /dev/null @@ -1 +0,0 @@ -scoreboard objectives setdisplay sidebar.team.gold totalList \ No newline at end of file diff --git a/data/fz/functions/scoreboards/tradingcounter/calculator.mcfunction b/data/fz/functions/scoreboards/tradingcounter/calculator.mcfunction deleted file mode 100644 index 78a58d6..0000000 --- a/data/fz/functions/scoreboards/tradingcounter/calculator.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#计算交易榜和总榜 -scoreboard players add @s tradingCounter 1 -scoreboard players add 总交♂易数 tradingCounter 1 -scoreboard players add 总交♂易数 totalList 1 -#重置触发该函数的成就，地毯小人已在成就里排除 -advancement revoke @s only fz:scoreboards/tradingcounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/tradingcounter/setdisplay.mcfunction b/data/fz/functions/scoreboards/tradingcounter/setdisplay.mcfunction deleted file mode 100644 index 3e4d637..0000000 --- a/data/fz/functions/scoreboards/tradingcounter/setdisplay.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#将交易榜显示给轮播记分板的队伍（金队） -scoreboard objectives setdisplay sidebar.team.gold tradingCounter \ No newline at end of file diff --git a/data/fz/functions/scoreboards/uninstall.mcfunction b/data/fz/functions/scoreboards/uninstall.mcfunction deleted file mode 100644 index 3129f09..0000000 --- a/data/fz/functions/scoreboards/uninstall.mcfunction +++ /dev/null @@ -1,60 +0,0 @@ -schedule clear fz:scoreboards/totallist -schedule clear fz:scoreboards/activation/activation -schedule clear fz:scoreboards/damagetaken/damagetaken -schedule clear fz:scoreboards/deathcounter/deathcounter -schedule clear fz:scoreboards/digcounter/digcounter -schedule clear fz:scoreboards/fishingcounter/fishingcounter -schedule clear fz:scoreboards/killcounter/killcounter -schedule clear fz:scoreboards/tradingcounter/tradingcounter -schedule clear fz:scoreboards/main - -scoreboard objectives remove carpetBot -scoreboard objectives remove actimeCounter - -scoreboard objectives remove usedDiaAxe -scoreboard objectives remove usedDiaPickaxe -scoreboard objectives remove usedDiaShovel -scoreboard objectives remove usedDiaHoe -scoreboard objectives remove usedIroAxe -scoreboard objectives remove usedIroPickaxe -scoreboard objectives remove usedIroShovel -scoreboard objectives remove usedIroHoe -scoreboard objectives remove usedStoAxe -scoreboard objectives remove usedStoPickaxe -scoreboard objectives remove usedStoShovel -scoreboard objectives remove usedStoHoe -scoreboard objectives remove usedWooAxe -scoreboard objectives remove usedWooPickaxe -scoreboard objectives remove usedWooShovel -scoreboard objectives remove usedWooHoe -scoreboard objectives remove usedGolAxe -scoreboard objectives remove usedGolPickaxe -scoreboard objectives remove usedGolShovel -scoreboard objectives remove usedGolHoe -scoreboard objectives remove usedNetAxe -scoreboard objectives remove usedNetPickaxe -scoreboard objectives remove usedNetShovel -scoreboard objectives remove usedNetHoe - -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 -scoreboard objectives setdisplay sidebar.team.dark_red -scoreboard objectives setdisplay sidebar.team.gray -scoreboard objectives setdisplay sidebar.team.blue -scoreboard objectives setdisplay sidebar.team.red -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"}] \ No newline at end of file diff --git a/data/fz/functions/start/000x.mcfunction b/data/fz/functions/start/000x.mcfunction deleted file mode 100644 index 03da677..0000000 --- a/data/fz/functions/start/000x.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -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 \ No newline at end of file diff --git a/data/fz/functions/start/00xx.mcfunction b/data/fz/functions/start/00xx.mcfunction deleted file mode 100644 index 9b03286..0000000 --- a/data/fz/functions/start/00xx.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -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 \ No newline at end of file diff --git a/data/fz/functions/start/start.mcfunction b/data/fz/functions/start/start.mcfunction deleted file mode 100644 index 74e64b4..0000000 --- a/data/fz/functions/start/start.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#判断各功能是否已安装并运行 -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"} \ No newline at end of file diff --git a/data/fz/functions/start/update.mcfunction b/data/fz/functions/start/update.mcfunction deleted file mode 100644 index 83c41cd..0000000 --- a/data/fz/functions/start/update.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -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"} \ No newline at end of file diff --git a/data/fz/functions/sweeper/bossbar.mcfunction b/data/fz/functions/sweeper/bossbar.mcfunction deleted file mode 100644 index d1802ce..0000000 --- a/data/fz/functions/sweeper/bossbar.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -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] -scoreboard players remove sweeperBossbar parameter 1 -schedule function fz:sweeper/bossbar 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/config/off.mcfunction b/data/fz/functions/sweeper/config/off.mcfunction deleted file mode 100644 index aaac352..0000000 --- a/data/fz/functions/sweeper/config/off.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -execute unless score sweeperTime parameter matches 0 run scoreboard players set sweeperTime parameter 0 -schedule clear fz:sweeper/bossbar -schedule clear fz:sweeper/main -schedule clear fz:sweeper/timer/1s -schedule clear fz:sweeper/timer/2s -schedule clear fz:sweeper/timer/3s -schedule clear fz:sweeper/timer/4s -schedule clear fz:sweeper/timer/5s -schedule clear fz:sweeper/timer/10s -schedule clear fz:sweeper/timer/30s -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 - -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 \ No newline at end of file diff --git a/data/fz/functions/sweeper/config/on.mcfunction b/data/fz/functions/sweeper/config/on.mcfunction deleted file mode 100644 index f8f98d3..0000000 --- a/data/fz/functions/sweeper/config/on.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -execute if score @s config matches 1478966211 run scoreboard players set sweeperTime parameter 30 -execute if score @s config matches 1478966212 run scoreboard players set sweeperTime parameter 60 -execute if score @s config matches 1478966213 run scoreboard players set sweeperTime parameter 120 -execute if score @s config matches 1478966214 run scoreboard players set sweeperTime parameter 180 -execute if score @s config matches 1478966215 run scoreboard players set sweeperTime parameter 240 -schedule clear fz:sweeper/bossbar -schedule clear fz:sweeper/main -schedule clear fz:sweeper/timer/1s -schedule clear fz:sweeper/timer/2s -schedule clear fz:sweeper/timer/3s -schedule clear fz:sweeper/timer/4s -schedule clear fz:sweeper/timer/5s -schedule clear fz:sweeper/timer/10s -schedule clear fz:sweeper/timer/30s -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 true - -function fz:sweeper/main -function fz:sweeper/bossbar \ No newline at end of file diff --git a/data/fz/functions/sweeper/config/trigger.mcfunction b/data/fz/functions/sweeper/config/trigger.mcfunction deleted file mode 100644 index 480ff15..0000000 --- a/data/fz/functions/sweeper/config/trigger.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -execute if score @s config matches 1478966211..1478966215 run function fz:sweeper/config/on -execute if score @s config matches 1478966210 run function fz:sweeper/config/off -#提示音开关 -execute if score @s config matches 1478966208 run tag @s remove fz.sweeperSoundOff -execute if score @s config matches 1478966209 run tag @s add fz.sweeperSoundOff -#boss血条时间提示开关 -execute if score @s config matches 1478966206 run tag @s remove fz.sweeperBossbarOff -execute if score @s config matches 1478966207 run tag @s add fz.sweeperBossbarOff -#文字时间提示开关 -execute if score @s config matches 1478966204 run tag @s remove fz.sweeperMessageOff -execute if score @s config matches 1478966205 run tag @s add fz.sweeperMessageOff -#矿车白名单 -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 fz:sweeper players @a[tag=!fz.sweeperBossbarOff] - -scoreboard players reset @s config -function fz:config/display \ No newline at end of file diff --git a/data/fz/functions/sweeper/install.mcfunction b/data/fz/functions/sweeper/install.mcfunction deleted file mode 100644 index 1f8ca2e..0000000 --- a/data/fz/functions/sweeper/install.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -data modify storage fz:survival installed.sweeper set value 1b -bossbar add fz:sweeper {"text":"null"} -bossbar set fz:sweeper value 0 -#提示已安装 -tellraw @a {"text": "[信息]扫地机已安装","color": "#5fff00"} -function fz:sweeper/start \ No newline at end of file diff --git a/data/fz/functions/sweeper/main.mcfunction b/data/fz/functions/sweeper/main.mcfunction deleted file mode 100644 index 39865ff..0000000 --- a/data/fz/functions/sweeper/main.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -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 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 -execute if score sweeperTime parameter matches 60 run function fz:sweeper/timer/1min -execute if score sweeperTime parameter matches 120 run function fz:sweeper/timer/2min -execute if score sweeperTime parameter matches 180 run function fz:sweeper/timer/3min -execute if score sweeperTime parameter matches 240 run function fz:sweeper/timer/4min -scoreboard players operation sweeperBossbar parameter = sweeperTime parameter \ No newline at end of file diff --git a/data/fz/functions/sweeper/start.mcfunction b/data/fz/functions/sweeper/start.mcfunction deleted file mode 100644 index 871f393..0000000 --- a/data/fz/functions/sweeper/start.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -schedule clear fz:sweeper/bossbar -schedule clear fz:sweeper/main -schedule clear fz:sweeper/timer/1s -schedule clear fz:sweeper/timer/2s -schedule clear fz:sweeper/timer/3s -schedule clear fz:sweeper/timer/4s -schedule clear fz:sweeper/timer/5s -schedule clear fz:sweeper/timer/10s -schedule clear fz:sweeper/timer/30s -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 - -tellraw @a {"text": "[信息]扫地机已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/10s.mcfunction b/data/fz/functions/sweeper/timer/10s.mcfunction deleted file mode 100644 index a7c3940..0000000 --- a/data/fz/functions/sweeper/timer/10s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]10s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/5s 5s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/1min.mcfunction b/data/fz/functions/sweeper/timer/1min.mcfunction deleted file mode 100644 index 16e8a70..0000000 --- a/data/fz/functions/sweeper/timer/1min.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]1min后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/30s 30s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/1s.mcfunction b/data/fz/functions/sweeper/timer/1s.mcfunction deleted file mode 100644 index d64f111..0000000 --- a/data/fz/functions/sweeper/timer/1s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]1s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/main 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/2min.mcfunction b/data/fz/functions/sweeper/timer/2min.mcfunction deleted file mode 100644 index e2599a5..0000000 --- a/data/fz/functions/sweeper/timer/2min.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]2min后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/1min 60s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/2s.mcfunction b/data/fz/functions/sweeper/timer/2s.mcfunction deleted file mode 100644 index e277735..0000000 --- a/data/fz/functions/sweeper/timer/2s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]2s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/1s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/30s.mcfunction b/data/fz/functions/sweeper/timer/30s.mcfunction deleted file mode 100644 index 8bda140..0000000 --- a/data/fz/functions/sweeper/timer/30s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]30s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/10s 20s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/3min.mcfunction b/data/fz/functions/sweeper/timer/3min.mcfunction deleted file mode 100644 index f1414ca..0000000 --- a/data/fz/functions/sweeper/timer/3min.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]3min后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/2min 60s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/3s.mcfunction b/data/fz/functions/sweeper/timer/3s.mcfunction deleted file mode 100644 index 94390ab..0000000 --- a/data/fz/functions/sweeper/timer/3s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]3s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/2s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/4min.mcfunction b/data/fz/functions/sweeper/timer/4min.mcfunction deleted file mode 100644 index 1dc97a9..0000000 --- a/data/fz/functions/sweeper/timer/4min.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]4min后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/3min 60s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/4s.mcfunction b/data/fz/functions/sweeper/timer/4s.mcfunction deleted file mode 100644 index 5a91789..0000000 --- a/data/fz/functions/sweeper/timer/4s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]4s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/3s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/5s.mcfunction b/data/fz/functions/sweeper/timer/5s.mcfunction deleted file mode 100644 index dbbbc2a..0000000 --- a/data/fz/functions/sweeper/timer/5s.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[提醒]5s后清理掉落物","color": "#66ffff"} -execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 -schedule function fz:sweeper/timer/4s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/uninstall.mcfunction b/data/fz/functions/sweeper/uninstall.mcfunction deleted file mode 100644 index cdfc2de..0000000 --- a/data/fz/functions/sweeper/uninstall.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -schedule clear fz:sweeper/bossbar -schedule clear fz:sweeper/main -schedule clear fz:sweeper/timer/1s -schedule clear fz:sweeper/timer/2s -schedule clear fz:sweeper/timer/3s -schedule clear fz:sweeper/timer/4s -schedule clear fz:sweeper/timer/5s -schedule clear fz:sweeper/timer/10s -schedule clear fz:sweeper/timer/30s -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 remove fz:sweeper - -data modify storage fz:survival installed.sweeper set value 0b -#提示已卸载 -tellraw @a {"text": "[信息]扫地机已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/uninstall.mcfunction b/data/fz/functions/uninstall.mcfunction deleted file mode 100644 index e665165..0000000 --- a/data/fz/functions/uninstall.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#全卸载 -function fz:config/uninstall -function fz:health/uninstall -function fz:scoreboards/uninstall -function fz:sweeper/uninstall -function fz:login/logintips/uninstall -#删除系统计分板 -scoreboard objectives remove parameter -scoreboard objectives remove calculator -scoreboard objectives remove leaveGame -#存入已卸载信息，下次启动不会重新安装 -data modify storage fz:survival installed.datapack set value 0b -#提示已卸载 -tellraw @a {"text": "[信息]FZ'sDatapack已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/predicates/sweeper/minecart.json b/data/fz/predicates/sweeper/minecart.json deleted file mode 100644 index 60a6104..0000000 --- a/data/fz/predicates/sweeper/minecart.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Item:{id:\"minecraft:minecart\",Count:1b}}" - } -} \ No newline at end of file diff --git a/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json deleted file mode 100644 index d88c51a..0000000 --- a/data/minecraft/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "fz:load" - ] -} \ No newline at end of file diff --git a/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json deleted file mode 100644 index 8aecd26..0000000 --- a/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta deleted file mode 100644 index 79b7482..0000000 --- a/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "FZ's Datapack - Code By Harvey_Husky", - "pack_format": 7 - } -} \ No newline at end of file diff --git a/scripts/c.sc b/scripts/c.sc deleted file mode 100644 index 33b054d..0000000 --- a/scripts/c.sc +++ /dev/null @@ -1,7 +0,0 @@ -__config() -> { - 'stay_loaded' -> true -}; -__command() -> ( - run('gamemode spectator'); - run('execute at @s run tp @s ~ ~0.2 ~') -) \ No newline at end of file diff --git a/scripts/census.sc b/scripts/census.sc deleted file mode 100644 index 0c8efd8..0000000 --- a/scripts/census.sc +++ /dev/null @@ -1,193 +0,0 @@ -// by shenjack -// write at carpet 1.16.5 1.4.31 v210407 -// 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.2.0'; -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 - 'fabric-api' -> '>=0.26.0', // for some reason api left in 0.26.0 - 'carpet' -> '>=1.4.31' // best at 1.4.31 because fix issue of read_file() - }, - 'commands' -> { - '' -> 'help', - 'help' -> 'help', - 'reload' -> 'reload_script', - 'score load' -> 'load_scores', - 'score save' -> 'save_scores', - 'score print' -> 'print_scores', - 'debug level' -> ['debug_level', null], - 'debug level ' -> 'debug_level', - 'debug add_mine ' -> 'add_mine', - }, - 'arguments' -> { - 'player' -> { - 'type' -> 'players' - }, - 'block' -> { - 'type' -> 'string', - }, - 'debug_level' -> { - 'type' -> 'int', - 'min' -> 0, - 'max' -> 4, - 'suggest' -> [0, 1, 2, 3, 4] - } - }; -}; - -__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); -); - -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 -> ', 'c 设置DEBUG信息等级为 ', '^g 为 0-4的正整数,默认为2', '?/' + global_filename + ' debug level ')); -// print(format('e /' + global_filename + ' xxx -> ', 'c xxx', '^g xxx', '! /' + global_filename + ' xxx')); - 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() -> ( - 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_scores() -> ( - // 目前只会输出挖掘榜 - printl(global_score, 0, false, true); - print('§7' + '-'*10 + '挖掘榜' + '-'*10); // 输出标题 - mine = []; - max_len = 1; - // 初始化两个数据 - for(global_score, - max_len = max(max_len, length(_)); - // 如果这个名字的长度大于之前的，就把最大长度换成这个名字的 - put(mine, 0, [_, global_score:_:'mine':'total'], 'insert')); - // 把所有的数据加到mine里备用，等待排序 - mine = sort_key(mine, -_:1); // 根据每个挖掘数据的挖掘量进行排序(排序用的分数是挖掘量的倒数,这样可以倒序排列) - printl(mine, 1, false, true); - for(mine, - print(format(' ' + _:0 + ': ' + ' '*(max_len-length(_:0))+ _:1 + ' block'))); - // 依次输出数据 - -); - -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 = {'mine'-> {'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 = player ~ 'name'; - if(!player(splayer), - return()); - // 如果玩家列表里没有输入的玩家就返回 - if(!has(global_score:splayer), - make_player_score(splayer)); - // 如果榜单里没有玩家就加入玩家的榜单 - if(!has(global_score:splayer:'mine', block), - put(global_score:splayer:'mine':block, 1), - // 如果玩家的记录里没有这个方块就把这个方块加到挖掘列表里 - score = get(global_score:splayer:'mine':block); - put(global_score:splayer:'mine':block, score + 1)); - // 如果记录里有就 += 1 - full_score = get(global_score:splayer:'mine':'total'); - put(global_score:splayer:'mine':'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(); diff --git a/scripts/here.sc b/scripts/here.sc deleted file mode 100644 index 4876e96..0000000 --- a/scripts/here.sc +++ /dev/null @@ -1,60 +0,0 @@ -__config() -> { - 'stay_loaded' -> true, - 'commands' -> { - '' -> 'my_pos', - '' -> 'print_pos' - }, - 'arguments' -> { - 'player' -> { - 'type' -> 'players' - }, - } -}; -__command() -> ( - s_player = player(); - pos = query(s_player, 'pos'); - dim = query(s_player, 'dimension'); - if(dim == 'overworld', - ( - run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在主世界[x:%d, y:%d, z:%d, dim:overworld]","color": "aqua"}]', - round(pos:0), round(pos:1), round(pos:2) - )); - run(str('tellraw @a [{"text":"- 对应地狱: [x:%d, y:128, z:%d, dim:the_nether]","color": "aqua"}]', - round((pos:0)/8), round((pos:2)/8) - )) - ), - dim == 'the_nether', - ( - run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在下界[x:%d, y:%d, z:%d, dim:the_nether]","color": "aqua"}]', - round(pos:0), round(pos:1), round(pos:2) - )); - run(str('tellraw @a [{"text":"- 对应主世界: [x:%d, y:64, z:%d, dim:overworld]","color": "aqua"}]', - round((pos:0)*8), round((pos:2)*8) - )) - ), - dim == 'the_end', - ( - run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在末地[x:%d, y:%d, z:%d, dim:%s]","color": "aqua"}]', - round(pos:0), round(pos:1), round(pos:2), dim - )) - ), - run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在%s世界[x:%d, y:%d, z:%d, dim:%s]","color": "aqua"}]', - dim, round(pos:0), round(pos:1), round(pos:2), dim - )) - ); - 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()) -); \ No newline at end of file diff --git a/scripts/restore_scores.sc b/scripts/restore_scores.sc deleted file mode 100644 index d54fc06..0000000 --- a/scripts/restore_scores.sc +++ /dev/null @@ -1,235 +0,0 @@ -global_version = '1.4.1'; -__config() -> { - 'scope' -> 'global', - 'stay_loaded' -> false -}; -__command() -> print('版本：' + global_version); -global_bl = ['stone', 'granite', 'polished_granite', 'diorite', 'polished_diorite', 'andesite', 'polished_andesite', 'grass_block', - 'dirt', 'coarse_dirt', 'podzol', 'crimson_nylium', 'warped_nylium', 'cobblestone', 'oak_planks', 'spruce_planks', 'birch_planks', - 'jungle_planks', 'acacia_planks', 'dark_oak_planks', 'crimson_planks', 'warped_planks', 'sand', 'red_sand', 'gravel', 'gold_ore', - 'iron_ore', 'coal_ore', 'nether_gold_ore', 'oak_log', 'spruce_log', 'birch_log', 'jungle_log', 'acacia_log', 'dark_oak_log', - 'crimson_stem', 'warped_stem', 'stripped_oak_log', 'stripped_spruce_log', 'stripped_birch_log', 'stripped_jungle_log', - 'stripped_acacia_log', 'stripped_dark_oak_log', 'stripped_crimson_stem', 'stripped_warped_stem', 'stripped_oak_wood', - 'stripped_spruce_wood', 'stripped_birch_wood', 'stripped_jungle_wood', 'stripped_acacia_wood', 'stripped_dark_oak_wood', - 'stripped_crimson_hyphae', 'stripped_warped_hyphae', 'oak_wood', 'spruce_wood', 'birch_wood', 'jungle_wood', 'acacia_wood', - 'dark_oak_wood', 'crimson_hyphae', 'warped_hyphae', 'sponge', 'wet_sponge', 'glass', 'lapis_ore', 'lapis_block', 'sandstone', - 'chiseled_sandstone', 'cut_sandstone', 'white_wool', 'orange_wool', 'magenta_wool', 'light_blue_wool', 'yellow_wool', - 'lime_wool', 'pink_wool', 'gray_wool', 'light_gray_wool', 'cyan_wool', 'purple_wool', 'blue_wool', 'brown_wool', 'green_wool', - 'red_wool', 'black_wool', 'gold_block', 'iron_block', 'oak_slab', 'spruce_slab', 'birch_slab', 'jungle_slab', 'acacia_slab', - 'dark_oak_slab', 'crimson_slab', 'warped_slab', 'stone_slab', 'smooth_stone_slab', 'sandstone_slab', 'cut_sandstone_slab', - 'petrified_oak_slab', 'cobblestone_slab', 'brick_slab', 'stone_brick_slab', 'nether_brick_slab', 'quartz_slab', - 'red_sandstone_slab', 'cut_red_sandstone_slab', 'purpur_slab', 'prismarine_slab', 'prismarine_brick_slab', - 'dark_prismarine_slab', 'smooth_quartz', 'smooth_red_sandstone', 'smooth_sandstone', 'smooth_stone', 'bricks', 'bookshelf', - 'mossy_cobblestone', 'obsidian', 'purpur_block', 'purpur_pillar', 'purpur_stairs', 'oak_stairs', 'diamond_ore', 'diamond_block', - 'cobblestone_stairs', 'redstone_ore', 'ice', 'snow_block', 'clay', 'pumpkin', 'carved_pumpkin', 'netherrack', 'soul_sand', - 'soul_soil', 'basalt', 'polished_basalt', 'glowstone', 'jack_o_lantern', 'stone_bricks', 'mossy_stone_bricks', - 'cracked_stone_bricks', 'chiseled_stone_bricks', 'melon', 'brick_stairs', 'stone_brick_stairs', 'mycelium', 'nether_bricks', - 'cracked_nether_bricks', 'chiseled_nether_bricks', 'nether_brick_stairs', 'end_stone_bricks', 'sandstone_stairs', 'emerald_ore', - 'emerald_block', 'spruce_stairs', 'birch_stairs', 'jungle_stairs', 'crimson_stairs', 'warped_stairs', 'nether_quartz_ore', - 'chiseled_quartz_block', 'quartz_block', 'quartz_bricks', 'quartz_pillar', 'quartz_stairs', 'white_terracotta', - 'orange_terracotta', 'magenta_terracotta', 'light_blue_terracotta', 'yellow_terracotta', 'lime_terracotta', 'pink_terracotta', - 'gray_terracotta', 'light_gray_terracotta', 'cyan_terracotta', 'purple_terracotta', 'blue_terracotta', 'brown_terracotta', - 'green_terracotta', 'red_terracotta', 'black_terracotta', 'hay_block', 'terracotta', 'coal_block', 'packed_ice', 'acacia_stairs', - 'dark_oak_stairs', 'white_stained_glass', 'orange_stained_glass', 'magenta_stained_glass', 'light_blue_stained_glass', - 'yellow_stained_glass', 'lime_stained_glass', 'pink_stained_glass', 'gray_stained_glass', 'light_gray_stained_glass', - 'cyan_stained_glass', 'purple_stained_glass', 'blue_stained_glass', 'brown_stained_glass', 'green_stained_glass', - 'red_stained_glass', 'black_stained_glass', 'prismarine', 'prismarine_bricks', 'dark_prismarine', 'prismarine_stairs', - 'prismarine_brick_stairs', 'dark_prismarine_stairs', 'sea_lantern', 'red_sandstone', 'chiseled_red_sandstone', - 'cut_red_sandstone', 'red_sandstone_stairs', 'magma_block', 'nether_wart_block', 'warped_wart_block', 'red_nether_bricks', - 'bone_block', 'white_concrete', 'orange_concrete', 'magenta_concrete', 'light_blue_concrete', 'yellow_concrete', 'lime_concrete', - 'pink_concrete', 'gray_concrete', 'light_gray_concrete', 'cyan_concrete', 'purple_concrete', 'blue_concrete', 'brown_concrete', - 'green_concrete', 'red_concrete', 'black_concrete', 'white_concrete_powder', 'orange_concrete_powder', 'magenta_concrete_powder', - 'light_blue_concrete_powder', 'yellow_concrete_powder', 'lime_concrete_powder', 'pink_concrete_powder', 'gray_concrete_powder', - 'light_gray_concrete_powder', 'cyan_concrete_powder', 'purple_concrete_powder', 'blue_concrete_powder', 'brown_concrete_powder', - 'green_concrete_powder', 'red_concrete_powder', 'black_concrete_powder', 'dead_tube_coral_block', 'dead_brain_coral_block', - 'dead_bubble_coral_block', 'dead_fire_coral_block', 'dead_horn_coral_block', 'tube_coral_block', 'brain_coral_block', - 'bubble_coral_block', 'fire_coral_block', 'horn_coral_block', 'blue_ice', 'polished_granite_stairs', - 'smooth_red_sandstone_stairs', 'mossy_stone_brick_stairs', 'polished_diorite_stairs', 'mossy_cobblestone_stairs', - 'end_stone_brick_stairs', 'stone_stairs', 'smooth_sandstone_stairs', 'smooth_quartz_stairs', 'granite_stairs', 'andesite_stairs', - 'red_nether_brick_stairs', 'polished_andesite_stairs', 'diorite_stairs', 'polished_granite_slab', 'smooth_red_sandstone_slab', - 'mossy_stone_brick_slab', 'polished_diorite_slab', 'mossy_cobblestone_slab', 'end_stone_brick_slab', 'smooth_sandstone_slab', - 'smooth_quartz_slab', 'granite_slab', 'andesite_slab', 'red_nether_brick_slab', 'polished_andesite_slab', 'diorite_slab', - 'dried_kelp_block', 'netherite_block', 'ancient_debris', 'crying_obsidian', 'blackstone', 'blackstone_slab', - 'blackstone_stairs', 'gilded_blackstone', 'polished_blackstone', 'polished_blackstone_slab', 'polished_blackstone_stairs', - 'chiseled_polished_blackstone', 'polished_blackstone_bricks', 'polished_blackstone_brick_slab', - 'polished_blackstone_brick_stairs', 'cracked_polished_blackstone_bricks', 'oak_sapling', 'spruce_sapling', 'birch_sapling', - 'jungle_sapling', 'acacia_sapling', 'dark_oak_sapling', 'oak_leaves', 'spruce_leaves', 'birch_leaves', 'jungle_leaves', - 'acacia_leaves', 'dark_oak_leaves', 'cobweb', 'grass', 'fern', 'dead_bush', 'seagrass', 'sea_pickle', 'dandelion', 'poppy', - 'blue_orchid', 'allium', 'azure_bluet', 'red_tulip', 'orange_tulip', 'white_tulip', 'pink_tulip', 'oxeye_daisy', 'cornflower', - 'lily_of_the_valley', 'wither_rose', 'brown_mushroom', 'red_mushroom', 'crimson_fungus', 'warped_fungus', 'crimson_roots', - 'warped_roots', 'nether_sprouts', 'weeping_vines', 'twisting_vines', 'sugar_cane', 'kelp', 'bamboo', 'torch', 'end_rod', - 'chorus_plant', 'chorus_flower', 'chest', 'crafting_table', 'furnace', 'ladder', 'cactus', 'jukebox', 'oak_fence', - 'spruce_fence', 'birch_fence', 'jungle_fence', 'acacia_fence', 'dark_oak_fence', 'crimson_fence', 'warped_fence', 'soul_torch', - 'brown_mushroom_block', 'red_mushroom_block', 'mushroom_stem', 'iron_bars', 'chain', 'glass_pane', 'vine', 'lily_pad', - 'nether_brick_fence', 'enchanting_table', 'end_portal_frame', 'ender_chest', 'cobblestone_wall', 'mossy_cobblestone_wall', - 'brick_wall', 'prismarine_wall', 'red_sandstone_wall', 'mossy_stone_brick_wall', 'granite_wall', 'stone_brick_wall', - 'nether_brick_wall', 'andesite_wall', 'red_nether_brick_wall', 'sandstone_wall', 'end_stone_brick_wall', 'diorite_wall', - 'blackstone_wall', 'polished_blackstone_wall', 'polished_blackstone_brick_wall', 'anvil', 'chipped_anvil', 'damaged_anvil', - 'white_carpet', 'orange_carpet', 'magenta_carpet', 'light_blue_carpet', 'yellow_carpet', 'lime_carpet', 'pink_carpet', - 'gray_carpet', 'light_gray_carpet', 'cyan_carpet', 'purple_carpet', 'blue_carpet', 'brown_carpet', 'green_carpet', 'red_carpet', - 'black_carpet', 'slime_block', 'sunflower', 'lilac', 'rose_bush', 'peony', 'white_stained_glass_pane', - 'orange_stained_glass_pane', 'magenta_stained_glass_pane', 'light_blue_stained_glass_pane', 'yellow_stained_glass_pane', - 'lime_stained_glass_pane', 'pink_stained_glass_pane', 'gray_stained_glass_pane', 'light_gray_stained_glass_pane', - 'cyan_stained_glass_pane', 'purple_stained_glass_pane', 'blue_stained_glass_pane', 'brown_stained_glass_pane', - 'green_stained_glass_pane', 'red_stained_glass_pane', 'black_stained_glass_pane', 'shulker_box', 'white_shulker_box', - 'orange_shulker_box', 'magenta_shulker_box', 'light_blue_shulker_box', 'yellow_shulker_box', 'lime_shulker_box', - 'pink_shulker_box', 'gray_shulker_box', 'light_gray_shulker_box', 'cyan_shulker_box', 'purple_shulker_box', 'blue_shulker_box', - 'brown_shulker_box', 'green_shulker_box', 'red_shulker_box', 'black_shulker_box', 'white_glazed_terracotta', - 'orange_glazed_terracotta', 'magenta_glazed_terracotta', 'light_blue_glazed_terracotta', 'yellow_glazed_terracotta', - 'lime_glazed_terracotta', 'pink_glazed_terracotta', 'gray_glazed_terracotta', 'light_gray_glazed_terracotta', - 'cyan_glazed_terracotta', 'purple_glazed_terracotta', 'blue_glazed_terracotta', 'brown_glazed_terracotta', - 'green_glazed_terracotta', 'red_glazed_terracotta', 'black_glazed_terracotta', 'tube_coral', 'brain_coral', 'bubble_coral', - 'fire_coral', 'horn_coral', 'dead_brain_coral', 'dead_bubble_coral', 'dead_fire_coral', 'dead_horn_coral', 'dead_tube_coral', - 'tube_coral_fan', 'brain_coral_fan', 'bubble_coral_fan', 'fire_coral_fan', 'horn_coral_fan', 'dead_tube_coral_fan', - 'dead_brain_coral_fan', 'dead_bubble_coral_fan', 'dead_fire_coral_fan', 'dead_horn_coral_fan', 'scaffolding', 'oak_sign', - 'spruce_sign', 'birch_sign', 'jungle_sign', 'acacia_sign', 'dark_oak_sign', 'crimson_sign', 'warped_sign', 'white_bed', - 'orange_bed', 'magenta_bed', 'light_blue_bed', 'yellow_bed', 'lime_bed', 'pink_bed', 'gray_bed', 'light_gray_bed', 'cyan_bed', - 'purple_bed', 'blue_bed', 'brown_bed', 'green_bed', 'red_bed', 'black_bed', 'flower_pot', 'skeleton_skull', - 'wither_skeleton_skull', 'player_head', 'zombie_head', 'creeper_head', 'dragon_head', 'white_banner', 'orange_banner', - 'magenta_banner', 'light_blue_banner', 'yellow_banner', 'lime_banner', 'pink_banner', 'gray_banner', 'light_gray_banner', - 'cyan_banner', 'purple_banner', 'blue_banner', 'brown_banner', 'green_banner', 'red_banner', 'black_banner', 'loom', 'composter', - 'barrel', 'smoker', 'blast_furnace', 'cartography_table', 'fletching_table', 'grindstone', 'smithing_table', 'stonecutter', - 'bell', 'lantern', 'soul_lantern', 'campfire', 'soul_campfire', 'shroomlight', 'bee_nest', 'beehive', 'honey_block', - 'honeycomb_block', 'lodestone', 'respawn_anchor', 'dispenser', 'note_block', 'sticky_piston', 'piston', 'tnt', 'lever', - 'stone_pressure_plate', 'oak_pressure_plate', 'spruce_pressure_plate', 'birch_pressure_plate', 'jungle_pressure_plate', - 'acacia_pressure_plate', 'dark_oak_pressure_plate', 'crimson_pressure_plate', 'warped_pressure_plate', - 'polished_blackstone_pressure_plate', 'redstone_torch', 'oak_trapdoor', 'spruce_trapdoor', 'birch_trapdoor', 'jungle_trapdoor', - 'acacia_trapdoor', 'dark_oak_trapdoor', 'crimson_trapdoor', 'warped_trapdoor', 'oak_fence_gate', 'spruce_fence_gate', - 'birch_fence_gate', 'jungle_fence_gate', 'acacia_fence_gate', 'dark_oak_fence_gate', 'crimson_fence_gate', 'warped_fence_gate', - 'redstone_lamp', 'tripwire_hook', 'stone_button', 'oak_button', 'spruce_button', 'birch_button', 'jungle_button', - 'acacia_button', 'dark_oak_button', 'crimson_button', 'warped_button', 'polished_blackstone_button', 'trapped_chest', - 'light_weighted_pressure_plate', 'heavy_weighted_pressure_plate', 'daylight_detector', 'redstone_block', 'hopper', 'dropper', - 'iron_trapdoor', 'observer', 'iron_door', 'oak_door', 'spruce_door', 'birch_door', 'jungle_door', 'acacia_door', 'dark_oak_door', - 'crimson_door', 'warped_door', 'repeater', 'comparator', 'redstone', 'lectern', 'target', 'powered_rail', 'detector_rail', - 'rail', 'activator_rail', 'beacon', 'turtle_egg', 'conduit', 'brewing_stand', 'cauldron', 'sculk_sensor', 'raw_iron_block', - 'raw_copper_block', 'raw_gold_block', 'powder_snow', 'candle', 'deepslate_coal_ore', 'deepslate_iron_ore', 'deepslate_copper_ore', - 'deepslate_lapis_ore', 'deepslate_gold_ore', 'deepslate_redstone_ore', 'deepslate_diamond_ore', 'deepslate_emerald_ore', - 'cobbled_deepslate', 'infested_stone', 'infested_cobblestone', 'infested_stone_bricks', 'infested_cracked_stone_bricks', - 'infested_mossy_stone_bricks', 'infested_chiseled_stone_bricks', 'infested_deepslate', 'deepslate', 'chiseled_deepslate', - 'polished_deepslate', 'spore_blossom', 'hanging_roots', 'rooted_dirt', 'dirt_path', 'farmland', 'wall_torch', 'tall_grass', - 'tall_seagrass', 'big_dripleaf', 'small_dripleaf', 'glow_berries', 'cave_vines', 'cave_vines_plant', 'moss_carpet', 'moss_block', - 'flowering_azalea_leaves', 'azalea_leaves', 'azalea', 'flowering_azalea', 'glow_lichen', 'dripstone_block', 'pointed_dripstone', - 'lightning_rod', 'cobbled_deepslate_stairs', 'polished_deepslate_stairs', 'deepslate_brick_stairs', 'deepslate_tile_stairs', - 'cut_copper_stairs', 'exposed_cut_copper_stairs', 'weathered_cut_copper_stairs', 'oxidized_cut_copper_stairs', - 'waxed_cut_copper_stairs', 'waxed_exposed_cut_copper_stairs', 'waxed_weathered_cut_copper_stairs', - 'waxed_oxidized_cut_copper_stairs', 'cobbled_deepslate_slab', 'polished_deepslate_slab', 'deepslate_brick_slab', - 'deepslate_tile_slab', 'cut_copper_slab', 'exposed_cut_copper_slab', 'weathered_cut_copper_slab', 'oxidized_cut_copper_slab', - 'waxed_cut_copper_slab', 'waxed_exposed_cut_copper_slab', 'waxed_weathered_cut_copper_slab', 'waxed_oxidized_cut_copper_slab', - 'copper_block', 'exposed_copper', 'weathered_copper', 'oxidized_copper', 'cut_copper', 'exposed_cut_copper', - 'weathered_cut_copper', 'oxidized_cut_copper', 'waxed_copper_block', 'waxed_exposed_copper', 'waxed_weathered_copper', - 'waxed_oxidized_copper', 'waxed_cut_copper', 'waxed_exposed_cut_copper', 'waxed_weathered_cut_copper', 'waxed_oxidized_cut_copper', - 'copper_ore', 'tinted_glass', 'smooth_basalt', 'calcite', 'amethyst_block', 'budding_amethyst', 'amethyst_cluster', - 'small_amethyst_bud', 'medium_amethyst_bud', 'large_amethyst_bud', 'amethyst_cluster', 'tuff', 'white_candle', 'orange_candle', - '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) ->( - scoreboard_remove('killCounter'); - scoreboard_remove('digCounter'); - scoreboard_remove('deathCounter'); - scoreboard_remove('tradingCounter'); - scoreboard_remove('fishingCounter'); - scoreboard_remove('damageTaken'); - scoreboard_remove('activation'); - scoreboard_remove('fz.aviate1m'); - scoreboard_remove('totalList'); - scoreboard_add('killCounter'); - scoreboard_add('digCounter'); - scoreboard_add('deathCounter'); - scoreboard_add('tradingCounter'); - scoreboard_add('fishingCounter'); - scoreboard_add('damageTaken'); - scoreboard_add('activation'); - scoreboard_add('fz.aviate1m'); - scoreboard_add('totalList'); - total_actime = 0; - total_death = 0; - total_mined = 0; - total_fished = 0; - 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_time')/72000; - print(actime); - scoreboard('activation', pl:i, actime); - total_actime += actime; - //抖M榜 - hurt = statistic(pl:i, 'custom', 'damage_taken')/100; - print(hurt); - scoreboard('damageTaken', pl:i, hurt); - total_hurt += hurt; - //死亡榜 - death = statistic(pl:i, 'custom', 'deaths'); - print(death); - scoreboard('deathCounter', pl:i, death); - total_death += death; - //挖掘榜 - mined = 0; - c_for(j = 0, j < length(global_bl), j += 1, - mined += statistic(pl:i, 'mined', global_bl:j); - ); - print(mined); - scoreboard('digCounter', pl:i, mined); - total_mined += mined; - //钓鱼榜 - fished = statistic(pl:i, 'custom', 'fish_caught'); - print(fished); - scoreboard('fishingCounter', pl:i, fished); - total_fished += fished; - //击杀榜 - killed = statistic(pl:i, 'custom', 'mob_kills'); - killed += statistic(pl:i, 'custom', 'player_kills'); - print(killed); - scoreboard('killCounter', pl:i, killed); - total_killed += killed; - //交易榜 - traded = statistic(pl:i, 'custom', 'traded_with_villager'); - print(traded); - scoreboard('tradingCounter', pl:i, traded); - total_traded += traded; - run('player ' + pl:i + ' kill') - ); - scoreboard('tradingCounter', '总交♂易数', total_traded); - scoreboard('totalList', '总交♂易数', total_traded); - scoreboard('killCounter', '总击杀数', total_killed); - scoreboard('totalList', '总击杀数', total_killed); - scoreboard('fishingCounter', '总钓鱼数', total_fished); - scoreboard('totalList', '总钓鱼数', total_fished); - scoreboard('digCounter', '总挖掘量', total_mined); - scoreboard('totalList', '总挖掘量', total_mined); - scoreboard('deathCounter', '全部木大', total_death); - scoreboard('totalList', '全部木大', total_death); - scoreboard('activation', '总在线时间(h)', total_actime); - 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); - run('function fz:scoreboards/install'); - return(failed_list); -); -by_whitelist() ->( - pl = keys(system_info('server_whitelist')); - game_tick(50); - failed_list = __restore(pl); - if(failed_list != [], - print(' : ( 这些玩家恢复失败了：' + failed_list); - ); - print('完成！'); - return() -) \ No newline at end of file diff --git a/scripts/s.sc b/scripts/s.sc deleted file mode 100644 index eda9e40..0000000 --- a/scripts/s.sc +++ /dev/null @@ -1,6 +0,0 @@ -__config() -> { - 'stay_loaded' -> true -}; -__command() -> ( - run('gamemode survival') -) \ No newline at end of file diff --git a/scripts/score_move.py b/scripts/score_move.py deleted file mode 100644 index ffea692..0000000 --- a/scripts/score_move.py +++ /dev/null @@ -1,56 +0,0 @@ -""" -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) diff --git a/scripts/tagplayer.sc b/scripts/tagplayer.sc deleted file mode 100644 index 426dfa9..0000000 --- a/scripts/tagplayer.sc +++ /dev/null @@ -1,1252 +0,0 @@ -//************************************************************* -//************请将该文件放入"world\scripts"文件夹中************ -//*************可以自定义插件名，但不能为“player”************** -//************************************************************* -scoreboard_add('carpetBot'); -team_add('carpetBot'); -team_add('shadowedPlayer'); -team_property('carpetBot', 'prefix', '假的'); -team_property('shadowedPlayer', 'prefix', '挂机'); -global_version = '2.4.0'; -global_carpet_version = split('\\+v',system_info('scarpet_version')); -global_require_carpet_version = ['1.4.22', 210113]; -global_filename = system_info('app_name'); -run('data merge storage minecraft:fz.tagplayer {filename:"' + global_filename + '"}'); -run('carpet setDefault commandPlayer true'); - -config = read_file('config/config', 'json'); -global_config = m(); -if (config == null, - ( - global_config = {'allow_spawning_whitelist_players' -> 'true'}; - ), - if (config:'allow_spawning_whitelist_players' == null || - (config:'allow_spawning_whitelist_players' != 'true' && config:'allow_spawning_whitelist_players' != 'false'), - ( - global_config:'allow_spawning_whitelist_players' = 'true' - ), - global_config:'allow_spawning_whitelist_players' = config:'allow_spawning_whitelist_players'; - ); -); -logger(config:'allow_spawning_whitelist_players'); -delete_file('config/config', 'json'); -write_file('config/config', 'json', global_config); - -__config() -> { - 'scope' -> 'global', - 'stay_loaded' -> true, - 'allow_command_conflicts' -> true, - 'commands' -> { - '' -> 'help', - 'spawn ' -> ['summon',null,null,null], - 'spawn at ' -> ['summon',null,null], - 'spawn at facing ' -> ['summon',null], - 'spawn at facing in ' -> 'summon', - 'kill ' -> 'kill', - 'killall' -> 'killall', - 'attack ' -> 'attack_once', - 'attack continuous' -> 'attack_continuous', - 'attack interval ' -> 'attack_interval', - 'attack once' -> 'attack_once', - 'drop all' -> 'drop_all', - 'drop ' -> 'drop_once', - 'drop continuous' -> 'drop_continuous', - 'drop interval ' -> 'drop_interval', - 'drop mainhand' -> 'drop_mainhand', - 'drop offhand' -> 'drop_offhand', - 'drop once' -> 'drop_once', - 'dropStack all' -> 'drop_stack_all', - 'dropStack ' -> 'drop_stack_once', - 'dropStack continuous' -> 'drop_stack_continuous', - 'dropStack interval ' -> 'drop_stack_interval', - 'dropStack mainhand' -> 'drop_stack_mainhand', - 'dropStack offhand' -> 'drop_stack_offhand', - 'dropStack once' -> 'drop_stack_once', - 'jump ' -> 'jump_once', - 'jump continuous' -> 'jump_continuous', - 'jump interval ' -> 'jump_interval', - 'jump once' -> 'jump_once', - 'swapHands ' -> 'swap_hands_once', - 'swapHands continuous' -> 'swap_hands_continuous', - 'swapHands interval ' -> 'swap_hands_interval', - 'swapHands once' -> 'swap_hands_once', - 'use ' -> 'use_once', - 'use continuous' -> 'use_continuous', - 'use interval ' -> 'use_interval', - 'use once' -> 'use_once', - 'mount ' -> 'mount', - 'dismount ' -> 'dismount', - 'sprint ' -> 'sprint', - 'unsprint ' -> 'unsprint', - 'sneak ' -> 'sneak', - 'unsneak ' -> 'unsneak', - 'look back' -> 'turn_back', - 'look left' -> 'turn_left', - 'look right' -> 'turn_right', - 'look up' -> 'look_up', - 'look down' -> 'look_down', - 'look east' -> 'look_east', - 'look north' -> 'look_north', - 'look south' -> 'look_south', - 'look west' -> 'look_west', - 'look ' -> 'look', - 'look position ' -> 'look_pos', - 'move backward' -> 'move_backward', - 'move forward' -> 'move_forward', - 'move left' -> 'move_left', - 'move right' -> 'move_right', - 'move stop' -> 'move_stop', - 'stop ' -> 'stop', - 'check ' -> 'check', - 'checkall' -> 'checkall', - 'tp ' -> 'tp', - 'tp ' -> 'tp_with_rotation', - 'tp ' -> 'tp_to_player', - 'tp atBot' -> 'tp_at_bot', - 'tp atBot' -> 'tp_at_bot_with_rotation', - 'hotbar ' -> 'hotbar', - 'shadow' -> 'shadow', - }, - 'arguments' -> { - 'dimension' -> { - 'type' -> 'text', - 'suggest' -> ['overworld','the_nether','the_end'] - }, - 'hotbar' -> { - 'type' -> 'int', - 'min' -> 1, - 'max' -> 9, - 'suggest' -> [1,2,3,4,5,6,7,8,9] - }, - 'bot' -> { - 'type' -> 'term', - 'suggester' -> _(args) -> ( - player_list = player('all'); - bot_list = l(); - c_for(i = 0, i < length(player_list), i += 1, - one_player_str = player_list:i; - if (scoreboard('carpetBot', one_player_str) == 1, - put(bot_list, length(bot_list), player_list:i) - ); - ); - put(bot_list, length(bot_list), player()); - return(bot_list) - ) - }, - 'killbot' -> { - 'type' -> 'term', - 'suggester' -> _(args) -> ( - player_list = player('all'); - bot_list = l(); - c_for(i = 0, i < length(player_list), i += 1, - one_player_str = player_list:i; - if (scoreboard('carpetBot', one_player_str) == 1, - put(bot_list, length(bot_list), player_list:i) - ); - ); - return(bot_list) - ) - }, - 'player' -> { - 'type' -> 'term', - 'suggester' -> _(args) -> player('all') - }, - 'tick' -> { - 'type' -> 'int', - 'min' -> 1, - 'suggest' -> [] - }, - 'rotation' -> { - 'type' -> 'rotation' - }, - 'position' -> { - 'type' -> 'location' - } - } -}; -__on_player_disconnects(player, reason) ->( - delete_all_files(player); - if(scoreboard('carpetBot', player) == 1, - scoreboard_remove('actimeCounter', player); - scoreboard_remove('carpetBot', player); - team_leave(player); - leaveGame = scoreboard('leaveGame', player); - scoreboard('leaveGame', player, leaveGame + 1); - ); -); -__on_player_connects(player) -> ( - run('tellraw ' + player + ' {"text":"[提醒]输入“/' + global_filename + '”查看假人相关功能的帮助", "color":"#66ffff"}'); -); -__on_server_shuts_down() ->( - player_list = player('all'); - c_for(i = 0, i < length(player_list), i += 1, - delete_all_files(player_list:i); - if(scoreboard('carpetBot', player) == 1, - scoreboard_remove('actimeCounter', player_list:i); - team_leave(player); - ) - ); - scoreboard_remove('carpetBot'); - team_remove('carpetBot'); - team_remove('shadowedPlayer') -); -check_fakeplayer(player_name) ->( - f_player = player(player_name); - if (!f_player, - ( - print('§4假人'+player_name+'未在线'); - exit() - ), - scoreboard('carpetBot', f_player) != 1 && f_player != player(), - ( - print('§4'+f_player+'不是假人'); - exit() - ) - ) -); -check_offline(player_name) ->( - f_player = player(player_name); - if (!f_player, - print('§4玩家或假人'+player_name+'未在线'); - exit() - ) -); -check_online(player_name) ->( - if (global_config:'allow_spawning_whitelist_players' == 'false', - wl = keys(system_info('server_whitelist')); - c_for(i = 0, i < length(wl), i += 1, - if (lower(wl:i) == lower(player_name), - print('§4'+player_name+'是白名单玩家'); - exit() - ); - ); - ); - f_player = player(player_name); - if (f_player, - if (scoreboard('carpetBot', f_player) == 1, - print('§4假人'+f_player+'已经在线了'); - exit() - ); - print('§4玩家'+f_player+'已经在线了'); - exit() - ) -); -check_pos(x) ->( - x = number(x); - if(x == null, - print('§4请输入正确的坐标'); - exit() - ); - return(x) -); -check_dim(s_player,f_player) ->( - if (s_player~'dimension' != f_player~'dimension', - print('§4不在同一维度！'); - exit() - ); -); -delete_all_files(f_player) ->( - delete_file(f_player + '-' + 'attack', 'text'); - delete_file(f_player + '-' + 'drop', 'text'); - delete_file(f_player + '-' + 'drop_stack', 'text'); - delete_file(f_player + '-' + 'jump', 'text'); - delete_file(f_player + '-' + 'swap_hands', 'text'); - delete_file(f_player + '-' + 'use', 'text'); - delete_file(f_player + '-' + 'move_vertical', 'text'); - delete_file(f_player + '-' + 'move_transverse', 'text') -); -help() ->( - print('--使用帮助：'); - print('/' + global_filename + ' spawn <玩家名> (at facing <仰俯> <偏转> in )\n - 生成假人可选“at”、“facing”、“in”参数'); - print('/' + global_filename + ' kill <玩家名>\n - 删除假人'); - print('/' + global_filename + ' killall\n - 删除全部假人'); - print('/' + global_filename + ' tp <玩家名> (<仰俯> <偏转>) (atBot)\n - 传送假人到,,，可选<仰俯>和<偏转>角度，如以结尾则相对坐标以假人为原点'); - print('/' + global_filename + ' look <玩家名> <仰俯> <偏转>\n - 转动假人视角，、可替换为“s”来代表你的视角方向'); - print('/' + global_filename + ' look <玩家名> \n - 让假人向<上/下/东/西/南/北>方向看'); - print('/' + global_filename + ' look <玩家名> \n - 让假人向<后/左/右>方向看'); - print('/' + global_filename + ' move <玩家名> \n - 让假人<向前/向后/向左/向右>移动'); - print('/' + global_filename + ' <玩家名> continuous\n - 让假人持续<攻击或挖掘/丢一个物品/丢一组物品/跳跃/换手/使用物品>'); - print('/' + global_filename + ' <玩家名> interval <整数>\n - 让假人每<整数>游戏刻<攻击/丢一个物品/丢一组物品/跳跃/换手/使用物品>一次'); - print('/' + global_filename + ' <玩家名> once\n - 让假人<攻击或挖掘/丢一个物品/丢一组物品/跳跃/换手/使用物品>一次'); - print('/' + global_filename + ' <玩家名> <1-9>\n - 更改假人使用的热键栏'); - print('/' + global_filename + ' <玩家名> \n - 让假人<丢一个/丢一组><主手/副手>的物品'); - print('/' + global_filename + ' <玩家名>\n - 让假人<潜行/站立>'); - print('/' + global_filename + ' <玩家名>\n - 让假人准备<疾跑/行走>，在水中疾跑以游泳'); - print('/' + global_filename + ' <玩家名>\n - 让假人<乘坐/卸下>'); - print('/' + global_filename + ' stop <玩家名>\n - 停止假人的一切动作'); - print('/' + global_filename + ' check <玩家名>\n - 检查假人状态'); - print('/' + global_filename + ' checkall\n - 检查所有假人状态'); - print('' + global_filename + '版本: ' + global_version); - print('carpet版本: ' + global_carpet_version:0); - if(number(global_carpet_version:1) < global_require_carpet_version:1 || global_carpet_version == null, - print('§4' + global_filename + '需要地毯' + global_require_carpet_version:0 + '或以上来运行！否则会出现预期之外的问题') - ); - return() -); -reload() ->( - run('script load ' + global_filename); - run('tellraw @a {"text":"+ global_filename +重载成功！"}'); - return() -); -summon(player_name, position, rotation, dimension) ->( - if(length(player_name) > 16, - player_name = slice(player_name,0,15) - ); - check_online(player_name); - s_player = player(); - if(position == null, - position = query(s_player, 'pos') - ); - if(rotation == null, - rotation = l(query(s_player, 'yaw'), query(s_player, 'pitch')) - ); - if(dimension == null, - dimension = query(s_player, 'dimension') - ); - run( - str('player %s spawn at %f %f %f facing %f %f in %s', - player_name, position:0, position:1, position:2, rotation:0, rotation:1, dimension - ) - ); - f_player = player(player_name); - if (!f_player, - print('§4生成失败'); - return() - ); - delete_all_files(f_player); - team_add('carpetBot', f_player); - run('tellraw @a {"text":"↑假的"}'); - scoreboard('carpetBot', f_player, 1); - return() -); -kill(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - if(f_player != player(), - ( - run('tellraw @a {"text":"↓假的"}'); - run(str('player %s kill', f_player)); - ), - print('§4你不是假人') - ); - return() -); -killall() ->( - player_list = team_list('carpetBot'); - c_for(i = 0, i < length(player_list), i += 1, - run(str('player %s kill', player_list:i)); - ); - if(player_list == l(), - print('§4不存在假人'); - return() - ); - game_tick(50); - run('tellraw @a {"text":"已清除全部假人"}'); - return() -); -//挂机 -shadow() ->( - f_player = player(); - run(str('player %s shadow', f_player)); - scoreboard('carpetBot', f_player, 1); - team_add('shadowedPlayer', f_player); - return() -); -//热键栏 -hotbar(player_name, hotbar) ->( - run(str('player %s hotbar %d', player_name, hotbar)); - return() -); -//攻击 -attack_continuous(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s attack continuous', player_name)); - delete_file(f_player + '-' + 'attack', 'text'); - write_file(f_player + '-' + 'attack', 'text', 0); - return() -); -attack_interval(player_name,tick) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s attack interval %d', player_name, tick)); - delete_file(f_player + '-' + 'attack', 'text'); - write_file(f_player + '-' + 'attack', 'text', tick); - return() -); -attack_once(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s attack once', player_name)); - delete_file(f_player + '-' + 'attack', 'text'); - return() -); -attack_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s attack', player_name)); - delete_file(f_player + '-' + 'attack', 'text'); - return() -); -//丢弃 -drop_continuous(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s drop continuous', player_name)); - delete_file(f_player + '-' + 'drop', 'text'); - write_file(f_player + '-' + 'drop', 'text', 0); - return() -); -drop_interval(player_name,tick) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s drop interval %d', player_name, tick)); - delete_file(f_player + '-' + 'drop', 'text'); - write_file(f_player + '-' + 'drop', 'text', tick); - return() -); -drop_once(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s drop once', player_name)); - delete_file(f_player + '-' + 'drop', 'text'); - return() -); -drop_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s drop', player_name)); - delete_file(f_player + '-' + 'drop', 'text'); - return() -); -drop_all(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s drop all', player_name)); - return() -); -drop_offhand(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - return() -); -drop_mainhand(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s drop mainhand', player_name)); - return() -); -//丢弃一组 -drop_stack_continuous(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack continuous', player_name)); - delete_file(f_player + '-' + 'drop_stack', 'text'); - write_file(f_player + '-' + 'drop_stack', 'text', 0); - return() -); -drop_stack_interval(player_name,tick) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack interval %d', player_name, tick)); - delete_file(f_player + '-' + 'drop_stack', 'text'); - write_file(f_player + '-' + 'drop_stack', 'text', tick); - return() -); -drop_stack_once(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack once', player_name)); - delete_file(f_player + '-' + 'drop_stack', 'text'); - return() -); -drop_stack_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack', player_name)); - delete_file(f_player + '-' + 'drop_stack', 'text'); - return() -); -drop_stack_all(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack all', player_name)); - return() -); -drop_stack_offhand(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack offhand', player_name)); - return() -); -drop_stack_mainhand(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dropStack mainhand', player_name)); - return() -); -//跳跃 -jump_continuous(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s jump continuous', player_name)); - delete_file(f_player + '-' + 'jump', 'text'); - write_file(f_player + '-' + 'jump', 'text', 0); - return() -); -jump_interval(player_name,tick) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s jump interval %d', player_name, tick)); - delete_file(f_player + '-' + 'jump', 'text'); - write_file(f_player + '-' + 'jump', 'text', tick); - return() -); -jump_once(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s jump once', player_name)); - delete_file(f_player + '-' + 'jump', 'text'); - return() -); -jump_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s jump', player_name)); - delete_file(f_player + '-' + 'jump', 'text'); - return() -); -//换手 -swap_hands_continuous(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s swapHands continuous', player_name)); - delete_file(f_player + '-' + 'swap_hands', 'text'); - write_file(f_player + '-' + 'swap_hands', 'text', 0); - return() -); -swap_hands_interval(player_name,tick) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s swapHands interval %d', player_name, tick)); - delete_file(f_player + '-' + 'swap_hands', 'text'); - write_file(f_player + '-' + 'swap_hands', 'text', tick); - return() -); -swap_hands_once(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s swapHands once', player_name)); - delete_file(f_player + '-' + 'swap_hands', 'text'); - return() -); -swap_hands_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s swapHands', player_name)); - delete_file(f_player + '-' + 'swap_hands', 'text'); - return() -); -//右键 -use_continuous(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s use continuous', player_name)); - delete_file(f_player + '-' + 'use', 'text'); - write_file(f_player + '-' + 'use', 'text', 0); - return() -); -use_interval(player_name,tick) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s use interval %d', player_name, tick)); - delete_file(f_player + '-' + 'use', 'text'); - write_file(f_player + '-' + 'use', 'text', tick); - return() -); -use_once(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s use once', player_name)); - delete_file(f_player + '-' + 'use', 'text'); - return() -); -use_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s use', player_name)); - delete_file(f_player + '-' + 'use', 'text'); - return() -); -//骑乘 -mount(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s mount', player_name)); - return() -); -dismount(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s dismount', player_name)); - return() -); -//冲刺 -sprint(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s sprint', player_name)); - write_file(f_player + '-' + 'sprint', 'text', tick); - return() -); -unsprint(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s unsprint', player_name)); - delete_file(f_player + '-' + 'sprint', 'text'); - return() -); -//下蹲 -sneak(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s sneak', player_name)); - write_file(f_player + '-' + 'sneak', 'text', tick); - return() -); -unsneak(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s unsneak', player_name)); - delete_file(f_player + '-' + 'sneak', 'text'); - return() -); -//转向 -turn_back(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s turn back', player_name)); - return() -); -turn_left(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s turn left', player_name)); - return() -); -turn_right(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s turn right', player_name)); - return() -); -//看向 -look(player_name,rotation) ->( - print(rotation); - f_player = player(player_name); - check_fakeplayer(player_name); - s_player = player(); - x = (rotation:1)%360; - y = (rotation:0)%180; - if(x > 180, - x = x - 360 - ); - if(x < -180, - x = x + 360 - ); - if(y > 90, - y = y - 180 - ); - if(y < -90, - y = y + 180 - ); - modify(player(player_name), 'yaw', x); - modify(player(player_name), 'pitch', y); - print(str('已将'+player_name+'的视角指向§a[%.1f,%.1f]',x,y)); - return() -); -look_up(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look up', player_name)); - return() -); -look_down(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look down', player_name)); - return() -); -look_east(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look east', player_name)); - return() -); -look_north(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look north', player_name)); - return() -); -look_south(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look south', player_name)); - return() -); -look_west(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look west', player_name)); - return() -); -look_pos(player_name, position) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s look at %f %f %f', player_name, position:0, position:1, position:2)); - return() -); -//移动 -move_backward(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s move backward', player_name)); - delete_file(f_player + '-' + 'move_vertical', 'text'); - write_file(f_player + '-' + 'move_vertical', 'text', 'backward'); - return() -); -move_forward(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s move forward', player_name)); - delete_file(f_player + '-' + 'move_vertical', 'text'); - write_file(f_player + '-' + 'move_vertical', 'text', 'forward'); - return() -); -move_left(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s move left', player_name)); - delete_file(f_player + '-' + 'move_transverse', 'text'); - write_file(f_player + '-' + 'move_transverse', 'text', 'left'); - return() -); -move_right(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s move right', player_name)); - delete_file(f_player + '-' + 'move_transverse', 'text'); - write_file(f_player + '-' + 'move_transverse', 'text', 'right'); - return() -); -move_stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s move', player_name)); - delete_file(f_player + '-' + 'move_vertical', 'text'); - delete_file(f_player + '-' + 'move_transverse', 'text'); - return() -); -//停止 -stop(player_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - run(str('player %s stop', player_name)); - delete_all_files(f_player); - return() -); -//传送 -tp(player_name, position) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - s_player = player(); - x = position:0; - y = position:1; - if(y>4096 || y<-4096, - print('§4y值不能超过±4096！'); - return() - ); - z = position:2; - print(s_player~'yaw'+'|'+s_player~'pitch'); - run(str('tp %s %f %f %f %f %f', f_player, x, y, z, s_player~'yaw', s_player~'pitch')); - print(str('已将'+player_name+'传送至§a[%.2f,%.2f,%.2f]',x,y,z)); - return() -); -tp_with_rotation(player_name, position, rotation) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - s_player = player(); - f_player = player(player_name); - x = position:0; - y = position:1; - if(y>4096 || y<-4096, - print('§4y值不能超过±4096！'); - return() - ); - z = position:2; - yaw = (rotation:1)%360; - pitch = (rotation:0)%180; - if(yaw > 180, - yaw = yaw - 360 - ); - if(yaw < -180, - yaw = yaw + 360 - ); - if(pitch > 90, - pitch = pitch - 180 - ); - if(pitch < -90, - pitch = pitch + 180 - ); - run(str('tp %s %f %f %f %f %f', f_player, x, y, z, yaw, pitch)); - print(str('已将'+player_name+'传送至§a[%.2f,%.2f,%.2f]',x,y,z)); - return() -); -tp_to_player(player_name, target_name) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - s_player = player(target_name); - if (!s_player, - print('§4玩家未在线'); - return() - ); - run(str('tp %s %s', f_player, s_player)); - print(str('已将'+player_name+'传送至'+s_player)); - return() -); -tp_at_bot(player_name, position) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - s_player = player(); - x = position:0; - y = position:1; - if(y>4096 || y<-4096, - print('§4y值不能超过±4096！'); - return() - ); - z = position:2; - print(s_player~'yaw'+'|'+s_player~'pitch'); - run(str('execute at %s run tp %s %f %f %f', f_player, x, y, z)); - print(str('已将'+player_name+'传送至§a[%.2f,%.2f,%.2f]',x,y,z)); - return() -); -tp_at_bot_with_rotation(player_name, position, rotation) ->( - f_player = player(player_name); - check_fakeplayer(player_name); - s_player = player(); - f_player = player(player_name); - x = position:0; - y = position:1; - if(y>4096 || y<-4096, - print('§4y值不能超过±4096！'); - return() - ); - z = position:2; - yaw = (rotation:1)%360; - pitch = (rotation:0)%180; - if(yaw > 180, - yaw = yaw - 360 - ); - if(yaw < -180, - yaw = yaw + 360 - ); - if(pitch > 90, - pitch = pitch - 180 - ); - if(pitch < -90, - pitch = pitch + 180 - ); - run(str('execute at %s run tp %s %f %f %f %f %f', f_player, f_player, x, y, z, yaw, pitch)); - print(str('已将'+player_name+'传送至§a[%.2f,%.2f,%.2f]',x,y,z)); - return() -); -//状态检查 -check(player_name) ->( - check_offline(player_name); - f_player = player(player_name); - if(scoreboard('carpetBot', f_player) == 1, - ( - print('假人“'+f_player+'”：'); - ), - print('玩家“'+f_player+'”：'); - ); - //血量 - inner_health = number(str('%d',query(f_player,'health')+0.9)); - if(inner_health <= 5, - inner_color = '§4'; - ); - if(inner_health > 5 && inner_health <= 10, - inner_color = '§c'; - ); - if(inner_health > 10 && inner_health <= 15, - inner_color = '§e'; - ); - if(inner_health > 15, - inner_color = '§a'; - ); - print('- 血量：'+inner_color+inner_health); - //位置 - if(f_player~'dimension' == 'overworld', - f_dimension = '§2主世界' - ); - if(f_player~'dimension' == 'the_nether', - f_dimension = '§4地狱' - ); - if(f_player~'dimension' == 'the_end', - f_dimension = '§7末地' - ); - print(str('- 位于：%s§a[%.2f,%.2f,%.2f]',f_dimension,f_player~'x',f_player~'y',f_player~'z')); - //指向 - f_yaw = f_player~'yaw'; - if(f_yaw > 180, - f_yaw = f_yaw - 360 - ); - if(f_yaw < -180, - f_yaw = f_yaw + 360 - ); - if(f_yaw > -112.5 && f_yaw <= -67.5, - f_yaw_curt = '东' - ); - if(f_yaw > -22.5 && f_yaw <= 22.5, - f_yaw_curt = '南' - ); - if(f_yaw > 67.5 && f_yaw <= 112.5, - f_yaw_curt = '西' - ); - if(f_yaw > 157.5 || f_yaw <= -157.5, - f_yaw_curt = '北' - ); - if(f_yaw > -157.5 && f_yaw <= -112.5, - f_yaw_curt = '东北' - ); - if(f_yaw > -67.5 && f_yaw <= -22.5, - f_yaw_curt = '东南' - ); - if(f_yaw > 112.5 && f_yaw <= 157.5, - f_yaw_curt = '西北' - ); - if(f_yaw > 22.5 && f_yaw <= 67.5, - f_yaw_curt = '西南' - ); - f_pitch = f_player~'pitch'; - if(f_pitch > -15 && f_pitch <= 15, - f_pitch_curt = '前方' - ); - if(f_pitch > 15 && f_pitch <= 75, - f_pitch_curt = '斜下方' - ); - if(f_pitch > 75 && f_pitch <= 90, - f_pitch_curt = '下方' - ); - if(f_pitch > -75 && f_pitch <= -15, - f_pitch_curt = '斜上方' - ); - if(f_pitch >= -90 && f_pitch <= -75, - f_pitch_curt = '上方' - ); - print(str('- 指向：§e%s,%s§a[%.1f,%.1f]',f_yaw_curt,f_pitch_curt,f_yaw,f_pitch)); - f_state = global_bot_state:f_player; - //潜行/疾跑/游泳 - inner_sneak = query(f_player,'sneaking'); - inner_sprint = query(f_player,'sprinting'); - inner_swim = query(f_player,'swimming'); -//*************************************************** - noAct = true; - //攻击/挖掘 - inner_attack = read_file(f_player + '-' + 'attack', 'text'):0; - if(inner_attack != null, - if(inner_attack == 0, - print('- 正在挖掘'); - noAct = false - ); - if(inner_attack > 0, - inner_sec = inner_attack/20; - print('- 每' + inner_attack + '游戏刻（' + inner_sec + '游戏秒）尝试攻击一次'); - noAct = false - ) - ); - //扔东西 - inner_drop = read_file(f_player + '-' + 'drop', 'text'):0; - if(inner_drop != null, - if(inner_drop == 0, - print('- 正在持续每次扔一个物品'); - noAct = false - ); - if(inner_drop > 0, - inner_sec = inner_drop/20; - print('- 每' + inner_drop + '游戏刻（' + inner_sec + '游戏秒）扔1个物品'); - noAct = false - ) - ); - inner_drop_stack = read_file(f_player + '-' + 'drop_stack', 'text'):0; - if(inner_drop_stack != null, - if(inner_drop_stack == 0, - print('- 正在持续每次扔一组物品'); - noAct = false - ); - if(inner_drop > 0, - inner_sec = inner_drop_stack/20; - print('- 每' + inner_drop_stack + '游戏刻（' + inner_sec + '游戏秒）扔1个物品'); - noAct = false - ) - ); - //跳跃 - inner_jump = read_file(f_player + '-' + 'jump', 'text'):0; - if(inner_jump != null, - if(inner_jump == 0, - print('- 正在持续跳跃'); - noAct = false - ); - if(inner_jump > 0, - inner_sec = inner_jump/20; - print('- 每' + inner_jump + '游戏刻（' + inner_sec + '游戏秒）尝试跳跃一次'); - noAct = false - ) - ); - //换手 - inner_swap_hands = read_file(f_player + '-' + 'swap_hands', 'text'):0; - if(inner_swap_hands != null, - if(inner_swap_hands == 0, - print('- 正在持续交换左右手的物品'); - noAct = false - ); - if(inner_swap_hands > 0, - inner_sec = inner_swap_hands/20; - print('- 每' + inner_swap_hands + '游戏刻（' + inner_sec + '游戏秒）交换一次左右手的物品'); - noAct = false - ) - ); - //使用物品 - inner_use = read_file(f_player + '-' + 'use', 'text'):0; - if(inner_use != null, - if(inner_use == 0, - print('- 正在持续使♂用物品'); - noAct = false - ); - if(inner_use > 0, - inner_sec = inner_use/20; - print('- 每' + inner_use + '游戏刻（' + inner_sec + '游戏秒）尝试使用一次物♂品'); - noAct = false - ) - ); - //移动**********************************重点********************************* - inner_move_vertical = read_file(f_player + '-' + 'move_vertical', 'text'):0; - inner_move_transverse = read_file(f_player + '-' + 'move_transverse', 'text'):0; - if(inner_sneak == true, - if(inner_move_vertical == 'forward', - if(inner_move_transverse == 'right', - print('- 正在向右前方潜行↗'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左前方潜行↖'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向前潜行↑'); - noAct = false - ) - ); - if(inner_move_vertical == 'backward', - if(inner_move_transverse == 'right', - print('- 正在向右后方潜行↘'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左后方潜行↙'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向后潜行↓'); - noAct = false - ) - ); - if(inner_move_vertical == null, - if(inner_move_transverse == 'right', - print('- 正在向右潜行→'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左潜行←'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在潜伏'); - noAct = false - ) - ) - ); - if(inner_sprint == true, - if(inner_swim == true, - if(inner_move_vertical == 'forward', - if(inner_move_transverse == 'right', - print('- 正在向右前方游泳↗'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左前方游泳↖'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向前游泳↑'); - noAct = false - ) - ); - if(inner_move_vertical == 'backward', - if(inner_move_transverse == 'right', - print('- 正在向右后方游泳↘§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左后方游泳↙§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向后游泳↓§e（没错它可以开挂）'); - noAct = false - ) - ); - if(inner_move_vertical == null, - if(inner_move_transverse == 'right', - print('- 正在向右游泳→§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左游泳←§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在原地游泳↓§e（没错它可以开挂）'); - noAct = false - ) - ) - ); - if(inner_swim == false, - if(inner_move_vertical == 'forward', - if(inner_move_transverse == 'right', - print('- 正在向右前方疾跑↗'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左前方疾跑↖'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向前疾跑↑'); - noAct = false - ) - ); - if(inner_move_vertical == 'backward', - if(inner_move_transverse == 'right', - print('- 正在向右后方疾跑↘§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左后方疾跑↙§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向后疾跑↓§e（没错它可以开挂）'); - noAct = false - ) - ); - if(inner_move_vertical == null, - if(inner_move_transverse == 'right', - print('- 正在向右疾跑→§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左疾跑←§e（没错它可以开挂）'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在原地疾跑，§e（没错它可以开挂）'); - noAct = false - ) - ) - ); - ); - if(inner_sprint == false && inner_sneak == false, - if(inner_move_vertical == 'forward', - if(inner_move_transverse == 'right', - print('- 正在向右前方走↗'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左前方走↖'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向前走↑'); - noAct = false - ) - ); - if(inner_move_vertical == 'backward', - if(inner_move_transverse == 'right', - print('- 正在向右后方走↘'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左后方走↙'); - noAct = false - ); - if(inner_move_transverse == null, - print('- 正在向后走↓'); - noAct = false - ) - ); - if(inner_move_vertical == null, - if(inner_move_transverse == 'right', - print('- 正在向右走→'); - noAct = false - ); - if(inner_move_transverse == 'left', - print('- 正在向左走←'); - noAct = false - ) - ) - ); - //乘坐 - inner_mount = f_player~'mount'; - if(inner_mount != null, - if(inner_mount == 'horse', - print('- 正在骑马') - ); - if(inner_mount == 'donkey', - print('- 正在骑驴') - ); - if(inner_mount == 'mule', - print('- 正在骑骡') - ); - if(inner_mount == 'trader_llama', - print('- 正在骑羊驼') - ); - if(inner_mount == 'pig', - print('- 正在骑猪') - ); - if(inner_mount == 'skeleton_horse', - print('- 正在骑骷髅马') - ); - if(inner_mount == 'zombie_horse', - print('- 正在骑僵尸马') - ); - noAct = false - ); - if(noAct == true, - print('- 无地毯动作') - ); - return() -); -checkall() ->( - player_list = player('all'); - c_for(i = 0, i < length(player_list), i += 1, - check(player_list:i); - ); - return() -); -run(str('tellraw @a {"text": "[版本信息]' + global_filename + '版本: ' + global_version + '", "color": "#ffd900"}')); -run(str('tellraw @a {"text": "[版本信息]carpet版本: ' + global_carpet_version:0 + '", "color": "#ffd900"}')); -if(number(global_carpet_version:1) < global_require_carpet_version:1 || global_carpet_version == null, - run(str('tellraw @a {"text": "[错误]' + global_filename + '需要地毯' + global_require_carpet_version:0 + '或以上来运行！否则会出现预期之外的问题", "color": "#ff6100"}');) -); \ No newline at end of file diff --git a/图片示例：设置界面.png b/图片示例：设置界面.png deleted file mode 100644 index 8b53a64..0000000 Binary files a/图片示例：设置界面.png and /dev/null differ