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

fix: comment out nbs Tempo Changer causing empty gaps after tempo has been changed

Browse Source 
refactor: some refactors i've done while inspecting the issue lol
feat: re-add note counts
This commit is contained in:
ChomeNS
2025-04-16 11:05:01 +07:00
parent ef15c45619
commit 346c55c3d6
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-number.txt
View File

@@ -1 +1 @@
2726
2747

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

@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -328,10 +329,24 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen
formatTime((long) (currentSong.length * speed)).color(NamedTextColor.GRAY)).color(NamedTextColor.DARK_GRAY)
);
if (!bot.core.hasRateLimit() && !currentLyrics.isEmpty()) {
final DecimalFormat formatter = new DecimalFormat("#,###");
if (!bot.core.hasRateLimit()) {
component = component
.append(Component.text(" | ", NamedTextColor.DARK_GRAY))
.append(Component.text(currentLyrics).color(NamedTextColor.BLUE));
.append(Component.text(" | ").color(NamedTextColor.DARK_GRAY))
.append(
Component.translatable(
"%s / %s",
Component.text(formatter.format(currentSong.position), NamedTextColor.GRAY),
Component.text(formatter.format(currentSong.size()), NamedTextColor.GRAY)
).color(NamedTextColor.DARK_GRAY)
);
if (!currentLyrics.isBlank()) {
component = component
.append(Component.text(" | ", NamedTextColor.DARK_GRAY))
.append(Component.text(currentLyrics).color(NamedTextColor.BLUE));
}
}
if (currentSong.paused) {
@@ -376,18 +391,16 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen
public void handlePlaying () {
if (currentSong == null) return;
try {
currentSong.advanceTime();
while (currentSong.reachedNextNote()) {
final Note note = currentSong.getNextNote();
currentSong.advanceTime();
while (currentSong.reachedNextNote()) {
final Note note = currentSong.getNextNote();
try {
if (note.isRainbowToggle) {
rainbow = !rainbow;
continue;
}
if (note.volume == 0) continue;
double key = note.shiftedPitch;
final Vector3d blockPosition = getBlockPosition(note);
@@ -439,9 +452,9 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen
MathUtilities.clamp(floatingPitch, 0, 2)
);
}
} catch (final Exception e) {
bot.logger.error(e);
}
} catch (final Exception e) {
bot.logger.error(e);
}
}

4
src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java
View File

@@ -213,7 +213,9 @@ public class NBSConverter implements Converter {
if (name.equals("Tempo Changer")) {
isTempoChanger = true;
tempo = (double) Math.abs(note.pitch) * 100 / 15;
// causes issues :(
// (more specifically empty gaps after the tempo has been changed)
// tempo = (double) Math.abs(note.pitch) * 100 / 15;
} else if (name.equals("Toggle Rainbow")) {
isRainbowToggle = true;
}

4
src/main/java/me/chayapak1/chomens_bot/song/Song.java
View File

@@ -139,9 +139,7 @@ public class Song {
}
public Note getNextNote () {
if (position >= notes.size()) {
if (bot.music.loop == Loop.OFF) return null;
}
if (position >= notes.size() && bot.music.loop == Loop.OFF) return null;
return notes.get(position++);
}