2.5.3f - fixed my dumb code

stellarspmc · Jul 13, 2024 · 9e928bd · 9e928bd
1 parent 2b0db1a
commit 9e928bd
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,8 +2,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>ml.spmc</groupId>
-  <artifactId>MusicBot</artifactId>
-  <version>2.5.2</version>
+  <artifactId>SPMCRadio</artifactId>
+  <version>2.5.3</version>
   <build>
     <plugins>
       <plugin>
@@ -15,14 +15,14 @@
             <manifest>
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
-              <mainClass>ml.spmc.musicbot.MusicBot</mainClass>
+              <mainClass>fun.spmc.radio.SPMCRadio</mainClass>
             </manifest>
           </archive>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  <name>MusicBot</name>
+  <name>SPMCRadio</name>
   <url>https://mc.spmc.fun</url>
 
   <repositories>
@@ -61,6 +61,11 @@
       <artifactId>v2</artifactId>
       <version>1.4.0</version>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.5.6</version>
+    </dependency>
   </dependencies>
 
 

diff --git a/src/main/java/ml/spmc/radio/Config.java → src/main/java/fun/spmc/radio/Config.java b/src/main/java/ml/spmc/radio/Config.java → src/main/java/fun/spmc/radio/Config.java
@@ -1,4 +1,4 @@
-package ml.spmc.radio;
+package fun.spmc.radio;
 
 import java.io.*;
 import java.net.URISyntaxException;

