From 932b9a34e05065827d515a3ec17e65a323396b39 Mon Sep 17 00:00:00 2001 From: EillesWan Date: Thu, 18 Jul 2024 16:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE.md | 267 +++++++------------- Musicreater/__init__.py | 13 +- Musicreater/constants.py | 6 +- Musicreater/exceptions.py | 4 +- Musicreater/experiment.py | 4 +- Musicreater/magicmain.py | 4 +- Musicreater/main.py | 88 +++---- Musicreater/plugin/__init__.py | 4 +- Musicreater/plugin/addonpack/__init__.py | 4 +- Musicreater/plugin/addonpack/main.py | 4 +- Musicreater/plugin/archive.py | 4 +- Musicreater/plugin/bdx.py | 4 +- Musicreater/plugin/bdxfile/__init__.py | 4 +- Musicreater/plugin/bdxfile/main.py | 4 +- Musicreater/plugin/common.py | 4 +- Musicreater/plugin/main.py | 4 +- Musicreater/plugin/mcstructfile/__init__.py | 4 +- Musicreater/plugin/mcstructfile/main.py | 4 +- Musicreater/plugin/mcstructure.py | 4 +- Musicreater/plugin/noteblock.py | 4 +- Musicreater/plugin/schematic.py | 4 +- Musicreater/plugin/schematic/__init__.py | 4 +- Musicreater/plugin/schematic/main.py | 4 +- Musicreater/plugin/websocket/__init__.py | 4 +- Musicreater/plugin/websocket/main.py | 4 +- Musicreater/subclass.py | 160 +----------- Musicreater/types.py | 4 +- Musicreater/utils.py | 4 +- docs/转换乐器对照表.md | 4 +- example.py | 4 +- setup.py | 2 +- upload.bat | 8 +- 32 files changed, 194 insertions(+), 450 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 15693bd..989c51d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,218 +1,123 @@ -**注意，以下条款或版权声明应当且必须是高于此项目中任何其他声明的** +# 汉钰律许可协议 -1. 音·创的全部开发者享有其完整版权，其开发者可以在任一时刻终止以后音·创源代码开放，若经由其开发者授予特殊权利，则授权对象可以将源代码进行特定的被特殊授权的操作 -2. 音·创或（及）其代码允许在 Apache2.0 协议的条款与说明下进行非商业使用 -3. 除部分代码特殊声明外，音·创允许对其或（及）其代码进行商业化使用，但是需要经过音·创主要开发者（诸葛亮与八卦阵、金羿）的一致授权，同时，授权对象在商业化授权的使用过程中必须依照 Apache2.0 协议的条款与说明 -4. 若存在对于音·创包含的部分代码的特殊开源声明，则此部分代码依照其特定的开源方式授权，但若此部分代码经由此部分代码的主要开发者一致特殊授权后商用，则授权对象在商用时依照此部分的开发者所准许的方式（或条款）进行商用 -5. Apache2.0 协议的英文原文副本可见下文 +**总第一版 · 二〇二四年七月七日编** -> The English Translation of the TERMS AND CONDITIONS above is listed below -> -> This translated version is for reference only and has no legal effect. -> -> The version with legal effect is the Chinese version above. +## 一、重要须知 -**Note, The TERMS AND CONDITIONS below should and must be above all others in this project** +1. 为保护采用本协议的作品在开源过程中，其著作权人所应有的权益，根据**中华人民共和国著作权法和相关法律法规**，制定本协议。 -1. *Musicreater* is fully copyrighted by all its developers, the developers have the right to make *Musicreater* close sourced at any time. Operations are permitted under specific terms instructed by its developer(s). -2. Non-commercial use of *Musicreater* and(or) its source code is permitted under Apache License 2.0. -3. Commercial use of *Musicreater* is permitted under Apache License 2.0 with the unanimous permission of the steering developers of *Musicreater* (*bgArray*诸葛亮与八卦阵 and *Eilles*金羿). -4. *Musicreater* is open sourced under priority given: - 1. License granted by the core developer(s) of a section after negotiation. - 2. Explicitly stated license. - 3. Apache 2.0 License. -5. A copy of the original Apache Lisence 2.0 can be found below. +2. 本协议履行过程中，请注意本协议中**免除或限制**民事主体**责任或权利**的条款、法律适用和争议解决条款（尤其是加有特殊标记的条款），这些条款应在中国法律所允许的范围内最大程度地适用。 -```text - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +3. 若本协议所涉及的自然人**未满 18 周岁**，该自然人应在监护人的陪同下阅读本协议及有关本协议的条款内容，并在取得其监护人同意后开始或继续应用本协议所授权的行为。 - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +4. 由于互联网服务、互联网内容的特殊性，若本协议以电子协议形式分发并签订，其依然有效。您一旦开始对本协议所授权之作品进行本协议所授权的行为，即视为您已经阅读、理解并同意并已经接受本协议的全部条款。 - 1. Definitions. +5. 本协议的订立、履行、解释及争议的解决均**适用中华人民共和国法律并排除其他一切冲突法的适用**。_本协议订立于许可证最初的颁发者的地址。若其为自然人，则订立于该自然人户籍所在地；若为法人或非法人组织，则订立于其注册地_。本协议的订立各方应友好协商解决于协议所规定之行为的履行相关的争议；如协商不成，任何一方均可向合同签订地有管辖权的人民法院提起诉讼。 - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +6. 本协议的原本仅为现代汉语，书写于简体中文。若存在其他语言的翻译或其他同等语言但非简体中文文本的版本，应当无法律效力。 - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. +## 二、术语定义 - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +1. “**许可证**”、“**协议**”（后文称“本协议”）是指根据本文档中所列举的全部术语、定义、条款、限制等文本，是本合同的简称称谓。本合同全称是“汉钰律许可协议”。 - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. +2. “**协议颁发者**”（后文称“颁发者”）是将条款或协议应用于其拥有著作财产权的作品的民事主体，或由其指定从而拥有颁发者身份的民事主体。 - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +3. “**源**”形式是指对包括但不限于 软件、硬件、文档、配置项 等种类的作品进行修改、编辑的首选形式；若不存在首选形式，则初次编辑该作品所需的形式即为源形式。 - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. +4. “**目标**”形式是指对源形式进行机械转换、翻译、打印、制造、加工等同类型活动后形成的结果形式，包括但不限于源代码编译后的目标软件、生成的文件、转换出的媒体、制造出的机械、打印出的实体文本、加工后的零件。 - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +5. “**采用本协议的作品**”（后文称“此作品”）是指经颁发者授权而使用本协议进行授权的任何作品，该作品应在自然人可见处明确附加一个自然人可读的版权通知（可以参考文末附录中提供的示例）；若在一个可分割的作品中，部分地采用本协议进行授权，则该部分应当视为一个独立的采用本协议的作品，该作品应当在自然人可见处明确附加一个自然人可读的范围限定和版权通知（同样可以参考文末附录中提供的示例）。 - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. +6. “**贡献**”是指对作品进行的，意在提交给此作品颁发者以让著作权人包含在其作品中的任何修订或补充，该修订或补充同样属于一种作品。依据此定义，“提交”一词表示经由此作品颁发者所指定的形式，将其所进行的修改发送给此作品颁发者。该形式应当包括在此作品颁发者指定的平台内发送易于编辑的修改信息、在此作品颁发者指定的电子邮箱中发送易于编辑的修改信息、在此作品颁发者指定的源码控制系统或发布跟踪系统上提交的易于编辑的修改信息，但由著作权人以明显标注或指定为“非贡献”的活动除外。颁发者自己对作品进行的修改同样视作对作品的贡献。 - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." +7. “**贡献者**”是指此作品颁发者接受的贡献的提交者，或包含在作品的贡献清单中的民事主体。贡献者在提交贡献并经此作品颁发者通过且该贡献已经被应用于此作品中后，该贡献者应当视为此作品的著作权人之一，但不应视为此作品非其贡献的部分的著作权人。一个作品的颁发者同样属于其贡献者。**请注意**，针对贡献者提交的贡献，该贡献者应被视为该贡献的协议颁发者，但不应视作本作品的颁发者。 - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. +8. “**用户**”、“**使用者**”是指行使本协议所授权之行为的民事主体。据此，贡献者亦属于用户。 - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. +9. “**商业性使用**”、“**商用**”是指任何以谋取利益为目的的使用，包括但不限于以贩卖、出租的形式对作品进行使用；但若将该牟利活动明确指示为“捐赠”，且在牟利者进行本协议所授权的活动时不以捐赠数额为标准，则此种的获取利益的“捐赠”行为不属于商业性使用。 - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. +## 三、权利授予 - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: +1. 任何由颁发者所进行的特殊声明、特别注意等此类内容，应当在法律效力上高于本协议的条款或声明；这些声明若与本协议冲突，本协议的该冲突部分无效；本协议与这些声明共同构成颁发者与用户之间的合同。 - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and +2. 此作品的贡献者享有其贡献的完整著作权。 - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and +3. 此作品的贡献者将自己的贡献的全部著作财产权，免费、公开、不可撤销、无限期、非专有地授予此作品的全部著作权人，并准许其在全世界范围内使用上述权利；若无明确的标识，贡献者允许此作品的颁发者对其贡献进行免费、公开、不可撤销、无限期、非专有、世界范围内的商业性使用。 - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and +4. 此作品的著作权人及贡献者授予用户**免费、公开、不可撤销、非专有、非商用**地以任意形式**复制、发行、展览、表演、放映、广播、信息网络传播、摄制、改编、翻译、汇编、二次授权**的权利，准许其在此作品颁发者所指定的区域与时间内行使上述权利；若此作品颁发者未特别指定的，则视作在全世界范围内无限期地授权；若此作品颁发者特别指定在特定情况下可以商用，则应当按照其所指定的条件进行商业性使用，商用的过程中，应当明确标识此作品的著作权人。 - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. +5. 一旦此作品有任意由非贡献形式而产生的更改，更改的部分将不视为此作品的一部分，除非该部分不可离开此作品单独存在；若该部分必须依赖此作品而不可与此作品分离从而单独存在，则更改后的作品不视作此作品，在这种情况下，除非此更改后的作品已获得此作品颁发者的特殊许可、或更改者即为此作品颁发者本人，否则对该作品进行的任何活动都应当遵守本协议。 - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. +6. 经贡献而产生的对此作品的更改，属于此作品的一部分；在此情况下，更改后的作品，依旧视作此作品。 - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. +7. 依据本款的第 4 条，若用户在本协议的授权下，将此作品授予他人进行任何形式的活动（即“二次授权”、“二次分发”），则应确保其使用的协议或授权内容，与本协议的条款不冲突；当存在与本协议条款的冲突时，则该冲突内容无效，被授权的第三方应依照本协议的条款进行活动；除非该用户获得了此作品颁发者的特殊许可、或该用户即为此作品颁发者本人。 - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. +8. 依据本款的第 5 条，若由非贡献形式而产生更改的部分是可分割而不需依赖此作品即可单独存在的，若该部分明确注明不使用本协议进行授权或明确声明了其他授权条款，则该部分不视作采用本协议；但未更改的部分仍应视作原此作品的一部分，需要采用本协议进行授权，除非此更改后的作品已获得此作品颁发者的特殊许可、或更改者即为此作品颁发者本人。 - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. +9. 若此作品或所提交的贡献包含其著作权人的专利，则该专利所有人即此作品的著作权人应准许此作品全体著作权人**免费、公开、不可撤销、非专有、无版权费的专利许可**，以便贡献者对作品进行本协议所授权进行的活动。 - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. +10. 上述专利许可的授予，仅适用于在所提交的贡献中，可由专利所有者授予的，且在对此作品进行本协议所授权的活动中，必须使用的专利。 - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. +11. 如果用户对任何民事主体，因其在进行本协议所授权进行的活动中侵犯该用户的专利而提起诉讼，那么根据本协议授予该用户的所有关于此作品的任何其他专利许可将在提起上述诉讼之日起终止。 - END OF TERMS AND CONDITIONS +12. 如果本作品作为用户的其他作品的不可分割的一部分进行任何民事活动，本协议依旧对本作品（即该用户的其他作品的一部分）生效；若本作品完全融入该用户的其他作品之中而不可独立存在，则该用户需要保证其作品存在与本协议冲突的条款；除非该作品已获得此作品颁发者的特殊许可、或该用户即为此作品颁发者本人。 +## 四、使用条件 - Copyright 2023 TriM-Organization 金羿("Eilles Wan") & 诸葛亮与八卦阵("bgArray") & all the developers of Musicreater +在对此作品进行本协议所授权的民事活动中，应当同时满足以下条款： - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +1. 用户必须为此作品的任何其他接收者提供本协议的副本，在不得已无法提供副本的情况下，也应明确指示其他接收者可查阅本协议的位置。 - http://www.apache.org/licenses/LICENSE-2.0 +2. 用户必须在修改后的作品中附带明显的通知，声明用户已更改文件，并注明更改位置。 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +3. 若用户二次分发此作品，可以选择向此作品的接收者提供无偿或有偿的担保维修、支持服务或其他责任、义务。但是，该用户只可以其自己的名义提供上述内容，不得以任何其他贡献者的名义。且该用户必须明确表明任何此类责任或义务是由其个人独立提供，且其同意并应当承担赔偿此作品的全体贡献者因其个人承担上述责任义务而产生的任何赔偿责任。 + +4. 用户不得删除或更改此作品中包含的任何许可声明（包括版权声明，专利声明，免责声明，或赔偿责任限制），除非该更改是对已知事实错误的修补、或其已获得此作品颁发者的特殊许可、或更改者即为此作品颁发者本人。 + +5. 若此作品将权益的声明通知作为一部分，那么由用户分发的任何版本的作品中须至少在下列三处之一包含该声明通知的自然人可读副本： + + - 该作品的权益声明通知中 + - 在源形式的文件中（当且仅当该作品开放源代码） + - 在惯例中作为第三方通知出现之处（当且仅当该作品会产生画面，且该画面可被自然人详细观察） + + 该通知的内容仅供信息提供，不应对许可证进行任何文字上的修改。用户可在其分发的作品中，在不构成修改本协议的前提下，在作品自身的声明通知或属性描述后或作为附录添加。 + +6. 依据本款第3条，若用户二次分发此作品时，选择向作品的接收者提供收费的担保服务，则必须明确告知该接收者本协议全部内容与此作品原出处，并确保其知悉上述内容；但若用户在二次分发此作品是，不选择提供任何服务，则该用户不允许向作品的接收者收取任何费用，除非该用户获得了此作品颁发者的特殊许可、或该用户即为此作品颁发者本人。 + +## 五、提交贡献 + +除非贡献者明确声明，在本作品中由该贡献者向颁发者的提供的提交，必须符合本协议的条款，并与本协议的条款不存在冲突；除非此贡献中与本协议冲突的附加条款已获得颁发者的特殊许可、或贡献者即为此作品颁发者本人。 + +## 六、商标相关 + +本协议并未授予用户，将颁发者的商标、专属标记或特定产品名称，用于合理的或惯例性的描述或此类声明之外其他任何位置的权利。 + +## 七、免责声明 + +1. 若非因法律要求或经过了特殊准许，此作品在根据本协议“原样”提供的基础上，**不予提供任何形式的担保、任何明示、任何暗示或类似承诺**，此类包括但不限于担保此作品毫无缺陷、担保此作品适于贩卖、担保此作品适于特定目的、担保使用此作品绝不侵权。用户将自行承担因此作品的质量或性能问题而产生的全部风险。若此作品在任何方面欠妥，将由用户（而非任何贡献者、而非任何颁发者）承担所有必要的服务、维修或除错的任何成本。本免责声明本许可的重要组成部分。当且仅当遵守本免责声明时，本协议的其他条款中对本作品的使用授权方可生效。 + +2. 无论是因何种原因，如果不是在法律规定的特殊情况（如，确为贡献者的故意或重大过失）下或者经过了特殊准许，即使贡献者事先已知发生损害的可能，在使用本作品时，用户产生的任何直接、间接、特殊、偶然或必然造成的损失（包括但不限于商誉损失、工作延误、计算机系统故障等），**均不由任一贡献者承担**。 + +**以上是本许可协议的全部条款** + +--- + +附录 + +**如何在自己的作品中应用 汉钰律许可协议** + +若要在自己源形式的作品应用本协议，请在其中附加下面的通知模板，并将六角括号“〔〕”中的字段替换成自身的实际信息来替换（不包括括号本身）。这些文本必须以对应文件格式适当的注释句法包含在其中，可以是实体的纸质文档、也可以是网络公告或者计算机文件；或者脱离该源之外，另起一个新的文件，使之指向要应用本协议的那个作品。同时也建议将作品名或类别名以及目的说明之类的声明囊括在同一个可被打印的页面上作为版权通知的整体，这样更加容易的区分出第三方内容。 + +若需要在自己以目标形式存在的作品中应用本协议，同样需要附加下面的通知模板并更改六角括号中的字样。但是，这些文本可以是位于作品的标签上、位于作品的用户可见且能被自然人详细观察的画面之中、或者按照惯例中许可协议应该出现的位置；同时，这些文本的所处位置应当能够明确指示到本协议应用的那个作品。另外，建议将作品名或类别名以及目的说明之类的声明囊括在同一个可被打印的位置上作为版权通知的整体，这样更加容易的区分出第三方内容。 + +**通知模板** + +``` +版权所有 © 〔年份〕 〔著作权人〕 +〔或者：版权所有 (C) 〔年份〕 〔著作权人〕〕 + +〔该作品〕根据 第一版 汉钰律许可协议（“本协议”）授权。 +任何人皆可从以下地址获得本协议副本：〔本协议副本所在地址〕。 +若非因法律要求或经过了特殊准许，此作品在根据本协议“原样”提供的基础上，不予提供任何形式的担保、任何明示、任何暗示或类似承诺。也就是说，用户将自行承担因此作品的质量或性能问题而产生的全部风险。 +详细的准许和限制条款请见原协议文本。 ``` \ No newline at end of file diff --git a/Musicreater/__init__.py b/Musicreater/__init__.py index 95be9fe..285467e 100644 --- a/Musicreater/__init__.py +++ b/Musicreater/__init__.py @@ -5,11 +5,16 @@ Musicreater(音·创) A free open source library used for convert midi file into formats that is suitable for **Minecraft**. -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray -开源相关声明请见 仓库根目录下的 License.md -Terms & Conditions: License.md in the root directory +音·创（“本项目”）的协议颁发者为 金羿、诸葛亮与八卦阵 +The Licensor of Musicreater("this project") is Eilles Wan, bgArray. + +本项目根据 第一版 汉钰律许可协议（“本协议”）授权。 +任何人皆可从以下地址获得本协议副本：https://gitee.com/EillesWan/YulvLicenses。 +若非因法律要求或经过了特殊准许，此作品在根据本协议“原样”提供的基础上，不予提供任何形式的担保、任何明示、任何暗示或类似承诺。也就是说，用户将自行承担因此作品的质量或性能问题而产生的全部风险。 +详细的准许和限制条款请见原协议文本。 """ # 睿乐组织 开发交流群 861684859 diff --git a/Musicreater/constants.py b/Musicreater/constants.py index 5d40dcb..280ac08 100644 --- a/Musicreater/constants.py +++ b/Musicreater/constants.py @@ -5,8 +5,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory @@ -1041,7 +1041,7 @@ MM_DISLINK_PERCUSSION_INSTRUMENT_TABLE: Dict[int, str] = { # 金羿ELS 音符方块对照表 -MN_EILLES_NOTE_TABLE: Dict[int, str] = { +MN_EILLES_NOTE_BLOCK_TABLE: Dict[int, str] = { 0: "C", 1: "C#", 2: "D", diff --git a/Musicreater/exceptions.py b/Musicreater/exceptions.py index 70f5774..ebb5d2d 100644 --- a/Musicreater/exceptions.py +++ b/Musicreater/exceptions.py @@ -5,8 +5,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/experiment.py b/Musicreater/experiment.py index a6c1007..e58e608 100644 --- a/Musicreater/experiment.py +++ b/Musicreater/experiment.py @@ -5,8 +5,8 @@ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/magicmain.py b/Musicreater/magicmain.py index 1d5fecc..35b552d 100644 --- a/Musicreater/magicmain.py +++ b/Musicreater/magicmain.py @@ -22,8 +22,8 @@ Musicreater (音·创) A free open source library used for convert midi file into formats that is suitable for **Minecraft**. -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 ../License.md Terms & Conditions: ../License.md diff --git a/Musicreater/main.py b/Musicreater/main.py index 690d9c8..ffccb57 100644 --- a/Musicreater/main.py +++ b/Musicreater/main.py @@ -7,11 +7,16 @@ Musicreater (音·创) A free open source library used for **Minecraft** musics. -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray -开源相关声明请见 仓库根目录下的 License.md -Terms & Conditions: License.md in the root directory +音·创（“本项目”）的协议颁发者为 金羿、诸葛亮与八卦阵 +The Licensor of Musicreater("this project") is Eilles Wan, bgArray. + +本项目根据 第一版 汉钰律许可协议（“本协议”）授权。 +任何人皆可从以下地址获得本协议副本：https://gitee.com/EillesWan/YulvLicenses。 +若非因法律要求或经过了特殊准许，此作品在根据本协议“原样”提供的基础上，不予提供任何形式的担保、任何明示、任何暗示或类似承诺。也就是说，用户将自行承担因此作品的质量或性能问题而产生的全部风险。 +详细的准许和限制条款请见原协议文本。 """ # 音·创 开发交流群 861684859 @@ -368,53 +373,6 @@ class MusicSequence: if is_sort: self.channels[channel_no].sort(key=lambda note: note.start_tick) - @staticmethod - def guess_deviation_wasted( - total_note_count: int, - total_instrument_count: int, - note_count_per_instrument: Optional[Dict[str, int]] = None, - qualified_note_count_per_instrument: Optional[Dict[str, int]] = None, - music_channels: Optional[MineNoteChannelType] = None, - ) -> float: - """已废弃""" - if ( - note_count_per_instrument is None - or qualified_note_count_per_instrument is None - ): - if music_channels is None: - raise ValueError("参数不足，算逑！") - note_count_per_instrument = {} - qualified_note_count_per_instrument = {} - for this_note in [k for j in music_channels.values() for k in j]: - if this_note.sound_name in note_count_per_instrument.keys(): - note_count_per_instrument[this_note.sound_name] += 1 - qualified_note_count_per_instrument[ - this_note.sound_name - ] += is_note_in_diapason(this_note) - else: - note_count_per_instrument[this_note.sound_name] = 1 - qualified_note_count_per_instrument[this_note.sound_name] = int( - is_note_in_diapason(this_note) - ) - return ( - sum( - [ - ( - ( - MM_INSTRUMENT_RANGE_TABLE[inst][-1] - * note_count - / total_note_count - - MM_INSTRUMENT_RANGE_TABLE[inst][-1] - ) - * (note_count - qualified_note_count_per_instrument[inst]) - ) - for inst, note_count in note_count_per_instrument.items() - ] - ) - / total_instrument_count - / total_note_count - ) - @staticmethod def to_music_note_channels( midi: mido.MidiFile, @@ -999,6 +957,34 @@ class MidiConvert(MusicSequence): self.progress_bar_command = result return result + def redefine_execute_format(self, is_old_exe_cmd_using: bool = False): + """ + 根据是否使用旧版执行命令格式，重新定义执行命令的起始格式。 + + 此方法用于处理 Minecraft 中的执行命令的格式差异。在 Minecraft 的命令系统中， + "execute" 命令的用法在不同版本间有所变化。此方法允许动态选择使用旧版还是新版 + 的命令格式，以便适应不同的 Minecraft 版本。 + + Parameters + ---------- + is_old_exe_cmd_using: bool + 是否使用旧版执行命令格式。 + + Returns + ------- + MidiConvert修改后的实例，允许链式调用 + """ + + # 根据 is_old_exe_cmd_using 的值选择合适的执行命令头格式 + self.execute_cmd_head = ( + "execute {} ~ ~ ~ " # 旧版执行命令格式 + if is_old_exe_cmd_using + else "execute as {} at @s positioned ~ ~ ~ run " # 新版执行命令格式 + ) + + # 返回修改后的实例，支持链式调用 + return self + def to_command_list_in_score( self, scoreboard_name: str = "mscplay", diff --git a/Musicreater/plugin/__init__.py b/Musicreater/plugin/__init__.py index ed2af53..851d10b 100644 --- a/Musicreater/plugin/__init__.py +++ b/Musicreater/plugin/__init__.py @@ -2,8 +2,8 @@ """ 存放非音·创本体的附加功能件 -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/addonpack/__init__.py b/Musicreater/plugin/addonpack/__init__.py index 56af4c0..1bea77f 100644 --- a/Musicreater/plugin/addonpack/__init__.py +++ b/Musicreater/plugin/addonpack/__init__.py @@ -2,8 +2,8 @@ """ 用以生成附加包的附加功能 -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/addonpack/main.py b/Musicreater/plugin/addonpack/main.py index 71105c3..bbda69e 100644 --- a/Musicreater/plugin/addonpack/main.py +++ b/Musicreater/plugin/addonpack/main.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/archive.py b/Musicreater/plugin/archive.py index d5b9fbb..9c83701 100644 --- a/Musicreater/plugin/archive.py +++ b/Musicreater/plugin/archive.py @@ -5,8 +5,8 @@ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/bdx.py b/Musicreater/plugin/bdx.py index 4f27c0c..2f15939 100644 --- a/Musicreater/plugin/bdx.py +++ b/Musicreater/plugin/bdx.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/bdxfile/__init__.py b/Musicreater/plugin/bdxfile/__init__.py index f9b9f8f..5a87f23 100644 --- a/Musicreater/plugin/bdxfile/__init__.py +++ b/Musicreater/plugin/bdxfile/__init__.py @@ -2,8 +2,8 @@ """ 用以生成BDX结构文件的附加功能 -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/bdxfile/main.py b/Musicreater/plugin/bdxfile/main.py index 7626c5e..b70d25c 100644 --- a/Musicreater/plugin/bdxfile/main.py +++ b/Musicreater/plugin/bdxfile/main.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/common.py b/Musicreater/plugin/common.py index 8fb350c..2bda08b 100644 --- a/Musicreater/plugin/common.py +++ b/Musicreater/plugin/common.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/main.py b/Musicreater/plugin/main.py index b6fa83a..e34a9af 100644 --- a/Musicreater/plugin/main.py +++ b/Musicreater/plugin/main.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/mcstructfile/__init__.py b/Musicreater/plugin/mcstructfile/__init__.py index ad779a9..d1e35e3 100644 --- a/Musicreater/plugin/mcstructfile/__init__.py +++ b/Musicreater/plugin/mcstructfile/__init__.py @@ -2,8 +2,8 @@ """ 用以生成单个mcstructure文件的附加功能 -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/mcstructfile/main.py b/Musicreater/plugin/mcstructfile/main.py index e799eb9..dbb2aa7 100644 --- a/Musicreater/plugin/mcstructfile/main.py +++ b/Musicreater/plugin/mcstructfile/main.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/mcstructure.py b/Musicreater/plugin/mcstructure.py index 9dfa033..cb36397 100644 --- a/Musicreater/plugin/mcstructure.py +++ b/Musicreater/plugin/mcstructure.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/noteblock.py b/Musicreater/plugin/noteblock.py index 5900d37..548e924 100644 --- a/Musicreater/plugin/noteblock.py +++ b/Musicreater/plugin/noteblock.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/schematic.py b/Musicreater/plugin/schematic.py index 54091cf..69aaa24 100644 --- a/Musicreater/plugin/schematic.py +++ b/Musicreater/plugin/schematic.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/schematic/__init__.py b/Musicreater/plugin/schematic/__init__.py index ffccd9a..9fe2123 100644 --- a/Musicreater/plugin/schematic/__init__.py +++ b/Musicreater/plugin/schematic/__init__.py @@ -2,8 +2,8 @@ """ 用以生成Schematic结构的附加功能 -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/schematic/main.py b/Musicreater/plugin/schematic/main.py index a03f615..2daad1c 100644 --- a/Musicreater/plugin/schematic/main.py +++ b/Musicreater/plugin/schematic/main.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/websocket/__init__.py b/Musicreater/plugin/websocket/__init__.py index c05b970..85469b2 100644 --- a/Musicreater/plugin/websocket/__init__.py +++ b/Musicreater/plugin/websocket/__init__.py @@ -2,8 +2,8 @@ """ 用以启动WebSocket服务器播放的附加功能 -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/plugin/websocket/main.py b/Musicreater/plugin/websocket/main.py index 2b34fdd..78f52c9 100644 --- a/Musicreater/plugin/websocket/main.py +++ b/Musicreater/plugin/websocket/main.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/subclass.py b/Musicreater/subclass.py index 7e8bd71..ebdacd0 100644 --- a/Musicreater/subclass.py +++ b/Musicreater/subclass.py @@ -5,8 +5,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory @@ -353,152 +353,6 @@ class MineNote: return self.tuplize() == other.tuplize() -# @dataclass(init=False) -# class SingleNote: -# """存储单个音符的类""" - -# instrument: int -# """乐器编号""" - -# note: int -# """音符编号""" - -# velocity: int -# """力度/响度""" - -# start_time: int -# """开始之时 ms""" - -# duration: int -# """音符持续时间 ms""" - -# track_no: int -# """音符所处的音轨""" - -# percussive: bool -# """是否为打击乐器""" - -# extra_info: Any -# """你觉得放什么好？""" - -# def __init__( -# self, -# instrument: int, -# pitch: int, -# velocity: int, -# startime: int, -# lastime: int, -# is_percussion: bool, -# track_number: int = 0, -# extra_information: Any = None, -# ): -# """用于存储单个音符的类 -# :param instrument 乐器编号 -# :param pitch 音符编号 -# :param velocity 力度/响度 -# :param startTime 开始之时(ms) -# 注：此处的时间是用从乐曲开始到当前的毫秒数 -# :param lastTime 音符延续时间(ms)""" -# self.instrument: int = instrument -# """乐器编号""" -# self.note: int = pitch -# """音符编号""" -# self.velocity: int = velocity -# """力度/响度""" -# self.start_time: int = startime -# """开始之时 ms""" -# self.duration: int = lastime -# """音符持续时间 ms""" -# self.track_no: int = track_number -# """音符所处的音轨""" -# self.percussive: bool = is_percussion -# """是否为打击乐器""" - -# self.extra_info = extra_information - -# @property -# def inst(self) -> int: -# """乐器编号""" -# return self.instrument - -# @inst.setter -# def inst(self, inst_: int): -# self.instrument = inst_ - -# @property -# def pitch(self) -> int: -# """音符编号""" -# return self.note - -# # @property -# # def get_mc_pitch(self,table: Dict[int, Tuple[str, int]]) -> float: -# # self.mc_sound_ID, _X = inst_to_sould_with_deviation(self.inst,table,"note.bd" if self.percussive else "note.flute",) -# # return -1 if self.percussive else 2 ** ((self.note - 60 - _X) / 12) - -# def set_info(self, sth: Any): -# """设置附加信息""" -# self.extra_info = sth - -# def __str__(self, is_track: bool = False): -# return "{}Note(Instrument = {}, {}Velocity = {}, StartTime = {}, Duration = {}{})".format( -# "Percussive" if self.percussive else "", -# self.inst, -# "" if self.percussive else "Pitch = {}, ".format(self.pitch), -# self.start_time, -# self.duration, -# ", Track = {}".format(self.track_no) if is_track else "", -# ) - -# def __tuple__(self): -# return ( -# ( -# self.percussive, -# self.inst, -# self.velocity, -# self.start_time, -# self.duration, -# self.track_no, -# ) -# if self.percussive -# else ( -# self.percussive, -# self.inst, -# self.note, -# self.velocity, -# self.start_time, -# self.duration, -# self.track_no, -# ) -# ) - -# def __dict__(self): -# return ( -# { -# "Percussive": self.percussive, -# "Instrument": self.inst, -# "Velocity": self.velocity, -# "StartTime": self.start_time, -# "Duration": self.duration, -# "Track": self.track_no, -# } -# if self.percussive -# else { -# "Percussive": self.percussive, -# "Instrument": self.inst, -# "Pitch": self.note, -# "Velocity": self.velocity, -# "StartTime": self.start_time, -# "Duration": self.duration, -# "Track": self.track_no, -# } -# ) - -# def __eq__(self, other) -> bool: -# if not isinstance(other, self.__class__): -# return False -# return self.__str__() == other.__str__() - - @dataclass(init=False) class MineCommand: """存储单个指令的类""" @@ -784,16 +638,6 @@ DEFAULT_PROGRESSBAR_STYLE = ProgressBarStyle( 默认的进度条样式 """ -# NoteChannelType = Mapping[ -# int, -# List[SingleNote,], -# ] -# """ -# 频道信息类型 - -# Dict[int,Dict[int,List[SingleNote,],],] -# """ - MineNoteChannelType = Mapping[ int, diff --git a/Musicreater/types.py b/Musicreater/types.py index 37e8d5f..cb11fef 100644 --- a/Musicreater/types.py +++ b/Musicreater/types.py @@ -5,8 +5,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/Musicreater/utils.py b/Musicreater/utils.py index 952fe4a..01688b4 100644 --- a/Musicreater/utils.py +++ b/Musicreater/utils.py @@ -4,8 +4,8 @@ """ """ -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 仓库根目录下的 License.md Terms & Conditions: License.md in the root directory diff --git a/docs/转换乐器对照表.md b/docs/转换乐器对照表.md index bb7ba7f..46b7caf 100644 --- a/docs/转换乐器对照表.md +++ b/docs/转换乐器对照表.md @@ -12,8 +12,8 @@ **_使用时请遵循协议规定_** -- 版权所有 © 2024 音·创 开发者 -- Copyright © 2024 all the developers of Musicreater +- 版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +- Copyright © 2024 EillesWan & bgArray * 开源相关声明请见 仓库根目录下的 License.md * Terms & Conditions: License.md in the root directory diff --git a/example.py b/example.py index e3a2c20..d6e3c6f 100644 --- a/example.py +++ b/example.py @@ -9,8 +9,8 @@ Musicreater (音·创) A free open source library used for convert midi file into formats that is suitable for **Minecraft**. -版权所有 © 2024 音·创 开发者 -Copyright © 2024 all the developers of Musicreater +版权所有 © 2024 金羿 & 诸葛亮与八卦阵 +Copyright © 2024 EillesWan & bgArray 开源相关声明请见 ./License.md Terms & Conditions: ./License.md diff --git a/setup.py b/setup.py index 4f64130..1ce742f 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ with open("README_EN.md", "r", encoding="utf-8") as fh: setuptools.setup( name="Musicreater", version=Musicreater.__version__, - author="Eilles Wan, bgArray", + author="金羿Eilles, bgArray, 鱼旧梦ElapsingDreams", author_email="TriM-Organization@hotmail.com", description="一款免费开源的针对《我的世界》音乐的支持库\n" "A free open-source python library used to convert midi into Minecraft.", diff --git a/upload.bat b/upload.bat index 75ac19a..2301a72 100644 --- a/upload.bat +++ b/upload.bat @@ -1,3 +1,7 @@ -python setup.py sdist bdist_wheel -python -m twine upload dist/* +python -m build +python -m twine check dist/* +pause +python -m twine upload dist/* --verbose +pause python clean_update.py +pause \ No newline at end of file