From 992572cbf1246d803f7f8b5bb94ee703b920c77b Mon Sep 17 00:00:00 2001 From: EillesWan Date: Wed, 8 Jun 2022 01:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - README.md | 3 ++- README_EN.md | 4 +++- __pycache__/__init__.cpython-38.pyc | Bin 637 -> 0 bytes __pycache__/main.cpython-38.pyc | Bin 17247 -> 0 bytes demo_convert.py | 29 +++++++++++++++++++++++++- example_convert_bdx.py | 2 +- example_convert_mcpack.py | 2 +- __init__.py => msctPkgver/__init__.py | 27 +++++++++++++++++------- main.py => msctPkgver/main.py | 8 +++---- 10 files changed, 59 insertions(+), 17 deletions(-) delete mode 100644 __pycache__/__init__.cpython-38.pyc delete mode 100644 __pycache__/main.cpython-38.pyc rename __init__.py => msctPkgver/__init__.py (50%) rename main.py => msctPkgver/main.py (98%) diff --git a/.gitignore b/.gitignore index 8720477..d48cb25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # mystuff -/__pycache__ /.vscode diff --git a/README.md b/README.md index 4e846a3..b15dde9 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ 音·创 Musicreater 是一款免费开源的 **《我的世界：基岩版》** 音乐制作软件 -音·创 pkgver (Musicreater Package Version) 是一款免费开源的 **《我的世界：基岩版》** 音乐转换库 +音·创 库版 (Musicreater Package Version) 是一款免费开源的针对 **《我的世界：基岩版》** 的midi音乐转换库 欢迎加群：[861684859](https://jq.qq.com/?_wv=1027&k=hpeRxrYr) @@ -114,6 +114,7 @@ - 感谢由 Charlie_Ping “查理平” 带来的bdx文件转换参考 - 感谢由 CMA_2401PT 为我们的软件开发进行指导 - 感谢由 Dislink Sforza \带来的midi音色解析以及转换指令的算法，我们将其加入了我们众多算法之一 +- 感谢 Touch \提供的测试支持 - 感谢广大群友为此程序提供的测试等支持 - 若您对我们有所贡献但您的名字没有显示在此列表中，请联系我！ diff --git a/README_EN.md b/README_EN.md index 21d309b..c6c5036 100644 --- a/README_EN.md +++ b/README_EN.md @@ -22,7 +22,9 @@ ## Introduction🚀 -Musicreater(音·创) is an free open source software which is used for making and also creating music in **Minecraft: Bedrock Edition**. +Musicreater(音·创) is a free open source software which is used for making and also creating music in **Minecraft: Bedrock Edition**. + +Musicreater pkgver(Package Version 音·创 库版) is a free open source library used for convert midi file into formats that is suitable for **Minecraft: Bedrock Edition**. Welcome to join our QQ group: [861684859](https://jq.qq.com/?_wv=1027&k=hpeRxrYr) diff --git a/__pycache__/__init__.cpython-38.pyc b/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 8e439b096ec5602fd5ecb9dc3424991ce2ddec43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmYjP&1(}u6yHrYO^DW$-WNPY+E6`;6g^lF{D>MYE`ec_9X5;m5jMM(y2zu$W^^WHp|olR0O-rT*Jzr#?} zQMfrdBCxp%t2_rnpg2mPIa;K+h!EkTm=U6DG);kKLM_CE89A1vg!p|bl`t0}#IM0pGuCpEtzWy4KW)B=*(*o(*+x}J?+`*3Jz38~(J{i3u^-(ppkX}e% zOhr=>a|W^n4a@)Wvzojv$ucgp%e)G}IRK77+s9VVb@p9*ozy>)&ikPIjf>~SYr4)? zfOI;Hw%?M*FtEpDZ<9N7OH#!ptcn>)#F}arfZ**7|DEfI(QKFV>3)g|=|2Ma&vNVim09 zv0i4M6txp6rZ6N<2k;guMNjApw^K8dI6{I}K!`hq&1!?o=wn+$X~jv2D$(M diff --git a/__pycache__/main.cpython-38.pyc b/__pycache__/main.cpython-38.pyc deleted file mode 100644 index ebd71ca032306bcf71eb1fb42053443f90d42d2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17247 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 diff --git a/demo_convert.py b/demo_convert.py index 29cccd9..b1ec441 100644 --- a/demo_convert.py +++ b/demo_convert.py @@ -1,6 +1,33 @@ # -*- coding: utf-8 -*- -from main import * + +# 音·创 开发交流群 861684859 +# Email EillesWan2006@163.com W-YI_DoctorYI@outlook.com EillesWan@outlook.com +# 版权所有 金羿("Eilles Wan") & 诸葛亮与八卦阵("bgArray") & 鸣凤鸽子("MingFengPigeon") +# 若需转载或借鉴 请依照 Apache 2.0 许可证进行许可 + + +""" +音·创 库版 MIDI转换展示程序 +Musicreater Package Version : Demo for Midi Conversion + + Copyright 2022 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + 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. +""" + + +from msctPkgver.main import * import os convertion = midiConvert() diff --git a/example_convert_bdx.py b/example_convert_bdx.py index 82702c1..28397f9 100644 --- a/example_convert_bdx.py +++ b/example_convert_bdx.py @@ -1,7 +1,7 @@ # THIS PROGRAM IS ONLY A TEST EXAMPLE -from main import * +from msctPkgver.main import * convertion = midiConvert() convertion.convert(input('请输入midi文件路径：'), input('请输入输出路径：')) diff --git a/example_convert_mcpack.py b/example_convert_mcpack.py index 0ce0bbb..ece9943 100644 --- a/example_convert_mcpack.py +++ b/example_convert_mcpack.py @@ -1,7 +1,7 @@ # THIS PROGRAM IS ONLY A TEST EXAMPLE -from main import * +from msctPkgver.main import * convertion = midiConvert() convertion.convert(input('请输入midi文件路径：'), input('请输入输出路径：')) diff --git a/__init__.py b/msctPkgver/__init__.py similarity index 50% rename from __init__.py rename to msctPkgver/__init__.py index e0fe887..2be4b07 100644 --- a/__init__.py +++ b/msctPkgver/__init__.py @@ -1,18 +1,26 @@ -# -*- coding:utf-8 -*- +# -*- coding: utf-8 -*- """一个简单的基于音·创的我的世界音频操作工具""" -import main -if main.importDebug(): - print("Debug finished correctly") -else: - print("Debug finished with errors") +# 音·创 开发交流群 861684859 +# Email EillesWan2006@163.com W-YI_DoctorYI@outlook.com EillesWan@outlook.com +# 版权所有 金羿("Eilles Wan") & 诸葛亮与八卦阵("bgArray") & 鸣凤鸽子("MingFengPigeon") +# 若需转载或借鉴 请依照 Apache 2.0 许可证进行许可 + + __version__ = '0.0.1' __all__ = [] __author__ = (('金羿', 'Eilles Wan'), ('诸葛亮与八卦阵', 'bgArray'), ('鸣凤鸽子', 'MingFengPigeon')) """ - Copyright © 2022 Team-Ryoun +音·创 库版 (Musicreater Package Version) +是一款免费开源的针对《我的世界：基岩版》的midi音乐转换库 +注意！除了此源文件以外，任何属于此仓库以及此项目的文件均依照Apache许可证进行许可 +Musicreater pkgver (Package Version 音·创 库版) +A free open source library used for convert midi file into formats that is suitable for **Minecraft: Bedrock Edition**. +Note! Except for this source file, all the files in this repository and this project are licensed under Apache License 2.0 + + Copyright 2022 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. @@ -27,5 +35,10 @@ __author__ = (('金羿', 'Eilles Wan'), ('诸葛亮与八卦阵', 'bgArray'), (' limitations under the License. """ + +import msctPkgver.main as msctPkgver + +from msctPkgver.main import * + print('此工具由凌天之云创新团队开发，版权归本团队参与开发的人员共同所有。') print('This tool is developed by Team-Ryoun, copyright belongs to the team members who developed the tool.') diff --git a/main.py b/msctPkgver/main.py similarity index 98% rename from main.py rename to msctPkgver/main.py index 3e8160b..dfa81db 100644 --- a/main.py +++ b/msctPkgver/main.py @@ -8,11 +8,11 @@ """ -音·创 (Musicreater) -一款免费开源的 《我的世界：基岩版》 音乐制作软件 +音·创 库版 (Musicreater Package Version) +是一款免费开源的针对《我的世界：基岩版》的midi音乐转换库 注意！除了此源文件以外，任何属于此仓库以及此项目的文件均依照Apache许可证进行许可 -Musicreater (音·创) -A free opensource software which is used for creating all kinds of musics in Minecraft +Musicreater pkgver (Package Version 音·创 库版) +A free open source library used for convert midi file into formats that is suitable for **Minecraft: Bedrock Edition**. Note! Except for this source file, all the files in this repository and this project are licensed under Apache License 2.0 Copyright 2022 all the developers of Musicreater