diff --git a/...main/java/ml/spmc/radio/EventHandler.java → ...ain/java/fun/spmc/radio/EventHandler.java b/...main/java/ml/spmc/radio/EventHandler.java → ...ain/java/fun/spmc/radio/EventHandler.java
@@ -1,9 +1,9 @@
-package ml.spmc.radio;
+package fun.spmc.radio;
 
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import ml.spmc.radio.music.MusicPlayer;
-import ml.spmc.radio.music.MusicType;
-import ml.spmc.radio.music.TrackScheduler;
+import fun.spmc.radio.music.MusicPlayer;
+import fun.spmc.radio.music.MusicType;
+import fun.spmc.radio.music.TrackScheduler;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -22,14 +22,12 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class EventHandler extends ListenerAdapter {
-    public static String[] details = new String[4];
 
     private static boolean isValidURL(String urlString) {
         try {
@@ -59,8 +57,6 @@ public void onGuildReady(@Nullable GuildReadyEvent e) {
 
     @Override
     public void onSlashCommandInteraction(SlashCommandInteractionEvent e) {
-        System.out.println("after wipe: " + Arrays.toString(EventHandler.details));
-
         switch (e.getName()) {
             case "play" -> {
                 String url = Objects.requireNonNull(e.getOption("song")).getAsString();
@@ -117,7 +113,7 @@ private static MessageEmbed getNowPlayingEmbed() {
 
         embedBuilder.setColor(new Color(2600572));
         embedBuilder.setAuthor("TCFPlayz", "https://mc.spmc.fun", "https://cdn.discordapp.com/avatars/340022376924446720/dff2fd1a8161150ce10b7138c66ca58c.webp?size=1024");
-        embedBuilder.setFooter("SPMCRadio 2.5p");
+        embedBuilder.setFooter("SPMCRadio 2.5.3");
         embedBuilder.setTimestamp(Instant.ofEpochMilli(System.currentTimeMillis()));
         return embedBuilder.build();
     }
@@ -127,7 +123,7 @@ private static MessageEmbed getQueueListEmbed() {
         EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setColor(new Color(2600572));
         embedBuilder.setAuthor("TCFPlayz", "https://mc.spmc.fun", "https://cdn.discordapp.com/avatars/340022376924446720/dff2fd1a8161150ce10b7138c66ca58c.webp?size=1024");
-        embedBuilder.setFooter("SPMCRadio 2.5p");
+        embedBuilder.setFooter("SPMCRadio 2.5.3");
         embedBuilder.setTimestamp(Instant.ofEpochMilli(System.currentTimeMillis()));
         embedBuilder.setTitle("Queue");
 

diff --git a/src/main/java/ml/spmc/radio/SPMCRadio.java → src/main/java/fun/spmc/radio/SPMCRadio.java b/src/main/java/ml/spmc/radio/SPMCRadio.java → src/main/java/fun/spmc/radio/SPMCRadio.java
@@ -1,6 +1,6 @@
-package ml.spmc.radio;
+package fun.spmc.radio;
 
-import ml.spmc.radio.music.MusicPlayer;
+import fun.spmc.radio.music.MusicPlayer;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.requests.GatewayIntent;

diff --git a/...ava/ml/spmc/radio/music/MusicManager.java → ...va/fun/spmc/radio/music/MusicManager.java b/...ava/ml/spmc/radio/music/MusicManager.java → ...va/fun/spmc/radio/music/MusicManager.java
@@ -1,4 +1,4 @@
-package ml.spmc.radio.music;
+package fun.spmc.radio.music;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;

diff --git a/...java/ml/spmc/radio/music/MusicPlayer.java → ...ava/fun/spmc/radio/music/MusicPlayer.java b/...java/ml/spmc/radio/music/MusicPlayer.java → ...ava/fun/spmc/radio/music/MusicPlayer.java
@@ -1,4 +1,4 @@
-package ml.spmc.radio.music;
+package fun.spmc.radio.music;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
@@ -9,14 +9,14 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import ml.spmc.radio.Config;
+import fun.spmc.radio.Config;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.managers.AudioManager;
 
 import java.util.*;
 
-import static ml.spmc.radio.SPMCRadio.bot;
+import static fun.spmc.radio.SPMCRadio.bot;
 
 public class MusicPlayer {
 
@@ -27,16 +27,15 @@ public class MusicPlayer {
     private static final AudioPlayer player = musicManager.player;
 
     public static void playMusic() {
+        manager.registerSourceManager(new dev.lavalink.youtube.YoutubeAudioSourceManager());
+
         VoiceChannel channel = bot.getVoiceChannelById(Config.MUSIC_CHANNEL_ID);
         assert guild != null;
-        dev.lavalink.youtube.YoutubeAudioSourceManager ytSourceManager = new dev.lavalink.youtube.YoutubeAudioSourceManager();
-        manager.registerSourceManager(ytSourceManager);
-
         final AudioManager manager2 = guild.getAudioManager();
         manager2.setSendingHandler(musicManager.getSendHandler());
         if (!manager2.isConnected()) {
             manager2.openAudioConnection(channel);
-            AudioSourceManagers.registerRemoteSources(manager, YoutubeAudioSourceManager.class);
+             AudioSourceManagers.registerRemoteSources(manager, YoutubeAudioSourceManager.class);
             AudioSourceManagers.registerLocalSource(manager);
             manager2.setSelfDeafened(true);
             player.setVolume(100);
@@ -78,10 +77,12 @@ public void playlistLoaded(AudioPlaylist playList) {
 
             @Override
             public void noMatches() {
+                System.out.println("No matches");
             }
 
             @Override
             public void loadFailed(FriendlyException exception) {
+                exception.printStackTrace();
             }
         });
     }

diff --git a/...ml/spmc/radio/music/MusicSendHandler.java → ...un/spmc/radio/music/MusicSendHandler.java b/...ml/spmc/radio/music/MusicSendHandler.java → ...un/spmc/radio/music/MusicSendHandler.java
@@ -1,4 +1,4 @@
-package ml.spmc.radio.music;
+package fun.spmc.radio.music;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame;

diff --git a/...n/java/ml/spmc/radio/music/MusicType.java → .../java/fun/spmc/radio/music/MusicType.java b/...n/java/ml/spmc/radio/music/MusicType.java → .../java/fun/spmc/radio/music/MusicType.java
@@ -1,4 +1,4 @@
-package ml.spmc.radio.music;
+package fun.spmc.radio.music;
 
 public enum MusicType {
     DEFAULT("https://youtube.com/playlist?list=PLy_S3qOMUL1epiuCU4kBTOpLo1xOFJSLx"), // 2022

diff --git a/...a/ml/spmc/radio/music/TrackScheduler.java → .../fun/spmc/radio/music/TrackScheduler.java b/...a/ml/spmc/radio/music/TrackScheduler.java → .../fun/spmc/radio/music/TrackScheduler.java
@@ -1,4 +1,4 @@
-package ml.spmc.radio.music;
+package fun.spmc.radio.music;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
@@ -16,7 +16,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import static ml.spmc.radio.EventHandler.getDuration;
+import static fun.spmc.radio.EventHandler.getDuration;
 
 
 public class TrackScheduler extends AudioEventAdapter {
@@ -30,7 +30,7 @@ private static MessageEmbed createEmbed(String[] detail) {
 
         embedBuilder.setColor(new Color(2600572));
         embedBuilder.setAuthor("TCFPlayz", "https://mc.spmc.fun", "https://cdn.discordapp.com/avatars/340022376924446720/dff2fd1a8161150ce10b7138c66ca58c.webp?size=1024");
-        embedBuilder.setFooter("SPMCRadio 2.5p");
+        embedBuilder.setFooter("SPMCRadio 2.5.3");
         embedBuilder.setTimestamp(Instant.ofEpochMilli(System.currentTimeMillis()));
         return embedBuilder.build();
     }
@@ -40,7 +40,6 @@ private static MessageEmbed createEmbed(String[] detail) {
     public static ArrayList<AudioTrack> arrayQueue;
     AudioTrack lastTrack;
     public static boolean shuffled = false;
-    private static String[] details;
 
     public TrackScheduler(AudioPlayer player) {
         TrackScheduler.player = player;
@@ -55,19 +54,11 @@ private void queue(AudioTrack track) {
     }
 
     public void queuePlaylist(AudioPlaylist playlist) {
-        details[0] = playlist.isSearchResult() ? "" : "a";
-        details[1] = playlist.isSearchResult() ? playlist.getSelectedTrack().getInfo().title : playlist.getName();
-        details[2] = playlist.isSearchResult() ? playlist.getSelectedTrack().getInfo().author : "Feature Unavailable";
-        details[3] = String.valueOf(playlist.isSearchResult() ? playlist.getSelectedTrack().getDuration() : playlist.getTracks().stream().mapToLong(AudioTrack::getDuration).sum());
         if (playlist.isSearchResult()) queue(playlist.getSelectedTrack());
         else playlist.getTracks().forEach(this::queue);
     }
 
     public void queueTrack(AudioTrack track) {
-        details[0] = "";
-        details[1] = track.getInfo().title;
-        details[2] = track.getInfo().author;
-        details[3] = String.valueOf(track.getDuration());
         queue(track);
     }