Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.

Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.

Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java

@@ -21,7 +21,7 @@ public abstract class MiniDbClientPlugin<DataType extends Object> extends MiniCl
 		clientManager.addStoredProcedureLoginProcessor(this);
 	}
 
-	public abstract void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException;
+	public abstract void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
 	
 	public CoreClientManager getClientManager()
 	{

Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java

@@ -7,7 +7,7 @@ public interface ILoginProcessor
 {
 	String getName();
 	
-	void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException;
+	void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
 
 	String getQuery(int accountId, String uuid, String name);
 }

Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java

@@ -142,7 +142,7 @@ public class AccountRepository extends RepositoryBase
 			
 			for (ILoginProcessor loginProcessor : loginProcessors.values())
 			{
-				loginProcessor.processLoginResultSet(name, statement.getResultSet());
+				loginProcessor.processLoginResultSet(name, accountId, statement.getResultSet());
 				statement.getMoreResults();
 			}
 		}

Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java

@@ -754,7 +754,7 @@ public enum Achievement
 		return _category;
 	}
 
-	public AchievementData getLevelData(int exp)
+	public AchievementData getLevelData(long exp)
 	{
 		for (int i = 0; i < _levels.length; i++)
 		{

Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java

@@ -3,10 +3,10 @@ package mineplex.core.achievement;
 public class AchievementData
 {
 	private int _level;
-	private int _expRemainder;
-	private int _expNextLevel;
+	private long _expRemainder;
+	private long _expNextLevel;
 	
-	public AchievementData(int level, int expRemainder, int expNextLevel)
+	public AchievementData(int level, long expRemainder, long expNextLevel)
 	{
 		_level = level;
 		_expRemainder = expRemainder;
@@ -18,12 +18,12 @@ public class AchievementData
 		return _level;
 	}
 	
-	public int getExpRemainder()
+	public long getExpRemainder()
 	{
 		return _expRemainder;
 	}
 	
-	public int getExpNextLevel()
+	public long getExpNextLevel()
 	{
 		return _expNextLevel;
 	}

Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementLog.java

@@ -2,10 +2,10 @@ package mineplex.core.achievement;
 
 public class AchievementLog
 {
-	public int Amount;
+	public long Amount;
 	public boolean LevelUp;
 	
-	public AchievementLog(int amount, boolean levelUp)
+	public AchievementLog(long amount, boolean levelUp)
 	{
 		Amount = amount;
 		LevelUp = levelUp;

Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java

@@ -73,7 +73,7 @@ public class BenefitManager extends MiniDbClientPlugin<BenefitData>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.retrievePlayerBenefitData(resultSet));
 	}

Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java

@@ -386,7 +386,7 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 	}
 	
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Get(playerName).addGold(_repository.retrieveDonorInfo(resultSet).getGold());
 	}

Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java

@@ -108,7 +108,7 @@ public class EloManager extends MiniDbClientPlugin<EloClientData>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}

Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java

@@ -401,7 +401,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
     }
 
     @Override
-    public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+    public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
     {
         Set(playerName, _repository.loadClientInformation(resultSet));
     }

Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java

@@ -230,7 +230,7 @@ public class IgnoreManager extends MiniDbClientPlugin<IgnoreData>
     }
 
     @Override
-    public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+    public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
     {
         Set(playerName, _repository.loadClientInformation(resultSet));
     }

Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java

@@ -251,7 +251,7 @@ public class InventoryManager extends MiniDbClientPlugin<ClientInventory>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}

Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java

@@ -106,7 +106,7 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}

Plugins/Mineplex.Core/src/mineplex/core/stats/PlayerStats.java

