diff --git a/Musicreater/__init__.py b/Musicreater/__init__.py index 7a7aaac..e914fd2 100644 --- a/Musicreater/__init__.py +++ b/Musicreater/__init__.py @@ -22,7 +22,7 @@ The Licensor of Musicreater("this project") is Eilles Wan, bgArray. # 若需转载或借鉴 许可声明请查看仓库目录下的 License.md -__version__ = "2.2.1" +__version__ = "2.2.2" __vername__ = "部分API小幅度新增内容" __author__ = ( ("金羿", "Eilles Wan"), diff --git a/Musicreater/plugin/addonpack/main.py b/Musicreater/plugin/addonpack/main.py index 6c4785a..be8a80f 100644 --- a/Musicreater/plugin/addonpack/main.py +++ b/Musicreater/plugin/addonpack/main.py @@ -147,7 +147,7 @@ def to_addon_pack_in_score( os.remove(f"{dist_path}/{midi_cvt.music_name}.mcpack") compress_zipfile( f"{dist_path}/temp/", - f"{dist_path}/{midi_cvt.music_name}.mcpack", + f"{dist_path}/{midi_cvt.music_name}[score].mcpack", ) shutil.rmtree(f"{dist_path}/temp/") @@ -350,7 +350,7 @@ def to_addon_pack_in_delay( os.remove(f"{dist_path}/{midi_cvt.music_name}.mcpack") compress_zipfile( f"{dist_path}/temp/", - f"{dist_path}/{midi_cvt.music_name}.mcpack", + f"{dist_path}/{midi_cvt.music_name}[delay].mcpack", ) shutil.rmtree(f"{dist_path}/temp/") @@ -557,7 +557,7 @@ def to_addon_pack_in_repeater( os.remove(f"{dist_path}/{midi_cvt.music_name}.mcpack") compress_zipfile( f"{dist_path}/temp/", - f"{dist_path}/{midi_cvt.music_name}.mcpack", + f"{dist_path}/{midi_cvt.music_name}[repeater].mcpack", ) shutil.rmtree(f"{dist_path}/temp/") @@ -677,7 +677,7 @@ def to_addon_pack_in_repeater_divided_by_instrument( os.remove(f"{dist_path}/{midi_cvt.music_name}.mcpack") compress_zipfile( f"{dist_path}/temp/", - f"{dist_path}/{midi_cvt.music_name}.mcpack", + f"{dist_path}/{midi_cvt.music_name}[repeater-div].mcpack", ) shutil.rmtree(f"{dist_path}/temp/") diff --git a/Musicreater/plugin/bdxfile/main.py b/Musicreater/plugin/bdxfile/main.py index b70d25c..7cedc19 100644 --- a/Musicreater/plugin/bdxfile/main.py +++ b/Musicreater/plugin/bdxfile/main.py @@ -117,7 +117,7 @@ def to_BDX_file_in_score( _bytes += cmdBytes with open( - os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}.bdx")), + os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}[score].bdx")), "ab+", ) as f: f.write(brotli.compress(_bytes + b"XE")) @@ -212,7 +212,7 @@ def to_BDX_file_in_delay( _bytes += cmdBytes with open( - os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}.bdx")), + os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}[delay].bdx")), "ab+", ) as f: f.write(brotli.compress(_bytes + b"XE")) diff --git a/Musicreater/plugin/mcstructfile/main.py b/Musicreater/plugin/mcstructfile/main.py index dbb2aa7..6d2c978 100644 --- a/Musicreater/plugin/mcstructfile/main.py +++ b/Musicreater/plugin/mcstructfile/main.py @@ -67,7 +67,7 @@ def to_mcstructure_file_in_delay( ) with open( - os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}.mcstructure")), + os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}[delay].mcstructure")), "wb+", ) as f: struct.dump(f) @@ -138,7 +138,7 @@ def to_mcstructure_file_in_score( ) with open( - os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}.mcstructure")), + os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}[score].mcstructure")), "wb+", ) as f: struct.dump(f) @@ -197,7 +197,7 @@ def to_mcstructure_file_in_repeater( ) with open( - os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}.mcstructure")), + os.path.abspath(os.path.join(dist_path, f"{midi_cvt.music_name}[repeater].mcstructure")), "wb+", ) as f: struct.dump(f) @@ -262,7 +262,7 @@ def to_mcstructure_files_in_repeater_divided_by_instruments( os.path.abspath( os.path.join( dist_path, - "{}_{}.mcstructure".format( + "{}[repeater-div]_{}.mcstructure".format( midi_cvt.music_name, inst.replace(".", "-") ), ) diff --git a/README.md b/README.md index 5cebeb9..fac51bf 100644 --- a/README.md +++ b/README.md @@ -112,9 +112,9 @@ 此项目亦不隶属或关联于 网易 -“Minecraft”是 Mojang Synergies AB 的商标，此项目中所有对于“我的世界”、“Minecraft”等相关称呼均为引用性使用 +“Minecraft”是 Mojang Synergies AB 的商标，此项目中所有对于“我的世界”、“Minecraft”等相关称呼均为必要的介绍性使用 -- 上文提及的 网易 公司，指代的是在中国大陆运营《我的世界：中国版》的上海网之易网络科技发展有限公司 +- 上文提及的 网易 公司，指代的是在中国大陆运营《我的世界：中国版》的上海网之易璀璨网络科技有限公司 NOT AN OFFICIAL MINECRAFT PRODUCT. diff --git a/README_EN.md b/README_EN.md index 6e8d23c..eafa0fb 100644 --- a/README_EN.md +++ b/README_EN.md @@ -69,11 +69,11 @@ Commands such as `python`、`pip` could be changed to some like `python3` or `pi ### Authors ✒ -**Eilles (金羿)**：A senior high school student, individual developer, unfamous Bilibili UPer, which knows a little about commands in _Minecraft: Bedrock Edition_ +**Eilles (金羿)**：A student, individual developer, unfamous Bilibili UPer, which knows a little about commands in _Minecraft: Bedrock Edition_ -**bgArray (诸葛亮与八卦阵)**: A junior high school student, player of _Minecraft: Bedrock Edition_, which is a fan of music and programming. +**bgArray (诸葛亮与八卦阵)**: A student, player of _Minecraft: Bedrock Edition_, which is a fan of music and programming. -**Touch (偷吃不是Touch)**: A man who is used to use command(s) in _Minecraft: Bedrock Edition_, who supported us of debugging and testing program and algorithm +**Touch (偷吃不是Touch)**: A man who is good at using command(s) in _Minecraft: Bedrock Edition_, who supported us of debugging and testing program and algorithm ## Acknowledgements 🙏 @@ -118,9 +118,9 @@ NOT APPROVED BY OR ASSOCIATED WITH NETEASE. 此项目亦不隶属或关联于 网易 相关 -“Minecraft”是 Mojang Synergies AB 的商标，此项目中所有对于“我的世界”、“Minecraft”等相关称呼均为引用性使用 +“Minecraft”是 Mojang Synergies AB 的商标，此项目中所有对于“我的世界”、“Minecraft”等相关称呼均为必要的介绍性使用 -- 上文提及的 网易 公司，指代的是在中国大陆运营《我的世界：中国版》的上海网之易网络科技发展有限公司 +- 上文提及的 网易 公司，指代的是在中国大陆运营《我的世界：中国版》的上海网之易璀璨网络科技有限公司 [Bilibili: Eilles]: https://img.shields.io/badge/Bilibili-%E9%87%91%E7%BE%BFELS-00A1E7?style=for-the-badge [Bilibili: bgArray]: https://img.shields.io/badge/Bilibili-%E8%AF%B8%E8%91%9B%E4%BA%AE%E4%B8%8E%E5%85%AB%E5%8D%A6%E9%98%B5-00A1E7?style=for-the-badge