Merge branch 'develop'

assets/config.csv

@@ -1,4 +1,5 @@
 "Type","Key","Value"
+"Globals","mode (dev or release)","dev"
 "Localized Commands","beans",""
 "Localized Commands","benchmark, bench",""
 "Localized Commands","bet",""
@@ -61,6 +62,7 @@
 "Localized Strings","BetBeansInfo","Allows you to bet your beans, set your amount after the command! Warning! House always wins!nSets of 3 will get 2x, 4 will get 10x, and 5 will get 1000x"
 "Localized Strings","BetBeansLose","Sorry, you didn't win, try again!"
 "Localized Strings","BetBeansLowBet","Please bet with at least 20 beans!"
+"Localized Strings","BetBeansMinThreshold",""
 "Localized Strings","BetBeansNotEnough","You don't have enough beans!"
 "Localized Strings","BetBeansNotValid","That's not a valid bet!"
 "Localized Strings","BetBeansWin","You won %s beans!"

src/commands/general/CommandBetBeans.java

@@ -5,6 +5,8 @@ import java.util.Random;
 import core.Command;
 import core.LocStrings;
 import dataStructures.*;
+import utils.GlobalLog;
+import utils.LogFilter;
 
 public class CommandBetBeans extends Command
 {
@@ -17,12 +19,30 @@ public class CommandBetBeans extends Command
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
 		String call = "";
+		
+		int min = 50;
 		int bet = 0;
 		int win = 0; 
+		
+		try
+		{
+			String valAsString = LocStrings.stub("BetBeansMinThreshold");
+			int parsed = Integer.parseInt(valAsString);
+			
+			if(parsed < 0)
+				parsed = 0;
+			
+			min = parsed;
+		}
+		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.");
+		}
+		
 		try 
 		{
 			bet = Integer.parseInt(input.args);
-			if(bet < 50)
+			if(bet < min)
 			{
 				res.send(LocStrings.stub("BetBeansLowBet"));
 				return;

src/commands/general/CommandLeaderboard.java

@@ -49,15 +49,25 @@ public class CommandLeaderboard extends Command
 				if(userID.length() < 1)
 					continue;
 				
-				// Look up in the database the user beans
-				String dbUserData = DatabaseManager.instance.globalGetRemoteValue(guildID + userID);
+				String dbUserData = null;
+				Long parsedBeans = null;
 				
-				// Leverage the fact that the user is automatically read and parsed when constructed.
-				Long parsedBeans = KittyUser.parseBeans(KittyUser.prepareFromString(dbUserData));
-				
-				// If we were only using cached users, we would use this. However, we're not.
-				// KittyUser cachedUser = ObjectBuilderFactory.getCachedUser(guildID, userID);
-				users.add(new Pair<Long, String>(parsedBeans, userID));
+				try
+				{
+					// Look up in the database the user beans
+					dbUserData = DatabaseManager.instance.globalGetRemoteValue(guildID + userID);
+					
+					// Leverage the fact that the user is automatically read and parsed when constructed.
+					parsedBeans = KittyUser.parseBeans(KittyUser.prepareFromString(dbUserData));
+					
+					// If we were only using cached users, we would use this. However, we're not.
+					// KittyUser cachedUser = ObjectBuilderFactory.getCachedUser(guildID, userID);
+					users.add(new Pair<Long, String>(parsedBeans, userID));
+				}
+				catch (Exception e)
+				{
+					GlobalLog.error(LogFilter.Command, "Issue parsing for leaderboard,\ndbUserData:" + dbUserData + "\nparsedBeans:" + parsedBeans);
+				}
 			}
 		}
 		

src/commands/general/CommandRPG.java

@@ -1,53 +0,0 @@
-package commands.general;
-
-import core.Command;
-import core.LocStrings;
-import core.rpg.RPGFramework;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Response;
-import dataStructures.UserInput;
-
-
-public class CommandRPG extends Command
-{
-	private RPGFramework framework;
-	
-	public CommandRPG(KittyRole role, KittyRating rating) 
-	{ 
-		super(role, rating);
-		framework = new RPGFramework();
-	}
-	
-	@Override
-	public String getHelpText() { return LocStrings.stub("RPGInfo"); };
-	
-	
-	@Override
-	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
-	{
-		if(input.args == null || input.args.length() == 0)
-		{
-			String output = getHelpText();
-			res.send(output);
-			return;
-		}
-		
-		String result = null;
-		synchronized(framework)
-		{
-			result = framework.run(user.uniqueID, input.args.trim());
-		}
-		
-		if(result == null)
-		{
-			res.send(LocStrings.stub("RPGInvalid"));
-			return;
-		}
-		
-		res.send(result);
-	}
-}

