Added ability to reply with an optional image for bet history

Moved any commands to do with image processing into separate package

.classpath

@@ -12,7 +12,6 @@
 	<classpathentry kind="lib" path="lib/httpclient-4.5.5.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.4.9.jar"/>
 	<classpathentry kind="lib" path="lib/WolframAlpha-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/JDA-3.7.1_385-withDependencies.jar"/>
 	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.23.1.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.25.jar"/>
 	<classpathentry kind="lib" path="lib/twitter4j-core-4.0.7-javadoc.jar"/>
@@ -24,7 +23,10 @@
 	<classpathentry kind="lib" path="lib/commons-collections4-4.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.9.jar"/>
 	<classpathentry kind="lib" path="lib/commons-text-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/google-http-client-1.32.0.jar"/>
 	<classpathentry kind="lib" path="lib/google-api-services-youtube-v3-rev212-1.25.0.jar"/>
-	<classpathentry kind="lib" path="lib/lavaplayer-1.3.19.jar"/>
+	<classpathentry kind="lib" path="lib/nanohttpd-2.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/LavaPlayerJar-1.3.50-jar-with-dependencies.jar"/>
+	<classpathentry kind="lib" path="lib/JDA-4.2.0_168-withDependencies.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -68,3 +68,5 @@ rP\.txt
 *.log
 
 cloc\.exe
+
+beanImage.png

assets/config.csv

@@ -1,4 +1,6 @@
 "Type","Key","Value"
+"Globals","mode (dev or release)","dev"
+"Globals","activity","with a laser pointer"
 "Localized Commands","beans",""
 "Localized Commands","benchmark, bench",""
 "Localized Commands","bet",""
@@ -16,9 +18,12 @@
 "Localized Commands","dbstats",""
 "Localized Commands","defaultdance",""
 "Localized Commands","derp",""
+"Localized Commands","derpi",""
+"Localized Commands","e6",""
 "Localized Commands","e621",""
 "Localized Commands","eightball, 8ball",""
 "Localized Commands","fetch",""
+"Localized Commands","getsauce",""
 "Localized Commands","givebeans",""
 "Localized Commands","help",""
 "Localized Commands","indicator",""
@@ -46,12 +51,15 @@
 "Localized Commands","stats",""
 "Localized Commands","teey",""
 "Localized Commands","tony, stark, dontfeelgood, dontfeelsogood","tony, stark, dontfeelgood, dontfeelsogood, snap"
+"Localized Commands","tradebeans, trade",""
 "Localized Commands","tweet",""
 "Localized Commands","vote",""
 "Localized Commands","wolfram",""
 "Localized Commands","work",""
 "Localized Commands","yeet",""
 "Localized Strings","AddGuildRoleFailure","Failed to add %s to %s"
+"Localized Strings","BeansImageBottomText","BEANS"
+"Localized Strings","BeansImageTopText","YOU HAVE"
 "Localized Strings","BeansShowDisplay","You have %s beans!"
 "Localized Strings","BeansShowInfo","Displays how many beans you have"
 "Localized Strings","BeansShowMentioned","I took a look and %sbeans!"
@@ -60,11 +68,13 @@
 "Localized Strings","BetBeansInfo","Allows you to bet your beans, set your amount after the command! Warning! House always wins!nSets of 3 will get 2x, 4 will get 10x, and 5 will get 1000x"
 "Localized Strings","BetBeansLose","Sorry, you didn't win, try again!"
 "Localized Strings","BetBeansLowBet","Please bet with at least 20 beans!"
+"Localized Strings","BetBeansMinThreshold",""
 "Localized Strings","BetBeansNotEnough","You don't have enough beans!"
 "Localized Strings","BetBeansNotValid","That's not a valid bet!"
 "Localized Strings","BetBeansWin","You won %s beans!"
 "Localized Strings","BetHistoryInfo","Gives how many beans I've ~~stolen~~ won from your bets!"
-"Localized Strings","BetHistoryOutput","I have %s treats from betting!"
+"Localized Strings","BetHistoryOptionalPNGPath",""
+"Localized Strings","BetHistoryOutput","I have %s beans from betting!"
 "Localized Strings","BlurryInfo","Blurs your icon or the icon of a friend you mentioned"
 "Localized Strings","BoopInfo","Kitty will react with a counter"
 "Localized Strings","BoopMultiple","%s booped several others - %s!"
@@ -107,8 +117,10 @@
 "Localized Strings","DBFlushInfo","Takes all objects queued for the database and writes them to the database, then says how many were written."
 "Localized Strings","DBStatsInfo","Shows current statistics for the database"
 "Localized Strings","DefaultDanceInfo","y'all know forknife, get ready to dance, or make a friend dance with @!"
+"Localized Strings","DerpiError",""
 "Localized Strings","DoWorkFinished","I finished with my work! :D"
 "Localized Strings","DoWorkInfo","Occupies a core for a few seconds"
+"Localized Strings","E6Blacklisted","I can't show that image ;3; (it may be blacklisted)"
 "Localized Strings","EightBallError","Hmm? You'll need to ask a question!"
 "Localized Strings","EightBallInfo","Answers a yes or no question! Warning: Kitty can not actually tell the future, she claims no responsibility for any lion mauling, lack of lottery wins, or felony charges."
 "Localized Strings","EightBallMaybe1","Reply hazy, try again."
@@ -139,6 +151,7 @@
 "Localized Strings","FetchInfo","Throw a custom emote and I'll try to bring it back.... maybe"
 "Localized Strings","FetchRunAway","*Runs away and doesn't return for a long time*"
 "Localized Strings","FetchStare","*Stares at %s*"
+"Localized Strings","GetSauceInfo",""
 "Localized Strings","GiveBeansInfo","Gives beans to the mentioned users!"
 "Localized Strings","GiveBeansInvalid","That's not a valid number!"
 "Localized Strings","GiveBeansNoneMentioned","You didn't mention anyone!"
@@ -178,7 +191,11 @@
 "Localized Strings","MapVersion","Using mapgen v0.1"
 "Localized Strings","MapWidth",""
 "Localized Strings","ModInfo","Mod is a super command for admin or mod use only!\n\t`mod ban @user` will ban a user from the server\n\t`mod kick @user` will kick the user from the server"
+"Localized Strings","MusicAddTrack",""
 "Localized Strings","MusicInfo",""
+"Localized Strings","MusicVolChanged","Volume set to %s!"
+"Localized Strings","MusicVolCurrent","Volume is at %s!"
+"Localized Strings","MusicVolOOB",""
 "Localized Strings","PerishInfo","Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned"
 "Localized Strings","PingInfo","Will respond with Pong!"
 "Localized Strings","PingResponse","Pong!"
@@ -234,6 +251,7 @@
 "Localized Strings","TeeyInfo","Teey yourself back into existance, or teey a friend with @!"
 "Localized Strings","TradeBeansInfo","Give your friends some of your beans! Just don't forget to @ them!"
 "Localized Strings","TradeBeansIntParseError","That's not a real number! D:"
+"Localized Strings","TradeBeansMultipleUsersTagged",""
 "Localized Strings","TradeBeansNoTargetError","Don't forget to tag who you want to give the beans to!"
 "Localized Strings","TradeBeansNotEnoughError","You can't give more beans than you have!"
 "Localized Strings","TradeBeansStealingBeans","Hey %s! Stealing is wrong! Let's see how you like it! *steals 10 beans*"
@@ -267,9 +285,12 @@
 "Command Enabler","dbstats","1"
 "Command Enabler","defaultdance","1"
 "Command Enabler","derp","1"
+"Command Enabler","derpi","1"
+"Command Enabler","e6","1"
 "Command Enabler","e621","1"
 "Command Enabler","eightball, 8ball","1"
 "Command Enabler","fetch","1"
+"Command Enabler","getsauce","1"
 "Command Enabler","givebeans","1"
 "Command Enabler","guildroleadd","1"
 "Command Enabler","guildroleallowed","1"
@@ -308,6 +329,7 @@
 "Command Enabler","stats","1"
 "Command Enabler","teey","1"
 "Command Enabler","tony, stark, dontfeelgood, dontfeelsogood","1"
+"Command Enabler","tradebeans, trade","1"
 "Command Enabler","tweet","1"
 "Command Enabler","vote","1"
 "Command Enabler","wolfram","1"

assets/plugins/derpisource.lua

@@ -0,0 +1,22 @@
+function plugin(message, user)
+	local index;
+	local concat;
+	if(string.find(message, "https://derpicdn.net/img"))then
+		if(string.find(message, "view/"))then
+			index = string.find(message, "/[^/]*$");
+			return "!derpi ID:" .. string.sub(message, index + 1, string.find(message, ".[^.]*$")-1);
+		else
+			if(string.find(message, "download/"))then
+				index = string.find(message, "_");
+				concat = string.sub(message, 0, index-1);
+				return "!derpi ID:" .. string.sub(concat, string.find(message, "/[^/]*$") + 1);
+			else
+				index = string.find(message, "/[^/]*$");
+				concat = string.sub(message, 0, index - 1);
+				index = string.find(concat, "/[^/]*$");
+
+				return "!derpi ID:" .. string.sub(concat, index + 1);
+			end
+		end
+	end
+end

assets/plugins/e6source.lua

@@ -0,0 +1,8 @@
+function plugin(message, user) 
+	if(string.find(message, "https://static1.e621.net/data") or string.find(message, "https://static1.e926.net/data"))then
+		if(string.find(message, " "))then
+			message = string.sub(message, 0, string.find(message, " "));
+		end
+		return "!e6 md5:" .. string.sub(message, string.find(message, "/[^/]*$") + 1 ,string.find(message, ".[^.]*$") - 1);
+	end
+end

src/commands/beans/CommandBeansShow.java

@@ -0,0 +1,138 @@
+package commands.beans;
+
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import core.Command;
+import core.Constants;
+import core.LocStrings;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+
+public class CommandBeansShow extends Command
+{
+	public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("BeansShowInfo"); };
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		if(input.mentions == null)
+		{
+			//res.send("" + user.getBeans());
+			try {
+				res.sendFile(combineImages(user.getBeans()), "png");
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+//			res.send(String.format(LocStrings.stub("BeansShowDisplay"), user.getBeans()));
+		}
+		else
+		{
+			String mentionedBeans = ""; 
+			for(KittyUser mentioned:input.mentions)
+			{
+				mentionedBeans += mentioned.name + " has " + mentioned.getBeans() + " ";
+			}
+			res.send(String.format(LocStrings.stub("BeansShowMentioned"), mentionedBeans));
+		}
+	}
+	
+	private File combineImages(long beans) throws IOException
+	{
+		// Acquire images
+		BufferedImage imageBase = ImageIO.read(new File(Constants.AssetDirectory + "beans/BeansBG.png"));
+		BufferedImage thouBean = ImageIO.read(new File(Constants.AssetDirectory + "beans/thouBean.png"));
+		BufferedImage hunBean = ImageIO.read(new File(Constants.AssetDirectory + "beans/hunBean.png"));
+		BufferedImage tenBean = ImageIO.read(new File(Constants.AssetDirectory + "beans/tenBean.png"));
+		BufferedImage oneBean = ImageIO.read(new File(Constants.AssetDirectory + "beans/oneBean.png"));
+		
+		final int baseWidth = imageBase.getWidth();
+		final int baseHeight = imageBase.getHeight();
+		
+		long calcBean = beans;
+		
+		long thousands = beans / 1000;
+		calcBean = beans % 1000;
+		long hundreds = (calcBean / 100);
+		calcBean = calcBean % 100;
+		long tens = (calcBean / 10);
+		calcBean = calcBean % 10;
+		long ones = calcBean;
+		
+		BufferedImage beanImage = new BufferedImage(baseWidth, baseHeight, BufferedImage.TYPE_INT_ARGB);
+		Graphics beanGraphics = beanImage.getGraphics();
+		Rectangle rect = new Rectangle(0, 0, baseWidth, baseHeight);
+		beanGraphics.drawImage(imageBase,0,0,null);
+		
+		for(int i = 0; i < ones; i++)
+		{
+			int x = (int)(Math.random() * (baseWidth - oneBean.getWidth())) + 1;
+			int y = (int)(Math.random() * (baseHeight - oneBean.getHeight())) + 1;
+			beanGraphics.drawImage(oneBean, x, y, null);
+		}
+		
+		for(int i = 0; i < tens; i++)
+		{
+			int x = (int)(Math.random() * (baseWidth - tenBean.getWidth())) + 1;
+			int y = (int)(Math.random() * (baseHeight - tenBean.getHeight())) + 1;
+			beanGraphics.drawImage(tenBean, x, y, null);
+		}
+		
+		for(int i = 0; i < hundreds; i++)
+		{
+			int x = (int)(Math.random() * (baseWidth - hunBean.getWidth())) + 1;
+			int y = (int)(Math.random() * (baseHeight - hunBean.getHeight())) + 1;
+			beanGraphics.drawImage(hunBean, x, y, null);
+		}
+		
+		for(int i = 0; i < thousands; i++)
+		{
+			int x = (int)(Math.random() * (baseWidth - thouBean.getWidth())) + 1;
+			int y = (int)(Math.random() * (baseHeight - thouBean.getHeight())) + 1;
+			beanGraphics.drawImage(thouBean, x, y, null);
+		}
+		
+		
+		try {
+			@SuppressWarnings("unused")
+			Font font = null;
+			font = Font.createFont(Font.TRUETYPE_FONT, new File(Constants.AssetDirectory +"fonts/B612Mono-Regular.ttf"));
+		} catch (Exception e)
+		{
+		}
+		Font beanFont = new Font("font", Font.BOLD, 45);
+		beanGraphics.setFont(beanFont);
+		
+		drawCenteredString(beanGraphics, LocStrings.stub("BeansImageTopText"), rect, beanFont, .25);
+		drawCenteredString(beanGraphics, "" + beans, rect, beanFont, .5);
+		drawCenteredString(beanGraphics, LocStrings.stub("BeansImageBottomText"), rect, beanFont, .75);
+
+		ImageIO.write(beanImage, "PNG", new File("beanImage.png"));
+		return new File("beanImage.png");
+	}
+	
+	private void drawCenteredString(Graphics beanGraphics, String text, Rectangle rect, Font font, double segment)
+	{
+		FontMetrics metrics = beanGraphics.getFontMetrics(font);
+		
+		int x = rect.x + (rect.width - metrics.stringWidth(text)) / 2;
+		int y = (int)(rect.y + ((rect.height - metrics.getHeight()) * segment) + metrics.getAscent());
+		
+		beanGraphics.drawString(text, x, y);
+	}
+}

src/commands/beans/CommandBetBeans.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.beans;
 
 import java.util.Random;
 
@@ -20,7 +20,7 @@ public class CommandBetBeans extends Command
 	{
 		String call = "";
 		
-		int min = 50;
+		int min = 20;
 		int bet = 0;
 		int win = 0; 
 		
@@ -36,7 +36,8 @@ public class CommandBetBeans extends Command
 		}
 		catch (Exception e)
 		{
-			GlobalLog.log(LogFilter.Command, "Betting took place, but a value was not specified in the config file so 50 was used as the minimum bet threshold. Consider specifying BetBeansMinThreshold.");
+			GlobalLog.log(LogFilter.Command, "Betting took place, but a value was not specified in the config file "
+					+ "so 50 was used as the minimum bet threshold. Consider specifying BetBeansMinThreshold.");
 		}
 		
 		try 

src/commands/beans/CommandBetHistory.java

@@ -1,4 +1,6 @@
-package commands.general;
+package commands.beans;
+
+import java.io.File;
 
 import core.Command;
 import core.LocStrings;
@@ -9,6 +11,8 @@ import dataStructures.KittyRole;
 import dataStructures.KittyUser;
 import dataStructures.Response;
 import dataStructures.UserInput;
+import utils.GlobalLog;
+import utils.LogFilter;
 
 public class CommandBetHistory extends Command
 {
@@ -20,6 +24,22 @@ public class CommandBetHistory extends Command
 	@Override
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
+		// Send primary response
 		res.send(String.format(LocStrings.stub("BetHistoryOutput"), guild.beans.get()));
+		
+		// Look up extra information to see if we ahve a flair image
+		String optional = LocStrings.stub("BetHistoryOptionalPNGPath");
+		if(optional != null && optional.length() > 0)
+		{
+			File responseImage = new File(optional);
+			if(responseImage.exists())
+			{
+				res.sendFile(responseImage, ".png");
+			}
+			else
+			{
+				GlobalLog.warn(LogFilter.Command, "Optional PNG image for bet history was specified, but the file could not be found.");
+			}
+		}
 	}
 }

src/commands/beans/CommandGiveBeans.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.beans;
 
 import core.Command;
 import core.LocStrings;

src/commands/beans/CommandTradeBeans.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.beans;
 
 import core.Command;
 import core.LocStrings;
@@ -25,15 +25,29 @@ public class CommandTradeBeans extends Command
 			res.send(LocStrings.stub("TradeBeansNoTargetError"));
 			return;
 		}
+		if(input.mentions.length > 1)
+		{
+			res.send(LocStrings.stub("TradeBeansMultipleUsersTagged"));
+			return;
+		}
 		
 		int beans = 0;
-		try {
+
+		try
+		{
 			beans = Integer.parseInt(input.args.split(" ")[0]);
 		}
 		catch (NumberFormatException e)
 		{
-			res.send(LocStrings.stub("TradeBeansIntParseError"));
-			return;
+			try
+			{
+				beans = Integer.parseInt(input.args.split(" ")[1]);
+			}
+			catch(Exception eInner)
+			{
+				res.send(LocStrings.stub("TradeBeansIntParseError"));
+				return;
+			}
 		}
 		
 		if(user.getBeans() < beans)

src/commands/dev/CommandDBFlush.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import core.Command;
 import core.Constants;

src/commands/dev/CommandDBStats.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

src/commands/dev/CommandDoWork.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import core.*;
 import dataStructures.KittyChannel;

src/commands/dev/CommandHelpBuilder.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import java.io.File;
 import java.io.FileNotFoundException;

src/commands/dev/CommandInvite.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import core.Command;
 import core.LocStrings;

src/commands/dev/CommandShutdown.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import core.Command;
 import core.DatabaseManager;

src/commands/dev/CommandStats.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import core.Command;
 import core.LocStrings;

src/commands/dev/CommandTweet.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.dev;
 
 import core.Command;
 import core.LocStrings;

src/commands/general/CommandBeansShow.java

@@ -1,29 +0,0 @@
-package commands.general;
-
-import core.Command;
-import core.LocStrings;
-import dataStructures.*;
-
-public class CommandBeansShow extends Command
-{
-	public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("BeansShowInfo"); };
-	
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		if(input.mentions == null)
-			res.send(String.format(LocStrings.stub("BeansShowDisplay"), user.getBeans()));
-		else
-		{
-			String mentionedBeans = ""; 
-			for(KittyUser mentioned:input.mentions)
-			{
-				mentionedBeans += mentioned.name + " has " + mentioned.getBeans() + " ";
-			}
-			res.send(String.format(LocStrings.stub("BeansShowMentioned"), mentionedBeans));
-		}
-	}
-}

src/commands/general/CommandBoop.java

@@ -68,22 +68,23 @@ public class CommandBoop extends Command
 	{
 		if(input.mentions == null)
 		{
+			// No one is booped, just the bot!
 			boopTracker.applyBoop();
 			res.send(String.format(LocStrings.stub("BoopStandard"), user.name, boopTracker.howMany()));
 		}
 		else
 		{
+			// When someone boops one other person
 			if(input.mentions.length == 1)
 			{
-				boopTracker.applyBoop();
 				res.send(String.format(LocStrings.stub("BoopPerson"), user.name, input.mentions[0].name));
 				return;
 			}
 			
+			// A number of people have been booped
 			String booped = ""; 
 			for(int i = 0; i < input.mentions.length; i++)
 			{
-				boopTracker.applyBoop();
 				if(i < input.mentions.length-1)
 					booped += input.mentions[i].name + ", ";
 				else

src/commands/general/CommandChoose.java

@@ -27,12 +27,20 @@ public class CommandChoose extends Command
 		
 		String [] choices = input.args.split(",");
 		
-		if(choices.length == 1)
+		if(choices.length <= 1)
 		{
 			res.send(LocStrings.stub("ChooseOne"));
 			return;
 		}
 		
+		for(int i = 0; i < choices.length; i ++)
+		{
+			if (choices[i].equals(""))
+			{
+				choices[i] = "KittyBot is the best!"; 
+			}
+		}
+		
 		res.send(String.format(LocStrings.stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString()));
 	}
 }

src/commands/general/CommandColor.java

@@ -32,7 +32,7 @@ public class CommandColor extends Command
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
 		// First, try and parse out the color to make sure we can even get it.
-		ColorData colorData = theColorAPI.lookupHex(input.args.trim());
+		ColorData colorData = theColorAPI.lookupHex(input.args);
 		
 		// Verify the color was even found
 		if(colorData == null)

src/commands/general/CommandLeaderboard.java

@@ -7,7 +7,7 @@ import core.Command;
 import core.Constants;
 import core.DatabaseManager;
 import core.LocStrings;
-import core.ObjectBuilderFactory;
+import core.ObjectBuilder;
 import dataStructures.KittyChannel;
 import dataStructures.KittyEmbed;
 import dataStructures.KittyGuild;
@@ -98,7 +98,7 @@ public class CommandLeaderboard extends Command
 		{
 			// Only now that we've sorted do we do the full construction and caching of users
 			Pair<Long, String> userPair = users.get(i);
-			KittyUser cachedUser = ObjectBuilderFactory.getKittyUser(guildID, userPair.Second);
+			KittyUser cachedUser = ObjectBuilder.getKittyUser(guildID, userPair.Second);
 			
 			if(cachedUser == null)
 				continue; 

src/commands/general/CommandRoll.java

@@ -22,7 +22,9 @@ public class CommandRoll extends Command
 		{
 			KittyEmbed embed = new KittyEmbed();
 			embed.title = user.name +"'s roll!";
+			System.out.println("HERE");
 			embed.descriptionText = rollDice(input.args);
+			System.out.println("THERE");
 			Random numGen = new Random(user.name.hashCode());
 			float hue = numGen.nextFloat();
 			float sat = .7f;
@@ -41,10 +43,11 @@ public class CommandRoll extends Command
 		Stack<Integer> values = new Stack<Integer>();
 		Stack<Character> operators = new Stack<Character>();
 		String steps = ""; 
+		
 		for(int i = 0; i < thing.length(); i ++)
 		{
 			char current = thing.charAt(i);
-			
+			System.out.println("ROLLING");
 			switch(current)
 			{
 				case '+':
@@ -122,8 +125,11 @@ public class CommandRoll extends Command
 		{
 			steps += "\n" + calculate(values, operators);
 		}
-		
-		return "Roll```" + thing + "```" + "Steps```" + steps + "```" + "Final value ```" + values.pop() +"```";
+		if(steps != "")
+		{
+			return "Roll```" + thing + "```" + "Steps```" + steps + "```" + "Final value ```" + values.pop() +"```";
+		}
+		return "That's not a roll that's just " + values.pop() +"!";
 	}
 	
 	
@@ -173,7 +179,7 @@ public class CommandRoll extends Command
 		int roll = 0;
 		int dice = first;
 		int sides = second;
-		int [] rolls = new int [sides];
+		int [] rolls = new int [dice];
 		
 		if(dice < 1)
 			return new int[0];

src/commands/images/CommandBlurry.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;

src/commands/images/CommandCatch.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.io.File;
 import java.io.IOException;

src/commands/images/CommandDefaultDance.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.io.File;
 import java.io.IOException;

src/commands/images/CommandPerish.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;

src/commands/images/CommandStark.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;

src/commands/images/CommandTeey.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.io.File;
 import java.io.IOException;

src/commands/images/CommandYeet.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.images;
 
 import java.io.File;
 import java.io.IOException;

src/commands/music/CommandMusicMain.java

@@ -2,6 +2,7 @@ package commands.music;
 
 import core.Command;
 import core.LocStrings;
+import core.SubCommandFormattable;
 import core.SubCommandFramework;
 import dataStructures.*;
 
@@ -13,14 +14,20 @@ public class CommandMusicMain extends Command
 		super(level, rating); 
 		framework.addCommand("join", new SubCommandJoin(KittyRole.General, KittyRating.Safe));
 		framework.addCommand("leave", new SubCommandLeave(KittyRole.General, KittyRating.Safe));
+		framework.addCommand("add", new SubCommandAddTrack(KittyRole.General, KittyRating.Safe));
+		framework.addCommand("skip", new SubCommandSkip(KittyRole.General, KittyRating.Safe));
+		framework.addCommand("stop", new SubCommandStop(KittyRole.General, KittyRating.Safe));
+		framework.addCommand("playlist", new SubCommandPlaylist(KittyRole.General, KittyRating.Safe));
+		framework.addCommand("volume", new SubCommandVolume(KittyRole.General, KittyRating.Safe));
 	}
 	
 	@Override
-	public String getHelpText() { return LocStrings.stub("MusicInfo"); }
+	public String getHelpText() {return LocStrings.stub("MusicInfo"); }
 	
 	@Override
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
-		framework.run(guild, channel, user, input).Call(res);
+		SubCommandFormattable scf = framework.run(guild, channel, user, input);
+		scf.Call(res);
 	}
 }

src/commands/music/SubCommandAddTrack.java

@@ -1,7 +1,6 @@
 package commands.music;
 
-import com.google.api.services.youtube.YouTube;
-
+import core.LocStrings;
 import core.SubCommand;
 import core.SubCommandFormattable;
 import dataStructures.KittyChannel;
@@ -10,16 +9,25 @@ import dataStructures.KittyRating;
 import dataStructures.KittyRole;
 import dataStructures.KittyUser;
 import dataStructures.UserInput;
+import network.NetworkYoutube;
 
 public class SubCommandAddTrack extends SubCommand 
 {
 	
 	public SubCommandAddTrack(KittyRole level, KittyRating rating) { super(level, rating); }
 	
+	NetworkYoutube YT = new NetworkYoutube();
+	
 	@Override
 	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
 	{
-		
-		return null;
+		//Get track from Youtube 
+		String video = input.args;
+		if(!(video.startsWith("https://www.youtube") || video.startsWith("https://www.youtu.be")))
+		{
+			video =  YT.getYT(video);
+		}
+		guild.audio.playVideo(video);
+		return new SubCommandFormattable(String.format(LocStrings.stub("MusicAddTrack"), video));
 	}
 }

src/commands/music/SubCommandPlaylist.java

@@ -0,0 +1,38 @@
+package commands.music;
+
+import java.util.ArrayList;
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+
+import core.SubCommand;
+import core.SubCommandFormattable;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.UserInput;
+
+public class SubCommandPlaylist extends SubCommand 
+{
+
+	public SubCommandPlaylist(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating);	}
+
+	@Override
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
+	{
+		ArrayList <AudioTrack> playlist = guild.audio.getPlaylist();
+		String stringPlaylist = "";
+		
+		for(AudioTrack track : playlist)
+		{
+			stringPlaylist += (playlist.indexOf(track) + 1) + ": " + track.getInfo().title + "\n"; 
+		}
+		if(stringPlaylist.equals(""))
+		{
+			return new SubCommandFormattable("Nothing Queued!");
+		}
+		return new SubCommandFormattable(stringPlaylist);
+	}
+
+}

src/commands/music/SubCommandSkip.java

@@ -0,0 +1,23 @@
+package commands.music;
+
+import core.SubCommand;
+import core.SubCommandFormattable;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.UserInput;
+
+public class SubCommandSkip extends SubCommand
+{
+	public SubCommandSkip(KittyRole level, KittyRating rating) { super(level, rating); }
+	{
+		
+	}
+	@Override
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
+	{
+		return new SubCommandFormattable(guild.audio.skipVideo(guild.audio.player));
+	}
+}

src/commands/music/SubCommandStop.java

@@ -0,0 +1,23 @@
+package commands.music;
+
+import core.SubCommand;
+import core.SubCommandFormattable;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.UserInput;
+
+public class SubCommandStop extends SubCommand
+{
+
+	public SubCommandStop(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating);}
+
+	@Override
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
+	{
+		return new SubCommandFormattable(guild.audio.stopPlayer(guild.audio.player));
+	}
+	
+}

src/commands/music/SubCommandVolume.java

@@ -0,0 +1,42 @@
+package commands.music;
+
+import core.LocStrings;
+import core.SubCommand;
+import core.SubCommandFormattable;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.UserInput;
+
+public class SubCommandVolume extends SubCommand
+{
+	public SubCommandVolume(KittyRole level, KittyRating rating) { super(level, rating); }
+	{
+		
+	}
+	@Override
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
+	{
+		int newVol = guild.audio.getVolume(guild.audio.player);
+		if(input.args != null)
+		{
+			try
+			{
+				newVol = Integer.parseInt(input.args);
+				if(newVol > 100 || newVol <1)
+				{
+					return new SubCommandFormattable(String.format(LocStrings.stub("MusicVolOOB")));
+				}
+				guild.audio.changeVolume(guild.audio.player, newVol);
+			}
+			catch(Exception e)
+			{
+				return new SubCommandFormattable(String.format(LocStrings.stub("MusicVolCurrent"), newVol));
+			}
+			
+		}
+		return new SubCommandFormattable(String.format(LocStrings.stub("MusicVolChanged"), newVol));
+	}
+}

src/commands/network/CommandColiru.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.network;
 
 import core.Command;
 import core.LocStrings;

src/commands/network/CommandDerpi.java

@@ -0,0 +1,72 @@
+package commands.network;
+
+import core.Command;
+import core.LocStrings;
+import dataStructures.KittyChannel;
+import dataStructures.KittyEmbed;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+import network.NetworkDerpi;
+
+public class CommandDerpi extends Command
+{
+	NetworkDerpi searcher = new NetworkDerpi(); 
+	KittyEmbed response;
+	
+	// Required constructor
+	public CommandDerpi(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return "Will search derpibooru for the tags entered, if KittyBot's content filter allows it"; }
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		if(guild.contentRating == KittyRating.Filtered)
+		{
+			try
+			{
+				response = searcher.getDerpi(input.args.replace(',', ' ') + " safe").output();
+				res.send(response);
+			}
+			catch(Exception e)
+			{
+				res.send(LocStrings.stub("DerpiError"));
+			}
+		}
+		else
+		{
+			if(input.args == null || input.args.length() == 0)
+				res.send("DerpiNoSearchError");
+			else
+			{
+				response = searcher.getDerpi(input.args).output();
+				try 
+				{
+					res.send(response);
+				}
+				catch(Exception e)
+				{
+					res.send(LocStrings.stub("DerpiError"));
+				}
+			}
+		}
+		
+		if(input.args.startsWith("ID:"))
+		{
+			response = searcher.getDerpiByID(input.args.substring(input.args.indexOf(':'))).output();
+			try 
+			{
+				res.send(response);
+			}
+			catch(Exception e)
+			{
+				res.send(LocStrings.stub("DerpiError"));
+			}
+		}
+	}
+}

src/commands/network/CommandE6.java

@@ -0,0 +1,71 @@
+package commands.network;
+
+import core.Command;
+import core.LocStrings;
+import dataStructures.*;
+import network.NetworkE6;
+
+public class CommandE6 extends Command
+{
+	NetworkE6 searcher = new NetworkE6();
+	KittyEmbed response;
+	GenericImage image; 
+	
+	public CommandE6(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText()
+	{
+		String toRet = "Will search e6"; 
+		toRet += "21 for the tags entered, if KittyBot's content filter allows it";
+		return toRet;
+	}
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		if(guild.contentRating == KittyRating.Filtered)
+		{
+			image = searcher.getE6(input.args + " rating:safe", "");
+			try
+			{
+				response = image.output();
+			}
+			catch(Exception e)
+			{				
+				res.send(LocStrings.stub("E6Blacklisted"));
+				return;
+			}
+			try 
+			{
+				if(response.bodyImageURL == null)
+				{
+					Exception e = new Exception();
+					throw e; 
+				}
+				res.send(response);
+			}
+			catch(Exception e)
+			{
+				res.send(LocStrings.stub("E6Blacklisted"));
+			}
+		}
+		else
+		{
+			if(input.args == null || input.args.length() == 0)
+				res.send("E6NoSearchError");
+			else
+			{
+				try 
+				{
+					response = searcher.getE6(input.args, "").output();
+					res.send(response);
+				}
+				catch(Exception e)
+				{
+					res.send(LocStrings.stub("E6Blacklisted"));
+				}
+			}
+		}
+	}
+}

src/commands/network/CommandGetSauce.java

@@ -0,0 +1,35 @@
+package commands.network;
+
+import core.Command;
+import core.LocStrings;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+import network.NetworkSauceNAO;
+
+public class CommandGetSauce extends Command
+{
+	NetworkSauceNAO sauce = new NetworkSauceNAO();
+	
+	public CommandGetSauce(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("GetSauceInfo"); };
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		try
+		{
+			res.send(sauce.getSauce(input.args).output());
+		}
+		catch(Exception e)
+		{
+			res.send("Image not found");
+		}
+	}
+}

src/commands/network/CommandJDoodle.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.network;
 
 import core.Command;
 import core.LocStrings;

src/commands/network/CommandWolfram.java

@@ -1,4 +1,4 @@
-package commands.general;
+package commands.network;
 
 import java.io.File;
 import java.io.IOException;

src/core/CommandManager.java

@@ -4,11 +4,37 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import commands.beans.CommandBeansShow;
+import commands.beans.CommandBetBeans;
+import commands.beans.CommandBetHistory;
+import commands.beans.CommandGiveBeans;
+import commands.beans.CommandTradeBeans;
 import commands.characters.CommandCharacterMain;
+import commands.dev.CommandDBFlush;
+import commands.dev.CommandDBStats;
+import commands.dev.CommandDoWork;
+import commands.dev.CommandHelpBuilder;
+import commands.dev.CommandInvite;
+import commands.dev.CommandShutdown;
+import commands.dev.CommandStats;
+import commands.dev.CommandTweet;
 import commands.general.*;
 import commands.guildrole.CommandGuildRoleMain;
