misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: reduce duplicate code in MusicPlayerPlugin:loadSong

Browse Source
This commit is contained in:
ChomeNS
2025-03-17 14:11:14 +07:00
parent dd0d80f265
commit 164f097249
2 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java
View File

@@ -81,61 +81,48 @@ public class MusicPlayerPlugin extends Bot.Listener {
}
public void loadSong (Path location, PlayerEntry sender) {
if (songQueue.size() > 500) return;
loaderThread = new SongLoaderThread(location, bot, sender.profile.getName());
bot.chat.tellraw(
Component
.translatable(
"Loading %s",
Component.text(location.getFileName().toString(), ColorUtilities.getColorByString(bot.config.colorPalette.secondary))
)
.color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor))
startLoadingSong(
location.getFileName().toString(),
new SongLoaderThread(location, bot, sender.profile.getName())
);
loaderThread.start();
}
public void loadSong (URL location, PlayerEntry sender) {
if (songQueue.size() > 500) return;
urlLimit++;
if (urlLimit > bot.config.music.urlRatelimit.limit) {
bot.chat.tellraw(Component.text("ohio").color(NamedTextColor.RED));
return;
}
loaderThread = new SongLoaderThread(location, bot, sender.profile.getName());
bot.chat.tellraw(
Component
.translatable(
"Loading %s",
Component.text(location.toString(), ColorUtilities.getColorByString(bot.config.colorPalette.secondary))
)
.color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor))
);
loaderThread.start();
}
public void loadSong (byte[] data, PlayerEntry sender) {
startLoadingSong(
sender.profile.getName() + "'s song item",
new SongLoaderThread(data, bot, sender.profile.getName())
);
}
public void loadSong (URL location, PlayerEntry sender) {
if (urlLimit >= bot.config.music.urlRatelimit.limit) {
bot.chat.tellraw(Component.text("URL loading is being rate limited!").color(NamedTextColor.RED));
return;
}
urlLimit++;
startLoadingSong(
location.toString(),
new SongLoaderThread(location, bot, sender.profile.getName())
);
}
private void startLoadingSong (String songName, SongLoaderThread loaderThread) {
if (songQueue.size() > 500) return;
loaderThread = new SongLoaderThread(data, bot, sender.profile.getName());
this.loaderThread = loaderThread;
bot.chat.tellraw(
Component
.translatable(
"Loading %s",
Component.text(sender.profile.getName() + "'s song item", ColorUtilities.getColorByString(bot.config.colorPalette.secondary))
Component.text(songName, ColorUtilities.getColorByString(bot.config.colorPalette.secondary))
)
.color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor))
);
loaderThread.start();
this.loaderThread.start();
}
private void onCoreReady () {