Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads

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

@@ -18,7 +18,6 @@ public enum AchievementCategory
 			new StatDisplay[] { StatDisplay.GEMS_EARNED, null, new StatDisplay("Games Played", "GamesPlayed"), StatDisplay.TIME_IN_GAME },
 			Material.EMERALD, 0, GameCategory.GLOBAL, null),
 
-	//Survival
 	BRIDGES("The Bridges", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.IRON_PICKAXE, 0, GameCategory.SURVIVAL, "Destructor Kit"),
@@ -27,50 +26,46 @@ public enum AchievementCategory
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.DIAMOND_SWORD, 0, GameCategory.SURVIVAL, "Horseman Kit"),
 
-	MINE_STRIKE("MineStrike", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.LOSSES, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.TNT, 0, GameCategory.CLASSICS, null),
-
 	SKYWARS("SkyWars",null,
 			new StatDisplay[]{StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED},
-			Material.INK_SACK, 0,GameCategory.SURVIVAL, "Destructor Kit"),	
+			Material.DOUBLE_PLANT, 5, GameCategory.SURVIVAL, "Destructor Kit"),
+
+	UHC("Ultra Hardcore", null,
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
+			Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
 
 	WIZARDS("Wizards", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
 
-	UHC("Ultra Hardcore", null,
+	CASTLE_SIEGE("Castle Siege", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.LOSSES, new StatDisplay("Kills as Defenders"), new StatDisplay("Deaths as Defenders"),
-			Material.GOLD_INGOT, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
+					new StatDisplay("Kills as Undead"), new StatDisplay("Deaths as Undead"), StatDisplay.GEMS_EARNED },
-
+			Material.DIAMOND_CHESTPLATE, 0, GameCategory.CLASSICS, null),
-	//Classics
-	SMASH_MOBS("Super Smash Mobs", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.SKULL_ITEM, 4, GameCategory.CLASSICS, "Sheep Kit"),
 
 	BLOCK_HUNT("Block Hunt", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.GRASS, 0, GameCategory.CLASSICS, null),
 
-	MASTER_BUILDERS("Master Builders", null,
+	SMASH_MOBS("Super Smash Mobs", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.WOOD, 0, GameCategory.CLASSICS, null),
+			Material.SKULL_ITEM, 4, GameCategory.CLASSICS, "Sheep Kit"),
+
+	MINE_STRIKE("MineStrike", null,
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.LOSSES, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
+			Material.TNT, 0, GameCategory.CLASSICS, null),
 
 	DRAW_MY_THING("Draw My Thing", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
 			Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, null),
 
-	CASTLE_SIEGE("Castle Siege", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.LOSSES, new StatDisplay("Kills as Defenders"), new StatDisplay("Deaths as Defenders"),
-			new StatDisplay("Kills as Undead"), new StatDisplay("Deaths as Undead"), StatDisplay.GEMS_EARNED },
-			Material.DIAMOND_CHESTPLATE, 0, GameCategory.CLASSICS, null),
-
-	//Champions
 	CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM"},
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.LOSSES, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.BEACON, 0, GameCategory.CHAMPIONS, "Extra Class Skills"),
 