+import commands.images.CommandBlurry;
+import commands.images.CommandCatch;
+import commands.images.CommandDefaultDance;
+import commands.images.CommandPerish;
+import commands.images.CommandStark;
+import commands.images.CommandTeey;
+import commands.images.CommandYeet;
 import commands.mod.CommandModMain;
 import commands.music.CommandMusicMain;
+import commands.network.CommandColiru;
+import commands.network.CommandDerpi;
+import commands.network.CommandE6;
+import commands.network.CommandGetSauce;
+import commands.network.CommandJDoodle;
+import commands.network.CommandWolfram;
 import commands.poll.CommandPollMain;
 import commands.raffle.CommandRaffleMain;
 import dataStructures.*;
@@ -107,6 +133,11 @@ public class CommandManager
 		this.register(LocCommands.stub("poll"), new CommandPollMain(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("music"), new CommandMusicMain(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("defaultdance"), new CommandDefaultDance(KittyRole.General, KittyRating.Safe));
+		this.register(LocCommands.stub("getsauce"), new CommandGetSauce(KittyRole.General, KittyRating.Safe));
+		this.register(LocCommands.stub("tradebeans, trade"), new CommandTradeBeans(KittyRole.General, KittyRating.Safe));
+		
+		this.register(LocCommands.stub("e6"), new CommandE6(KittyRole.General, KittyRating.Filtered));
+		this.register(LocCommands.stub("derpi"), new CommandDerpi(KittyRole.General, KittyRating.Filtered));
 	}
 	
 	// Allows the command manager to keep track of a command. Takes a pair (the un-localized and localzied commands)

src/core/Config.java

@@ -28,6 +28,7 @@ public class Config
 				sections = new Vector<IConfigSection>();
 				
 				// Add all sections
+				sections.add(new ConfigGlobals());
 				sections.add(new LocCommands());
 				sections.add(new LocStrings());
 				sections.add(new CommandEnabler());

src/core/ConfigGlobals.java

@@ -0,0 +1,102 @@
+package core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import dataStructures.KittyStartupMode;
+import utils.GlobalLog;
+
+// Want to add a single item to the config file? This is where that lives.
+public class ConfigGlobals implements IConfigSection
+{
+	// Defined const variables
+	public static final String header = "Globals";
+	public static ConfigGlobals instance;
+	
+	
+	// A pile of variables being manually tracked/serialized to the config file
+	private static final String startupStyleKey = "mode (dev or release)";
+	private KittyStartupMode startupStyleValue = KittyStartupMode.Dev;
+	
+	private static final String activityKey = "activity";
+	private String activityValue = "with a laser pointer";  // Appears as "Playing with a laser pointer"
+	
+	// Singleton Constructor - explode if there's a problem.
+	public ConfigGlobals()
+	{
+		if(instance == null)
+		{
+			instance = this;
+		}
+		else
+		{
+			GlobalLog.error("Attempted to initialize a second config globals! Probably don't do this!");
+		}
+	}
+	
+	@Override
+	public String getSectionTitle()
+	{
+		return header;
+	}
+
+	public static KittyStartupMode getStartupMode()
+	{
+		return instance.startupStyleValue;
+	}
+	
+	public static String getActivity()
+	{
+		return instance.activityValue;
+	}
+	
+	@Override
+	public void consume(List<ConfigItem> pairs)
+	{
+		for(int i = 0; i < pairs.size(); ++i)
+		{
+			String key = pairs.get(i).key;
+			String value = pairs.get(i).value;
+			
+			// Parse startup style
+			if(key.equalsIgnoreCase(startupStyleKey))
+			{
+				startupStyleValue = KittyStartupMode.Dev;
+				
+				if(value.equalsIgnoreCase(KittyStartupMode.Release.name()))
+				{
+					startupStyleValue = KittyStartupMode.Release;
+				}
+				
+				if(value.equalsIgnoreCase(KittyStartupMode.PoguRelease.name()))
+				{
+					startupStyleValue = KittyStartupMode.PoguRelease;
+				}
+				
+				continue;
+			}
+			
+			// Parse text for 'playing' 
+			if(key.equalsIgnoreCase(activityKey))
+			{
+				activityValue = value;
+			}
+		}
+		
+		// If we change any globals, update anything we need to.
+		if(ObjectBuilder.getHasInitialized())
+		{
+			ObjectBuilder.updateActivity();
+		}
+	}
+
+	@Override
+	public List<ConfigItem> produce()
+	{
+		List<ConfigItem> items = new ArrayList<ConfigItem>();
+		items.add(new ConfigItem(getSectionTitle(), startupStyleKey, startupStyleValue.name().toLowerCase()));
+		items.add(new ConfigItem(getSectionTitle(), activityKey, activityValue));
+		
+		return items;
+	}
+}

src/core/ConfigItem.java

@@ -6,9 +6,9 @@ import utils.StringUtils;
 // perform any parsing past naming columns, and just holds the raw data.
 public class ConfigItem
 {
-	public String type;
-	public String key;
-	public String value;
+	public String type;  // The section this specific key/value pair belongs to. This almost certainly will appear in multiple places. 
+	public String key;   // A unique key for a given lookup value for the specified section. Keys, within sections, are unique.
+	public String value; // The value assocaited with the key.
 	public static final int items = 3;
 	public static final String[] header = {"Type","Key","Value"};
 	

src/core/LocCommands.java

@@ -11,7 +11,7 @@ import dataStructures.Pair;
 public class LocCommands extends BaseLocFile implements IConfigSection
 {
 	// Defined const variables
-	public static final String HeaderName = "Localized Commands";
+	public static final String header = "Localized Commands";
 	public static final String function = "LocCommands.stub";
 	
 	// Instance
@@ -20,7 +20,7 @@ public class LocCommands extends BaseLocFile implements IConfigSection
 	// Constructor
 	public LocCommands() 
 	{
-		super(HeaderName, function);
+		super(header, function);
 		
 		GlobalLog.log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName());
 		

src/core/ObjectBuilder.java

@@ -7,28 +7,43 @@ import java.util.concurrent.Semaphore;
 
 import javax.security.auth.login.LoginException;
 
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
+
 //import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 //import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
 
 import core.lua.PluginManager;
-import dataStructures.*;
+import dataStructures.KittyChannel;
+import dataStructures.KittyCore;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyStartupMode;
+import dataStructures.KittyUser;
 import main.Main;
-import net.dv8tion.jda.core.AccountType;
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.JDABuilder;
-import net.dv8tion.jda.core.entities.*;
-import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.AccountType;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Activity;
+import net.dv8tion.jda.api.entities.Emote;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import offline.Ref;
 import utils.AdminControl;
 //import utils.AudioUtils;
 import utils.GlobalLog;
 import utils.LogFilter;
+import utils.audio.AudioUtils;
 
-// NOTE(wisp): Isolated factory to assist with storage and caching if needed.
+// NOTE: Isolated factory to assist with storage and caching if needed.
 // This also minimizes the number of places JDA interacts with our codebase.
 // As it stands, if the object name begins with Kitty, it's constructed here.
 // TODO: Make all methods ID based instead of event based 
-public class ObjectBuilderFactory 
+public class ObjectBuilder 
 {
 	// Key: guild string id, Value: guild information
 	private static HashMap<String, KittyGuild> guildCache;
@@ -55,7 +70,7 @@ public class ObjectBuilderFactory
 	private static CommandManager commandManager;
 	
 	//Audio track manager
-//	private static AudioPlayerManager audioPlayer = new DefaultAudioPlayerManager();
+	private static AudioPlayerManager playerManager = new DefaultAudioPlayerManager();
 	
 	// Localization classes - these are singletons, but should be initialized before almost all other 
 	// things so their inclusion in the factory is to ensure they're started at the correct time.
@@ -67,15 +82,20 @@ public class ObjectBuilderFactory
 	
 	// Lazy initialization multithreaded mutex stuff to prevent explosions.
 	// TODO: Investigate using 'synchronized' instead potentially
-	private static boolean hasInitialized;
+	private static Boolean hasInitialized = false;
 	private static Semaphore initMutex = new Semaphore(1);
 	private static JDA kitty;
 	
 	// This is it, this is how the lazy init starts!
 	private static void lazyInit()
 	{
-		if(hasInitialized)
-			return;
+		synchronized(hasInitialized)
+		{
+			if(hasInitialized)
+			{
+				return;
+			}
+		}
 		
 		try
 		{
@@ -90,15 +110,21 @@ public class ObjectBuilderFactory
 				database = null;
 				stats = null;
 				
+				AudioSourceManagers.registerRemoteSources(playerManager);
+				AudioSourceManagers.registerLocalSource(playerManager);
+				
 				// Start by reading from things that are external. Because
-				// we require these things to be resolved before the rest of the application,
-				// we place them here.
+				// we require these things to be resolved before the rest of 
+				// the application, we place them here.
 				config = new Config();
 			}
 			finally
 			{
 				initMutex.release();
-				hasInitialized = true;
+				synchronized(hasInitialized)
+				{
+					hasInitialized = true;
+				}
 			}
 		}
 		catch(InterruptedException ie)
@@ -108,6 +134,14 @@ public class ObjectBuilderFactory
 		}
 	}
 	
+	public static boolean getHasInitialized()
+	{
+		synchronized(hasInitialized)
+		{
+			return hasInitialized;
+		}
+	}
+	
 	  ////////////////////////
 	 // Extraction Methods //
 	////////////////////////
@@ -124,8 +158,10 @@ public class ObjectBuilderFactory
 		
 		List<Emote> emotes = event.getGuild().getEmotes();
 		ArrayList<String> emotesString = new ArrayList<String>();
+		HashMap<Long, KittyChannel> channels = new HashMap<Long, KittyChannel>();
 		String emote;
 		String emoteFix; 
+		channels.put(Long.getLong(uid), extractChannel(event));
 		for(int i = 0; i < emotes.size(); i++)
 		{
 			emote = emotes.get(i).toString();
@@ -147,7 +183,8 @@ public class ObjectBuilderFactory
 			else
 			{
 				// Construct a new guild with defaults				
-				guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString);
+				guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString,
+						new AudioUtils(event.getGuild(), playerManager), channels);
 				DatabaseManager.instance.globalRegister(guild);
 				guildCache.put(uid, guild);
 			}
@@ -156,6 +193,8 @@ public class ObjectBuilderFactory
 		return guild;
 	}
 	