src/commands/music/CommandMusicMain.java

@@ -27,7 +27,6 @@ public class CommandMusicMain extends Command
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
 		SubCommandFormattable scf = framework.run(guild, channel, user, input);
-		System.out.println("SCF: " + scf.resString);
 		scf.Call(res);
 	}
 }

src/commands/music/SubCommandPlaylist.java

@@ -6,7 +6,12 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 
 import core.SubCommand;
 import core.SubCommandFormattable;
-import dataStructures.*;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.UserInput;
 
 public class SubCommandPlaylist extends SubCommand 
 {
@@ -16,9 +21,18 @@ public class SubCommandPlaylist extends SubCommand
 	@Override
 	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-//		ArrayList<AudioTrack> playlist = guild.audio.getPlaylist();
-		String stringPlaylist = guild.audio.getPlaylist(guild.audio.player);
+		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/SubCommandStop.java

@@ -17,8 +17,7 @@ public class SubCommandStop extends SubCommand
 	@Override
 	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-		
 		return new SubCommandFormattable(guild.audio.stopPlayer(guild.audio.player));
 	}
 	
-}
+}

src/commands/rpg/RPGCommandBattleFight.java

@@ -1,37 +0,0 @@
-package commands.rpg;
-
-import core.rpg.RPGCommand;
-import core.rpg.RPGInput;
-import core.rpg.RPGState;
-
-public class RPGCommandBattleFight extends RPGCommand
-{
-	@Override
-	public String onRun(RPGState state, RPGInput input)
-	{
-		if(state.battleContext == null)
-			return "```There's nothing to fight!```";
-		
-		String out = null;
-		String reward = null;
-		
-		out = "No one ever trained you to fight, so you do a silly dance and it weirds your opponent out and they leave. (i need to implement this still)";
-		reward = "+150xp";
-		
-		state.battleContext = null;
-		state.player.applyEXP(150);
-		
-		if(out != null && reward != null)
-		{
-			out += "\n";
-			out += "\n";
-			out += "[" + reward + "]";
-		}
-		
-		if(out != null)
-			out = "```\n" + out + "```";
-		
-		return out;
-	}
-
-}

src/commands/rpg/RPGCommandBattleRun.java

@@ -1,36 +0,0 @@
-package commands.rpg;
-
-import core.rpg.RPGCommand;
-import core.rpg.RPGInput;
-import core.rpg.RPGState;
-
-public class RPGCommandBattleRun extends RPGCommand 
-{
-	@Override
-	public String onRun(RPGState state, RPGInput input)
-	{
-		if(state.battleContext == null)
-			return "```There's nothing to run from!```";
-		
-		long lostGold = (long)(state.player.getGold() * .1);
-		String out = null;
-		
-		state.player.spendGold(lostGold);
-		state.battleContext = null;
-		
-		out = "You duck behind a tree and manage to escape from encounter just barely!";
-		if(lostGold > 0)
-		{
-			out += " As you make your final move to escape, you accidentally drop some of your gold behind. You don't dare try to go back and pick it up.";
-			out += "\n";
-			out += "\n";
-			out += "[-" + lostGold + "gp]";
-		}
-		
-		if(out != null)
-			out = "```\n" + out + "```";
-		
-		return out;
-	}
-
-}

src/commands/rpg/RPGCommandExplore.java

