Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta

Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameOption.java

@@ -0,0 +1,37 @@
+package nautilus.game.arcade.game;
+
+public class GameOption 
+{
+	//Store the name and Description of each option - Literally every GameOption should have these
+	private String _optionName;
+	private String _optionDescription;
+	
+	public GameOption(String optName, String optDesc)
+	{
+		_optionName = optName;
+		_optionDescription = optDesc;
+	}
+	
+	//Get methods for name of option and description
+	public String GetOptionName()
+	{
+		return _optionName;
+	}
+	
+	public String GetOptionDescription()
+	{
+		return _optionDescription;
+	}
+	
+	//Every GameOption will have a SetOption method of some sort
+	public void SetOption()
+	{
+		
+	}
+	
+	/*Every GameOption will have a GetOptionSetting method, as well
+	 * However, since each GameOption class will have a different return type,
+	 * there isn't much need to create one here at this time
+	*/
+
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameOptionBoolean.java

@@ -0,0 +1,26 @@
+package nautilus.game.arcade.game;
+
+public class GameOptionBoolean extends GameOption 
+{
+	
+	//Set boolean to true by default for ease of use
+	private Boolean _optionSetting;
+	
+	public GameOptionBoolean(Boolean optOnOff, String optName, String optType) 
+	{
+		super(optName, optType);
+		// TODO Auto-generated constructor stub
+		_optionSetting = optOnOff;
+	}
+	
+	public Boolean GetOptionSetting()
+	{
+		return _optionSetting;
+	}
+	
+	public void SetOption(Boolean newOptionSetting)
+	{
+		_optionSetting = newOptionSetting;
+	}
+
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameOptionDouble.java

@@ -0,0 +1,25 @@
+package nautilus.game.arcade.game;
+
+public class GameOptionDouble extends GameOption 
+{
+
+	private double _optionDouble;
+	
+	public GameOptionDouble(double optDouble, String optName, String optDesc) 
+	{
+		super(optName, optDesc);
+		// TODO Auto-generated constructor stub
+		_optionDouble = optDouble;
+	}
+	
+	public double GetOptionSetting()
+	{
+		return _optionDouble;
+	}
+	
+	public void SetOptionSetting(double newOptionSetting)
+	{
+		_optionDouble = newOptionSetting;
+	}
+
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameOptionHashInt.java

@@ -0,0 +1,27 @@
+package nautilus.game.arcade.game;
+
+import java.util.HashSet;
+
+public class GameOptionHashInt extends GameOption 
+{
+
+	private HashSet<Integer> _optionHash;
+	
+	public GameOptionHashInt(HashSet<Integer> optHash, String optName, String optDesc) 
+	{
+		super(optName, optDesc);
+		// TODO Auto-generated constructor stub
+		_optionHash = optHash;
+	}
+
+	public HashSet<Integer> GetOptionSetting()
+	{
+		return _optionHash;
+	}
+	
+	public void SetOptionSetting(HashSet<Integer> optHash)
+	{
+		_optionHash = optHash;
+	}
+	
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameOptionInteger.java

@@ -0,0 +1,25 @@
+package nautilus.game.arcade.game;
+
+public class GameOptionInteger extends GameOption 
+{
+
+	private int _optionInt;
+	
+	public GameOptionInteger(int optInt, String optName, String optType) 
+	{
+		super(optName, optType);
+		// TODO Auto-generated constructor stub
+		_optionInt = optInt;
+	}
+	
+	public int GetOptionSetting()
+	{
+		return _optionInt;
+	}
+	
+	public void SetOptionSetting(int newOptionSetting)
+	{
+		_optionInt = newOptionSetting;
+	}
+	
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameOptionLong.java

@@ -0,0 +1,25 @@
+package nautilus.game.arcade.game;
+
+public class GameOptionLong extends GameOption 
+{
+	
+	private long _optionLong;
+
+	public GameOptionLong(long optLong, String optName, String optDesc) 
+	{
+		super(optName, optDesc);
+		// TODO Auto-generated constructor stub
+		_optionLong = optLong;
+	}
+	
+	public long GetOptionSetting()
+	{
+		return _optionLong;
+	}
+	
+	public void SetOptionSetting(long newOptionSetting)
+	{
+		_optionLong = newOptionSetting;
+	}
+
+}