+	
+	
 	// Explicitly locks: guildCache
 	public static KittyRole extractRole(GuildMessageReceivedEvent event)
 	{
@@ -166,7 +205,7 @@ public class ObjectBuilderFactory
 		// allowed to use the bot at a general level.
 		KittyRole role = KittyRole.General;
 
-		if(event.getAuthor().getId() == event.getGuild().getOwner().getUser().getId())
+		if(event.getAuthor().getId() == event.getGuild().getOwnerId())
 		{
 			role = KittyRole.Admin;
 		}
@@ -205,14 +244,13 @@ public class ObjectBuilderFactory
 	public static KittyChannel extractChannel(GuildMessageReceivedEvent event)
 	{
 		lazyInit();
-		
 		String channelID = event.getChannel().getId();
-		String guildID = event.getGuild().getId();
 		KittyChannel channel = null;
 		
 		synchronized(channelCache)
 		{
 			KittyChannel cachedChannel = channelCache.get(channelID);
+			boolean mature; 
 			
 			if(cachedChannel != null)
 			{
@@ -220,8 +258,8 @@ public class ObjectBuilderFactory
 			}
 			else
 			{
-				KittyGuild cachedGuild = guildCache.get(guildID);
-				channel = new KittyChannel(channelID, cachedGuild);
+				mature = event.getChannel().isNSFW();
+				channel = new KittyChannel(channelID, mature);
 				channelCache.put(channelID, channel);
 			}
 		}
@@ -365,13 +403,34 @@ public class ObjectBuilderFactory
 	{
 		lazyInit();
 		
-		kitty = new JDABuilder(AccountType.BOT).setToken(Ref.TestToken).buildBlocking();
-		kitty.getPresence().setGame(Game.playing("with digital yarn"));
+		// Determine token based on config. Default to test token.
+		String tokenToUse = Ref.TestToken;
+		switch(ConfigGlobals.getStartupMode())
+		{
+			case Release: tokenToUse = Ref.Token; break;
+			case PoguRelease: tokenToUse = Ref.PoguToken; break;
+			default: tokenToUse = Ref.TestToken; break;
+		}
+
+		// Construct bot based on token using the JDA Builder
+		JDABuilder builder = JDABuilder.createDefault(tokenToUse);
+		kitty = builder.build();
+		
+		// Set activity, and add primariy event listener.
+		updateActivity();
 		kitty.addEventListener(new Main());
 		
 		return new KittyCore(kitty);
 	}
 	
+	// Updates the bots current activity based on the globals value.
+	public static void updateActivity()
+	{
+		String activity = ConfigGlobals.getActivity();
+		GlobalLog.log(LogFilter.Core, "Updating activity to " + activity);
+		kitty.getPresence().setActivity(Activity.playing(activity));
+	}
+	
 	// Default construction of the command manager. In order to remotely resolve command enabling
 	// and disabling, what we do is construct the commands with a localized pair that is checked against
 	// the CommandEnabler object passed in. In theory, we could have multiple CommandManagers, tho we can

src/core/Stats.java

@@ -107,12 +107,12 @@ public class Stats
 	
 	public int getGuildCount()
 	{
-		return ObjectBuilderFactory.getGuildCount();
+		return ObjectBuilder.getGuildCount();
 	}
 	
 	public int getUserCount()
 	{
-		return ObjectBuilderFactory.getUserCount();
+		return ObjectBuilder.getUserCount();
 	}
 	
 	public ArrayList<Command> getAllCommands()

src/dataStructures/GenericImage.java

@@ -1,40 +1,57 @@
 package dataStructures;
 
-// This is a structure representing an image reponse for handing around.
+import java.awt.Color;
+
+// This is a structure representing an image response for handing around.
 public class GenericImage 
 {
-	private String artist; 
-	private String postURL; 
-	private String imageURL;
+	private KittyEmbed response= new KittyEmbed(); 
 	
 	public GenericImage(String artist, String postURL, String imageURL)
 	{
-		this.artist = artist; 
-		this.postURL = postURL; 
-		this.imageURL = imageURL; 
+		response.authorText = null;
+		response.color = new Color(0,0,0);
 	}
 	
 	public void editArtist(String artist)
 	{
-		this.artist = artist; 
+		response.authorText = artist;
+	}
+	
+	public void editAuthorImage(String URL)
+	{
+		response.authorImage = URL; 
 	}
 	
 	public void editPostURL(String postURL)
 	{
-		this.postURL = postURL; 
+		response.authorLink = postURL;
 	}
 	
 	public void editImageURL(String imageURL)
 	{
-		this.imageURL = imageURL; 
+		response.imageURL = imageURL; 
 	}
 	
-	public String toString()
+	public void editDescriptionText(String score) 
 	{
-		if(imageURL.isEmpty())
-		{
-			return "I couldn't find anything! Please try again!"; 
-		}
-		return "Artist: " + artist + "\n<" + postURL.trim()  + ">\n" + imageURL; 
+		response.descriptionText = score;
+	}
+	
+	public void editFooterText(String tags) 
+	{
+		response.footerText = tags; 
+	}
+	
+	public KittyEmbed output()
+	{
+		return response; 
+	}
+
+	public boolean isValid() 
+	{
+		if(response.title != null)
+			return true;
+		return false;
 	}
 }

src/dataStructures/KittyChannel.java

@@ -1,31 +1,15 @@
 package dataStructures;
 
-//import core.DatabaseTrackedObject;
 
-public class KittyChannel //extends DatabaseTrackedObject
+public class KittyChannel 
 {
 	public String uniqueID;
-	public KittyGuild guild;
+	public boolean mature;
 	
-	//public KittyRating rating;
-	//public bool isVoice;
-	
-	public KittyChannel(String uniqueID, KittyGuild guild)
+	public KittyChannel(String uniqueID, boolean mature)
 	{
 		//super(uniqueID);
 		this.uniqueID = uniqueID;
-		this.guild = guild;
+		this.mature = false;
 	}	
-
-//	@Override
-//	public String serialize() 
-//	{
-//		return "";
-//	}
-//
-//	@Override
-//	public void deSerialzie(String string) 
-//	{
-//		
-//	}
 }

src/dataStructures/KittyCore.java

@@ -1,6 +1,6 @@
 package dataStructures;
 
-import net.dv8tion.jda.core.JDA;
+import net.dv8tion.jda.api.JDA;
 
 public class KittyCore
 {

src/dataStructures/KittyGuild.java

@@ -1,11 +1,12 @@
 package dataStructures;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import core.DatabaseManager;
 import core.DatabaseTrackedObject;
 import utils.AdminControl;
-import utils.AudioUtils;
+import utils.audio.AudioUtils;
 
 // Context for a given guild for kittybot. Primarily designed to hold guild-specific settings.
 public class KittyGuild extends DatabaseTrackedObject
@@ -21,6 +22,7 @@ public class KittyGuild extends DatabaseTrackedObject
 	public ArrayList<String> hasVoted = new ArrayList<String>();
 	public ArrayList<String> emoji = new ArrayList<String>();
 	public ArrayList <KittyPoll> choices = new ArrayList<KittyPoll>();
+	public HashMap <Long, KittyChannel> channels;
 	public AdminControl control;
 	public AudioUtils audio;
 	public ArrayList <KittyUser> raffleUsersUnchosen = new ArrayList<KittyUser>();
@@ -42,8 +44,10 @@ public class KittyGuild extends DatabaseTrackedObject
 	}
 	
 	// Default content for a guild
-	public KittyGuild(String uniqueID, AdminControl adminControl, ArrayList <String> emoji)
+	public KittyGuild(String uniqueID, AdminControl adminControl, ArrayList <String> emoji, 
+			AudioUtils audio, HashMap<Long, KittyChannel> channels)
 	{
+		
 		super(uniqueID);
 		this.uniqueID = uniqueID;
 		roleList = new KittyTrackedVector(roleListName, uniqueID);
@@ -54,11 +58,14 @@ public class KittyGuild extends DatabaseTrackedObject
 		this.contentRating = KittyRating.Safe; 
 		this.polling = false;
 		this.emoji = emoji;
+		this.audio = audio;
+		this.channels = channels;
 		setCommandIndicator("!");
 	}
 	
 	// Explicit constructor
-	public KittyGuild(String commandIndicator, KittyRating contentRating, KittyUser guildOwner, String uniqueID)
+	public KittyGuild(String commandIndicator, KittyRating contentRating, KittyUser guildOwner, 
+			String uniqueID, AudioUtils audio, HashMap<Long, KittyChannel> channels)
 	{
 		super(uniqueID);
 		this.uniqueID = uniqueID;
@@ -70,6 +77,8 @@ public class KittyGuild extends DatabaseTrackedObject
 		this.contentRating = contentRating;
 		this.polling = false;
 		this.guildOwner = guildOwner;
+		this.audio = audio;
+		this.channels = channels;
 	}
 	
 	public String startPoll(String poll)
@@ -123,7 +132,7 @@ public class KittyGuild extends DatabaseTrackedObject
 	{
 		if(!raffleUsersChosen.contains(user) && !raffleUsersUnchosen.contains(user) && user.getBeans() > raffleCost && raffling)
 		{
-			user.changeBeans(raffleCost);
+			user.changeBeans(-raffleCost);
 			raffleUsersUnchosen.add(user);
 			return true;
 		}

src/dataStructures/KittyStartupMode.java

@@ -0,0 +1,18 @@
+package dataStructures;
+
+public enum KittyStartupMode 
+{
+	Dev(1), Release(2), PoguRelease(3);
+	
+	private final int value;
+	private KittyStartupMode(int value) 
+	{
+		this.value = value;
+	}
+	
+	public int getValue() 
+	{
+		return value;
+	}
+}
+

src/dataStructures/Response.java

@@ -3,11 +3,12 @@ package dataStructures;
 import java.io.File;
 import java.io.InputStream;
 
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.MessageBuilder;
-import net.dv8tion.jda.core.entities.TextChannel;
-import net.dv8tion.jda.core.events.message.guild.*;
-import net.dv8tion.jda.core.EmbedBuilder;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.utils.AttachmentOption;
 import utils.GlobalLog;
 import utils.LogFilter;
 
@@ -72,10 +73,14 @@ public class Response
 			embed.setThumbnail(thumbPath);
 			message.setEmbed(embed.build());
 			
+			GlobalLog.log("We're trying to send a response that has a locally defined thumbnail file...");
+			
 			File thumbImage = new File(thumbName);
 			if(thumbImage.exists())
 			{
-				event.getChannel().sendFile(thumbImage, thumbName, message.build()).queue();
+				// Used to eb as follows:
+				//event.getChannel().sendFile(thumbImage, thumbName, message.build()).queue();
+				event.getChannel().sendMessage(message.build()).queue();
 			}
 		}
 		else
@@ -143,4 +148,11 @@ public class Response
 		GlobalLog.log(LogFilter.Response, "Sending input stream response");
 		event.getChannel().sendFile(in, "return." + extension).queue();
 	}
+	
+	//Sends Kittybot as an object
+	//WARNING: THIS WILL EDIT THE ENTIRE BOT, DO NOT USE LIGHTLY 
+	public JDA getKitty()
+	{
+		return kitty;
+	}
 }

src/dataStructures/UserInput.java

@@ -2,9 +2,9 @@ package dataStructures;
 
 import java.util.List;
 
-import core.ObjectBuilderFactory;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
+import core.ObjectBuilder;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
 public class UserInput 
 {
@@ -93,7 +93,7 @@ public class UserInput
 		KittyUser [] KittyMentions = new KittyUser[JDAMentions.size()];
 		for(int i = 0; i < KittyMentions.length; i ++)
 		{
-			KittyMentions [i] = ObjectBuilderFactory.getKittyUser(event.getGuild().getId(), JDAMentions.get(i).getUser().getId());
+			KittyMentions [i] = ObjectBuilder.getKittyUser(event.getGuild().getId(), JDAMentions.get(i).getUser().getId());
 		}
 		return KittyMentions;
 	}

src/main/Main.java

@@ -8,7 +8,7 @@ import core.CharacterManager;
 import core.CommandEnabler;
 import core.CommandManager;
 import core.DatabaseManager;
-import core.ObjectBuilderFactory;
+import core.ObjectBuilder;
 import core.RPManager;
 import core.Stats;
 import core.lua.PluginManager;
@@ -18,13 +18,8 @@ import dataStructures.KittyGuild;
 import dataStructures.KittyUser;
 import dataStructures.Response;
 import dataStructures.UserInput;
-import net.dv8tion.jda.core.AccountType;
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.JDABuilder;
-import net.dv8tion.jda.core.entities.Game;
-import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.core.hooks.ListenerAdapter;
-import offline.Ref;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import utils.GlobalLog;
 
 // http://www.slf4j.org/ - this JDA logging tool has been disabled by specifying NOP implementation.
