mms-lib 0.3.0__tar.gz → 0.3.2__tar.gz

{mms_lib-0.3.0 → mms_lib-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mms-lib
-Version: 0.3.0
+Version: 0.3.2
 Summary: Extract from MIDI-MCSTRUCTURE NEXT Project
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown

{mms_lib-0.3.0 → mms_lib-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mms-lib"
-version = "0.3.0"
+version = "0.3.2"
 description = "Extract from MIDI-MCSTRUCTURE NEXT Project"
 readme = "README.md"
 requires-python = ">=3.14"

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/__init__.py

@@ -2,4 +2,4 @@ from .core import init, read_midi, convertor, profile
 from .dataclass import Settings, Note, Lyrics
 
 __all__ = ["init", "read_midi", "convertor", "profile", "Note", "Lyrics", "Settings"]
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/assets/text/features.json

@@ -51,7 +51,6 @@
   "109": ["linear_note"],
   "110": ["linear_note"],
   "124": ["linear_note"],
-  "612": ["linear_note"],
   "percussion": {
     "undefined": []
   }

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/assets/text/mapping.json

@@ -27,11 +27,11 @@
   "27": "guitar",
   "28": "guitar",
   "29": "guitar",
-  "30": "bass",
-  "31": "bass",
+  "30": "guitar",
+  "31": "guitar",
   "32": "bass",
-  "33": "guitar",
-  "34": "guitar",
+  "33": "bass",
+  "34": "bass",
   "35": "bass",
   "36": "bass",
   "37": "bass",
@@ -43,12 +43,12 @@
   "43": "didgeridoo",
   "45": "pling",
   "46": "harp",
-  "47": "iron_xylophone",
+  "47": "base_drum",
   "48": "flute",
   "49": "flute",
   "50": "flute",
   "51": "flute",
-  "52": "didgeridoo",
+  "52": "flute",
   "53": "flute",
   "54": "flute",
   "55": "orchestra_hit",
@@ -57,12 +57,12 @@
   "58": "tuba",
   "59": "trumpet",
   "60": "french_horn",
-  "61": "flute",
-  "62": "flute",
-  "63": "flute",
+  "61": "trumpet",
+  "62": "trumpet",
+  "63": "trumpet",
   "64": "flute",
-  "65": "guitar",
-  "66": "bass",
+  "65": "flute",
+  "66": "flute",
   "67": "didgeridoo",
   "68": "flute",
   "69": "flute",
@@ -73,7 +73,7 @@
   "74": "flute",
   "75": "flute",
   "76": "flute",
-  "77": "banjo",
+  "77": "flute",
   "78": "flute",
   "79": "flute",
   "80": "bit",
@@ -83,11 +83,11 @@
   "84": "bit",
   "85": "flute",
   "86": "flute",
-  "87": "orchestra_hit",
-  "88": "banjo",
+  "87": "bit",
+  "88": "flute",
   "89": "flute",
   "90": "bit",
-  "91": "orchestra_hit",
+  "91": "flute",
   "92": "didgeridoo",
   "93": "iron_xylophone",
   "94": "bit",
@@ -99,9 +99,10 @@
   "109": "flute",
   "110": "flute",
   "111": "flute",
-  "112": "cow_bell",
-  "114": "hat",
-  "115": "xylophone",
+  "112": "bell",
+  "113": "cow_bell",
+  "114": "iron_xylophone",
+  "115": "hat",
   "116": "base_drum",
   "117": "snare",
   "118": "snare",
@@ -109,29 +110,28 @@
   "123": "parrot",
   "124": "telephone_ring",
   "125": "helicopter",
-  "126": "hat",
+  "126": "snare",
   "127": "gun",
-  "612": "trumpet",
   "percussion": {
     "undefined": "cymbal",
     "31": "hat",
-    "33": "snare",
-    "34": "hat",
+    "33": "hat",
+    "34": "bell",
     "35": "base_drum",
-    "36": "snare",
+    "36": "base_drum",
     "37": "hat",
-    "38": "hat",
-    "39": "hat",
-    "40": "hat",
+    "38": "snare",
+    "39": "snare",
+    "40": "snare",
     "41": "base_drum",
     "42": "closed_cymbal",
-    "43": "hat",
+    "43": "base_drum",
     "44": "pedal_cymbal",
     "45": "base_drum",
     "46": "open_cymbal",
-    "47": "snare",
-    "48": "hat",
-    "50": "hat",
+    "47": "base_drum",
+    "48": "base_drum",
+    "50": "base_drum",
     "56": "cow_bell",
     "69": "cabasa",
     "82": "shaker",

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/assets/text/profile.json

@@ -77,22 +77,22 @@
         ["note.bd", 1.5, 0, 0]
       ],
       "cymbal": [
-        ["random.fizz", 1.0, 19, 0]
+        ["dig.sand", 1.0, 19, 0]
       ],
       "open_cymbal": [
-        ["random.fizz", 1.5, 19, 0]
+        ["dig.sand", 1.5, 19, 0]
       ],
       "pedal_cymbal": [
-        ["random.fizz", 1.5, 31, 0]
+        ["dig.sand", 1.5, 31, 0]
       ],
       "closed_cymbal": [
-        ["random.fizz", 1.5, 38, 0]
+        ["dig.sand", 1.5, 38, 0]
       ],
       "cabasa": [
-        ["random.fizz", 1.2, 19, 0]
+        ["dig.sand", 1.2, 19, 0]
       ],
       "shaker": [
-        ["random.fizz", 1.2, 31, 0]
+        ["dig.sand", 1.2, 31, 0]
       ],
       "parrot": [
         ["mob.parrot.idle", 1.0, 0, 0]
@@ -122,16 +122,16 @@
         ["note.didgeridoo", 0.8, 0, 0]
       ],
       "trumpet": [
-        ["note.trumpet", 0.7, 0, 0]
+        ["note.trumpet", 0.5, 0, 0]
       ],
       "french_horn": [
-        ["note.trumpet_exposed", 0.7, 0, 0]
+        ["note.trumpet_exposed", 0.5, 0, 0]
       ],
       "trombone": [
-        ["note.trumpet_weathered", 0.7, 0, 0]
+        ["note.trumpet_weathered", 0.5, 0, 0]
       ],
       "tuba": [
-        ["note.trumpet_oxidized", 0.7, 0, 0]
+        ["note.trumpet_oxidized", 0.5, 0, 0]
       ],
       "orchestra_hit": [
         ["note.bass", 0.4, 0, 0],
@@ -235,22 +235,22 @@
         ["block.note_block.basedrum", 1.5, 0, 0]
       ],
       "cymbal": [
-        ["block.fire.extinguish", 1.0, 19, 0]
+        ["block.sand.break", 1.0, 19, 0]
       ],
       "open_cymbal": [
-        ["block.fire.extinguish", 1.5, 19, 0]
+        ["block.sand.break", 1.5, 19, 0]
       ],
       "pedal_cymbal": [
-        ["block.fire.extinguish", 1.5, 31, 0]
+        ["block.sand.break", 1.5, 31, 0]
       ],
       "closed_cymbal": [
-        ["block.fire.extinguish", 1.5, 38, 0]
+        ["block.sand.break", 1.5, 38, 0]
       ],
       "cabasa": [
-        ["block.fire.extinguish", 1.2, 19, 0]
+        ["block.sand.break", 1.2, 19, 0]
       ],
       "shaker": [
-        ["block.fire.extinguish", 1.2, 31, 0]
+        ["block.sand.break", 1.2, 31, 0]
       ],
       "parrot": [
         ["entity.parrot.ambient", 1.0, 0, 0]
@@ -280,16 +280,16 @@
         ["block.note_block.didgeridoo", 0.8, 0, 0]
       ],
       "trumpet": [
-        ["block.note_block.trumpet", 0.7, 0, 0]
+        ["block.note_block.trumpet", 0.5, 0, 0]
       ],
       "french_horn": [
-        ["block.note_block.trumpet_exposed", 0.7, 0, 0]
+        ["block.note_block.trumpet_exposed", 0.5, 0, 0]
       ],
       "trombone": [
-        ["block.note_block.trumpet_weathered", 0.7, 0, 0]
+        ["block.note_block.trumpet_weathered", 0.5, 0, 0]
       ],
       "tuba": [
-        ["block.note_block.trumpet_oxidized", 0.7, 0, 0]
+        ["block.note_block.trumpet_oxidized", 0.5, 0, 0]
       ],
       "orchestra_hit": [
         ["block.note_block.bass", 0.4, 0, 0],
@@ -381,22 +381,22 @@
         ["note.bd", 1.5, 0, 0]
       ],
       "cymbal": [
-        ["random.fizz", 1.0, 19, 0]
+        ["dig.sand", 1.0, 19, 0]
       ],
       "open_cymbal": [
-        ["random.fizz", 1.5, 19, 0]
+        ["dig.sand", 1.5, 19, 0]
       ],
       "pedal_cymbal": [
-        ["random.fizz", 1.5, 31, 0]
+        ["dig.sand", 1.5, 31, 0]
       ],
       "closed_cymbal": [
-        ["random.fizz", 1.5, 38, 0]
+        ["dig.sand", 1.5, 38, 0]
       ],
       "cabasa": [
-        ["random.fizz", 1.2, 19, 0]
+        ["dig.sand", 1.2, 19, 0]
       ],
       "shaker": [
-        ["random.fizz", 1.2, 31, 0]
+        ["dig.sand", 1.2, 31, 0]
       ],
       "parrot": [
         ["mob.parrot.idle", 1.0, 0, 0]
@@ -501,22 +501,22 @@
         ["block.note.basedrum", 1.5, 0, 0]
       ],
       "cymbal": [
-        ["block.fire.extinguish", 1.0, 19, 0]
+        ["block.sand.break", 1.0, 19, 0]
       ],
       "open_cymbal": [
-        ["block.fire.extinguish", 1.5, 19, 0]
+        ["block.sand.break", 1.5, 19, 0]
       ],
       "pedal_cymbal": [
-        ["block.fire.extinguish", 1.5, 31, 0]
+        ["block.sand.break", 1.5, 31, 0]
       ],
       "closed_cymbal": [
-        ["block.fire.extinguish", 1.5, 38, 0]
+        ["block.sand.break", 1.5, 38, 0]
       ],
       "cabasa": [
-        ["block.fire.extinguish", 1.2, 19, 0]
+        ["block.sand.break", 1.2, 19, 0]
       ],
       "shaker": [
-        ["block.fire.extinguish", 1.2, 31, 0]
+        ["block.sand.break", 1.2, 31, 0]
       ],
       "parrot": [
         ["entity.parrot.ambient", 1.0, 0, 0]

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/core.py

@@ -172,7 +172,7 @@ def get_notes(midi_file: MIDIReader, platform_profile: dict, tempo: float | int)
             if data.percussion:
                 program = platform_profile["sound_list"].get(profile.mapping.get_p(data.program), platform_profile["sound_list"][profile.mapping.p_mapping["undefined"]])
 
-                if "linear_note" in profile.features["percussion"].get(str(data.source_program), profile.features["percussion"]["undefined"]):
+                if "linear_note" in profile.features["percussion"].get(str(data.program), profile.features["percussion"]["undefined"]):
                     linear_note = True
             else:
                 if data.program == -1:
@@ -180,13 +180,13 @@ def get_notes(midi_file: MIDIReader, platform_profile: dict, tempo: float | int)
                 else:
                     program = platform_profile["sound_list"].get(profile.mapping.get(data.program), platform_profile["sound_list"][profile.mapping.mapping["undefined"]])
 
-                if "linear_note" in profile.features.get(str(data.source_program), profile.features["undefined"]):
+                if "linear_note" in profile.features.get(str(data.program), profile.features["undefined"]):
                     linear_note = True
 
             if program is None: continue
 
             delay_time = 0
-            while data.time + delay_time < time:
+            while data.time + delay_time <= time:
                 # 一个音符可以对应多个我的世界乐器，因此这里遍历一下从配置文件中获取的数据
                 for note in program:
                     # 累加配置文件中我的世界乐器之间的时间间隔

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/dataclass.py

@@ -227,7 +227,6 @@ class Lyrics:
 
 class NoteData:
     __slots__ = (
-        "source_program",
         "percussion",
         "velocity",
         "panning",
@@ -237,15 +236,14 @@ class NoteData:
         "type"
     )
 
-    def __init__(self, time: float, pitch: float, program: tuple[int, int], panning: tuple[float, float], velocity: float):
+    def __init__(self, time: float, pitch: float, program: int, panning: tuple[float, float], velocity: float):
         self.type = "note"
         self.time = time
         self.pitch = pitch
-        self.program = program[0]
+        self.program = program
         self.panning = panning
         self.velocity = velocity
         self.percussion = False
-        self.source_program = program[1]
 
 class LyricsData:
     __slots__ = (
@@ -380,29 +378,48 @@ class LyricsList:
 class Stack:
     __slots__ = (
         "__data",
+        "__p_data"
     )
 
     def __init__(self):
         self.__data: dict[int, dict[float, list[NoteData]]] = {}
+        self.__p_data: dict[int, dict[float, list[NoteData]]] = {}
 
     def put(self, channel: int, data: NoteData):
-        data.percussion = channel == 9
+        if channel == 9:
+            base = self.__p_data
+            note_id = data.program
+            data.percussion = True
+        else:
+            base = self.__data
+            note_id = data.pitch
+            data.percussion = False
+
+        if channel not in base:
+            base[channel] = {note_id: [data]}
+        elif note_id not in base[channel]:
+            base[channel][note_id] = [data]
+        else:
+            base[channel][note_id].append(data)
 
-        if channel not in self.__data:
-            self.__data[channel] = {data.pitch: [data]}
-        elif data.pitch not in self.__data[channel]:
-            self.__data[channel][data.pitch] = [data]
+    def get(self, channel: int, note_id: int) -> NoteData | None:
+        if channel == 9:
+            base = self.__p_data
         else:
-            self.__data[channel][data.pitch].append(data)
+            base = self.__data
 
-    def get(self, channel: int, pitch: int) -> NoteData | None:
-        if pitch in self.__data[channel] and self.__data[channel][pitch]:
-            return self.__data[channel][pitch].pop()
+        if note_id in base.get(channel, {}) and base[channel][note_id]:
+            return base[channel][note_id].pop()
         else:
             return None
 
     def __iter__(self):
         for channel in self.__data.values():
+            for notes in channel.values():
+                for note in notes:
+                    yield note
+
+        for channel in self.__p_data.values():
             for notes in channel.values():
                 for note in notes:
                     yield note

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/midi_reader.py

@@ -134,9 +134,6 @@ class MIDIReader:
     def get_time_accuracy(self, time_per_tick: float) -> float:
         return sum(map(lambda i: (round_int(i / time_per_tick) - i / time_per_tick) ** 2, self._scan_time_nodes()))
 
-    def override_mapping(self, mapping: dict[int, dict[int, int]]) -> None:
-        self.__instruments_mapping = mapping
-
     def __iter__(self):
         stack = Stack()
         tempo_info = TempoList(self.__midi_file.ticks_per_beat)
@@ -154,14 +151,12 @@ class MIDIReader:
                 # 判断该事件是否有通道数据，如果有并且通道没有初始化数据就初始化该通道
                 if hasattr(message, "channel"):
                     channel = message.channel
-                    mapping: dict[int, int] = self.__instruments_mapping.get(channel, {})
                     if channel not in channel_info:
                         channel_info[channel] = {
                             "program": InfoList(-1),
                             "volume": InfoList(1),
                             "panning": InfoList((0, 1))}
                 else:
-                    mapping = {}
                     channel = -1
                 # 获取tempo信息
                 if message.type == "set_tempo":
@@ -189,7 +184,7 @@ class MIDIReader:
                     # 获取歌词数据
                     data = LyricsData(message.text)
                 # 获取音符信息
-                elif message.type == "note_on" and message.velocity != 0:
+                elif message.type == "note_on" and message.velocity > 0:
                     # 对音符力度（音量）进行归一化处理
                     note_velocity = message.velocity / 127
                     # 音符音量再乘以音符所在的通道的音量
@@ -201,17 +196,41 @@ class MIDIReader:
                         # 打击乐器保持原声
                         note_pitch = 66
                         note_program = message.note
+
+                        data = stack.get(channel, note_program)
+
+                        stack.put(
+                            channel,
+                            NoteData(
+                                tempo_info.compute_time(time),
+                                note_pitch,
+                                note_program,
+                                note_panning,
+                                note_velocity
+                            )
+                        )
                     else:
                         note_pitch = message.note
                         note_program = channel_info[channel]["program"].match_info(time)
 
-                    # 打包数据
-                    stack.put(channel, NoteData(tempo_info.compute_time(time), note_pitch, (mapping.get(note_program, note_program), note_program), note_panning, note_velocity))
-
-                elif message.type == "note_off" or (message.type == "note_on" and message.velocity == 0):
+                        if note_data := stack.get(channel, note_pitch):
+                            data = note_data
+
+                        stack.put(
+                            channel,
+                            NoteData(
+                                tempo_info.compute_time(time),
+                                note_pitch,
+                                note_program,
+                                note_panning,
+                                note_velocity
+                            )
+                        )
+
+                elif message.type == "note_off" or message.type == "note_on":
                     data = stack.get(channel, message.note)
 
                 # 将音符时间转为绝对时间并返回结果，时间单位为毫秒
                 if data is not None: yield tempo_info.compute_time(time), data
 
-        for data in stack: yield data.time + 0.00001, data
+        for data in stack: yield data.time, data

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/nbs_reader.py

@@ -6,21 +6,21 @@ from .dataclass import NoteData
 
 NBS_TO_GM_MAPPING = {
     0:  0,
-    1:  43,
+    1:  32,
     2:  116,
     3:  118,
     4:  115,
     5:  24,
     6:  73,
-    7:  14,
-    8:  8,
+    7:  9,
+    8:  14,
     9:  13,
-    10: 9,
+    10: 11,
     11: 113,
-    12: 111,
+    12: 43,
     13: 80,
     14: 105,
-    15: 98,
+    15: 1,
 }
 
 class NBSReader:
@@ -52,12 +52,11 @@ class NBSReader:
                 radian = math.radians((panning + 100) * 0.9)
 
                 note_data = NoteData(
-                    tick * 50,
+                    current_time := tick * (1000 / self.__nbs_file.header.tempo),
                     note.key + 21 + note.pitch / 100,
-                    (NBS_TO_GM_MAPPING.get(note.instrument, 0), ) * 2,
+                    NBS_TO_GM_MAPPING.get(note.instrument, 0),
                     (round_45(math.cos(radian), 2), round_45(math.sin(radian), 2)),
-                    note.velocity * volume_info[note.layer]
+                    note.velocity * volume_info[note.layer] / 10000
                 )
 
-                yield tick * 50 + 0.00001, note_data
-
+                yield current_time, note_data

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms/tools.py

@@ -26,4 +26,8 @@ def is_number(text: str) -> bool:
     return all(text[i] in "0123456789" or (text[i] == "." and 1 < i + 1 < length) for i in range(length)) and text.count(".") <= 1
 
 def is_midi(data: bytes) -> bool:
-    return data[:4] == b"MThd"
+    return data[:4] == b"MThd"
+
+def replace_item(d: dict, k, v):
+    old_v, d[k] = d[k], v
+    return old_v

{mms_lib-0.3.0 → mms_lib-0.3.2}/src/mms_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mms-lib
-Version: 0.3.0
+Version: 0.3.2
 Summary: Extract from MIDI-MCSTRUCTURE NEXT Project
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown