From 3efc80ec584818c64c184a857c132381f7c10baf Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Mon, 22 Dec 2014 16:11:59 -0600 Subject: [PATCH] Update jooq database classes --- .../src/mineplex/database/Account.java | 12 +- .../src/mineplex/database/Keys.java | 54 ++- .../src/mineplex/database/Tables.java | 50 ++- .../mineplex/database/tables/Accounts.java | 7 +- .../mineplex/database/tables/RewardLog.java | 127 ------- .../tables/records/AccountsRecord.java | 136 +++++--- .../tables/records/RewardLogRecord.java | 314 ------------------ 7 files changed, 197 insertions(+), 503 deletions(-) delete mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/RewardLog.java delete mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/RewardLogRecord.java diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Account.java b/Plugins/Mineplex.Database/src/mineplex/database/Account.java index 2086d4ff4..0cecaba81 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Account.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Account.java @@ -11,7 +11,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 = 477510632; + private static final long serialVersionUID = 1260689680; /** * The singleton instance of Account @@ -34,6 +34,7 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali private final java.util.List> getTables0() { return java.util.Arrays.>asList( + mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountGemTransactions.accountGemTransactions, @@ -42,6 +43,13 @@ 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.ClanAlliances.clanAlliances, + mineplex.database.tables.Clans.clans, + mineplex.database.tables.ClanTerritory.clanTerritory, + mineplex.database.tables.EloRating.eloRating, + mineplex.database.tables.FieldBlock.fieldBlock, + mineplex.database.tables.FieldMonster.fieldMonster, + mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.Games.games, mineplex.database.tables.ItemCategories.itemCategories, @@ -51,8 +59,8 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.Polls.polls, mineplex.database.tables.RankBenefits.rankBenefits, - mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.ServerPassword.serverPassword, + mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Stats.stats, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard); } diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java index afcbd3525..786311960 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java @@ -18,6 +18,7 @@ public class Keys { // IDENTITY definitions // ------------------------------------------------------------------------- + public static final org.jooq.Identity IDENTITY_accountClan = Identities0.IDENTITY_accountClan; public static final org.jooq.Identity IDENTITY_accountCoinTransactions = Identities0.IDENTITY_accountCoinTransactions; public static final org.jooq.Identity IDENTITY_accountFriend = Identities0.IDENTITY_accountFriend; public static final org.jooq.Identity IDENTITY_accountGemTransactions = Identities0.IDENTITY_accountGemTransactions; @@ -26,6 +27,13 @@ public class Keys { public static final org.jooq.Identity IDENTITY_accountPreferences = Identities0.IDENTITY_accountPreferences; public static final org.jooq.Identity IDENTITY_accounts = Identities0.IDENTITY_accounts; public static final org.jooq.Identity IDENTITY_accountStats = Identities0.IDENTITY_accountStats; + public static final org.jooq.Identity IDENTITY_clanAlliances = Identities0.IDENTITY_clanAlliances; + public static final org.jooq.Identity IDENTITY_clans = Identities0.IDENTITY_clans; + public static final org.jooq.Identity IDENTITY_clanTerritory = Identities0.IDENTITY_clanTerritory; + public static final org.jooq.Identity IDENTITY_eloRating = Identities0.IDENTITY_eloRating; + public static final org.jooq.Identity IDENTITY_fieldBlock = Identities0.IDENTITY_fieldBlock; + public static final org.jooq.Identity IDENTITY_fieldMonster = Identities0.IDENTITY_fieldMonster; + public static final org.jooq.Identity IDENTITY_fieldOre = Identities0.IDENTITY_fieldOre; public static final org.jooq.Identity IDENTITY_gamePlayers = Identities0.IDENTITY_gamePlayers; public static final org.jooq.Identity IDENTITY_games = Identities0.IDENTITY_games; public static final org.jooq.Identity IDENTITY_itemCategories = Identities0.IDENTITY_itemCategories; @@ -35,8 +43,8 @@ public class Keys { public static final org.jooq.Identity IDENTITY_playerMap = Identities0.IDENTITY_playerMap; public static final org.jooq.Identity IDENTITY_polls = Identities0.IDENTITY_polls; public static final org.jooq.Identity IDENTITY_rankBenefits = Identities0.IDENTITY_rankBenefits; - public static final org.jooq.Identity IDENTITY_rewardLog = Identities0.IDENTITY_rewardLog; public static final org.jooq.Identity IDENTITY_serverPassword = Identities0.IDENTITY_serverPassword; + public static final org.jooq.Identity IDENTITY_spawns = Identities0.IDENTITY_spawns; public static final org.jooq.Identity IDENTITY_stats = Identities0.IDENTITY_stats; public static final org.jooq.Identity IDENTITY_tournamentLeaderboard = Identities0.IDENTITY_tournamentLeaderboard; @@ -44,6 +52,7 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- + public static final org.jooq.UniqueKey KEY_accountClan_PRIMARY = UniqueKeys0.KEY_accountClan_PRIMARY; public static final org.jooq.UniqueKey KEY_accountCoinTransactions_PRIMARY = UniqueKeys0.KEY_accountCoinTransactions_PRIMARY; public static final org.jooq.UniqueKey KEY_accountFriend_PRIMARY = UniqueKeys0.KEY_accountFriend_PRIMARY; public static final org.jooq.UniqueKey KEY_accountFriend_uuidIndex = UniqueKeys0.KEY_accountFriend_uuidIndex; @@ -58,6 +67,14 @@ public class Keys { public static final org.jooq.UniqueKey KEY_accounts_uuidIndex = UniqueKeys0.KEY_accounts_uuidIndex; public static final org.jooq.UniqueKey KEY_accountStats_PRIMARY = UniqueKeys0.KEY_accountStats_PRIMARY; public static final org.jooq.UniqueKey KEY_accountStats_accountStatIndex = UniqueKeys0.KEY_accountStats_accountStatIndex; + public static final org.jooq.UniqueKey KEY_clanAlliances_PRIMARY = UniqueKeys0.KEY_clanAlliances_PRIMARY; + public static final org.jooq.UniqueKey KEY_clans_PRIMARY = UniqueKeys0.KEY_clans_PRIMARY; + public static final org.jooq.UniqueKey KEY_clanTerritory_PRIMARY = UniqueKeys0.KEY_clanTerritory_PRIMARY; + public static final org.jooq.UniqueKey KEY_eloRating_PRIMARY = UniqueKeys0.KEY_eloRating_PRIMARY; + public static final org.jooq.UniqueKey KEY_eloRating_uuid_gameType_index = UniqueKeys0.KEY_eloRating_uuid_gameType_index; + public static final org.jooq.UniqueKey KEY_fieldBlock_PRIMARY = UniqueKeys0.KEY_fieldBlock_PRIMARY; + public static final org.jooq.UniqueKey KEY_fieldMonster_PRIMARY = UniqueKeys0.KEY_fieldMonster_PRIMARY; + public static final org.jooq.UniqueKey KEY_fieldOre_PRIMARY = UniqueKeys0.KEY_fieldOre_PRIMARY; public static final org.jooq.UniqueKey KEY_gamePlayers_PRIMARY = UniqueKeys0.KEY_gamePlayers_PRIMARY; public static final org.jooq.UniqueKey KEY_games_PRIMARY = UniqueKeys0.KEY_games_PRIMARY; public static final org.jooq.UniqueKey KEY_itemCategories_PRIMARY = UniqueKeys0.KEY_itemCategories_PRIMARY; @@ -70,8 +87,8 @@ public class Keys { public static final org.jooq.UniqueKey KEY_playerMap_playerIndex = UniqueKeys0.KEY_playerMap_playerIndex; public static final org.jooq.UniqueKey KEY_polls_PRIMARY = UniqueKeys0.KEY_polls_PRIMARY; public static final org.jooq.UniqueKey KEY_rankBenefits_PRIMARY = UniqueKeys0.KEY_rankBenefits_PRIMARY; - public static final org.jooq.UniqueKey KEY_rewardLog_PRIMARY = UniqueKeys0.KEY_rewardLog_PRIMARY; public static final org.jooq.UniqueKey KEY_serverPassword_PRIMARY = UniqueKeys0.KEY_serverPassword_PRIMARY; + public static final org.jooq.UniqueKey KEY_spawns_PRIMARY = UniqueKeys0.KEY_spawns_PRIMARY; public static final org.jooq.UniqueKey KEY_stats_PRIMARY = UniqueKeys0.KEY_stats_PRIMARY; public static final org.jooq.UniqueKey KEY_stats_nameIndex = UniqueKeys0.KEY_stats_nameIndex; public static final org.jooq.UniqueKey KEY_tournamentLeaderboard_PRIMARY = UniqueKeys0.KEY_tournamentLeaderboard_PRIMARY; @@ -81,6 +98,8 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- + public static final org.jooq.ForeignKey accountClan_ibfk_1 = ForeignKeys0.accountClan_ibfk_1; + public static final org.jooq.ForeignKey accountClan_ibfk_2 = ForeignKeys0.accountClan_ibfk_2; public static final org.jooq.ForeignKey accountCoinTransactions_ibfk_1 = ForeignKeys0.accountCoinTransactions_ibfk_1; public static final org.jooq.ForeignKey accountGemTransactions_ibfk_1 = ForeignKeys0.accountGemTransactions_ibfk_1; public static final org.jooq.ForeignKey accountInventory_ibfk_1 = ForeignKeys0.accountInventory_ibfk_1; @@ -89,11 +108,13 @@ public class Keys { public static final org.jooq.ForeignKey accountPolls_ibfk_2 = ForeignKeys0.accountPolls_ibfk_2; public static final org.jooq.ForeignKey accountStats_ibfk_1 = ForeignKeys0.accountStats_ibfk_1; public static final org.jooq.ForeignKey accountStats_ibfk_2 = ForeignKeys0.accountStats_ibfk_2; + public static final org.jooq.ForeignKey clanAlliances_ibfk_2 = ForeignKeys0.clanAlliances_ibfk_2; + public static final org.jooq.ForeignKey clanAlliances_ibfk_1 = ForeignKeys0.clanAlliances_ibfk_1; + public static final org.jooq.ForeignKey clanTerritory_ibfk_1 = ForeignKeys0.clanTerritory_ibfk_1; public static final org.jooq.ForeignKey FK_gamePlayers_games = ForeignKeys0.FK_gamePlayers_games; public static final org.jooq.ForeignKey FK_gamePlayers_accounts = ForeignKeys0.FK_gamePlayers_accounts; public static final org.jooq.ForeignKey items_ibfk_1 = ForeignKeys0.items_ibfk_1; public static final org.jooq.ForeignKey mail_ibfk_1 = ForeignKeys0.mail_ibfk_1; - public static final org.jooq.ForeignKey rewardLog_ibfk_1 = ForeignKeys0.rewardLog_ibfk_1; public static final org.jooq.ForeignKey FK_tournamentLeaderboard_accounts = ForeignKeys0.FK_tournamentLeaderboard_accounts; // ------------------------------------------------------------------------- @@ -101,6 +122,7 @@ public class Keys { // ------------------------------------------------------------------------- private static class Identities0 extends org.jooq.impl.AbstractKeys { + public static org.jooq.Identity IDENTITY_accountClan = createIdentity(mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.id); public static org.jooq.Identity IDENTITY_accountCoinTransactions = createIdentity(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id); public static org.jooq.Identity IDENTITY_accountFriend = createIdentity(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.id); public static org.jooq.Identity IDENTITY_accountGemTransactions = createIdentity(mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id); @@ -109,6 +131,13 @@ public class Keys { public static org.jooq.Identity IDENTITY_accountPreferences = createIdentity(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.id); public static org.jooq.Identity IDENTITY_accounts = createIdentity(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id); public static org.jooq.Identity IDENTITY_accountStats = createIdentity(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id); + public static org.jooq.Identity IDENTITY_clanAlliances = createIdentity(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id); + public static org.jooq.Identity IDENTITY_clans = createIdentity(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id); + public static org.jooq.Identity IDENTITY_clanTerritory = createIdentity(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id); + public static org.jooq.Identity IDENTITY_eloRating = createIdentity(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id); + public static org.jooq.Identity IDENTITY_fieldBlock = createIdentity(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id); + public static org.jooq.Identity IDENTITY_fieldMonster = createIdentity(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id); + public static org.jooq.Identity IDENTITY_fieldOre = createIdentity(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id); public static org.jooq.Identity IDENTITY_gamePlayers = createIdentity(mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.id); public static org.jooq.Identity IDENTITY_games = createIdentity(mineplex.database.tables.Games.games, mineplex.database.tables.Games.games.id); public static org.jooq.Identity IDENTITY_itemCategories = createIdentity(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id); @@ -118,13 +147,14 @@ public class Keys { public static org.jooq.Identity IDENTITY_playerMap = createIdentity(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id); public static org.jooq.Identity IDENTITY_polls = createIdentity(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id); public static org.jooq.Identity IDENTITY_rankBenefits = createIdentity(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id); - public static org.jooq.Identity IDENTITY_rewardLog = createIdentity(mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.RewardLog.rewardLog.id); public static org.jooq.Identity IDENTITY_serverPassword = createIdentity(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id); + public static org.jooq.Identity IDENTITY_spawns = createIdentity(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id); public static org.jooq.Identity IDENTITY_stats = createIdentity(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id); public static org.jooq.Identity IDENTITY_tournamentLeaderboard = createIdentity(mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard.id); } private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys { + public static final org.jooq.UniqueKey KEY_accountClan_PRIMARY = createUniqueKey(mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.id); public static final org.jooq.UniqueKey KEY_accountCoinTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id); public static final org.jooq.UniqueKey KEY_accountFriend_PRIMARY = createUniqueKey(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.id); public static final org.jooq.UniqueKey KEY_accountFriend_uuidIndex = createUniqueKey(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.uuidSource, mineplex.database.tables.AccountFriend.accountFriend.uuidTarget); @@ -139,6 +169,14 @@ public class Keys { public static final org.jooq.UniqueKey KEY_accounts_uuidIndex = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.uuid); public static final org.jooq.UniqueKey KEY_accountStats_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id); public static final org.jooq.UniqueKey KEY_accountStats_accountStatIndex = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.accountId, mineplex.database.tables.AccountStats.accountStats.statId); + public static final org.jooq.UniqueKey KEY_clanAlliances_PRIMARY = createUniqueKey(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id); + public static final org.jooq.UniqueKey KEY_clans_PRIMARY = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id); + public static final org.jooq.UniqueKey KEY_clanTerritory_PRIMARY = createUniqueKey(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id); + public static final org.jooq.UniqueKey KEY_eloRating_PRIMARY = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id); + public static final org.jooq.UniqueKey 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 KEY_fieldBlock_PRIMARY = createUniqueKey(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id); + public static final org.jooq.UniqueKey KEY_fieldMonster_PRIMARY = createUniqueKey(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id); + public static final org.jooq.UniqueKey KEY_fieldOre_PRIMARY = createUniqueKey(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id); public static final org.jooq.UniqueKey KEY_gamePlayers_PRIMARY = createUniqueKey(mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.id); public static final org.jooq.UniqueKey KEY_games_PRIMARY = createUniqueKey(mineplex.database.tables.Games.games, mineplex.database.tables.Games.games.id); public static final org.jooq.UniqueKey KEY_itemCategories_PRIMARY = createUniqueKey(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id); @@ -151,8 +189,8 @@ public class Keys { public static final org.jooq.UniqueKey KEY_playerMap_playerIndex = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.playerName); public static final org.jooq.UniqueKey KEY_polls_PRIMARY = createUniqueKey(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id); public static final org.jooq.UniqueKey KEY_rankBenefits_PRIMARY = createUniqueKey(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id); - public static final org.jooq.UniqueKey KEY_rewardLog_PRIMARY = createUniqueKey(mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.RewardLog.rewardLog.id); public static final org.jooq.UniqueKey KEY_serverPassword_PRIMARY = createUniqueKey(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id); + public static final org.jooq.UniqueKey KEY_spawns_PRIMARY = createUniqueKey(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id); public static final org.jooq.UniqueKey KEY_stats_PRIMARY = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id); public static final org.jooq.UniqueKey KEY_stats_nameIndex = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.name); public static final org.jooq.UniqueKey KEY_tournamentLeaderboard_PRIMARY = createUniqueKey(mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard.id); @@ -160,6 +198,8 @@ public class Keys { } private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys { + public static final org.jooq.ForeignKey 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 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 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 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 accountInventory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId); @@ -168,11 +208,13 @@ public class Keys { public static final org.jooq.ForeignKey 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 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 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 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 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 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 FK_gamePlayers_games = createForeignKey(mineplex.database.Keys.KEY_games_PRIMARY, mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.gameId); public static final org.jooq.ForeignKey FK_gamePlayers_accounts = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.accountId); public static final org.jooq.ForeignKey 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 mail_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.accountId); - public static final org.jooq.ForeignKey rewardLog_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.RewardLog.rewardLog.accountId); public static final org.jooq.ForeignKey FK_tournamentLeaderboard_accounts = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard.accountId); } } diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java index 9ab9306c5..7bf5beedd 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java @@ -13,6 +13,11 @@ package mineplex.database; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { + /** + * The table Account.accountClan + */ + public static final mineplex.database.tables.AccountClan accountClan = mineplex.database.tables.AccountClan.accountClan; + /** * The table Account.accountCoinTransactions */ @@ -53,6 +58,41 @@ public class Tables { */ public static final mineplex.database.tables.AccountStats accountStats = mineplex.database.tables.AccountStats.accountStats; + /** + * The table Account.clanAlliances + */ + public static final mineplex.database.tables.ClanAlliances clanAlliances = mineplex.database.tables.ClanAlliances.clanAlliances; + + /** + * The table Account.clans + */ + public static final mineplex.database.tables.Clans clans = mineplex.database.tables.Clans.clans; + + /** + * The table Account.clanTerritory + */ + public static final mineplex.database.tables.ClanTerritory clanTerritory = mineplex.database.tables.ClanTerritory.clanTerritory; + + /** + * The table Account.eloRating + */ + public static final mineplex.database.tables.EloRating eloRating = mineplex.database.tables.EloRating.eloRating; + + /** + * The table Account.fieldBlock + */ + public static final mineplex.database.tables.FieldBlock fieldBlock = mineplex.database.tables.FieldBlock.fieldBlock; + + /** + * The table Account.fieldMonster + */ + public static final mineplex.database.tables.FieldMonster fieldMonster = mineplex.database.tables.FieldMonster.fieldMonster; + + /** + * The table Account.fieldOre + */ + public static final mineplex.database.tables.FieldOre fieldOre = mineplex.database.tables.FieldOre.fieldOre; + /** * The table Account.gamePlayers */ @@ -98,16 +138,16 @@ public class Tables { */ public static final mineplex.database.tables.RankBenefits rankBenefits = mineplex.database.tables.RankBenefits.rankBenefits; - /** - * The table Account.rewardLog - */ - public static final mineplex.database.tables.RewardLog rewardLog = mineplex.database.tables.RewardLog.rewardLog; - /** * The table Account.serverPassword */ public static final mineplex.database.tables.ServerPassword serverPassword = mineplex.database.tables.ServerPassword.serverPassword; + /** + * The table Account.spawns + */ + public static final mineplex.database.tables.Spawns spawns = mineplex.database.tables.Spawns.spawns; + /** * The table Account.stats */ diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java index 4593abb25..e891e9891 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java @@ -11,7 +11,7 @@ package mineplex.database.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Accounts extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { - private static final long serialVersionUID = -1971089065; + private static final long serialVersionUID = 1365067279; /** * The singleton instance of Account.accounts @@ -46,6 +46,11 @@ public class Accounts extends org.jooq.impl.TableImpl gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER.defaulted(true), this, ""); + /** + * The column Account.accounts.gold. + */ + public final org.jooq.TableField gold = createField("gold", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, ""); + /** * The column Account.accounts.coins. */ diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/RewardLog.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/RewardLog.java deleted file mode 100644 index c865bceeb..000000000 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/RewardLog.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package mineplex.database.tables; - -/** - * This class is generated by jOOQ. - */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.2" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class RewardLog extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { - - private static final long serialVersionUID = 503144315; - - /** - * The singleton instance of Account.rewardLog - */ - public static final mineplex.database.tables.RewardLog rewardLog = new mineplex.database.tables.RewardLog(); - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return mineplex.database.tables.records.RewardLogRecord.class; - } - - /** - * The column Account.rewardLog.id. - */ - public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column Account.rewardLog.accountId. - */ - public final org.jooq.TableField accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * The column Account.rewardLog.date. - */ - public final org.jooq.TableField date = createField("date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, ""); - - /** - * The column Account.rewardLog.type. - */ - public final org.jooq.TableField type = createField("type", org.jooq.impl.SQLDataType.VARCHAR.length(16).nullable(false), this, ""); - - /** - * The column Account.rewardLog.rarity. - */ - public final org.jooq.TableField rarity = createField("rarity", org.jooq.impl.SQLDataType.VARCHAR.length(16).nullable(false), this, ""); - - /** - * The column Account.rewardLog.reward. - */ - public final org.jooq.TableField reward = createField("reward", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false), this, ""); - - /** - * Create a Account.rewardLog table reference - */ - public RewardLog() { - this("rewardLog", null); - } - - /** - * Create an aliased Account.rewardLog table reference - */ - public RewardLog(java.lang.String alias) { - this(alias, mineplex.database.tables.RewardLog.rewardLog); - } - - private RewardLog(java.lang.String alias, org.jooq.Table aliased) { - this(alias, aliased, null); - } - - private RewardLog(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { - super(alias, mineplex.database.Account.Account, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Identity getIdentity() { - return mineplex.database.Keys.IDENTITY_rewardLog; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.UniqueKey getPrimaryKey() { - return mineplex.database.Keys.KEY_rewardLog_PRIMARY; - } - - /** - * {@inheritDoc} - */ - @Override - public java.util.List> getKeys() { - return java.util.Arrays.>asList(mineplex.database.Keys.KEY_rewardLog_PRIMARY); - } - - /** - * {@inheritDoc} - */ - @Override - public java.util.List> getReferences() { - return java.util.Arrays.>asList(mineplex.database.Keys.rewardLog_ibfk_1); - } - - /** - * {@inheritDoc} - */ - @Override - public mineplex.database.tables.RewardLog as(java.lang.String alias) { - return new mineplex.database.tables.RewardLog(alias, this); - } - - /** - * Rename this table - */ - public mineplex.database.tables.RewardLog rename(java.lang.String name) { - return new mineplex.database.tables.RewardLog(name, null); - } -} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountsRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountsRecord.java index 3dab8cf77..41bc7277e 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountsRecord.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountsRecord.java @@ -9,9 +9,9 @@ package mineplex.database.tables.records; @javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.2" }, comments = "This class is generated by jOOQ") @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record11 { +public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record12 { - private static final long serialVersionUID = -1996366804; + private static final long serialVersionUID = 973515906; /** * Setter for Account.accounts.id. @@ -69,102 +69,116 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImplAccount.accounts.gold. + */ + public void setGold(java.lang.Integer value) { + setValue(4, value); + } + + /** + * Getter for Account.accounts.gold. + */ + public java.lang.Integer getGold() { + return (java.lang.Integer) getValue(4); + } + /** * Setter for Account.accounts.coins. */ public void setCoins(java.lang.Integer value) { - setValue(4, value); + setValue(5, value); } /** * Getter for Account.accounts.coins. */ public java.lang.Integer getCoins() { - return (java.lang.Integer) getValue(4); + return (java.lang.Integer) getValue(5); } /** * Setter for Account.accounts.donorRank. */ public void setDonorRank(java.lang.String value) { - setValue(5, value); + setValue(6, value); } /** * Getter for Account.accounts.donorRank. */ public java.lang.String getDonorRank() { - return (java.lang.String) getValue(5); + return (java.lang.String) getValue(6); } /** * Setter for Account.accounts.rank. */ public void setRank(java.lang.String value) { - setValue(6, value); + setValue(7, value); } /** * Getter for Account.accounts.rank. */ public java.lang.String getRank() { - return (java.lang.String) getValue(6); + return (java.lang.String) getValue(7); } /** * Setter for Account.accounts.rankPerm. */ public void setRankPerm(java.lang.Byte value) { - setValue(7, value); + setValue(8, value); } /** * Getter for Account.accounts.rankPerm. */ public java.lang.Byte getRankPerm() { - return (java.lang.Byte) getValue(7); + return (java.lang.Byte) getValue(8); } /** * Setter for Account.accounts.rankExpire. */ public void setRankExpire(java.sql.Timestamp value) { - setValue(8, value); + setValue(9, value); } /** * Getter for Account.accounts.rankExpire. */ public java.sql.Timestamp getRankExpire() { - return (java.sql.Timestamp) getValue(8); + return (java.sql.Timestamp) getValue(9); } /** * Setter for Account.accounts.lastLogin. */ public void setLastLogin(java.sql.Timestamp value) { - setValue(9, value); + setValue(10, value); } /** * Getter for Account.accounts.lastLogin. */ public java.sql.Timestamp getLastLogin() { - return (java.sql.Timestamp) getValue(9); + return (java.sql.Timestamp) getValue(10); } /** * Setter for Account.accounts.totalPlayTime. */ public void setTotalPlayTime(java.lang.String value) { - setValue(10, value); + setValue(11, value); } /** * Getter for Account.accounts.totalPlayTime. */ public java.lang.String getTotalPlayTime() { - return (java.lang.String) getValue(10); + return (java.lang.String) getValue(11); } // ------------------------------------------------------------------------- @@ -180,23 +194,23 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return (org.jooq.Row11) super.fieldsRow(); + public org.jooq.Row12 fieldsRow() { + return (org.jooq.Row12) super.fieldsRow(); } /** * {@inheritDoc} */ @Override - public org.jooq.Row11 valuesRow() { - return (org.jooq.Row11) super.valuesRow(); + public org.jooq.Row12 valuesRow() { + return (org.jooq.Row12) super.valuesRow(); } /** @@ -236,6 +250,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field5() { + return mineplex.database.tables.Accounts.accounts.gold; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field6() { return mineplex.database.tables.Accounts.accounts.coins; } @@ -243,7 +265,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field6() { + public org.jooq.Field field7() { return mineplex.database.tables.Accounts.accounts.donorRank; } @@ -251,7 +273,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field7() { + public org.jooq.Field field8() { return mineplex.database.tables.Accounts.accounts.rank; } @@ -259,7 +281,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field8() { + public org.jooq.Field field9() { return mineplex.database.tables.Accounts.accounts.rankPerm; } @@ -267,7 +289,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field9() { + public org.jooq.Field field10() { return mineplex.database.tables.Accounts.accounts.rankExpire; } @@ -275,7 +297,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field10() { + public org.jooq.Field field11() { return mineplex.database.tables.Accounts.accounts.lastLogin; } @@ -283,7 +305,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field11() { + public org.jooq.Field field12() { return mineplex.database.tables.Accounts.accounts.totalPlayTime; } @@ -324,6 +346,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record6 { - - private static final long serialVersionUID = 2005336153; - - /** - * Setter for Account.rewardLog.id. - */ - public void setId(java.lang.Integer value) { - setValue(0, value); - } - - /** - * Getter for Account.rewardLog.id. - */ - public java.lang.Integer getId() { - return (java.lang.Integer) getValue(0); - } - - /** - * Setter for Account.rewardLog.accountId. - */ - public void setAccountId(java.lang.Integer value) { - setValue(1, value); - } - - /** - * Getter for Account.rewardLog.accountId. - */ - public java.lang.Integer getAccountId() { - return (java.lang.Integer) getValue(1); - } - - /** - * Setter for Account.rewardLog.date. - */ - public void setDate(java.sql.Timestamp value) { - setValue(2, value); - } - - /** - * Getter for Account.rewardLog.date. - */ - public java.sql.Timestamp getDate() { - return (java.sql.Timestamp) getValue(2); - } - - /** - * Setter for Account.rewardLog.type. - */ - public void setType(java.lang.String value) { - setValue(3, value); - } - - /** - * Getter for Account.rewardLog.type. - */ - public java.lang.String getType() { - return (java.lang.String) getValue(3); - } - - /** - * Setter for Account.rewardLog.rarity. - */ - public void setRarity(java.lang.String value) { - setValue(4, value); - } - - /** - * Getter for Account.rewardLog.rarity. - */ - public java.lang.String getRarity() { - return (java.lang.String) getValue(4); - } - - /** - * Setter for Account.rewardLog.reward. - */ - public void setReward(java.lang.String value) { - setValue(5, value); - } - - /** - * Getter for Account.rewardLog.reward. - */ - public java.lang.String getReward() { - return (java.lang.String) getValue(5); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Record1 key() { - return (org.jooq.Record1) super.key(); - } - - // ------------------------------------------------------------------------- - // Record6 type implementation - // ------------------------------------------------------------------------- - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Row6 fieldsRow() { - return (org.jooq.Row6) super.fieldsRow(); - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Row6 valuesRow() { - return (org.jooq.Row6) super.valuesRow(); - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field1() { - return mineplex.database.tables.RewardLog.rewardLog.id; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field2() { - return mineplex.database.tables.RewardLog.rewardLog.accountId; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field3() { - return mineplex.database.tables.RewardLog.rewardLog.date; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field4() { - return mineplex.database.tables.RewardLog.rewardLog.type; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field5() { - return mineplex.database.tables.RewardLog.rewardLog.rarity; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field6() { - return mineplex.database.tables.RewardLog.rewardLog.reward; - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Integer value1() { - return getId(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Integer value2() { - return getAccountId(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.sql.Timestamp value3() { - return getDate(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.String value4() { - return getType(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.String value5() { - return getRarity(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.String value6() { - return getReward(); - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord value1(java.lang.Integer value) { - setId(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord value2(java.lang.Integer value) { - setAccountId(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord value3(java.sql.Timestamp value) { - setDate(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord value4(java.lang.String value) { - setType(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord value5(java.lang.String value) { - setRarity(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord value6(java.lang.String value) { - setReward(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public RewardLogRecord values(java.lang.Integer value1, java.lang.Integer value2, java.sql.Timestamp value3, java.lang.String value4, java.lang.String value5, java.lang.String value6) { - return this; - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached RewardLogRecord - */ - public RewardLogRecord() { - super(mineplex.database.tables.RewardLog.rewardLog); - } - - /** - * Create a detached, initialised RewardLogRecord - */ - public RewardLogRecord(java.lang.Integer id, java.lang.Integer accountId, java.sql.Timestamp date, java.lang.String type, java.lang.String rarity, java.lang.String reward) { - super(mineplex.database.tables.RewardLog.rewardLog); - - setValue(0, id); - setValue(1, accountId); - setValue(2, date); - setValue(3, type); - setValue(4, rarity); - setValue(5, reward); - } -}