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

fix: some improvements and bugfixes in music

Browse Source
This commit is contained in:
ChomeNS
2025-08-18 19:20:28 +07:00
parent 0a87c1aed6
commit e938e5a4b6
3 changed files with 96 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-number.txt
View File

@@ -1 +1 @@
3584
3586

34
src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java
View File

@@ -397,24 +397,26 @@ public class MusicCommand extends Command implements Listener {
final Bot bot = context.bot;
final List<Song> queue = bot.music.songQueue;
final List<Component> queueWithNames = new ObjectArrayList<>();
int i = 0;
for (final Song song : queue) {
queueWithNames.add(
Component.text(
song.name,
(i++ & 1) == 0
? bot.colorPalette.primary
: bot.colorPalette.secondary
)
synchronized (queue) {
final List<Component> queueWithNames = new ObjectArrayList<>();
int i = 0;
for (final Song song : queue) {
queueWithNames.add(
Component.text(
song.name,
(i++ & 1) == 0
? bot.colorPalette.primary
: bot.colorPalette.secondary
)
);
}
return Component.translatable(
"commands.music.queue",
NamedTextColor.GREEN,
Component.join(JoinConfiguration.commas(true), queueWithNames)
);
}
return Component.translatable(
"commands.music.queue",
NamedTextColor.GREEN,
Component.join(JoinConfiguration.commas(true), queueWithNames)
);
}
// lazy fix for java using "goto" as keyword real

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

@@ -57,6 +57,8 @@ public class MusicPlayerPlugin implements Listener {
public SongLoaderThread loaderThread = null;
public Loop loop = Loop.OFF;
private final Object tickLock = new Object();
// sus nightcore stuff,..,.,.
public double pitch = 0;
public double speed = 1;
@@ -84,7 +86,17 @@ public class MusicPlayerPlugin implements Listener {
bot.listener.addListener(this);
bot.executor.scheduleAtFixedRate(this::onMusicTick, 0, 50, TimeUnit.MILLISECONDS);
bot.executor.scheduleAtFixedRate(() -> {
if (!bot.loggedIn) return;
synchronized (tickLock) {
try {
onMusicTick();
} catch (final Exception e) {
bot.logger.error(e);
}
}
}, 0, 50, TimeUnit.MILLISECONDS);
bot.executor.scheduleAtFixedRate(() -> urlLimit = 0, 0, bot.config.music.urlRatelimit.seconds, TimeUnit.SECONDS);
}
@@ -147,81 +159,75 @@ public class MusicPlayerPlugin implements Listener {
// this needs a separate ticker because we need
// the song to be playing without lag
private void onMusicTick () {
try {
if (!bot.loggedIn) return;
if (currentSong == null) {
if (songQueue.isEmpty()) return; // this line
if (currentSong == null) {
if (songQueue.isEmpty()) return; // this line
currentSong = songQueue.getFirst(); // songQueue.poll();
currentSong.context.sendOutput(
Component.translatable(
"commands.music.nowplaying",
bot.colorPalette.defaultColor,
Component.empty().append(Component.text(currentSong.name, bot.colorPalette.secondary))
)
);
currentSong.play();
addBossBar();
addBossBar();
}
currentSong = songQueue.getFirst(); // songQueue.poll();
currentSong.context.sendOutput(
Component.translatable(
"commands.music.nowplaying",
bot.colorPalette.defaultColor,
Component.empty().append(Component.text(currentSong.name, bot.colorPalette.secondary))
)
);
if (isStopping) {
currentSong = null;
isStopping = false;
} else if (!currentSong.finished()) {
handleLyrics();
BotBossBar bossBar = bot.bossbar.get(BOSS_BAR_NAME);
if (bossBar == null) bossBar = addBossBar();
if (bossBar != null && bot.options.useCore) {
bossBar.setTitle(generateBossBar());
bossBar.setColor(bossBarColor);
bossBar.setValue((int) Math.floor(((currentSong.time / speed) / 1000)));
bossBar.setMax((long) (currentSong.length / speed) / 1000);
}
if (currentSong.paused || bot.core.isRateLimited()) return;
handlePlaying();
} else {
currentLyrics = "";
if (loop == Loop.CURRENT) {
currentSong.loop();
return;
}
currentSong.context.sendOutput(
Component.translatable(
"commands.music.finished",
bot.colorPalette.defaultColor,
Component.empty().append(Component.text(currentSong.name, bot.colorPalette.secondary))
)
);
if (loop == Loop.ALL) {
skip();
return;
}
songQueue.removeFirst();
if (songQueue.isEmpty()) {
stopPlaying();
return;
}
if (currentSong.size() > 0) {
currentSong = songQueue.getFirst();
currentSong.setTime(0);
currentSong.play();
}
if (isStopping) {
currentSong = null;
isStopping = false;
} else if (!currentSong.finished()) {
handleLyrics();
BotBossBar bossBar = bot.bossbar.get(BOSS_BAR_NAME);
if (bossBar == null) bossBar = addBossBar();
if (bossBar != null && bot.options.useCore) {
bossBar.setTitle(generateBossBar());
bossBar.setColor(bossBarColor);
bossBar.setValue((int) Math.floor(((currentSong.time / speed) / 1000)));
bossBar.setMax((long) (currentSong.length / speed) / 1000);
}
if (currentSong.paused || bot.core.isRateLimited()) return;
handlePlaying();
} else {
currentLyrics = "";
if (loop == Loop.CURRENT) {
currentSong.loop();
return;
}
currentSong.context.sendOutput(
Component.translatable(
"commands.music.finished",
bot.colorPalette.defaultColor,
Component.empty().append(Component.text(currentSong.name, bot.colorPalette.secondary))
)
);
if (loop == Loop.ALL) {
skip();
return;
}
songQueue.removeFirst();
if (songQueue.isEmpty()) {
stopPlaying();
return;
}
if (currentSong.size() > 0) {
currentSong = songQueue.getFirst();
currentSong.setTime(0);
currentSong.play();
}
}
} catch (final Exception e) {
bot.logger.error(e);
}
}
@@ -241,8 +247,6 @@ public class MusicPlayerPlugin implements Listener {
}
public BotBossBar addBossBar () {
if (currentSong == null) return null;
rainbow = false;
final BotBossBar bossBar = new BotBossBar(