anthony
/
Infernote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

modified: CNAME

Browse Source 
modified:   pom.xml
	renamed:    scripts/run_jmusicbot.sh -> scripts/run_infernote.sh
	renamed:    src/main/java/com/jagrosh/jmusicbot/Bot.java -> src/main/java/su/cif/infernote/Bot.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/BotConfig.java -> src/main/java/su/cif/infernote/BotConfig.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/JMusicBot.java -> src/main/java/su/cif/infernote/Infernote.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/Listener.java -> src/main/java/su/cif/infernote/Listener.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java -> src/main/java/su/cif/infernote/audio/AloneInVoiceHandler.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java -> src/main/java/su/cif/infernote/audio/AudioHandler.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java -> src/main/java/su/cif/infernote/audio/NowplayingHandler.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java -> src/main/java/su/cif/infernote/audio/PlayerManager.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java -> src/main/java/su/cif/infernote/audio/QueuedTrack.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java -> src/main/java/su/cif/infernote/audio/RequestMetadata.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java -> src/main/java/su/cif/infernote/audio/TransformativeAudioSourceManager.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java -> src/main/java/su/cif/infernote/commands/AdminCommand.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java -> src/main/java/su/cif/infernote/commands/DJCommand.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java -> src/main/java/su/cif/infernote/commands/MusicCommand.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java -> src/main/java/su/cif/infernote/commands/OwnerCommand.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java -> src/main/java/su/cif/infernote/commands/admin/PrefixCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java -> src/main/java/su/cif/infernote/commands/admin/QueueTypeCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java -> src/main/java/su/cif/infernote/commands/admin/SetdjCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java -> src/main/java/su/cif/infernote/commands/admin/SettcCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java -> src/main/java/su/cif/infernote/commands/admin/SetvcCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java -> src/main/java/su/cif/infernote/commands/admin/SkipratioCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java -> src/main/java/su/cif/infernote/commands/dj/ForceRemoveCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java -> src/main/java/su/cif/infernote/commands/dj/ForceskipCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java -> src/main/java/su/cif/infernote/commands/dj/MoveTrackCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java -> src/main/java/su/cif/infernote/commands/dj/PauseCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java -> src/main/java/su/cif/infernote/commands/dj/PlaynextCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java -> src/main/java/su/cif/infernote/commands/dj/RepeatCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java -> src/main/java/su/cif/infernote/commands/dj/SkiptoCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java -> src/main/java/su/cif/infernote/commands/dj/StopCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java -> src/main/java/su/cif/infernote/commands/dj/VolumeCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java -> src/main/java/su/cif/infernote/commands/general/SettingsCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java -> src/main/java/su/cif/infernote/commands/music/LyricsCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java -> src/main/java/su/cif/infernote/commands/music/NowplayingCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java -> src/main/java/su/cif/infernote/commands/music/PlayCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java -> src/main/java/su/cif/infernote/commands/music/PlaylistsCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java -> src/main/java/su/cif/infernote/commands/music/QueueCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java -> src/main/java/su/cif/infernote/commands/music/RemoveCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java -> src/main/java/su/cif/infernote/commands/music/SCSearchCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java -> src/main/java/su/cif/infernote/commands/music/SearchCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java -> src/main/java/su/cif/infernote/commands/music/SeekCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java -> src/main/java/su/cif/infernote/commands/music/ShuffleCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java -> src/main/java/su/cif/infernote/commands/music/SkipCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java -> src/main/java/su/cif/infernote/commands/owner/AutoplaylistCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java -> src/main/java/su/cif/infernote/commands/owner/DebugCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java -> src/main/java/su/cif/infernote/commands/owner/EvalCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java -> src/main/java/su/cif/infernote/commands/owner/PlaylistCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetavatarCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetgameCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetnameCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetstatusCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java -> src/main/java/su/cif/infernote/commands/owner/ShutdownCmd.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/entities/Pair.java -> src/main/java/su/cif/infernote/entities/Pair.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java -> src/main/java/su/cif/infernote/entities/Prompt.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java -> src/main/java/su/cif/infernote/gui/ConsolePanel.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/gui/GUI.java -> src/main/java/su/cif/infernote/gui/GUI.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java -> src/main/java/su/cif/infernote/gui/TextAreaOutputStream.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java -> src/main/java/su/cif/infernote/playlist/PlaylistLoader.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java -> src/main/java/su/cif/infernote/queue/AbstractQueue.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java -> src/main/java/su/cif/infernote/queue/FairQueue.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java -> src/main/java/su/cif/infernote/queue/LinearQueue.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java -> src/main/java/su/cif/infernote/queue/QueueSupplier.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java -> src/main/java/su/cif/infernote/queue/Queueable.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java -> src/main/java/su/cif/infernote/settings/QueueType.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java -> src/main/java/su/cif/infernote/settings/RepeatMode.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/settings/Settings.java -> src/main/java/su/cif/infernote/settings/Settings.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java -> src/main/java/su/cif/infernote/settings/SettingsManager.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java -> src/main/java/su/cif/infernote/utils/FormatUtil.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java -> src/main/java/su/cif/infernote/utils/OtherUtil.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java -> src/main/java/su/cif/infernote/utils/TimeUtil.java
	renamed:    src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java -> src/main/java/su/cif/infernote/utils/YouTubeUtil.java
	renamed:    src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java -> src/test/java/su/cif/infernote/FairQueueTest.java
	renamed:    src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java -> src/test/java/su/cif/infernote/TimeUtilTest.java
main
anthony 5 months ago
parent 6cd913e5af
commit 7502645325
75 changed files with 302 additions and 302 deletions
Show Stats Download Patch File Download Diff File

2
CNAME
Unescape Escape View File

@ -1 +1 @@
jmusicbot.com cif.su

6
pom.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.jagrosh</groupId> <groupId>su.cif</groupId>
<artifactId>JMusicBot</artifactId> <artifactId>Infernote</artifactId>
<version>Snapshot</version> <version>Snapshot</version>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -135,7 +135,7 @@
</transformer> </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries> <manifestEntries>
<Main-Class>com.jagrosh.jmusicbot.JMusicBot</Main-Class> <Main-Class>su.cif.infernote.Infernote</Main-Class>
<Specification-Title>${project.artifactId}</Specification-Title> <Specification-Title>${project.artifactId}</Specification-Title>
<Specification-Version>${project.version}</Specification-Version> <Specification-Version>${project.version}</Specification-Version>
<Implementation-Title>${project.artifactId}</Implementation-Title> <Implementation-Title>${project.artifactId}</Implementation-Title>

2
scripts/run_jmusicbot.sh → scripts/run_infernote.sh
Unescape Escape View File

@ -10,7 +10,7 @@ LOOP=true
download() { download() {
if [ $DOWNLOAD = true ]; then if [ $DOWNLOAD = true ]; then
URL=$(curl -s https://api.github.com/repos/jagrosh/MusicBot/releases/latest \ URL=$(curl -s https://code.cif.su/api/v1/repos/anthony/infernote/releases/latest \
| grep -i "browser_download_url.*\.jar" \ | grep -i "browser_download_url.*\.jar" \
| sed 's/.*\(http.*\)"/\1/') | sed 's/.*\(http.*\)"/\1/')
FILENAME=$(echo $URL | sed 's/.*\/\([^\/]*\)/\1/') FILENAME=$(echo $URL | sed 's/.*\/\([^\/]*\)/\1/')

16
src/main/java/com/jagrosh/jmusicbot/Bot.java → src/main/java/su/cif/infernote/Bot.java
Unescape Escape View File

@ -1,15 +1,15 @@
package com.jagrosh.jmusicbot; package su.cif.infernote;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import com.jagrosh.jdautilities.commons.waiter.EventWaiter; import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
import com.jagrosh.jmusicbot.audio.AloneInVoiceHandler; import su.cif.infernote.audio.AloneInVoiceHandler;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.NowplayingHandler; import su.cif.infernote.audio.NowplayingHandler;
import com.jagrosh.jmusicbot.audio.PlayerManager; import su.cif.infernote.audio.PlayerManager;
import com.jagrosh.jmusicbot.gui.GUI; import su.cif.infernote.gui.GUI;
import com.jagrosh.jmusicbot.playlist.PlaylistLoader; import su.cif.infernote.playlist.PlaylistLoader;
import com.jagrosh.jmusicbot.settings.SettingsManager; import su.cif.infernote.settings.SettingsManager;
import java.util.Objects; import java.util.Objects;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.entities.Activity;

22
src/main/java/com/jagrosh/jmusicbot/BotConfig.java → src/main/java/su/cif/infernote/BotConfig.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot; package su.cif.infernote;
import com.jagrosh.jmusicbot.entities.Prompt; import su.cif.infernote.entities.Prompt;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.jagrosh.jmusicbot.utils.YouTubeUtil; import su.cif.infernote.utils.YouTubeUtil;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.IpBlock; import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.IpBlock;
import com.typesafe.config.*; import com.typesafe.config.*;
@ -19,8 +19,8 @@ public class BotConfig
{ {
private final Prompt prompt; private final Prompt prompt;
private final static String CONTEXT = "Config"; private final static String CONTEXT = "Config";
private final static String START_TOKEN = "/// START OF JMUSICBOT CONFIG ///"; private final static String START_TOKEN = "/// START OF CONFIG ///";
private final static String END_TOKEN = "/// END OF JMUSICBOT CONFIG ///"; private final static String END_TOKEN = "/// END OF CONFIG ///";
private Path path = null; private Path path = null;
private String token, prefix, altprefix, helpWord, playlistsFolder, logLevel, private String token, prefix, altprefix, helpWord, playlistsFolder, logLevel,
@ -168,7 +168,7 @@ public class BotConfig
private static String loadDefaultConfig() private static String loadDefaultConfig()
{ {
String original = OtherUtil.loadResource(new JMusicBot(), "/reference.conf"); String original = OtherUtil.loadResource(new Infernote(), "/reference.conf");
return original==null return original==null
? "token = BOT_TOKEN_HERE\r\nowner = 0 // OWNER ID" ? "token = BOT_TOKEN_HERE\r\nowner = 0 // OWNER ID"
: original.substring(original.indexOf(START_TOKEN)+START_TOKEN.length(), original.indexOf(END_TOKEN)).trim(); : original.substring(original.indexOf(START_TOKEN)+START_TOKEN.length(), original.indexOf(END_TOKEN)).trim();
@ -189,17 +189,17 @@ public class BotConfig
public static void writeDefaultConfig() public static void writeDefaultConfig()
{ {
Prompt prompt = new Prompt(null, null, true, true); Prompt prompt = new Prompt(null, null, true, true);
prompt.alert(Prompt.Level.INFO, "JMusicBot Config", "Generating default config file"); prompt.alert(Prompt.Level.INFO, "Infernote Config", "Generating default config file");
Path path = BotConfig.getConfigPath(); Path path = BotConfig.getConfigPath();
byte[] bytes = BotConfig.loadDefaultConfig().getBytes(); byte[] bytes = BotConfig.loadDefaultConfig().getBytes();
try try
{ {
prompt.alert(Prompt.Level.INFO, "JMusicBot Config", "Writing default config file to " + path.toAbsolutePath().toString()); prompt.alert(Prompt.Level.INFO, "Infernote Config", "Writing default config file to " + path.toAbsolutePath().toString());
Files.write(path, bytes); Files.write(path, bytes);
} }
catch(Exception ex) catch(Exception ex)
{ {
prompt.alert(Prompt.Level.ERROR, "JMusicBot Config", "An error occurred writing the default config file: " + ex.getMessage()); prompt.alert(Prompt.Level.ERROR, "Infernote Config", "An error occurred writing the default config file: " + ex.getMessage());
} }
} }

36
src/main/java/com/jagrosh/jmusicbot/JMusicBot.java → src/main/java/su/cif/infernote/Infernote.java
Unescape Escape View File

@ -1,18 +1,18 @@
package com.jagrosh.jmusicbot; package su.cif.infernote;
import com.jagrosh.jdautilities.command.CommandClient; import com.jagrosh.jdautilities.command.CommandClient;
import com.jagrosh.jdautilities.command.CommandClientBuilder; import com.jagrosh.jdautilities.command.CommandClientBuilder;
import com.jagrosh.jdautilities.commons.waiter.EventWaiter; import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
import com.jagrosh.jdautilities.examples.command.*; import com.jagrosh.jdautilities.examples.command.*;
import com.jagrosh.jmusicbot.commands.admin.*; import su.cif.infernote.commands.admin.*;
import com.jagrosh.jmusicbot.commands.dj.*; import su.cif.infernote.commands.dj.*;
import com.jagrosh.jmusicbot.commands.general.*; import su.cif.infernote.commands.general.*;
import com.jagrosh.jmusicbot.commands.music.*; import su.cif.infernote.commands.music.*;
import com.jagrosh.jmusicbot.commands.owner.*; import su.cif.infernote.commands.owner.*;
import com.jagrosh.jmusicbot.entities.Prompt; import su.cif.infernote.entities.Prompt;
import com.jagrosh.jmusicbot.gui.GUI; import su.cif.infernote.gui.GUI;
import com.jagrosh.jmusicbot.settings.SettingsManager; import su.cif.infernote.settings.SettingsManager;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import java.awt.Color; import java.awt.Color;
import java.util.Arrays; import java.util.Arrays;
import javax.security.auth.login.LoginException; import javax.security.auth.login.LoginException;
@ -25,9 +25,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Level;
public class JMusicBot public class Infernote
{ {
public final static Logger LOG = LoggerFactory.getLogger(JMusicBot.class); public final static Logger LOG = LoggerFactory.getLogger(Infernote.class);
public final static Permission[] RECOMMENDED_PERMS = {Permission.MESSAGE_READ, Permission.MESSAGE_WRITE, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION, public final static Permission[] RECOMMENDED_PERMS = {Permission.MESSAGE_READ, Permission.MESSAGE_WRITE, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION,
Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI, Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI,
Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE}; Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE};
@ -52,7 +52,7 @@ public class JMusicBot
private static void startBot() private static void startBot()
{ {
// create prompt to handle startup // create prompt to handle startup
Prompt prompt = new Prompt("JMusicBot"); Prompt prompt = new Prompt("Infernote");
// startup checks // startup checks
OtherUtil.checkVersion(prompt); OtherUtil.checkVersion(prompt);
@ -112,7 +112,7 @@ public class JMusicBot
String unsupportedReason = OtherUtil.getUnsupportedBotReason(jda); String unsupportedReason = OtherUtil.getUnsupportedBotReason(jda);
if (unsupportedReason != null) if (unsupportedReason != null)
{ {
prompt.alert(Prompt.Level.ERROR, "JMusicBot", "JMusicBot cannot be run on this Discord bot: " + unsupportedReason); prompt.alert(Prompt.Level.ERROR, "Infernote", "Infernote cannot be run on this Discord bot: " + unsupportedReason);
try{ Thread.sleep(5000);}catch(InterruptedException ignored){} // this is awful but until we have a better way... try{ Thread.sleep(5000);}catch(InterruptedException ignored){} // this is awful but until we have a better way...
jda.shutdown(); jda.shutdown();
System.exit(1); System.exit(1);
@ -123,27 +123,27 @@ public class JMusicBot
// message content intent // message content intent
if(!"@mention".equals(config.getPrefix())) if(!"@mention".equals(config.getPrefix()))
{ {
LOG.info("JMusicBot", "You currently have a custom prefix set. " LOG.info("Infernote", "You currently have a custom prefix set. "
+ "If your prefix is not working, make sure that the 'MESSAGE CONTENT INTENT' is Enabled " + "If your prefix is not working, make sure that the 'MESSAGE CONTENT INTENT' is Enabled "
+ "on https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot"); + "on https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot");
} }
} }
catch (LoginException ex) catch (LoginException ex)
{ {
prompt.alert(Prompt.Level.ERROR, "JMusicBot", ex + "\nPlease make sure you are " prompt.alert(Prompt.Level.ERROR, "Infernote", ex + "\nPlease make sure you are "
+ "editing the correct config.txt file, and that you have used the " + "editing the correct config.txt file, and that you have used the "
+ "correct token (not the 'secret'!)\nConfig Location: " + config.getConfigLocation()); + "correct token (not the 'secret'!)\nConfig Location: " + config.getConfigLocation());
System.exit(1); System.exit(1);
} }
catch(IllegalArgumentException ex) catch(IllegalArgumentException ex)
{ {
prompt.alert(Prompt.Level.ERROR, "JMusicBot", "Some aspect of the configuration is " prompt.alert(Prompt.Level.ERROR, "Infernote", "Some aspect of the configuration is "
+ "invalid: " + ex + "\nConfig Location: " + config.getConfigLocation()); + "invalid: " + ex + "\nConfig Location: " + config.getConfigLocation());
System.exit(1); System.exit(1);
} }
catch(ErrorResponseException ex) catch(ErrorResponseException ex)
{ {
prompt.alert(Prompt.Level.ERROR, "JMusicBot", ex + "\nInvalid reponse returned when " prompt.alert(Prompt.Level.ERROR, "Infernote", ex + "\nInvalid reponse returned when "
+ "attempting to connect, please make sure you're connected to the internet"); + "attempting to connect, please make sure you're connected to the internet");
System.exit(1); System.exit(1);
} }

8
src/main/java/com/jagrosh/jmusicbot/Listener.java → src/main/java/su/cif/infernote/Listener.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.jagrosh.jmusicbot; package su.cif.infernote;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
@ -32,7 +32,7 @@ public class Listener extends ListenerAdapter
{ {
Logger log = LoggerFactory.getLogger("MusicBot"); Logger log = LoggerFactory.getLogger("MusicBot");
log.warn("This bot is not on any guilds! Use the following link to add the bot to your guilds!"); log.warn("This bot is not on any guilds! Use the following link to add the bot to your guilds!");
log.warn(event.getJDA().getInviteUrl(JMusicBot.RECOMMENDED_PERMS)); log.warn(event.getJDA().getInviteUrl(Infernote.RECOMMENDED_PERMS));
} }
credit(event.getJDA()); credit(event.getJDA());
event.getJDA().getGuilds().forEach((guild) -> event.getJDA().getGuilds().forEach((guild) ->
@ -101,7 +101,7 @@ public class Listener extends ListenerAdapter
if(bot.getConfig().getDBots()) if(bot.getConfig().getDBots())
return; return;
jda.getTextChannelById(119222314964353025L) jda.getTextChannelById(119222314964353025L)
.sendMessage("This account is running JMusicBot. Please do not list bot clones on this server, <@"+bot.getConfig().getOwnerId()+">.").complete(); .sendMessage("This account is running Infernote. Please do not list bot clones on this server, <@"+bot.getConfig().getOwnerId()+">.").complete();
dbots.leave().queue(); dbots.leave().queue();
} }
} }

4
src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java → src/main/java/su/cif/infernote/audio/AloneInVoiceHandler.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;

16
src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java → src/main/java/su/cif/infernote/audio/AudioHandler.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; import su.cif.infernote.playlist.PlaylistLoader.Playlist;
import com.jagrosh.jmusicbot.queue.AbstractQueue; import su.cif.infernote.queue.AbstractQueue;
import com.jagrosh.jmusicbot.settings.QueueType; import su.cif.infernote.settings.QueueType;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.jagrosh.jmusicbot.settings.RepeatMode; import su.cif.infernote.settings.RepeatMode;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter; import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
@ -15,8 +15,8 @@ import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack; import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;

8
src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java → src/main/java/su/cif/infernote/audio/NowplayingHandler.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.entities.Pair; import su.cif.infernote.entities.Pair;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;

8
src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java → src/main/java/su/cif/infernote/audio/PlayerManager.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.dunctebot.sourcemanagers.DuncteBotSources; import com.dunctebot.sourcemanagers.DuncteBotSources;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.BotConfig; import su.cif.infernote.BotConfig;
import com.jagrosh.jmusicbot.utils.YouTubeUtil; import su.cif.infernote.utils.YouTubeUtil;
import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry; import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;

6
src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java → src/main/java/su/cif/infernote/audio/QueuedTrack.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import com.jagrosh.jmusicbot.queue.Queueable; import su.cif.infernote.queue.Queueable;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;
public class QueuedTrack implements Queueable public class QueuedTrack implements Queueable

4
src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java → src/main/java/su/cif/infernote/audio/RequestMetadata.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;

2
src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java → src/main/java/su/cif/infernote/audio/TransformativeAudioSourceManager.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.audio; package su.cif.infernote.audio;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.track.AudioItem; import com.sedmelluq.discord.lavaplayer.track.AudioItem;

2
src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java → src/main/java/su/cif/infernote/commands/AdminCommand.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.commands; package su.cif.infernote.commands;
import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.Command;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;

6
src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java → src/main/java/su/cif/infernote/commands/DJCommand.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.jagrosh.jmusicbot.commands; package su.cif.infernote.commands;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;

8
src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java → src/main/java/su/cif/infernote/commands/MusicCommand.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.commands; package su.cif.infernote.commands;
import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.Command;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import net.dv8tion.jda.api.entities.GuildVoiceState; import net.dv8tion.jda.api.entities.GuildVoiceState;
import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.entities.VoiceChannel;

2
src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java → src/main/java/su/cif/infernote/commands/OwnerCommand.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.commands; package su.cif.infernote.commands;
import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.Command;

8
src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java → src/main/java/su/cif/infernote/commands/admin/PrefixCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.admin; package su.cif.infernote.commands.admin;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.AdminCommand; import su.cif.infernote.commands.AdminCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
public class PrefixCmd extends AdminCommand public class PrefixCmd extends AdminCommand
{ {

12
src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java → src/main/java/su/cif/infernote/commands/admin/QueueTypeCmd.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.commands.admin; package su.cif.infernote.commands.admin;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.AdminCommand; import su.cif.infernote.commands.AdminCommand;
import com.jagrosh.jmusicbot.settings.QueueType; import su.cif.infernote.settings.QueueType;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
public class QueueTypeCmd extends AdminCommand public class QueueTypeCmd extends AdminCommand
{ {

10
src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java → src/main/java/su/cif/infernote/commands/admin/SetdjCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.admin; package su.cif.infernote.commands.admin;
import java.util.List; import java.util.List;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.commons.utils.FinderUtil; import com.jagrosh.jdautilities.commons.utils.FinderUtil;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.AdminCommand; import su.cif.infernote.commands.AdminCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;
public class SetdjCmd extends AdminCommand public class SetdjCmd extends AdminCommand

10
src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java → src/main/java/su/cif/infernote/commands/admin/SettcCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.admin; package su.cif.infernote.commands.admin;
import java.util.List; import java.util.List;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.commons.utils.FinderUtil; import com.jagrosh.jdautilities.commons.utils.FinderUtil;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.AdminCommand; import su.cif.infernote.commands.AdminCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.TextChannel;
public class SettcCmd extends AdminCommand public class SettcCmd extends AdminCommand

10
src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java → src/main/java/su/cif/infernote/commands/admin/SetvcCmd.java
Unescape Escape View File

@ -1,13 +1,13 @@
package com.jagrosh.jmusicbot.commands.admin; package su.cif.infernote.commands.admin;
import java.util.List; import java.util.List;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.commons.utils.FinderUtil; import com.jagrosh.jdautilities.commons.utils.FinderUtil;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.AdminCommand; import su.cif.infernote.commands.AdminCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.entities.VoiceChannel;
public class SetvcCmd extends AdminCommand public class SetvcCmd extends AdminCommand

8
src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java → src/main/java/su/cif/infernote/commands/admin/SkipratioCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.admin; package su.cif.infernote.commands.admin;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.AdminCommand; import su.cif.infernote.commands.AdminCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
public class SkipratioCmd extends AdminCommand public class SkipratioCmd extends AdminCommand
{ {

10
src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java → src/main/java/su/cif/infernote/commands/dj/ForceRemoveCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.commons.utils.FinderUtil; import com.jagrosh.jdautilities.commons.utils.FinderUtil;
import com.jagrosh.jdautilities.menu.OrderedMenu; import com.jagrosh.jdautilities.menu.OrderedMenu;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;

12
src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java → src/main/java/su/cif/infernote/commands/dj/ForceskipCmd.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.RequestMetadata; import su.cif.infernote.audio.RequestMetadata;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
public class ForceskipCmd extends DJCommand public class ForceskipCmd extends DJCommand
{ {

12
src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java → src/main/java/su/cif/infernote/commands/dj/MoveTrackCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack; import su.cif.infernote.audio.QueuedTrack;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.queue.AbstractQueue; import su.cif.infernote.queue.AbstractQueue;
/** /**
* Command that provides users the ability to move a track in the playlist. * Command that provides users the ability to move a track in the playlist.

8
src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java → src/main/java/su/cif/infernote/commands/dj/PauseCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
public class PauseCmd extends DJCommand public class PauseCmd extends DJCommand
{ {

16
src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java → src/main/java/su/cif/infernote/commands/dj/PlaynextCmd.java
Unescape Escape View File

@ -1,13 +1,13 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack; import su.cif.infernote.audio.QueuedTrack;
import com.jagrosh.jmusicbot.audio.RequestMetadata; import su.cif.infernote.audio.RequestMetadata;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;

10
src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java → src/main/java/su/cif/infernote/commands/dj/RepeatCmd.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.settings.RepeatMode; import su.cif.infernote.settings.RepeatMode;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
public class RepeatCmd extends DJCommand public class RepeatCmd extends DJCommand
{ {

8
src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java → src/main/java/su/cif/infernote/commands/dj/SkiptoCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
public class SkiptoCmd extends DJCommand public class SkiptoCmd extends DJCommand
{ {

8
src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java → src/main/java/su/cif/infernote/commands/dj/StopCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
public class StopCmd extends DJCommand public class StopCmd extends DJCommand
{ {

12
src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java → src/main/java/su/cif/infernote/commands/dj/VolumeCmd.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.commands.dj; package su.cif.infernote.commands.dj;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
public class VolumeCmd extends DJCommand public class VolumeCmd extends DJCommand
{ {

12
src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java → src/main/java/su/cif/infernote/commands/general/SettingsCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.general; package su.cif.infernote.commands.general;
import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.Command;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.settings.QueueType; import su.cif.infernote.settings.QueueType;
import com.jagrosh.jmusicbot.settings.RepeatMode; import su.cif.infernote.settings.RepeatMode;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;

8
src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java → src/main/java/su/cif/infernote/commands/music/LyricsCmd.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jlyrics.LyricsClient; import com.jagrosh.jlyrics.LyricsClient;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;

8
src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java → src/main/java/su/cif/infernote/commands/music/NowplayingCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message;

20
src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java → src/main/java/su/cif/infernote/commands/music/PlayCmd.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jmusicbot.audio.RequestMetadata; import su.cif.infernote.audio.RequestMetadata;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
@ -10,13 +10,13 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.Command;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.menu.ButtonMenu; import com.jagrosh.jdautilities.menu.ButtonMenu;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack; import su.cif.infernote.audio.QueuedTrack;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; import su.cif.infernote.playlist.PlaylistLoader.Playlist;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message;

6
src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java → src/main/java/su/cif/infernote/commands/music/PlaylistsCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import java.util.List; import java.util.List;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
public class PlaylistsCmd extends MusicCommand public class PlaylistsCmd extends MusicCommand
{ {

20
src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java → src/main/java/su/cif/infernote/commands/music/QueueCmd.java
Unescape Escape View File

@ -1,18 +1,18 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.menu.Paginator; import com.jagrosh.jdautilities.menu.Paginator;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack; import su.cif.infernote.audio.QueuedTrack;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import com.jagrosh.jmusicbot.settings.QueueType; import su.cif.infernote.settings.QueueType;
import com.jagrosh.jmusicbot.settings.RepeatMode; import su.cif.infernote.settings.RepeatMode;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message;

12
src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java → src/main/java/su/cif/infernote/commands/music/RemoveCmd.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack; import su.cif.infernote.audio.QueuedTrack;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;

4
src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java → src/main/java/su/cif/infernote/commands/music/SCSearchCmd.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
public class SCSearchCmd extends SearchCmd public class SCSearchCmd extends SearchCmd
{ {

16
src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java → src/main/java/su/cif/infernote/commands/music/SearchCmd.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jmusicbot.audio.RequestMetadata; import su.cif.infernote.audio.RequestMetadata;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
@ -10,11 +10,11 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.menu.OrderedMenu; import com.jagrosh.jdautilities.menu.OrderedMenu;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.QueuedTrack; import su.cif.infernote.audio.QueuedTrack;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message;

14
src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java → src/main/java/su/cif/infernote/commands/music/SeekCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.RequestMetadata; import su.cif.infernote.audio.RequestMetadata;
import com.jagrosh.jmusicbot.commands.DJCommand; import su.cif.infernote.commands.DJCommand;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java → src/main/java/su/cif/infernote/commands/music/ShuffleCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
public class ShuffleCmd extends MusicCommand public class ShuffleCmd extends MusicCommand
{ {

12
src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java → src/main/java/su/cif/infernote/commands/music/SkipCmd.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.commands.music; package su.cif.infernote.commands.music;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler; import su.cif.infernote.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.RequestMetadata; import su.cif.infernote.audio.RequestMetadata;
import com.jagrosh.jmusicbot.commands.MusicCommand; import su.cif.infernote.commands.MusicCommand;
import com.jagrosh.jmusicbot.utils.FormatUtil; import su.cif.infernote.utils.FormatUtil;
public class SkipCmd extends MusicCommand public class SkipCmd extends MusicCommand
{ {

8
src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java → src/main/java/su/cif/infernote/commands/owner/AutoplaylistCmd.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import com.jagrosh.jmusicbot.settings.Settings; import su.cif.infernote.settings.Settings;
public class AutoplaylistCmd extends OwnerCommand public class AutoplaylistCmd extends OwnerCommand
{ {

10
src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java → src/main/java/su/cif/infernote/commands/owner/DebugCmd.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo; import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import com.sedmelluq.discord.lavaplayer.tools.PlayerLibrary; import com.sedmelluq.discord.lavaplayer.tools.PlayerLibrary;
import net.dv8tion.jda.api.JDAInfo; import net.dv8tion.jda.api.JDAInfo;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
@ -33,7 +33,7 @@ public class DebugCmd extends OwnerCommand
sb.append("```\nSystem Properties:"); sb.append("```\nSystem Properties:");
for(String key: PROPERTIES) for(String key: PROPERTIES)
sb.append("\n ").append(key).append(" = ").append(System.getProperty(key)); sb.append("\n ").append(key).append(" = ").append(System.getProperty(key));
sb.append("\n\nJMusicBot Information:") sb.append("\n\nInfernote Information:")
.append("\n Version = ").append(OtherUtil.getCurrentVersion()) .append("\n Version = ").append(OtherUtil.getCurrentVersion())
.append("\n Owner = ").append(bot.getConfig().getOwnerId()) .append("\n Owner = ").append(bot.getConfig().getOwnerId())
.append("\n Prefix = ").append(bot.getConfig().getPrefix()) .append("\n Prefix = ").append(bot.getConfig().getPrefix())

6
src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java → src/main/java/su/cif/infernote/commands/owner/EvalCmd.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import javax.script.ScriptEngine; import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager; import javax.script.ScriptEngineManager;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.ChannelType;
public class EvalCmd extends OwnerCommand public class EvalCmd extends OwnerCommand

8
src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java → src/main/java/su/cif/infernote/commands/owner/PlaylistCmd.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.Command;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; import su.cif.infernote.playlist.PlaylistLoader.Playlist;
public class PlaylistCmd extends OwnerCommand public class PlaylistCmd extends OwnerCommand
{ {

8
src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java → src/main/java/su/cif/infernote/commands/owner/SetavatarCmd.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import net.dv8tion.jda.api.entities.Icon; import net.dv8tion.jda.api.entities.Icon;
public class SetavatarCmd extends OwnerCommand public class SetavatarCmd extends OwnerCommand

6
src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java → src/main/java/su/cif/infernote/commands/owner/SetgameCmd.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.entities.Activity;
public class SetgameCmd extends OwnerCommand public class SetgameCmd extends OwnerCommand

6
src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java → src/main/java/su/cif/infernote/commands/owner/SetnameCmd.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import net.dv8tion.jda.api.exceptions.RateLimitedException; import net.dv8tion.jda.api.exceptions.RateLimitedException;
public class SetnameCmd extends OwnerCommand public class SetnameCmd extends OwnerCommand

6
src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java → src/main/java/su/cif/infernote/commands/owner/SetstatusCmd.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.OnlineStatus;
public class SetstatusCmd extends OwnerCommand public class SetstatusCmd extends OwnerCommand

6
src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java → src/main/java/su/cif/infernote/commands/owner/ShutdownCmd.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.jagrosh.jmusicbot.commands.owner; package su.cif.infernote.commands.owner;
import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.command.CommandEvent;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
import com.jagrosh.jmusicbot.commands.OwnerCommand; import su.cif.infernote.commands.OwnerCommand;
public class ShutdownCmd extends OwnerCommand public class ShutdownCmd extends OwnerCommand
{ {

2
src/main/java/com/jagrosh/jmusicbot/entities/Pair.java → src/main/java/su/cif/infernote/entities/Pair.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.entities; package su.cif.infernote.entities;
public class Pair<K,V> public class Pair<K,V>
{ {

2
src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java → src/main/java/su/cif/infernote/entities/Prompt.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.entities; package su.cif.infernote.entities;
import java.util.Scanner; import java.util.Scanner;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;

2
src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java → src/main/java/su/cif/infernote/gui/ConsolePanel.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.gui; package su.cif.infernote.gui;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.GridLayout; import java.awt.GridLayout;

6
src/main/java/com/jagrosh/jmusicbot/gui/GUI.java → src/main/java/su/cif/infernote/gui/GUI.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.jagrosh.jmusicbot.gui; package su.cif.infernote.gui;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.awt.event.WindowListener; import java.awt.event.WindowListener;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JTabbedPane; import javax.swing.JTabbedPane;
import javax.swing.WindowConstants; import javax.swing.WindowConstants;
import com.jagrosh.jmusicbot.Bot; import su.cif.infernote.Bot;
public class GUI extends JFrame public class GUI extends JFrame
{ {
@ -22,7 +22,7 @@ public class GUI extends JFrame
public void init() public void init()
{ {
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
setTitle("JMusicBot"); setTitle("Infernote");
JTabbedPane tabs = new JTabbedPane(); JTabbedPane tabs = new JTabbedPane();
tabs.add("Console", console); tabs.add("Console", console);
getContentPane().add(tabs); getContentPane().add(tabs);

2
src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java → src/main/java/su/cif/infernote/gui/TextAreaOutputStream.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.gui; package su.cif.infernote.gui;
import java.awt.*; import java.awt.*;
import java.io.*; import java.io.*;

6
src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java → src/main/java/su/cif/infernote/playlist/PlaylistLoader.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot.playlist; package su.cif.infernote.playlist;
import com.jagrosh.jmusicbot.BotConfig; import su.cif.infernote.BotConfig;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;

2
src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java → src/main/java/su/cif/infernote/queue/AbstractQueue.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.queue; package su.cif.infernote.queue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;

2
src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java → src/main/java/su/cif/infernote/queue/FairQueue.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.queue; package su.cif.infernote.queue;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

2
src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java → src/main/java/su/cif/infernote/queue/LinearQueue.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.queue; package su.cif.infernote.queue;
public class LinearQueue<T extends Queueable> extends AbstractQueue<T> public class LinearQueue<T extends Queueable> extends AbstractQueue<T>
{ {

2
src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java → src/main/java/su/cif/infernote/queue/QueueSupplier.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.queue; package su.cif.infernote.queue;
@FunctionalInterface @FunctionalInterface
public interface QueueSupplier public interface QueueSupplier

2
src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java → src/main/java/su/cif/infernote/queue/Queueable.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.queue; package su.cif.infernote.queue;
public interface Queueable { public interface Queueable {

12
src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java → src/main/java/su/cif/infernote/settings/QueueType.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.jagrosh.jmusicbot.settings; package su.cif.infernote.settings;
import com.jagrosh.jmusicbot.queue.AbstractQueue; import su.cif.infernote.queue.AbstractQueue;
import com.jagrosh.jmusicbot.queue.FairQueue; import su.cif.infernote.queue.FairQueue;
import com.jagrosh.jmusicbot.queue.LinearQueue; import su.cif.infernote.queue.LinearQueue;
import com.jagrosh.jmusicbot.queue.Queueable; import su.cif.infernote.queue.Queueable;
import com.jagrosh.jmusicbot.queue.QueueSupplier; import su.cif.infernote.queue.QueueSupplier;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

2
src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java → src/main/java/su/cif/infernote/settings/RepeatMode.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.settings; package su.cif.infernote.settings;
public enum RepeatMode public enum RepeatMode
{ {

2
src/main/java/com/jagrosh/jmusicbot/settings/Settings.java → src/main/java/su/cif/infernote/settings/Settings.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.settings; package su.cif.infernote.settings;
import com.jagrosh.jdautilities.command.GuildSettingsProvider; import com.jagrosh.jdautilities.command.GuildSettingsProvider;
import java.util.Collection; import java.util.Collection;

4
src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java → src/main/java/su/cif/infernote/settings/SettingsManager.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot.settings; package su.cif.infernote.settings;
import com.jagrosh.jdautilities.command.GuildSettingsManager; import com.jagrosh.jdautilities.command.GuildSettingsManager;
import com.jagrosh.jmusicbot.utils.OtherUtil; import su.cif.infernote.utils.OtherUtil;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.NoSuchFileException; import java.nio.file.NoSuchFileException;

4
src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java → src/main/java/su/cif/infernote/utils/FormatUtil.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.jagrosh.jmusicbot.utils; package su.cif.infernote.utils;
import com.jagrosh.jmusicbot.audio.RequestMetadata.UserInfo; import su.cif.infernote.audio.RequestMetadata.UserInfo;
import java.util.List; import java.util.List;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.TextChannel;

20
src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java → src/main/java/su/cif/infernote/utils/OtherUtil.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot.utils; package su.cif.infernote.utils;
import com.jagrosh.jmusicbot.JMusicBot; import su.cif.infernote.Infernote;
import com.jagrosh.jmusicbot.entities.Prompt; import su.cif.infernote.entities.Prompt;
import java.io.*; import java.io.*;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
@ -43,7 +43,7 @@ public class OtherUtil
{ {
try try
{ {
result = Paths.get(new File(JMusicBot.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile().getPath() + File.separator + path); result = Paths.get(new File(Infernote.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile().getPath() + File.separator + path);
} }
catch(URISyntaxException ignored) {} catch(URISyntaxException ignored) {}
} }
@ -152,14 +152,14 @@ public class OtherUtil
if(latestVersion!=null && !latestVersion.equals(version)) if(latestVersion!=null && !latestVersion.equals(version))
{ {
prompt.alert(Prompt.Level.WARNING, "JMusicBot Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion)); prompt.alert(Prompt.Level.WARNING, "Infernote Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion));
} }
} }
public static String getCurrentVersion() public static String getCurrentVersion()
{ {
if(JMusicBot.class.getPackage()!=null && JMusicBot.class.getPackage().getImplementationVersion()!=null) if(Infernote.class.getPackage()!=null && Infernote.class.getPackage().getImplementationVersion()!=null)
return JMusicBot.class.getPackage().getImplementationVersion(); return Infernote.class.getPackage().getImplementationVersion();
else else
return "UNKNOWN"; return "UNKNOWN";
} }
@ -194,17 +194,17 @@ public class OtherUtil
} }
/** /**
* Checks if the bot JMusicBot is being run on is supported & returns the reason if it is not. * Checks if the bot Infernote is being run on is supported & returns the reason if it is not.
* @return A string with the reason, or null if it is supported. * @return A string with the reason, or null if it is supported.
*/ */
public static String getUnsupportedBotReason(JDA jda) public static String getUnsupportedBotReason(JDA jda)
{ {
if (jda.getSelfUser().getFlags().contains(User.UserFlag.VERIFIED_BOT)) if (jda.getSelfUser().getFlags().contains(User.UserFlag.VERIFIED_BOT))
return "The bot is verified. Using JMusicBot in a verified bot is not supported."; return "The bot is verified. Using Infernote in a verified bot is not supported.";
ApplicationInfo info = jda.retrieveApplicationInfo().complete(); ApplicationInfo info = jda.retrieveApplicationInfo().complete();
if (info.isBotPublic()) if (info.isBotPublic())
return "\"Public Bot\" is enabled. Using JMusicBot as a public bot is not supported. Please disable it in the " return "\"Public Bot\" is enabled. Using Infernote as a public bot is not supported. Please disable it in the "
+ "Developer Dashboard at https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot ." + "Developer Dashboard at https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot ."
+ "You may also need to disable all Installation Contexts at https://discord.com/developers/applications/" + "You may also need to disable all Installation Contexts at https://discord.com/developers/applications/"
+ jda.getSelfUser().getId() + "/installation ."; + jda.getSelfUser().getId() + "/installation .";

2
src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java → src/main/java/su/cif/infernote/utils/TimeUtil.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.utils; package su.cif.infernote.utils;
public class TimeUtil public class TimeUtil
{ {

2
src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java → src/main/java/su/cif/infernote/utils/YouTubeUtil.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.jagrosh.jmusicbot.utils; package su.cif.infernote.utils;
import com.sedmelluq.lava.extensions.youtuberotator.planner.*; import com.sedmelluq.lava.extensions.youtuberotator.planner.*;
import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.IpBlock; import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.IpBlock;

6
src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java → src/test/java/su/cif/infernote/FairQueueTest.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.jagrosh.jmusicbot; package su.cif.infernote;
import com.jagrosh.jmusicbot.queue.FairQueue; import su.cif.infernote.queue.FairQueue;
import com.jagrosh.jmusicbot.queue.Queueable; import su.cif.infernote.queue.Queueable;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;

4
src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java → src/test/java/su/cif/infernote/TimeUtilTest.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.jagrosh.jmusicbot; package su.cif.infernote;
import com.jagrosh.jmusicbot.utils.TimeUtil; import su.cif.infernote.utils.TimeUtil;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
Write Preview
Loading…
Cancel
Save