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,10 +18,12 @@
 "Localized Commands","dbstats",""
 "Localized Commands","defaultdance",""
 "Localized Commands","derp",""
-"Localized Commands","dew",""
+"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",""
@@ -47,13 +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","weh",""
 "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!"
@@ -62,12 +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","50"
+"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!"
@@ -110,9 +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","DewInfo","A fun little dev experiment!"
+"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."
@@ -143,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!"
@@ -182,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!"
@@ -238,13 +251,13 @@
 "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*"
 "Localized Strings","TradeBeansSuccess","%s gave %s %s beans!"
 "Localized Strings","TweetError","Tweet command failed!"
 "Localized Strings","TweetInfo","Kitty will tweet to her personal twitter account"
-"Localized Strings","WehInfo","Weh"
 "Localized Strings","WolframError","Something went wrong!"
 "Localized Strings","WolframInfo","Will query wolframalpha with your question and give a full image output of the answer"
 "Localized Strings","WolframNoArgs","You need to provide some arguments!"
@@ -272,10 +285,12 @@
 "Command Enabler","dbstats","1"
 "Command Enabler","defaultdance","1"
 "Command Enabler","derp","1"
-"Command Enabler","dew","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"
@@ -314,9 +329,9 @@
 "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","weh","1"
 "Command Enabler","wolfram","1"
 "Command Enabler","work","1"
 "Command Enabler","yeet","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,25 +1,45 @@
-package commands.general;
-
-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;
-
-public class CommandBetHistory extends Command
-{
-	public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("BetHistoryInfo"); }
-	
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		res.send(String.format(LocStrings.stub("BetHistoryOutput"), guild.beans.get()));
-	}
+package commands.beans;
+
+import java.io.File;
+
+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 utils.GlobalLog;
+import utils.LogFilter;
+
+public class CommandBetHistory extends Command
+{
+	public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("BetHistoryInfo"); }
+	
+	@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/benchmark/BenchmarkCommandCompare.java

@@ -2,11 +2,11 @@ package commands.benchmark;
 
 import java.util.List;
 
-import commands.benchmark.core.BenchmarkCommand;
-import commands.benchmark.core.BenchmarkEntry;
-import commands.benchmark.core.BenchmarkFormattable;
-import commands.benchmark.core.BenchmarkInput;
-import commands.benchmark.core.BenchmarkManager;
+import core.benchmark.BenchmarkCommand;
+import core.benchmark.BenchmarkEntry;
+import core.benchmark.BenchmarkFormattable;
+import core.benchmark.BenchmarkInput;
+import core.benchmark.BenchmarkManager;
 
 public class BenchmarkCommandCompare extends BenchmarkCommand 
 {

src/commands/benchmark/BenchmarkCommandFind.java

@@ -2,11 +2,7 @@ package commands.benchmark;
 
 import java.util.List;
 
-import commands.benchmark.core.BenchmarkCommand;
-import commands.benchmark.core.BenchmarkEntry;
-import commands.benchmark.core.BenchmarkFormattable;
-import commands.benchmark.core.BenchmarkInput;
-import commands.benchmark.core.BenchmarkManager;
+import core.benchmark.*;
 
 public class BenchmarkCommandFind extends BenchmarkCommand 
 {

src/commands/benchmark/BenchmarkCommandInfo.java

@@ -2,11 +2,11 @@ package commands.benchmark;
 
 import java.util.List;
 
-import commands.benchmark.core.BenchmarkCommand;
-import commands.benchmark.core.BenchmarkEntry;
-import commands.benchmark.core.BenchmarkFormattable;
-import commands.benchmark.core.BenchmarkInput;
-import commands.benchmark.core.BenchmarkManager;
+import core.benchmark.BenchmarkCommand;
+import core.benchmark.BenchmarkEntry;
+import core.benchmark.BenchmarkFormattable;
+import core.benchmark.BenchmarkInput;
+import core.benchmark.BenchmarkManager;
 import dataStructures.KittyEmbed;
 import java.awt.Color;
 

src/commands/dev/CommandDBFlush.java

@@ -1,35 +1,35 @@
-package commands.general;
-
-import core.Command;
-import core.Constants;
-import core.DatabaseManager;
-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;
-
-public class CommandDBFlush extends Command
-{
-	public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("DBFlushInfo"); }
-
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		int numUpdated = DatabaseManager.instance.upkeep();
-
-		KittyEmbed embed = new KittyEmbed();
-		embed.title = "Database queue flushed";
-		embed.descriptionText = "**Dirty:** " + numUpdated;
-		embed.color = Constants.ColorDefault;
-		
-		res.send(embed);
-	}
-}
+package commands.dev;
+
+import core.Command;
+import core.Constants;
+import core.DatabaseManager;
+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;
+
+public class CommandDBFlush extends Command
+{
+	public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("DBFlushInfo"); }
+
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		int numUpdated = DatabaseManager.instance.upkeep();
+
+		KittyEmbed embed = new KittyEmbed();
+		embed.title = "Database queue flushed";
+		embed.descriptionText = "**Dirty:** " + numUpdated;
+		embed.color = Constants.ColorDefault;
+		
+		res.send(embed);
+	}
+}

src/commands/dev/CommandDBStats.java

@@ -1,43 +1,43 @@
-package commands.general;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-import core.Command;
-import core.Constants;
-import core.DatabaseManager;
-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;
-
-public class CommandDBStats extends Command
-{
-	DateFormat dateFormat;
-	public CommandDBStats(KittyRole level, KittyRating rating)
-	{
-		super(level, rating);
-		dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-	}
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("DBStatsInfo"); }
-
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		KittyEmbed embed = new KittyEmbed();
-		embed.title = "Database Info";
-		embed.descriptionText = "**Tracked Items:** " + DatabaseManager.instance.getTrackedObjectsSize();
-		embed.descriptionText += "\n";
-		embed.descriptionText += "**Last Upkeep:** " + dateFormat.format(DatabaseManager.instance.getLastUpkeep()) + " UTC-7"; 
-		embed.color = Constants.ColorDefault;
-		
-		res.send(embed);
-	}
-}
+package commands.dev;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import core.Command;
+import core.Constants;
+import core.DatabaseManager;
+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;
+
+public class CommandDBStats extends Command
+{
+	DateFormat dateFormat;
+	public CommandDBStats(KittyRole level, KittyRating rating)
+	{
+		super(level, rating);
+		dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+	}
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("DBStatsInfo"); }
+
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		KittyEmbed embed = new KittyEmbed();
+		embed.title = "Database Info";
+		embed.descriptionText = "**Tracked Items:** " + DatabaseManager.instance.getTrackedObjectsSize();
+		embed.descriptionText += "\n";
+		embed.descriptionText += "**Last Upkeep:** " + dateFormat.format(DatabaseManager.instance.getLastUpkeep()) + " UTC-7"; 
+		embed.color = Constants.ColorDefault;
+		
+		res.send(embed);
+	}
+}

src/commands/dev/CommandDoWork.java

@@ -1,33 +1,33 @@
-package commands.general;
-
-import core.*;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Response;
-import dataStructures.UserInput;
-
-public class CommandDoWork extends Command
-{
-	// Required constructor
-	public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); }
-
-	@Override
-	public String getHelpText() { return LocStrings.stub("DoWorkInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		@SuppressWarnings("unused")
-		long thispieceofshit = 0; 
-		for(int i = 0; i < 200000000 + Math.random() * 30; i ++)
-		{
-			thispieceofshit += Math.log((double)i);
-		}
-		
-		res.send(LocStrings.stub("DoWorkFinished"));
-	}
+package commands.dev;
+
+import core.*;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+
+public class CommandDoWork extends Command
+{
+	// Required constructor
+	public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); }
+
+	@Override
+	public String getHelpText() { return LocStrings.stub("DoWorkInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		@SuppressWarnings("unused")
+		long thispieceofshit = 0; 
+		for(int i = 0; i < 200000000 + Math.random() * 30; i ++)
+		{
+			thispieceofshit += Math.log((double)i);
+		}
+		
+		res.send(LocStrings.stub("DoWorkFinished"));
+	}
 }

src/commands/dev/CommandHelpBuilder.java

@@ -1,136 +1,136 @@
-package commands.general;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import core.Command;
-import core.LocStrings;
-import core.Stats;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Response;
-import dataStructures.UserInput;
-import utils.GlobalLog;
-import utils.ImageUtils;
-
-public class CommandHelpBuilder extends Command {
-
-	public CommandHelpBuilder(KittyRole role, KittyRating rating) {
-		super(role, rating);
-	}
-
-	@Override
-	public String getHelpText() { return LocStrings.stub("HelpBuilderInfo"); }
-	
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		// Holds command groups
-		HashMap<KittyRole, ArrayList<Command>> commandsByRole = new HashMap<KittyRole, ArrayList<Command>>();
-		
-		// Populate w/ empty array lists
-		for(int i = 0; i < KittyRole.values().length; ++i)
-			commandsByRole.put(KittyRole.values()[i], new ArrayList<Command>());
-		
-		// Sort commands out
-		ArrayList<Command> commands = Stats.instance.getAllCommands();
-		for(int i = 0; i < commands.size(); ++i)
-		{
-			Command current = commands.get(i);
-			commandsByRole.get(current.requiredRole()).add(current);
-		}
-		
-		// Format outstring and send it back for now
-		String out = "";
-		out += populateSection(KittyRole.Admin, commandsByRole, true) + "\n";
-		out += populateSection(KittyRole.Mod, commandsByRole, true) + "\n";
-		out += populateSection(KittyRole.General, commandsByRole, false) + "\n";
-		
-		// Write out file
-		String filename = "buildhelp_out.txt";
-
-		try {
-			PrintWriter writer = new PrintWriter(filename);
-			writer.println(out);
-			writer.flush();
-			writer.close();
-		} 
-		catch (FileNotFoundException e)
-		{
-			GlobalLog.error(e.toString());
-			return;
-		}
-		
-		File file = new File(filename);
-		res.sendFile(file, "txt");
-		ImageUtils.blockingFileDelete(file);
-	}
-	
-	// Generates the section for a specific role, optionally adding spacing after for another section 
-	private String populateSection(KittyRole role, HashMap<KittyRole, ArrayList<Command>> commandsByRole, boolean delimitSection)
-	{
-		// Formatting variables
-		final String headerStart = "<h2>";
-		final String headerEnd = "</h2>\n";
-		final String sectionStart = "<p>\n";
-		final String sectionEnd = "</p>";
-		final String indent = "  ";
-		final String leadStart = "<code>";
-		final String leadEnd = "</code>";
-		final String leadFollow = ": ";	
-		final String lineDelimiter = "<br/>\n";
-		final String sectionDelimiter = "\n\n";
-		
-		String accumulated = "";
-		ArrayList<Command> commands = commandsByRole.get(role);
-		ArrayList<Command> commandsSoFar = new ArrayList<Command>();
-		if(commands.size() > 0)
-		{
-			String roleStr = role.toString();
-			roleStr = roleStr.substring(0, 1).toUpperCase() + roleStr.toLowerCase().substring(1);
-			
-			// Section header
-			accumulated += headerStart + roleStr + " commands" + headerEnd;
-			accumulated += sectionStart;
-			
-			// Section content
-			for(int i = 0; i < commands.size(); ++i)
-			{
-				accumulated += indent;
-				Command command = commands.get(i);
-				
-				// Skip multiples
-				if(commandsSoFar.contains(command))
-					continue;
-				else
-					commandsSoFar.add(command);
-				
-				// Write out all the keys and the help text
-				ArrayList<String> keys = command.registeredNames();
-				for(int j = 0; j < keys.size(); ++j)
-				{
-					if(j != 0)
-						accumulated += ", ";
-					
-					accumulated += leadStart + keys.get(j) + leadEnd;
-				}
-				
-				accumulated += leadFollow + commands.get(i).getHelpText() + lineDelimiter;;
-			}
-						
-			accumulated += sectionEnd;
-			
-			// Add spaces after if needed
-			if(delimitSection)
-				accumulated += sectionDelimiter;
-		}
-		
-		return accumulated;
-	}
+package commands.dev;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import core.Command;
+import core.LocStrings;
+import core.Stats;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+import utils.GlobalLog;
+import utils.ImageUtils;
+
+public class CommandHelpBuilder extends Command {
+
+	public CommandHelpBuilder(KittyRole role, KittyRating rating) {
+		super(role, rating);
+	}
+
+	@Override
+	public String getHelpText() { return LocStrings.stub("HelpBuilderInfo"); }
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		// Holds command groups
+		HashMap<KittyRole, ArrayList<Command>> commandsByRole = new HashMap<KittyRole, ArrayList<Command>>();
+		
+		// Populate w/ empty array lists
+		for(int i = 0; i < KittyRole.values().length; ++i)
+			commandsByRole.put(KittyRole.values()[i], new ArrayList<Command>());
+		
+		// Sort commands out
+		ArrayList<Command> commands = Stats.instance.getAllCommands();
+		for(int i = 0; i < commands.size(); ++i)
+		{
+			Command current = commands.get(i);
+			commandsByRole.get(current.requiredRole()).add(current);
+		}
+		
+		// Format outstring and send it back for now
+		String out = "";
+		out += populateSection(KittyRole.Admin, commandsByRole, true) + "\n";
+		out += populateSection(KittyRole.Mod, commandsByRole, true) + "\n";
+		out += populateSection(KittyRole.General, commandsByRole, false) + "\n";
+		
+		// Write out file
+		String filename = "buildhelp_out.txt";
+
+		try {
+			PrintWriter writer = new PrintWriter(filename);
+			writer.println(out);
+			writer.flush();
+			writer.close();
+		} 
+		catch (FileNotFoundException e)
+		{
+			GlobalLog.error(e.toString());
+			return;
+		}
+		
+		File file = new File(filename);
+		res.sendFile(file, "txt");
+		ImageUtils.blockingFileDelete(file);
+	}
+	
+	// Generates the section for a specific role, optionally adding spacing after for another section 
+	private String populateSection(KittyRole role, HashMap<KittyRole, ArrayList<Command>> commandsByRole, boolean delimitSection)
+	{
+		// Formatting variables
+		final String headerStart = "<h2>";
+		final String headerEnd = "</h2>\n";
+		final String sectionStart = "<p>\n";
+		final String sectionEnd = "</p>";
+		final String indent = "  ";
+		final String leadStart = "<code>";
+		final String leadEnd = "</code>";
+		final String leadFollow = ": ";	
+		final String lineDelimiter = "<br/>\n";
+		final String sectionDelimiter = "\n\n";
+		
+		String accumulated = "";
+		ArrayList<Command> commands = commandsByRole.get(role);
+		ArrayList<Command> commandsSoFar = new ArrayList<Command>();
+		if(commands.size() > 0)
+		{
+			String roleStr = role.toString();
+			roleStr = roleStr.substring(0, 1).toUpperCase() + roleStr.toLowerCase().substring(1);
+			
+			// Section header
+			accumulated += headerStart + roleStr + " commands" + headerEnd;
+			accumulated += sectionStart;
+			
+			// Section content
+			for(int i = 0; i < commands.size(); ++i)
+			{
+				accumulated += indent;
+				Command command = commands.get(i);
+				
+				// Skip multiples
+				if(commandsSoFar.contains(command))
+					continue;
+				else
+					commandsSoFar.add(command);
+				
+				// Write out all the keys and the help text
+				ArrayList<String> keys = command.registeredNames();
+				for(int j = 0; j < keys.size(); ++j)
+				{
+					if(j != 0)
+						accumulated += ", ";
+					
+					accumulated += leadStart + keys.get(j) + leadEnd;
+				}
+				
+				accumulated += leadFollow + commands.get(i).getHelpText() + lineDelimiter;;
+			}
+						
+			accumulated += sectionEnd;
+			
+			// Add spaces after if needed
+			if(delimitSection)
+				accumulated += sectionDelimiter;
+		}
+		
+		return accumulated;
+	}
 }

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,60 +1,60 @@
-package commands.general;
-
-import core.Command;
-import core.DatabaseManager;
-import core.LocStrings;
-import core.Stats;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Response;
-import dataStructures.UserInput;
-import utils.GlobalLog;
-import utils.LogFilter;
-
-// NOTE(wisp): This is a sort of special command.
-public class CommandShutdown extends Command
-{
-	public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); }
-
-	@Override
-	public String getHelpText() { return LocStrings.stub("ShutdownInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		// Flag the shutdown immediately.
-		Stats.instance.indicateShutdown();
-		
-		boolean isSafe = false;
-		switch(input.args.toLowerCase().trim())
-		{
-			case "s":
-			case "safe":
-			case "-s":
-			case "-safe":
-			case "snafe":
-				isSafe = true;
-				break;
-		}
-		
-		if(isSafe)
-		{
-			// Force upkeep, this works so long as upkeep is on the main thread.
-			res.sendImmediate(LocStrings.stub("ShutdownSafe"));
-			DatabaseManager.instance.upkeep(); 
-			GlobalLog.warn(LogFilter.Command, LocStrings.lookup("ShutdownSafe"));
-			
-			System.exit(0);
-		}
-		else
-		{
-			res.sendImmediate(LocStrings.stub("ShutdownUnsafe"));// "``");
-			GlobalLog.warn(LogFilter.Command, LocStrings.lookup("ShutdownSafe"));
-			System.exit(0);
-		}
-	}
+package commands.dev;
+
+import core.Command;
+import core.DatabaseManager;
+import core.LocStrings;
+import core.Stats;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.Response;
+import dataStructures.UserInput;
+import utils.GlobalLog;
+import utils.LogFilter;
+
+// NOTE(wisp): This is a sort of special command.
+public class CommandShutdown extends Command
+{
+	public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); }
+
+	@Override
+	public String getHelpText() { return LocStrings.stub("ShutdownInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		// Flag the shutdown immediately.
+		Stats.instance.indicateShutdown();
+		
+		boolean isSafe = false;
+		switch(input.args.toLowerCase().trim())
+		{
+			case "s":
+			case "safe":
+			case "-s":
+			case "-safe":
+			case "snafe":
+				isSafe = true;
+				break;
+		}
+		
+		if(isSafe)
+		{
+			// Force upkeep, this works so long as upkeep is on the main thread.
+			res.sendImmediate(LocStrings.stub("ShutdownSafe"));
+			DatabaseManager.instance.upkeep(); 
+			GlobalLog.warn(LogFilter.Command, LocStrings.lookup("ShutdownSafe"));
+			
+			System.exit(0);
+		}
+		else
+		{
+			res.sendImmediate(LocStrings.stub("ShutdownUnsafe"));// "``");
+			GlobalLog.warn(LogFilter.Command, LocStrings.lookup("ShutdownSafe"));
+			System.exit(0);
+		}
+	}
 }

src/commands/dev/CommandStats.java

@@ -1,89 +1,89 @@
-package commands.general;
-
-import core.Command;
-import core.LocStrings;
-import core.CommandManager.ThreadData;
-import core.Constants;
-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 core.Stats;
-
-public class CommandStats extends Command
-{
-	public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("StatsInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		// Variables
-		Stats stats = Stats.instance;
-		String out = "";
-		long seen = stats.getMessagesSeen();
-		long processed = stats.getCommandsProcessed();
-		
-		// General
-		out += "General";
-		out += "```\n";
-		out += " Messages observed: " + seen + "\n";
-		out += "Commands processed: " + processed + "\n";
-		out += "  Command invoke %: " + ((int)((processed / (float)seen) * 1000)) / 10.0f + "%\n";
-		out += "        Bot uptime: " + stats.getFormattedUptime() + "\n";
-		out += "```\n";
-		
-		// Health
-		out += "Health";
-		out += "```\n";
-		out += " SMT cores: " + stats.getCPUAvailable() + "\n";
-		
-		// If CPU load works on this OS, list it. -1.0 is the error state 
-		double CPULoad = stats.getSystemCPULoad();
-		out += CPULoad > -0.9
-			 ? "  CPU Load: " + (CPULoad * 100) + "%\n" : "";
-		
-		ThreadData data = stats.getThreadData();
-		Integer terminated = data.states.get(Thread.State.TERMINATED);
-		Integer runnable = data.states.get(Thread.State.RUNNABLE);
-		Integer blocked = data.states.get(Thread.State.BLOCKED);
-		Integer timed_waiting = data.states.get(Thread.State.TIMED_WAITING);
-		Integer waiting = data.states.get(Thread.State.WAITING);
-		
-		out += "   Threads:"
-			+ " run-" + (runnable == null ? 0 : runnable)
-			+ " block-" + (blocked == null ? 0 : blocked)
-			+ " sleep-" + (timed_waiting == null ? 0 : timed_waiting)
-			+ " wait-" + (waiting == null ? 0 : waiting)
-			+ " term-" + (terminated == null ? 0 : terminated)
-			+ "\n";
-		
-		out += "```\n";
-		
-		
-		// Cache
-		Integer guildCount = stats.getGuildCount();
-		Integer userCount = stats.getUserCount();
-		
-		out += "Cache";
-		out += "```\n"
-			+ "Cached Guilds: " + guildCount + "\n"
-			+ " Cached Users: " + userCount;
-		
-		out += "\n```";
-		
-		KittyEmbed embed = new KittyEmbed();
-		embed.title = "Bot Stats";
-		embed.descriptionText = out;
-		embed.color = Constants.ColorDefault;
-		
-		res.send(embed);
-	}
-}
+package commands.dev;
+
+import core.Command;
+import core.LocStrings;
+import core.CommandManager.ThreadData;
+import core.Constants;
+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 core.Stats;
+
+public class CommandStats extends Command
+{
+	public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("StatsInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		// Variables
+		Stats stats = Stats.instance;
+		String out = "";
+		long seen = stats.getMessagesSeen();
+		long processed = stats.getCommandsProcessed();
+		
+		// General
+		out += "General";
+		out += "```\n";
+		out += " Messages observed: " + seen + "\n";
+		out += "Commands processed: " + processed + "\n";
+		out += "  Command invoke %: " + ((int)((processed / (float)seen) * 1000)) / 10.0f + "%\n";
+		out += "        Bot uptime: " + stats.getFormattedUptime() + "\n";
+		out += "```\n";
+		
+		// Health
+		out += "Health";
+		out += "```\n";
+		out += " SMT cores: " + stats.getCPUAvailable() + "\n";
+		
+		// If CPU load works on this OS, list it. -1.0 is the error state 
+		double CPULoad = stats.getSystemCPULoad();
+		out += CPULoad > -0.9
+			 ? "  CPU Load: " + (CPULoad * 100) + "%\n" : "";
+		
+		ThreadData data = stats.getThreadData();
+		Integer terminated = data.states.get(Thread.State.TERMINATED);
+		Integer runnable = data.states.get(Thread.State.RUNNABLE);
+		Integer blocked = data.states.get(Thread.State.BLOCKED);
+		Integer timed_waiting = data.states.get(Thread.State.TIMED_WAITING);
+		Integer waiting = data.states.get(Thread.State.WAITING);
+		
+		out += "   Threads:"
+			+ " run-" + (runnable == null ? 0 : runnable)
+			+ " block-" + (blocked == null ? 0 : blocked)
+			+ " sleep-" + (timed_waiting == null ? 0 : timed_waiting)
+			+ " wait-" + (waiting == null ? 0 : waiting)
+			+ " term-" + (terminated == null ? 0 : terminated)
+			+ "\n";
+		
+		out += "```\n";
+		
+		
+		// Cache
+		Integer guildCount = stats.getGuildCount();
+		Integer userCount = stats.getUserCount();
+		
+		out += "Cache";
+		out += "```\n"
+			+ "Cached Guilds: " + guildCount + "\n"
+			+ " Cached Users: " + userCount;
+		
+		out += "\n```";
+		
+		KittyEmbed embed = new KittyEmbed();
+		embed.title = "Bot Stats";
+		embed.descriptionText = out;
+		embed.color = Constants.ColorDefault;
+		
+		res.send(embed);
+	}
+}

src/commands/dev/CommandTweet.java

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

src/commands/dew/CommandDew.java