@@ -1,97 +0,0 @@
-package commands.rpg;
-
-import java.util.Random;
-
-import core.rpg.RPGBattleContext;
-import core.rpg.RPGCommand;
-import core.rpg.RPGInput;
-import core.rpg.RPGState;
-
-public class RPGCommandExplore extends RPGCommand
-{
-	private class Chance
-	{
-		double rand;
-		float lastSection;
-		
-		public Chance(float percentChanceTotal)
-		{
-			rand = new Random().nextDouble() * percentChanceTotal;
-			lastSection = 0;
-		}
-		
-		public boolean Next(float amount)
-		{
-			lastSection += amount;
-			return rand < lastSection;
-		}
-	}
-	
-	@Override
-	public String onRun(RPGState state, RPGInput input)
-	{
-		Chance chance = new Chance(100);
-		
-		String out = null;
-		String reward = null;
-		
-		if(state.battleContext != null)
-			return "```You can't explore right now, you're in a fight! Try either 'fight' or 'run'!```";
-
-		if(chance.Next(20))
-		{
-			out = "A creature jumps out of a bush at you!";
-			reward = "Prepare to fight!";
-			state.battleContext = new RPGBattleContext(state);
-		}
-		else if(chance.Next(20))
-		{
-			final int gp = 1;
-			
-			out = "As you take a stroll, you spy a small shiny glint from a bush and decide to investigate! Looks like it's your lucky day!";
-			reward = "+" + gp + "gp";
-			state.player.giveGold(gp);
-		}
-		else if(chance.Next(20))
-		{
-			final int healing = 1;
-			final int xp = 25;
-			
-			out = "You head out on a lovely stroll down a familiar path - the sun is out and the birds are chirping! Nothing much comes  of it, but you feel refreshed.";
-			reward = "+" + xp + "xp, +" + healing + "hp";
-			state.player.applyHealing(healing);
-			state.player.applyEXP(xp);
-		}
-		else if(chance.Next(20))
-		{
-			final int xp = 75;
-			final int damage = 1;
-			
-			out = "Today's the day you head out on a new path. You find a lot of little nicknacks and trinkets on the trail, but leave them be. The trail gets really steep, the rocks jagged, but you keep going. Eventually, you make it out to the other side into a small but pleasant town, and collapse on a bench to catch your breath.";
-			reward = "+" + xp + "xp, -" + damage + "hp";
-			state.player.applyEXP(xp);
-			state.player.applyDamage(damage);
-		}
-		else
-		{
-			final int hp = 2;
-			
-			out = "You step outside but it starts to rain. You decide not to do much today, and hang about the inn and the tavern.";
-			reward = "+" + hp + "hp";
-			state.player.applyHealing(hp);
-		}
-		
-		if(out != null && reward != null)
-		{
-			out += "\n";
-			out += "\n";
-			out += "[" + reward + "]";
-		}
-		
-		if(out != null)
-			out = "```\n" + out + "```";
-		
-		return out;
-	}
-
-}

src/commands/rpg/RPGCommandInfo.java

@@ -1,91 +0,0 @@
-package commands.rpg;
-
-import core.rpg.RPGArmor;
-import core.rpg.RPGCommand;
-import core.rpg.RPGInput;
-import core.rpg.RPGState;
-import core.rpg.RPGWeapon;
-
-public class RPGCommandInfo extends RPGCommand
-{
-	@Override
-	public String onRun(RPGState state, RPGInput input)
-	{
-		String out = null;
-		switch(input.value.trim().toLowerCase())
-		{
-			case "weapon":
-			case "weapo":
-			case "weap":
-			case "wea":
-			case "we":
-			case "w":
-			case "wepon":
-			case "wepo":
-			case "wep":
-			case "hand":
-			case "att":
-			case "attack":
-				out = weaponStats(state.player.getWeapon());
-				break;
-
-			case "armour":
-			case "armou":
-			case "armor":
-			case "armr":
-			case "armo":
-			case "arm":
-			case "ar":
-			case "a":
-			case "def":
-			case "defense":
-			case "body":
-			case "dress":
-			case "wear":
-			case "outfit":
-				out = armorStats(state.player.getArmor());
-				break;
-		}
-		
-		if(out != null)
-			out = "```\n" + out + "```";
-		
-		return out;
-	}
-	
-	private String weaponStats(RPGWeapon weapon)
-	{
-		if(weapon == null)
-			return null;
-		
-		String out = "";
-		out += "[" + weapon.getName() + "]";
-		out += "\n";
-		out += "  att: " + weapon.getAttack();
-		out += "\n";
-		out += "value: " + weapon.getValue() + "gp";
-		out += "\n";
-		out += "\n";
-		out += weapon.getDescription();
-		
-		return out;
-	}
-	
-	private String armorStats(RPGArmor armor)
-	{
-		if(armor == null)
-			return null;
-		
-		String out = "";
-		out += "[" + armor.getName() + "]";
-		out += "\n";
-		out += "  def: " + armor.getDefense();
-		out += "\n";
-		out += "value: " + armor.getValue() + "gp";
-		out += "\n";
-		out += "\n";
-		out += armor.getDescription();
-		
-		return out;
-	}
-}