@@ -42,20 +37,21 @@ public class Main extends ListenerAdapter
 	private static PluginManager pluginManager;
 	private static CharacterManager charManager; 
 	
+	
 	// Initialization and setup
 	public static void main(String[] args) throws InterruptedException, LoginException, Exception
 	{
 		// Factory startup. The ordering is intentional.
 		GlobalLog.initialize();
-		databaseManager = ObjectBuilderFactory.constructDatabaseManager();
-		commandManager = ObjectBuilderFactory.constructCommandManager(CommandEnabler.instance); // TODO: Untangle this singleton
-		stats = ObjectBuilderFactory.constructStats(commandManager);
+		databaseManager = ObjectBuilder.constructDatabaseManager();
+		commandManager = ObjectBuilder.constructCommandManager(CommandEnabler.instance); // TODO: Untangle this singleton
+		stats = ObjectBuilder.constructStats(commandManager);
 		charManager = new CharacterManager();
-		rpManager = ObjectBuilderFactory.constructRPManager();
-		pluginManager = ObjectBuilderFactory.constructPluginManager();
+		rpManager = ObjectBuilder.constructRPManager();
+		pluginManager = ObjectBuilder.constructPluginManager();
 		
 		// Bot startup
-		kittyCore = ObjectBuilderFactory.constructKittyCore();
+		kittyCore = ObjectBuilder.constructKittyCore();
 	}
 
 	// When a message is sent in a server that kitty is in, this is what's called.
@@ -67,9 +63,9 @@ public class Main extends ListenerAdapter
 			return;
 		
 		// Factory objects
-		KittyUser user = ObjectBuilderFactory.extractUser(event);
-		KittyGuild guild = ObjectBuilderFactory.extractGuild(event);
-		KittyChannel channel = ObjectBuilderFactory.extractChannel(event);
+		KittyUser user = ObjectBuilder.extractUser(event);
+		KittyGuild guild = ObjectBuilder.extractGuild(event);
+		KittyChannel channel = ObjectBuilder.extractChannel(event);
 		
 		// Specialized uncached objects
 		Response response = new Response(event, kittyCore);
