TriM-Organization/Musicreater
2
0
Fork 0
mirror of https://github.com/TriM-Organization/Musicreater.git synced 2025-09-03 19:06:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

暑假回学校，同步所有更改内容

Browse Source
This commit is contained in:
金羿ELS
2025-08-30 19:48:41 +08:00
parent c056eb1fcb
commit 6f94f477f2
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Musicreater/__init__.py
View File

@ -22,7 +22,7 @@ The Licensor of Musicreater("this project") is Eilles, bgArray.
# 若需转载或借鉴 许可声明请查看仓库目录下的 License.md # 若需转载或借鉴 许可声明请查看仓库目录下的 License.md
__version__ = "2.4.2.1" __version__ = "2.4.2.2"
__vername__ = "音符附加信息升级" __vername__ = "音符附加信息升级"
__author__ = ( __author__ = (
("金羿", "Eilles"), ("金羿", "Eilles"),

6
Musicreater/exceptions.py
View File

@ -39,7 +39,7 @@ class MidiFormatException(MSCTBaseException):
def __init__(self, *args): def __init__(self, *args):
"""音·创库版本的所有MIDI格式错误均继承于此""" """音·创库版本的所有MIDI格式错误均继承于此"""
super().__init__("MIDI格式错误", *args) super().__init__("MIDI 格式错误", *args)
class MidiDestroyedError(MSCTBaseException): class MidiDestroyedError(MSCTBaseException):
@ -47,7 +47,7 @@ class MidiDestroyedError(MSCTBaseException):
def __init__(self, *args): def __init__(self, *args):
"""Midi文件损坏""" """Midi文件损坏"""
super().__init__("MIDI文件损坏：无法读取MIDI文件", *args) super().__init__("MIDI文件损坏：无法读取 MIDI 文件", *args)
# class MidiUnboundError(MSCTBaseException): # class MidiUnboundError(MSCTBaseException):
@ -87,7 +87,7 @@ class NotDefineTempoError(MidiFormatException):
def __init__(self, *args): def __init__(self, *args):
"""没有Tempo设定导致时间无法计算的错误""" """没有Tempo设定导致时间无法计算的错误"""
super().__init__("在曲目开始时没有声明Tempo（未指定拍长）", *args) super().__init__("在曲目开始时没有声明 Tempo（未指定拍长）", *args)
class ChannelOverFlowError(MidiFormatException): class ChannelOverFlowError(MidiFormatException):

2
Musicreater/plugin/__init__.py
View File

@ -34,6 +34,7 @@ __all__ = [
"AXIS_PARTICULAR_VALUE", "AXIS_PARTICULAR_VALUE",
"COMPABILITY_VERSION_117", "COMPABILITY_VERSION_117",
"COMPABILITY_VERSION_119", "COMPABILITY_VERSION_119",
"COMPABILITY_VERSION_121",
# BDX 函数 # BDX 函数
"bdx_move", "bdx_move",
"form_command_block_in_BDX_bytes", "form_command_block_in_BDX_bytes",
@ -62,6 +63,7 @@ from .mcstructure import (
AXIS_PARTICULAR_VALUE, AXIS_PARTICULAR_VALUE,
COMPABILITY_VERSION_119, COMPABILITY_VERSION_119,
COMPABILITY_VERSION_117, COMPABILITY_VERSION_117,
COMPABILITY_VERSION_121,
command_statevalue, command_statevalue,
form_note_block_in_NBT_struct, form_note_block_in_NBT_struct,
form_repeater_in_NBT_struct, form_repeater_in_NBT_struct,

8
Musicreater/plugin/mcstructure.py
View File

@ -58,6 +58,10 @@ COMPABILITY_VERSION_117: int = 17879555
""" """
Minecraft 1.17 兼容版本号 Minecraft 1.17 兼容版本号
""" """
COMPABILITY_VERSION_121: int = 18168865
"""
Minecraft 1.21 兼容版本号
"""
def command_statevalue(axis_: Literal["x", "y", "z", "X", "Y", "Z"], forward_: bool): def command_statevalue(axis_: Literal["x", "y", "z", "X", "Y", "Z"], forward_: bool):
@ -236,7 +240,9 @@ def form_command_block_in_NBT_struct(
"SuccessCount": 0, "SuccessCount": 0,
"TickDelay": tickDelay, "TickDelay": tickDelay,
"TrackOutput": trackOutput, "TrackOutput": trackOutput,
"Version": 25, "Version": (
25 if compability_version_number <= COMPABILITY_VERSION_119 else 43
),
"auto": alwaysRun, "auto": alwaysRun,
"conditionMet": False, # 是否已经满足条件 "conditionMet": False, # 是否已经满足条件
"conditionalMode": condition, "conditionalMode": condition,