fix: removed too much
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
@@ -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<TempoSection> tempoSections = new ArrayList<>();
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user