@@ -101,7 +97,8 @@ public class Main extends ListenerAdapter
 				{
 					if(pluginOutput.get(i).startsWith("!"))
 					{
-						commandManager.invokeOnNewThread(guild, channel, user, new UserInput(pluginOutput.get(i).substring(1), guild), response);
+						commandManager.invokeOnNewThread(guild, channel, user, 
+								new UserInput(pluginOutput.get(i).substring(1), guild), response);
 					}
 					else
 					{

src/main/Superintendent.java

@@ -14,7 +14,7 @@ import dataStructures.KittyRole;
 import dataStructures.KittyUser;
 import dataStructures.Response;
 import dataStructures.UserInput;
-import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import offline.Ref;
 
 // Manages the fiddly bits and upkeep of the bot - while not 

src/network/NetworkColiru.java

@@ -6,13 +6,40 @@ public class NetworkColiru
 {
 	public String compileCPlusPlus(String query)
 	{
-		// Escape characters that need escaping.
-		// Primarily types of whitespace.
+		// Escape characters that need escaping - mostly whitespace.
 		query = query.replace("\\n", "\\\\n");
 		query = query.replace("\\t", "\\\\t");
 		query = query.replace("\n", "\\n");
 		query = query.replace("\"", "\\\"");
 		query = query.replace("\t", "\\t");
+		query = query.replace("`", "");
+
+//		// replace backticks on only the edges of the string.
+//		StringBuilder s = new StringBuilder(query);
+//		
+//		for(int i = 0; i < s.length(); ++i)
+//		{
+//			if(s.charAt(i) != '`')
+//				break;
+//			
+//			s.setCharAt(i, ' ');
+//		}
+//		
+//		for(int i = s.length() - 1; i >= 0; --i)
+//		{
+//			if(s.charAt(i) != '`')
+//				break;
+//			
+//			s.setCharAt(i, ' ');
+//		}
+//		
+//		query = s.toString().trim();
+		
+		// Determine if the query is effectively empty or not. If it is, don't attempt to compile it.
+		if(query.trim().length() == 0)
+		{
+			return "I can't compile nothing!";
+		}
 
 		// Send the compilation request!
 		String result = HTTPUtils.sendPOSTRequest("http://coliru.stacked-crooked.com/compile"
@@ -21,7 +48,7 @@ public class NetworkColiru
 		// If we got a valid response...
 		if(!result.isEmpty())
 		{
-			result = "Here's what happened when I went to compiled that! \n```" + result + "```";
+			result = "Here's what happened when I went to compile that! \n```" + result + "```";
 		}
 		
 		return result;

src/network/NetworkDerpi.java

@@ -7,13 +7,14 @@ import utils.*;
 
 public class NetworkDerpi
 {
-	private final String mainURL = "https://derpibooru.org/search.json?q=";
+	private final String mainURL = "https://derpibooru.org/api/v1/json/search/images?q=";
 	private static final Gson jsonParser_ = new Gson();
 	
 	private class DerpiResponseObject
     {
         public String image;
         public String tags;
+        public String score; 
     }
     
     private class InitialRequest
@@ -23,22 +24,41 @@ public class NetworkDerpi
 
     public GenericImage getDerpi(String query) 
 	{
+    	String res;
     	GenericImage image = new GenericImage(" ", " ", " ");
     	query = query.trim();
 		query = query.replace(" ", ",");
-        String res = HTTPUtils.sendGETRequest(mainURL + query + "&random_image=1&key=" + Ref.derpiKey);
+        System.out.println(mainURL + query + "&sf=random&key=" + Ref.derpiKey);
+    	if(query.startsWith("ID:"))
+    	{
+    		res = HTTPUtils.sendGETRequest("https://derpibooru.org/api/v1/json/images/" + query.substring(3));
+    	}
+    	else
+    	{
+    		res =  HTTPUtils.sendGETRequest(mainURL + query + "&sf=random&key=" + Ref.derpiKey);
+    	}
+    	System.out.println(res);
         if(res != null)
         {
+        	InitialRequest obj;
             // Use class evaluation on an array of the response object to be able to hold multiple.
-            InitialRequest obj = jsonParser_.fromJson(res, InitialRequest.class);
+        	try 
+        	{
+        		 obj = jsonParser_.fromJson(res, InitialRequest.class);
+        	}
+        	catch(Exception e)
+        	{
+        		return null;
+        	}
+            
             if(res != null)
             {
-            	
                 String res2 = HTTPUtils.sendGETRequest("https://derpibooru.org/" + obj.id + ".json");
-                image.editPostURL("<https://derpibooru.org/" + obj.id +">");
+                image.editPostURL("https://derpibooru.org/" + obj.id);
                 DerpiResponseObject imageObj = jsonParser_.fromJson(res2, DerpiResponseObject.class);
                 
-                image.editImageURL("https:" + imageObj.image.substring(0, imageObj.image.indexOf('_')) + imageObj.image.substring(imageObj.image.lastIndexOf('.')));
+                image.editImageURL("https:" + imageObj.image.substring(0, imageObj.image.indexOf('_')) + 
+                		imageObj.image.substring(imageObj.image.lastIndexOf('.')));
                 if(imageObj.tags.contains("artist:"))
                 {
                 	String [] sepTags = imageObj.tags.split(",");
@@ -54,8 +74,20 @@ public class NetworkDerpi
                 			artists += sepTags[i].substring(sepTags[i].indexOf(":")+1);
                 		}
                 	}
+                	image.editAuthorImage("https://derpicdn.net/favicon.ico");
 
         			image.editArtist(artists);
+        			String tags = "";
+        			for(int i = 0; i < sepTags.length && i < 15; i++)
+                	{
+                		if(!sepTags[i].contains("artist:"))
+                		{
+                			tags += sepTags[i];
+                		}
+                	}
+        			
+        			image.editFooterText("[Tags]" + tags);
+        			image.editDescriptionText("Score: " + imageObj.score);
                 }
                 else
                 {
@@ -66,4 +98,46 @@ public class NetworkDerpi
         
 		return image;
 	}
+    
+    public GenericImage getDerpiByID(String id)
+    {
+    	GenericImage image = new GenericImage(" ", " ", " ");
+    	String artists = "";
+    	image.editAuthorImage("https://derpicdn.net/favicon.ico");
+    	String res;
+    	try
+    	{
+    		 res = HTTPUtils.sendGETRequest("https://derpibooru.org/" + id + ".json");
+    	}
+    	catch(Exception e)
+    	{
+    		return null;
+    	}
+    	DerpiResponseObject imageObj = jsonParser_.fromJson(res, DerpiResponseObject.class);
+    	if(imageObj.tags.contains("artist:"))
+        {
+        	String [] sepTags = imageObj.tags.split(",");
+        	for(int i = 0; i < sepTags.length; i++)
+        	{
+        		if(sepTags[i].contains("artist:"))
+        		{
+        			if(!artists.equals(""))
+        			{
+        				artists += " and ";
+        			}
+        			artists += sepTags[i].substring(sepTags[i].indexOf(":")+1);
+        		}
+        	}
+        }
+    	if(artists != "")
+    		image.editArtist(artists);
+    	else
+    		image.editArtist("Artist Unknown!");
+    	
+    	image.editFooterText("[Tags]" + imageObj.tags);
+		image.editDescriptionText("Score: " + imageObj.score);
+    	image.editImageURL("https:" + imageObj.image.substring(0, imageObj.image.indexOf('_')) + 
+        		imageObj.image.substring(imageObj.image.lastIndexOf('.')));
+    	return image;
+    }
 }

src/network/NetworkE6.java

@@ -0,0 +1,218 @@
+package network;
+
+import com.google.gson.Gson;
+
+import dataStructures.GenericImage;
+import offline.Ref;
+import utils.HTTPUtils;
+
+/**
+ * This is the e621 request class, designed for form and parse requests that
+ * use the e621 API, and is entirely static. 
+ * 
+ * If you ever find this class randomly not working,
+ * it may be a good idea to make sure the user agent string is set in 
+ * HTTPUtils to something other than a browser emulating string, or the default
+ * java one.
+ * 
+ * @author Wisp
+ * Edited by Rin
+ */
+public class NetworkE6
+{   
+	  ///////////////////////////////////////
+	 // Internal JSON class and variables //
+	//////////////////////////////////.////
+	private static final Gson jsonParser_ = new Gson();
+	private static final String API_ROOT = "https://e621.net/posts.json?";
+	private static int maxSearchResults_ = 10;
+	private static String[] blacklist = Ref.e621Blacklist;
+	
+	private class E6ResponseObject
+	{
+		// public variables matching the case and the type we want for JSON.
+		// There are many more fields, but if we don't provide some it just
+		// doesn't bother parsing them.
+		public E6ResponseObjectPost [] posts; 
+		
+	}
+	
+	private class E6ResponseObjectPost
+	{
+		public String id;
+		public String [] sources;
+		public String[] pools;
+		public String rating;
+		public E6ResponseObjectFile file;
+		public E6ResponseObjectScore score;
+		public E6ResponseObjectTags tags;
+		public E6ResponseObjectRelationships relationships;
+	}
+	
+	private class E6ResponseObjectFile
+	{
+		public String url;
+	}
+	
+	private class E6ResponseObjectScore
+	{
+		public String total; 
+	}
+	
+	private class E6ResponseObjectTags
+	{
+		public String[] general;
+		public String[] artist;
+	}
+	
+	private class E6ResponseObjectRelationships
+	{
+		public String has_children;
+		public String[] children; 
+	}
+	
+	
+
+	
+	
+	  ////////////////////
+	 // Static methods //
+	////////////////////
+	// Requests a specific image, then returns a few.
+	public GenericImage getE6(String input, String sauceNaoDependant)
+	{
+		GenericImage image = new GenericImage("","","");
+		boolean blacklisted;
+		// Clean up request and replace problematic characters for the query string.
+		input = input.trim();
+		input = input.replace("+", "%2B");
+		input = input.replace(" ", "%20");
+		
+		// Configure and send request. Note: Random ordering added as first
+		// tag by default. User-provided tags, therefore, will override it. 
+		// If order:score is provided, that will be honored over order:random.
+		String res = HTTPUtils.sendGETRequest(API_ROOT + "tags=order:random%20" + input + "&limit=" + maxSearchResults_);
+		if(res != null)
+		{
+			
+			// Use class evaluation on an array of the response imageObject to be able to hold multiple.
+			E6ResponseObject imageObj = jsonParser_.fromJson(res, E6ResponseObject.class);
+			// For now, we really just wanna display images and their source. 
+			// Append them all separately to a response string w/ some flavor text.
+			if(imageObj.posts.length < 1)
+			{
+				
+			}
+			else
+			{
+				for(int i = 0; i < imageObj.posts.length; ++i)
+				{
+					String [] TagsList = imageObj.posts[i].tags.general;
+					blacklisted = false;
+					for(int j = 0; j < blacklist.length; j++)
+					{
+						for(int k = 0; k < TagsList.length; k ++)
+						{
+							if(TagsList[k].equals(blacklist[j]))
+							{
+								System.out.println("BLACKLISTED " + blacklist[j]);
+								blacklisted = true;
+							}
+						}
+					}
+					
+					if(blacklisted)
+					{
+						return null;
+					}
+					// We will always have a file URL. That's a given.
+					image.editImageURL(imageObj.posts[i].file.url);
+					image.editPostURL("https://e621.net/posts/" + imageObj.posts[i].id);
+					if(imageObj.posts[i].tags.artist.length > 0)
+						{
+							String artists = imageObj.posts[i].tags.artist[0];
+							for(int j = 1; j < imageObj.posts[i].tags.artist.length; j++)
+								artists += ", " + imageObj.posts[i].tags.artist[j];
+							image.editArtist(artists);
+						}
+					else
+						image.editArtist("Artist Not Found!");
+					
+					image.editAuthorImage("https://e621.net/favicon.ico");
+					
+					String sources = "";
+					
+					if(imageObj.posts[i].sources != null)
+					{
+						for(int k = 0; k < imageObj.posts[i].sources.length; k ++)
+						{
+							if(!imageObj.posts[i].sources[k].endsWith(imageObj.posts[i].file.url.substring(imageObj.posts[i].file.url.lastIndexOf('.'))))
+							{
+								String source = imageObj.posts[i].sources[k];
+								if(source.contains("//www."))
+								{
+									source = source.substring(source.indexOf(".") + 1);
+									source = source.substring(0, source.indexOf('.'));
+								}
+								else 
+								{
+									source = source.substring(source.indexOf("/") + 2);
+									source = "[" + source.substring(0, source.indexOf('.')) + "]";
+									if(source.equals("[pbs]"))
+									{
+										source = "[twitter-cdn]";
+									}
+								}
+								sources += " [" + source + "](" + imageObj.posts[i].sources[k] + ") "; 
+							}
+						}
+						if(sources.equals(""))
+						{
+							sources = " Source not listed";
+						}
+						if(sauceNaoDependant.equals(""))
+						{
+							image.editDescriptionText("Score: " + imageObj.posts[i].score.total + "\n**Source:**" + sources);
+						}
+						else
+						{
+							image.editDescriptionText(sauceNaoDependant + "\nScore: " + imageObj.posts[i].score.total + "\n**Source:**" + sources);
+						}
+					}
+					else
+					{
+						image.editDescriptionText("Score: " + imageObj.posts[i].score.total);
+					}
+					
+					
+					String descTags = "";
+					if(imageObj.posts[i].tags.general.length > 15)
+					{
+						for(int o = 0; o < 15; o++)
+						{
+							descTags += imageObj.posts[i].tags.general[o] + ", ";
+						}
+						image.editFooterText("[Tags] " + descTags + " etc.");
+					}
+					else
+					{
+						for(int o = 0; o < imageObj.posts[i].tags.general.length - 1; o++)
+						{
+							descTags += imageObj.posts[i].tags.general[o] + ", ";
+						}
+						descTags += imageObj.posts[i].tags.general[imageObj.posts[i].tags.general.length-1] + "";
+						
+						image.editFooterText("[Tags] " + descTags);
+					}
+					
+					if(image.output().authorText != null)
+					{
+						return image; 
+					}
+				}
+			}
+			
+		}
+		return image;
+	}
+}

src/network/NetworkE621.java

@@ -1,104 +0,0 @@
-package network;
-
-import com.google.gson.Gson;
-import dataStructures.GenericImage;
-import offline.Ref;
-import utils.*;
-
-/**
- * This is the e621 request class, designed for form and parse requests that
- * use the e621 API, and is entirely static. 
- * 
- * If you ever find this class randomly not working,
- * it may be a good idea to make sure the user agent string is set in 
- * HTTPUtils to something other than a browser emulating string, or the default
- * java one.
- * 
- * @author Wisp
- * Edited by Rin
- */
-public class NetworkE621 
-{   
-	  ///////////////////////////////////////
-	 // Internal JSON class and variables //
-	//////////////////////////////////.////
-	private static final Gson jsonParser_ = new Gson();
-	private static final String API_ROOT = "https://e621.net/post/index.json?";
-	private static int maxSearchResults_ = 10;
-	private static String[] blacklist = Ref.e621Blacklist;
-	private class E621ResponseObject
-	{
-		// public varaibles matching the case and the type we want for JSON.
-		// There are many more fields, but if we don't provide some it just
-		// doesn't bother parsing them.
-		public String file_url;
-		public String id;
-		public String tags;
-		public String [] artist;
-	}
-
-	
-	
-	  ////////////////////
-	 // Static methods //
-	////////////////////
-	// Requests a specific image, then returns a few.
-	public GenericImage getE621(String input)
-	{
-
-		GenericImage image = new GenericImage("","","");
-		boolean blacklisted;
-		// Clean up request and replace problematic characters for the query string.
-		input = input.trim();
-		input = input.replace("+", "%2B");
-		input = input.replace(" ", "%20");
-		
-		// Configure and send request. Note: Random ordering added as first
-		// tag by default. User-provided tags, therefore, will override it. 
-		// If order:score is provided, that will be honored over order:random.
-		String res = HTTPUtils.sendPOSTRequest(API_ROOT
-			, "tags=order:random%20" + input + "&limit=" + maxSearchResults_);
-		
-		
-		if(res != null)
-		{
-			// Use class evaluation on an array of the response imageObject to be able to hold multiple.
-			E621ResponseObject[] imageObj = jsonParser_.fromJson(res, E621ResponseObject[].class);
-			
-			// For now, we really just wanna display images and their source. 
-			// Append them all separately to a response string w/ some flavor text.
-			if(imageObj.length < 1)
-			{
-				
-			}
-			else
-			{
-				for(int i = 0; i < imageObj.length; ++i)
-				{
-					blacklisted = false;
-					for(int j = 0; j < blacklist.length; j++)
-					{
-						if(imageObj[i].tags.contains(blacklist[j]))
-						{
-							blacklisted = true;
-						}
-					}
-					
-					if(blacklisted)
-					{
-						continue;
-					}
-					// We will always have a file URL. That's a given.
-					image.editImageURL(imageObj[i].file_url);
-					image.editPostURL("https://e621.net/post/show/" + imageObj[i].id);
-					if(imageObj[i].artist.length > 0)
-						image.editArtist(imageObj[i].artist[0]);
-					else
-						image.editArtist("Artist Not Found!");
-				}
-			}
-			
-		}
-		return image;
-	}
-}

src/network/NetworkSauceNAO.java

@@ -0,0 +1,56 @@
+package network;
+
+import java.util.List;
+
+import com.google.gson.Gson;
+
+import dataStructures.GenericImage;
+import offline.Ref;
+import utils.HTTPUtils;
+
+public class NetworkSauceNAO 
+{
+	private static final Gson jsonParser_ = new Gson();
+	private static final String API_ROOT = "https://saucenao.com/search.php?dbmask=268435456&output_type=2&numres=10&api_key=" + Ref.SauceNAOKey +"&url=";
+	NetworkE6 e6Sauce = new NetworkE6();
+	private class SauceNAOResponseObject
+	{
+		List<SauceNAOResult> results;
+	}
+	
+	private class SauceNAOResult
+	{
+		SauceNAOData data;
+		SauceNAOHeader header; 
+	}
+	
+	private class SauceNAOHeader
+	{
+		double similarity;
+	}
+	
+	private class SauceNAOData
+	{
+		String [] ext_urls;
+	}
+	
+	public GenericImage getSauce(String input)
+	{
+		double similarity; 
+		input = input.trim();
+		input = input.replace("+", "%2B");
+		input = input.replace(" ", "%20");
+		
+		String res = HTTPUtils.sendGETRequest(API_ROOT + input);
+		SauceNAOResponseObject sauce = jsonParser_.fromJson(res, SauceNAOResponseObject.class);
+		String sauceUrl = sauce.results.get(0).data.ext_urls[0];
+		similarity = sauce.results.get(0).header.similarity;
+		if(sauceUrl.startsWith("https://e621.net/post/show/"))
+		{
+			return e6Sauce.getE6("id:" + sauceUrl.substring(27), "Confidence: " + similarity + "%");
+		}
+		GenericImage unknown = new GenericImage("", "","");
+		return unknown;
+	}
+	
+}

src/network/NetworkTheColorAPI.java

@@ -73,9 +73,36 @@ public class NetworkTheColorAPI
 	
 	public ColorData lookupHex(String hex)
 	{
+		if(hex == null)
+			return null;
+		
+		hex = hex.replace("#", "").trim();
+		int len = hex.length();
+		
+		if(len == 0)
+			return null;
+		
+		// Verify we're either a full or half length color. Intermediate colors not supported.
+		// Alpha is also not supported.
+		if(len != 6 && len != 3)
+			return null;
+		
 		try
 		{
-			hex = hex.replace("#", "");
+			String hexUpper = hex.toUpperCase();
+			
+			// Verify the number is hex.
+			for(int i = 0; i < hexUpper.length(); ++i)
+			{
+				char current = hexUpper.charAt(i);
+				Boolean isValidNum = current >= '0' && current <= '9';
+				Boolean isValidChar = current >= 'A' && current <= 'F';
+				
+				// If it's not a valid character or a valid number, return null/
+				if(!isValidNum && !isValidChar)
+					return null;
+			}
+			
 			String response = HTTPUtils.sendGETRequest("https://www.thecolorapi.com/id?hex=" + hex);
 			
 			ColorData data = jsonParser.fromJson(response, ColorData.class);

src/network/NetworkYoutube.java

@@ -1,14 +1,56 @@
 package network;
 
-import com.google.api.services.youtube.YouTube;
+import java.util.List;
+
+import com.google.gson.Gson;
 
 import offline.Ref;
+import utils.HTTPUtils;
 
 public class NetworkYoutube 
 {
-	private static YouTube youtube;
+	 ///////////////////////////////////////
+	 // Internal JSON class and variables //
+	//////////////////////////////////.////
 	
-	public NetworkYoutube()
+	//https://www.youtube.com/watch?v=
+	
+	private static final Gson jsonParser_ = new Gson();
+	private static final String API_ROOT = "https://www.googleapis.com/youtube/v3/search?part=snippet&maxResults=10&q=";
+	
+	
+	// Use this as the base
+	public class YTOuter
 	{
+		List<YTInner> items;
+	}
+	
+	public class YTInner
+	{
+		YTID id;
+		YTSnippet snippet;
+	}
+	
+	public class YTID
+	{
+		String videoId;
+	}
+	
+	public class YTSnippet
+	{
+		String title;
+		String description;
+	}
+	
+	public String getYT(String input)
+	{
+		input = input.trim();
+		input = input.replace("+", "%2B");
+		input = input.replace(" ", "%20");
+		
+		String res = HTTPUtils.sendGETRequest(API_ROOT + input +
+				"&order=viewCount&type=video&topicId=%2Fm%2F04rlf&videoDefinition=high&key=" + Ref.youtube);
+		YTOuter videoObj = jsonParser_.fromJson(res, YTOuter.class);
+		return "https://www.youtube.com/watch?v=" + videoObj.items.get(0).id.videoId;
 	}
 }

src/utils/AdminControl.java

@@ -1,24 +1,30 @@
 package utils;
 
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.managers.GuildController;
+import java.util.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.internal.handle.GuildSetupController;
 
 public class AdminControl 
 { 
-	private GuildController guildCon; 
 	private Guild guild;
 	
 	public AdminControl(Guild guild)
 	{
 		this.guild = guild;
-		guildCon = guild.getController();
 	}
 	
 	public boolean addRole(String memberID, String roleName)
 	{
 		try
 		{
-			guildCon.addRolesToMember(guild.getMemberById(memberID), guild.getRolesByName(roleName, true)).complete();
+			Member member = guild.getMemberById(memberID);
+			List<Role> roles = guild.getRolesByName(roleName, true);
+			for(Role role : roles)
+			{
+				guild.addRoleToMember(member, role).complete();// submit instead? We need to queue.				
+			}
 		}
 		catch(Exception e)
 		{
@@ -31,7 +37,12 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.removeRolesFromMember(guild.getMemberById(memberID), guild.getRolesByName(roleName, true)).complete();
+			Member member = guild.getMemberById(memberID);
+			List<Role> roles = guild.getRolesByName(roleName, true);
+			for(Role role : roles)
+			{
+				guild.removeRoleFromMember(member, role).complete();
+			}
 		}
 		catch(Exception e)
 		{
@@ -44,7 +55,7 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.kick(guild.getMemberById(memberID)).complete();
+			guild.kick(guild.getMemberById(memberID)).complete();
 		}
 		catch(Exception e)
 		{
@@ -57,7 +68,7 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.setMute(guild.getMemberById(memberID), true);
+			guild.mute(guild.getMemberById(memberID), true);
 			return true;
 		}
 		catch(Exception e)
@@ -70,7 +81,7 @@ public class AdminControl
 	{
 		try
 		{
-			guildCon.ban(guild.getMemberById(memberID), 0).complete();
+			guild.ban(guild.getMemberById(memberID), 0).complete();
 			return true;
 		}
 		catch(Exception e)

src/utils/AudioUtils.java

@@ -1,48 +0,0 @@
-package utils;
-/***
- * https://developers.google.com/youtube/v3/code_samples/code_snippets?apix_params=%7B%22part%22%3A%22snippet%22%2C%22maxResults%22%3A25%2C%22q%22%3A%22surfing%22%7D
- * https://github.com/sedmelluq/LavaPlayer#jda-integration
- * https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/core/entities/VoiceChannel.html
- * https://developers.google.com/youtube/registering_an_application#Create_API_Keys
- */
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.managers.AudioManager;
-
-public class AudioUtils 
-{
-	private Guild guild;
-	AudioManager audio;
-	AudioPlayer player;
-	
-	
-	public AudioUtils(Guild guild)
-	{
-		this.guild = guild;
-		audio = guild.getAudioManager();
-	}
-	
-	public boolean joinChannel(String channelName)
-	{
-		VoiceChannel channel = null; 
-		channel = guild.getVoiceChannelsByName(channelName, true).get(0);
-		if(channel != null)
-		{
-			audio.openAudioConnection(channel);
-			return true;
-		}
-		return false; 
-	}
-	
-	public boolean leaveChannel()
-	{
-		if(audio.isConnected())
-		{
-			audio.closeAudioConnection();
-			return true;
-		}
-		return false;
-	}
-}

src/utils/GlobalLog.java

@@ -36,11 +36,13 @@ public class GlobalLog
 		System.out.println(logLine);
 	}
 	
+	public static void log(LogFilter filter, Object obj) { write(log, filter, obj.toString()); } 
 	public static void log(LogFilter filter, String msg) { write(log, filter, msg); } 
 	public static void warn(LogFilter filter, String msg) { write(warn, filter, msg); }
 	public static void error(LogFilter filter, String msg) { write(error, filter, msg); System.err.println(msg); System.err.flush(); }
 	public static void fatal(LogFilter filter, String msg) throws Exception { write(fatal, filter, msg); throw new Exception(msg); }
 	
+	public static void log(Object obj) { log(LogFilter.Debug, obj); } 
 	public static void log(String msg) { log(LogFilter.Debug, msg); } 
 	public static void warn(String msg) { warn(LogFilter.Debug, msg); }
 	public static void error(String msg) { error(LogFilter.Debug, msg); }

src/utils/audio/AudioUtils.java

@@ -0,0 +1,192 @@
+package utils.audio;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
+
+import net.dv8tion.jda.api.audio.AudioSendHandler;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.managers.AudioManager;
+
+
+public class AudioUtils 
+{
+	private Guild guild;
+	public AudioManager am;
+	public final AudioPlayer player;
+	public final AudioPlayerManager playerManager;
+	private ArrayList <AudioTrack> playlist = new ArrayList<AudioTrack>();
+	
+	
+	public AudioUtils(Guild guild, AudioPlayerManager playerManager)
+	{
+		player = playerManager.createPlayer();
+		this.playerManager = playerManager;
+		this.guild = guild;
+		am = guild.getAudioManager();
+		
+	}
+	
+	public boolean joinChannel(String channelName)
+	{
+		VoiceChannel channel = null; 
+		channel = guild.getVoiceChannelsByName(channelName, true).get(0);
+		if(channel != null)
+		{
+			am.openAudioConnection(channel);
+			return true;
+		}
+		return false; 
+	}
+	
+	public boolean leaveChannel()
+	{
+		if(am.isConnected())
+		{
+			am.closeAudioConnection();
+			return true;
+		}
+		return false;
+	}
+	
+	
+	public class AudioPlayerSendHandler implements AudioSendHandler 
+	{
+		private final AudioPlayer audioPlayer;
+		private AudioFrame lastFrame;
+		
+		public AudioPlayerSendHandler(AudioPlayer audioPlayer) 
+		{
+			this.audioPlayer = audioPlayer;
+		}
+		
+		@Override
+		public boolean canProvide() 
+		{
+			lastFrame = audioPlayer.provide();
+			return lastFrame != null;
+		}
+		
+		@Override 
+		public ByteBuffer provide20MsAudio()
+		{
+			ByteBuffer outputBuffer = ByteBuffer.wrap(lastFrame.getData());
+			return outputBuffer;
+		}
+		
+		@Override public boolean isOpus()
+		{
+			return true;
+		}
+	}
+	
+	public class SmallAudio implements AudioLoadResultHandler
+	{	
+		private SmallAudio(AudioPlayer player)
+		{
+		}
+		
+		@Override public void loadFailed(FriendlyException arg0) { }
+		@Override public void noMatches() { }
+		@Override public void playlistLoaded(AudioPlaylist arg0) { }
+		
+		@Override
+		public void trackLoaded(AudioTrack track)
+		{
+			synchronized(playlist)
+			{
+				playlist.add(track);
+			}
+		}
+	}
+	
+	
+	public String playVideo(String videoURL)
+	{
+		guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(player));
+		playerManager.loadItemOrdered(player, videoURL, new SmallAudio(player));
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {}
+		if(player.getPlayingTrack() == null)
+		{
+			MusicController control = new MusicController(player, playlist);
+			control.start();
+		}
+		return null;
+	}
+	
+	public int getVolume(AudioPlayer player)
+	{
+		return player.getVolume();
+	}
+	
+	public void changeVolume(AudioPlayer player, int newVol)
+	{
+		player.setVolume(newVol);
+	}
+	
+	public String skipVideo(AudioPlayer player)
+	{
+		player.stopTrack();
+		return "Skipped";
+	}
+	
+	public String stopPlayer(AudioPlayer player)
+	{
+		playlist.clear();
+		player.stopTrack();
+		return "Stopped";
+	}
+	
+	public ArrayList<AudioTrack> getPlaylist()
+	{
+		return playlist;
+	}
+}
+
+class MusicController extends Thread
+{
+	AudioPlayer player;
+	private ArrayList <AudioTrack> playlist;
+	
+	public MusicController(AudioPlayer player, ArrayList <AudioTrack> playlist)
+	{
+		this.player = player;
+		this.playlist = playlist; 
+	}
+	
+	@Override
+	public void run()
+	{
+		try {
+			Thread.sleep(5000);
+		} catch (InterruptedException e) {}
+		AudioTrack nowPlaying = null;
+		do 
+		{
+			if(!playlist.isEmpty() || nowPlaying != null)
+			{
+				if(player.getPlayingTrack() == null)
+				{
+					if(playlist.isEmpty())
+						nowPlaying = null;
+					else
+					{
+						nowPlaying = playlist.get(0);
+						playlist.remove(0);
+					}
+					player.startTrack(nowPlaying, false);
+				}
+			}
+		}
+		while(!playlist.isEmpty() || player.getPlayingTrack() != null);
+	}
+}

src/utils/audio/TrackScheduler.java

@@ -0,0 +1,56 @@
+package utils.audio;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
+import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * This class schedules tracks for the audio player. It contains the queue of tracks.
+ */
+public class TrackScheduler extends AudioEventAdapter {
+  private final AudioPlayer player;
+  private final BlockingQueue<AudioTrack> queue;
+
+  /**
+   * @param player The audio player this scheduler uses
+   */
+  public TrackScheduler(AudioPlayer player) {
+    this.player = player;
+    this.queue = new LinkedBlockingQueue<>();
+  }
+
+  /**
+   * Add the next track to queue or play right away if nothing is in the queue.
+   *
+   * @param track The track to play or add to queue.
+   */
+  public void queue(AudioTrack track) 
+  {
+    // Calling startTrack with the noInterrupt set to true will start the track only if nothing is currently playing. If
+    // something is playing, it returns false and does nothing. In that case the player was already playing so this
+    // track goes to the queue instead.
+    if (!player.startTrack(track, true)) {
+      queue.offer(track);
+    }
+  }
+
+  /**
+   * Start the next track, stopping the current one if it is playing.
+   */
+  public void nextTrack() {
+    // Start the next track, regardless of if something is already playing or not. In case queue was empty, we are
+    // giving null to startTrack, which is a valid argument and will simply stop the player.
+    player.startTrack(queue.poll(), false);
+  }
+
+  @Override
+  public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
+    // Only start the next track if the end reason is suitable for it (FINISHED or LOAD_FAILED)
+    if (endReason.mayStartNext) {
+      nextTrack();
+    }
+  }
+}