diff --git a/.classpath b/.classpath index 0bd885b..e5e8a9b 100644 --- a/.classpath +++ b/.classpath @@ -24,6 +24,7 @@ - + + diff --git a/lib/lavaplayer-1.3.19.jar b/lib/lavaplayer-1.3.19.jar new file mode 100644 index 0000000..472c468 Binary files /dev/null and b/lib/lavaplayer-1.3.19.jar differ diff --git a/src/commands/music/CommandMusicMain.java b/src/commands/music/CommandMusicMain.java index 7eb3318..181fb21 100644 --- a/src/commands/music/CommandMusicMain.java +++ b/src/commands/music/CommandMusicMain.java @@ -23,4 +23,4 @@ public class CommandMusicMain extends Command { framework.run(guild, channel, user, input).Call(res); } -} +} \ No newline at end of file diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index 376e06a..5b77c66 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -7,6 +7,9 @@ import java.util.concurrent.Semaphore; import javax.security.auth.login.LoginException; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; +import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; + import core.lua.PluginManager; import dataStructures.*; import main.Main; @@ -51,6 +54,9 @@ public class ObjectBuilderFactory // Command manager private static CommandManager commandManager; + //Audio track manager + AudioPlayerManager audioPlayer = new DefaultAudioPlayerManager(); + // Localization classes - these are singletons, but should be initialized before almost all other // things so their inclusion in the factory is to ensure they're started at the correct time. @SuppressWarnings("unused") private static LocStrings locStrings; diff --git a/src/utils/AudioUtils.java b/src/utils/AudioUtils.java index 02e3b6d..b8554c1 100644 --- a/src/utils/AudioUtils.java +++ b/src/utils/AudioUtils.java @@ -1,5 +1,7 @@ package utils; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; + import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.VoiceChannel; import net.dv8tion.jda.core.managers.AudioManager; @@ -8,10 +10,14 @@ public class AudioUtils { private Guild guild; AudioManager audio; - public AudioUtils(Guild guild) + AudioPlayer player; + + + public AudioUtils(Guild guild, AudioPlayer player) { this.guild = guild; audio = guild.getAudioManager(); + this.player = player; } public boolean joinChannel(String channelName)