From 7cf994a3ebba733bf717e4f6fa82a058cbf43253 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Mon, 14 Aug 2023 21:21:13 +0700 Subject: [PATCH] some more before i go to sleep --- .../chayapak/chomens_bot/plugins/MusicPlayerPlugin.java | 2 +- .../land/chipmunk/chayapak/chomens_bot/song/NBSConverter.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java index 28d1edf5..c64aa436 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java @@ -290,7 +290,7 @@ public class MusicPlayerPlugin extends Bot.Listener { while (currentSong.reachedNextNote()) { final Note note = currentSong.getNextNote(); - if (notesPerSecond > 1000) continue; + if (notesPerSecond > 2500) continue; float key = note.pitch; diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/song/NBSConverter.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/song/NBSConverter.java index 7cd715fa..c3b12ef7 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/song/NBSConverter.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/song/NBSConverter.java @@ -5,6 +5,7 @@ import land.chipmunk.chayapak.chomens_bot.Bot; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.nio.file.Path; import java.util.ArrayList; // Author: hhhzzzsss @@ -168,7 +169,8 @@ public class NBSConverter { NBSCustomInstrument customInstrument = customInstruments.get(index); - String name = customInstrument.file; + final Path path = Path.of(customInstrument.file); + String name = path.getFileName().toString(); if (name.endsWith(".ogg")) name = name.substring(0, name.length() - ".ogg".length()); // bad but OK instrument = Instrument.of(name);