-
+	MASTER_BUILDERS("Master Builders", null,
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
+			Material.WOOD, 0, GameCategory.CLASSICS, null),
 			
 	//Arcade
 	DRAGONS("Dragons", null,

Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementMainPage.java

@@ -42,9 +42,9 @@ public class AchievementMainPage extends ShopPageBase<AchievementManager, Achiev
 	{
 		ArrayList<Integer> pageLayout = new ItemLayout(
 		"XXXXOXXXX",
-		"XOXOXOXOX",
+		"OXOXOXOXO",
-		"XOXOXOXOX",
+		"OXOXOXOXO",
-		"OXOXOXOXO").getItemSlots();
+		"XXOXOXOXX").getItemSlots();
 		int listSlot = 0;
  
 		for (AchievementCategory category : AchievementCategory.values())

Plugins/Mineplex.Core/src/mineplex/core/game/GameCategory.java

@@ -0,0 +1,6 @@
+package mineplex.core.game;
+
+public enum GameCategory
+{
+	SURVIVAL, CLASSICS, CHAMPIONS, ARCADE, EVENT, TEAM_VARIANT, EXTRA
+}

Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java

@@ -0,0 +1,127 @@
+package mineplex.core.game;
+
+import org.bukkit.Material;
+
+public enum GameDisplay
+{
+	//Mini
+	BaconBrawl("Bacon Brawl", Material.PORK, (byte)0, GameCategory.ARCADE, 1),
+	Barbarians("A Barbarians Life", Material.WOOD_AXE, (byte)0, GameCategory.EXTRA, 2),
+	Bridge("The Bridges", Material.IRON_PICKAXE, (byte)0, GameCategory.SURVIVAL, 3),
+	CastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.CLASSICS, 4),
+	ChampionsDominate("Champions Domination", "Champions", Material.BEACON, (byte)0, GameCategory.CHAMPIONS, 6),
+	//ChampionsMOBA(ChampionsMOBA.class, "Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0, GameCategory.CHAMPIONS, 7),
+	ChampionsTDM("Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0, GameCategory.CHAMPIONS, 5),
+	Christmas("Christmas Chaos", Material.SNOW_BALL, (byte)0, GameCategory.CLASSICS, 8),
+	DeathTag("Death Tag", Material.SKULL_ITEM, (byte)0, GameCategory.ARCADE, 9),
+	DragonEscape("Dragon Escape", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE, 10),
+	DragonEscapeTeams("Dragon Escape Teams", Material.DRAGON_EGG, (byte)0, GameCategory.TEAM_VARIANT, 11),
+	DragonRiders("Dragon Riders", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE, 12),
+	Dragons("Dragons", Material.ENDER_STONE, (byte)0, GameCategory.ARCADE, 13),
+	DragonsTeams("Dragons Teams", Material.ENDER_STONE, (byte)0, GameCategory.TEAM_VARIANT, 14),
+	Draw("Draw My Thing", Material.BOOK_AND_QUILL, (byte)0, GameCategory.CLASSICS, 15),
+	Evolution("Evolution", Material.EMERALD, (byte)0, GameCategory.ARCADE, 16),
+	//FlappyBird(FlappyBird.class, "Flappy Bird", Material.FEATHER, (byte)0, GameCategory.ARCADE, 17),
+	Gravity("Gravity", Material.ENDER_PORTAL, (byte)0, GameCategory.EXTRA, 18),
+	Halloween("Halloween Horror", Material.PUMPKIN, (byte)0, GameCategory.CLASSICS, 19),
+	HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
+	HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
+	Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21),
+	Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
+	MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
+	MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CHAMPIONS, 25),// Temp set to CHAMPIONS to fix UI bug
+	MineWare("MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
+	OldMineWare("Old MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
+	Paintball("Super Paintball", Material.ENDER_PEARL, (byte)0, GameCategory.ARCADE, 28),
+	Quiver("One in the Quiver", Material.ARROW, (byte)0, GameCategory.ARCADE, 29),
+	QuiverTeams("One in the Quiver Teams", Material.ARROW, (byte)0, GameCategory.TEAM_VARIANT, 30),
+	Runner("Runner", Material.LEATHER_BOOTS, (byte)0, GameCategory.ARCADE, 31),
+	SearchAndDestroy("Search and Destroy", Material.TNT, (byte)0, GameCategory.SURVIVAL, 32),
+	Sheep("Sheep Quest", Material.WOOL, (byte)4, GameCategory.ARCADE, 33),
+
+	Smash("Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS, 34),
+	SmashDomination("Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.EXTRA, 36),
+	SmashTeams("Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.TEAM_VARIANT, 35),
+	Snake("Snake", Material.WOOL, (byte)0, GameCategory.ARCADE, 37),
+	SneakyAssassins("Sneaky Assassins", Material.INK_SACK, (byte)0, GameCategory.ARCADE, 38),
+	SnowFight("Snow Fight", Material.SNOW_BALL, (byte)0, GameCategory.EXTRA, 39),
+	Spleef("Super Spleef", Material.IRON_SPADE, (byte)0, GameCategory.ARCADE, 40),
+	SpleefTeams("Super Spleef Teams", Material.IRON_SPADE, (byte)0, GameCategory.TEAM_VARIANT, 41),
+	SquidShooter("Squid Shooter", Material.FIREWORK_CHARGE, (byte)0, GameCategory.ARCADE, 43),
+	Stacker("Super Stacker", Material.BOWL, (byte)0, GameCategory.ARCADE, 42),
+	SurvivalGames("Survival Games", Material.IRON_SWORD, (byte)0, GameCategory.SURVIVAL, 22),
+	SurvivalGamesTeams("Survival Games Teams", Material.IRON_SWORD, (byte)0, GameCategory.TEAM_VARIANT, 23),
+	Tug("Tug of Wool", Material.WHEAT, (byte)0, GameCategory.ARCADE, 44),
+	TurfWars("Turf Wars", Material.STAINED_CLAY, (byte)14, GameCategory.ARCADE, 45),
+	UHC("Ultra Hardcore", Material.GOLDEN_APPLE, (byte)0, GameCategory.SURVIVAL, 46),
+	WitherAssault("Wither Assault", Material.SKULL_ITEM, (byte)1, GameCategory.ARCADE, 47),
+	Wizards("Wizards", Material.BLAZE_ROD, (byte)0, GameCategory.SURVIVAL, 48),
+	ZombieSurvival("Zombie Survival", Material.SKULL_ITEM, (byte)2, GameCategory.SURVIVAL, 49),
+
+	Build("Master Builders", Material.WOOD, (byte)0, GameCategory.CLASSICS, 50),
+	Cards("Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
+	Skywars("SkyWars", Material.DOUBLE_PLANT, (byte)5, GameCategory.SURVIVAL, 52),
+
+	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
+
+	String _name;
+	String _lobbyName;
+	Material _mat;
+	byte _data;
+	GameCategory _gameCategory;
+
+	private int _gameId;	// Unique identifying id for this gamemode (used for statistics)
+	public int getGameId() { return _gameId; }
+
+	GameDisplay(String name, Material mat, byte data, GameCategory gameCategory, int gameId)
+	{
+		this(name, name, mat, data, gameCategory, gameId);
+	}
+
+	GameDisplay(String name, String lobbyName, Material mat, byte data, GameCategory gameCategory, int gameId)
+	{
+		_name = name;
+		_lobbyName = lobbyName;
+		_mat = mat;
+		_data = data;
+		_gameCategory = gameCategory;
+		_gameId = gameId;
+	}
+
+	public String getName()
+	{
+		return _name;
+	}
+
+	public String getLobbyName()
+	{
+		return _lobbyName;
+	}
+
+	public Material getMaterial()
+	{
+		return _mat;
+	}
+
+	public byte getMaterialData()
+	{
+		return _data;
+	}
+
+	public GameCategory getGameCategory()
+	{
+		return _gameCategory;
+	}
+
+
+	public static GameDisplay matchName(String name)
+	{
+		for (GameDisplay display : values())
+		{
+			if (display.getName().equalsIgnoreCase(name))
+				return display;
+		}
+		return null;
+	}
+
+}

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 = -359672907;
+	private static final long serialVersionUID = -478529995;
 
 	/**
 	 * The reference instance of <code>Account</code>
@@ -49,9 +49,16 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.AccountPreferences.accountPreferences,
 			mineplex.database.tables.Accounts.accounts,
 			mineplex.database.tables.AccountStats.accountStats,
+			mineplex.database.tables.AccountTasks.accountTasks,
+			mineplex.database.tables.AccountTransactions.accountTransactions,
+			mineplex.database.tables.ActiveTournaments.activeTournaments,
+			mineplex.database.tables.Bonus.bonus,
 			mineplex.database.tables.ClanAlliances.clanAlliances,
 			mineplex.database.tables.ClanEnemies.clanEnemies,
+			mineplex.database.tables.ClanMember.clanMember,
 			mineplex.database.tables.Clans.clans,
+			mineplex.database.tables.ClanServer.clanServer,
+			mineplex.database.tables.ClanShopItem.clanShopItem,
 			mineplex.database.tables.ClanTerritory.clanTerritory,
 			mineplex.database.tables.EloRating.eloRating,
 			mineplex.database.tables.FieldBlock.fieldBlock,
@@ -65,6 +72,11 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.Polls.polls,
 			mineplex.database.tables.ServerPassword.serverPassword,
 			mineplex.database.tables.Spawns.spawns,
-			mineplex.database.tables.Stats.stats);
+			mineplex.database.tables.StatEvents.statEvents,
+			mineplex.database.tables.Stats.stats,
+			mineplex.database.tables.StatTypes.statTypes,
+			mineplex.database.tables.Tasks.tasks,
+			mineplex.database.tables.TournamentLB.TournamentLB,
+			mineplex.database.tables.Transactions.transactions);
 	}
 }

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

@@ -31,11 +31,16 @@ public class Keys {
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = Identities0.IDENTITY_accountPreferences;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> IDENTITY_accounts = Identities0.IDENTITY_accounts;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountStatsRecord, java.lang.Integer> IDENTITY_accountStats = Identities0.IDENTITY_accountStats;
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTasksRecord, java.lang.Integer> IDENTITY_accountTasks = Identities0.IDENTITY_accountTasks;
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTransactionsRecord, java.lang.Integer> IDENTITY_accountTransactions = Identities0.IDENTITY_accountTransactions;
+	public static final org.jooq.Identity<mineplex.database.tables.records.BonusRecord, java.lang.Integer> IDENTITY_bonus = Identities0.IDENTITY_bonus;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = Identities0.IDENTITY_clanAlliances;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> IDENTITY_clanEnemies = Identities0.IDENTITY_clanEnemies;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = Identities0.IDENTITY_clans;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClanServerRecord, java.lang.Integer> IDENTITY_clanServer = Identities0.IDENTITY_clanServer;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClanShopItemRecord, java.lang.Integer> IDENTITY_clanShopItem = Identities0.IDENTITY_clanShopItem;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> IDENTITY_clanTerritory = Identities0.IDENTITY_clanTerritory;
-	public static final org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> IDENTITY_eloRating = Identities0.IDENTITY_eloRating;
+	public static final org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> IDENTITY_eloRating = Identities0.IDENTITY_eloRating;
 	public static final org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> IDENTITY_fieldBlock = Identities0.IDENTITY_fieldBlock;
 	public static final org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> IDENTITY_fieldMonster = Identities0.IDENTITY_fieldMonster;
 	public static final org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> IDENTITY_fieldOre = Identities0.IDENTITY_fieldOre;
@@ -47,7 +52,10 @@ public class Keys {
 	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.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;
 	public static final org.jooq.Identity<mineplex.database.tables.records.StatsRecord, java.lang.Integer> IDENTITY_stats = Identities0.IDENTITY_stats;
+	public static final org.jooq.Identity<mineplex.database.tables.records.TasksRecord, java.lang.Integer> IDENTITY_tasks = Identities0.IDENTITY_tasks;
+	public static final org.jooq.Identity<mineplex.database.tables.records.TransactionsRecord, java.lang.Integer> IDENTITY_transactions = Identities0.IDENTITY_transactions;
 
 	// -------------------------------------------------------------------------
 	// UNIQUE and PRIMARY KEY definitions
@@ -68,12 +76,21 @@ public class Keys {
 	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.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;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ActiveTournamentsRecord> KEY_activeTournaments_PRIMARY = UniqueKeys0.KEY_activeTournaments_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusRecord> KEY_bonus_PRIMARY = UniqueKeys0.KEY_bonus_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = UniqueKeys0.KEY_clanAlliances_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_PRIMARY = UniqueKeys0.KEY_clanEnemies_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_clanId = UniqueKeys0.KEY_clanEnemies_unique_clanId;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_otherClanId = UniqueKeys0.KEY_clanEnemies_unique_otherClanId;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_PRIMARY = UniqueKeys0.KEY_clans_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_clanName = UniqueKeys0.KEY_clans_clanName;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_PRIMARY = UniqueKeys0.KEY_clanServer_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_PRIMARY = UniqueKeys0.KEY_clanShopItem_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_shop_page_slot_UNIQUE = UniqueKeys0.KEY_clanShopItem_shop_page_slot_UNIQUE;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_PRIMARY = UniqueKeys0.KEY_clanTerritory_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_territory_server_chunk_UNIQUE = UniqueKeys0.KEY_clanTerritory_territory_server_chunk_UNIQUE;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_PRIMARY = UniqueKeys0.KEY_eloRating_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = UniqueKeys0.KEY_eloRating_uuid_gameType_index;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> KEY_fieldBlock_PRIMARY = UniqueKeys0.KEY_fieldBlock_PRIMARY;
@@ -90,16 +107,25 @@ public class Keys {
 	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.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;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_UK_DailyEntry = UniqueKeys0.KEY_statEvents_UK_DailyEntry;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_PRIMARY = UniqueKeys0.KEY_stats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_nameIndex = UniqueKeys0.KEY_stats_nameIndex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_PRIMARY = UniqueKeys0.KEY_statTypes_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_name = UniqueKeys0.KEY_statTypes_name;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_PRIMARY = UniqueKeys0.KEY_tasks_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_name_UNIQUE = UniqueKeys0.KEY_tasks_name_UNIQUE;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_PRIMARY = UniqueKeys0.KEY_TournamentLB_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_UK_PlayerEntry = UniqueKeys0.KEY_TournamentLB_UK_PlayerEntry;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TransactionsRecord> KEY_transactions_PRIMARY = UniqueKeys0.KEY_transactions_PRIMARY;
 
 	// -------------------------------------------------------------------------
 	// FOREIGN KEY definitions
 	// -------------------------------------------------------------------------
 
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> accountClan_ibfk_1 = ForeignKeys0.accountClan_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> FK_accountClan_accounts = ForeignKeys0.FK_accountClan_accounts;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> accountClan_ibfk_2 = ForeignKeys0.accountClan_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> FK_accountClan_clans2 = ForeignKeys0.FK_accountClan_clans2;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountCoinTransactions_ibfk_1 = ForeignKeys0.accountCoinTransactions_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> FK_ACT_ACCOUNTS_ID = ForeignKeys0.FK_ACT_ACCOUNTS_ID;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountGemTransactions_ibfk_1 = ForeignKeys0.accountGemTransactions_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.AccountsRecord> accountInventory_ibfk_1 = ForeignKeys0.accountInventory_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2;
@@ -107,11 +133,18 @@ public class Keys {
 	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.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;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.TasksRecord> ACCOUNTTASKS_TASKID = ForeignKeys0.ACCOUNTTASKS_TASKID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTRANSACTIONS_ACCOUNTID = ForeignKeys0.ACCOUNTTRANSACTIONS_ACCOUNTID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.TransactionsRecord> ACCOUNTTRANSACTIONS_TRANSACTIONID = ForeignKeys0.ACCOUNTTRANSACTIONS_TRANSACTIONID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusRecord, mineplex.database.tables.records.AccountsRecord> bonus_ibfk_1 = ForeignKeys0.bonus_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_2 = ForeignKeys0.clanAlliances_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_1 = ForeignKeys0.clanAlliances_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_1 = ForeignKeys0.clanEnemies_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_2 = ForeignKeys0.clanEnemies_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClansRecord, mineplex.database.tables.records.ClanServerRecord> clans_ibfk_1 = ForeignKeys0.clans_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClansRecord> clanTerritory_ibfk_1 = ForeignKeys0.clanTerritory_ibfk_1;
+	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;
 
@@ -130,11 +163,16 @@ public class Keys {
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = createIdentity(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> IDENTITY_accounts = createIdentity(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountStatsRecord, java.lang.Integer> IDENTITY_accountStats = createIdentity(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountTasksRecord, java.lang.Integer> IDENTITY_accountTasks = createIdentity(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountTransactionsRecord, java.lang.Integer> IDENTITY_accountTransactions = createIdentity(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.BonusRecord, java.lang.Integer> IDENTITY_bonus = createIdentity(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = createIdentity(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> IDENTITY_clanEnemies = createIdentity(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = createIdentity(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClanServerRecord, java.lang.Integer> IDENTITY_clanServer = createIdentity(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClanShopItemRecord, java.lang.Integer> IDENTITY_clanShopItem = createIdentity(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> IDENTITY_clanTerritory = createIdentity(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id);
-		public static org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> IDENTITY_eloRating = createIdentity(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> IDENTITY_eloRating = createIdentity(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> IDENTITY_fieldBlock = createIdentity(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> IDENTITY_fieldMonster = createIdentity(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> IDENTITY_fieldOre = createIdentity(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id);
@@ -146,7 +184,10 @@ public class Keys {
 		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.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);
 		public static org.jooq.Identity<mineplex.database.tables.records.StatsRecord, java.lang.Integer> IDENTITY_stats = createIdentity(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.TasksRecord, java.lang.Integer> IDENTITY_tasks = createIdentity(mineplex.database.tables.Tasks.tasks, mineplex.database.tables.Tasks.tasks.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.TransactionsRecord, java.lang.Integer> IDENTITY_transactions = createIdentity(mineplex.database.tables.Transactions.transactions, mineplex.database.tables.Transactions.transactions.id);
 	}
 
 	private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
@@ -165,14 +206,23 @@ public class Keys {
 		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.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);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ActiveTournamentsRecord> KEY_activeTournaments_PRIMARY = createUniqueKey(mineplex.database.tables.ActiveTournaments.activeTournaments, mineplex.database.tables.ActiveTournaments.activeTournaments.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusRecord> KEY_bonus_PRIMARY = createUniqueKey(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = createUniqueKey(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_PRIMARY = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_clanId = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.clanId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_otherClanId = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.otherClanId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_PRIMARY = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_clanName = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.serverId, mineplex.database.tables.Clans.clans.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_PRIMARY = createUniqueKey(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id, mineplex.database.tables.ClanServer.clanServer.serverName);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_PRIMARY = createUniqueKey(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_shop_page_slot_UNIQUE = createUniqueKey(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.shopName, mineplex.database.tables.ClanShopItem.clanShopItem.shopPage, mineplex.database.tables.ClanShopItem.clanShopItem.slot);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_PRIMARY = createUniqueKey(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_territory_server_chunk_UNIQUE = createUniqueKey(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.serverId, mineplex.database.tables.ClanTerritory.clanTerritory.chunk);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_PRIMARY = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
-		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.uuid, mineplex.database.tables.EloRating.eloRating.gameType);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.uuid, mineplex.database.tables.EloRating.eloRating.gamemode);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> KEY_fieldBlock_PRIMARY = createUniqueKey(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord> KEY_fieldMonster_PRIMARY = createUniqueKey(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord> KEY_fieldOre_PRIMARY = createUniqueKey(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id);
@@ -187,14 +237,23 @@ public class Keys {
 		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.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);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_UK_DailyEntry = createUniqueKey(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.accountId, mineplex.database.tables.StatEvents.statEvents.date, mineplex.database.tables.StatEvents.statEvents.gamemode, mineplex.database.tables.StatEvents.statEvents.serverGroup, mineplex.database.tables.StatEvents.statEvents.type);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_PRIMARY = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_nameIndex = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_PRIMARY = createUniqueKey(mineplex.database.tables.StatTypes.statTypes, mineplex.database.tables.StatTypes.statTypes.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_name = createUniqueKey(mineplex.database.tables.StatTypes.statTypes, mineplex.database.tables.StatTypes.statTypes.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_PRIMARY = createUniqueKey(mineplex.database.tables.Tasks.tasks, mineplex.database.tables.Tasks.tasks.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_name_UNIQUE = createUniqueKey(mineplex.database.tables.Tasks.tasks, mineplex.database.tables.Tasks.tasks.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_PRIMARY = createUniqueKey(mineplex.database.tables.TournamentLB.TournamentLB, mineplex.database.tables.TournamentLB.TournamentLB.rank);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_UK_PlayerEntry = createUniqueKey(mineplex.database.tables.TournamentLB.TournamentLB, mineplex.database.tables.TournamentLB.TournamentLB.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TransactionsRecord> KEY_transactions_PRIMARY = createUniqueKey(mineplex.database.tables.Transactions.transactions, mineplex.database.tables.Transactions.transactions.id);
 	}
 
 	private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys {
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> accountClan_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> FK_accountClan_accounts = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.accountId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> accountClan_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.clanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> FK_accountClan_clans2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.clanId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountCoinTransactions_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_uuidIndex, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accounts_uuid);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> FK_ACT_ACCOUNTS_ID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountGemTransactions_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_uuidIndex, mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.accounts_uuid);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.AccountsRecord> accountInventory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId);
 		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);
@@ -202,11 +261,18 @@ public class Keys {
 		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.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);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.TasksRecord> ACCOUNTTASKS_TASKID = createForeignKey(mineplex.database.Keys.KEY_tasks_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.taskId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTRANSACTIONS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.TransactionsRecord> ACCOUNTTRANSACTIONS_TRANSACTIONID = createForeignKey(mineplex.database.Keys.KEY_transactions_PRIMARY, mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.transactionId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusRecord, mineplex.database.tables.records.AccountsRecord> bonus_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.clanId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.otherClanId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.clanId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.otherClanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClansRecord, mineplex.database.tables.records.ClanServerRecord> clans_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.serverId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClansRecord> clanTerritory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.clanId);
+		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);
 	}

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

@@ -16,6 +16,74 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Routines {
 
+	/**
+	 * 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) {
+		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.execute(configuration);
+		return p;
+	}
+
+	/**
+	 * Call <code>Account.createLeaderboard</code>
+	 */
+	public static void callCreateleaderboard(org.jooq.Configuration configuration, java.lang.String tableName) {
+		mineplex.database.routines.CreateLeaderboard p = new mineplex.database.routines.CreateLeaderboard();
+		p.setTableName(tableName);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call <code>Account.HeidiSQL_temproutine_1</code>
+	 */
+	public static void callHeidisqlTemproutine_1(org.jooq.Configuration configuration, java.lang.Integer statAccountID, java.sql.Date statDate, java.lang.Byte statGamemode, java.lang.String statServerGroup, java.lang.Byte statType, java.lang.Short statValue) {
+		mineplex.database.routines.HeidiSQL_temproutine_1 p = new mineplex.database.routines.HeidiSQL_temproutine_1();
+		p.setStatAccountID(statAccountID);
+		p.setStatDate(statDate);
+		p.setStatGamemode(statGamemode);
+		p.setStatServerGroup(statServerGroup);
+		p.setStatType(statType);
+		p.setStatValue(statValue);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call <code>Account.HeidiSQL_temproutine_2</code>
+	 */
+	public static void callHeidisqlTemproutine_2(org.jooq.Configuration configuration, java.lang.Integer statAccountID, java.sql.Date statDate, java.lang.Byte statGamemode, java.lang.String statServerGroup, java.lang.Byte statType, java.lang.Short statValue) {
+		mineplex.database.routines.HeidiSQL_temproutine_2 p = new mineplex.database.routines.HeidiSQL_temproutine_2();
+		p.setStatAccountID(statAccountID);
+		p.setStatDate(statDate);
+		p.setStatGamemode(statGamemode);
+		p.setStatServerGroup(statServerGroup);
+		p.setStatType(statType);
+		p.setStatValue(statValue);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call <code>Account.insertStatEvent</code>
+	 */
+	public static void callInsertstatevent(org.jooq.Configuration configuration, java.lang.Integer statAccountID, java.sql.Date statDate, java.lang.Byte statGamemode, java.lang.String statServerGroup, java.lang.Byte statType, java.lang.Short statValue) {
+		mineplex.database.routines.InsertStatEvent p = new mineplex.database.routines.InsertStatEvent();
+		p.setStatAccountID(statAccountID);
+		p.setStatDate(statDate);
+		p.setStatGamemode(statGamemode);
+		p.setStatServerGroup(statServerGroup);
+		p.setStatType(statType);
+		p.setStatValue(statValue);
+
+		p.execute(configuration);
+	}
+
 	/**
 	 * Call <code>Account.playerLogin</code>
 	 */
@@ -27,6 +95,17 @@ public class Routines {
 		p.execute(configuration);
 	}
 
+	/**
+	 * Call <code>Account.swapTableNames</code>
+	 */
+	public static void callSwaptablenames(org.jooq.Configuration configuration, java.lang.String tableName1, java.lang.String tableName2) {
+		mineplex.database.routines.SwapTableNames p = new mineplex.database.routines.SwapTableNames();
+		p.setTableName1(tableName1);
+		p.setTableName2(tableName2);
+
+		p.execute(configuration);
+	}
+
 	/**
 	 * Call <code>Account.test</code>
 	 */
@@ -37,4 +116,23 @@ public class Routines {
 
 		p.execute(configuration);
 	}
+
+	/**
+	 * Call <code>Account.updateTournament</code>
+	 */
+	public static void callUpdatetournament(org.jooq.Configuration configuration, java.lang.String tourneyName) {
+		mineplex.database.routines.UpdateTournament p = new mineplex.database.routines.UpdateTournament();
+		p.setTourneyName(tourneyName);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call <code>Account.updateTournaments</code>
+	 */
+	public static void callUpdatetournaments(org.jooq.Configuration configuration) {
+		mineplex.database.routines.UpdateTournaments p = new mineplex.database.routines.UpdateTournaments();
+
+		p.execute(configuration);
+	}
 }

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

@@ -66,6 +66,26 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountStats accountStats = mineplex.database.tables.AccountStats.accountStats;
 
+	/**
+	 * The table Account.accountTasks
+	 */
+	public static final mineplex.database.tables.AccountTasks accountTasks = mineplex.database.tables.AccountTasks.accountTasks;
+
+	/**
+	 * The table Account.accountTransactions
+	 */
+	public static final mineplex.database.tables.AccountTransactions accountTransactions = mineplex.database.tables.AccountTransactions.accountTransactions;
+
+	/**
+	 * The table Account.activeTournaments
+	 */
+	public static final mineplex.database.tables.ActiveTournaments activeTournaments = mineplex.database.tables.ActiveTournaments.activeTournaments;
+
+	/**
+	 * The table Account.bonus
+	 */
+	public static final mineplex.database.tables.Bonus bonus = mineplex.database.tables.Bonus.bonus;
+
 	/**
 	 * The table Account.clanAlliances
 	 */
@@ -76,11 +96,26 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.ClanEnemies clanEnemies = mineplex.database.tables.ClanEnemies.clanEnemies;
 
+	/**
+	 * VIEW
+	 */
+	public static final mineplex.database.tables.ClanMember clanMember = mineplex.database.tables.ClanMember.clanMember;
+
 	/**
 	 * The table Account.clans
 	 */
 	public static final mineplex.database.tables.Clans clans = mineplex.database.tables.Clans.clans;
 
+	/**
+	 * The table Account.clanServer
+	 */
+	public static final mineplex.database.tables.ClanServer clanServer = mineplex.database.tables.ClanServer.clanServer;
+
+	/**
+	 * The table Account.clanShopItem
+	 */
+	public static final mineplex.database.tables.ClanShopItem clanShopItem = mineplex.database.tables.ClanShopItem.clanShopItem;
+
 	/**
 	 * The table Account.clanTerritory
 	 */
@@ -146,8 +181,33 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Spawns spawns = mineplex.database.tables.Spawns.spawns;
 
+	/**
+	 * The table Account.statEvents
+	 */
+	public static final mineplex.database.tables.StatEvents statEvents = mineplex.database.tables.StatEvents.statEvents;
+
 	/**
 	 * The table Account.stats
 	 */
 	public static final mineplex.database.tables.Stats stats = mineplex.database.tables.Stats.stats;
+
+	/**
+	 * Stores a reference of the various types of statistics and their associated stat type IDs.
+	 */
+	public static final mineplex.database.tables.StatTypes statTypes = mineplex.database.tables.StatTypes.statTypes;
+
+	/**
+	 * The table Account.tasks
+	 */
+	public static final mineplex.database.tables.Tasks tasks = mineplex.database.tables.Tasks.tasks;
+
+	/**
+	 * The table Account.TournamentLB
+	 */
+	public static final mineplex.database.tables.TournamentLB TournamentLB = mineplex.database.tables.TournamentLB.TournamentLB;
+
+	/**
+	 * The table Account.transactions
+	 */
+	public static final mineplex.database.tables.Transactions transactions = mineplex.database.tables.Transactions.transactions;
 }

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountClan extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountClanRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 1128103338;
+	private static final long serialVersionUID = 1838492867;
 
 	/**
 	 * The reference instance of <code>Account.accountClan</code>
@@ -39,17 +39,17 @@ public class AccountClan extends org.jooq.impl.TableImpl<mineplex.database.table
 	/**
 	 * The column <code>Account.accountClan.accountId</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
 
 	/**
 	 * The column <code>Account.accountClan.clanId</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
 
 	/**
 	 * The column <code>Account.accountClan.clanRole</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.String> clanRole = createField("clanRole", org.jooq.impl.SQLDataType.VARCHAR.length(140), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.String> clanRole = createField("clanRole", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, "");
 
 	/**
 	 * Create a <code>Account.accountClan</code> table reference
@@ -102,7 +102,7 @@ public class AccountClan extends org.jooq.impl.TableImpl<mineplex.database.table
 	 */
 	@Override
 	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, ?>> getReferences() {
-		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, ?>>asList(mineplex.database.Keys.accountClan_ibfk_1, mineplex.database.Keys.accountClan_ibfk_2);
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, ?>>asList(mineplex.database.Keys.FK_accountClan_accounts, mineplex.database.Keys.FK_accountClan_clans2);
 	}
 
 	/**

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountCoinTransactions extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountCoinTransactionsRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1752050449;
+	private static final long serialVersionUID = -205501041;
 
 	/**
 	 * The reference instance of <code>Account.accountCoinTransactions</code>
@@ -37,9 +37,9 @@ public class AccountCoinTransactions extends org.jooq.impl.TableImpl<mineplex.da
 	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
 
 	/**
-	 * The column <code>Account.accountCoinTransactions.accounts_uuid</code>.
+	 * The column <code>Account.accountCoinTransactions.accountId</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.String> accounts_uuid = createField("accounts_uuid", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
 
 	/**
 	 * The column <code>Account.accountCoinTransactions.reason</code>.
@@ -102,7 +102,7 @@ public class AccountCoinTransactions extends org.jooq.impl.TableImpl<mineplex.da
 	 */
 	@Override
 	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, ?>> getReferences() {
-		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, ?>>asList(mineplex.database.Keys.accountCoinTransactions_ibfk_1);
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, ?>>asList(mineplex.database.Keys.FK_ACT_ACCOUNTS_ID);
 	}
 
 	/**

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountFriend extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountFriendRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 1087877071;
+	private static final long serialVersionUID = -1948342395;
 
 	/**
 	 * The reference instance of <code>Account.accountFriend</code>
@@ -56,6 +56,16 @@ public class AccountFriend extends org.jooq.impl.TableImpl<mineplex.database.tab
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.AccountFriendRecord, java.sql.Timestamp> created = createField("created", org.jooq.impl.SQLDataType.TIMESTAMP, this, "");
 
+	/**
+	 * The column <code>Account.accountFriend.sourceId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountFriendRecord, java.lang.Integer> sourceId = createField("sourceId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.accountFriend.targetId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountFriendRecord, java.lang.Integer> targetId = createField("targetId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
 	/**
 	 * Create a <code>Account.accountFriend</code> table reference
 	 */

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountPreferences extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountPreferencesRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1627677427;
+	private static final long serialVersionUID = -38086905;
 
 	/**
 	 * The reference instance of <code>Account.accountPreferences</code>
@@ -126,6 +126,11 @@ public class AccountPreferences extends org.jooq.impl.TableImpl<mineplex.databas
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Byte> friendAllowMessaging = createField("friendAllowMessaging", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, "");
 
+	/**
+	 * The column <code>Account.accountPreferences.language</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.String> language = createField("language", org.jooq.impl.SQLDataType.VARCHAR.length(45), this, "");
+
 	/**
 	 * Create a <code>Account.accountPreferences</code> table reference
 	 */

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class ClanAlliances extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClanAlliancesRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -948941039;
+	private static final long serialVersionUID = 2034100059;
 
 	/**
 	 * The reference instance of <code>Account.clanAlliances</code>
@@ -49,7 +49,7 @@ public class ClanAlliances extends org.jooq.impl.TableImpl<mineplex.database.tab
 	/**
 	 * The column <code>Account.clanAlliances.trusted</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Byte> trusted = createField("trusted", org.jooq.impl.SQLDataType.TINYINT, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Boolean> trusted = createField("trusted", org.jooq.impl.SQLDataType.BIT, this, "");
 
 	/**
 	 * Create a <code>Account.clanAlliances</code> table reference

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class ClanEnemies extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClanEnemiesRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 362260050;
+	private static final long serialVersionUID = 7530567;
 
 	/**
 	 * The reference instance of <code>Account.clanEnemies</code>
@@ -46,6 +46,11 @@ public class ClanEnemies extends org.jooq.impl.TableImpl<mineplex.database.table
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> otherClanId = createField("otherClanId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
 
+	/**
+	 * The column <code>Account.clanEnemies.initiator</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Boolean> initiator = createField("initiator", org.jooq.impl.SQLDataType.BIT.nullable(false), this, "");
+
 	/**
 	 * The column <code>Account.clanEnemies.timeFormed</code>.
 	 */

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class ClanTerritory extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClanTerritoryRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -889997754;
+	private static final long serialVersionUID = -1393369389;
 
 	/**
 	 * The reference instance of <code>Account.clanTerritory</code>
@@ -42,9 +42,9 @@ public class ClanTerritory extends org.jooq.impl.TableImpl<mineplex.database.tab
 	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER, this, "");
 
 	/**
-	 * The column <code>Account.clanTerritory.serverName</code>.
+	 * The column <code>Account.clanTerritory.serverId</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.String> serverName = createField("serverName", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> serverId = createField("serverId", org.jooq.impl.SQLDataType.INTEGER, this, "");
 
 	/**
 	 * The column <code>Account.clanTerritory.chunk</code>.
@@ -54,7 +54,7 @@ public class ClanTerritory extends org.jooq.impl.TableImpl<mineplex.database.tab
 	/**
 	 * The column <code>Account.clanTerritory.safe</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Byte> safe = createField("safe", org.jooq.impl.SQLDataType.TINYINT, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Boolean> safe = createField("safe", org.jooq.impl.SQLDataType.BIT, this, "");
 
 	/**
 	 * Create a <code>Account.clanTerritory</code> table reference
@@ -99,7 +99,7 @@ public class ClanTerritory extends org.jooq.impl.TableImpl<mineplex.database.tab
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord>>asList(mineplex.database.Keys.KEY_clanTerritory_PRIMARY);
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord>>asList(mineplex.database.Keys.KEY_clanTerritory_PRIMARY, mineplex.database.Keys.KEY_clanTerritory_territory_server_chunk_UNIQUE);
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class ClanTerritory extends org.jooq.impl.TableImpl<mineplex.database.tab
 	 */
 	@Override
 	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, ?>> getReferences() {
-		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, ?>>asList(mineplex.database.Keys.clanTerritory_ibfk_1);
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, ?>>asList(mineplex.database.Keys.clanTerritory_ibfk_1, mineplex.database.Keys.clanTerritory_ibfk_2);
 	}
 
 	/**

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 = 1661214130;
+	private static final long serialVersionUID = -194264445;
 
 	/**
 	 * The reference instance of <code>Account.clans</code>
@@ -37,14 +37,14 @@ 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> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
 
 	/**
-	 * The column <code>Account.clans.serverName</code>.
+	 * The column <code>Account.clans.serverId</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> serverName = createField("serverName", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> serverId = createField("serverId", org.jooq.impl.SQLDataType.INTEGER, this, "");
 
 	/**
 	 * The column <code>Account.clans.name</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> name = createField("name", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> name = createField("name", org.jooq.impl.SQLDataType.VARCHAR.length(100).nullable(false), this, "");
 
 	/**
 	 * The column <code>Account.clans.description</code>.
@@ -59,17 +59,17 @@ public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	/**
 	 * The column <code>Account.clans.admin</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Byte> admin = createField("admin", org.jooq.impl.SQLDataType.TINYINT, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Boolean> admin = createField("admin", org.jooq.impl.SQLDataType.BIT.nullable(false).defaulted(true), this, "");
 
 	/**
 	 * The column <code>Account.clans.dateCreated</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> dateCreated = createField("dateCreated", org.jooq.impl.SQLDataType.CLOB.length(16777215), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.sql.Timestamp> dateCreated = createField("dateCreated", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, "");
 
 	/**
 	 * The column <code>Account.clans.lastOnline</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> lastOnline = createField("lastOnline", org.jooq.impl.SQLDataType.CLOB.length(16777215), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.sql.Timestamp> lastOnline = createField("lastOnline", org.jooq.impl.SQLDataType.TIMESTAMP, this, "");
 
 	/**
 	 * The column <code>Account.clans.energy</code>.
@@ -119,7 +119,15 @@ public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord>>asList(mineplex.database.Keys.KEY_clans_PRIMARY);
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord>>asList(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.Keys.KEY_clans_clanName);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.ClansRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.ClansRecord, ?>>asList(mineplex.database.Keys.clans_ibfk_1);
 	}
 
 	/**

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

@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class EloRating extends org.jooq.impl.TableImpl<mineplex.database.tables.records.EloRatingRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1481831022;
+	private static final long serialVersionUID = -747680746;
 
 	/**
 	 * The reference instance of <code>Account.eloRating</code>
@@ -34,22 +34,32 @@ public class EloRating extends org.jooq.impl.TableImpl<mineplex.database.tables.
 	/**
 	 * The column <code>Account.eloRating.id</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> id = createField("id", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), this, "");
 
 	/**
 	 * The column <code>Account.eloRating.uuid</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.String> uuid = createField("uuid", org.jooq.impl.SQLDataType.VARCHAR.length(256), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.String> uuid = createField("uuid", org.jooq.impl.SQLDataType.VARCHAR.length(256).nullable(false), this, "");
 
 	/**
-	 * The column <code>Account.eloRating.gameType</code>.
+	 * The column <code>Account.eloRating.gamemode</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.String> gameType = createField("gameType", org.jooq.impl.SQLDataType.VARCHAR.length(256), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UByte> gamemode = createField("gamemode", org.jooq.impl.SQLDataType.TINYINTUNSIGNED.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.eloRating.matchesPlayed</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> matchesPlayed = createField("matchesPlayed", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false).defaulted(true), this, "");
 
 	/**
 	 * The column <code>Account.eloRating.elo</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> elo = createField("elo", org.jooq.impl.SQLDataType.INTEGER, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> elo = createField("elo", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.eloRating.gameType</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.String> gameType = createField("gameType", org.jooq.impl.SQLDataType.VARCHAR.length(40).nullable(false), this, "");
 
 	/**
 	 * Create a <code>Account.eloRating</code> table reference
@@ -77,7 +87,7 @@ public class EloRating extends org.jooq.impl.TableImpl<mineplex.database.tables.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> getIdentity() {
+	public org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> getIdentity() {
 		return mineplex.database.Keys.IDENTITY_eloRating;
 	}
 

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountCoinTransactionsRecord.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 AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountCoinTransactionsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> {
+public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountCoinTransactionsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.Integer> {
 
-	private static final long serialVersionUID = 542320400;
+	private static final long serialVersionUID = 1454061161;
 
 	/**
 	 * Setter for <code>Account.accountCoinTransactions.id</code>.
@@ -33,17 +33,17 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	}
 
 	/**
-	 * Setter for <code>Account.accountCoinTransactions.accounts_uuid</code>.
+	 * Setter for <code>Account.accountCoinTransactions.accountId</code>.
 	 */
-	public void setAccounts_uuid(java.lang.String value) {
+	public void setAccountId(java.lang.Integer value) {
 		setValue(1, value);
 	}
 
 	/**
-	 * Getter for <code>Account.accountCoinTransactions.accounts_uuid</code>.
+	 * Getter for <code>Account.accountCoinTransactions.accountId</code>.
 	 */
-	public java.lang.String getAccounts_uuid() {
+	public java.lang.Integer getAccountId() {
-		return (java.lang.String) getValue(1);
+		return (java.lang.Integer) getValue(1);
 	}
 
 	/**
@@ -94,7 +94,7 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> fieldsRow() {
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.Integer> fieldsRow() {
 		return (org.jooq.Row4) super.fieldsRow();
 	}
 
@@ -102,7 +102,7 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> valuesRow() {
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.Integer> valuesRow() {
 		return (org.jooq.Row4) super.valuesRow();
 	}
 
@@ -118,8 +118,8 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field2() {
+	public org.jooq.Field<java.lang.Integer> field2() {
-		return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accounts_uuid;
+		return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accountId;
 	}
 
 	/**
@@ -150,8 +150,8 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value2() {
+	public java.lang.Integer value2() {
-		return getAccounts_uuid();
+		return getAccountId();
 	}
 
 	/**
@@ -183,8 +183,8 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountCoinTransactionsRecord value2(java.lang.String value) {
+	public AccountCoinTransactionsRecord value2(java.lang.Integer value) {
-		setAccounts_uuid(value);
+		setAccountId(value);
 		return this;
 	}
 
@@ -210,7 +210,7 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountCoinTransactionsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) {
+	public AccountCoinTransactionsRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.Integer value4) {
 		return this;
 	}
 
@@ -228,11 +228,11 @@ public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecord
 	/**
 	 * Create a detached, initialised AccountCoinTransactionsRecord
 	 */
-	public AccountCoinTransactionsRecord(java.lang.Integer id, java.lang.String accounts_uuid, java.lang.String reason, java.lang.Integer coins) {
+	public AccountCoinTransactionsRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String reason, java.lang.Integer coins) {
 		super(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions);
 
 		setValue(0, id);
-		setValue(1, accounts_uuid);
+		setValue(1, accountId);
 		setValue(2, reason);
 		setValue(3, coins);
 	}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriendRecord.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 AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountFriendRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record5<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.sql.Timestamp> {
+public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountFriendRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record7<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.sql.Timestamp, java.lang.Integer, java.lang.Integer> {
 
-	private static final long serialVersionUID = -1309490322;
+	private static final long serialVersionUID = -1039002159;
 
 	/**
 	 * Setter for <code>Account.accountFriend.id</code>.
@@ -88,6 +88,34 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 		return (java.sql.Timestamp) getValue(4);
 	}
 
+	/**
+	 * Setter for <code>Account.accountFriend.sourceId</code>.
+	 */
+	public void setSourceId(java.lang.Integer value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountFriend.sourceId</code>.
+	 */
+	public java.lang.Integer getSourceId() {
+		return (java.lang.Integer) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.accountFriend.targetId</code>.
+	 */
+	public void setTargetId(java.lang.Integer value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountFriend.targetId</code>.
+	 */
+	public java.lang.Integer getTargetId() {
+		return (java.lang.Integer) getValue(6);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -101,23 +129,23 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	}
 
 	// -------------------------------------------------------------------------
-	// Record5 type implementation
+	// Record7 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row5<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.sql.Timestamp> fieldsRow() {
+	public org.jooq.Row7<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.sql.Timestamp, java.lang.Integer, java.lang.Integer> fieldsRow() {
-		return (org.jooq.Row5) super.fieldsRow();
+		return (org.jooq.Row7) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row5<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.sql.Timestamp> valuesRow() {
+	public org.jooq.Row7<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.sql.Timestamp, java.lang.Integer, java.lang.Integer> valuesRow() {
-		return (org.jooq.Row5) super.valuesRow();
+		return (org.jooq.Row7) super.valuesRow();
 	}
 
 	/**
@@ -160,6 +188,22 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 		return mineplex.database.tables.AccountFriend.accountFriend.created;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field6() {
+		return mineplex.database.tables.AccountFriend.accountFriend.sourceId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field7() {
+		return mineplex.database.tables.AccountFriend.accountFriend.targetId;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -200,6 +244,22 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 		return getCreated();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value6() {
+		return getSourceId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value7() {
+		return getTargetId();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -249,7 +309,25 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountFriendRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.sql.Timestamp value5) {
+	public AccountFriendRecord value6(java.lang.Integer value) {
+		setSourceId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountFriendRecord value7(java.lang.Integer value) {
+		setTargetId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountFriendRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.sql.Timestamp value5, java.lang.Integer value6, java.lang.Integer value7) {
 		return this;
 	}
 
@@ -267,7 +345,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	/**
 	 * Create a detached, initialised AccountFriendRecord
 	 */
-	public AccountFriendRecord(java.lang.Integer id, java.lang.String uuidSource, java.lang.String uuidTarget, java.lang.String status, java.sql.Timestamp created) {
+	public AccountFriendRecord(java.lang.Integer id, java.lang.String uuidSource, java.lang.String uuidTarget, java.lang.String status, java.sql.Timestamp created, java.lang.Integer sourceId, java.lang.Integer targetId) {
 		super(mineplex.database.tables.AccountFriend.accountFriend);
 
 		setValue(0, id);
@@ -275,5 +353,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 		setValue(2, uuidTarget);
 		setValue(3, status);
 		setValue(4, created);
+		setValue(5, sourceId);
+		setValue(6, targetId);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferencesRecord.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 AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountPreferencesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record19<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> {
+public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountPreferencesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record20<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.String> {
 
-	private static final long serialVersionUID = 944261312;
+	private static final long serialVersionUID = 296650044;
 
 	/**
 	 * Setter for <code>Account.accountPreferences.id</code>.
@@ -284,6 +284,20 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		return (java.lang.Byte) getValue(18);
 	}
 
+	/**
+	 * Setter for <code>Account.accountPreferences.language</code>.
+	 */
+	public void setLanguage(java.lang.String value) {
+		setValue(19, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountPreferences.language</code>.
+	 */
+	public java.lang.String getLanguage() {
+		return (java.lang.String) getValue(19);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -297,23 +311,23 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 	}
 
 	// -------------------------------------------------------------------------
-	// Record19 type implementation
+	// Record20 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row19<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> fieldsRow() {
+	public org.jooq.Row20<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.String> fieldsRow() {
-		return (org.jooq.Row19) super.fieldsRow();
+		return (org.jooq.Row20) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row19<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> valuesRow() {
+	public org.jooq.Row20<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.String> valuesRow() {
-		return (org.jooq.Row19) super.valuesRow();
+		return (org.jooq.Row20) super.valuesRow();
 	}
 
 	/**
@@ -468,6 +482,14 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		return mineplex.database.tables.AccountPreferences.accountPreferences.friendAllowMessaging;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field20() {
+		return mineplex.database.tables.AccountPreferences.accountPreferences.language;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -620,6 +642,14 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		return getFriendAllowMessaging();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value20() {
+		return getLanguage();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -795,7 +825,16 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountPreferencesRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.Byte value3, java.lang.Byte value4, java.lang.Byte value5, java.lang.Byte value6, java.lang.Byte value7, java.lang.Byte value8, java.lang.Byte value9, java.lang.Byte value10, java.lang.Byte value11, java.lang.Byte value12, java.lang.Byte value13, java.lang.Byte value14, java.lang.Byte value15, java.lang.Byte value16, java.lang.Byte value17, java.lang.Byte value18, java.lang.Byte value19) {
+	public AccountPreferencesRecord value20(java.lang.String value) {
+		setLanguage(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountPreferencesRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.Byte value3, java.lang.Byte value4, java.lang.Byte value5, java.lang.Byte value6, java.lang.Byte value7, java.lang.Byte value8, java.lang.Byte value9, java.lang.Byte value10, java.lang.Byte value11, java.lang.Byte value12, java.lang.Byte value13, java.lang.Byte value14, java.lang.Byte value15, java.lang.Byte value16, java.lang.Byte value17, java.lang.Byte value18, java.lang.Byte value19, java.lang.String value20) {
 		return this;
 	}
 
@@ -813,7 +852,7 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 	/**
 	 * Create a detached, initialised AccountPreferencesRecord
 	 */
-	public AccountPreferencesRecord(java.lang.Integer id, java.lang.String uuid, java.lang.Byte filterChat, java.lang.Byte invisibility, java.lang.Byte games, java.lang.Byte visibility, java.lang.Byte friendChat, java.lang.Byte privateMessaging, java.lang.Byte showChat, java.lang.Byte partyRequests, java.lang.Byte forcefield, java.lang.Byte showMacReports, java.lang.Byte ignoreVelocity, java.lang.Byte pendingFriendRequests, java.lang.Byte friendDisplayInventoryUI, java.lang.Byte friendDisplayOnlineStatus, java.lang.Byte friendDisplayServerName, java.lang.Byte friendAllowRequests, java.lang.Byte friendAllowMessaging) {
+	public AccountPreferencesRecord(java.lang.Integer id, java.lang.String uuid, java.lang.Byte filterChat, java.lang.Byte invisibility, java.lang.Byte games, java.lang.Byte visibility, java.lang.Byte friendChat, java.lang.Byte privateMessaging, java.lang.Byte showChat, java.lang.Byte partyRequests, java.lang.Byte forcefield, java.lang.Byte showMacReports, java.lang.Byte ignoreVelocity, java.lang.Byte pendingFriendRequests, java.lang.Byte friendDisplayInventoryUI, java.lang.Byte friendDisplayOnlineStatus, java.lang.Byte friendDisplayServerName, java.lang.Byte friendAllowRequests, java.lang.Byte friendAllowMessaging, java.lang.String language) {
 		super(mineplex.database.tables.AccountPreferences.accountPreferences);
 
 		setValue(0, id);
@@ -835,5 +874,6 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		setValue(16, friendDisplayServerName);
 		setValue(17, friendAllowRequests);
 		setValue(18, friendAllowMessaging);
+		setValue(19, language);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanAlliancesRecord.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 ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanAlliancesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Byte> {
+public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanAlliancesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Boolean> {
 
-	private static final long serialVersionUID = 1482018494;
+	private static final long serialVersionUID = -932423532;
 
 	/**
 	 * Setter for <code>Account.clanAlliances.id</code>.
@@ -63,15 +63,15 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	/**
 	 * Setter for <code>Account.clanAlliances.trusted</code>.
 	 */
-	public void setTrusted(java.lang.Byte value) {
+	public void setTrusted(java.lang.Boolean value) {
 		setValue(3, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanAlliances.trusted</code>.
 	 */
-	public java.lang.Byte getTrusted() {
+	public java.lang.Boolean getTrusted() {
-		return (java.lang.Byte) getValue(3);
+		return (java.lang.Boolean) getValue(3);
 	}
 
 	// -------------------------------------------------------------------------
@@ -94,7 +94,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Byte> fieldsRow() {
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Boolean> fieldsRow() {
 		return (org.jooq.Row4) super.fieldsRow();
 	}
 
@@ -102,7 +102,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Byte> valuesRow() {
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Boolean> valuesRow() {
 		return (org.jooq.Row4) super.valuesRow();
 	}
 
@@ -134,7 +134,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Byte> field4() {
+	public org.jooq.Field<java.lang.Boolean> field4() {
 		return mineplex.database.tables.ClanAlliances.clanAlliances.trusted;
 	}
 
@@ -166,7 +166,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Byte value4() {
+	public java.lang.Boolean value4() {
 		return getTrusted();
 	}
 
@@ -201,7 +201,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanAlliancesRecord value4(java.lang.Byte value) {
+	public ClanAlliancesRecord value4(java.lang.Boolean value) {
 		setTrusted(value);
 		return this;
 	}
@@ -210,7 +210,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanAlliancesRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.Byte value4) {
+	public ClanAlliancesRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.Boolean value4) {
 		return this;
 	}
 
@@ -228,7 +228,7 @@ public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	/**
 	 * Create a detached, initialised ClanAlliancesRecord
 	 */
-	public ClanAlliancesRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.Integer otherClanId, java.lang.Byte trusted) {
+	public ClanAlliancesRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.Integer otherClanId, java.lang.Boolean trusted) {
 		super(mineplex.database.tables.ClanAlliances.clanAlliances);
 
 		setValue(0, id);

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanEnemiesRecord.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 ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanEnemiesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record8<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> {
+public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanEnemiesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Boolean, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> {
 
-	private static final long serialVersionUID = 1371005861;
+	private static final long serialVersionUID = -1319061144;
 
 	/**
 	 * Setter for <code>Account.clanEnemies.id</code>.
@@ -60,74 +60,88 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 		return (java.lang.Integer) getValue(2);
 	}
 
+	/**
+	 * Setter for <code>Account.clanEnemies.initiator</code>.
+	 */
+	public void setInitiator(java.lang.Boolean value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanEnemies.initiator</code>.
+	 */
+	public java.lang.Boolean getInitiator() {
+		return (java.lang.Boolean) getValue(3);
+	}
+
 	/**
 	 * Setter for <code>Account.clanEnemies.timeFormed</code>.
 	 */
 	public void setTimeFormed(java.sql.Timestamp value) {
-		setValue(3, value);
+		setValue(4, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanEnemies.timeFormed</code>.
 	 */
 	public java.sql.Timestamp getTimeFormed() {
-		return (java.sql.Timestamp) getValue(3);
+		return (java.sql.Timestamp) getValue(4);
 	}
 
 	/**
 	 * Setter for <code>Account.clanEnemies.clanScore</code>.
 	 */
 	public void setClanScore(java.lang.Integer value) {
-		setValue(4, value);
+		setValue(5, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanEnemies.clanScore</code>.
 	 */
 	public java.lang.Integer getClanScore() {
-		return (java.lang.Integer) getValue(4);
+		return (java.lang.Integer) getValue(5);
 	}
 
 	/**
 	 * Setter for <code>Account.clanEnemies.otherClanScore</code>.
 	 */
 	public void setOtherClanScore(java.lang.Integer value) {
-		setValue(5, value);
+		setValue(6, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanEnemies.otherClanScore</code>.
 	 */
 	public java.lang.Integer getOtherClanScore() {
-		return (java.lang.Integer) getValue(5);
+		return (java.lang.Integer) getValue(6);
 	}
 
 	/**
 	 * Setter for <code>Account.clanEnemies.clanKills</code>.
 	 */
 	public void setClanKills(java.lang.Integer value) {
-		setValue(6, value);
+		setValue(7, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanEnemies.clanKills</code>.
 	 */
 	public java.lang.Integer getClanKills() {
-		return (java.lang.Integer) getValue(6);
+		return (java.lang.Integer) getValue(7);
 	}
 
 	/**
 	 * Setter for <code>Account.clanEnemies.otherClanKills</code>.
 	 */
 	public void setOtherClanKills(java.lang.Integer value) {
-		setValue(7, value);
+		setValue(8, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanEnemies.otherClanKills</code>.
 	 */
 	public java.lang.Integer getOtherClanKills() {
-		return (java.lang.Integer) getValue(7);
+		return (java.lang.Integer) getValue(8);
 	}
 
 	// -------------------------------------------------------------------------
@@ -143,23 +157,23 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	}
 
 	// -------------------------------------------------------------------------
-	// Record8 type implementation
+	// Record9 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row8<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
+	public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Boolean, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
-		return (org.jooq.Row8) super.fieldsRow();
+		return (org.jooq.Row9) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row8<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
+	public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Boolean, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
-		return (org.jooq.Row8) super.valuesRow();
+		return (org.jooq.Row9) super.valuesRow();
 	}
 
 	/**
@@ -190,7 +204,15 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.sql.Timestamp> field4() {
+	public org.jooq.Field<java.lang.Boolean> field4() {
+		return mineplex.database.tables.ClanEnemies.clanEnemies.initiator;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.sql.Timestamp> field5() {
 		return mineplex.database.tables.ClanEnemies.clanEnemies.timeFormed;
 	}
 
@@ -198,7 +220,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field5() {
+	public org.jooq.Field<java.lang.Integer> field6() {
 		return mineplex.database.tables.ClanEnemies.clanEnemies.clanScore;
 	}
 
@@ -206,7 +228,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field6() {
+	public org.jooq.Field<java.lang.Integer> field7() {
 		return mineplex.database.tables.ClanEnemies.clanEnemies.otherClanScore;
 	}
 
@@ -214,7 +236,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field7() {
+	public org.jooq.Field<java.lang.Integer> field8() {
 		return mineplex.database.tables.ClanEnemies.clanEnemies.clanKills;
 	}
 
@@ -222,7 +244,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field8() {
+	public org.jooq.Field<java.lang.Integer> field9() {
 		return mineplex.database.tables.ClanEnemies.clanEnemies.otherClanKills;
 	}
 
@@ -254,7 +276,15 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.sql.Timestamp value4() {
+	public java.lang.Boolean value4() {
+		return getInitiator();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.sql.Timestamp value5() {
 		return getTimeFormed();
 	}
 
@@ -262,7 +292,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value5() {
+	public java.lang.Integer value6() {
 		return getClanScore();
 	}
 
@@ -270,7 +300,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value6() {
+	public java.lang.Integer value7() {
 		return getOtherClanScore();
 	}
 
@@ -278,7 +308,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value7() {
+	public java.lang.Integer value8() {
 		return getClanKills();
 	}
 
@@ -286,7 +316,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value8() {
+	public java.lang.Integer value9() {
 		return getOtherClanKills();
 	}
 
@@ -321,7 +351,16 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanEnemiesRecord value4(java.sql.Timestamp value) {
+	public ClanEnemiesRecord value4(java.lang.Boolean value) {
+		setInitiator(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanEnemiesRecord value5(java.sql.Timestamp value) {
 		setTimeFormed(value);
 		return this;
 	}
@@ -330,7 +369,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanEnemiesRecord value5(java.lang.Integer value) {
+	public ClanEnemiesRecord value6(java.lang.Integer value) {
 		setClanScore(value);
 		return this;
 	}
@@ -339,7 +378,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanEnemiesRecord value6(java.lang.Integer value) {
+	public ClanEnemiesRecord value7(java.lang.Integer value) {
 		setOtherClanScore(value);
 		return this;
 	}
@@ -348,7 +387,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanEnemiesRecord value7(java.lang.Integer value) {
+	public ClanEnemiesRecord value8(java.lang.Integer value) {
 		setClanKills(value);
 		return this;
 	}
@@ -357,7 +396,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanEnemiesRecord value8(java.lang.Integer value) {
+	public ClanEnemiesRecord value9(java.lang.Integer value) {
 		setOtherClanKills(value);
 		return this;
 	}
@@ -366,7 +405,7 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanEnemiesRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.sql.Timestamp value4, java.lang.Integer value5, java.lang.Integer value6, java.lang.Integer value7, java.lang.Integer value8) {
+	public ClanEnemiesRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.Boolean value4, java.sql.Timestamp value5, java.lang.Integer value6, java.lang.Integer value7, java.lang.Integer value8, java.lang.Integer value9) {
 		return this;
 	}
 
@@ -384,16 +423,17 @@ public class ClanEnemiesRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	/**
 	 * Create a detached, initialised ClanEnemiesRecord
 	 */
-	public ClanEnemiesRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.Integer otherClanId, java.sql.Timestamp timeFormed, java.lang.Integer clanScore, java.lang.Integer otherClanScore, java.lang.Integer clanKills, java.lang.Integer otherClanKills) {
+	public ClanEnemiesRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.Integer otherClanId, java.lang.Boolean initiator, java.sql.Timestamp timeFormed, java.lang.Integer clanScore, java.lang.Integer otherClanScore, java.lang.Integer clanKills, java.lang.Integer otherClanKills) {
 		super(mineplex.database.tables.ClanEnemies.clanEnemies);
 
 		setValue(0, id);
 		setValue(1, clanId);
 		setValue(2, otherClanId);
-		setValue(3, timeFormed);
+		setValue(3, initiator);
-		setValue(4, clanScore);
+		setValue(4, timeFormed);
-		setValue(5, otherClanScore);
+		setValue(5, clanScore);
-		setValue(6, clanKills);
+		setValue(6, otherClanScore);
-		setValue(7, otherClanKills);
+		setValue(7, clanKills);
+		setValue(8, otherClanKills);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanTerritoryRecord.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 ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanTerritoryRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record5<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> {
+public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanTerritoryRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record5<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.Boolean> {
 
-	private static final long serialVersionUID = 166696952;
+	private static final long serialVersionUID = 1422111385;
 
 	/**
 	 * Setter for <code>Account.clanTerritory.id</code>.
@@ -47,17 +47,17 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	}
 
 	/**
-	 * Setter for <code>Account.clanTerritory.serverName</code>.
+	 * Setter for <code>Account.clanTerritory.serverId</code>.
 	 */
-	public void setServerName(java.lang.String value) {
+	public void setServerId(java.lang.Integer value) {
 		setValue(2, value);
 	}
 
 	/**
-	 * Getter for <code>Account.clanTerritory.serverName</code>.
+	 * Getter for <code>Account.clanTerritory.serverId</code>.
 	 */
-	public java.lang.String getServerName() {
+	public java.lang.Integer getServerId() {
-		return (java.lang.String) getValue(2);
+		return (java.lang.Integer) getValue(2);
 	}
 
 	/**
@@ -77,15 +77,15 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	/**
 	 * Setter for <code>Account.clanTerritory.safe</code>.
 	 */
-	public void setSafe(java.lang.Byte value) {
+	public void setSafe(java.lang.Boolean value) {
 		setValue(4, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clanTerritory.safe</code>.
 	 */
-	public java.lang.Byte getSafe() {
+	public java.lang.Boolean getSafe() {
-		return (java.lang.Byte) getValue(4);
+		return (java.lang.Boolean) getValue(4);
 	}
 
 	// -------------------------------------------------------------------------
@@ -108,7 +108,7 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> fieldsRow() {
+	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.Boolean> fieldsRow() {
 		return (org.jooq.Row5) super.fieldsRow();
 	}
 
@@ -116,7 +116,7 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> valuesRow() {
+	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.Boolean> valuesRow() {
 		return (org.jooq.Row5) super.valuesRow();
 	}
 
@@ -140,8 +140,8 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field3() {
+	public org.jooq.Field<java.lang.Integer> field3() {
-		return mineplex.database.tables.ClanTerritory.clanTerritory.serverName;
+		return mineplex.database.tables.ClanTerritory.clanTerritory.serverId;
 	}
 
 	/**
@@ -156,7 +156,7 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Byte> field5() {
+	public org.jooq.Field<java.lang.Boolean> field5() {
 		return mineplex.database.tables.ClanTerritory.clanTerritory.safe;
 	}
 
@@ -180,8 +180,8 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value3() {
+	public java.lang.Integer value3() {
-		return getServerName();
+		return getServerId();
 	}
 
 	/**
@@ -196,7 +196,7 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Byte value5() {
+	public java.lang.Boolean value5() {
 		return getSafe();
 	}
 
@@ -222,8 +222,8 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanTerritoryRecord value3(java.lang.String value) {
+	public ClanTerritoryRecord value3(java.lang.Integer value) {
-		setServerName(value);
+		setServerId(value);
 		return this;
 	}
 
@@ -240,7 +240,7 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanTerritoryRecord value5(java.lang.Byte value) {
+	public ClanTerritoryRecord value5(java.lang.Boolean value) {
 		setSafe(value);
 		return this;
 	}
@@ -249,7 +249,7 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClanTerritoryRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.Byte value5) {
+	public ClanTerritoryRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.String value4, java.lang.Boolean value5) {
 		return this;
 	}
 
@@ -267,12 +267,12 @@ public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	/**
 	 * Create a detached, initialised ClanTerritoryRecord
 	 */
-	public ClanTerritoryRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.String serverName, java.lang.String chunk, java.lang.Byte safe) {
+	public ClanTerritoryRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.Integer serverId, java.lang.String chunk, java.lang.Boolean safe) {
 		super(mineplex.database.tables.ClanTerritory.clanTerritory);
 
 		setValue(0, id);
 		setValue(1, clanId);
-		setValue(2, serverName);
+		setValue(2, serverId);
 		setValue(3, chunk);
 		setValue(4, safe);
 	}

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.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.lang.String, 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.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> {
 
-	private static final long serialVersionUID = 1282971231;
+	private static final long serialVersionUID = -1803774546;
 
 	/**
 	 * Setter for <code>Account.clans.id</code>.
@@ -33,17 +33,17 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	}
 
 	/**
-	 * Setter for <code>Account.clans.serverName</code>.
+	 * Setter for <code>Account.clans.serverId</code>.
 	 */
-	public void setServerName(java.lang.String value) {
+	public void setServerId(java.lang.Integer value) {
 		setValue(1, value);
 	}
 
 	/**
-	 * Getter for <code>Account.clans.serverName</code>.
+	 * Getter for <code>Account.clans.serverId</code>.
 	 */
-	public java.lang.String getServerName() {
+	public java.lang.Integer getServerId() {
-		return (java.lang.String) getValue(1);
+		return (java.lang.Integer) getValue(1);
 	}
 
 	/**
@@ -91,43 +91,43 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Setter for <code>Account.clans.admin</code>.
 	 */
-	public void setAdmin(java.lang.Byte value) {
+	public void setAdmin(java.lang.Boolean value) {
 		setValue(5, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clans.admin</code>.
 	 */
-	public java.lang.Byte getAdmin() {
+	public java.lang.Boolean getAdmin() {
-		return (java.lang.Byte) getValue(5);
+		return (java.lang.Boolean) getValue(5);
 	}
 
 	/**
 	 * Setter for <code>Account.clans.dateCreated</code>.
 	 */
-	public void setDateCreated(java.lang.String value) {
+	public void setDateCreated(java.sql.Timestamp value) {
 		setValue(6, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clans.dateCreated</code>.
 	 */
-	public java.lang.String getDateCreated() {
+	public java.sql.Timestamp getDateCreated() {
-		return (java.lang.String) getValue(6);
+		return (java.sql.Timestamp) getValue(6);
 	}
 
 	/**
 	 * Setter for <code>Account.clans.lastOnline</code>.
 	 */
-	public void setLastOnline(java.lang.String value) {
+	public void setLastOnline(java.sql.Timestamp value) {
 		setValue(7, value);
 	}
 
 	/**
 	 * Getter for <code>Account.clans.lastOnline</code>.
 	 */
-	public java.lang.String getLastOnline() {
+	public java.sql.Timestamp getLastOnline() {
-		return (java.lang.String) getValue(7);
+		return (java.sql.Timestamp) getValue(7);
 	}
 
 	/**
@@ -164,7 +164,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row9<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.lang.String, java.lang.Integer> fieldsRow() {
+	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();
 	}
 
@@ -172,7 +172,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row9<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.lang.String, java.lang.Integer> valuesRow() {
+	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();
 	}
 
@@ -188,8 +188,8 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field2() {
+	public org.jooq.Field<java.lang.Integer> field2() {
-		return mineplex.database.tables.Clans.clans.serverName;
+		return mineplex.database.tables.Clans.clans.serverId;
 	}
 
 	/**
@@ -220,7 +220,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Byte> field6() {
+	public org.jooq.Field<java.lang.Boolean> field6() {
 		return mineplex.database.tables.Clans.clans.admin;
 	}
 
@@ -228,7 +228,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field7() {
+	public org.jooq.Field<java.sql.Timestamp> field7() {
 		return mineplex.database.tables.Clans.clans.dateCreated;
 	}
 
@@ -236,7 +236,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field8() {
+	public org.jooq.Field<java.sql.Timestamp> field8() {
 		return mineplex.database.tables.Clans.clans.lastOnline;
 	}
 
@@ -260,8 +260,8 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value2() {
+	public java.lang.Integer value2() {
-		return getServerName();
+		return getServerId();
 	}
 
 	/**
@@ -292,7 +292,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Byte value6() {
+	public java.lang.Boolean value6() {
 		return getAdmin();
 	}
 
@@ -300,7 +300,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value7() {
+	public java.sql.Timestamp value7() {
 		return getDateCreated();
 	}
 
@@ -308,7 +308,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value8() {
+	public java.sql.Timestamp value8() {
 		return getLastOnline();
 	}
 
@@ -333,8 +333,8 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord value2(java.lang.String value) {
+	public ClansRecord value2(java.lang.Integer value) {
-		setServerName(value);
+		setServerId(value);
 		return this;
 	}
 
@@ -369,7 +369,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord value6(java.lang.Byte value) {
+	public ClansRecord value6(java.lang.Boolean value) {
 		setAdmin(value);
 		return this;
 	}
@@ -378,7 +378,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord value7(java.lang.String value) {
+	public ClansRecord value7(java.sql.Timestamp value) {
 		setDateCreated(value);
 		return this;
 	}
@@ -387,7 +387,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord value8(java.lang.String value) {
+	public ClansRecord value8(java.sql.Timestamp value) {
 		setLastOnline(value);
 		return this;
 	}
@@ -405,7 +405,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Byte value6, java.lang.String value7, java.lang.String value8, java.lang.Integer value9) {
+	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) {
 		return this;
 	}
 
@@ -423,11 +423,11 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Create a detached, initialised ClansRecord
 	 */
-	public ClansRecord(java.lang.Integer id, java.lang.String serverName, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Byte admin, java.lang.String dateCreated, java.lang.String 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) {
 		super(mineplex.database.tables.Clans.clans);
 
 		setValue(0, id);
-		setValue(1, serverName);
+		setValue(1, serverId);
 		setValue(2, name);
 		setValue(3, description);
 		setValue(4, home);

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

@@ -14,22 +14,22 @@ package mineplex.database.tables.records;
 	comments = "This class is generated by jOOQ"
 )
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.EloRatingRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> {
+public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.EloRatingRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record6<org.jooq.types.UInteger, java.lang.String, org.jooq.types.UByte, org.jooq.types.UInteger, java.lang.Integer, java.lang.String> {
 
-	private static final long serialVersionUID = 1948352677;
+	private static final long serialVersionUID = 329740739;
 
 	/**
 	 * Setter for <code>Account.eloRating.id</code>.
 	 */
-	public void setId(java.lang.Integer value) {
+	public void setId(org.jooq.types.UInteger value) {
 		setValue(0, value);
 	}
 
 	/**
 	 * Getter for <code>Account.eloRating.id</code>.
 	 */
-	public java.lang.Integer getId() {
+	public org.jooq.types.UInteger getId() {
-		return (java.lang.Integer) getValue(0);
+		return (org.jooq.types.UInteger) getValue(0);
 	}
 
 	/**
@@ -47,31 +47,59 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	}
 
 	/**
-	 * Setter for <code>Account.eloRating.gameType</code>.
+	 * Setter for <code>Account.eloRating.gamemode</code>.
 	 */
-	public void setGameType(java.lang.String value) {
+	public void setGamemode(org.jooq.types.UByte value) {
 		setValue(2, value);
 	}
 
 	/**
-	 * Getter for <code>Account.eloRating.gameType</code>.
+	 * Getter for <code>Account.eloRating.gamemode</code>.
 	 */
-	public java.lang.String getGameType() {
+	public org.jooq.types.UByte getGamemode() {
-		return (java.lang.String) getValue(2);
+		return (org.jooq.types.UByte) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.eloRating.matchesPlayed</code>.
+	 */
+	public void setMatchesPlayed(org.jooq.types.UInteger value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.eloRating.matchesPlayed</code>.
+	 */
+	public org.jooq.types.UInteger getMatchesPlayed() {
+		return (org.jooq.types.UInteger) getValue(3);
 	}
 
 	/**
 	 * Setter for <code>Account.eloRating.elo</code>.
 	 */
 	public void setElo(java.lang.Integer value) {
-		setValue(3, value);
+		setValue(4, value);
 	}
 
 	/**
 	 * Getter for <code>Account.eloRating.elo</code>.
 	 */
 	public java.lang.Integer getElo() {
-		return (java.lang.Integer) getValue(3);
+		return (java.lang.Integer) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.eloRating.gameType</code>.
+	 */
+	public void setGameType(java.lang.String value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.eloRating.gameType</code>.
+	 */
+	public java.lang.String getGameType() {
+		return (java.lang.String) getValue(5);
 	}
 
 	// -------------------------------------------------------------------------
@@ -82,35 +110,35 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Record1<java.lang.Integer> key() {
+	public org.jooq.Record1<org.jooq.types.UInteger> key() {
 		return (org.jooq.Record1) super.key();
 	}
 
 	// -------------------------------------------------------------------------
-	// Record4 type implementation
+	// Record6 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> fieldsRow() {
+	public org.jooq.Row6<org.jooq.types.UInteger, java.lang.String, org.jooq.types.UByte, org.jooq.types.UInteger, java.lang.Integer, java.lang.String> fieldsRow() {
-		return (org.jooq.Row4) super.fieldsRow();
+		return (org.jooq.Row6) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> valuesRow() {
+	public org.jooq.Row6<org.jooq.types.UInteger, java.lang.String, org.jooq.types.UByte, org.jooq.types.UInteger, java.lang.Integer, java.lang.String> valuesRow() {
-		return (org.jooq.Row4) super.valuesRow();
+		return (org.jooq.Row6) super.valuesRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field1() {
+	public org.jooq.Field<org.jooq.types.UInteger> field1() {
 		return mineplex.database.tables.EloRating.eloRating.id;
 	}
 
@@ -126,15 +154,23 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field3() {
+	public org.jooq.Field<org.jooq.types.UByte> field3() {
-		return mineplex.database.tables.EloRating.eloRating.gameType;
+		return mineplex.database.tables.EloRating.eloRating.gamemode;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field4() {
+	public org.jooq.Field<org.jooq.types.UInteger> field4() {
+		return mineplex.database.tables.EloRating.eloRating.matchesPlayed;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field5() {
 		return mineplex.database.tables.EloRating.eloRating.elo;
 	}
 
@@ -142,7 +178,15 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value1() {
+	public org.jooq.Field<java.lang.String> field6() {
+		return mineplex.database.tables.EloRating.eloRating.gameType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.types.UInteger value1() {
 		return getId();
 	}
 
@@ -158,15 +202,23 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value3() {
+	public org.jooq.types.UByte value3() {
-		return getGameType();
+		return getGamemode();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value4() {
+	public org.jooq.types.UInteger value4() {
+		return getMatchesPlayed();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value5() {
 		return getElo();
 	}
 
@@ -174,7 +226,15 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public EloRatingRecord value1(java.lang.Integer value) {
+	public java.lang.String value6() {
+		return getGameType();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord value1(org.jooq.types.UInteger value) {
 		setId(value);
 		return this;
 	}
@@ -192,8 +252,8 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public EloRatingRecord value3(java.lang.String value) {
+	public EloRatingRecord value3(org.jooq.types.UByte value) {
-		setGameType(value);
+		setGamemode(value);
 		return this;
 	}
 
@@ -201,7 +261,16 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public EloRatingRecord value4(java.lang.Integer value) {
+	public EloRatingRecord value4(org.jooq.types.UInteger value) {
+		setMatchesPlayed(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord value5(java.lang.Integer value) {
 		setElo(value);
 		return this;
 	}
@@ -210,7 +279,16 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	 * {@inheritDoc}
 	 */
 	@Override
-	public EloRatingRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) {
+	public EloRatingRecord value6(java.lang.String value) {
+		setGameType(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord values(org.jooq.types.UInteger value1, java.lang.String value2, org.jooq.types.UByte value3, org.jooq.types.UInteger value4, java.lang.Integer value5, java.lang.String value6) {
 		return this;
 	}
 
@@ -228,12 +306,14 @@ public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.
 	/**
 	 * Create a detached, initialised EloRatingRecord
 	 */
-	public EloRatingRecord(java.lang.Integer id, java.lang.String uuid, java.lang.String gameType, java.lang.Integer elo) {
+	public EloRatingRecord(org.jooq.types.UInteger id, java.lang.String uuid, org.jooq.types.UByte gamemode, org.jooq.types.UInteger matchesPlayed, java.lang.Integer elo, java.lang.String gameType) {
 		super(mineplex.database.tables.EloRating.eloRating);
 
 		setValue(0, id);
 		setValue(1, uuid);
-		setValue(2, gameType);
+		setValue(2, gamemode);
-		setValue(3, elo);
+		setValue(3, matchesPlayed);
+		setValue(4, elo);
+		setValue(5, gameType);
 	}
 }

Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java

@@ -720,6 +720,11 @@ public class ServerManager extends MiniPlugin
 		return _serverNpcShopMap.get("Ultra Hardcore");
 	}
 
+	public ServerNpcShop getSKYShop()
+	{
+		return _serverNpcShopMap.get("SkyWars");
+	}
+
 	public ServerNpcShop getPlayerGamesShop()
 	{
 		return _serverNpcShopMap.get("Mineplex Player Servers");

Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java

@@ -25,6 +25,7 @@ import mineplex.hub.server.ui.button.SelectMINButton;
 import mineplex.hub.server.ui.button.SelectMSButton;
 import mineplex.hub.server.ui.button.SelectPLAYERButton;
 import mineplex.hub.server.ui.button.SelectSGButton;
+import mineplex.hub.server.ui.button.SelectSKYButton;
 import mineplex.hub.server.ui.button.SelectSSMButton;
 import mineplex.hub.server.ui.button.SelectTDMButton;
 import mineplex.hub.server.ui.button.SelectUHCButton;
@@ -73,17 +74,27 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("HG") + ChatColor.RESET + " other players!",
 				}));
 
-		setItem(4, ItemStackFactory.Instance.CreateStack(Material.TNT.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Mine-Strike " + C.cGray + "Team Survival", new String[] 
+		setItem(4, ItemStackFactory.Instance.CreateStack(Material.DOUBLE_PLANT.getId(), (byte) 5, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "SkyWars " + C.cGray + "Solo Survival", new String[]
 				{
-					ChatColor.RESET + "",
+						ChatColor.RESET + "",
-					ChatColor.RESET + "One team must defend two bomb sites from",
+						ChatColor.RESET + "High in the sky <Number> contenders fight for the right to rule the skies!",
-					ChatColor.RESET + "the other team, who are trying to plant a bomb",
+						ChatColor.RESET + "Spawn on a floating island and build your path!",
-					ChatColor.RESET + "and blow them up!",
+						ChatColor.RESET + "Find and use weapons to take your enemies down!",
-					ChatColor.RESET + "",
+						ChatColor.RESET + "Standing up there, death ever looming if you fall..",
-					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("MS") + ChatColor.RESET + " other players!",
+						ChatColor.RESET + "Can you fight? Can you live? Can you win SkyWars?",
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("SKY") + ChatColor.RESET + " other players!",
 				}));
 
-		setItem(6, _superSmashCycle.get(_ssmIndex));
+		setItem(6, ItemStackFactory.Instance.CreateStack(Material.GOLDEN_APPLE.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "UHC " + C.cGray + "Ultra Hardcore Mode", new String[]
+				{
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Extremely hard team-based survival ",
+						ChatColor.RESET + "Gather materials and fight your way",
+						ChatColor.RESET + "to become the last team standing!",
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("UHC") + ChatColor.RESET + " other players!",
+				}));
 
 		setItem(8, ItemStackFactory.Instance.CreateStack(Material.BLAZE_ROD.getId(), (byte) 0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Wizards " + C.cGray + "Last Man Standing", new String[]
 				{
@@ -95,7 +106,39 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("WIZ") + ChatColor.RESET + " other players!",
 				}));
 
-		setItem(18, ItemStackFactory.Instance.CreateStack(Material.BOOK_AND_QUILL.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Draw My Thing " + C.cGray + "Pictionary!", new String[] 
+		setItem(18, ItemStackFactory.Instance.CreateStack(Material.DIAMOND_CHESTPLATE, (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Castle Siege " + C.cGray + "Team Game", new String[]
+				{
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Defenders must protect King Sparklez",
+						ChatColor.RESET + "from the endless waves of Undead",
+						ChatColor.RESET + "until the sun rises!",
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("CS") + ChatColor.RESET + " other players!",
+				}));
+
+		setItem(20, ItemStackFactory.Instance.CreateStack(Material.GRASS.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Block Hunt " + C.cGray + "Cat and Mouse", new String[]
+				{
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Hide as blocks/animals, upgrade your ",
+						ChatColor.RESET + "weapon and fight to survive against",
+						ChatColor.RESET + "the Hunters!",
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BH") + ChatColor.RESET + " other players!",
+				}));
+
+		setItem(22, _superSmashCycle.get(_ssmIndex));
+
+		setItem(24, ItemStackFactory.Instance.CreateStack(Material.TNT.getId(), (byte) 0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Mine-Strike " + C.cGray + "Team Survival", new String[]
+				{
+						ChatColor.RESET + "",
+						ChatColor.RESET + "One team must defend two bomb sites from",
+						ChatColor.RESET + "the other team, who are trying to plant a bomb",
+						ChatColor.RESET + "and blow them up!",
+						ChatColor.RESET + "",
+						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("MS") + ChatColor.RESET + " other players!",
+				}));
+		
+		setItem(26, ItemStackFactory.Instance.CreateStack(Material.BOOK_AND_QUILL.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Draw My Thing " + C.cGray + "Pictionary!", new String[]
 				{ 
 					ChatColor.RESET + "",
 					ChatColor.RESET + "Players take turns at drawing a random",
@@ -105,17 +148,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DMT") + ChatColor.RESET + " other players!",
 				}));
 		
-		setItem(20, ItemStackFactory.Instance.CreateStack(Material.DIAMOND_CHESTPLATE, (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Castle Siege " + C.cGray + "Team Game", new String[] 
+		setItem(36, ItemStackFactory.Instance.CreateStack(Material.BEACON.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Dominate " + C.cGray + "Team Game", new String[]
-				{
-					ChatColor.RESET + "",
-					ChatColor.RESET + "Defenders must protect King Sparklez",
-					ChatColor.RESET + "from the endless waves of Undead",
-					ChatColor.RESET + "until the sun rises!",
-					ChatColor.RESET + "",
-					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("CS") + ChatColor.RESET + " other players!",
-				}));
-		
-		setItem(22, ItemStackFactory.Instance.CreateStack(Material.BEACON.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Dominate " + C.cGray + "Team Game", new String[] 
 				{
 					ChatColor.RESET + "",
 					ChatColor.RESET + "Customize one of five exciting champions",
@@ -125,7 +158,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DOM") + ChatColor.RESET + " other players!",
 				}));
 		
-		setItem(24, ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Team Deathmatch " + C.cGray + "Team Game", new String[] 
+		setItem(38, ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Team Deathmatch " + C.cGray + "Team Game", new String[]
 				{
 					ChatColor.RESET + "",
 					ChatColor.RESET + "Customize one of five exciting champions",
@@ -135,27 +168,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("TDM") + ChatColor.RESET + " other players!",
 				}));
 		
-		setItem(26, ItemStackFactory.Instance.CreateStack(Material.GRASS.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Block Hunt " + C.cGray + "Cat and Mouse", new String[] 
+		setItem(40, ItemStackFactory.Instance.CreateStack(Material.WOOD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Master Builders " + C.cGray + "Creative Build", new String[]
-				{ 
-					ChatColor.RESET + "",
-					ChatColor.RESET + "Hide as blocks/animals, upgrade your ",
-					ChatColor.RESET + "weapon and fight to survive against",
-					ChatColor.RESET + "the Hunters!",
-					ChatColor.RESET + "",
-					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BH") + ChatColor.RESET + " other players!",
-				}));
-
-		setItem(36, ItemStackFactory.Instance.CreateStack(Material.GOLDEN_APPLE.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "UHC " + C.cGray + "Ultra Hardcore Mode", new String[]
-				{
-						ChatColor.RESET + "",
-						ChatColor.RESET + "Extremely hard team-based survival ",
-						ChatColor.RESET + "Gather materials and fight your way",
-						ChatColor.RESET + "to become the last team standing!",
-						ChatColor.RESET + "",
-						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("UHC") + ChatColor.RESET + " other players!",
-				}));
-		
-		setItem(38, ItemStackFactory.Instance.CreateStack(Material.WOOD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Master Builders " + C.cGray + "Creative Build", new String[]
 				{ 
 					ChatColor.RESET + "",
 					ChatColor.RESET + "Players are given a Build Theme and ",
@@ -165,9 +178,9 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BLD") + ChatColor.RESET + " other players!",
 				}));
 		
-		setItem(40, _minigameCycle.get(_minigameIndex));
+		setItem(42, _minigameCycle.get(_minigameIndex));
 
-		setItem(42, ItemStackFactory.Instance.CreateStack(Material.SKULL_ITEM.getId(), (byte) 3, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Player Servers " + C.cGray + "Player Hosted Games", new String[]
+		setItem(44, ItemStackFactory.Instance.CreateStack(Material.SKULL_ITEM.getId(), (byte) 3, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Player Servers " + C.cGray + "Player Hosted Games", new String[]
 				{
 						ChatColor.RESET + "",
 						ChatColor.RESET + "Join your friends in their own ",
@@ -176,31 +189,23 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						ChatColor.RESET + "",
 				}));
 
-		setItem(44, ItemStackFactory.Instance.CreateStack(Material.ANVIL.getId(), (byte) 0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Beta Games " + C.cGray + "Play Unreleased Games", new String[]
-				{
-						ChatColor.RESET + "",
-						ChatColor.RESET + "Help test and improve our ",
-						ChatColor.RESET + "unreleased games.",
-						ChatColor.RESET + "",
-						ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BETA") + ChatColor.RESET + " other players!",
-				}));
-
 		getButtonMap().put(0, new SelectBRButton(this));
 		getButtonMap().put(2, new SelectSGButton(this));
-		getButtonMap().put(4, new SelectMSButton(this));
+		getButtonMap().put(4, new SelectSKYButton(this));
-		getButtonMap().put(6, new SelectSSMButton(this));
+		getButtonMap().put(6, new SelectUHCButton(this));
 		getButtonMap().put(8, new SelectWIZButton(this));
 				
-		getButtonMap().put(18, new SelectDMTButton(this));
+		getButtonMap().put(18, new SelectCSButton(this));
-		getButtonMap().put(20, new SelectCSButton(this));
+		getButtonMap().put(20, new SelectBHButton(this));
-		getButtonMap().put(22, new SelectDOMButton(this));
+		getButtonMap().put(22, new SelectSSMButton(this));
-		getButtonMap().put(24, new SelectTDMButton(this));
+		getButtonMap().put(24, new SelectMSButton(this));
-		getButtonMap().put(26, new SelectBHButton(this));
+		getButtonMap().put(26, new SelectDMTButton(this));
-		getButtonMap().put(36, new SelectUHCButton(this));
+		getButtonMap().put(36, new SelectDOMButton(this));
-		getButtonMap().put(38, new SelectBLDButton(this));
+		getButtonMap().put(38, new SelectTDMButton(this));
-		getButtonMap().put(40, new SelectMINButton(this));
+		getButtonMap().put(40, new SelectBLDButton(this));
-		getButtonMap().put(42, new SelectPLAYERButton(this));
+		getButtonMap().put(42, new SelectMINButton(this));
-		getButtonMap().put(44, new SelectBETAButton(this));
+		getButtonMap().put(44, new SelectPLAYERButton(this));
+//		getButtonMap().put(44, new SelectBETAButton(this));
 	}
 
 	@SuppressWarnings("deprecation")
@@ -538,6 +543,11 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 		getPlugin().getUHCShop().attemptShopOpen(player);
 	}
 
+	public void openSKY(Player player)
+	{
+		getPlugin().getSKYShop().attemptShopOpen(player);
+	}
+
 	public void openPlayerGames(Player player)
 	{
 		getPlugin().getPlayerGamesShop().attemptShopOpen(player);

Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java

@@ -11,10 +11,12 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import mineplex.core.account.CoreClientManager;
+import mineplex.core.achievement.AchievementCategory;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.donation.DonationManager;
+import mineplex.core.game.GameDisplay;
 import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.core.shop.page.ShopPageBase;
@@ -299,6 +301,8 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 		String hostName = serverInfo.Name.substring(0, serverInfo.Name.indexOf('-'));
 		String server = ChatColor.GREEN + C.Bold + serverInfo.Name;
 		String host = ChatColor.YELLOW + "Host: " + C.cWhite + hostName;
+		Material material = Material.SKULL_ITEM;
+		byte data = (byte) 3;
 
 		ArrayList<String> lore = new ArrayList<String>();
 		lore.add(host);
@@ -307,7 +311,15 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 		lore.add(" ");
 
 		if (serverInfo.Game != null)
+		{
 			lore.add(ChatColor.RESET + C.cYellow + "Game: " + C.cWhite + serverInfo.Game);
+			GameDisplay display = GameDisplay.matchName(serverInfo.Game);
+			if (display != null)
+			{
+				material = display.getMaterial();
+				data = display.getMaterialData();
+			}
+		}
 
 		if (serverInfo.Map != null)
 			lore.add(ChatColor.RESET + C.cYellow + "Map: " + C.cWhite + serverInfo.Map);
@@ -318,10 +330,14 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 			lore.add(ChatColor.RESET + C.cGreen + "Hosted by a Staff Member");
 		}
 
-		ShopItem shopItem = new ShopItem(Material.SKULL_ITEM, (byte)3, server, lore.toArray(new String[0]), 1, false, false);
+		ShopItem shopItem = new ShopItem(material, data, server, lore.toArray(new String[0]), 1, false, false);
-		SkullMeta meta = (SkullMeta) shopItem.getItemMeta();
+		if (material == Material.SKULL_ITEM)
-		meta.setOwner(hostName);
+		{
-		shopItem.setItemMeta(meta);
+			SkullMeta meta = (SkullMeta) shopItem.getItemMeta();
+			meta.setOwner(hostName);
+			shopItem.setItemMeta(meta);
+		}
+
 		return shopItem;
 	}
 

Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectSKYButton.java

@@ -0,0 +1,23 @@
+package mineplex.hub.server.ui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import mineplex.hub.server.ui.ServerGameMenu;
+
+public class SelectSKYButton implements IButton
+{
+	private ServerGameMenu _menu;
+
+	public SelectSKYButton(ServerGameMenu menu)
+	{
+		_menu = menu;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_menu.openSKY(player);
+	}
+}

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

@@ -1,5 +1,7 @@
 package nautilus.game.arcade;
 
+import mineplex.core.game.GameCategory;
+import mineplex.core.game.GameDisplay;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.games.baconbrawl.BaconBrawl;
 import nautilus.game.arcade.game.games.barbarians.Barbarians;
@@ -60,70 +62,66 @@ import org.bukkit.Material;
 public enum GameType
 {	
 	//Mini
-	BaconBrawl(BaconBrawl.class, "Bacon Brawl", Material.PORK, (byte)0, GameCategory.ARCADE, 1),
+	BaconBrawl(BaconBrawl.class, GameDisplay.BaconBrawl),
-	Barbarians(Barbarians.class, "A Barbarians Life", Material.WOOD_AXE, (byte)0, GameCategory.EXTRA, 2),
+	Barbarians(Barbarians.class, GameDisplay.Barbarians),
-	Bridge(Bridge.class, "The Bridges", Material.IRON_PICKAXE, (byte)0, GameCategory.SURVIVAL, 3),
+	Bridge(Bridge.class, GameDisplay.Bridge),
-	CastleSiege(CastleSiege.class, "Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.CLASSICS, 4),
+	CastleSiege(CastleSiege.class, GameDisplay.CastleSiege),
-	ChampionsDominate(ChampionsDominate.class, "Champions Domination", "Champions", Material.BEACON, (byte)0, GameCategory.CHAMPIONS, 6),
+	ChampionsDominate(ChampionsDominate.class, GameDisplay.ChampionsDominate),
 	//ChampionsMOBA(ChampionsMOBA.class, "Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0, GameCategory.CHAMPIONS, 7),
-	ChampionsTDM(ChampionsTDM.class, "Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0, GameCategory.CHAMPIONS, 5),
+	ChampionsTDM(ChampionsTDM.class, GameDisplay.ChampionsTDM),
-	Christmas(Christmas.class, "Christmas Chaos", Material.SNOW_BALL, (byte)0, GameCategory.CLASSICS, 8),
+	Christmas(Christmas.class, GameDisplay.Christmas),
-	DeathTag(DeathTag.class, "Death Tag", Material.SKULL_ITEM, (byte)0, GameCategory.ARCADE, 9),
+	DeathTag(DeathTag.class, GameDisplay.DeathTag),
-	DragonEscape(DragonEscape.class, "Dragon Escape", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE, 10),
+	DragonEscape(DragonEscape.class, GameDisplay.DragonEscape),
-	DragonEscapeTeams(DragonEscapeTeams.class, "Dragon Escape Teams", Material.DRAGON_EGG, (byte)0, GameCategory.TEAM_VARIANT, 11),
+	DragonEscapeTeams(DragonEscapeTeams.class, GameDisplay.DragonEscapeTeams),
-	DragonRiders(DragonRiders.class, "Dragon Riders", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE, 12),
+	DragonRiders(DragonRiders.class, GameDisplay.DragonRiders),
-	Dragons(Dragons.class, "Dragons", Material.ENDER_STONE, (byte)0, GameCategory.ARCADE, 13),
+	Dragons(Dragons.class, GameDisplay.Dragons),
-	DragonsTeams(DragonsTeams.class, "Dragons Teams", Material.ENDER_STONE, (byte)0, GameCategory.TEAM_VARIANT, 14),
+	DragonsTeams(DragonsTeams.class, GameDisplay.DragonsTeams),
-	Draw(Draw.class, "Draw My Thing", Material.BOOK_AND_QUILL, (byte)0, GameCategory.CLASSICS, 15),
+	Draw(Draw.class, GameDisplay.Draw),
-	Evolution(Evolution.class, "Evolution", Material.EMERALD, (byte)0, GameCategory.ARCADE, 16),
+	Evolution(Evolution.class, GameDisplay.Evolution),
 	//FlappyBird(FlappyBird.class, "Flappy Bird", Material.FEATHER, (byte)0, GameCategory.ARCADE, 17),
-	Gravity(Gravity.class, "Gravity", Material.ENDER_PORTAL, (byte)0, GameCategory.EXTRA, 18),
+	Gravity(Gravity.class, GameDisplay.Gravity),
-	Halloween(Halloween.class, "Halloween Horror", Material.PUMPKIN, (byte)0, GameCategory.CLASSICS, 19),
+	Halloween(Halloween.class, GameDisplay.Halloween),
-	HideSeek(HideSeek.class, "Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
+	HideSeek(HideSeek.class, GameDisplay.HideSeek),
-	HoleInTheWall(HoleInTheWall.class, "Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
+	HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
-	Horse(Horse.class, "Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21),
+	Horse(Horse.class, GameDisplay.Horse),
-	Micro(Micro.class, "Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
+	Micro(Micro.class, GameDisplay.Micro),
-	MilkCow(MilkCow.class, "Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
+	MilkCow(MilkCow.class, GameDisplay.MilkCow),
-	MineStrike(MineStrike.class, "MineStrike", Material.TNT, (byte)0, GameCategory.CLASSICS, 25, "http://chivebox.com/file/c/assets.zip", true),
+	MineStrike(MineStrike.class, GameDisplay.MineStrike, "http://chivebox.com/file/c/assets.zip", true),// Temp set to CHAMPIONS to fix UI bug
-	MineWare(MineWare.class, "MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
+	MineWare(MineWare.class, GameDisplay.MineWare),
-	OldMineWare(OldMineWare.class, "Old MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26),
+	OldMineWare(OldMineWare.class, GameDisplay.OldMineWare),
-	Paintball(Paintball.class, "Super Paintball", Material.ENDER_PEARL, (byte)0, GameCategory.ARCADE, 28),
+	Paintball(Paintball.class, GameDisplay.Paintball),
-	Quiver(Quiver.class, "One in the Quiver", Material.ARROW, (byte)0, GameCategory.ARCADE, 29),
+	Quiver(Quiver.class, GameDisplay.Quiver),
-	QuiverTeams(QuiverTeams.class, "One in the Quiver Teams", Material.ARROW, (byte)0, GameCategory.TEAM_VARIANT, 30),
+	QuiverTeams(QuiverTeams.class, GameDisplay.QuiverTeams),
-	Runner(Runner.class, "Runner", Material.LEATHER_BOOTS, (byte)0, GameCategory.ARCADE, 31),
+	Runner(Runner.class, GameDisplay.Runner),
-	SearchAndDestroy(SearchAndDestroy.class, "Search and Destroy", Material.TNT, (byte)0, GameCategory.SURVIVAL, 32),
+	SearchAndDestroy(SearchAndDestroy.class, GameDisplay.SearchAndDestroy),
-	Sheep(SheepGame.class, "Sheep Quest", Material.WOOL, (byte)4, GameCategory.ARCADE, 33),
+	Sheep(SheepGame.class, GameDisplay.Sheep),
 	
-	Smash(SuperSmash.class, "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS, 34),
+	Smash(SuperSmash.class, GameDisplay.Smash),
-	SmashDomination(SuperSmashDominate.class, "Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.EXTRA, 36),
+	SmashDomination(SuperSmashDominate.class, GameDisplay.SmashDomination),
-	SmashTeams(SuperSmashTeam.class, "Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.TEAM_VARIANT, 35),
+	SmashTeams(SuperSmashTeam.class, GameDisplay.SmashTeams),
-	Snake(Snake.class, "Snake", Material.WOOL, (byte)0, GameCategory.ARCADE, 37),
+	Snake(Snake.class, GameDisplay.Snake),
-	SneakyAssassins(SneakyAssassins.class, "Sneaky Assassins", Material.INK_SACK, (byte)0, GameCategory.ARCADE, 38),
+	SneakyAssassins(SneakyAssassins.class, GameDisplay.SneakyAssassins),
-	SnowFight(SnowFight.class, "Snow Fight", Material.SNOW_BALL, (byte)0, GameCategory.EXTRA, 39),
+	SnowFight(SnowFight.class, GameDisplay.SnowFight),
-	Spleef(Spleef.class, "Super Spleef", Material.IRON_SPADE, (byte)0, GameCategory.ARCADE, 40),
+	Spleef(Spleef.class, GameDisplay.Spleef),
-	SpleefTeams(SpleefTeams.class, "Super Spleef Teams", Material.IRON_SPADE, (byte)0, GameCategory.TEAM_VARIANT, 41),
+	SpleefTeams(SpleefTeams.class, GameDisplay.SpleefTeams),
-	SquidShooter(SquidShooter.class, "Squid Shooter", Material.FIREWORK_CHARGE, (byte)0, GameCategory.ARCADE, 43),
+	SquidShooter(SquidShooter.class, GameDisplay.SquidShooter),
-	Stacker(Stacker.class, "Super Stacker", Material.BOWL, (byte)0, GameCategory.ARCADE, 42),
+	Stacker(Stacker.class, GameDisplay.Stacker),
-	SurvivalGames(SurvivalGames.class, "Survival Games", Material.IRON_SWORD, (byte)0, GameCategory.SURVIVAL, 22),
+	SurvivalGames(SurvivalGames.class, GameDisplay.SurvivalGames),
-	SurvivalGamesTeams(SurvivalGamesTeams.class, "Survival Games Teams", Material.IRON_SWORD, (byte)0, GameCategory.TEAM_VARIANT, 23),
+	SurvivalGamesTeams(SurvivalGamesTeams.class, GameDisplay.SurvivalGamesTeams),
-	Tug(Tug.class, "Tug of Wool", Material.WHEAT, (byte)0, GameCategory.ARCADE, 44),
+	Tug(Tug.class, GameDisplay.Tug),
-	TurfWars(TurfForts.class, "Turf Wars", Material.STAINED_CLAY, (byte)14, GameCategory.ARCADE, 45),
+	TurfWars(TurfForts.class, GameDisplay.TurfWars),
-	UHC(UHC.class, "Ultra Hardcore", Material.GOLDEN_APPLE, (byte)0, GameCategory.SURVIVAL, 46),
+	UHC(UHC.class, GameDisplay.UHC),
-	WitherAssault(WitherGame.class, "Wither Assault", Material.SKULL_ITEM, (byte)1, GameCategory.ARCADE, 47),
+	WitherAssault(WitherGame.class, GameDisplay.WitherAssault),
-	Wizards(Wizards.class, "Wizards", Material.BLAZE_ROD, (byte)0, GameCategory.SURVIVAL, 48, "http://chivebox.com/file/c/ResWizards.zip", true),
+	Wizards(Wizards.class, GameDisplay.Barbarians.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
-	ZombieSurvival(ZombieSurvival.class, "Zombie Survival", Material.SKULL_ITEM, (byte)2, GameCategory.SURVIVAL, 49),
+	ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
 	
-	Build(Build.class, "Master Builders", Material.BRICK, (byte)0, GameCategory.CLASSICS, 50),
+	Build(Build.class, GameDisplay.Build),
-	Cards(Cards.class, "Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
+	Cards(Cards.class, GameDisplay.Cards),
-	Skywars(SkyWars.class, "SkyWars", Material.CHEST, (byte)0, GameCategory.SURVIVAL, 52),
+	Skywars(SkyWars.class, GameDisplay.Skywars),
 	
-	Event(EventGame.class, "Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
+	Event(EventGame.class, GameDisplay.Event);
 
-	String _name;
+	GameDisplay _display;
-	String _lobbyName;
-	Material _mat; 
-	byte _data;
-	GameCategory _gameCategory;
 	boolean _enforceResourcePack;
 	String _resourcePack;
 	Class<? extends Game> _gameClass;
@@ -131,30 +129,14 @@ public enum GameType
 	private int _gameId;	// Unique identifying id for this gamemode (used for statistics)
 	public int getGameId() { return _gameId; }
 
-	GameType(Class<? extends Game> gameClass, String name, Material mat, byte data, GameCategory gameCategory, int gameId)
+	GameType(Class<? extends Game> gameClass, GameDisplay display)
 	{
-		this(gameClass, name, name, mat, data, gameCategory, gameId);
+		this(gameClass, display, null, false);
 	}
 
-	GameType(Class<? extends Game> gameClass, String name, Material mat, byte data, GameCategory gameCategory, int gameId, String resourcePackUrl, boolean enforceResourcePack)
+	GameType(Class<? extends Game> gameClass, GameDisplay display, String resourcePackUrl, boolean enforceResourcePack)
-	{
-		this(gameClass, name, name, mat, data, gameCategory, gameId, resourcePackUrl, enforceResourcePack);
-	}
-
-	GameType(Class<? extends Game> gameClass, String name, String lobbyName, Material mat, byte data, GameCategory gameCategory, int gameId)
-	{
-		this(gameClass, name, lobbyName, mat, data, gameCategory, gameId, null, false);
-	}
-
-	GameType(Class<? extends Game> gameClass, String name, String lobbyName, Material mat, byte data, GameCategory gameCategory, int gameId, String resourcePackUrl, boolean enforceResourcePack)
 	{
 		_gameClass = gameClass;
-		_name = name;
-		_lobbyName = lobbyName;
-		_mat = mat;
-		_data = data;
-		_gameCategory = gameCategory;
-		_gameId = gameId;
 		_resourcePack = resourcePackUrl;
 		_enforceResourcePack = enforceResourcePack;
 	}
@@ -176,31 +158,26 @@ public enum GameType
 
 	public String GetName()
 	{
-		return _name;
+		return _display.getName();
 	}
 	
 	public String GetLobbyName()
 	{
-		return _lobbyName;
+		return _display.getLobbyName();
 	}
 	
 	public Material GetMaterial()
 	{
-		return _mat;
+		return _display.getMaterial();
 	}
 	
 	public byte GetMaterialData()
 	{
-		return _data;
+		return _display.getMaterialData();
 	}
 
 	public GameCategory getGameCategory()
 	{
-		return _gameCategory;
+		return _display.getGameCategory();
-	}
-
-	public enum GameCategory
-	{
-		SURVIVAL, CLASSICS, CHAMPIONS, ARCADE, EVENT, TEAM_VARIANT, EXTRA;
 	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java

@@ -105,6 +105,7 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.Barbarians);
 		legendGames.add(GameType.OldMineWare);
 		legendGames.add(GameType.SmashDomination);
+		legendGames.add(GameType.Skywars);
 		// Team variants
 		legendGames.add(GameType.DragonEscapeTeams);
 		legendGames.add(GameType.DragonsTeams);