@@ -6,13 +6,13 @@ import mineplex.core.common.util.NautHashMap;
 
 public class PlayerStats 
 {
-	private NautHashMap<String, Integer> _statHash = new NautHashMap<String, Integer>();
+	private NautHashMap<String, Long> _statHash = new NautHashMap<String,Long>();
 	
-	public int addStat(String statName, int value)
+	public long addStat(String statName, long value)
 	{
 		if (!_statHash.containsKey(statName))
 		{
-			_statHash.put(statName, 0);
+			_statHash.put(statName, 0L);
 		}
 		
 		_statHash.put(statName, _statHash.get(statName) + value);
@@ -20,9 +20,9 @@ public class PlayerStats
 		return _statHash.get(statName);
 	}
 
-	public int getStat(String statName) 
+	public long getStat(String statName) 
 	{
-		return _statHash.containsKey(statName) ? _statHash.get(statName) : 0;
+		return _statHash.containsKey(statName) ? _statHash.get(statName) : 0L;
 	}
 
 	public Set<String> getStatsNames() 

Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java

@@ -0,0 +1,99 @@
+package mineplex.core.stats;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jooq.Configuration;
+import org.jooq.DSLContext;
+import org.jooq.Delete;
+import org.jooq.Insert;
+import org.jooq.SQLDialect;
+import org.jooq.TransactionalRunnable;
+import org.jooq.Update;
+import org.jooq.impl.DSL;
+
+import mineplex.core.account.ILoginProcessor;
+import mineplex.core.database.DBPool;
+import mineplex.database.Tables;
+
+public class SecondaryStatHandler implements ILoginProcessor
+{
+	private StatsManager _statsManager;
+	private StatsRepository _repository;
+	
+	public SecondaryStatHandler(StatsManager statsManager, StatsRepository repository)
+	{
+		_statsManager = statsManager;
+		_repository = repository;
+	}
+
+	@Override
+	public String getName()
+	{
+		return "Secondary Stat Handler";
+	}
+
+	@Override
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
+	{
+		PlayerStats oldPlayerStats = _statsManager.Get(playerName);
+		PlayerStats newPlayerStats = _repository.loadClientInformation(resultSet);
+		
+		if (newPlayerStats.getStatsNames().size() == 0 && oldPlayerStats.getStatsNames().size() != 0)
+		{
+			try
+			{
+				DSLContext context = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
+
+				final List<Insert> inserts = new ArrayList<>();
+				final List<Delete> deletes = new ArrayList<>();
+
+				for (String statName : oldPlayerStats.getStatsNames())
+				{
+					Integer statId = _statsManager.getStatId(statName);
+
+					Insert insert = context
+							.insertInto(Tables.accountStat)
+							.set(Tables.accountStat.accountId, accountId)
+							.set(Tables.accountStat.statId, statId)
+							.set(Tables.accountStat.value, oldPlayerStats.getStat(statName));
+
+					inserts.add(insert);
+					
+					Delete delete = context.delete(Tables.accountStats)
+								.where(Tables.accountStats.accountId.equal(accountId));
+					
+					deletes.add(delete);
+				}
+				
+				context.transaction(new TransactionalRunnable()
+				{
+					@Override
+					public void run(Configuration config) throws Exception
+					{
+						DSL.using(config).batch(inserts).execute();
+						DSL.using(config).batch(deletes).execute();
+					}
+				});
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+		else
+		{
+			_statsManager.replacePlayerHack(playerName, newPlayerStats);
+		}
+	}
+
+	@Override
+	public String getQuery(int accountId, String uuid, String name)
+	{
+		return "SELECT stats.name, value FROM accountStat INNER JOIN stats ON stats.id = accountStat.statId WHERE accountStat.accountId = '" + accountId + "';";
+	}
+
+}

Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java

@@ -9,7 +9,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniDbClientPlugin;
-import mineplex.core.account.CoreClient;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilServer;
@@ -24,7 +23,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 	private StatsRepository _repository;
 	
 	private NautHashMap<String, Integer> _stats = new NautHashMap<String, Integer>();
-	private NautHashMap<Player, NautHashMap<String, Integer>> _statUploadQueue = new NautHashMap<Player, NautHashMap<String, Integer>>();
+	private NautHashMap<Player, NautHashMap<String, Long>> _statUploadQueue = new NautHashMap<Player, NautHashMap<String, Long>>();
 	private Runnable _saveRunnable;
 	
 	public StatsManager(JavaPlugin plugin, CoreClientManager clientManager) 
@@ -50,11 +49,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		{
 			_stats.put(stat.Name, stat.Id);
 		}
+		
+		clientManager.addStoredProcedureLoginProcessor(new SecondaryStatHandler(this, _repository));
 	}
 	
-	public void incrementStat(final Player player, final String statName, final int value)
+	public void incrementStat(final Player player, final String statName, final long value)
 	{
-		int newValue = Get(player).addStat(statName, value);
+		long newValue = Get(player).addStat(statName, value);
 
 		//Event
 		UtilServer.getServer().getPluginManager().callEvent(new StatChangeEvent(player.getName(), statName, newValue - value, newValue));
@@ -97,15 +98,15 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		}
 	}
 	
-	private void addToQueue(String statName, Player player, int value)
+	private void addToQueue(String statName, Player player, long value)
 	{
 		synchronized (_statSync)
 		{
 			if (!_statUploadQueue.containsKey(player))
-				_statUploadQueue.put(player, new NautHashMap<String, Integer>());
+				_statUploadQueue.put(player, new NautHashMap<String, Long>());
 			
 			if (!_statUploadQueue.get(player).containsKey(statName))
-				_statUploadQueue.get(player).put(statName, 0);
+				_statUploadQueue.get(player).put(statName, 0L);
 			
 			_statUploadQueue.get(player).put(statName, _statUploadQueue.get(player).get(statName) + value);
 		}
@@ -118,7 +119,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		
 		try
 		{
-			NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>();
+			NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
 			
 			synchronized (_statSync)
 			{
@@ -131,7 +132,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 					
 					int uploadKey = ClientManager.getCachedClientAccountId(player.getUniqueId());
 					
-					uploadQueue.put(uploadKey, new NautHashMap<Integer, Integer>());
+					uploadQueue.put(uploadKey, new NautHashMap<Integer, Long>());
 					
 					for (String statName : _statUploadQueue.get(player).keySet())
 					{
@@ -152,13 +153,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		}
 	}
 
-	public boolean incrementStat(final int accountId, final String statName, final int value)
+	public boolean incrementStat(final int accountId, final String statName, final long value)
 	{
 		if (_stats.containsKey(statName))
 			return false;
 		
-		final NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>();
-		uploadQueue.put(accountId, new NautHashMap<Integer, Integer>());
+		final NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
+		uploadQueue.put(accountId, new NautHashMap<Integer, Long>());
 		uploadQueue.get(accountId).put(_stats.get(statName), value);
 		
 		runAsync(new Runnable()
@@ -172,6 +173,16 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		return true;
 	}
 	
+	public int getStatId(String statName)
+	{
+		return _stats.get(statName);
+	}
+	
+	public void replacePlayerHack(String playerName, PlayerStats playerStats)
+	{
+		Set(playerName, playerStats);
+	}
+	
 	@Override
 	protected PlayerStats AddPlayer(String player)
 	{
@@ -191,7 +202,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}

Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java

@@ -77,7 +77,7 @@ public class StatsRepository extends RepositoryBase
 	}
 
 	@SuppressWarnings("rawtypes")
-	public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue)
+	public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue)
 	{
 		try
 		{
@@ -91,18 +91,18 @@ public class StatsRepository extends RepositoryBase
 				for (Integer statId : uploadQueue.get(accountId).keySet())
 				{
 					Update update = context
-							.update(Tables.accountStats)
-							.set(Tables.accountStats.value, Tables.accountStats.value.plus(uploadQueue.get(accountId).get(statId)))
-							.where(Tables.accountStats.accountId.eq(accountId))
-							.and(Tables.accountStats.statId.eq(statId));
+							.update(Tables.accountStat)
+							.set(Tables.accountStat.value, Tables.accountStat.value.plus(uploadQueue.get(accountId).get(statId)))
+							.where(Tables.accountStat.accountId.eq(accountId))
+							.and(Tables.accountStat.statId.eq(statId));
 
 					updates.add(update);
 
 					Insert insert = context
-							.insertInto(Tables.accountStats)
-							.set(Tables.accountStats.accountId, accountId)
-							.set(Tables.accountStats.statId, statId)
-							.set(Tables.accountStats.value, uploadQueue.get(accountId).get(statId));
+							.insertInto(Tables.accountStat)
+							.set(Tables.accountStat.accountId, accountId)
+							.set(Tables.accountStat.statId, statId)
+							.set(Tables.accountStat.value, uploadQueue.get(accountId).get(statId));
 
 					inserts.add(insert);
 				}
@@ -137,10 +137,10 @@ public class StatsRepository extends RepositoryBase
 			context = DSL.using(getConnectionPool(), SQLDialect.MYSQL);
 		}
 
-		Result<Record2<String, Integer>> result = context.select(Tables.stats.name, Tables.accountStats.value).from(Tables.accountStats)
+		Result<Record2<String, Long>> result = context.select(Tables.stats.name, Tables.accountStat.value).from(Tables.accountStat)
 				.join(Tables.stats)
-				.on(Tables.stats.id.eq(Tables.accountStats.statId))
-				.where(Tables.accountStats.accountId.eq(DSL.select(Tables.accounts.id)
+				.on(Tables.stats.id.eq(Tables.accountStat.statId))
+				.where(Tables.accountStat.accountId.eq(DSL.select(Tables.accounts.id)
 						.from(Tables.accounts)
 						.where(Tables.accounts.name.eq(playerName)))
 				).fetch();
@@ -149,7 +149,7 @@ public class StatsRepository extends RepositoryBase
 		if (result.isNotEmpty())
 		{
 			playerStats = new PlayerStats();
-			for (Record2<String, Integer> record : result)
+			for (Record2<String, Long> record : result)
 			{
 				playerStats.addStat(record.value1(), record.value2());
 			}

Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java

@@ -47,7 +47,7 @@ public class GiveStatCommand extends CommandBase<StatsManager>
 						final CoreClient client = Plugin.getClientManager().Get(args[0]);
 						
 						if (client != null)
-							Plugin.incrementStat(client.getAccountId(), statName, Integer.parseInt(args[args.length - 1]));
+							Plugin.incrementStat(client.getAccountId(), statName, Long.parseLong(args[args.length - 1]));
 						else
 							caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + args[0] + "'s account!"));
 					}

Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java

@@ -55,7 +55,7 @@ public class TimeCommand extends CommandBase<StatsManager>
 									}
 									else
 									{
-										int time = stats.getStat("Global.TimeInGame");
+										long time = stats.getStat("Global.TimeInGame");
 										UtilPlayer.message(caller, F.main("Time", F.name(args[0]) + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"));
 									}
 								}
@@ -70,7 +70,7 @@ public class TimeCommand extends CommandBase<StatsManager>
 			}
 			else
 			{
-				int time = Plugin.Get(target).getStat("Global.TimeInGame");
+				long time = Plugin.Get(target).getStat("Global.TimeInGame");
 				UtilPlayer.message(caller, F.main("Time", F.name(target.getName() + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game")));
 			}
 		}

Plugins/Mineplex.Core/src/mineplex/core/stats/event/StatChangeEvent.java

@@ -11,10 +11,10 @@ public class StatChangeEvent extends Event
     
     private String _player;
     private String _statName;
-    private int _valueBefore;
-    private int _valueAfter;
+    private long _valueBefore;
+    private long _valueAfter;
     
-    public StatChangeEvent(String player, String statName, int valueBefore, int valueAfter)
+    public StatChangeEvent(String player, String statName, long valueBefore, long valueAfter)
     {
        _player = player;
        _statName = statName;
@@ -42,12 +42,12 @@ public class StatChangeEvent extends Event
     	return _statName;
     }
     
-    public int getValueBefore()
+    public long getValueBefore()
     {
     	return _valueBefore;
     }
     
-    public int getValueAfter()
+    public long getValueAfter()
     {
     	return _valueAfter;
     }

Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java

@@ -134,7 +134,7 @@ public class TaskManager extends MiniDbClientPlugin<TaskClient>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}

Plugins/Mineplex.Database/src/mineplex/database/Account.java

@@ -16,7 +16,7 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Account extends org.jooq.impl.SchemaImpl implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -478529995;
+	private static final long serialVersionUID = 625106486;
 
 	/**
 	 * The reference instance of <code>Account</code>
@@ -48,6 +48,7 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.AccountPolls.accountPolls,
 			mineplex.database.tables.AccountPreferences.accountPreferences,
 			mineplex.database.tables.Accounts.accounts,
+			mineplex.database.tables.AccountStat.accountStat,
 			mineplex.database.tables.AccountStats.accountStats,
 			mineplex.database.tables.AccountTasks.accountTasks,
 			mineplex.database.tables.AccountTransactions.accountTransactions,
@@ -67,9 +68,11 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.ItemCategories.itemCategories,
 			mineplex.database.tables.Items.items,
 			mineplex.database.tables.Mail.mail,
+			mineplex.database.tables.Mailbox.mailbox,
 			mineplex.database.tables.Npcs.npcs,
 			mineplex.database.tables.PlayerMap.playerMap,
 			mineplex.database.tables.Polls.polls,
+			mineplex.database.tables.RankBenefits.rankBenefits,
 			mineplex.database.tables.ServerPassword.serverPassword,
 			mineplex.database.tables.Spawns.spawns,
 			mineplex.database.tables.StatEvents.statEvents,

Plugins/Mineplex.Database/src/mineplex/database/Keys.java

@@ -47,9 +47,11 @@ public class Keys {
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = Identities0.IDENTITY_itemCategories;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = Identities0.IDENTITY_items;
 	public static final org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = Identities0.IDENTITY_mail;
+	public static final org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = Identities0.IDENTITY_mailbox;
 	public static final org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = Identities0.IDENTITY_npcs;
 	public static final org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = Identities0.IDENTITY_playerMap;
 	public static final org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = Identities0.IDENTITY_polls;
+	public static final org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = Identities0.IDENTITY_rankBenefits;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = Identities0.IDENTITY_serverPassword;
 	public static final org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = Identities0.IDENTITY_spawns;
 	public static final org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = Identities0.IDENTITY_statEvents;
@@ -75,6 +77,7 @@ public class Keys {
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = UniqueKeys0.KEY_accountPreferences_uuid_index;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = UniqueKeys0.KEY_accounts_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = UniqueKeys0.KEY_accounts_uuidIndex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = UniqueKeys0.KEY_accountStat_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = UniqueKeys0.KEY_accountStats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = UniqueKeys0.KEY_accountTasks_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = UniqueKeys0.KEY_accountTransactions_PRIMARY;
@@ -101,10 +104,12 @@ public class Keys {
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = UniqueKeys0.KEY_items_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = UniqueKeys0.KEY_items_uniqueNameCategoryIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = UniqueKeys0.KEY_mail_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = UniqueKeys0.KEY_mailbox_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = UniqueKeys0.KEY_npcs_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = UniqueKeys0.KEY_playerMap_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = UniqueKeys0.KEY_playerMap_playerIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = UniqueKeys0.KEY_polls_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = UniqueKeys0.KEY_rankBenefits_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = UniqueKeys0.KEY_serverPassword_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = UniqueKeys0.KEY_spawns_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = UniqueKeys0.KEY_statEvents_PRIMARY;
@@ -131,6 +136,8 @@ public class Keys {
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = ForeignKeys0.accountPolls_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = ForeignKeys0.accountPolls_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = ForeignKeys0.accountStat_account;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = ForeignKeys0.accountStat_stat;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = ForeignKeys0.accountStats_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = ForeignKeys0.accountStats_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = ForeignKeys0.ACCOUNTTASKS_ACCOUNTID;
@@ -147,6 +154,8 @@ public class Keys {
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = ForeignKeys0.clanTerritory_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = ForeignKeys0.items_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = ForeignKeys0.mail_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = ForeignKeys0.mailbox_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = ForeignKeys0.rankBenefits_ibfk_1;
 
 	// -------------------------------------------------------------------------
 	// [#1459] distribute members to avoid static initialisers > 64kb
@@ -179,9 +188,11 @@ public class Keys {
 		public static org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = createIdentity(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = createIdentity(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = createIdentity(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = createIdentity(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = createIdentity(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = createIdentity(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = createIdentity(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = createIdentity(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = createIdentity(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = createIdentity(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = createIdentity(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
@@ -205,6 +216,7 @@ public class Keys {
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = createUniqueKey(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.uuid);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.uuid);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId, mineplex.database.tables.AccountStat.accountStat.statId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
@@ -231,10 +243,12 @@ public class Keys {
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name, mineplex.database.tables.Items.items.categoryId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = createUniqueKey(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = createUniqueKey(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = createUniqueKey(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.playerName);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = createUniqueKey(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = createUniqueKey(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = createUniqueKey(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = createUniqueKey(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = createUniqueKey(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
@@ -259,6 +273,8 @@ public class Keys {
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.itemId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_polls_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.pollId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.statId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.statId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.accountId);
@@ -275,5 +291,7 @@ public class Keys {
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.serverId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_itemCategories_PRIMARY, mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.categoryId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.accountId);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/Routines.java

@@ -16,14 +16,39 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Routines {
 
+	/**
+	 * Call <code>Account.accountGoldChange</code>
+	 */
+	public static java.lang.Byte callAccountgoldchange(org.jooq.Configuration configuration, java.lang.Integer accountId, java.lang.Integer goldChange) {
+		mineplex.database.routines.AccountGoldChange p = new mineplex.database.routines.AccountGoldChange();
+		p.setAccountId(accountId);
+		p.setGoldChange(goldChange);
+
+		p.execute(configuration);
+		return p.getSuccess();
+	}
+
 	/**
 	 * Call <code>Account.check_daily</code>
 	 */
-	public static mineplex.database.routines.Check_daily callCheckDaily(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coins_change, java.lang.Integer gems_change) {
+	public static mineplex.database.routines.Check_daily callCheckDaily(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
 		mineplex.database.routines.Check_daily p = new mineplex.database.routines.Check_daily();
 		p.setAccountId_in(accountId_in);
-		p.setCoins_change(coins_change);
-		p.setGems_change(gems_change);
+		p.setCoinsChange(coinsChange);
+		p.setGemsChange(gemsChange);
+
+		p.execute(configuration);
+		return p;
+	}
+
+	/**
+	 * Call <code>Account.check_rank</code>
+	 */
+	public static mineplex.database.routines.Check_rank callCheckRank(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
+		mineplex.database.routines.Check_rank p = new mineplex.database.routines.Check_rank();
+		p.setAccountId_in(accountId_in);
+		p.setCoinsChange(coinsChange);
+		p.setGemsChange(gemsChange);
 
 		p.execute(configuration);
 		return p;
@@ -117,6 +142,16 @@ public class Routines {
 		p.execute(configuration);
 	}
 
+	/**
+	 * Call <code>Account.testPro</code>
+	 */
+	public static java.sql.Date callTestpro(org.jooq.Configuration configuration) {
+		mineplex.database.routines.TestPro p = new mineplex.database.routines.TestPro();
+
+		p.execute(configuration);
+		return p.getVar();
+	}
+
 	/**
 	 * Call <code>Account.updateTournament</code>
 	 */

Plugins/Mineplex.Database/src/mineplex/database/Tables.java

@@ -61,6 +61,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Accounts accounts = mineplex.database.tables.Accounts.accounts;
 
+	/**
+	 * The table Account.accountStat
+	 */
+	public static final mineplex.database.tables.AccountStat accountStat = mineplex.database.tables.AccountStat.accountStat;
+
 	/**
 	 * The table Account.accountStats
 	 */
@@ -156,6 +161,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Mail mail = mineplex.database.tables.Mail.mail;
 
+	/**
+	 * The table Account.mailbox
+	 */
+	public static final mineplex.database.tables.Mailbox mailbox = mineplex.database.tables.Mailbox.mailbox;
+
 	/**
 	 * The table Account.npcs
 	 */
@@ -171,6 +181,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Polls polls = mineplex.database.tables.Polls.polls;
 
+	/**
+	 * The table Account.rankBenefits
+	 */
+	public static final mineplex.database.tables.RankBenefits rankBenefits = mineplex.database.tables.RankBenefits.rankBenefits;
+
 	/**
 	 * The table Account.serverPassword
 	 */

Plugins/Mineplex.Database/src/mineplex/database/routines/AccountGoldChange.java

@@ -0,0 +1,67 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountGoldChange extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 360483639;
+
+	/**
+	 * The parameter <code>Account.accountGoldChange.accountId</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> accountId = createParameter("accountId", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.accountGoldChange.goldChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> goldChange = createParameter("goldChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.accountGoldChange.success</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> success = createParameter("success", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public AccountGoldChange() {
+		super("accountGoldChange", mineplex.database.Account.Account);
+
+		addInParameter(accountId);
+		addInParameter(goldChange);
+		addOutParameter(success);
+	}
+
+	/**
+	 * Set the <code>accountId</code> parameter IN value to the routine
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(mineplex.database.routines.AccountGoldChange.accountId, value);
+	}
+
+	/**
+	 * Set the <code>goldChange</code> parameter IN value to the routine
+	 */
+	public void setGoldChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.AccountGoldChange.goldChange, value);
+	}
+
+	/**
+	 * Get the <code>success</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getSuccess() {
+		return getValue(success);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/routines/Check_daily.java

@@ -16,7 +16,7 @@ package mineplex.database.routines;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1106680609;
+	private static final long serialVersionUID = -1266580733;
 
 	/**
 	 * The parameter <code>Account.check_daily.accountId_in</code>.
@@ -24,14 +24,14 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
 	public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
 
 	/**
-	 * The parameter <code>Account.check_daily.coins_change</code>.
+	 * The parameter <code>Account.check_daily.coinsChange</code>.
 	 */
-	public static final org.jooq.Parameter<java.lang.Integer> coins_change = createParameter("coins_change", org.jooq.impl.SQLDataType.INTEGER, false);
+	public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
 
 	/**
-	 * The parameter <code>Account.check_daily.gems_change</code>.
+	 * The parameter <code>Account.check_daily.gemsChange</code>.
 	 */
-	public static final org.jooq.Parameter<java.lang.Integer> gems_change = createParameter("gems_change", org.jooq.impl.SQLDataType.INTEGER, false);
+	public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
 
 	/**
 	 * The parameter <code>Account.check_daily.pass</code>.
@@ -50,8 +50,8 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
 		super("check_daily", mineplex.database.Account.Account);
 
 		addInParameter(accountId_in);
-		addInParameter(coins_change);
-		addInParameter(gems_change);
+		addInParameter(coinsChange);
+		addInParameter(gemsChange);
 		addOutParameter(pass);
 		addOutParameter(outTime);
 	}
@@ -64,17 +64,17 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
 	}
 
 	/**
-	 * Set the <code>coins_change</code> parameter IN value to the routine
+	 * Set the <code>coinsChange</code> parameter IN value to the routine
 	 */
-	public void setCoins_change(java.lang.Integer value) {
-		setValue(mineplex.database.routines.Check_daily.coins_change, value);
+	public void setCoinsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_daily.coinsChange, value);
 	}
 
 	/**
-	 * Set the <code>gems_change</code> parameter IN value to the routine
+	 * Set the <code>gemsChange</code> parameter IN value to the routine
 	 */
-	public void setGems_change(java.lang.Integer value) {
-		setValue(mineplex.database.routines.Check_daily.gems_change, value);
+	public void setGemsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_daily.gemsChange, value);
 	}
 
 	/**

Plugins/Mineplex.Database/src/mineplex/database/routines/Check_rank.java

@@ -0,0 +1,93 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Check_rank extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -1491579372;
+
+	/**
+	 * The parameter <code>Account.check_rank.accountId_in</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_rank.coinsChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_rank.gemsChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_rank.pass</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> pass = createParameter("pass", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * The parameter <code>Account.check_rank.outTime</code>.
+	 */
+	public static final org.jooq.Parameter<java.sql.Date> outTime = createParameter("outTime", org.jooq.impl.SQLDataType.DATE, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public Check_rank() {
+		super("check_rank", mineplex.database.Account.Account);
+
+		addInParameter(accountId_in);
+		addInParameter(coinsChange);
+		addInParameter(gemsChange);
+		addOutParameter(pass);
+		addOutParameter(outTime);
+	}
+
+	/**
+	 * Set the <code>accountId_in</code> parameter IN value to the routine
+	 */
+	public void setAccountId_in(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_rank.accountId_in, value);
+	}
+
+	/**
+	 * Set the <code>coinsChange</code> parameter IN value to the routine
+	 */
+	public void setCoinsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_rank.coinsChange, value);
+	}
+
+	/**
+	 * Set the <code>gemsChange</code> parameter IN value to the routine
+	 */
+	public void setGemsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_rank.gemsChange, value);
+	}
+
+	/**
+	 * Get the <code>pass</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getPass() {
+		return getValue(pass);
+	}
+
+	/**
+	 * Get the <code>outTime</code> parameter OUT value from the routine
+	 */
+	public java.sql.Date getOutTime() {
+		return getValue(outTime);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/routines/TestPro.java

@@ -0,0 +1,41 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class TestPro extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -418397480;
+
+	/**
+	 * The parameter <code>Account.testPro.var</code>.
+	 */
+	public static final org.jooq.Parameter<java.sql.Date> var = createParameter("var", org.jooq.impl.SQLDataType.DATE, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public TestPro() {
+		super("testPro", mineplex.database.Account.Account);
+
+		addOutParameter(var);
+	}
+
+	/**
+	 * Get the <code>var</code> parameter OUT value from the routine
+	 */
+	public java.sql.Date getVar() {
+		return getValue(var);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java

@@ -0,0 +1,109 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountStat extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 956897097;
+
+	/**
+	 * The reference instance of <code>Account.accountStat</code>
+	 */
+	public static final mineplex.database.tables.AccountStat accountStat = new mineplex.database.tables.AccountStat();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.AccountStatRecord> getRecordType() {
+		return mineplex.database.tables.records.AccountStatRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.accountStat.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.accountStat.statId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Integer> statId = createField("statId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.accountStat.value</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Long> value = createField("value", org.jooq.impl.SQLDataType.BIGINT.defaulted(true), this, "");
+
+	/**
+	 * Create a <code>Account.accountStat</code> table reference
+	 */
+	public AccountStat() {
+		this("accountStat", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.accountStat</code> table reference
+	 */
+	public AccountStat(java.lang.String alias) {
+		this(alias, mineplex.database.tables.AccountStat.accountStat);
+	}
+
+	private AccountStat(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountStatRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private AccountStat(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountStatRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_accountStat_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord>>asList(mineplex.database.Keys.KEY_accountStat_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, ?>>asList(mineplex.database.Keys.accountStat_account, mineplex.database.Keys.accountStat_stat);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.AccountStat as(java.lang.String alias) {
+		return new mineplex.database.tables.AccountStat(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.AccountStat rename(java.lang.String name) {
+		return new mineplex.database.tables.AccountStat(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1950407601;
+	private static final long serialVersionUID = -70389593;
 
 	/**
 	 * The reference instance of <code>Account.bonus</code>
@@ -44,7 +44,7 @@ public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	/**
 	 * The column <code>Account.bonus.ranktime</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Timestamp> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.TIMESTAMP, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Date> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.DATE, this, "");
 
 	/**
 	 * Create a <code>Account.bonus</code> table reference

Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -194264445;
+	private static final long serialVersionUID = -1842631086;
 
 	/**
 	 * The reference instance of <code>Account.clans</code>
@@ -76,6 +76,31 @@ public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> energy = createField("energy", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
 
+	/**
+	 * The column <code>Account.clans.kills</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> kills = createField("kills", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.murder</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> murder = createField("murder", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.deaths</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> deaths = createField("deaths", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.warWins</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> warWins = createField("warWins", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.warLosses</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> warLosses = createField("warLosses", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
 	/**
 	 * Create a <code>Account.clans</code> table reference
 	 */

Plugins/Mineplex.Database/src/mineplex/database/tables/Mailbox.java

@@ -0,0 +1,137 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Mailbox extends org.jooq.impl.TableImpl<mineplex.database.tables.records.MailboxRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 581316209;
+
+	/**
+	 * The reference instance of <code>Account.mailbox</code>
+	 */
+	public static final mineplex.database.tables.Mailbox mailbox = new mineplex.database.tables.Mailbox();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.MailboxRecord> getRecordType() {
+		return mineplex.database.tables.records.MailboxRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.mailbox.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.mailbox.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.mailbox.sender</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.String> sender = createField("sender", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
+
+	/**
+	 * The column <code>Account.mailbox.message</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.String> message = createField("message", org.jooq.impl.SQLDataType.VARCHAR.length(1024), this, "");
+
+	/**
+	 * The column <code>Account.mailbox.archived</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Byte> archived = createField("archived", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.mailbox.deleted</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Byte> deleted = createField("deleted", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.mailbox.timeSent</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.sql.Timestamp> timeSent = createField("timeSent", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * Create a <code>Account.mailbox</code> table reference
+	 */
+	public Mailbox() {
+		this("mailbox", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.mailbox</code> table reference
+	 */
+	public Mailbox(java.lang.String alias) {
+		this(alias, mineplex.database.tables.Mailbox.mailbox);
+	}
+
+	private Mailbox(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.MailboxRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private Mailbox(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.MailboxRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_mailbox;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_mailbox_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord>>asList(mineplex.database.Keys.KEY_mailbox_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, ?>>asList(mineplex.database.Keys.mailbox_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.Mailbox as(java.lang.String alias) {
+		return new mineplex.database.tables.Mailbox(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.Mailbox rename(java.lang.String name) {
+		return new mineplex.database.tables.Mailbox(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/RankBenefits.java

@@ -0,0 +1,117 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class RankBenefits extends org.jooq.impl.TableImpl<mineplex.database.tables.records.RankBenefitsRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 1274456623;
+
+	/**
+	 * The reference instance of <code>Account.rankBenefits</code>
+	 */
+	public static final mineplex.database.tables.RankBenefits rankBenefits = new mineplex.database.tables.RankBenefits();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.RankBenefitsRecord> getRecordType() {
+		return mineplex.database.tables.records.RankBenefitsRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.rankBenefits.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.rankBenefits.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.rankBenefits.benefit</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.String> benefit = createField("benefit", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * Create a <code>Account.rankBenefits</code> table reference
+	 */
+	public RankBenefits() {
+		this("rankBenefits", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.rankBenefits</code> table reference
+	 */
+	public RankBenefits(java.lang.String alias) {
+		this(alias, mineplex.database.tables.RankBenefits.rankBenefits);
+	}
+
+	private RankBenefits(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RankBenefitsRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private RankBenefits(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RankBenefitsRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_rankBenefits;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_rankBenefits_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord>>asList(mineplex.database.Keys.KEY_rankBenefits_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, ?>>asList(mineplex.database.Keys.rankBenefits_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.RankBenefits as(java.lang.String alias) {
+		return new mineplex.database.tables.RankBenefits(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.RankBenefits rename(java.lang.String name) {
+		return new mineplex.database.tables.RankBenefits(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java

@@ -0,0 +1,199 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables.records;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.Long> {
+
+	private static final long serialVersionUID = 1109290129;
+
+	/**
+	 * Setter for <code>Account.accountStat.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountStat.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.accountStat.statId</code>.
+	 */
+	public void setStatId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountStat.statId</code>.
+	 */
+	public java.lang.Integer getStatId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.accountStat.value</code>.
+	 */
+	public void setValue(java.lang.Long value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountStat.value</code>.
+	 */
+	public java.lang.Long getValue() {
+		return (java.lang.Long) getValue(2);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record2<java.lang.Integer, java.lang.Integer> key() {
+		return (org.jooq.Record2) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record3 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.AccountStat.accountStat.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.AccountStat.accountStat.statId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Long> field3() {
+		return mineplex.database.tables.AccountStat.accountStat.value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getStatId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Long value3() {
+		return getValue();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord value1(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord value2(java.lang.Integer value) {
+		setStatId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord value3(java.lang.Long value) {
+		setValue(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Long value3) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached AccountStatRecord
+	 */
+	public AccountStatRecord() {
+		super(mineplex.database.tables.AccountStat.accountStat);
+	}
+
+	/**
+	 * Create a detached, initialised AccountStatRecord
+	 */
+	public AccountStatRecord(java.lang.Integer accountId, java.lang.Integer statId, java.lang.Long value) {
+		super(mineplex.database.tables.AccountStat.accountStat);
+
+		setValue(0, accountId);
+		setValue(1, statId);
+		setValue(2, value);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java

@@ -14,9 +14,9 @@ package mineplex.database.tables.records;
 	comments = "This class is generated by jOOQ"
 )
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> {
+public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> {
 
-	private static final long serialVersionUID = 1527068906;
+	private static final long serialVersionUID = -64019858;
 
 	/**
 	 * Setter for <code>Account.bonus.accountId</code>.
@@ -49,15 +49,15 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Setter for <code>Account.bonus.ranktime</code>.
 	 */
-	public void setRanktime(java.sql.Timestamp value) {
+	public void setRanktime(java.sql.Date value) {
 		setValue(2, value);
 	}
 
 	/**
 	 * Getter for <code>Account.bonus.ranktime</code>.
 	 */
-	public java.sql.Timestamp getRanktime() {
-		return (java.sql.Timestamp) getValue(2);
+	public java.sql.Date getRanktime() {
+		return (java.sql.Date) getValue(2);
 	}
 
 	// -------------------------------------------------------------------------
@@ -80,7 +80,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> fieldsRow() {
+	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> fieldsRow() {
 		return (org.jooq.Row3) super.fieldsRow();
 	}
 
@@ -88,7 +88,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> valuesRow() {
+	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> valuesRow() {
 		return (org.jooq.Row3) super.valuesRow();
 	}
 
@@ -112,7 +112,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.sql.Timestamp> field3() {
+	public org.jooq.Field<java.sql.Date> field3() {
 		return mineplex.database.tables.Bonus.bonus.ranktime;
 	}
 
@@ -136,7 +136,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.sql.Timestamp value3() {
+	public java.sql.Date value3() {
 		return getRanktime();
 	}
 
@@ -162,7 +162,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public BonusRecord value3(java.sql.Timestamp value) {
+	public BonusRecord value3(java.sql.Date value) {
 		setRanktime(value);
 		return this;
 	}
@@ -171,7 +171,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Timestamp value3) {
+	public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Date value3) {
 		return this;
 	}
 
@@ -189,7 +189,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Create a detached, initialised BonusRecord
 	 */
-	public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Timestamp ranktime) {
+	public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Date ranktime) {
 		super(mineplex.database.tables.Bonus.bonus);
 
 		setValue(0, accountId);

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.java

@@ -14,9 +14,9 @@ package mineplex.database.tables.records;
 	comments = "This class is generated by jOOQ"
 )
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> {
+public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> {
 
-	private static final long serialVersionUID = -1803774546;
+	private static final long serialVersionUID = -1588610871;
 
 	/**
 	 * Setter for <code>Account.clans.id</code>.
@@ -144,6 +144,76 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return (java.lang.Integer) getValue(8);
 	}
 
+	/**
+	 * Setter for <code>Account.clans.kills</code>.
+	 */
+	public void setKills(java.lang.Integer value) {
+		setValue(9, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.kills</code>.
+	 */
+	public java.lang.Integer getKills() {
+		return (java.lang.Integer) getValue(9);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.murder</code>.
+	 */
+	public void setMurder(java.lang.Integer value) {
+		setValue(10, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.murder</code>.
+	 */
+	public java.lang.Integer getMurder() {
+		return (java.lang.Integer) getValue(10);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.deaths</code>.
+	 */
+	public void setDeaths(java.lang.Integer value) {
+		setValue(11, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.deaths</code>.
+	 */
+	public java.lang.Integer getDeaths() {
+		return (java.lang.Integer) getValue(11);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.warWins</code>.
+	 */
+	public void setWarWins(java.lang.Integer value) {
+		setValue(12, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.warWins</code>.
+	 */
+	public java.lang.Integer getWarWins() {
+		return (java.lang.Integer) getValue(12);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.warLosses</code>.
+	 */
+	public void setWarLosses(java.lang.Integer value) {
+		setValue(13, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.warLosses</code>.
+	 */
+	public java.lang.Integer getWarLosses() {
+		return (java.lang.Integer) getValue(13);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -157,23 +227,23 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	}
 
 	// -------------------------------------------------------------------------
-	// Record9 type implementation
+	// Record14 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> fieldsRow() {
-		return (org.jooq.Row9) super.fieldsRow();
+	public org.jooq.Row14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row14) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> valuesRow() {
-		return (org.jooq.Row9) super.valuesRow();
+	public org.jooq.Row14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row14) super.valuesRow();
 	}
 
 	/**
@@ -248,6 +318,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return mineplex.database.tables.Clans.clans.energy;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field10() {
+		return mineplex.database.tables.Clans.clans.kills;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field11() {
+		return mineplex.database.tables.Clans.clans.murder;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field12() {
+		return mineplex.database.tables.Clans.clans.deaths;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field13() {
+		return mineplex.database.tables.Clans.clans.warWins;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field14() {
+		return mineplex.database.tables.Clans.clans.warLosses;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -320,6 +430,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return getEnergy();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value10() {
+		return getKills();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value11() {
+		return getMurder();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value12() {
+		return getDeaths();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value13() {
+		return getWarWins();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value14() {
+		return getWarLosses();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -405,7 +555,52 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Boolean value6, java.sql.Timestamp value7, java.sql.Timestamp value8, java.lang.Integer value9) {
+	public ClansRecord value10(java.lang.Integer value) {
+		setKills(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value11(java.lang.Integer value) {
+		setMurder(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value12(java.lang.Integer value) {
+		setDeaths(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value13(java.lang.Integer value) {
+		setWarWins(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value14(java.lang.Integer value) {
+		setWarLosses(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Boolean value6, java.sql.Timestamp value7, java.sql.Timestamp value8, java.lang.Integer value9, java.lang.Integer value10, java.lang.Integer value11, java.lang.Integer value12, java.lang.Integer value13, java.lang.Integer value14) {
 		return this;
 	}
 
@@ -423,7 +618,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Create a detached, initialised ClansRecord
 	 */
-	public ClansRecord(java.lang.Integer id, java.lang.Integer serverId, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Boolean admin, java.sql.Timestamp dateCreated, java.sql.Timestamp lastOnline, java.lang.Integer energy) {
+	public ClansRecord(java.lang.Integer id, java.lang.Integer serverId, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Boolean admin, java.sql.Timestamp dateCreated, java.sql.Timestamp lastOnline, java.lang.Integer energy, java.lang.Integer kills, java.lang.Integer murder, java.lang.Integer deaths, java.lang.Integer warWins, java.lang.Integer warLosses) {
 		super(mineplex.database.tables.Clans.clans);
 
 		setValue(0, id);
@@ -435,5 +630,10 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		setValue(6, dateCreated);
 		setValue(7, lastOnline);
 		setValue(8, energy);
+		setValue(9, kills);
+		setValue(10, murder);
+		setValue(11, deaths);
+		setValue(12, warWins);
+		setValue(13, warLosses);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/MailboxRecord.java

@@ -0,0 +1,359 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables.records;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class MailboxRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.MailboxRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> {
+
+	private static final long serialVersionUID = 763437590;
+
+	/**
+	 * Setter for <code>Account.mailbox.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.sender</code>.
+	 */
+	public void setSender(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.sender</code>.
+	 */
+	public java.lang.String getSender() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.message</code>.
+	 */
+	public void setMessage(java.lang.String value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.message</code>.
+	 */
+	public java.lang.String getMessage() {
+		return (java.lang.String) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.archived</code>.
+	 */
+	public void setArchived(java.lang.Byte value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.archived</code>.
+	 */
+	public java.lang.Byte getArchived() {
+		return (java.lang.Byte) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.deleted</code>.
+	 */
+	public void setDeleted(java.lang.Byte value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.deleted</code>.
+	 */
+	public java.lang.Byte getDeleted() {
+		return (java.lang.Byte) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.timeSent</code>.
+	 */
+	public void setTimeSent(java.sql.Timestamp value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.timeSent</code>.
+	 */
+	public java.sql.Timestamp getTimeSent() {
+		return (java.sql.Timestamp) getValue(6);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record7 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> fieldsRow() {
+		return (org.jooq.Row7) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> valuesRow() {
+		return (org.jooq.Row7) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.Mailbox.mailbox.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.Mailbox.mailbox.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.Mailbox.mailbox.sender;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field4() {
+		return mineplex.database.tables.Mailbox.mailbox.message;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field5() {
+		return mineplex.database.tables.Mailbox.mailbox.archived;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field6() {
+		return mineplex.database.tables.Mailbox.mailbox.deleted;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.sql.Timestamp> field7() {
+		return mineplex.database.tables.Mailbox.mailbox.timeSent;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getSender();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value4() {
+		return getMessage();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value5() {
+		return getArchived();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value6() {
+		return getDeleted();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.sql.Timestamp value7() {
+		return getTimeSent();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value2(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value3(java.lang.String value) {
+		setSender(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value4(java.lang.String value) {
+		setMessage(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value5(java.lang.Byte value) {
+		setArchived(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value6(java.lang.Byte value) {
+		setDeleted(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value7(java.sql.Timestamp value) {
+		setTimeSent(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.Byte value5, java.lang.Byte value6, java.sql.Timestamp value7) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached MailboxRecord
+	 */
+	public MailboxRecord() {
+		super(mineplex.database.tables.Mailbox.mailbox);
+	}
+
+	/**
+	 * Create a detached, initialised MailboxRecord
+	 */
+	public MailboxRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String sender, java.lang.String message, java.lang.Byte archived, java.lang.Byte deleted, java.sql.Timestamp timeSent) {
+		super(mineplex.database.tables.Mailbox.mailbox);
+
+		setValue(0, id);
+		setValue(1, accountId);
+		setValue(2, sender);
+		setValue(3, message);
+		setValue(4, archived);
+		setValue(5, deleted);
+		setValue(6, timeSent);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/RankBenefitsRecord.java

@@ -0,0 +1,199 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables.records;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class RankBenefitsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.RankBenefitsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.String> {
+
+	private static final long serialVersionUID = 1205523956;
+
+	/**
+	 * Setter for <code>Account.rankBenefits.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.rankBenefits.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.rankBenefits.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.rankBenefits.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.rankBenefits.benefit</code>.
+	 */
+	public void setBenefit(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.rankBenefits.benefit</code>.
+	 */
+	public java.lang.String getBenefit() {
+		return (java.lang.String) getValue(2);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record3 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.String> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.String> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.RankBenefits.rankBenefits.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.RankBenefits.rankBenefits.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.RankBenefits.rankBenefits.benefit;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getBenefit();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord value2(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord value3(java.lang.String value) {
+		setBenefit(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached RankBenefitsRecord
+	 */
+	public RankBenefitsRecord() {
+		super(mineplex.database.tables.RankBenefits.rankBenefits);
+	}
+
+	/**
+	 * Create a detached, initialised RankBenefitsRecord
+	 */
+	public RankBenefitsRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String benefit) {
+		super(mineplex.database.tables.RankBenefits.rankBenefits);
+
+		setValue(0, id);
+		setValue(1, accountId);
+		setValue(2, benefit);
+	}
+}

Plugins/Mineplex.Hub/src/mineplex/hub/HubRepository.java

@@ -33,33 +33,6 @@ public class HubRepository
 	public void initialize(boolean us) 
 	{
 		_us = us;
-		
-		PreparedStatement preparedStatement = null;
-
-		try (Connection connection = DBPool.MINEPLEX.getConnection())
-		{
-			// Create table
-			preparedStatement = connection.prepareStatement(CREATE_NEWS_TABLE);
-			preparedStatement.execute();
-		}
-		catch (Exception exception)
-		{
-			exception.printStackTrace();
-		}
-		finally
-		{
-			if (preparedStatement != null)
-			{
-				try
-				{
-					preparedStatement.close();
-				} 
-				catch (SQLException e)
-				{
-					e.printStackTrace();
-				}
-			}
-		}
 	}
 	
 	public HashMap<String, String> retrieveNewsEntries()

Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java

@@ -58,7 +58,7 @@ public class NewsManager extends MiniPlugin
 				"News Line 3",
 				"News Line 4",
 				};
-		
+
 		RefreshNews();
 	}
 	

Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java

@@ -11,10 +11,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.java.JavaPlugin;
+
 import net.minecraft.server.v1_7_R4.ChatSerializer;
 import net.minecraft.server.v1_7_R4.PacketPlayOutChat;
 import net.minecraft.util.com.google.gson.JsonObject;
-
 import mineplex.core.MiniDbClientPlugin;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.Rank;
@@ -212,7 +212,7 @@ public class PollManager extends MiniDbClientPlugin<PlayerPollData>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadPollData(resultSet));
 	}

Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java

@@ -33,7 +33,7 @@ public class GemHunterCommand extends CommandBase<SalesPackageManager>
 		else if (amount == 8)
 			tempExp = 220000;
 		
-		final int experience = tempExp;
+		final long experience = tempExp;
 		
 		Plugin.getClientManager().loadClientByName(playerName, new Runnable()
 		{