Fixed the damn music...

6h+ to fix this mess...

Author: RealMangorage

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
     dependencies {
         classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
-        classpath 'org.mangorage:MangoBotGradle:6.0.10'
+        classpath 'org.mangorage:MangoBotGradle:6.0.11'
     }
 }
 
@@ -70,16 +70,14 @@ dependencies {
 
     installer('org.mangorage:installer:4.0.13')
 
-    bootstrap("org.mangorage:mangobotbootstrap:1.0.18")
-    plugin('org.mangorage:mangobot:12.0.51')
-
-//    library('org.classdump.luna:luna-all-shaded:0.4.1')
-
+    bootstrap("org.mangorage:mangobotbootstrap:1.0.22")
+    plugin('org.mangorage:mangobot:12.0.57')
 
+    library 'org.slf4j:slf4j-simple:2.0.13' // Use a recent version)
     library('org.luaj:luaj-jme:3.0.1')
 
     library('dev.arbjerg:lavaplayer:2.2.3')
-    library('dev.lavalink.youtube:common:1.12.0')
+    library('dev.lavalink.youtube:common:+')
 }
 
 test {

src/main/java/module-info.java

@@ -8,10 +8,12 @@
     requires net.minecraftforge.eventbus;
     requires org.jetbrains.annotations;
 
-    requires static lavaplayer;
-    requires static common;
+    requires lavaplayer;
+    requires common;
+
     requires java.desktop;
     requires luaj.jme;
+    requires org.apache.logging.log4j;
 
 
     exports org.mangorage.mangobotplugin.entrypoint;
@@ -22,6 +24,9 @@
     opens org.mangorage.mangobotplugin.commands.trick to com.google.gson;
     opens org.mangorage.mangobotplugin.commands.trick.lua to com.google.gson;
 
+    exports org.mangorage.mangobotplugin.commands.music;
+    opens org.mangorage.mangobotplugin.commands.music;
+
     provides org.mangorage.mangobotcore.plugin.api.Plugin with org.mangorage.mangobotplugin.entrypoint.MangoBot;
     uses org.mangorage.mangobotcore.plugin.api.Plugin;
 }

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicPlayer.java

@@ -42,7 +42,7 @@
 import java.util.HashMap;
 import java.util.function.Consumer;
 
-public class MusicPlayer extends AudioEventAdapter implements AudioSendHandler {
+public final class MusicPlayer extends AudioEventAdapter implements AudioSendHandler {
     private static final HashMap<String, MusicPlayer> MUSIC_PLAYERS = new HashMap<>();
 
     public static MusicPlayer getInstance(String guildID) {
@@ -92,28 +92,37 @@ public boolean isQueueEmpty() {
 
     public void load(String URL, Consumer<AudioTrackEvent> eventConsumer) {
 
-        manager.loadItem(new AudioReference(URL.trim(), null), new AudioLoadResultHandler() {
-            @Override
-            public void trackLoaded(AudioTrack track) {
-                eventConsumer.accept(new AudioTrackEvent(track, AudioTrackEvent.Info.SUCCESS));
-            }
-
-            @Override
-            public void playlistLoaded(AudioPlaylist playlist) {
-                // Allow playlists maybe?
-            }
-
-            @Override
-            public void noMatches() {
-                eventConsumer.accept(new AudioTrackEvent(null, AudioTrackEvent.Info.NO_MATCHES));
-            }
-
-            @Override
-            public void loadFailed(FriendlyException exception) {
-                eventConsumer.accept(new AudioTrackEvent(null, AudioTrackEvent.Info.FAILED));
-                LogHelper.info(exception.getMessage());
-            }
-        });
+        try {
+            manager.loadItem(new AudioReference(URL.trim(), null), new AudioLoadResultHandler() {
+                @Override
+                public void trackLoaded(AudioTrack track) {
+                    eventConsumer.accept(new AudioTrackEvent(track, AudioTrackEvent.Info.SUCCESS));
+                    System.out.println("LOL");
+                }
+
+                @Override
+                public void playlistLoaded(AudioPlaylist playlist) {
+                    // Allow playlists maybe?
+                    eventConsumer.accept(new AudioTrackEvent(playlist.getSelectedTrack(), AudioTrackEvent.Info.SUCCESS));
+                    System.out.println("LOL");
+                }
+
+                @Override
+                public void noMatches() {
+                    eventConsumer.accept(new AudioTrackEvent(null, AudioTrackEvent.Info.NO_MATCHES));
+                    System.out.println("LOL");
+                }
+
+                @Override
+                public void loadFailed(FriendlyException exception) {
+                    eventConsumer.accept(new AudioTrackEvent(null, AudioTrackEvent.Info.FAILED));
+                    LogHelper.info(exception.getMessage());
+                    exception.printStackTrace();
+                }
+            });
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
     }
 
     public AudioStatus getStatus() {

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicUtil.java

@@ -22,14 +22,7 @@
 
 package org.mangorage.mangobotplugin.commands.music;
 
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.beam.BeamAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.getyarn.GetyarnAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioSourceManager;
 import dev.lavalink.youtube.YoutubeAudioSourceManager;
 import net.dv8tion.jda.api.audio.SpeakingMode;
 import net.dv8tion.jda.api.entities.Guild;
@@ -59,6 +52,7 @@ public static void connectToAudioChannel(VoiceChannel channel) {
     }
 
     public static void connectToAudioChannelNoMusic(VoiceChannel channel) {
+
         try {
             Guild guild = channel.getGuild();
             AudioManager audioManager = guild.getAudioManager();
@@ -80,14 +74,6 @@ public static void leaveVoiceChannel(Guild guild) {
     }
 
     public static void registerRemoteSources(AudioPlayerManager playerManager) {
-        var containerRegistry = MediaContainerRegistry.DEFAULT_REGISTRY;
         playerManager.registerSourceManager(new YoutubeAudioSourceManager());
-        playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
-        playerManager.registerSourceManager(new BandcampAudioSourceManager());
-        playerManager.registerSourceManager(new VimeoAudioSourceManager());
-        // playerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
-        playerManager.registerSourceManager(new BeamAudioSourceManager());
-        playerManager.registerSourceManager(new GetyarnAudioSourceManager());
-        playerManager.registerSourceManager(new HttpAudioSourceManager(containerRegistry));
     }
 }

src/main/java/org/mangorage/mangobotplugin/commands/music/commands/PlayCommand.java

@@ -100,6 +100,7 @@ public CommandResult execute(Message message, Arguments arg) {
                         });
                     } catch (Exception e) {
                         LogHelper.error(e.getMessage());
+                        e.getStackTrace();
                     }
                 } else
                     channel.sendMessage("Already playing!").queue();

src/main/java/org/mangorage/mangobotplugin/entrypoint/MangoBot.java

@@ -14,7 +14,6 @@
 import org.mangorage.commonutils.jda.ButtonActionRegistry;
 import org.mangorage.commonutils.jda.MessageSettings;
 import org.mangorage.commonutils.jda.slash.command.Command;
-import org.mangorage.entrypoint.MangoBotCore;
 import org.mangorage.mangobotcore.jda.command.api.CommandManager;
 import org.mangorage.mangobotcore.plugin.api.MangoBotPlugin;
 import org.mangorage.mangobotcore.plugin.api.Plugin;
@@ -81,6 +80,7 @@ public final class MangoBot implements Plugin {
     private JDA jda;
 
     public MangoBot() {
+
         ACTION_REGISTRY.register(new TrashButtonAction());
 
         commandManager.register(new EmojiCommand());