src/commands/rpg/RPGCommandStats.java

@@ -1,61 +0,0 @@
-package commands.rpg;
-
-import core.rpg.RPGArmor;
-import core.rpg.RPGCommand;
-import core.rpg.RPGExpTable;
-import core.rpg.RPGInput;
-import core.rpg.RPGPlayer;
-import core.rpg.RPGState;
-import core.rpg.RPGWeapon;
-
-public class RPGCommandStats extends RPGCommand
-{
-	@Override
-	public String onRun(RPGState state, RPGInput input) 
-	{
-		RPGPlayer player = state.player;
-		long exp = player.getEXP();
-		long level = RPGExpTable.levelFromEXP(player.getEXP());
-		long ceil = RPGExpTable.expCeil(level);
-		
-		String indent = "";
-		String linebreak = "\n";
-		
-		String out = "";
-		out += indent + "[" + player.getName() + ", lv. " + level + "]";
-		out += indent + linebreak;
-		out += indent + "_______________";
-		out += indent + linebreak;
-		
-		out += indent + "   EXP: " + exp;
-		out += indent + " (until next: " + (ceil - exp) + ")";
-		out += indent + linebreak;
-				
-		out += indent + "  Gold: " + player.getGold();
-		out += indent + linebreak;
-		
-		out += indent + "Health: " + player.getHealthCurrent() + "/" + player.getHealthMax();
-		out += indent + linebreak;
-		
-		RPGWeapon weapon = player.getWeapon();
-		out += indent + "_____";
-		out += indent + linebreak; 
-		out += indent + "Weapon: " + weapon.getName();
-		out += indent + linebreak;
-		out += indent + "   att: " + weapon.getAttack();
-		out += indent + linebreak;
-		
-		RPGArmor armor = player.getArmor();
-		out += indent + "_____";
-		out += indent + linebreak; 
-		out += indent + "Armor: " + armor.getName();
-		out += indent + linebreak;
-		out += indent + "  def: " + armor.getDefense() ;
-		out += indent + linebreak;
-		
-		out += indent + linebreak;
-		out += "Use 'info armor' / 'info weapon' for details!";
-		
-		return "```\n" + out + "```";
-	}
-}

src/core/CommandManager.java

@@ -5,61 +5,13 @@ import java.util.HashMap;
 import java.util.Map.Entry;
 
 import commands.characters.CommandCharacterMain;
-import commands.general.CommandBeansShow;
-import commands.general.CommandBenchmark;
-import commands.general.CommandBetBeans;
-import commands.general.CommandBetHistory;
-import commands.general.CommandBlurry;
-import commands.general.CommandBoop;
-import commands.general.CommandCatch;
-import commands.general.CommandChangeIndicator;
-import commands.general.CommandChoose;
-import commands.general.CommandColiru;
-import commands.general.CommandColor;
-import commands.general.CommandCrouton;
-import commands.general.CommandDBFlush;
-import commands.general.CommandDBStats;
-import commands.general.CommandDoWork;
-import commands.general.CommandEightBall;
-import commands.general.CommandFetch;
-import commands.general.CommandGetSauce;
-import commands.general.CommandGiveBeans;
-import commands.general.CommandHelp;
-import commands.general.CommandHelpBuilder;
-import commands.general.CommandInfo;
-import commands.general.CommandInvite;
-import commands.general.CommandJDoodle;
-import commands.general.CommandLeaderboard;
-import commands.general.CommandMap;
-import commands.general.CommandPerish;
-import commands.general.CommandPing;
-import commands.general.CommandRPEnd;
-import commands.general.CommandRPG;
-import commands.general.CommandRPStart;
-import commands.general.CommandRating;
-import commands.general.CommandRemind;
-import commands.general.CommandRole;
-import commands.general.CommandRoll;
-import commands.general.CommandShutdown;
-import commands.general.CommandStark;
-import commands.general.CommandStats;
-import commands.general.CommandTeey;
-import commands.general.CommandTweet;
-import commands.general.CommandWolfram;
-import commands.general.CommandYeet;
+import commands.general.*;
 import commands.guildrole.CommandGuildRoleMain;
 import commands.mod.CommandModMain;
 import commands.music.CommandMusicMain;
 import commands.poll.CommandPollMain;
 import commands.raffle.CommandRaffleMain;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Pair;
-import dataStructures.Response;
-import dataStructures.UserInput;
+import dataStructures.*;
 import utils.GlobalLog;
 import utils.LogFilter;
 
@@ -117,7 +69,6 @@ public class CommandManager
 		
 		// Mod
 		this.register(LocCommands.stub("givebeans"), new CommandGiveBeans(KittyRole.Mod, KittyRating.Safe));
-		this.register(LocCommands.stub("rpg"), new CommandRPG(KittyRole.Mod, KittyRating.Safe));
 		this.register(LocCommands.stub("mod"), new CommandModMain(KittyRole.Mod, KittyRating.Safe));
 
 		// General
@@ -155,6 +106,7 @@ public class CommandManager
 		this.register(LocCommands.stub("raffle"), new CommandRaffleMain(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("poll"), new CommandPollMain(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("music"), new CommandMusicMain(KittyRole.General, KittyRating.Safe));
+		this.register(LocCommands.stub("defaultdance"), new CommandDefaultDance(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("getsauce"), new CommandGetSauce(KittyRole.General, KittyRating.Safe));
 	}
 	

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,68 @@
+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;
+	
+	// Constructor
+	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;
+	}
+	
+	@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;
+			}
+		}
+	}
+
+	@Override
+	public List<ConfigItem> produce()
+	{
+		List<ConfigItem> items = new ArrayList<ConfigItem>();
+		items.add(new ConfigItem(getSectionTitle(), startupStyleKey, startupStyleValue.name().toLowerCase()));
+		
+		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/ObjectBuilderFactory.java

@@ -20,6 +20,7 @@ import dataStructures.KittyCore;
 import dataStructures.KittyGuild;
 import dataStructures.KittyRating;
 import dataStructures.KittyRole;
+import dataStructures.KittyStartupMode;
 import dataStructures.KittyUser;
 import main.Main;
 import net.dv8tion.jda.core.AccountType;
@@ -382,9 +383,15 @@ public class ObjectBuilderFactory
 	{
 		lazyInit();
 		
+		// Determine token based on config. Default to test token.
+		String tokenToUse = Ref.TestToken;
+		if(ConfigGlobals.getStartupMode() == KittyStartupMode.Release)
+			tokenToUse = Ref.Token;
+		
+		// Construct bot based on token
 		kitty = new JDABuilder(AccountType.BOT)
-				.setToken(Ref.TestToken).buildBlocking();
-		kitty.getPresence().setGame(Game.playing("with digital yarn"));
+				.setToken(tokenToUse).buildBlocking();
+		kitty.getPresence().setGame(Game.playing("with a laser pointer"));
 		kitty.addEventListener(new Main());
 		
 		return new KittyCore(kitty);

src/core/rpg/RPGArmor.java

@@ -1,14 +0,0 @@
-package core.rpg;
-
-public class RPGArmor extends RPGItem
-{
-	int defense;
-	
-	public RPGArmor() 
-	{
-		super("Tattered Clothes", "The remains of your first sewing project. You did a pretty good job!", 5);
-		defense = 1;
-	}
-	
-	public long getDefense() { return defense; }
-}

src/core/rpg/RPGBattleContext.java

@@ -1,11 +0,0 @@
-package core.rpg;
-
-public class RPGBattleContext
-{
-	public RPGState stateRef;
-	
-	public RPGBattleContext(RPGState state)
-	{
-		this.stateRef = state;
-	}
-}

src/core/rpg/RPGCommand.java

@@ -1,9 +0,0 @@
-package core.rpg;
-
-public abstract class RPGCommand
-{
-	public RPGCommand() { }
-	
-	// OVERRIDE ME
-	public abstract String onRun(RPGState state, RPGInput input);
-}

src/core/rpg/RPGEnemy.java

@@ -1,9 +0,0 @@
-package core.rpg;
-
-public class RPGEnemy extends RPGUnit
-{
-	RPGWeapon attack;
-	RPGArmor armor; 
-	
-	long expValue;
-}

src/core/rpg/RPGExpTable.java

@@ -1,65 +0,0 @@
-package core.rpg;
-
-public final class RPGExpTable
-{
-	public static long expFloor(long level)
-	{
-		if(level > Levels.length - 1)
-			level = Levels.length - 1;
-		
-		else if (level <= 0)
-			level = 1;
-		
-		return Levels[(int) level];
-	}
-	
-	public static long expCeil(long level)
-	{
-		if(level > Levels.length - 1)
-			level = Levels.length - 1;
-		
-		else if (level <= 0)
-			level = 1;
-		
-		return Levels[(int) (level + 1)];
-	}
-	public static long levelFromEXP(long exp)
-	{
-		if(exp < 0)
-			exp = 0;
-		
-		for(int i = 0; i < Levels.length; ++i)
-		{
-			if(Levels[i] > exp)
-				return i - 1;
-		}
-
-		return Levels.length - 1;
-	}
-	
-	// Based on D&D Pathfinder levels
-	public static long Levels[] = 
-	{
-		0,       // level 0
-		0,       // level 1
-		3000,    // level 2
-		7500,    // level 3
-		14000,   // level 4
-		23000,   // level 5
-		35000,   // level 6
-		53000,   // level 7
-		77000,   // level 8
-		115000,  // level 9
-		160000,  // level 10
-		235000,  // level 11
-		330000,  // level 12
-		475000,  // level 13
-		665000,  // level 14
-		955000,  // level 15
-		1350000, // level 16
-		1900000, // level 17
-		2700000, // level 18
-		3850000, // level 19
-		5350000  // level 20
-	};
-}

src/core/rpg/RPGFramework.java

@@ -1,82 +0,0 @@
-package core.rpg;
-
-import java.util.HashMap;
-
-import commands.rpg.RPGCommandBattleFight;
-import commands.rpg.RPGCommandBattleRun;
-import commands.rpg.RPGCommandExplore;
-import commands.rpg.RPGCommandInfo;
-import commands.rpg.RPGCommandStats;
-import core.rpg.RPGInput;
-
-// Holds the framework for the text RPG, for any number of users
-public class RPGFramework
-{
-	// User ID to user state. Users are conceptually just an ID.
-	public HashMap<String, RPGState> gameStates;
-	public HashMap<String, RPGCommand> gameCommands;
-	
-	// Ctor
-	public RPGFramework()
-	{
-		this.gameStates = new HashMap<String, RPGState>();
-		this.gameCommands = new HashMap<String, RPGCommand>();
-		
-		registerCommand("stats", new RPGCommandStats());
-		registerCommand("about", new RPGCommandInfo());
-		registerCommand("info", new RPGCommandInfo());
-		registerCommand("explore", new RPGCommandExplore());
-		registerCommand("run", new RPGCommandBattleRun());
-		registerCommand("fight", new RPGCommandBattleFight());
-	}
-	
-	// Primary external
-	public String run(String userID, String inputRaw)
-	{
-		RPGState state = lookupState(userID);
-		RPGInput input = new RPGInput(inputRaw);
-		return executeCommand(input.key, state, input);
-	}
-
-	// Get state for executing a command
-	public RPGState lookupState(String userID)
-	{
-		RPGState state;
-		synchronized(gameStates)
-		{
-			// Note: Hardcoded right now. Later: Extract.
-			state = gameStates.get(userID);
-			
-			if(state == null)
-			{
-				state = new RPGState(userID);
-				gameStates.put(userID, state);
-			}
-		}
-		
-		return state;
-	}
-
-	// Registers a command
-	private void registerCommand(String commandName, RPGCommand command)
-	{
-		commandName = commandName.toLowerCase();
-		if(gameCommands.put(commandName, command) != null)
-			RPGLog.log("Managed to register the same RPG command twice! Not ideal!");
-		
-		RPGLog.log("Registered " + commandName);
-	}
-	
-	private String executeCommand(String name, RPGState state, RPGInput input)
-	{
-		synchronized(gameCommands)
-		{
-			RPGCommand command = gameCommands.get(name.toLowerCase());
-			
-			if(command != null && state != null)
-				return command.onRun(state,  input);
-		}
-		
-		return null; 
-	}
-}

src/core/rpg/RPGInput.java

@@ -1,32 +0,0 @@
-package core.rpg;
-
-import utils.StringUtils;
-
-public class RPGInput
-{
-	public String raw;
-	public String key;
-	public String value;
-	
-	public RPGInput(String raw)
-	{
-		this.raw = raw;
-		this.key = "";
-		this.value = "";
-		
-		if(raw == null || raw.length() == 0)
-			return;
-		
-		raw = raw.trim();
-		int whitespacePos = StringUtils.findFirstWhitespace(raw);
-		
-		if(whitespacePos == -1)
-		{
-			key = raw;
-			return;
-		}
-		
-		key = raw.substring(0, whitespacePos).trim();
-		value = raw.substring(whitespacePos).trim();
-	}
-}

src/core/rpg/RPGItem.java

@@ -1,25 +0,0 @@
-package core.rpg;
-
-public abstract class RPGItem
-{
-	protected String name;
-	protected String description;
-	protected int value;
-	
-	// Defaults
-	public RPGItem() { this("unknown"); } 
-	public RPGItem(String name) { this(name, "nothig is known about this item"); }
-	public RPGItem(String name, String description) { this(name, description, 1); }
-
-	// Ctor
-	public RPGItem(String name, String description, int value)
-	{
-		this.name = name;
-		this.description = description;
-		this.value = value;
-	}
-	
-	public String getName() { return name; }
-	public String getDescription() { return description; }
-	public long getValue() { return value; }
-}

src/core/rpg/RPGLog.java

@@ -1,12 +0,0 @@
-package core.rpg;
-
-import utils.GlobalLog;
-import utils.LogFilter;
-
-public class RPGLog 
-{
-	public static void log(String toWrite)
-	{
-		GlobalLog.log(LogFilter.Command, "[RPG] " + toWrite);
-	}
-}

src/core/rpg/RPGMain.java

@@ -1,39 +0,0 @@
-package core.rpg;
-
-import java.util.Scanner;
-
-// This is for testing only, and generally doesn't run unless it's specified.
-public class RPGMain
-{
-	private static RPGFramework framework;
-	private static Scanner scanner;
-	
-	public static void RPGmain(String[] args)
-	{
-		init();
-		while(run()) { };
-		shutdown();
-	}
-	
-	// Initializes stuff (small factory, ish)
-	private static void init()
-	{
-		framework = new RPGFramework();
-		scanner = new Scanner(System.in);
-	}
-	
-	// Main loop
-	private static boolean run()
-	{
-		// move outside
-		String out = framework.run("Test", scanner.nextLine()); 
-		RPGLog.log(out);
-		return true;
-	}
-	
-	// Cleanup
-	private static void shutdown()
-	{
-		scanner.close();
-	}
-}

src/core/rpg/RPGPlayer.java

@@ -1,58 +0,0 @@
-package core.rpg;
-
-public class RPGPlayer extends RPGUnit 
-{
-	private String name;
-	private long gold;
-	private long exp;
-	
-	RPGWeapon weapon;
-	RPGArmor armor;
-	
-	public RPGPlayer()
-	{
-		super();
-		
-		name = "Wanderer";
-		healthCurrent = 5;
-		healthMax = 5;
-		gold = 0;
-		weapon = new RPGWeapon();
-		armor = new RPGArmor();
-	}
-	
-	// Getters
-	public long getEXP() { return exp; }
-	public long getGold() { return gold; }
-	public String getName() { return name; }
-	public RPGArmor getArmor() { return armor; };
-	public RPGWeapon getWeapon() { return weapon; };
-	
-	// Setters
-	public void setName(String name) { this.name = name; }
-	
-	// Interactions
-	public void applyEXP(int expToGive)
-	{
-		if(expToGive < 0)
-			expToGive = 0;
-		
-		exp += expToGive;
-	}
-	
-	public void giveGold(long amount) 
-	{
-		if(amount < 0)
-			amount = 0;
-		
-		gold += amount;
-	}
-	
-	public void spendGold(long amount)
-	{
-		if(amount < 0)
-			amount = 0;
-		
-		gold -= amount;
-	}
-}

src/core/rpg/RPGState.java

@@ -1,19 +0,0 @@
-package core.rpg;
-
-// Holds specific state information for a given user and their world
-public class RPGState
-{
-	// General
-	public String userID;
-	
-	// Stats and gameplay
-	public RPGPlayer player;
-	public RPGBattleContext battleContext;
-	
-	public RPGState(String userID)
-	{
-		this.userID = userID;
-		this.player = new RPGPlayer();
-		this.battleContext = null;
-	}
-}

src/core/rpg/RPGUnit.java

@@ -1,34 +0,0 @@
-package core.rpg;
-
-public abstract class RPGUnit 
-{
-	protected int healthMax;
-	protected int healthCurrent;
-	
-	public int getHealthMax() { return healthMax; }
-	public int getHealthCurrent() { return healthCurrent; }
-	public boolean isAlive() { return healthCurrent > 0; }
-
-	// Generic implementation. Consider implementing armor in 
-	// derived classes, for example.
-	public void applyDamage(int value) 
-	{ 
-		if(value < 0)
-			value = 0;
-		
-		healthCurrent -= value; 
-	}
-	
-	// Generic implementation. Consider applying boosts in
-	// derived classes, for example.
-	public void applyHealing(int value) 
-	{
-		if(value < 0)
-			value = 0;
-		
-		healthCurrent += value;
-		
-		if(healthCurrent > healthMax)
-			healthCurrent = healthMax;
-	}
-}

src/core/rpg/RPGWeapon.java

@@ -1,17 +0,0 @@
-package core.rpg;
-
-public class RPGWeapon extends RPGItem
-{
-	private long attack;
-	private double accuracy;
-	
-	RPGWeapon() 
-	{
-		super("Singed Stick", "A really cool stick that you found! You poked at your campfire last night with it a bit, so the end is a bit toasty.", 2);
-		attack = 1;
-		accuracy = 0.8;
-	}
-	
-	public long getAttack() { return attack; }
-	public double getAccuracy() { return accuracy; }
-}

src/dataStructures/KittyStartupMode.java

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

src/utils/audio/AudioUtils.java

@@ -1,7 +1,5 @@
 package utils.audio;
 import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Queue;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
@@ -22,7 +20,7 @@ public class AudioUtils
 	public AudioManager am;
 	public final AudioPlayer player;
 	public final AudioPlayerManager playerManager;
-	private Queue <AudioTrack> playlist = new LinkedList<>();
+	private ArrayList <AudioTrack> playlist = new ArrayList<AudioTrack>();
 	
 	
 	public AudioUtils(Guild guild, AudioPlayerManager playerManager)
@@ -86,12 +84,9 @@ public class AudioUtils
 	}
 	
 	public class SmallAudio implements AudioLoadResultHandler
-	{
-		private AudioPlayer player;
-		
+	{	
 		private SmallAudio(AudioPlayer player)
 		{
-			this.player = player;
 		}
 		
 		@Override public void loadFailed(FriendlyException arg0) { }
@@ -105,14 +100,6 @@ public class AudioUtils
 			{
 				playlist.add(track);
 			}
-			do 
-			{
-				if(player.getPlayingTrack() == null)
-				{
-					player.startTrack(playlist.poll(), false);
-				}
-			}
-			while(!playlist.isEmpty());
 		}
 	}
 	
@@ -121,13 +108,21 @@ public class AudioUtils
 	{
 		guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(player));
 		playerManager.loadItemOrdered(player, videoURL, new SmallAudio(player));
-		
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {}
+		if(player.getPlayingTrack() == null)
+		{
+			MusicController control = new MusicController(player, playlist);
+			control.start();
+		}
 		return null;
 	}
 	
 	public String skipVideo(AudioPlayer player)
 	{
-		return null;
+		player.stopTrack();
+		return "Skipped";
 	}
 	
 	public String stopPlayer(AudioPlayer player)
@@ -137,8 +132,44 @@ public class AudioUtils
 		return "Stopped";
 	}
 	
-	public String getPlaylist(AudioPlayer player)
+	public ArrayList<AudioTrack> getPlaylist()
 	{
-		return player.getPlayingTrack().getInfo().title;
+		return playlist;
+	}
+}
+
+class MusicController extends Thread
+{
+	AudioPlayer player;
+	private ArrayList <AudioTrack> playlist;
+	
+	public MusicController(AudioPlayer player, ArrayList <AudioTrack> playlist)
+	{
+		this.player = player;
+		this.playlist = playlist; 
+	}
+	
+	@Override
+	public void run()
+	{
+		AudioTrack nowPlaying = null;
+		do 
+		{
+			if(!playlist.isEmpty() || nowPlaying != null)
+			{
+				if(player.getPlayingTrack() == null)
+				{
+					if(playlist.isEmpty())
+						nowPlaying = null;
+					else
+					{
+						nowPlaying = playlist.get(0);
+						playlist.remove(0);
+					}
+					player.startTrack(nowPlaying, false);
+				}
+			}
+		}
+		while(!playlist.isEmpty() || player.getPlayingTrack() != null);
 	}
 }

src/utils/audio/TrackScheduler.java

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