From f49765104348ef433cd29f7cd742fe4850f75415 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Sat, 10 May 2025 16:33:24 +0700 Subject: [PATCH] fix: removed too much --- .../me/chayapak1/chomens_bot/commands/MusicCommand.java | 3 ++- .../java/me/chayapak1/chomens_bot/song/MidiConverter.java | 2 +- .../java/me/chayapak1/chomens_bot/song/NBSConverter.java | 3 ++- src/main/java/me/chayapak1/chomens_bot/song/Song.java | 6 +++++- .../me/chayapak1/chomens_bot/song/SongPlayerConverter.java | 2 +- .../me/chayapak1/chomens_bot/song/TextFileConverter.java | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java index 4a557d02..2e5ce697 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java @@ -598,7 +598,8 @@ public class MusicCommand extends Command implements Listener { "chayapak", "hhhzzzsss", I18nUtilities.get("commands.music.testsong.description"), - null + null, + false ); int instrumentId = 0; diff --git a/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java index 123b7922..fd07e2bd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java @@ -82,7 +82,7 @@ public class MidiConverter implements Converter { if (stringText.endsWith("\n")) stringText = stringText.substring(0, stringText.length() - 1); if (stringTracks.endsWith("\n")) stringTracks = stringTracks.substring(0, stringTracks.length() - 1); - final Song song = new Song(name, bot, songName, null, null, stringText, stringTracks); + final Song song = new Song(name, bot, songName, null, null, stringText, stringTracks, false); tempoEvents.sort(Comparator.comparingLong(MidiEvent::getTick)); diff --git a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java index a262f632..a9b29ff1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java @@ -198,7 +198,8 @@ public class NBSConverter implements Converter { songAuthor, songOriginalAuthor, songDescription, - stringLayerNames.substring(0, Math.max(0, stringLayerNames.length() - 1)) + stringLayerNames.substring(0, Math.max(0, stringLayerNames.length() - 1)), + true ); final List tempoSections = new ArrayList<>(); diff --git a/src/main/java/me/chayapak1/chomens_bot/song/Song.java b/src/main/java/me/chayapak1/chomens_bot/song/Song.java index 0bba0ddc..dc75fd6a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Song.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Song.java @@ -40,6 +40,8 @@ public class Song { private final Bot bot; + public final boolean nbs; + public Song ( final String originalName, final Bot bot, @@ -47,7 +49,8 @@ public class Song { final String songAuthor, final String songOriginalAuthor, final String songDescription, - final String tracks + final String tracks, + final boolean nbs ) { this.originalName = originalName; this.bot = bot; @@ -56,6 +59,7 @@ public class Song { this.songOriginalAuthor = songOriginalAuthor; this.songDescription = songDescription; this.tracks = tracks; + this.nbs = nbs; updateName(); } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java index ddb4f0ee..6b0127e5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java @@ -44,7 +44,7 @@ public class SongPlayerConverter implements Converter { final int loopCount = buffer.get() & 0xFF; final long loopPosition = buffer.getLong(); - final Song song = new Song(fileName, bot, !songName.trim().isEmpty() ? songName : null, null, null, null, null); + final Song song = new Song(fileName, bot, !songName.trim().isEmpty() ? songName : null, null, null, null, null, false); song.length = songLength; // song.looping = loop > 0; // song.loopCount = loopCount; diff --git a/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java index 4e591395..93dbc246 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java @@ -14,7 +14,7 @@ public class TextFileConverter implements Converter { int length = 0; - final Song song = new Song(fileName, bot, null, null, null, null, null); + final Song song = new Song(fileName, bot, null, null, null, null, null, false); for (final String line : data.split("\r\n|\r|\n")) { if (line.isBlank()) continue;