-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added support for writing MCSP2 and TXT files
- Loading branch information
Showing
10 changed files
with
270 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
src/main/java/net/raphimc/noteblocklib/format/mcsp2/McSp2Converter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * This file is part of NoteBlockLib - https://github.com/RaphiMC/NoteBlockLib | ||
| * Copyright (C) 2022-2025 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.raphimc.noteblocklib.format.mcsp2; | ||
|
|
||
| import net.raphimc.noteblocklib.data.MinecraftDefinitions; | ||
| import net.raphimc.noteblocklib.data.MinecraftInstrument; | ||
| import net.raphimc.noteblocklib.format.mcsp2.model.McSp2Layer; | ||
| import net.raphimc.noteblocklib.format.mcsp2.model.McSp2Note; | ||
| import net.raphimc.noteblocklib.format.mcsp2.model.McSp2Song; | ||
| import net.raphimc.noteblocklib.format.nbs.model.NbsSong; | ||
| import net.raphimc.noteblocklib.model.Note; | ||
| import net.raphimc.noteblocklib.model.Song; | ||
| import net.raphimc.noteblocklib.util.SongResampler; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| public class McSp2Converter { | ||
|
|
||
| private static final List<MinecraftInstrument> SUPPORTED_INSTRUMENTS = Arrays.asList(MinecraftInstrument.HARP, MinecraftInstrument.BASS, MinecraftInstrument.BASS_DRUM, MinecraftInstrument.SNARE, MinecraftInstrument.HAT); | ||
|
|
||
| /** | ||
| * Creates a new MCSP2 song from the general data of the given song (Also copies some format specific fields if applicable). | ||
| * | ||
| * @param song The song | ||
| * @return The new MCSP2 song | ||
| */ | ||
| public static McSp2Song createSong(Song song) { | ||
| song = song.copy(); | ||
| SongResampler.changeTickSpeed(song, Math.max(McSp2Definitions.MIN_TEMPO, Math.min(McSp2Definitions.MAX_TEMPO, Math.round(song.getTempoEvents().get(0))))); | ||
|
|
||
| final McSp2Song newSong = new McSp2Song(); | ||
| newSong.copyGeneralData(song); | ||
| newSong.setTempo((int) song.getTempoEvents().get(0)); | ||
|
|
||
| for (int tick : song.getNotes().getTicks()) { | ||
| final List<Note> notes = song.getNotes().get(tick); | ||
| for (int i = 0; i < notes.size(); i++) { | ||
| final Note note = notes.get(i); | ||
| if (note.getInstrument() instanceof MinecraftInstrument && SUPPORTED_INSTRUMENTS.contains((MinecraftInstrument) note.getInstrument()) && note.getVolume() > 0) { | ||
| final McSp2Note mcSp2Note = new McSp2Note(); | ||
| mcSp2Note.setInstrument(((MinecraftInstrument) note.getInstrument()).nbsId()); | ||
| mcSp2Note.setKey((byte) Math.max(MinecraftDefinitions.MC_LOWEST_KEY, Math.min(MinecraftDefinitions.MC_HIGHEST_KEY, note.getMcKey()))); | ||
|
|
||
| final McSp2Layer mcSp2Layer = newSong.getLayers().computeIfAbsent(i, k -> new McSp2Layer()); | ||
| mcSp2Layer.getNotes().put(tick, mcSp2Note); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (song instanceof McSp2Song) { | ||
| final McSp2Song mcSp2Song = (McSp2Song) song; | ||
| newSong.setAutoSaveInterval(mcSp2Song.getAutoSaveInterval()); | ||
| newSong.setAutoSaveInterval((byte) mcSp2Song.getAutoSaveInterval()); | ||
| newSong.setMinutesSpent(mcSp2Song.getMinutesSpent()); | ||
| newSong.setLeftClicks(mcSp2Song.getLeftClicks()); | ||
| newSong.setRightClicks(mcSp2Song.getRightClicks()); | ||
| newSong.setNoteBlocksAdded(mcSp2Song.getNoteBlocksAdded()); | ||
| newSong.setNoteBlocksRemoved(mcSp2Song.getNoteBlocksRemoved()); | ||
| } else if (song instanceof NbsSong) { | ||
| final NbsSong nbsSong = (NbsSong) song; | ||
| newSong.setAutoSaveInterval(nbsSong.isAutoSave() ? nbsSong.getAutoSaveInterval() : (byte) 0); | ||
| newSong.setMinutesSpent(nbsSong.getMinutesSpent()); | ||
| newSong.setLeftClicks(nbsSong.getLeftClicks()); | ||
| newSong.setRightClicks(nbsSong.getRightClicks()); | ||
| newSong.setNoteBlocksAdded(nbsSong.getNoteBlocksAdded()); | ||
| newSong.setNoteBlocksRemoved(nbsSong.getNoteBlocksRemoved()); | ||
| } | ||
|
|
||
| return newSong; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/main/java/net/raphimc/noteblocklib/format/txt/TxtConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * This file is part of NoteBlockLib - https://github.com/RaphiMC/NoteBlockLib | ||
| * Copyright (C) 2022-2025 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.raphimc.noteblocklib.format.txt; | ||
|
|
||
| import net.raphimc.noteblocklib.data.MinecraftDefinitions; | ||
| import net.raphimc.noteblocklib.data.MinecraftInstrument; | ||
| import net.raphimc.noteblocklib.format.txt.model.TxtNote; | ||
| import net.raphimc.noteblocklib.format.txt.model.TxtSong; | ||
| import net.raphimc.noteblocklib.model.Note; | ||
| import net.raphimc.noteblocklib.model.Song; | ||
| import net.raphimc.noteblocklib.util.SongResampler; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| public class TxtConverter { | ||
|
|
||
| /** | ||
| * Creates a new TXT song from the general data of the given song (Also copies some format specific fields if applicable). | ||
| * | ||
| * @param song The song | ||
| * @return The new TXT song | ||
| */ | ||
| public static TxtSong createSong(Song song) { | ||
| song = song.copy(); | ||
| SongResampler.changeTickSpeed(song, TxtDefinitions.TEMPO); | ||
|
|
||
| final TxtSong newSong = new TxtSong(); | ||
| newSong.copyGeneralData(song); | ||
|
|
||
| for (int tick : song.getNotes().getTicks()) { | ||
| for (Note note : song.getNotes().get(tick)) { | ||
| if (note.getInstrument() instanceof MinecraftInstrument && note.getVolume() > 0) { | ||
| final TxtNote txtNote = new TxtNote(); | ||
| txtNote.setInstrument(((MinecraftInstrument) note.getInstrument()).mcId()); | ||
| txtNote.setKey((byte) Math.max(MinecraftDefinitions.MC_LOWEST_KEY, Math.min(MinecraftDefinitions.MC_HIGHEST_KEY, note.getMcKey()))); | ||
| newSong.getTxtNotes().computeIfAbsent(tick, k -> new ArrayList<>()).add(txtNote); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return newSong; | ||
| } | ||
|
|
||
| } |
24 changes: 24 additions & 0 deletions
24
src/main/java/net/raphimc/noteblocklib/format/txt/TxtDefinitions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * This file is part of NoteBlockLib - https://github.com/RaphiMC/NoteBlockLib | ||
| * Copyright (C) 2022-2025 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package net.raphimc.noteblocklib.format.txt; | ||
|
|
||
| public class TxtDefinitions { | ||
|
|
||
| public static final int TEMPO = 20; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters