+Moved guildrole commands to subcommand routine

src/commands/general/CommandRoll.java

@@ -0,0 +1,177 @@
+package commands;
+
+import java.util.Stack;
+
+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 CommandRoll extends Command
+{
+	public CommandRoll(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String getHelpText() { return LocStrings.stub("RollInfo"); } 
+	
+	@Override
+	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		try 
+		{
+			res.send(rollDice(input.args));
+		}
+		catch(Exception e)
+		{
+			res.send(LocStrings.stub("RollError"));
+		}
+	}
+	
+	private String rollDice(String thing)
+	{
+		Stack<Integer> values = new Stack<Integer>();
+		Stack<Character> operators = new Stack<Character>();
+		for(int i = 0; i < thing.length(); i ++)
+		{
+			char current = thing.charAt(i);
+			
+			switch(current)
+			{
+				case '+':
+				case '-':
+				case '*':
+				case '/':
+					if(operators.isEmpty() || !hasPrecendence(operators.peek(), current) || operators.peek() == '(')
+						operators.add(current);
+					else
+					{
+						calculate(values, operators);
+						operators.add(current); 
+					}
+						
+					continue;
+					
+				case '(':
+					operators.add(current);
+					continue;
+					
+				case ')':
+					if(operators.peek() == '(')
+						operators.pop(); 
+					else
+					{
+						i --;
+						calculate(values, operators);
+					}
+					continue;
+					
+				case 'd':
+					if(operators.isEmpty() || operators.peek() == '(' || !hasPrecendence(operators.peek(), current))
+						operators.add(current);
+					else
+						calculate(values, operators);
+					continue;
+					
+				case ' ':
+					continue; 
+					
+				default:
+					try
+					{
+					    // Accumulate valid characters
+					    String accumulated = "";
+					    for(int j = i; j < thing.length(); ++j)
+					    {
+					        char parse = thing.charAt(j);
+					        if(Character.isDigit(parse))
+					        {
+					            accumulated += parse; // Keep tabs on our character
+					            ++i;                  // Offset overall loop
+					            continue;
+					        }
+					        
+					        // Default leave
+					        break;
+					    }
+					    
+					    if(accumulated.length() <= 0)
+					        throw new Exception("Error! Invalid character!");
+					        
+					    values.add(Integer.parseInt(accumulated));
+					    i--;
+					}
+					catch (Exception e)
+					{
+					    System.out.print("Something went wrong");
+					    i = thing.length();
+					}
+			}
+		}
+		
+		while(operators.size() > 0)
+		{
+			calculate(values, operators);
+		}
+		
+		return "" + values.pop();
+	}
+	
+	private void calculate(Stack<Integer> nums, Stack<Character> operators)
+	{
+		int second = nums.pop();
+		int first = nums.pop();
+		int value = 0;
+		
+		switch(operators.pop())
+		{
+			case '+':
+				value = first + second;
+				break;
+			case '-':
+				value = first - second;
+				break;
+			case '*':
+				value = first * second;
+				break;
+			case '/':
+				value = first / second;
+				break;
+			case 'd': 
+				value = roll(first, second);
+		}
+		
+		nums.add(value);
+	}
+
+	private int roll(int first, int second) 
+	{
+		int total = 0;
+		int roll = 0;
+		int dice = first;
+		int sides = second;
+		
+		if(dice < 1)
+			return 0; 
+		for(int i = 0; dice > i; i ++)
+		{
+			roll = (int)(Math.random() * sides) + 1;
+			total += roll;
+		}
+		return total;
+	}
+
+	private boolean hasPrecendence(char op1, char op2)
+	{
+		 if ((op2 == '*' || op2 == '/') && (op1 == '+' || op1 == '-')) 
+	         return false;
+	     else
+	    	 if ((op2 == 'd') && (op1 == '+' || op1 == '-' || op1 == '*' || op1 == '/')) 
+	    		 return false;
+	    	 else
+	    		 return true; 
+	}
+}