@@ -1,43 +0,0 @@
-package commands.dew;
-
-import commands.dew.core.impl.DewCore;
-import core.Command;
-import core.LocStrings;
-import core.SubCommandFramework;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Response;
-import dataStructures.UserInput;
-
-public class CommandDew extends Command
-{	
-	public static DewCore core;
-	SubCommandFramework framework = new SubCommandFramework();
-
-	@Override
-	public String getHelpText() { return LocStrings.stub("DewInfo"); }
-	
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) 
-	{
-		framework.run(guild, channel, user, input).Call(res);
-	}
-	
-	public CommandDew(KittyRole level, KittyRating rating) 
-	{
-		super(level, rating);
-		
-		core = new DewCore(framework);
-		
-		framework.addCommand("luatest", new CommandDewLuaTest(KittyRole.Dev, KittyRating.Safe));
-		framework.addCommand("realm", new CommandDewRealm(KittyRole.Dev, KittyRating.Safe));
-		framework.addCommand("w", new CommandDewInput("w", KittyRole.Dev, KittyRating.Safe));
-		framework.addCommand("a", new CommandDewInput("a", KittyRole.Dev, KittyRating.Safe));
-		framework.addCommand("s", new CommandDewInput("s", KittyRole.Dev, KittyRating.Safe));
-		framework.addCommand("d", new CommandDewInput("d", KittyRole.Dev, KittyRating.Safe));
-		framework.addCommand("capture", new CommandDewCapture(KittyRole.Dev, KittyRating.Safe));
-	}
-}

src/commands/dew/CommandDewCapture.java

@@ -1,28 +0,0 @@
-package commands.dew;
-
-import commands.dew.adapter.KittyAdapterDewPlayer;
-import commands.dew.core.impl.DewCore;
-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 CommandDewCapture extends SubCommand
-{
-	public CommandDewCapture(KittyRole roleLevel, KittyRating contentRating)
-	{
-		super(roleLevel, contentRating);
-	}
-
-	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
-	{
-		KittyAdapterDewPlayer player = DewCore.getOrCreate(user);
-		DewCore.playersCaptured.add(player);
-		return null;//new SubCommandFormattable("captured input for " + user.name);
-	}
-}

src/commands/dew/CommandDewInput.java

@@ -1,41 +0,0 @@
-package commands.dew;
-
-import commands.dew.adapter.KittyAdapterDewPlayer;
-import commands.dew.core.impl.DewCore;
-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 CommandDewInput extends SubCommand
-{
-	String letter = "";
-	public CommandDewInput(String letter, KittyRole roleLevel, KittyRating contentRating)
-	{
-		super(roleLevel, contentRating);
-		this.letter = letter.toLowerCase();
-	}
-
-	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
-	{
-		KittyAdapterDewPlayer player = DewCore.getOrCreate(user);
-		
-		int x = player.getRealmX();
-		int y = player.getRealmY();
-		
-		switch(letter)
-		{
-			case "w": player.setRealmPos(x, y - 1); break;
-			case "a": player.setRealmPos(x - 1, y); break;
-			case "s": player.setRealmPos(x, y + 1); break;
-			case "d": player.setRealmPos(x + 1, y); break;
-		}
-		
-		return new SubCommandFormattable(DewCore.drawWorld(player));
-	}
-}

src/commands/dew/CommandDewLuaTest.java

@@ -1,67 +0,0 @@
-package commands.dew;
-
-import java.util.UUID;
-
-import commands.dew.core.data.*;
-import commands.dew.core.impl.DewLuaCore;
-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 CommandDewLuaTest extends SubCommand
-{
-	public CommandDewLuaTest(KittyRole roleLevel, KittyRating contentRating)
-	{
-		super(roleLevel, contentRating);
-	}
-
-	private String asCodeBlock(String string)
-	{
-		return "```lua\n" + string + "```"; 
-	}
-	
-	private String asCodeLine(String string)
-	{
-		return "`" + string + "`"; 
-	}
-	
-	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
-	{
-		String out = "";
-		
-		try
-		{
-			out += "**Testing writing...\n**";
-			DewRealm m = new DewRealm();
-			m.id = UUID.randomUUID().toString();
-			String out1 = DewLuaCore.toLua(m);
-			out += asCodeBlock(out1);
-			
-			String out2 = DewLuaCore.toLua(new DewMovementInfo());
-			out += asCodeBlock(out2);
-			
-			out += "**Testing Reading...**\n";
-			
-			DewRealm map = new DewRealm();
-			DewLuaCore.fromLua(map, out1);
-			out += "ID from 1st write: " + asCodeLine(map.id) + "\n";
-			
-			DewMovementInfo move = new DewMovementInfo();
-			DewLuaCore.fromLua(move, out2);
-			out += "Qualified type test: " + asCodeLine(move.toString()) + "\n";
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace(System.err);
-		}
-		
-	
-		return new SubCommandFormattable(out);
-	}
-}

src/commands/dew/CommandDewRealm.java

@@ -1,31 +0,0 @@
-package commands.dew;
-
-import commands.dew.adapter.KittyAdapterDewPlayer;
-import commands.dew.core.impl.DewCore;
-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 CommandDewRealm  extends SubCommand
-{
-	public CommandDewRealm(KittyRole roleLevel, KittyRating contentRating)
-	{
-		super(roleLevel, contentRating);
-	}
-	
-	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
-	{
-		KittyAdapterDewPlayer player = DewCore.getOrCreate(user);
-		
-		String out = DewCore.drawWorld(player);
-		
-		return new SubCommandFormattable(out);
-	}
-
-}

src/commands/dew/adapter/KittyAdapterDewPlayer.java

@@ -1,71 +0,0 @@
-package commands.dew.adapter;
-
-import commands.dew.core.api.IDewPlayer;
-import commands.dew.core.data.DewRealm;
-import dataStructures.KittyUser;
-
-public class KittyAdapterDewPlayer implements IDewPlayer 
-{
-	private KittyUser user;
-	private String realmID;
-	private int x;
-	private int y;
-	
-	public KittyAdapterDewPlayer(DewRealm realm, KittyUser user, int x, int y)
-	{
-		this.user = user;
-		this.realmID = realm.id;
-		this.x = x;
-		this.y = y;
-	}
-	
-	public String getVisual()
-	{
-		return user.name.length() >= 1 ? user.name.substring(0, 1) : "@";
-	}
-	
-	public boolean isUser(KittyUser user)
-	{
-		return user.uniqueID == user.uniqueID;
-	}
-
-	public void setRealmPos(int x, int y)
-	{
-		this.x = x;
-		this.y = y;
-	}
-	
-	  ////////////////////////////
-	 // Interface requirements //
-	////////////////////////////
-	
-	@Override
-	public String getName()
-	{
-		return user.name;
-	}
-
-	@Override
-	public String getUniqueID()
-	{
-		return user.uniqueID;
-	}
-
-	@Override
-	public String getCurrentRealmID()
-	{
-		return realmID;
-	}
-
-	@Override
-	public int getRealmX()
-	{
-		return x;
-	}
-
-	@Override
-	public int getRealmY()
-	{
-		return y;
-	}
-}

src/commands/dew/core/api/IDewCore.java

@@ -1,5 +0,0 @@
-package commands.dew.core.api;
-
-public interface IDewCore {
-
-}

src/commands/dew/core/api/IDewEntity.java

@@ -1,6 +0,0 @@
-package commands.dew.core.api;
-
-public interface IDewEntity 
-{
-	public String getUniqueID();
-}

src/commands/dew/core/api/IDewLuaCore.java

@@ -1,6 +0,0 @@
-package commands.dew.core.api;
-
-public interface IDewLuaCore
-{
-
-}

src/commands/dew/core/api/IDewLuaSerializable.java

@@ -1,6 +0,0 @@
-package commands.dew.core.api;
-
-public interface IDewLuaSerializable<T>
-{
-	// Type info for derived class encoded in T
-}

src/commands/dew/core/api/IDewMessage.java

@@ -1,19 +0,0 @@
-package commands.dew.core.api;
-
-// Commands are standalone pieces of data that contain only structures.
-// Each command is simplistic and represents an action in the game world.
-// Format:
-/*
-return
-{
-	name="SomeCommand",
-	data={
-		-- some object here --
-	}
-}
-*/
-public interface IDewMessage<T>
-{
-	public String getMessageName();
-	public T getData();
-}

src/commands/dew/core/api/IDewPlayer.java

@@ -1,9 +0,0 @@
-package commands.dew.core.api;
-
-public interface IDewPlayer extends IDewEntity
-{
-	public String getName();
-	public String getCurrentRealmID();
-	public int getRealmX();
-	public int getRealmY();
-}

src/commands/dew/core/data/DewMapTile.java

@@ -1,18 +0,0 @@
-package commands.dew.core.data;
-
-public enum DewMapTile 
-{
-	// Assign multiples of 2 for flag purposes
-	Default(0), Grass(1), Tree(2);
-	
-	private final int value;
-	private DewMapTile(int value) 
-	{
-		this.value = value;
-	}
-	
-	public int getValue() 
-	{
-		return value;
-	}
-}

src/commands/dew/core/data/DewMovementInfo.java

@@ -1,11 +0,0 @@
-package commands.dew.core.data;
-
-import commands.dew.core.api.IDewLuaSerializable;
-
-// Treat all data objects as structs for the purposes of this.
-public class DewMovementInfo implements IDewLuaSerializable<DewMovementInfo>
-{
-	public String entityID;
-	public int x;
-	public int y;
-}

src/commands/dew/core/data/DewRealm.java

@@ -1,9 +0,0 @@
-package commands.dew.core.data;
-
-import commands.dew.core.api.IDewLuaSerializable;
-
-public final class DewRealm implements IDewLuaSerializable<DewRealm>
-{
-	public String id = "0";
-	public int[][] map = new int[12][24]; // [Rows][Columns]
-}

src/commands/dew/core/impl/DewCore.java

@@ -1,174 +0,0 @@
-package commands.dew.core.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import commands.dew.adapter.KittyAdapterDewPlayer;
-import commands.dew.core.data.DewMapTile;
-import commands.dew.core.data.DewRealm;
-import core.SubCommandFormattable;
-import core.SubCommandFramework;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyUser;
-import dataStructures.Response;
-import dataStructures.UserInput;
-import utils.GlobalLog;
-import utils.LogFilter;
-
-public class DewCore 
-{
-	// TODO: Make realm and players both per-realm
-	public static String responseHeader = "[Dewdrop Forest]";
-	public static DewRealm realm;
-	public static List<KittyAdapterDewPlayer> players;
-	public static List<KittyAdapterDewPlayer> playersCaptured;
-	private static SubCommandFramework framework;
-	
-	public DewCore(SubCommandFramework framework)
-	{
-		DewCore.framework = framework;
-		DewCore.realm = new DewRealm();
-		DewCore.players = new ArrayList<KittyAdapterDewPlayer>();
-		DewCore.playersCaptured = new ArrayList<KittyAdapterDewPlayer>();
-		
-		for(int y = 0; y < realm.map.length; ++y)
-		{
-			for(int x = 0; x < realm.map[y].length; ++x)
-			{
-				realm.map[y][x] = DewMapTile.Grass.getValue();
-			}
-		}
-	}
-	
-	// Returns false if not captured, true if captured.
-	public static boolean ProcessIfCaptured(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput baseInput, Response res)
-	{
-		// Search for a captured player.
-		KittyAdapterDewPlayer player = null;
-		for(KittyAdapterDewPlayer p : playersCaptured)
-		{
-			if(p.getUniqueID() == user.uniqueID)
-			{
-				player = p;
-				break;
-			}
-		}
-		
-		// If we didn't find that the person is captured, return false since we don't need to do anything.
-		if(player == null)
-			return false;
-		
-		// See if we run anything - also, check to see if we need to exit.
-		boolean didRun = false;
-		try
-		{
-			UserInput toEdit = new UserInput(baseInput);
-			String key = toEdit.message.toLowerCase().trim();
-			toEdit.key = key;
-			toEdit.args = key;
-			switch(key)
-			{
-				case "cap":
-				case "capture":
-				case "uncapture":
-				case "stop":
-				case "quit":
-				case "exit":
-					playersCaptured.remove(player);
-					return false;
-			}
-			
-			SubCommandFormattable f = framework.run(guild, channel, user, toEdit);
-			
-			if(f != null)
-			{
-				Response.GetLastMessage((String last) -> {
-					if(last.contains(responseHeader))
-							Response.EditLastMessage(f.resString);
-				});
-				didRun = true;
-			}
-		}
-		catch(Exception e)
-		{
-			GlobalLog.error(LogFilter.Command, e);
-		}
-		
-		if(didRun)
-		{
-			baseInput.deleteOriginInput();
-		}
-		
-		return didRun;
-	}
-	
-	public static KittyAdapterDewPlayer getOrCreate(KittyUser user)
-	{
-		for(KittyAdapterDewPlayer player : players)
-		{
-			if(player.getUniqueID() == user.uniqueID)
-			{
-				return player;
-			}
-		}
-		
-		KittyAdapterDewPlayer player = new KittyAdapterDewPlayer(realm, user, 10, 10);
-		players.add(player);
-		return player;
-	}
-	
-	public static String drawWorld(KittyAdapterDewPlayer player)
-	{
-		// Build empty world buffer
-		String[][] worldBuffer = new String[realm.map.length][realm.map[0].length];
-		
-		// Build world
-		for(int y = 0; y < realm.map.length; ++y)
-		{
-			for(int x = 0; x < realm.map[y].length; ++x)
-			{
-				switch(DewMapTile.values()[realm.map[y][x]])
-				{
-					case Grass:
-						worldBuffer[y][x] = ",";
-						break;
-						
-					default:
-						worldBuffer[y][x] = " ";
-						break;
-				}
-			}
-		}		
-		
-		// Build players
-		for(KittyAdapterDewPlayer p : players)
-		{
-			worldBuffer[p.getRealmY()][p.getRealmX()] = p.getVisual();
-		}
-		
-		// Draw world
-		String out = "";
-		out += responseHeader + "\n";
-		out += "**Realm ID - ** `" + realm.id + "`\n";
-		
-		for(int y = 0; y < worldBuffer.length; ++y)
-		{
-			out += "`";
-			
-			for(int x = 0; x < worldBuffer[y].length; ++x)
-			{
-				out += worldBuffer[y][x];
-			}
-			
-			out += "`";
-			out += "\n";
-		}
-		
-		out += "**Stats**\n";
-		out += "`Player Name` - `" + player.getName() + "`\n";
-		out += "`Player Icon` - `" + player.getVisual() + "`\n";
-		
-		return out;
-	}
-}

