Skip to content

Commit fac4411

Browse files
Cameron HesslerCameron Hessler
Cameron Hessler
authored and
Cameron Hessler
committed
Fixes build issues
1 parent 6e3d2f2 commit fac4411

19 files changed

+114
-94
lines changed

‎src/main/java/com/github/bustedearlobes/themis/Themis.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import com.github.bustedearlobes.themis.music.GlobalMusicManager;
2222
import com.github.bustedearlobes.themis.taskmanager.TaskManager;
2323

24-
import net.dv8tion.jda.core.AccountType;
25-
import net.dv8tion.jda.core.JDA;
26-
import net.dv8tion.jda.core.JDABuilder;
24+
import net.dv8tion.jda.api.AccountType;
25+
import net.dv8tion.jda.api.JDA;
26+
import net.dv8tion.jda.api.JDABuilder;
2727

2828
public class Themis {
2929
private final static Logger LOG = LoggerFactory.getLogger(Themis.class);

‎src/main/java/com/github/bustedearlobes/themis/commands/ClearCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import com.github.bustedearlobes.themis.Themis;
99
import com.github.bustedearlobes.themis.taskmanager.ClearMessagesTask;
1010

11-
import net.dv8tion.jda.core.JDA;
12-
import net.dv8tion.jda.core.entities.Message;
13-
import net.dv8tion.jda.core.entities.TextChannel;
11+
import net.dv8tion.jda.api.JDA;
12+
import net.dv8tion.jda.api.entities.Message;
13+
import net.dv8tion.jda.api.entities.TextChannel;
1414

1515
public class ClearCommand extends Command {
1616
private static final Logger LOG = LoggerFactory.getLogger(ClearCommand.class);

‎src/main/java/com/github/bustedearlobes/themis/commands/Command.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import com.github.bustedearlobes.themis.Themis;
77

8-
import net.dv8tion.jda.core.JDA;
9-
import net.dv8tion.jda.core.entities.Message;
10-
import net.dv8tion.jda.core.entities.TextChannel;
8+
import net.dv8tion.jda.api.JDA;
9+
import net.dv8tion.jda.api.entities.Message;
10+
import net.dv8tion.jda.api.entities.TextChannel;
1111

1212
public abstract class Command {
1313
private Pattern pattern;

‎src/main/java/com/github/bustedearlobes/themis/commands/CommandListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import com.github.bustedearlobes.themis.Themis;
1010

11-
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
12-
import net.dv8tion.jda.core.hooks.ListenerAdapter;
11+
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
12+
import net.dv8tion.jda.api.hooks.ListenerAdapter;
1313

1414
public class CommandListener extends ListenerAdapter {
1515
public static final String COMMAND_BASE = "!";

‎src/main/java/com/github/bustedearlobes/themis/commands/HelpCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
import com.github.bustedearlobes.themis.Themis;
66

7-
import net.dv8tion.jda.core.JDA;
8-
import net.dv8tion.jda.core.entities.Message;
7+
import net.dv8tion.jda.api.JDA;
8+
import net.dv8tion.jda.api.entities.Message;
9+
910

1011
public class HelpCommand extends Command {
1112
private static final String REGEX = "^help( (\\w+))?$";

‎src/main/java/com/github/bustedearlobes/themis/commands/MusicCommand.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
1515
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
1616

17-
import net.dv8tion.jda.core.JDA;
18-
import net.dv8tion.jda.core.entities.Guild;
19-
import net.dv8tion.jda.core.entities.Message;
20-
import net.dv8tion.jda.core.entities.TextChannel;
21-
import net.dv8tion.jda.core.managers.AudioManager;
17+
import net.dv8tion.jda.api.JDA;
18+
import net.dv8tion.jda.api.entities.Guild;
19+
import net.dv8tion.jda.api.entities.Message;
20+
import net.dv8tion.jda.api.entities.TextChannel;
21+
import net.dv8tion.jda.api.managers.AudioManager;
2222

2323
public class MusicCommand extends Command {
2424
private static final Logger LOG = LoggerFactory.getLogger(MusicCommand.class);

‎src/main/java/com/github/bustedearlobes/themis/commands/MuteCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import com.github.bustedearlobes.themis.taskmanager.ScheduledTask;
1111
import com.github.bustedearlobes.themis.taskmanager.TaskManager;
1212

13-
import net.dv8tion.jda.core.JDA;
14-
import net.dv8tion.jda.core.entities.Message;
15-
import net.dv8tion.jda.core.entities.TextChannel;
13+
import net.dv8tion.jda.api.JDA;
14+
import net.dv8tion.jda.api.entities.Message;
15+
import net.dv8tion.jda.api.entities.TextChannel;
1616

1717
public class MuteCommand extends Command {
1818
private static final String REGEX = "^(mute)( @\\w+)+( #\\w+)?( (\\d+)(s|m|h|d))?$";

‎src/main/java/com/github/bustedearlobes/themis/commands/OofCommand.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
1717
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
1818

19-
import net.dv8tion.jda.core.JDA;
20-
import net.dv8tion.jda.core.entities.Guild;
21-
import net.dv8tion.jda.core.entities.Message;
22-
import net.dv8tion.jda.core.managers.AudioManager;
19+
import net.dv8tion.jda.api.JDA;
20+
import net.dv8tion.jda.api.entities.Guild;
21+
import net.dv8tion.jda.api.entities.Message;
22+
import net.dv8tion.jda.api.managers.AudioManager;
2323

2424
public class OofCommand extends Command {
2525
private static final Logger LOG = LoggerFactory.getLogger(OofCommand.class);

‎src/main/java/com/github/bustedearlobes/themis/commands/ShutdownCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import com.github.bustedearlobes.themis.Themis;
99

10-
import net.dv8tion.jda.core.JDA;
11-
import net.dv8tion.jda.core.entities.Message;
10+
import net.dv8tion.jda.api.JDA;
11+
import net.dv8tion.jda.api.entities.Message;
1212

1313
public class ShutdownCommand extends Command {
1414
private static final Logger LOG = LoggerFactory.getLogger(ShutdownCommand.class);

‎src/main/java/com/github/bustedearlobes/themis/commands/UnmuteCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import com.github.bustedearlobes.themis.taskmanager.ScheduledTask;
1010
import com.github.bustedearlobes.themis.taskmanager.TaskManager;
1111

12-
import net.dv8tion.jda.core.JDA;
13-
import net.dv8tion.jda.core.entities.Message;
14-
import net.dv8tion.jda.core.entities.TextChannel;
12+
import net.dv8tion.jda.api.JDA;
13+
import net.dv8tion.jda.api.entities.Message;
14+
import net.dv8tion.jda.api.entities.TextChannel;
1515

1616
public class UnmuteCommand extends Command {
1717
private static final String REGEX = "^(unmute)( @\\w+)+( #\\w+)?$";

‎src/main/java/com/github/bustedearlobes/themis/messagelog/MessageLogger.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.io.IOException;
55
import java.nio.file.Files;
66
import java.nio.file.Path;
7-
import java.nio.file.Paths;
87
import java.text.MessageFormat;
98
import java.util.List;
109
import java.util.UUID;
@@ -15,14 +14,14 @@
1514

1615
import com.github.bustedearlobes.themis.Themis;
1716

18-
import net.dv8tion.jda.core.MessageBuilder;
19-
import net.dv8tion.jda.core.entities.Message;
20-
import net.dv8tion.jda.core.entities.Message.Attachment;
21-
import net.dv8tion.jda.core.entities.TextChannel;
22-
import net.dv8tion.jda.core.events.message.guild.GenericGuildMessageEvent;
23-
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
24-
import net.dv8tion.jda.core.events.message.guild.GuildMessageUpdateEvent;
25-
import net.dv8tion.jda.core.hooks.ListenerAdapter;
17+
import net.dv8tion.jda.api.MessageBuilder;
18+
import net.dv8tion.jda.api.entities.Message;
19+
import net.dv8tion.jda.api.entities.Message.Attachment;
20+
import net.dv8tion.jda.api.entities.TextChannel;
21+
import net.dv8tion.jda.api.events.message.guild.GenericGuildMessageEvent;
22+
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
23+
import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
24+
import net.dv8tion.jda.api.hooks.ListenerAdapter;
2625

2726
public class MessageLogger extends ListenerAdapter {
2827
private static final Logger LOG = LoggerFactory.getLogger(MessageLogger.class);
@@ -73,7 +72,7 @@ public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
7372
for(Attachment attachment : attachments) {
7473
try {
7574
File f = getUniqueFile(FilenameUtils.getExtension(attachment.getFileName()));
76-
if(attachment.download(f)) {
75+
if(attachment.downloadToFile().complete(f)) {
7776
LOG.info("Created new attachment for replay at {}", f.getAbsolutePath());
7877
moderationChannel.sendFile(f).complete();
7978
f.delete();
@@ -108,7 +107,7 @@ public void onGuildMessageUpdate(GuildMessageUpdateEvent event) {
108107
for(Attachment attachment : attachments) {
109108
try {
110109
File f = getUniqueFile(FilenameUtils.getExtension(attachment.getFileName()));
111-
if(attachment.download(f)) {
110+
if(attachment.downloadToFile().complete(f)) {
112111
LOG.info("Created new attachment for replay at {}", f.getAbsolutePath());
113112
moderationChannel.sendFile(f).complete();
114113
f.delete();

‎src/main/java/com/github/bustedearlobes/themis/music/AudioPlayerSendHandler.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.github.bustedearlobes.themis.music;
22

3+
import java.nio.ByteBuffer;
4+
35
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
46
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
57

6-
import net.dv8tion.jda.core.audio.AudioSendHandler;
8+
import net.dv8tion.jda.api.audio.AudioSendHandler;
79

810
/**
911
* This is a wrapper around AudioPlayer which makes it behave as an
@@ -30,8 +32,8 @@ public boolean canProvide() {
3032
}
3133

3234
@Override
33-
public byte[] provide20MsAudio() {
34-
return lastFrame.getData();
35+
public ByteBuffer provide20MsAudio() {
36+
return ByteBuffer.wrap(lastFrame.getData());
3537
}
3638

3739
@Override

‎src/main/java/com/github/bustedearlobes/themis/music/GlobalMusicManager.java

Lines changed: 49 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,59 @@
88
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
99
import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
1010
import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
11+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.DefaultSoundCloudDataReader;
12+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.DefaultSoundCloudFormatHandler;
13+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.DefaultSoundCloudHtmlDataLoader;
14+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.DefaultSoundCloudPlaylistLoader;
1115
import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
16+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudDataReader;
17+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudFormatHandler;
18+
import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudHtmlDataLoader;
1219
import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
1320

14-
import net.dv8tion.jda.core.entities.Guild;
21+
import net.dv8tion.jda.api.entities.Guild;
1522

1623
public class GlobalMusicManager {
17-
private List<GuildMusicManager> audioManagers = new ArrayList<>();
18-
private AudioPlayerManager playerManager;
19-
20-
public GlobalMusicManager() {
21-
playerManager = new DefaultAudioPlayerManager();
22-
playerManager.registerSourceManager(new YoutubeAudioSourceManager());
23-
playerManager.registerSourceManager(new SoundCloudAudioSourceManager());
24-
playerManager.registerSourceManager(new BandcampAudioSourceManager());
25-
playerManager.registerSourceManager(new HttpAudioSourceManager());
26-
playerManager.setFrameBufferDuration(50000);
27-
28-
AudioSourceManagers.registerLocalSource(playerManager);
29-
AudioSourceManagers.registerRemoteSources(playerManager);
30-
}
31-
32-
public GuildMusicManager getGuildMusicManager(Guild guild) {
33-
for(GuildMusicManager manager : audioManagers) {
34-
if(manager.getGuild() == guild) {
35-
return manager;
36-
}
37-
}
38-
GuildMusicManager newManager = new GuildMusicManager(guild, playerManager);
39-
guild.getAudioManager().setSendingHandler(newManager.getSendHandler());
40-
audioManagers.add(newManager);
41-
return newManager;
42-
}
43-
44-
public AudioPlayerManager getAudioPlayerManager() {
45-
return playerManager;
46-
}
24+
private List<GuildMusicManager> audioManagers = new ArrayList<>();
25+
private AudioPlayerManager playerManager;
26+
27+
public GlobalMusicManager() {
28+
playerManager = new DefaultAudioPlayerManager();
29+
playerManager.registerSourceManager(new YoutubeAudioSourceManager());
30+
31+
SoundCloudHtmlDataLoader defaultHtmlLoader = new DefaultSoundCloudHtmlDataLoader();
32+
SoundCloudFormatHandler defaultFormatHandler = new DefaultSoundCloudFormatHandler();
33+
SoundCloudDataReader defaultDataReader = new DefaultSoundCloudDataReader();
34+
35+
playerManager.registerSourceManager(new SoundCloudAudioSourceManager(
36+
true,
37+
defaultDataReader,
38+
defaultHtmlLoader,
39+
defaultFormatHandler,
40+
new DefaultSoundCloudPlaylistLoader(defaultHtmlLoader,
41+
defaultDataReader, defaultFormatHandler)));
42+
playerManager.registerSourceManager(new BandcampAudioSourceManager());
43+
playerManager.registerSourceManager(new HttpAudioSourceManager());
44+
playerManager.setFrameBufferDuration(50000);
45+
46+
AudioSourceManagers.registerLocalSource(playerManager);
47+
AudioSourceManagers.registerRemoteSources(playerManager);
48+
}
49+
50+
public GuildMusicManager getGuildMusicManager(Guild guild) {
51+
for (GuildMusicManager manager : audioManagers) {
52+
if (manager.getGuild() == guild) {
53+
return manager;
54+
}
55+
}
56+
GuildMusicManager newManager = new GuildMusicManager(guild, playerManager);
57+
guild.getAudioManager().setSendingHandler(newManager.getSendHandler());
58+
audioManagers.add(newManager);
59+
return newManager;
60+
}
61+
62+
public AudioPlayerManager getAudioPlayerManager() {
63+
return playerManager;
64+
}
4765

4866
}

‎src/main/java/com/github/bustedearlobes/themis/music/GuildMusicManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
44
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
55

6-
import net.dv8tion.jda.core.entities.Guild;
6+
import net.dv8tion.jda.api.entities.Guild;
77

88
public class GuildMusicManager {
99
/**

‎src/main/java/com/github/bustedearlobes/themis/taskmanager/ClearMessagesTask.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;
99

10-
import net.dv8tion.jda.core.entities.Guild;
11-
import net.dv8tion.jda.core.entities.Message;
12-
import net.dv8tion.jda.core.entities.TextChannel;
13-
import net.dv8tion.jda.core.entities.User;
10+
import net.dv8tion.jda.api.entities.Guild;
11+
import net.dv8tion.jda.api.entities.Message;
12+
import net.dv8tion.jda.api.entities.TextChannel;
13+
import net.dv8tion.jda.api.entities.User;
1414

1515
public class ClearMessagesTask extends InstantTask {
1616
private static final long serialVersionUID = 1L;

‎src/main/java/com/github/bustedearlobes/themis/taskmanager/MusicInactivityTask.java

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

88
import com.github.bustedearlobes.themis.music.GuildMusicManager;
99

10-
import net.dv8tion.jda.core.entities.Guild;
10+
import net.dv8tion.jda.api.entities.Guild;
1111

1212
public class MusicInactivityTask extends ScheduledTask {
1313
private static final Logger LOG = LoggerFactory.getLogger(MusicInactivityTask.class);

‎src/main/java/com/github/bustedearlobes/themis/taskmanager/MuteToggleTask.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

11-
import net.dv8tion.jda.core.Permission;
12-
import net.dv8tion.jda.core.entities.Guild;
13-
import net.dv8tion.jda.core.entities.Member;
14-
import net.dv8tion.jda.core.entities.PermissionOverride;
15-
import net.dv8tion.jda.core.entities.TextChannel;
16-
import net.dv8tion.jda.core.entities.User;
11+
import net.dv8tion.jda.api.Permission;
12+
import net.dv8tion.jda.api.entities.Guild;
13+
import net.dv8tion.jda.api.entities.Member;
14+
import net.dv8tion.jda.api.entities.PermissionOverride;
15+
import net.dv8tion.jda.api.entities.TextChannel;
16+
import net.dv8tion.jda.api.entities.User;
1717

1818
public class MuteToggleTask extends ScheduledTask {
1919
private static final long serialVersionUID = 1L;

‎src/main/java/com/github/bustedearlobes/themis/taskmanager/OofShutdownTask.java

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

88
import com.github.bustedearlobes.themis.music.GuildMusicManager;
99

10-
import net.dv8tion.jda.core.entities.Guild;
10+
import net.dv8tion.jda.api.entities.Guild;
1111

1212
public class OofShutdownTask extends ScheduledTask {
1313
private static final Logger LOG = LoggerFactory.getLogger(OofShutdownTask.class);

‎src/main/java/com/github/bustedearlobes/themis/taskmanager/ScheduledTask.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import com.github.bustedearlobes.themis.Themis;
1010
import com.github.bustedearlobes.themis.exceptions.EntityNotFoundException;
1111

12-
import net.dv8tion.jda.core.JDA;
13-
import net.dv8tion.jda.core.entities.Guild;
14-
import net.dv8tion.jda.core.entities.Member;
15-
import net.dv8tion.jda.core.entities.TextChannel;
16-
import net.dv8tion.jda.core.entities.User;
17-
import net.dv8tion.jda.core.hooks.ListenerAdapter;
12+
import net.dv8tion.jda.api.JDA;
13+
import net.dv8tion.jda.api.entities.Guild;
14+
import net.dv8tion.jda.api.entities.Member;
15+
import net.dv8tion.jda.api.entities.TextChannel;
16+
import net.dv8tion.jda.api.entities.User;
17+
import net.dv8tion.jda.api.hooks.ListenerAdapter;
1818

1919
public abstract class ScheduledTask extends ListenerAdapter implements Runnable, Serializable {
2020
private static final long serialVersionUID = 2L;

0 commit comments

Comments
 (0)