ChomeNS/chomens-bot-java
3
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

port songplayer test song for some reason

Browse source
This commit is contained in:
Chayapak 2023-08-20 17:52:40 +07:00
parent 8a8d6cc102
commit 97c1d5b963
2 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
View file

@ -6,7 +6,9 @@ import land.chipmunk.chayapak.chomens_bot.command.Command;
import land.chipmunk.chayapak.chomens_bot.command.CommandContext;
import land.chipmunk.chayapak.chomens_bot.command.TrustLevel;
import land.chipmunk.chayapak.chomens_bot.plugins.MusicPlayerPlugin;
import land.chipmunk.chayapak.chomens_bot.song.Instrument;
import land.chipmunk.chayapak.chomens_bot.song.Loop;
import land.chipmunk.chayapak.chomens_bot.song.Note;
import land.chipmunk.chayapak.chomens_bot.song.Song;
import land.chipmunk.chayapak.chomens_bot.util.ColorUtilities;
import land.chipmunk.chayapak.chomens_bot.util.TimestampUtilities;
@ -81,6 +83,7 @@ public class MusicCommand extends Command {
case "noteinstrument" -> noteInstrument(context, args);
case "pause", "resume" -> pause(context);
case "info" -> info(context);
case "testsong" -> testSong(context);
default -> Component.text("Invalid action").color(NamedTextColor.RED);
};
}
@ -435,4 +438,47 @@ public class MusicCommand extends Command {
Component.text(songDescription).color(NamedTextColor.AQUA)
).color(NamedTextColor.GOLD);
}
public Component testSong (CommandContext context) {
final Bot bot = context.bot;
final Song song = new Song(
"test_song",
bot,
"Test Song",
"chayapak",
"hhhzzzsss",
"SongPlayer's test song ported to ChomeNS Bot",
false
);
int instrumentId = 0;
int j = 0;
for (int i = 0; i < 400; i++) {
j++;
song.add(
new Note(
Instrument.fromId(instrumentId),
j,
1,
i * 50,
-1,
100
)
);
if (j > 15) {
instrumentId++;
if (instrumentId > 15) instrumentId = 0;
j = 0;
}
}
song.length = 400 * 50;
bot.music.songQueue.add(song);
return Component.text("Test song has been added to the song queue").color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
}
}

8
src/main/java/land/chipmunk/chayapak/chomens_bot/song/Song.java
View file

@ -37,20 +37,20 @@ public class Song {
if (isNotNullAndNotBlank(songOriginalAuthor) && !isNotNullAndNotBlank(songAuthor)) name = String.format(
"%s - %s",
songOriginalAuthor,
originalName
isNotNullAndNotBlank(songName) ? songName : originalName
);
else if (!isNotNullAndNotBlank(songOriginalAuthor) && isNotNullAndNotBlank(songAuthor)) name = String.format(
"%s - %s",
songAuthor,
originalName
isNotNullAndNotBlank(songName) ? songName : originalName
);
else if (isNotNullAndNotBlank(songOriginalAuthor) && isNotNullAndNotBlank(songAuthor)) name = String.format(
"%s/%s - %s",
songOriginalAuthor,
songAuthor,
originalName
isNotNullAndNotBlank(songName) ? songName : originalName
);
else name = originalName;
else name = isNotNullAndNotBlank(songName) ? songName : originalName;
this.originalName = originalName;
this.name = name;