Skip to content

Commit 0f52bbd

Browse files
jagroshjagrosh
committed
updated package name
fixed soundcloud search url bug fixed playlist permission bug added info to playlists command bumped versions
1 parent 61c6203 commit 0f52bbd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+173
-166
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A Discord music bot with a clean interface, and that is easy to set up and run y
1010
* Clean and beautiful menus
1111
* Channel-topic playback bar
1212
* Supports many sites, including Youtube, Soundcloud, and more
13-
* Playlist support
13+
* Playlist support (both web/youtube, and local)
1414

1515
# Setup
1616
Please see the [Setup Page](https://github.com/jagrosh/MusicBot/wiki/Setup) in the wiki to run this bot yourself!

‎pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>me.jagrosh</groupId>
4+
<groupId>com.jagrosh</groupId>
55
<artifactId>JMusicBot</artifactId>
6-
<version>0.0.3</version>
6+
<version>0.0.4</version>
77
<packaging>jar</packaging>
88

99
<repositories>
@@ -23,17 +23,17 @@
2323
<dependency>
2424
<groupId>net.dv8tion</groupId>
2525
<artifactId>JDA</artifactId>
26-
<version>3.0.0_162</version>
26+
<version>3.0.0_168</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>com.sedmelluq</groupId>
3030
<artifactId>lavaplayer</artifactId>
31-
<version>1.2.34</version>
31+
<version>1.2.36</version>
3232
</dependency>
3333
<dependency>
34-
<groupId>me.jagrosh</groupId>
34+
<groupId>com.jagrosh</groupId>
3535
<artifactId>JDA-Utilities</artifactId>
36-
<version>1.0</version>
36+
<version>1.1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.json</groupId>
@@ -52,7 +52,7 @@
5252
<archive>
5353
<manifest>
5454
<addClasspath>true</addClasspath>
55-
<mainClass>me.jagrosh.jmusicbot.JMusicBot</mainClass>
55+
<mainClass>com.jagrosh.jmusicbot.JMusicBot</mainClass>
5656
</manifest>
5757
</archive>
5858
</configuration>

src/main/java/me/jagrosh/jmusicbot/Bot.java renamed to src/main/java/com/jagrosh/jmusicbot/Bot.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot;
16+
package com.jagrosh.jmusicbot;
1717

1818
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
1919
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
@@ -27,12 +27,12 @@
2727
import java.util.concurrent.Executors;
2828
import java.util.concurrent.ScheduledExecutorService;
2929
import java.util.concurrent.TimeUnit;
30-
import me.jagrosh.jdautilities.commandclient.Command.Category;
31-
import me.jagrosh.jdautilities.commandclient.CommandEvent;
32-
import me.jagrosh.jdautilities.waiter.EventWaiter;
33-
import me.jagrosh.jmusicbot.audio.AudioHandler;
34-
import me.jagrosh.jmusicbot.gui.GUI;
35-
import me.jagrosh.jmusicbot.utils.FormatUtil;
30+
import com.jagrosh.jdautilities.commandclient.Command.Category;
31+
import com.jagrosh.jdautilities.commandclient.CommandEvent;
32+
import com.jagrosh.jdautilities.waiter.EventWaiter;
33+
import com.jagrosh.jmusicbot.audio.AudioHandler;
34+
import com.jagrosh.jmusicbot.gui.GUI;
35+
import com.jagrosh.jmusicbot.utils.FormatUtil;
3636
import net.dv8tion.jda.core.JDA;
3737
import net.dv8tion.jda.core.Permission;
3838
import net.dv8tion.jda.core.entities.Guild;
@@ -152,7 +152,7 @@ private void updateTopic(Guild guild, AudioHandler handler)
152152
{
153153
String otherText;
154154
if(tchan.getTopic()==null || tchan.getTopic().isEmpty())
155-
otherText = "";
155+
otherText = "\u200B";
156156
else if(tchan.getTopic().contains("\u200B"))
157157
otherText = tchan.getTopic().substring(tchan.getTopic().indexOf("\u200B"));
158158
else
@@ -293,7 +293,7 @@ public void setVolume(Guild guild, int volume)
293293
public void clearTextChannel(Guild guild)
294294
{
295295
Settings s = getSettings(guild);
296-
if(s!=null)
296+
if(s!=Settings.DEFAULT_SETTINGS)
297297
{
298298
if(s.getVoiceId()==null && s.getRoleId()==null)
299299
settings.remove(guild.getId());
@@ -306,7 +306,7 @@ public void clearTextChannel(Guild guild)
306306
public void clearVoiceChannel(Guild guild)
307307
{
308308
Settings s = getSettings(guild);
309-
if(s!=null)
309+
if(s!=Settings.DEFAULT_SETTINGS)
310310
{
311311
if(s.getTextId()==null && s.getRoleId()==null)
312312
settings.remove(guild.getId());
@@ -319,7 +319,7 @@ public void clearVoiceChannel(Guild guild)
319319
public void clearRole(Guild guild)
320320
{
321321
Settings s = getSettings(guild);
322-
if(s!=null)
322+
if(s!=Settings.DEFAULT_SETTINGS)
323323
{
324324
if(s.getVoiceId()==null && s.getTextId()==null)
325325
settings.remove(guild.getId());

src/main/java/me/jagrosh/jmusicbot/Config.java renamed to src/main/java/com/jagrosh/jmusicbot/Config.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot;
16+
package com.jagrosh.jmusicbot;
1717

1818
import java.io.IOException;
1919
import java.nio.file.Files;
@@ -124,7 +124,8 @@ public Config(boolean nogui)
124124
try {
125125
Files.write(Paths.get("config.txt"), builder.toString().trim().getBytes());
126126
} catch(IOException ex) {
127-
alert("Failed to write new config options to config.txt: "+ex);
127+
alert("Failed to write new config options to config.txt: "+ex
128+
+ "\nPlease make sure that the files are not on your desktop or some other restricted area.");
128129
}
129130
}
130131
}

src/main/java/me/jagrosh/jmusicbot/JMusicBot.java renamed to src/main/java/com/jagrosh/jmusicbot/JMusicBot.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot;
16+
package com.jagrosh.jmusicbot;
1717

1818
import java.awt.Color;
1919
import javax.security.auth.login.LoginException;
20-
import me.jagrosh.jdautilities.commandclient.CommandClient;
21-
import me.jagrosh.jdautilities.commandclient.CommandClientBuilder;
22-
import me.jagrosh.jdautilities.commandclient.examples.*;
23-
import me.jagrosh.jdautilities.waiter.EventWaiter;
24-
import me.jagrosh.jmusicbot.commands.*;
25-
import me.jagrosh.jmusicbot.gui.GUI;
20+
import com.jagrosh.jdautilities.commandclient.CommandClient;
21+
import com.jagrosh.jdautilities.commandclient.CommandClientBuilder;
22+
import com.jagrosh.jdautilities.commandclient.examples.*;
23+
import com.jagrosh.jdautilities.waiter.EventWaiter;
24+
import com.jagrosh.jmusicbot.commands.*;
25+
import com.jagrosh.jmusicbot.gui.GUI;
2626
import net.dv8tion.jda.core.AccountType;
2727
import net.dv8tion.jda.core.JDABuilder;
2828
import net.dv8tion.jda.core.OnlineStatus;

src/main/java/me/jagrosh/jmusicbot/Settings.java renamed to src/main/java/com/jagrosh/jmusicbot/Settings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot;
16+
package com.jagrosh.jmusicbot;
1717

1818
/**
1919
*

src/main/java/me/jagrosh/jmusicbot/audio/AudioHandler.java renamed to src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot.audio;
16+
package com.jagrosh.jmusicbot.audio;
1717

1818
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
1919
import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
@@ -24,9 +24,9 @@
2424
import java.util.LinkedList;
2525
import java.util.List;
2626
import java.util.Set;
27-
import me.jagrosh.jmusicbot.Bot;
28-
import me.jagrosh.jmusicbot.playlist.Playlist;
29-
import me.jagrosh.jmusicbot.queue.FairQueue;
27+
import com.jagrosh.jmusicbot.Bot;
28+
import com.jagrosh.jmusicbot.playlist.Playlist;
29+
import com.jagrosh.jmusicbot.queue.FairQueue;
3030
import net.dv8tion.jda.core.audio.AudioSendHandler;
3131
import net.dv8tion.jda.core.entities.Guild;
3232
import net.dv8tion.jda.core.entities.User;

src/main/java/me/jagrosh/jmusicbot/audio/QueuedTrack.java renamed to src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot.audio;
16+
package com.jagrosh.jmusicbot.audio;
1717

1818
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
19-
import me.jagrosh.jmusicbot.queue.Queueable;
20-
import me.jagrosh.jmusicbot.utils.FormatUtil;
19+
import com.jagrosh.jmusicbot.queue.Queueable;
20+
import com.jagrosh.jmusicbot.utils.FormatUtil;
2121

2222
/**
2323
*

src/main/java/me/jagrosh/jmusicbot/commands/ForceskipCmd.java renamed to src/main/java/com/jagrosh/jmusicbot/commands/ForceskipCmd.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot.commands;
16+
package com.jagrosh.jmusicbot.commands;
1717

18-
import me.jagrosh.jdautilities.commandclient.CommandEvent;
19-
import me.jagrosh.jmusicbot.Bot;
20-
import me.jagrosh.jmusicbot.audio.AudioHandler;
18+
import com.jagrosh.jdautilities.commandclient.CommandEvent;
19+
import com.jagrosh.jmusicbot.Bot;
20+
import com.jagrosh.jmusicbot.audio.AudioHandler;
2121
import net.dv8tion.jda.core.entities.User;
2222

2323
/**

src/main/java/me/jagrosh/jmusicbot/commands/MusicCommand.java renamed to src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.jagrosh.jmusicbot.commands;
16+
package com.jagrosh.jmusicbot.commands;
1717

18-
import me.jagrosh.jdautilities.commandclient.Command;
19-
import me.jagrosh.jdautilities.commandclient.CommandEvent;
20-
import me.jagrosh.jmusicbot.Bot;
21-
import me.jagrosh.jmusicbot.Settings;
22-
import me.jagrosh.jmusicbot.audio.AudioHandler;
18+
import com.jagrosh.jdautilities.commandclient.Command;
19+
import com.jagrosh.jdautilities.commandclient.CommandEvent;
20+
import com.jagrosh.jmusicbot.Bot;
21+
import com.jagrosh.jmusicbot.Settings;
22+
import com.jagrosh.jmusicbot.audio.AudioHandler;
2323
import net.dv8tion.jda.core.entities.GuildVoiceState;
2424
import net.dv8tion.jda.core.entities.TextChannel;
2525
import net.dv8tion.jda.core.entities.VoiceChannel;

0 commit comments

Comments
 (0)