diff --git a/.idea/.gitignore b/.idea/.gitignore
index d132fd4..ecf2f90 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +1,3 @@
# Default ignored files
/shelf/
-/.idea3/workspace.xml
+/.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 27b09d1..33ef636 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,9 @@
-
+
+
@@ -94,13 +95,6 @@
1680245437032
-
- 1681003794277
-
-
-
- 1681003794277
-
1681014542708
@@ -437,7 +431,14 @@
1681984879688
-
+
+ 1682060041610
+
+
+
+ 1682060041611
+
+
@@ -452,7 +453,6 @@
-
@@ -477,7 +477,8 @@
-
+
+
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
index c282824..6457239 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
@@ -393,22 +393,22 @@ public class MusicCommand implements Command {
public Component info (CommandContext context) {
final Bot bot = context.bot();
final Song currentSong = bot.music().currentSong();
- final String fileName = bot.music().fileName();
if (currentSong == null) return Component.text("No song is currently playing").color(NamedTextColor.RED);
// ig very code yup
+ final Component title = currentSong.name;
final String songAuthor = currentSong.songAuthor == null || currentSong.songAuthor.equals("") ? "N/A" : currentSong.songAuthor;
final String songOriginalAuthor = currentSong.songOriginalAuthor == null || currentSong.songOriginalAuthor.equals("") ? "N/A" : currentSong.songOriginalAuthor;
final String songDescription = currentSong.songDescription == null || currentSong.songDescription.equals("") ? "N/A" : currentSong.songDescription;
final Component component = Component.translatable(
"""
- Filename: %s
+ Title/Filename: %s
Author: %s
Original author: %s
Description: %s""",
- Component.text(fileName).color(NamedTextColor.AQUA),
+ title.color(NamedTextColor.AQUA),
Component.text(songAuthor).color(NamedTextColor.AQUA),
Component.text(songOriginalAuthor).color(NamedTextColor.AQUA),
Component.text(songDescription).color(NamedTextColor.AQUA)
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 90a331f..09f6fa9 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
@@ -34,8 +34,6 @@ public class MusicPlayerPlugin extends SessionAdapter {
}
}
- @Getter private String fileName;
-
@Getter @Setter private Song currentSong;
@Getter @Setter private LinkedList songQueue = new LinkedList<>();
@Getter @Setter private SongLoaderThread loaderThread;
@@ -99,7 +97,6 @@ public class MusicPlayerPlugin extends SessionAdapter {
bot.chat().tellraw(Component.translatable("Failed to load song: %s", loaderThread.exception.message()).color(NamedTextColor.RED));
} else {
songQueue.add(loaderThread.song);
- fileName = loaderThread.fileName;
bot.chat().tellraw(Component.translatable("Added %s to the song queue", Component.empty().append(loaderThread.song.name).color(NamedTextColor.GOLD)));
}
loaderThread = null;
@@ -151,7 +148,6 @@ public class MusicPlayerPlugin extends SessionAdapter {
if (songQueue.size() == 0) {
stopPlaying();
removeBossBar();
- fileName = null;
bot.chat().tellraw(Component.text("Finished playing every song in the queue"));
return;
}