src/commands/dew/core/impl/DewLuaCore.java

@@ -1,153 +0,0 @@
-package commands.dew.core.impl;
-
-import java.lang.reflect.Field;
-
-import org.luaj.vm2.Globals;
-import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.jse.JsePlatform;
-import commands.dew.core.api.IDewLuaCore;
-import commands.dew.core.api.IDewLuaSerializable;
-
-public class DewLuaCore implements IDewLuaCore
-{
-	private static Globals globalLuaCore = null;
-	
-	public static String toLua(IDewLuaSerializable<?> item)
-	{
-		return toLua(item, 0);
-	}
-	
-	private static String tab(int num)
-	{
-		String line = "";
-		
-		for(int i = 0; i < num; ++i)
-			line += "\t";
-		
-		return line;
-	}
-	
-	public static String toLua(IDewLuaSerializable<?> item, int tabs)
-	{
-		String out = tab(tabs) + "return {\n";
-		
-		// Set up type information
-		out += tab(tabs + 1) + "type=\"" + item.getClass().getTypeName() + "\",\n";
-		
-		
-		// Set up data information
-		out += tab(tabs + 1) + "data={\n";
-		
-		// Write data
-		Field[] fields = item.getClass().getDeclaredFields();
-		for(int i = 0; i < fields.length; ++i)
-		{
-			Field current = fields[i];
-			try
-			{
-				String line = "";
-				String fieldType = current.getType().toString().toLowerCase();
-				
-				line += tab(tabs + 2);
-				line += current.getName() + "=";
-				
-				switch(fieldType)
-				{
-					case "int": 
-						line += "" + current.get(item); 
-						break;
-						
-					case "class java.lang.string": 
-						String content = (String)current.get(item);
-						
-						if(content == null || content.length() == 0)
-							line += "\"\"";
-						else
-							line += "\"" + content + "\"";
-						
-						break;
-						
-						// wrong name
-					case "dewmaptile ":
-						line += "\"" + current.get(item).toString() + "\"";
-						break;
-						
-					default:
-						line += "nil";
-						System.err.print("Type could not be foramtted as lua: " + fieldType + "\n");
-						break;
-				}
-				
-				// If we're not the last line, add a comma.
-				if(i != fields.length - 1)
-					line += ",";
-				
-				out += line + "\n";
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace(System.err);
-			}
-		}
-		
-		out += tab(tabs + 1) + "}\n";
-		out += tab(tabs)+ "}\n";
-		return out;
-	}
-	
-
-	@SuppressWarnings({ "unchecked" })
-	public static <T> void fromLua(T obj, String lua)
-	{
-		if(globalLuaCore == null)
-		{
-			globalLuaCore = JsePlatform.standardGlobals();
-		}
-		
-		LuaValue luaResult = globalLuaCore.load(lua).call();
-		String type = luaResult.get("type").toString();
-		
-		try
-		{
-			LuaValue data = luaResult.get("data");
-			Class<T> concreteClass = (Class<T>) Class.forName(type);
-			
-			for(Field field : concreteClass.getDeclaredFields())
-			{
-				String name = field.getName();
-				LuaValue value = data.get(name);
-				
-				if(!value.isnil())
-				{
-					String fieldType = field.getType().toString().toLowerCase();
-					switch(fieldType)
-					{
-						case "int": 
-							field.set(obj, value.toint());
-							break;
-						
-						case "class java.lang.string": 
-							field.set(obj, value.toString());
-							break;
-							
-							// Not the right name
-						case "dewmaptile":
-						default: 
-							System.err.print("Could not set field of type: " + fieldType + "\n");
-							break;
-					}
-					
-				}
-				else
-				{
-					System.err.println("Field was not in lua: " + name);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace(System.err);
-		}
-	}
-}

src/commands/dew/core/messages/DewMessageMovement.java

@@ -1,8 +0,0 @@
-package commands.dew.core.messages;
-
-import commands.dew.core.api.IDewLuaSerializable;
-
-public class DewMessageMovement implements IDewLuaSerializable<DewMessageMovement>
-{
-
-}

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/CommandBenchmark.java

@@ -1,9 +1,9 @@
-package commands.benchmark;
+package commands.general;
 
-import commands.benchmark.core.BenchmarkFormattable;
-import commands.benchmark.core.BenchmarkFramework;
 import core.Command;
 import core.LocStrings;
+import core.benchmark.BenchmarkFormattable;
+import core.benchmark.BenchmarkFramework;
 import dataStructures.KittyChannel;
 import dataStructures.KittyGuild;
 import dataStructures.KittyRating;

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

@@ -31,28 +31,8 @@ public class CommandColor extends Command
 	@Override
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
-		if(input.args == null || input.args.length() == 0)
-		{
-			res.send(LocStrings.stub("ColorNotSearchable"));
-			return;
-		}
-
-		String toFind = null;
-		String[] split = input.args.split(" ");
-		
-		if(split.length >= 1)
-			toFind = split[0];
-		
 		// First, try and parse out the color to make sure we can even get it.
-		ColorData colorData = null;
-		if(toFind == null)
-		{
-			colorData = theColorAPI.lookupHex(input.args.trim());
-		}
-		else
-		{
-			colorData = theColorAPI.lookupHex(toFind.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

@@ -7,8 +7,6 @@ import java.util.Stack;
 import core.Command;
 import core.LocStrings;
 import dataStructures.*;
-import utils.GlobalLog;
-import utils.LogFilter;
 
 public class CommandRoll extends Command
 {
@@ -24,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;
@@ -34,7 +34,6 @@ public class CommandRoll extends Command
 		}
 		catch(Exception e)
 		{
-			GlobalLog.error(LogFilter.Command, e);
 			res.send(LocStrings.stub("RollError"));
 		}
 	}
@@ -44,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 '+':
@@ -125,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,18 +176,18 @@ public class CommandRoll extends Command
 
 	private int[] roll(int first, int second) 
 	{
-		int numberOfDice = first;
-		int diceSideCount = second;
-		int [] rolls = new int[numberOfDice];
+		int roll = 0;
+		int dice = first;
+		int sides = second;
+		int [] rolls = new int [dice];
 		
-		GlobalLog.log("number: " + numberOfDice + "   diceSides: " + diceSideCount);
-		
-		if(numberOfDice < 1)
+		if(dice < 1)
 			return new int[0];
-		
-		for(int i = 0; i < numberOfDice; i++)
-			rolls[i] = (int)(Math.random() * diceSideCount + 1);
-		
+		for(int i = 0; dice > i; i ++)
+		{
+			roll = (int)(Math.random() * sides) + 1;
+			rolls[i] = roll;
+		}
 		return rolls;
 	}
 

src/commands/general/CommandWeh.java

@@ -1,29 +0,0 @@
-package commands.general;
-
-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;
-
-public class CommandWeh extends Command {
-
-	public String getHelpText() { return LocStrings.stub("WehInfo"); }
-	
-	public CommandWeh(KittyRole roleLevel, KittyRating contentRating) {
-		super(roleLevel, contentRating);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	// The format for reutrning an emoji is: <:name:ID#>
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		res.send("<:weh:548301646929723393>");
-	}
-
-}

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,71 +1,71 @@
-package commands.general;
-
-import java.io.File;
-import java.io.IOException;
-import javax.imageio.ImageIO;
-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 utils.ImageOverlayBuilder;
-import utils.ImageUtils;
-
-public class CommandCatch extends Command
-{
-	// Required constructor
-	public CommandCatch(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	private static Long num = 0l;
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("CatchInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		String name = null;
-		File catchFile = null;
-		File catcheeFile = null;
-		
-		synchronized(num)
-		{
-			name = "catch_" + num + ".gif";
-			++num;
-		}
-		
-		try 
-		{
-			KittyUser person = null;
-			
-			if(input.mentions == null)
-				person = user; 
-			else
-				person = input.mentions[0];
-				
-			String catchFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
-			if(catchFilename == null)
-				return;
-			
-			catcheeFile = new File(catchFilename);
-			ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/catch/frames/", "catch ", 92, 18);
-			builder.overlay(ImageIO.read(catcheeFile), name);
-		} 
-		catch (IOException e) 
-		{
-			e.printStackTrace();
-		}
-		
-		catchFile = new File (name);
-		res.sendFile(catchFile, "gif");
-
-		// Thread cleanup...
-		ImageUtils.blockingFileDelete(catchFile);
-		ImageUtils.blockingFileDelete(catcheeFile);
-	}
-}
+package commands.images;
+
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+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 utils.ImageOverlayBuilder;
+import utils.ImageUtils;
+
+public class CommandCatch extends Command
+{
+	// Required constructor
+	public CommandCatch(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	private static Long num = 0l;
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("CatchInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		String name = null;
+		File catchFile = null;
+		File catcheeFile = null;
+		
+		synchronized(num)
+		{
+			name = "catch_" + num + ".gif";
+			++num;
+		}
+		
+		try 
+		{
+			KittyUser person = null;
+			
+			if(input.mentions == null)
+				person = user; 
+			else
+				person = input.mentions[0];
+				
+			String catchFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
+			if(catchFilename == null)
+				return;
+			
+			catcheeFile = new File(catchFilename);
+			ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/catch/frames/", "catch ", 92, 18);
+			builder.overlay(ImageIO.read(catcheeFile), name);
+		} 
+		catch (IOException e) 
+		{
+			e.printStackTrace();
+		}
+		
+		catchFile = new File (name);
+		res.sendFile(catchFile, "gif");
+
+		// Thread cleanup...
+		ImageUtils.blockingFileDelete(catchFile);
+		ImageUtils.blockingFileDelete(catcheeFile);
+	}
+}

src/commands/images/CommandDefaultDance.java

@@ -1,71 +1,71 @@
-package commands.general;
-
-import java.io.File;
-import java.io.IOException;
-import javax.imageio.ImageIO;
-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 utils.ImageOverlayBuilder;
-import utils.ImageUtils;
-
-public class CommandDefaultDance  extends Command
-{
-	// Required constructor
-	public CommandDefaultDance(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	private static Long num = 0l;
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("DefaultDanceInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		String name = null;
-		File dancerFile = null;
-		File danceeFile = null;
-		
-		synchronized(num)
-		{
-			name = "defaultDance_" + num + ".gif";
-			++num;
-		}
-		
-		try 
-		{
-			KittyUser person = null;
-			
-			if(input.mentions == null)
-				person = user; 
-			else
-				person = input.mentions[0];
-				
-			String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
-			if(yeeteeFilename == null)
-				return;
-			
-			danceeFile = new File(yeeteeFilename);
-			ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/dance/default/", "defaultDance ", 118, 18);
-			builder.overlay(ImageIO.read(danceeFile), name);
-		} 
-		catch (IOException e) 
-		{
-			e.printStackTrace();
-		}
-		
-		dancerFile = new File (name);
-		res.sendFile(dancerFile, "gif");
-
-		// Thread cleanup...
-		ImageUtils.blockingFileDelete(dancerFile);
-		ImageUtils.blockingFileDelete(danceeFile);
-	}
-}
+package commands.images;
+
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+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 utils.ImageOverlayBuilder;
+import utils.ImageUtils;
+
+public class CommandDefaultDance  extends Command
+{
+	// Required constructor
+	public CommandDefaultDance(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	private static Long num = 0l;
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("DefaultDanceInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		String name = null;
+		File dancerFile = null;
+		File danceeFile = null;
+		
+		synchronized(num)
+		{
+			name = "defaultDance_" + num + ".gif";
+			++num;
+		}
+		
+		try 
+		{
+			KittyUser person = null;
+			
+			if(input.mentions == null)
+				person = user; 
+			else
+				person = input.mentions[0];
+				
+			String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
+			if(yeeteeFilename == null)
+				return;
+			
+			danceeFile = new File(yeeteeFilename);
+			ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/dance/default/", "defaultDance ", 118, 18);
+			builder.overlay(ImageIO.read(danceeFile), name);
+		} 
+		catch (IOException e) 
+		{
+			e.printStackTrace();
+		}
+		
+		dancerFile = new File (name);
+		res.sendFile(dancerFile, "gif");
+
+		// Thread cleanup...
+		ImageUtils.blockingFileDelete(dancerFile);
+		ImageUtils.blockingFileDelete(danceeFile);
+	}
+}

src/commands/images/CommandPerish.java

@@ -1,105 +1,105 @@
-package commands.general;
-
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-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 utils.ImageUtils;
-
-public class CommandPerish  extends Command
-{
-	public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("PerishInfo"); };
-	
-	private static Long num = 0l;
-	
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		String name = null;
-		String filename = null;
-		File preProcessed = null;
-		File postProcessed = null;
-		
-		synchronized(num)
-		{
-			name = "perish_" + num + ".png";
-			++num;
-		}
-		
-		try 
-		{
-			try
-			{
-				filename = ImageUtils.downloadFromURL(input.args.split(" ")[0], ".png");
-				preProcessed = new File(filename);
-			}
-			catch(Exception e)
-			{
-				KittyUser person = user;
-				if(input.mentions != null)
-					person = input.mentions[0];
-				
-				filename = ImageUtils.downloadFromURL(person.avatarID, ".png");
-				if(filename == null)
-					return;
-			}
-			preProcessed = new File(filename);
-			applyTintEffect(ImageIO.read(preProcessed), name);
-		}
-		catch (IOException e) 
-		{
-			e.printStackTrace();
-		}
-		
-		postProcessed = new File(name);
-		res.sendFile(postProcessed, "png");
-		
-		ImageUtils.blockingFileDelete(preProcessed);
-		ImageUtils.blockingFileDelete(postProcessed);
-	}
-	
-	private static void applyTintEffect(BufferedImage image, String name) throws IOException
-	{
-		// Iterate over each column left to right and touch up each pixel
-		for(int x = 0; x < image.getWidth(); ++x)
-		{
-			for(int y = 0; y < image.getHeight(); ++y)
-			{
-				Color c = new Color(image.getRGB(x, y), true);
-				
-				int red = c.getRed();
-				red += 100;
-				if(red > 255)
-					red = 255;
-				
-				int green = c.getGreen();
-				
-				int blue = c.getBlue();
-				blue += 20;
-				if(blue > 255)
-					blue = 255;
-				
-				Color tinted = new Color(red, green, blue, c.getAlpha());
-				image.setRGB(x, y, tinted.getRGB());
-			}
-		}
-		
-		File outputfile = new File(name);
-		ImageIO.write(image, "png", outputfile);
-	}
-}
+package commands.images;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+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 utils.ImageUtils;
+
+public class CommandPerish  extends Command
+{
+	public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("PerishInfo"); };
+	
+	private static Long num = 0l;
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		String name = null;
+		String filename = null;
+		File preProcessed = null;
+		File postProcessed = null;
+		
+		synchronized(num)
+		{
+			name = "perish_" + num + ".png";
+			++num;
+		}
+		
+		try 
+		{
+			try
+			{
+				filename = ImageUtils.downloadFromURL(input.args.split(" ")[0], ".png");
+				preProcessed = new File(filename);
+			}
+			catch(Exception e)
+			{
+				KittyUser person = user;
+				if(input.mentions != null)
+					person = input.mentions[0];
+				
+				filename = ImageUtils.downloadFromURL(person.avatarID, ".png");
+				if(filename == null)
+					return;
+			}
+			preProcessed = new File(filename);
+			applyTintEffect(ImageIO.read(preProcessed), name);
+		}
+		catch (IOException e) 
+		{
+			e.printStackTrace();
+		}
+		
+		postProcessed = new File(name);
+		res.sendFile(postProcessed, "png");
+		
+		ImageUtils.blockingFileDelete(preProcessed);
+		ImageUtils.blockingFileDelete(postProcessed);
+	}
+	
+	private static void applyTintEffect(BufferedImage image, String name) throws IOException
+	{
+		// Iterate over each column left to right and touch up each pixel
+		for(int x = 0; x < image.getWidth(); ++x)
+		{
+			for(int y = 0; y < image.getHeight(); ++y)
+			{
+				Color c = new Color(image.getRGB(x, y), true);
+				
+				int red = c.getRed();
+				red += 100;
+				if(red > 255)
+					red = 255;
+				
+				int green = c.getGreen();
+				
+				int blue = c.getBlue();
+				blue += 20;
+				if(blue > 255)
+					blue = 255;
+				
+				Color tinted = new Color(red, green, blue, c.getAlpha());
+				image.setRGB(x, y, tinted.getRGB());
+			}
+		}
+		
+		File outputfile = new File(name);
+		ImageIO.write(image, "png", outputfile);
+	}
+}

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,72 +1,72 @@
-package commands.general;
-
-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;
-import utils.ImageOverlayBuilder;
-import utils.ImageUtils;
-
-public class CommandTeey extends Command
-{
-	// Required constructor
-	public CommandTeey(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	private static Long num = 0l;
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("TeeyInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		String name = null;
-		File teeyFile = null;
-		File teeyeeFile = null;
-		
-		synchronized(num)
-		{
-			name = "teey_" + num + ".gif";
-			++num;
-		}
-		
-		try 
-		{
-			KittyUser person = null;
-			
-			if(input.mentions == null)
-				person = user; 
-			else
-				person = input.mentions[0];
-				
-			String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
-			if(yeeteeFilename == null)
-				return;
-			
-			teeyeeFile = new File(yeeteeFilename);
-			ImageOverlayBuilder builder = new ImageOverlayBuilder(Constants.AssetDirectory + "teey/frames/", "teey ", 24, 18);
-			builder.overlay(ImageIO.read(teeyeeFile), name);
-		} 
-		catch (IOException e) 
-		{
-			e.printStackTrace();
-		}
-		
-		teeyFile = new File (name);
-		res.sendFile(teeyFile, "gif");
-
-		// Thread cleanup...
-		ImageUtils.blockingFileDelete(teeyFile);
-		ImageUtils.blockingFileDelete(teeyeeFile);
-	}
-}
+package commands.images;
+
+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;
+import utils.ImageOverlayBuilder;
+import utils.ImageUtils;
+
+public class CommandTeey extends Command
+{
+	// Required constructor
+	public CommandTeey(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	private static Long num = 0l;
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("TeeyInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		String name = null;
+		File teeyFile = null;
+		File teeyeeFile = null;
+		
+		synchronized(num)
+		{
+			name = "teey_" + num + ".gif";
+			++num;
+		}
+		
+		try 
+		{
+			KittyUser person = null;
+			
+			if(input.mentions == null)
+				person = user; 
+			else
+				person = input.mentions[0];
+				
+			String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
+			if(yeeteeFilename == null)
+				return;
+			
+			teeyeeFile = new File(yeeteeFilename);
+			ImageOverlayBuilder builder = new ImageOverlayBuilder(Constants.AssetDirectory + "teey/frames/", "teey ", 24, 18);
+			builder.overlay(ImageIO.read(teeyeeFile), name);
+		} 
+		catch (IOException e) 
+		{
+			e.printStackTrace();
+		}
+		
+		teeyFile = new File (name);
+		res.sendFile(teeyFile, "gif");
+
+		// Thread cleanup...
+		ImageUtils.blockingFileDelete(teeyFile);
+		ImageUtils.blockingFileDelete(teeyeeFile);
+	}
+}

src/commands/images/CommandYeet.java

@@ -1,72 +1,72 @@
-package commands.general;
-
-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;
-import utils.ImageOverlayBuilder;
-import utils.ImageUtils;
-
-public class CommandYeet extends Command
-{
-	// Required constructor
-	public CommandYeet(KittyRole level, KittyRating rating) { super(level, rating); }
-	
-	private static Long num = 0l;
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("YeetInfo"); }
-	
-	// Called when the command is run!
-	@Override 
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		String name = null;
-		File yeetFile = null;
-		File yeeteeFile = null;
-		
-		synchronized(num)
-		{
-			name = "yeet_" + num + ".gif";
-			++num;
-		}
-		
-		try 
-		{
-			KittyUser person = null;
-			
-			if(input.mentions == null)
-				person = user; 
-			else
-				person = input.mentions[0];
-				
-			String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
-			if(yeeteeFilename == null)
-				return;
-			
-			yeeteeFile = new File(yeeteeFilename);
-			ImageOverlayBuilder builder = new ImageOverlayBuilder(Constants.AssetDirectory + "yeet/frames/", "yeet ", 24, 18);
-			builder.overlay(ImageIO.read(yeeteeFile), name);
-		} 
-		catch (IOException e) 
-		{
-			e.printStackTrace();
-		}
-		
-		yeetFile = new File (name);
-		res.sendFile(yeetFile, "gif");
-
-		// Thread cleanup...
-		ImageUtils.blockingFileDelete(yeetFile);
-		ImageUtils.blockingFileDelete(yeeteeFile);
-	}
-}
+package commands.images;
+
+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;
+import utils.ImageOverlayBuilder;
+import utils.ImageUtils;
+
+public class CommandYeet extends Command
+{
+	// Required constructor
+	public CommandYeet(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	private static Long num = 0l;
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("YeetInfo"); }
+	
+	// Called when the command is run!
+	@Override 
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		String name = null;
+		File yeetFile = null;
+		File yeeteeFile = null;
+		
+		synchronized(num)
+		{
+			name = "yeet_" + num + ".gif";
+			++num;
+		}
+		
+		try 
+		{
+			KittyUser person = null;
+			
+			if(input.mentions == null)
+				person = user; 
+			else
+				person = input.mentions[0];
+				
+			String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png");
+			if(yeeteeFilename == null)
+				return;
+			
+			yeeteeFile = new File(yeeteeFilename);
+			ImageOverlayBuilder builder = new ImageOverlayBuilder(Constants.AssetDirectory + "yeet/frames/", "yeet ", 24, 18);
+			builder.overlay(ImageIO.read(yeeteeFile), name);
+		} 
+		catch (IOException e) 
+		{
+			e.printStackTrace();
+		}
+		
+		yeetFile = new File (name);
+		res.sendFile(yeetFile, "gif");
+
+		// Thread cleanup...
+		ImageUtils.blockingFileDelete(yeetFile);
+		ImageUtils.blockingFileDelete(yeeteeFile);
+	}
+}

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.*;
 
@@ -9,18 +10,24 @@ public class CommandMusicMain extends Command
 {
 	SubCommandFramework framework = new SubCommandFramework();
 	public CommandMusicMain(KittyRole level, KittyRating rating) 
-	{ 
+	{
 		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,5 +1,6 @@
 package commands.music;
 
+import core.LocStrings;
 import core.SubCommand;
 import core.SubCommandFormattable;
 import dataStructures.KittyChannel;
@@ -8,14 +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,13 +4,37 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import commands.benchmark.CommandBenchmark;
+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.dew.CommandDew;
+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.*;
@@ -64,7 +88,6 @@ public class CommandManager
 		this.register(LocCommands.stub("tweet"), new CommandTweet(KittyRole.Dev, KittyRating.Safe));
 		this.register(LocCommands.stub("dbflush"), new CommandDBFlush(KittyRole.Dev, KittyRating.Safe));
 		this.register(LocCommands.stub("dbstats"), new CommandDBStats(KittyRole.Dev, KittyRating.Safe));
-		this.register(LocCommands.stub("dew"), new CommandDew(KittyRole.Dev, KittyRating.Safe));
 		
 		// Admin
 		this.register(LocCommands.stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe));
@@ -110,7 +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("weh"), new CommandWeh(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/CommandThread.java

@@ -52,4 +52,4 @@ public class CommandThread  extends Thread
 			e.printStackTrace();
 		}
 	}
-}
+}

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

@@ -1,453 +1,512 @@
-package core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-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 core.lua.PluginManager;
-import dataStructures.*;
-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 offline.Ref;
-import utils.AdminControl;
-//import utils.AudioUtils;
-import utils.GlobalLog;
-import utils.LogFilter;
-
-// NOTE(wisp): 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 
-{
-	// Key: guild string id, Value: guild information
-	private static HashMap<String, KittyGuild> guildCache;
-
-	// Key: channel string id, Value: channel information
-	private static HashMap<String, KittyChannel> channelCache;
-	
-	// Key: guild string id + user string id, Value: user information
-	private static HashMap<String, KittyUser> userCache;
-	
-	// For tracking and managing object sync
-	private static DatabaseManager database;
-	
-	// Stats tracking and whatnot... for setting stats too internally potentially
-	private static Stats stats;
-	
-	// RPManger for tracking RP system
-	private static RPManager rpManager; 
-	
-	// Plugin manager
-	private static PluginManager pluginManager;
-	
-	// Command manager
-	private static CommandManager commandManager;
-	
-	//Audio track manager
-//	private static AudioPlayerManager audioPlayer = 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.
-	@SuppressWarnings("unused") private static LocStrings locStrings;
-	@SuppressWarnings("unused") private static LocCommands locCommands;
-	
-	// Config
-	@SuppressWarnings("unused") private static Config config;
-	
-	// Lazy initialization multithreaded mutex stuff to prevent explosions.
-	// TODO: Investigate using 'synchronized' instead potentially
-	private static boolean hasInitialized;
-	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;
-		
-		try
-		{
-			initMutex.acquire();
-			try
-			{
-				// structure initialization 
-				// Construct necessary data structures.
-				guildCache = new HashMap<String, KittyGuild>();
-				userCache = new HashMap<String, KittyUser>();
-				channelCache = new HashMap<String, KittyChannel>();
-				database = null;
-				stats = null;
-				
-				// 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.
-				config = new Config();
-			}
-			finally
-			{
-				initMutex.release();
-				hasInitialized = true;
-			}
-		}
-		catch(InterruptedException ie)
-		{
-			GlobalLog.error(LogFilter.Core, "Issue during object builder lazy initialization."
-				+ " The factory was not initialized, and kitty will not be able to continue functionally.");
-		}
-	}
-	
-	  ////////////////////////
-	 // Extraction Methods //
-	////////////////////////
-	
-	// Explicitly locks: guildCache
-	public static KittyGuild extractGuild(GuildMessageReceivedEvent event)
-	{
-		lazyInit();
-		
-		// Look up the guild. This process can only happen in a single-threaded way
-		// because of the nature of the cache. We wait until the last second to 
-		// look up the guild.
-		String uid = event.getGuild().getId();
-		
-		List<Emote> emotes = event.getGuild().getEmotes();
-		ArrayList<String> emotesString = new ArrayList<String>();
-		String emote;
-		String emoteFix; 
-		for(int i = 0; i < emotes.size(); i++)
-		{
-			emote = emotes.get(i).toString();
-			emoteFix = "<:" + emote.substring(2, emote.indexOf("("));
-			emoteFix += ":" + emote.substring(emote.indexOf("(")+1, emote.length()-1) + ">";
-			emotesString.add(emoteFix);
-		}
-		
-		// once we're lazily initialized, we can synchronize w/ the 
-		// guildCache object now instead of having to use a mutex.
-		KittyGuild guild = null;
-		synchronized (guildCache)
-		{
-			KittyGuild cachedGuild = guildCache.get(uid);
-			if(cachedGuild != null)
-			{
-				guild = cachedGuild;
-			}
-			else
-			{
-				// Construct a new guild with defaults
-				guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString);
-				DatabaseManager.instance.globalRegister(guild);
-				guildCache.put(uid, guild);
-			}
-		}
-
-		return guild;
-	}
-	
-	// Explicitly locks: guildCache
-	public static KittyRole extractRole(GuildMessageReceivedEvent event)
-	{
-		lazyInit();
-
-		// Looks up the user role. If none is found we check to see if they own
-		// the guild if not, they're assumed to be
-		// allowed to use the bot at a general level.
-		KittyRole role = KittyRole.General;
-		
-		if(event.getAuthor().getId() == event.getGuild().getOwner().getUser().getId())
-		{
-			role = KittyRole.Admin;
-		}
-		
-		String uid = event.getGuild().getId() + event.getAuthor().getId();
-		synchronized(userCache)
-		{
-			KittyUser cachedUser = userCache.get(uid);
-			if(cachedUser != null)
-				role = cachedUser.getRole();
-		}
-		
-		return role;
-	}
-	
-	// Explicitly locks: guildCache
-	// Extracts the content rating information it can from the provided event.
-	public static KittyRating extractContentRating(GuildMessageReceivedEvent event)
-	{
-		lazyInit();
-
-		// Look up content rating of the guild, returns a safe content rating.
-		KittyRating contentRating = KittyRating.Safe;
-		String uid = event.getGuild().getId();
-		synchronized(guildCache)
-		{
-			KittyGuild cachedGuild = guildCache.get(uid);
-			if(cachedGuild != null)
-				contentRating = cachedGuild.contentRating;
-		}
-		
-		return contentRating;
-	}
-	
-	// Implicitly locks guild cache by calling ExtractGuild
-	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);
-			
-			if(cachedChannel != null)
-			{
-				channel = cachedChannel;
-			}
-			else
-			{
-				KittyGuild cachedGuild = guildCache.get(guildID);
-				channel = new KittyChannel(channelID, cachedGuild);
-				channelCache.put(channelID, channel);
-			}
-		}
-		
-		return channel;
-	}
-	
-	// Implicitly locks guild cache by calling ExtractRole and ExtractGuild
-	public static KittyUser extractUser(GuildMessageReceivedEvent event)
-	{
-		lazyInit();
-		
-		String uid = event.getGuild().getId() + event.getAuthor().getId();
-		KittyUser user = null;
-		synchronized(userCache)
-		{			
-			KittyUser cachedUser = userCache.get(uid);
-			if(cachedUser != null)
-			{
-				updateUser(cachedUser, event.getMember());
-				user = cachedUser;
-			}
-			else
-			{
-				KittyRole role = extractRole(event);
-				KittyGuild guild = extractGuild(event);
-				
-				String name;
-				if(event.getMember().getNickname() == null)
-					name = event.getAuthor().getName();
-				else
-					name = event.getMember().getNickname();
-				
-				String discordID = event.getMember().getUser().getId(); 
-				String avatarID = event.getAuthor().getAvatarUrl();
-				user = new KittyUser(name, guild, role, uid, avatarID, discordID);
-				DatabaseManager.instance.globalRegister(user);
-				userCache.put(uid, user);
-			}
-		}
-		
-		if(event.getMessage().getMentionedMembers().isEmpty())
-			return user; 
-		
-		Member mentioned;
-		for(int i = 0; i < event.getMessage().getMentionedMembers().size(); i++)
-		{
-			mentioned = event.getMessage().getMentionedMembers().get(i);
-			if(mentioned.getNickname() != null)
-				extractUserByJDAUser(event.getGuild().getId(), mentioned.getNickname(), 
-					mentioned.getUser().getId(), mentioned.getUser().getAvatarUrl(), mentioned.getUser().getId());
-			else
-				extractUserByJDAUser(event.getGuild().getId(), mentioned.getUser().getName(), 
-						mentioned.getUser().getId(), mentioned.getUser().getAvatarUrl(), mentioned.getUser().getId());
-		}
-		
-		return user;
-	}
-	
-	// TODO: Clean up
-	public static KittyUser extractUserByJDAUser(String guildID, String name, String userID, String avatarID, String discordID)
-	{
-		lazyInit();
-		
-		String uid = guildID + userID;
-		KittyUser user = null;
-		synchronized(userCache)
-		{
-			KittyUser cachedUser = userCache.get(uid);
-			if(cachedUser != null)
-			{
-				if(name != null)
-					cachedUser.name = name;
-				
-				cachedUser.avatarID = avatarID;
-				user = cachedUser;
-			}
-			else
-			{
-				KittyRole role = KittyRole.General;
-				KittyGuild guild = guildCache.get(guildID);
-				user = new KittyUser(name, guild, role, uid, avatarID, discordID);
-				DatabaseManager.instance.globalRegister(user);
-				userCache.put(uid, user);
-			}
-		}
-		
-		return user; 
-	}
-	
-	// There is some redundant lookup occurring. If the user isn't cached yet, then we construct them and cache them.
-	// The assumption is made that the user does, in fact, exist.
-	public static KittyUser getKittyUser(String guildID, String userID)
-	{
-		String uid = guildID + userID;
-		KittyUser user = null;
-		synchronized(userCache)
-		{
-			user = userCache.get(uid);
-		}
-		
-		if(user == null)
-		{
-			Guild jdaGuild = kitty.getGuildById(guildID);
-			if(jdaGuild == null) return null;
-			
-			Member jdaMember = jdaGuild.getMemberById(userID);
-			if(jdaMember == null) return null;
-			
-			User jdaUser = jdaMember.getUser();
-			if(jdaUser == null) return null;
-			
-			user = extractUserByJDAUser(guildID, jdaMember.getNickname(), jdaUser.getId(), jdaUser.getAvatarUrl(), jdaUser.getId());
-			updateUser(user, jdaMember);
-		}
-		
-		return user; 
-	}
-	
-	// Updates a user's name appropriately based on nickname if available
-	public static void updateUser(KittyUser user,  Member member)
-	{
-		if(member.getNickname() == null)
-		{
-			user.name = member.getUser().getName();
-		}
-		else
-		{
-			user.name = member.getNickname();
-		}
-		
-		user.avatarID = member.getUser().getAvatarUrl();
-	}
-	
-	
-	  //////////////////////////
-	 // Construction Methods //
-	//////////////////////////
-	// Builds the core of the bot
-	public static KittyCore constructKittyCore() throws LoginException, InterruptedException
-	{
-		lazyInit();
-		
-		kitty = new JDABuilder(AccountType.BOT).setToken(Ref.TestToken).buildBlocking();
-		kitty.getPresence().setGame(Game.playing("with digital yarn"));
-		kitty.addEventListener(new Main());
-		
-		return new KittyCore(kitty);
-	}
-	
-	// 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
-	// only have one CommandEnabler.
-	public static CommandManager constructCommandManager(CommandEnabler commandEnabler)
-	{
-		lazyInit();
-		
-		if(commandManager == null)
-			commandManager = new CommandManager(commandEnabler);
-		
-		return commandManager;
-	}
-	
-	// Default database manager construction. It can be constructed 
-	// in different ways, and so we construct it outside of the constructor for 
-	// the factory  since it doesn't have to be present / can be elsewhere. 
-	// Effectively we cache the database here.
-	public static DatabaseManager constructDatabaseManager()
-	{
-		lazyInit();
-		
-		if(database == null)
-			database = new DatabaseManager();
-		
-		return database;
-	}
-	
-	public static Stats constructStats(CommandManager manager)
-	{
-		lazyInit();
-		
-		if(stats == null)
-			stats = new Stats(manager);
-		
-		return stats;
-	}
-	
-	public static RPManager constructRPManager()
-	{
-		lazyInit();
-		
-		if(rpManager == null)
-			rpManager = new RPManager();
-		
-		return rpManager;
-	}
-	
-	public static PluginManager constructPluginManager()
-	{
-		lazyInit();
-		
-		if(pluginManager == null)
-			pluginManager = new PluginManager(Constants.AssetDirectory + "plugins/");
-		
-		return pluginManager;
-	}
-	
-	
-	  /////////////////////
-	 // Utility Methods //
-	/////////////////////
-	
-	// Returns number of cached guilds (does not equal total users in the database, only what's in memory)
-	public static Integer getGuildCount()
-	{ 	synchronized(guildCache)
-		{
-			return guildCache.size();
-		}
-	}
-	
-	// Returns number of cached users (does not equal total users in the database, only what's in memory)
-	public static Integer getUserCount()
-	{ 	synchronized(userCache)
-		{
-			return userCache.size();
-		}
-	}
+package core;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+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.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.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: 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 ObjectBuilder 
+{
+	// Key: guild string id, Value: guild information
+	private static HashMap<String, KittyGuild> guildCache;
+
+	// Key: channel string id, Value: channel information
+	private static HashMap<String, KittyChannel> channelCache;
+	
+	// Key: guild string id + user string id, Value: user information
+	private static HashMap<String, KittyUser> userCache;
+	
+	// For tracking and managing object sync
+	private static DatabaseManager database;
+	
+	// Stats tracking and whatnot... for setting stats too internally potentially
+	private static Stats stats;
+	
+	// RPManger for tracking RP system
+	private static RPManager rpManager; 
+	
+	// Plugin manager
+	private static PluginManager pluginManager;
+	
+	// Command manager
+	private static CommandManager commandManager;
+	
+	//Audio track manager
+	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.
+	@SuppressWarnings("unused") private static LocStrings locStrings;
+	@SuppressWarnings("unused") private static LocCommands locCommands;
+	
+	// Config
+	@SuppressWarnings("unused") private static Config config;
+	
+	// Lazy initialization multithreaded mutex stuff to prevent explosions.
+	// TODO: Investigate using 'synchronized' instead potentially
+	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()
+	{
+		synchronized(hasInitialized)
+		{
+			if(hasInitialized)
+			{
+				return;
+			}
+		}
+		
+		try
+		{
+			initMutex.acquire();
+			try
+			{
+				// structure initialization 
+				// Construct necessary data structures.
+				guildCache = new HashMap<String, KittyGuild>();
+				userCache = new HashMap<String, KittyUser>();
+				channelCache = new HashMap<String, KittyChannel>();
+				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.
+				config = new Config();
+			}
+			finally
+			{
+				initMutex.release();
+				synchronized(hasInitialized)
+				{
+					hasInitialized = true;
+				}
+			}
+		}
+		catch(InterruptedException ie)
+		{
+			GlobalLog.error(LogFilter.Core, "Issue during object builder lazy initialization."
+				+ " The factory was not initialized, and kitty will not be able to continue functionally.");
+		}
+	}
+	
+	public static boolean getHasInitialized()
+	{
+		synchronized(hasInitialized)
+		{
+			return hasInitialized;
+		}
+	}
+	
+	  ////////////////////////
+	 // Extraction Methods //
+	////////////////////////
+	
+	// Explicitly locks: guildCache
+	public static KittyGuild extractGuild(GuildMessageReceivedEvent event)
+	{
+		lazyInit();
+		
+		// Look up the guild. This process can only happen in a single-threaded way
+		// because of the nature of the cache. We wait until the last second to 
+		// look up the guild.
+		String uid = event.getGuild().getId();
+		
+		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();
+			emoteFix = "<:" + emote.substring(2, emote.indexOf("("));
+			emoteFix += ":" + emote.substring(emote.indexOf("(")+1, emote.length()-1) + ">";
+			emotesString.add(emoteFix);
+		}
+		
+		// once we're lazily initialized, we can synchronize w/ the 
+		// guildCache object now instead of having to use a mutex.
+		KittyGuild guild = null;
+		synchronized (guildCache)
+		{
+			KittyGuild cachedGuild = guildCache.get(uid);
+			if(cachedGuild != null)
+			{
+				guild = cachedGuild;
+			}
+			else
+			{
+				// Construct a new guild with defaults				
+				guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString,
+						new AudioUtils(event.getGuild(), playerManager), channels);
+				DatabaseManager.instance.globalRegister(guild);
+				guildCache.put(uid, guild);
+			}
+		}
+
+		return guild;
+	}
+	
+	
+	
+	// Explicitly locks: guildCache
+	public static KittyRole extractRole(GuildMessageReceivedEvent event)
+	{
+		lazyInit();
+
+		// Looks up the user role. If none is found we check to see if they own
+		// the guild if not, they're assumed to be
+		// allowed to use the bot at a general level.
+		KittyRole role = KittyRole.General;
+
+		if(event.getAuthor().getId() == event.getGuild().getOwnerId())
+		{
+			role = KittyRole.Admin;
+		}
+		
+		String uid = event.getGuild().getId() + event.getAuthor().getId();
+		synchronized(userCache)
+		{
+			KittyUser cachedUser = userCache.get(uid);
+			if(cachedUser != null)
+				role = cachedUser.getRole();
+		}
+		
+		return role;
+	}
+	
+	// Explicitly locks: guildCache
+	// Extracts the content rating information it can from the provided event.
+	public static KittyRating extractContentRating(GuildMessageReceivedEvent event)
+	{
+		lazyInit();
+
+		// Look up content rating of the guild, returns a safe content rating.
+		KittyRating contentRating = KittyRating.Safe;
+		String uid = event.getGuild().getId();
+		synchronized(guildCache)
+		{
+			KittyGuild cachedGuild = guildCache.get(uid);
+			if(cachedGuild != null)
+				contentRating = cachedGuild.contentRating;
+		}
+		
+		return contentRating;
+	}
+	
+	// Implicitly locks guild cache by calling ExtractGuild
+	public static KittyChannel extractChannel(GuildMessageReceivedEvent event)
+	{
+		lazyInit();
+		String channelID = event.getChannel().getId();
+		KittyChannel channel = null;
+		
+		synchronized(channelCache)
+		{
+			KittyChannel cachedChannel = channelCache.get(channelID);
+			boolean mature; 
+			
+			if(cachedChannel != null)
+			{
+				channel = cachedChannel;
+			}
+			else
+			{
+				mature = event.getChannel().isNSFW();
+				channel = new KittyChannel(channelID, mature);
+				channelCache.put(channelID, channel);
+			}
+		}
+		
+		return channel;
+	}
+	
+	// Implicitly locks guild cache by calling ExtractRole and ExtractGuild
+	public static KittyUser extractUser(GuildMessageReceivedEvent event)
+	{
+		lazyInit();
+		
+		String uid = event.getGuild().getId() + event.getAuthor().getId();
+		KittyUser user = null;
+		synchronized(userCache)
+		{			
+			KittyUser cachedUser = userCache.get(uid);
+			if(cachedUser != null)
+			{
+				updateUser(cachedUser, event.getMember());
+				user = cachedUser;
+			}
+			else
+			{
+				KittyRole role = extractRole(event);
+				KittyGuild guild = extractGuild(event);
+				
+				String name;
+				if(event.getMember().getNickname() == null)
+					name = event.getAuthor().getName();
+				else
+					name = event.getMember().getNickname();
+				
+				String discordID = event.getMember().getUser().getId(); 
+				String avatarID = event.getAuthor().getAvatarUrl();
+				user = new KittyUser(name, guild, role, uid, avatarID, discordID);
+				DatabaseManager.instance.globalRegister(user);
+				userCache.put(uid, user);
+			}
+		}
+		
+		if(event.getMessage().getMentionedMembers().isEmpty())
+			return user; 
+		
+		Member mentioned;
+		for(int i = 0; i < event.getMessage().getMentionedMembers().size(); i++)
+		{
+			mentioned = event.getMessage().getMentionedMembers().get(i);
+			if(mentioned.getNickname() != null)
+				extractUserByJDAUser(event.getGuild().getId(), mentioned.getNickname(), 
+					mentioned.getUser().getId(), mentioned.getUser().getAvatarUrl(), mentioned.getUser().getId());
+			else
+				extractUserByJDAUser(event.getGuild().getId(), mentioned.getUser().getName(), 
+						mentioned.getUser().getId(), mentioned.getUser().getAvatarUrl(), mentioned.getUser().getId());
+		}
+		
+		return user;
+	}
+	
+	// TODO: Clean up
+	public static KittyUser extractUserByJDAUser(String guildID, String name, String userID, String avatarID, String discordID)
+	{
+		lazyInit();
+		
+		String uid = guildID + userID;
+		KittyUser user = null;
+		synchronized(userCache)
+		{
+			KittyUser cachedUser = userCache.get(uid);
+			if(cachedUser != null)
+			{
+				if(name != null)
+					cachedUser.name = name;
+				
+				cachedUser.avatarID = avatarID;
+				user = cachedUser;
+			}
+			else
+			{
+				KittyRole role = KittyRole.General;
+				KittyGuild guild = guildCache.get(guildID);
+				user = new KittyUser(name, guild, role, uid, avatarID, discordID);
+				DatabaseManager.instance.globalRegister(user);
+				userCache.put(uid, user);
+			}
+		}
+		
+		return user; 
+	}
+	
+	// There is some redundant lookup occurring. If the user isn't cached yet, then we construct them and cache them.
+	// The assumption is made that the user does, in fact, exist.
+	public static KittyUser getKittyUser(String guildID, String userID)
+	{
+		String uid = guildID + userID;
+		KittyUser user = null;
+		synchronized(userCache)
+		{
+			user = userCache.get(uid);
+		}
+		
+		if(user == null)
+		{
+			Guild jdaGuild = kitty.getGuildById(guildID);
+			if(jdaGuild == null) return null;
+			
+			Member jdaMember = jdaGuild.getMemberById(userID);
+			if(jdaMember == null) return null;
+			
+			User jdaUser = jdaMember.getUser();
+			if(jdaUser == null) return null;
+			
+			user = extractUserByJDAUser(guildID, jdaMember.getNickname(), jdaUser.getId(), jdaUser.getAvatarUrl(), jdaUser.getId());
+			updateUser(user, jdaMember);
+		}
+		
+		return user; 
+	}
+	
+	// Updates a user's name appropriately based on nickname if available
+	public static void updateUser(KittyUser user,  Member member)
+	{
+		if(member.getNickname() == null)
+		{
+			user.name = member.getUser().getName();
+		}
+		else
+		{
+			user.name = member.getNickname();
+		}
+		
+		user.avatarID = member.getUser().getAvatarUrl();
+	}
+	
+	
+	  //////////////////////////
+	 // Construction Methods //
+	//////////////////////////
+	// Builds the core of the bot
+	public static KittyCore constructKittyCore() throws LoginException, InterruptedException
+	{
+		lazyInit();
+		
+		// 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
+	// only have one CommandEnabler.
+	public static CommandManager constructCommandManager(CommandEnabler commandEnabler)
+	{
+		lazyInit();
+		
+		if(commandManager == null)
+			commandManager = new CommandManager(commandEnabler);
+		
+		return commandManager;
+	}
+	
+	// Default database manager construction. It can be constructed 
+	// in different ways, and so we construct it outside of the constructor for 
+	// the factory  since it doesn't have to be present / can be elsewhere. 
+	// Effectively we cache the database here.
+	public static DatabaseManager constructDatabaseManager()
+	{
+		lazyInit();
+		
+		if(database == null)
+			database = new DatabaseManager();
+		
+		return database;
+	}
+	
+	public static Stats constructStats(CommandManager manager)
+	{
+		lazyInit();
+		
+		if(stats == null)
+			stats = new Stats(manager);
+		
+		return stats;
+	}
+	
+	public static RPManager constructRPManager()
+	{
+		lazyInit();
+		
+		if(rpManager == null)
+			rpManager = new RPManager();
+		
+		return rpManager;
+	}
+	
+	public static PluginManager constructPluginManager()
+	{
+		lazyInit();
+		
+		if(pluginManager == null)
+			pluginManager = new PluginManager(Constants.AssetDirectory + "plugins/");
+		
+		return pluginManager;
+	}
+	
+	
+	  /////////////////////
+	 // Utility Methods //
+	/////////////////////
+	
+	// Returns number of cached guilds (does not equal total users in the database, only what's in memory)
+	public static Integer getGuildCount()
+	{ 	synchronized(guildCache)
+		{
+			return guildCache.size();
+		}
+	}
+	
+	// Returns number of cached users (does not equal total users in the database, only what's in memory)
+	public static Integer getUserCount()
+	{ 	synchronized(userCache)
+		{
+			return userCache.size();
+		}
+	}
 }

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/core/SubCommandFramework.java

