Skip to content

Commit 8e067e4

Browse files
committed
Added back all the AudioSources that are still working...
1 parent 5cdf22f commit 8e067e4

File tree

8 files changed

+45
-11
lines changed

8 files changed

+45
-11
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ dependencies {
6868
testImplementation platform('org.junit:junit-bom:5.9.1')
6969
testImplementation 'org.junit.jupiter:junit-jupiter'
7070

71-
installer('org.mangorage:installer:4.0.13')
71+
installer('org.mangorage:installer:4.0.20')
7272

73-
bootstrap("org.mangorage:mangobotbootstrap:1.0.27")
74-
plugin('org.mangorage:mangobot:12.0.61')
73+
bootstrap("org.mangorage:mangobotbootstrap:1.0.29")
74+
plugin('org.mangorage:mangobot:12.0.63')
7575

7676
library 'org.slf4j:slf4j-simple:2.0.13' // Use a recent version)
7777
library('org.luaj:luaj-jme:3.0.1')

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,8 @@ public boolean isQueueEmpty() {
9696
}
9797

9898
public void load(String URL, Consumer<AudioTrackEvent> eventConsumer) {
99-
10099
try {
101-
manager.loadItem(new AudioReference(URL.trim(), null), new AudioLoadResultHandler() {
100+
manager.loadItem(URL, new AudioLoadResultHandler() {
102101
@Override
103102
public void trackLoaded(AudioTrack track) {
104103
add(track);
@@ -107,10 +106,11 @@ public void trackLoaded(AudioTrack track) {
107106

108107
@Override
109108
public void playlistLoaded(AudioPlaylist playlist) {
109+
final var trackSelected = playlist.getSelectedTrack() == null ? playlist.getTracks().get(0) : playlist.getSelectedTrack();
110110
playlist.getTracks().forEach(track -> {
111111
add(track);
112112
});
113-
eventConsumer.accept(new AudioTrackEvent(playlist.getSelectedTrack(), AudioTrackEvent.Info.SUCCESS));
113+
eventConsumer.accept(new AudioTrackEvent(trackSelected, AudioTrackEvent.Info.SUCCESS));
114114
}
115115

116116
@Override

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
package org.mangorage.mangobotplugin.commands.music;
2424

2525
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
26+
import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
27+
import com.sedmelluq.discord.lavaplayer.source.beam.BeamAudioSourceManager;
28+
import com.sedmelluq.discord.lavaplayer.source.getyarn.GetyarnAudioSourceManager;
29+
import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
30+
import com.sedmelluq.discord.lavaplayer.source.local.LocalAudioSourceManager;
31+
import com.sedmelluq.discord.lavaplayer.source.nico.NicoAudioSourceManager;
32+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
33+
import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioSourceManager;
34+
import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioSourceManager;
35+
import com.sedmelluq.discord.lavaplayer.source.yamusic.YandexMusicAudioSourceManager;
2636
import dev.lavalink.youtube.YoutubeAudioSourceManager;
2737
import net.dv8tion.jda.api.audio.SpeakingMode;
2838
import net.dv8tion.jda.api.entities.Guild;
@@ -35,6 +45,7 @@
3545
import org.mangorage.commonutils.misc.PagedList;
3646
import org.mangorage.commonutils.misc.RunnableTask;
3747
import org.mangorage.commonutils.misc.TaskScheduler;
48+
import org.mangorage.entrypoint.MangoBotCore;
3849
import org.mangorage.mangobotplugin.PagedListManager;
3950
import org.mangorage.mangobotplugin.PagedListWithAction;
4051

@@ -84,7 +95,30 @@ public static void leaveVoiceChannel(Guild guild) {
8495
}
8596

8697
public static void registerRemoteSources(AudioPlayerManager playerManager) {
98+
playerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
99+
playerManager.registerSourceManager(new VimeoAudioSourceManager());
87100
playerManager.registerSourceManager(new YoutubeAudioSourceManager());
101+
playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
102+
playerManager.registerSourceManager(new BandcampAudioSourceManager());
103+
104+
// Not Available in my area...
105+
//playerManager.registerSourceManager(new NicoAudioSourceManager());
106+
//playerManager.registerSourceManager(new YandexMusicAudioSourceManager());
107+
108+
// Dead or Broken?
109+
// playerManager.registerSourceManager(new GetyarnAudioSourceManager());
110+
111+
// Dead, was shutdown
112+
// playerManager.registerSourceManager(new BeamAudioSourceManager());
113+
114+
115+
if (MangoBotCore.isDevMode()) {
116+
// I dont want to expose files in any way in production, in dev mode its nice for testing...
117+
playerManager.registerSourceManager(new LocalAudioSourceManager());
118+
}
119+
120+
// Goes last to avoid messing up any of the above...
121+
playerManager.registerSourceManager(new HttpAudioSourceManager());
88122
}
89123

90124
public static String formatDuration(long millis) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import java.util.List;
4040

4141

42-
public class PauseCommand implements ICommand {
42+
public final class PauseCommand implements ICommand {
4343
@Override
4444
public String id() {
4545
return "pause";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import java.util.List;
3838

39-
public class QueueCommand implements ICommand {
39+
public final class QueueCommand implements ICommand {
4040
private final PagedListManager pagedListManager;
4141

4242
public QueueCommand(PagedListManager pagedListManager) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import java.util.List;
1616

17-
public class SkipCommand implements ICommand {
17+
public final class SkipCommand implements ICommand {
1818
@Override
1919
public String id() {
2020
return "skip";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import java.util.List;
3636

37-
public class StopCommand implements ICommand {
37+
public final class StopCommand implements ICommand {
3838
@Override
3939
public String id() {
4040
return "stop";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
import java.util.List;
3535

36-
public class VolumeCommand implements ICommand {
36+
public final class VolumeCommand implements ICommand {
3737
@Override
3838
public String id() {
3939
return "setVolume";

0 commit comments

Comments
 (0)