@@ -7,7 +7,6 @@ import dataStructures.KittyGuild;
 import dataStructures.KittyUser;
 import dataStructures.UserInput;
 import utils.GlobalLog;
-import utils.LogFilter;
 
 public class SubCommandFramework 
 {
@@ -42,14 +41,10 @@ public class SubCommandFramework
 		}
 		catch(Exception e)
 		{
-			GlobalLog.error(LogFilter.Command, e);
-			
 			String help = Stats.instance.getHelpText(input.key);
-			
 			if(help != null)
 				return new SubCommandFormattable(help);
-			
-			return new SubCommandFormattable("Whoops! Internal subcommand error!");
+			return new SubCommandFormattable("Something has gone very wrong.");
 		}
 	}
 }

src/core/benchmark/BenchmarkCommand.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 public abstract class BenchmarkCommand
 {

src/core/benchmark/BenchmarkEntry.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 public class BenchmarkEntry
 {

src/core/benchmark/BenchmarkFormattable.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 import dataStructures.KittyEmbed;
 import dataStructures.Response;

src/core/benchmark/BenchmarkFramework.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 import java.util.HashMap;
 import commands.benchmark.*;

src/core/benchmark/BenchmarkInput.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 import utils.StringUtils;
 

src/core/benchmark/BenchmarkLog.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 import utils.GlobalLog;
 

src/core/benchmark/BenchmarkManager.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 import java.time.Instant;
 import java.util.ArrayList;

src/core/benchmark/BenchmarkType.java

@@ -1,4 +1,4 @@
-package commands.benchmark.core;
+package core.benchmark;
 
 public enum BenchmarkType
 {

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 String uniqueID;
-	public KittyGuild guild;
-	
-	//public KittyRating rating;
-	//public bool isVoice;
-	
-	public KittyChannel(String uniqueID, KittyGuild guild)
-	{
-		//super(uniqueID);
-		this.uniqueID = uniqueID;
-		this.guild = guild;
-	}
-
-//	@Override
-//	public String serialize() 
-//	{
-//		return "";
-//	}
-//
-//	@Override
-//	public void deSerialzie(String string) 
-//	{
-//		
-//	}
-}
+package dataStructures;
+
+
+public class KittyChannel 
+{
+	public String uniqueID;
+	public boolean mature;
+	
+	public KittyChannel(String uniqueID, boolean mature)
+	{
+		//super(uniqueID);
+		this.uniqueID = uniqueID;
+		this.mature = false;
+	}	
+}

src/dataStructures/KittyCore.java

@@ -1,13 +1,13 @@
-package dataStructures;
-
-import net.dv8tion.jda.core.JDA;
-
-public class KittyCore
-{
-	public final JDA jda;
-	
-	public KittyCore(JDA kitty)
-	{
-		this.jda = kitty;
-	}
-}
+package dataStructures;
+
+import net.dv8tion.jda.api.JDA;
+
+public class KittyCore
+{
+	public final JDA jda;
+	
+	public KittyCore(JDA kitty)
+	{
+		this.jda = kitty;
+	}
+}

src/dataStructures/KittyGuild.java

@@ -1,173 +1,182 @@
-package dataStructures;
-
-import java.util.ArrayList;
-
-import core.DatabaseManager;
-import core.DatabaseTrackedObject;
-import utils.AdminControl;
-import utils.AudioUtils;
-
-// Context for a given guild for kittybot. Primarily designed to hold guild-specific settings.
-public class KittyGuild extends DatabaseTrackedObject
-{
-	// Variables
-	public final String uniqueID;
-	public KittyRating contentRating;
-	public KittyUser guildOwner;
-	public boolean polling;
-	public String poll; 
-	public boolean raffling; 
-	public int raffleCost; 
-	public ArrayList<String> hasVoted = new ArrayList<String>();
-	public ArrayList<String> emoji = new ArrayList<String>();
-	public ArrayList <KittyPoll> choices = new ArrayList<KittyPoll>();
-	public AdminControl control;
-	public AudioUtils audio; 
-	public ArrayList <KittyUser> raffleUsersUnchosen = new ArrayList<KittyUser>();
-	public ArrayList <KittyUser> raffleUsersChosen = new ArrayList<KittyUser>();
-	
-	// Database synced info
-	private final String roleListName = "guildRoles";
-	public final KittyTrackedVector roleList;
-	
-	private final String beansName = "guildBeans";
-	public final KittyTrackedLong beans;
-	
-	private String commandIndicator;
-	
-	private void registerTrackedObjects()
-	{
-		DatabaseManager.instance.globalRegister(roleList);
-		DatabaseManager.instance.globalRegister(beans);
-	}
-	
-	// Default content for a guild
-	public KittyGuild(String uniqueID, AdminControl adminControl, ArrayList <String> emoji)
-	{
-		super(uniqueID);
-		this.uniqueID = uniqueID;
-		roleList = new KittyTrackedVector(roleListName, uniqueID);
-		beans = new KittyTrackedLong(beansName, uniqueID);
-		registerTrackedObjects();
-		
-		control = adminControl;
-		this.contentRating = KittyRating.Safe; 
-		this.polling = false;
-		this.emoji = emoji;
-		setCommandIndicator("!");
-	}
-	
-	// Explicit constructor
-	public KittyGuild(String commandIndicator, KittyRating contentRating, KittyUser guildOwner, String uniqueID)
-	{
-		super(uniqueID);
-		this.uniqueID = uniqueID;
-		roleList = new KittyTrackedVector(roleListName, uniqueID);
-		beans = new KittyTrackedLong(beansName, uniqueID);
-		registerTrackedObjects();
-		
-		setCommandIndicator(commandIndicator);
-		this.contentRating = contentRating;
-		this.polling = false;
-		this.guildOwner = guildOwner;
-	}
-	
-	public String startPoll(String poll)
-	{
-		polling = true; 
-		this.poll = poll;
-		return "Poll `" + poll + "` started! Don't forget to add choices with `!poll choice`~";
-	}
-	
-	public String addChoiceToPoll(String choice)
-	{
-		choices.add(new KittyPoll(choice));
-		return "Added `" + choice + "` to poll!";
-	}
-	
-	public String endPoll()
-	{
-		choices.clear();
-		hasVoted.clear();
-		this.polling = false;
-		poll = null;
-		return "Poll ended!";
-	}
-	
-	//Raffle methods
-	public boolean startRaffle(int beanCost)
-	{
-		if(raffling)
-		{
-			return false;
-		}
-		raffleCost = beanCost; 
-		raffling = true; 
-		return true;
-	}
-	
-	public boolean endRaffle()
-	{
-		if(raffling)
-		{
-			raffleCost = 0;
-			raffling = false;
-			raffleUsersChosen.removeAll(raffleUsersChosen);
-			raffleUsersUnchosen.removeAll(raffleUsersUnchosen);
-			return true;
-		}
-		return false;
-	}
-	
-	public boolean joinRaffle(KittyUser user)
-	{
-		if(!raffleUsersChosen.contains(user) && !raffleUsersUnchosen.contains(user) && user.getBeans() > raffleCost && raffling)
-		{
-			user.changeBeans(raffleCost);
-			raffleUsersUnchosen.add(user);
-			return true;
-		}
-		return false; 
-	}
-	
-	public KittyUser chooseRaffleWinner()
-	{
-		if(!raffleUsersUnchosen.isEmpty())
-		{
-			KittyUser chosen = raffleUsersUnchosen.get((int) (Math.random() * raffleUsersUnchosen.size()));
-			raffleUsersUnchosen.remove(chosen);
-			raffleUsersChosen.add(chosen);
-			return chosen;
-		}
-		return null;
-	}
-	
-	@Override
-	public String serialize() 
-	{
-		return commandIndicator;
-	}
-
-	@Override
-	public void deSerialzie(String string) 
-	{
-		if(string == null || string.length() == 0)
-			setCommandIndicator("!");
-		else
-			setCommandIndicator(string);
-	}
-	
-	public String getCommandIndicator()
-	{
-		return commandIndicator;
-	}
-	
-	public void setCommandIndicator(String newIndicator)
-	{
-		if(newIndicator != commandIndicator)
-		{
-			commandIndicator = newIndicator;
-			markDirty();
-		}
-	}
-}
+package dataStructures;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import core.DatabaseManager;
+import core.DatabaseTrackedObject;
+import utils.AdminControl;
+import utils.audio.AudioUtils;
+
+// Context for a given guild for kittybot. Primarily designed to hold guild-specific settings.
+public class KittyGuild extends DatabaseTrackedObject
+{
+	// Variables
+	public final String uniqueID;
+	public KittyRating contentRating;
+	public KittyUser guildOwner;
+	public boolean polling;
+	public String poll; 
+	public boolean raffling; 
+	public int raffleCost; 
+	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>();
+	public ArrayList <KittyUser> raffleUsersChosen = new ArrayList<KittyUser>();
+	
+	// Database synced info
+	private final String roleListName = "guildRoles";
+	public final KittyTrackedVector roleList;
+	
+	private final String beansName = "guildBeans";
+	public final KittyTrackedLong beans;
+	
+	private String commandIndicator;
+	
+	private void registerTrackedObjects()
+	{
+		DatabaseManager.instance.globalRegister(roleList);
+		DatabaseManager.instance.globalRegister(beans);
+	}
+	
+	// Default content for a guild
+	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);
+		beans = new KittyTrackedLong(beansName, uniqueID);
+		registerTrackedObjects();
+		
+		control = adminControl;
+		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, AudioUtils audio, HashMap<Long, KittyChannel> channels)
+	{
+		super(uniqueID);
+		this.uniqueID = uniqueID;
+		roleList = new KittyTrackedVector(roleListName, uniqueID);
+		beans = new KittyTrackedLong(beansName, uniqueID);
+		registerTrackedObjects();
+		
+		setCommandIndicator(commandIndicator);
+		this.contentRating = contentRating;
+		this.polling = false;
+		this.guildOwner = guildOwner;
+		this.audio = audio;
+		this.channels = channels;
+	}
+	
+	public String startPoll(String poll)
+	{
+		polling = true; 
+		this.poll = poll;
+		return "Poll `" + poll + "` started! Don't forget to add choices with `!poll choice`~";
+	}
+	
+	public String addChoiceToPoll(String choice)
+	{
+		choices.add(new KittyPoll(choice));
+		return "Added `" + choice + "` to poll!";
+	}
+	
+	public String endPoll()
+	{
+		choices.clear();
+		hasVoted.clear();
+		this.polling = false;
+		poll = null;
+		return "Poll ended!";
+	}
+	
+	//Raffle methods
+	public boolean startRaffle(int beanCost)
+	{
+		if(raffling)
+		{
+			return false;
+		}
+		raffleCost = beanCost; 
+		raffling = true; 
+		return true;
+	}
+	
+	public boolean endRaffle()
+	{
+		if(raffling)
+		{
+			raffleCost = 0;
+			raffling = false;
+			raffleUsersChosen.removeAll(raffleUsersChosen);
+			raffleUsersUnchosen.removeAll(raffleUsersUnchosen);
+			return true;
+		}
+		return false;
+	}
+	
+	public boolean joinRaffle(KittyUser user)
+	{
+		if(!raffleUsersChosen.contains(user) && !raffleUsersUnchosen.contains(user) && user.getBeans() > raffleCost && raffling)
+		{
+			user.changeBeans(-raffleCost);
+			raffleUsersUnchosen.add(user);
+			return true;
+		}
+		return false; 
+	}
+	
+	public KittyUser chooseRaffleWinner()
+	{
+		if(!raffleUsersUnchosen.isEmpty())
+		{
+			KittyUser chosen = raffleUsersUnchosen.get((int) (Math.random() * raffleUsersUnchosen.size()));
+			raffleUsersUnchosen.remove(chosen);
+			raffleUsersChosen.add(chosen);
+			return chosen;
+		}
+		return null;
+	}
+	
+	@Override
+	public String serialize() 
+	{
+		return commandIndicator;
+	}
+
+	@Override
+	public void deSerialzie(String string) 
+	{
+		if(string == null || string.length() == 0)
+			setCommandIndicator("!");
+		else
+			setCommandIndicator(string);
+	}
+	
+	public String getCommandIndicator()
+	{
+		return commandIndicator;
+	}
+	
+	public void setCommandIndicator(String newIndicator)
+	{
+		if(newIndicator != commandIndicator)
+		{
+			commandIndicator = newIndicator;
+			markDirty();
+		}
+	}
+}

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/KittyTrackedResponse.java

@@ -1,6 +0,0 @@
-package dataStructures;
-
-public class KittyTrackedResponse
-{
-	// TODO: Fill this out!
-}