From 2a18888922a0907274dcbecf917233b6237fb3a7 Mon Sep 17 00:00:00 2001 From: CoderTim Date: Tue, 14 Oct 2014 22:22:17 -0400 Subject: [PATCH] Improved NpcManager to work with persistent maps --- .../src/mineplex/core/npc/Npc.java | 38 ++- .../src/mineplex/core/npc/NpcManager.java | 161 ++++++++---- .../mineplex/core/npc/command/AddCommand.java | 16 +- .../core/npc/command/ClearCommand.java | 4 +- .../core/npc/command/DeleteCommand.java | 2 +- .../core/npc/command/HomeCommand.java | 2 +- .../mineplex/core/npc/command/NpcCommand.java | 2 +- .../src/mineplex/database/Account.java | 4 +- .../src/mineplex/database/Keys.java | 14 ++ .../src/mineplex/database/Tables.java | 10 + .../tables/AccountCoinTransactions.java | 117 +++++++++ .../database/tables/AccountFriend.java | 8 +- .../tables/AccountGemTransactions.java | 117 +++++++++ .../database/tables/AccountPreferences.java | 7 +- .../mineplex/database/tables/Accounts.java | 11 +- .../src/mineplex/database/tables/Npcs.java | 17 +- .../AccountCoinTransactionsRecord.java | 234 ++++++++++++++++++ .../tables/records/AccountFriendRecord.java | 36 +-- .../records/AccountGemTransactionsRecord.java | 234 ++++++++++++++++++ .../records/AccountPreferencesRecord.java | 58 ++++- .../tables/records/AccountsRecord.java | 134 ++++++---- .../database/tables/records/NpcsRecord.java | 130 ++++++---- .../compatibility/NpcProtectListener.java | 2 +- 23 files changed, 1147 insertions(+), 211 deletions(-) create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountCoinTransactions.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountGemTransactions.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountCoinTransactionsRecord.java create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountGemTransactionsRecord.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/Npc.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/Npc.java index 32a34b765..3f4e0dd01 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/Npc.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/Npc.java @@ -1,8 +1,7 @@ package mineplex.core.npc; -import java.util.UUID; - import org.bukkit.Bukkit; +import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCreature; import org.bukkit.entity.Entity; @@ -13,14 +12,16 @@ import mineplex.database.tables.records.NpcsRecord; public class Npc { + private final NpcManager _npcManager; private final NpcsRecord _databaseRecord; private final Location _location; - private UUID _uuid; + private LivingEntity _entity; private int _failedAttempts = 0; private boolean _returning = false; - public Npc(NpcsRecord databaseRecord) + public Npc(NpcManager npcManager, NpcsRecord databaseRecord) { + _npcManager = npcManager; _databaseRecord = databaseRecord; _location = new Location(Bukkit.getWorld(getDatabaseRecord().getWorld()), getDatabaseRecord().getX(), getDatabaseRecord().getY(), getDatabaseRecord().getZ()); @@ -28,15 +29,18 @@ public class Npc public void setEntity(LivingEntity entity) { - if (entity == null) - _uuid = null; - else - _uuid = entity.getUniqueId(); + if (entity != null) + getNpcManager()._npcMap.remove(entity.getUniqueId()); + + _entity = entity; + + if (_entity != null) + getNpcManager()._npcMap.put(_entity.getUniqueId(), this); } - public UUID getUuid() + public LivingEntity getEntity() { - return _uuid; + return _entity; } public NpcsRecord getDatabaseRecord() @@ -77,9 +81,9 @@ public class Npc return location.distanceSquared(getLocation()) <= getRadius() * getRadius(); } - public void returnToPost(Entity entity) + public void returnToPost() { - EntityCreature ec = ((CraftCreature) entity).getHandle(); + EntityCreature ec = ((CraftCreature) _entity).getHandle(); ec.getNavigation().a(getLocation().getX(), getLocation().getY(), getLocation().getZ(), .8f); @@ -99,4 +103,14 @@ public class Npc EntityCreature ec = ((CraftCreature) entity).getHandle(); ec.getNavigation().a(entityLocation.getX(), entityLocation.getY(), entityLocation.getZ(), .8f); } + + public NpcManager getNpcManager() + { + return _npcManager; + } + + public Chunk getChunk() + { + return getLocation().getChunk(); + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java index 4e772751e..d45803bf8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java @@ -2,8 +2,12 @@ package mineplex.core.npc; import java.sql.Connection; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Set; import java.util.UUID; @@ -20,11 +24,13 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.entity.Skeleton; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.world.ChunkLoadEvent; @@ -43,6 +49,8 @@ import mineplex.core.database.DBPool; import mineplex.core.npc.command.NpcCommand; import mineplex.core.npc.event.NpcDamageByEntityEvent; import mineplex.core.npc.event.NpcInteractEntityEvent; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; import mineplex.database.Tables; import mineplex.database.tables.records.NpcsRecord; import org.jooq.Result; @@ -84,7 +92,8 @@ public class NpcManager extends MiniPlugin } private final Creature _creature; - private final Set _npcs = new HashSet<>(); + private final List _npcs = new ArrayList<>(); + final Map _npcMap = new HashMap<>(); private final Set _npcDeletingPlayers = new HashSet<>(); public NpcManager(JavaPlugin plugin, Creature creature) @@ -113,12 +122,13 @@ public class NpcManager extends MiniPlugin } } + @Override public void AddCommands() { AddCommand(new NpcCommand(this)); } - public void Help(Player caller, String message) + public void help(Player caller, String message) { UtilPlayer.message(caller, F.main(_moduleName, "Commands List:")); UtilPlayer.message(caller, F.help("/npc add [radius] [adult] [name]", "Create a new NPC.", Rank.DEVELOPER)); @@ -130,23 +140,17 @@ public class NpcManager extends MiniPlugin UtilPlayer.message(caller, F.main(_moduleName, ChatColor.RED + message)); } - public void Help(Player caller) + public void help(Player caller) { - Help(caller, null); + help(caller, null); } - public Npc getNpcByEntityUUID(UUID uuid) + private Npc getNpcByEntityUUID(UUID uuid) { if (uuid == null) return null; - for (Npc npc : _npcs) - { - if (npc.getUuid() != null && npc.getUuid().equals(uuid)) - return npc; - } - - return null; + return _npcMap.get(uuid); } public Npc getNpcByEntity(Entity entity) @@ -162,10 +166,16 @@ public class NpcManager extends MiniPlugin return getNpcByEntity(entity) != null; } + public boolean isDetachedNpc(LivingEntity entity) + { + // Npc's name starts with ChatColor.RESET but it's missing from _npcMap + return !isNpc(entity) && entity.isCustomNameVisible() && (entity.getCustomName() == null || entity.getCustomName().startsWith(ChatColor.RESET.toString())); + } + @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void onEntityDamage(EntityDamageEvent event) { - if (isNpc(event.getEntity())) + if (event.getEntity() instanceof LivingEntity && isNpc(event.getEntity())) event.setCancelled(true); } @@ -209,24 +219,6 @@ public class NpcManager extends MiniPlugin event.setCancelled(true); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void OnChunkLoad(ChunkLoadEvent event) - { - for (Entity entity : event.getChunk().getEntities()) - { - Npc npc = getNpcByEntity(entity); - - if (npc != null) - { - UtilEnt.silence(entity, true); - UtilEnt.ghost(entity, true, false); - - if (npc.getDatabaseRecord().getRadius() == 0) - UtilEnt.Vegetate(entity); - } - } - } - @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void onPlayerInteractEntity(PlayerInteractEntityEvent event) { @@ -257,7 +249,7 @@ public class NpcManager extends MiniPlugin } } - public Entity addNpc(Player player, EntityType entityType, double radius, boolean adult, String name) throws SQLException + public Entity addNpc(Player player, EntityType entityType, double radius, boolean adult, String name, String entityMeta) throws SQLException { try (Connection connection = DBPool.getInstance().getConnection()) { @@ -282,6 +274,7 @@ public class NpcManager extends MiniPlugin npcsRecord.setLeggings(leggings); npcsRecord.setBoots(boots); npcsRecord.setInHand(inHand); + npcsRecord.setEntityMeta(entityMeta); try { @@ -292,7 +285,7 @@ public class NpcManager extends MiniPlugin npcsRecord.detach(); } - Npc npc = new Npc(npcsRecord); + Npc npc = new Npc(this, npcsRecord); _npcs.add(npc); return spawnNpc(npc); @@ -303,10 +296,19 @@ public class NpcManager extends MiniPlugin { LivingEntity entity = (LivingEntity) _creature.SpawnEntity(npc.getLocation(), EntityType.valueOf(npc.getDatabaseRecord().getEntityType())); + if (entity instanceof Skeleton && npc.getDatabaseRecord().getEntityMeta() != null) + ((Skeleton) entity).setSkeletonType(Skeleton.SkeletonType.valueOf(npc.getDatabaseRecord().getEntityMeta().toUpperCase())); + + entity.setCustomNameVisible(true); if (npc.getDatabaseRecord().getName() != null) { - entity.setCustomName(npc.getDatabaseRecord().getName()); - entity.setCustomNameVisible(true); + String name = npc.getDatabaseRecord().getName(); + for (ChatColor color : ChatColor.values()) + name = name.replace("(" + color.name().toLowerCase() + ")", color.toString()); + + name = ChatColor.translateAlternateColorCodes('&', name); + + entity.setCustomName(ChatColor.RESET + name); } entity.setCanPickupItems(false); @@ -360,6 +362,7 @@ public class NpcManager extends MiniPlugin npc.getDatabaseRecord().delete(); entity.remove(); + _npcMap.remove(entity.getUniqueId()); _npcs.remove(npc); return true; @@ -392,7 +395,7 @@ public class NpcManager extends MiniPlugin ((EntityInsentient) ((CraftLivingEntity) entity).getHandle()).persistent = true; UtilEnt.silence(entity, true); - if (!isNpcChunkLoaded(entity) || !(entity instanceof CraftCreature)) + if (!entity.getLocation().getChunk().isLoaded() || !(entity instanceof CraftCreature)) continue; if (!entity.isDead() && entity.isValid()) @@ -403,14 +406,14 @@ public class NpcManager extends MiniPlugin armor.setDurability((short) 0); } - if (npc.getFailedAttempts() >= 10) + if (npc.getFailedAttempts() >= 10 || npc.getDatabaseRecord().getRadius() == 0) { entity.teleport(npc.getLocation()); npc.setFailedAttempts(0); } else if (!npc.isInRadius(entity.getLocation())) { - npc.returnToPost(entity); + npc.returnToPost(); npc.incrementFailedAttempts(); } else @@ -435,7 +438,7 @@ public class NpcManager extends MiniPlugin if (npc == null) continue; - if (!isNpcChunkLoaded(entity)) + if (!entity.getLocation().getChunk().isLoaded()) continue; if (!entity.isDead() && entity.isValid()) @@ -448,11 +451,6 @@ public class NpcManager extends MiniPlugin } } - public boolean isNpcChunkLoaded(Entity entity) - { - return entity.getWorld().isChunkLoaded(entity.getLocation().getBlockX() >> 4, entity.getLocation().getBlockZ() >> 4); - } - public void loadNpcs() throws SQLException { String serverType = _plugin.getClass().getSimpleName(); @@ -468,9 +466,11 @@ public class NpcManager extends MiniPlugin { record.detach(); - Npc npc = new Npc(record); - spawnNpc(npc); + Npc npc = new Npc(this, record); _npcs.add(npc); + + if (npc.getChunk().isLoaded()) + spawnNpc(npc); } } } @@ -485,17 +485,72 @@ public class NpcManager extends MiniPlugin .delete(Tables.npcs) .where(Tables.npcs.server.eq(serverType)) .execute(); + } - for (World world : Bukkit.getWorlds()) + for (World world : Bukkit.getWorlds()) + { + for (LivingEntity entity : world.getEntitiesByClass(LivingEntity.class)) { - for (LivingEntity entity : world.getEntitiesByClass(LivingEntity.class)) - { - if (isNpc(entity)) - entity.remove(); - } + if (isNpc(entity)) + entity.remove(); } + } - _npcs.clear(); + _npcs.clear(); + _npcMap.clear(); + } + + @EventHandler + public void onUpdate(UpdateEvent event) + { + if (event.getType() != UpdateType.SEC) + return; + + for (World world : Bukkit.getWorlds()) + { + for (LivingEntity livingEntity : world.getEntitiesByClass(LivingEntity.class)) + { + if (isDetachedNpc(livingEntity)) + livingEntity.remove(); + } + } + + for (Npc npc : _npcs) + { + if (npc.getEntity() != null && !npc.getEntity().isValid() && npc.getChunk().isLoaded()) + spawnNpc(npc); } } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onChunkLoad(ChunkLoadEvent event) + { + for (Entity entity : event.getChunk().getEntities()) + { + if (entity instanceof LivingEntity) + { + Npc npc = getNpcByEntity(entity); + if (npc != null) + { + UtilEnt.silence(entity, true); + UtilEnt.ghost(entity, true, false); + + if (npc.getDatabaseRecord().getRadius() == 0) + UtilEnt.Vegetate(entity); + } + + if (isDetachedNpc((LivingEntity) entity)) + entity.remove(); + } + } + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onEntityDeath(EntityDeathEvent event) + { + Npc npc = getNpcByEntity(event.getEntity()); + + if (npc != null) + npc.setEntity(null); + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java index 133712cfe..e07beb03b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java @@ -21,7 +21,7 @@ public class AddCommand extends CommandBase public void Execute(Player caller, String[] args) { if (args == null) - Plugin.Help(caller); + Plugin.help(caller); else { EntityType type; @@ -31,7 +31,7 @@ public class AddCommand extends CommandBase } catch (IllegalArgumentException e) { - Plugin.Help(caller, "Invalid entity."); + Plugin.help(caller, "Invalid entity."); return; } @@ -45,7 +45,7 @@ public class AddCommand extends CommandBase } catch (NumberFormatException e) { - Plugin.Help(caller, "Invalid radius."); + Plugin.help(caller, "Invalid radius."); return; } @@ -57,15 +57,19 @@ public class AddCommand extends CommandBase String name = null; if (args.length >= 4) - name = ChatColor.translateAlternateColorCodes('&', args[3]); + { + name = args[3]; + for (int i = 4; i < args.length; i++) + name += " " + args[i]; + } try { - Plugin.addNpc(caller, type, radius, adult, name); + Plugin.addNpc(caller, type, radius, adult, name, null); } catch (SQLException e) { - Plugin.Help(caller, "Database error."); + Plugin.help(caller, "Database error."); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/ClearCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/ClearCommand.java index dab99d8ad..9af2975a1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/ClearCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/ClearCommand.java @@ -21,7 +21,7 @@ public class ClearCommand extends CommandBase public void Execute(Player caller, String[] args) { if (args != null) - Plugin.Help(caller); + Plugin.help(caller); else { try @@ -32,7 +32,7 @@ public class ClearCommand extends CommandBase } catch (SQLException e) { - Plugin.Help(caller, "Database error."); + Plugin.help(caller, "Database error."); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java index d4015bc2b..8e5012d6a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java @@ -19,7 +19,7 @@ public class DeleteCommand extends CommandBase public void Execute(Player caller, String[] args) { if (args != null) - Plugin.Help(caller); + Plugin.help(caller); else { Plugin.prepDeleteNpc(caller); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java index 46a5ccbc8..c5da7ee50 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java @@ -19,7 +19,7 @@ public class HomeCommand extends CommandBase public void Execute(Player caller, String[] args) { if (args != null) - Plugin.Help(caller); + Plugin.help(caller); else { Plugin.teleportNpcsHome(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java index b85ee91d1..0fd019913 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java @@ -21,6 +21,6 @@ public class NpcCommand extends MultiCommandBase @Override protected void Help(Player caller, String args[]) { - Plugin.Help(caller); + Plugin.help(caller); } } diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Account.java b/Plugins/Mineplex.Database/src/mineplex/database/Account.java index 6073e5df9..06753009a 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 = -1621358205; + private static final long serialVersionUID = 163654509; /** * The singleton instance of Account @@ -34,7 +34,9 @@ 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.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountFriend.accountFriend, + mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPreferences.accountPreferences, diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java index 70769c6ff..3d64f248d 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java @@ -18,7 +18,9 @@ public class Keys { // IDENTITY definitions // ------------------------------------------------------------------------- + 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; public static final org.jooq.Identity IDENTITY_accountInventory = Identities0.IDENTITY_accountInventory; public static final org.jooq.Identity IDENTITY_accountPolls = Identities0.IDENTITY_accountPolls; public static final org.jooq.Identity IDENTITY_accountPreferences = Identities0.IDENTITY_accountPreferences; @@ -41,7 +43,10 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- + 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; + public static final org.jooq.UniqueKey KEY_accountGemTransactions_PRIMARY = UniqueKeys0.KEY_accountGemTransactions_PRIMARY; public static final org.jooq.UniqueKey KEY_accountInventory_PRIMARY = UniqueKeys0.KEY_accountInventory_PRIMARY; public static final org.jooq.UniqueKey KEY_accountInventory_accountItemIndex = UniqueKeys0.KEY_accountInventory_accountItemIndex; public static final org.jooq.UniqueKey KEY_accountPolls_PRIMARY = UniqueKeys0.KEY_accountPolls_PRIMARY; @@ -74,6 +79,8 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- + 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; public static final org.jooq.ForeignKey accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2; public static final org.jooq.ForeignKey accountPolls_ibfk_1 = ForeignKeys0.accountPolls_ibfk_1; @@ -92,7 +99,9 @@ public class Keys { // ------------------------------------------------------------------------- private static class Identities0 extends org.jooq.impl.AbstractKeys { + 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); public static org.jooq.Identity IDENTITY_accountInventory = createIdentity(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.id); public static org.jooq.Identity IDENTITY_accountPolls = createIdentity(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.id); public static org.jooq.Identity IDENTITY_accountPreferences = createIdentity(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.id); @@ -113,7 +122,10 @@ public class Keys { } private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys { + 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); + public static final org.jooq.UniqueKey KEY_accountGemTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id); public static final org.jooq.UniqueKey KEY_accountInventory_PRIMARY = createUniqueKey(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.id); public static final org.jooq.UniqueKey KEY_accountInventory_accountItemIndex = createUniqueKey(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId, mineplex.database.tables.AccountInventory.accountInventory.itemId); public static final org.jooq.UniqueKey KEY_accountPolls_PRIMARY = createUniqueKey(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.id); @@ -144,6 +156,8 @@ public class Keys { } private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys { + 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); public static final org.jooq.ForeignKey accountInventory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.itemId); public static final org.jooq.ForeignKey accountPolls_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId); diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java index 9434a5ccf..5ede20b4e 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java @@ -13,11 +13,21 @@ package mineplex.database; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { + /** + * The table Account.accountCoinTransactions + */ + public static final mineplex.database.tables.AccountCoinTransactions accountCoinTransactions = mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions; + /** * The table Account.accountFriend */ public static final mineplex.database.tables.AccountFriend accountFriend = mineplex.database.tables.AccountFriend.accountFriend; + /** + * The table Account.accountGemTransactions + */ + public static final mineplex.database.tables.AccountGemTransactions accountGemTransactions = mineplex.database.tables.AccountGemTransactions.accountGemTransactions; + /** * The table Account.accountInventory */ diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountCoinTransactions.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountCoinTransactions.java new file mode 100644 index 000000000..d899cd48a --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountCoinTransactions.java @@ -0,0 +1,117 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.2" }, + comments = "This class is generated by jOOQ") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountCoinTransactions extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 2022908788; + + /** + * The singleton instance of Account.accountCoinTransactions + */ + public static final mineplex.database.tables.AccountCoinTransactions accountCoinTransactions = new mineplex.database.tables.AccountCoinTransactions(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.AccountCoinTransactionsRecord.class; + } + + /** + * The column Account.accountCoinTransactions.id. + */ + public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountCoinTransactions.accounts_uuid. + */ + public final org.jooq.TableField accounts_uuid = createField("accounts_uuid", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, ""); + + /** + * The column Account.accountCoinTransactions.reason. + */ + public final org.jooq.TableField reason = createField("reason", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, ""); + + /** + * The column Account.accountCoinTransactions.coins. + */ + public final org.jooq.TableField coins = createField("coins", org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a Account.accountCoinTransactions table reference + */ + public AccountCoinTransactions() { + this("accountCoinTransactions", null); + } + + /** + * Create an aliased Account.accountCoinTransactions table reference + */ + public AccountCoinTransactions(java.lang.String alias) { + this(alias, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions); + } + + private AccountCoinTransactions(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private AccountCoinTransactions(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_accountCoinTransactions; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_accountCoinTransactions_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountCoinTransactions_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.accountCoinTransactions_ibfk_1); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.AccountCoinTransactions as(java.lang.String alias) { + return new mineplex.database.tables.AccountCoinTransactions(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.AccountCoinTransactions rename(java.lang.String name) { + return new mineplex.database.tables.AccountCoinTransactions(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountFriend.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountFriend.java index 293e0a275..329321c4c 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountFriend.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountFriend.java @@ -11,7 +11,7 @@ package mineplex.database.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AccountFriend extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { - private static final long serialVersionUID = 35533677; + private static final long serialVersionUID = -547231162; /** * The singleton instance of Account.accountFriend @@ -42,9 +42,9 @@ public class AccountFriend extends org.jooq.impl.TableImpl uuidTarget = createField("uuidTarget", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, ""); /** - * The column Account.accountFriend.mutual. + * The column Account.accountFriend.status. */ - public final org.jooq.TableField mutual = createField("mutual", org.jooq.impl.SQLDataType.TINYINT, this, ""); + public final org.jooq.TableField status = createField("status", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, ""); /** * Create a Account.accountFriend table reference @@ -89,7 +89,7 @@ public class AccountFriend extends org.jooq.impl.TableImpl> getKeys() { - return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountFriend_PRIMARY); + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountFriend_PRIMARY, mineplex.database.Keys.KEY_accountFriend_uuidIndex); } /** diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountGemTransactions.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountGemTransactions.java new file mode 100644 index 000000000..0fdb825f8 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountGemTransactions.java @@ -0,0 +1,117 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.2" }, + comments = "This class is generated by jOOQ") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountGemTransactions extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 565873060; + + /** + * The singleton instance of Account.accountGemTransactions + */ + public static final mineplex.database.tables.AccountGemTransactions accountGemTransactions = new mineplex.database.tables.AccountGemTransactions(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.AccountGemTransactionsRecord.class; + } + + /** + * The column Account.accountGemTransactions.id. + */ + public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountGemTransactions.accounts_uuid. + */ + public final org.jooq.TableField accounts_uuid = createField("accounts_uuid", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, ""); + + /** + * The column Account.accountGemTransactions.reason. + */ + public final org.jooq.TableField reason = createField("reason", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, ""); + + /** + * The column Account.accountGemTransactions.gems. + */ + public final org.jooq.TableField gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a Account.accountGemTransactions table reference + */ + public AccountGemTransactions() { + this("accountGemTransactions", null); + } + + /** + * Create an aliased Account.accountGemTransactions table reference + */ + public AccountGemTransactions(java.lang.String alias) { + this(alias, mineplex.database.tables.AccountGemTransactions.accountGemTransactions); + } + + private AccountGemTransactions(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private AccountGemTransactions(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_accountGemTransactions; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_accountGemTransactions_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountGemTransactions_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.accountGemTransactions_ibfk_1); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.AccountGemTransactions as(java.lang.String alias) { + return new mineplex.database.tables.AccountGemTransactions(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.AccountGemTransactions rename(java.lang.String name) { + return new mineplex.database.tables.AccountGemTransactions(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountPreferences.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountPreferences.java index 65b403a04..7b5626f48 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountPreferences.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountPreferences.java @@ -11,7 +11,7 @@ package mineplex.database.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AccountPreferences extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { - private static final long serialVersionUID = 203359538; + private static final long serialVersionUID = -780380646; /** * The singleton instance of Account.accountPreferences @@ -91,6 +91,11 @@ public class AccountPreferences extends org.jooq.impl.TableImpl ignoreVelocity = createField("ignoreVelocity", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, ""); + /** + * The column Account.accountPreferences.pendingFriendRequests. + */ + public final org.jooq.TableField pendingFriendRequests = createField("pendingFriendRequests", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, ""); + /** * Create a Account.accountPreferences table reference */ diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java index 17cbb7477..4593abb25 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 = -555476915; + private static final long serialVersionUID = -1971089065; /** * The singleton instance of Account.accounts @@ -44,7 +44,12 @@ public class Accounts extends org.jooq.impl.TableImplAccount.accounts.gems. */ - public final org.jooq.TableField gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER, this, ""); + public final org.jooq.TableField gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER.defaulted(true), this, ""); + + /** + * The column Account.accounts.coins. + */ + public final org.jooq.TableField coins = createField("coins", org.jooq.impl.SQLDataType.INTEGER.defaulted(true), this, ""); /** * The column Account.accounts.donorRank. @@ -64,7 +69,7 @@ public class Accounts extends org.jooq.impl.TableImplAccount.accounts.rankExpire. */ - public final org.jooq.TableField rankExpire = createField("rankExpire", org.jooq.impl.SQLDataType.CLOB.length(16777215), this, ""); + public final org.jooq.TableField rankExpire = createField("rankExpire", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, ""); /** * The column Account.accounts.lastLogin. diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Npcs.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Npcs.java index 4ed247419..9ae280598 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/Npcs.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Npcs.java @@ -11,7 +11,7 @@ package mineplex.database.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Npcs extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { - private static final long serialVersionUID = -1308334886; + private static final long serialVersionUID = -1554338732; /** * The singleton instance of Account.npcs @@ -71,6 +71,11 @@ public class Npcs extends org.jooq.impl.TableImpl entityType = createField("entityType", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, ""); + /** + * The column Account.npcs.entityMeta. + */ + public final org.jooq.TableField entityMeta = createField("entityMeta", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + /** * The column Account.npcs.adult. */ @@ -79,27 +84,27 @@ public class Npcs extends org.jooq.impl.TableImplAccount.npcs.helmet. */ - public final org.jooq.TableField helmet = createField("helmet", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final org.jooq.TableField helmet = createField("helmet", org.jooq.impl.SQLDataType.CLOB.length(65535), this, ""); /** * The column Account.npcs.chestplate. */ - public final org.jooq.TableField chestplate = createField("chestplate", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final org.jooq.TableField chestplate = createField("chestplate", org.jooq.impl.SQLDataType.CLOB.length(65535), this, ""); /** * The column Account.npcs.leggings. */ - public final org.jooq.TableField leggings = createField("leggings", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final org.jooq.TableField leggings = createField("leggings", org.jooq.impl.SQLDataType.CLOB.length(65535), this, ""); /** * The column Account.npcs.boots. */ - public final org.jooq.TableField boots = createField("boots", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final org.jooq.TableField boots = createField("boots", org.jooq.impl.SQLDataType.CLOB.length(65535), this, ""); /** * The column Account.npcs.inHand. */ - public final org.jooq.TableField inHand = createField("inHand", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + public final org.jooq.TableField inHand = createField("inHand", org.jooq.impl.SQLDataType.CLOB.length(65535), this, ""); /** * Create a Account.npcs table reference diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountCoinTransactionsRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountCoinTransactionsRecord.java new file mode 100644 index 000000000..efa67c1b3 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountCoinTransactionsRecord.java @@ -0,0 +1,234 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.2" }, + comments = "This class is generated by jOOQ") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4 { + + private static final long serialVersionUID = -1674238317; + + /** + * Setter for Account.accountCoinTransactions.id. + */ + public void setId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.accountCoinTransactions.id. + */ + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.accountCoinTransactions.accounts_uuid. + */ + public void setAccounts_uuid(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.accountCoinTransactions.accounts_uuid. + */ + public java.lang.String getAccounts_uuid() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.accountCoinTransactions.reason. + */ + public void setReason(java.lang.String value) { + setValue(2, value); + } + + /** + * Getter for Account.accountCoinTransactions.reason. + */ + public java.lang.String getReason() { + return (java.lang.String) getValue(2); + } + + /** + * Setter for Account.accountCoinTransactions.coins. + */ + public void setCoins(java.lang.Integer value) { + setValue(3, value); + } + + /** + * Getter for Account.accountCoinTransactions.coins. + */ + public java.lang.Integer getCoins() { + return (java.lang.Integer) getValue(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row4 fieldsRow() { + return (org.jooq.Row4) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row4 valuesRow() { + return (org.jooq.Row4) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accounts_uuid; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.reason; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field4() { + return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.coins; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getAccounts_uuid(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value3() { + return getReason(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value4() { + return getCoins(); + } + + /** + * {@inheritDoc} + */ + @Override + public AccountCoinTransactionsRecord value1(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountCoinTransactionsRecord value2(java.lang.String value) { + setAccounts_uuid(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountCoinTransactionsRecord value3(java.lang.String value) { + setReason(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountCoinTransactionsRecord value4(java.lang.Integer value) { + setCoins(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountCoinTransactionsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountCoinTransactionsRecord + */ + public AccountCoinTransactionsRecord() { + super(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions); + } + + /** + * Create a detached, initialised AccountCoinTransactionsRecord + */ + public AccountCoinTransactionsRecord(java.lang.Integer id, java.lang.String accounts_uuid, java.lang.String reason, java.lang.Integer coins) { + super(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions); + + setValue(0, id); + setValue(1, accounts_uuid); + setValue(2, reason); + setValue(3, coins); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriendRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriendRecord.java index bd1d3e697..66785d677 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriendRecord.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriendRecord.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 AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4 { +public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4 { - private static final long serialVersionUID = -437854439; + private static final long serialVersionUID = -1139709892; /** * Setter for Account.accountFriend.id. @@ -56,17 +56,17 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImplAccount.accountFriend.mutual. + * Setter for Account.accountFriend.status. */ - public void setMutual(java.lang.Byte value) { + public void setStatus(java.lang.String value) { setValue(3, value); } /** - * Getter for Account.accountFriend.mutual. + * Getter for Account.accountFriend.status. */ - public java.lang.Byte getMutual() { - return (java.lang.Byte) getValue(3); + public java.lang.String getStatus() { + return (java.lang.String) getValue(3); } // ------------------------------------------------------------------------- @@ -89,7 +89,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { + public org.jooq.Row4 fieldsRow() { return (org.jooq.Row4) super.fieldsRow(); } @@ -97,7 +97,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { + public org.jooq.Row4 valuesRow() { return (org.jooq.Row4) super.valuesRow(); } @@ -129,8 +129,8 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl field4() { - return mineplex.database.tables.AccountFriend.accountFriend.mutual; + public org.jooq.Field field4() { + return mineplex.database.tables.AccountFriend.accountFriend.status; } /** @@ -161,8 +161,8 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4 { + + private static final long serialVersionUID = 1444170773; + + /** + * Setter for Account.accountGemTransactions.id. + */ + public void setId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.accountGemTransactions.id. + */ + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.accountGemTransactions.accounts_uuid. + */ + public void setAccounts_uuid(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.accountGemTransactions.accounts_uuid. + */ + public java.lang.String getAccounts_uuid() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.accountGemTransactions.reason. + */ + public void setReason(java.lang.String value) { + setValue(2, value); + } + + /** + * Getter for Account.accountGemTransactions.reason. + */ + public java.lang.String getReason() { + return (java.lang.String) getValue(2); + } + + /** + * Setter for Account.accountGemTransactions.gems. + */ + public void setGems(java.lang.Integer value) { + setValue(3, value); + } + + /** + * Getter for Account.accountGemTransactions.gems. + */ + public java.lang.Integer getGems() { + return (java.lang.Integer) getValue(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record4 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row4 fieldsRow() { + return (org.jooq.Row4) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row4 valuesRow() { + return (org.jooq.Row4) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.accounts_uuid; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.reason; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field4() { + return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.gems; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getAccounts_uuid(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value3() { + return getReason(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value4() { + return getGems(); + } + + /** + * {@inheritDoc} + */ + @Override + public AccountGemTransactionsRecord value1(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountGemTransactionsRecord value2(java.lang.String value) { + setAccounts_uuid(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountGemTransactionsRecord value3(java.lang.String value) { + setReason(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountGemTransactionsRecord value4(java.lang.Integer value) { + setGems(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountGemTransactionsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountGemTransactionsRecord + */ + public AccountGemTransactionsRecord() { + super(mineplex.database.tables.AccountGemTransactions.accountGemTransactions); + } + + /** + * Create a detached, initialised AccountGemTransactionsRecord + */ + public AccountGemTransactionsRecord(java.lang.Integer id, java.lang.String accounts_uuid, java.lang.String reason, java.lang.Integer gems) { + super(mineplex.database.tables.AccountGemTransactions.accountGemTransactions); + + setValue(0, id); + setValue(1, accounts_uuid); + setValue(2, reason); + setValue(3, gems); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferencesRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferencesRecord.java index 577f26a58..18b71c921 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferencesRecord.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferencesRecord.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 AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record13 { +public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record14 { - private static final long serialVersionUID = 865577358; + private static final long serialVersionUID = 1651524548; /** * Setter for Account.accountPreferences.id. @@ -195,6 +195,20 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl< return (java.lang.Byte) getValue(12); } + /** + * Setter for Account.accountPreferences.pendingFriendRequests. + */ + public void setPendingFriendRequests(java.lang.Byte value) { + setValue(13, value); + } + + /** + * Getter for Account.accountPreferences.pendingFriendRequests. + */ + public java.lang.Byte getPendingFriendRequests() { + return (java.lang.Byte) getValue(13); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -208,23 +222,23 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl< } // ------------------------------------------------------------------------- - // Record13 type implementation + // Record14 type implementation // ------------------------------------------------------------------------- /** * {@inheritDoc} */ @Override - public org.jooq.Row13 fieldsRow() { - return (org.jooq.Row13) super.fieldsRow(); + public org.jooq.Row14 fieldsRow() { + return (org.jooq.Row14) super.fieldsRow(); } /** * {@inheritDoc} */ @Override - public org.jooq.Row13 valuesRow() { - return (org.jooq.Row13) super.valuesRow(); + public org.jooq.Row14 valuesRow() { + return (org.jooq.Row14) super.valuesRow(); } /** @@ -331,6 +345,14 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl< return mineplex.database.tables.AccountPreferences.accountPreferences.ignoreVelocity; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field14() { + return mineplex.database.tables.AccountPreferences.accountPreferences.pendingFriendRequests; + } + /** * {@inheritDoc} */ @@ -435,6 +457,14 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl< return getIgnoreVelocity(); } + /** + * {@inheritDoc} + */ + @Override + public java.lang.Byte value14() { + return getPendingFriendRequests(); + } + /** * {@inheritDoc} */ @@ -556,7 +586,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) { + public AccountPreferencesRecord value14(java.lang.Byte value) { + setPendingFriendRequests(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) { return this; } @@ -574,7 +613,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) { + 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) { super(mineplex.database.tables.AccountPreferences.accountPreferences); setValue(0, id); @@ -590,5 +629,6 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl< setValue(10, forcefield); setValue(11, showMacReports); setValue(12, ignoreVelocity); + setValue(13, pendingFriendRequests); } } 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 7ea1ade53..3dab8cf77 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.Record10 { +public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record11 { - private static final long serialVersionUID = 1437085324; + private static final long serialVersionUID = -1996366804; /** * Setter for Account.accounts.id. @@ -69,88 +69,102 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImplAccount.accounts.coins. + */ + public void setCoins(java.lang.Integer value) { + setValue(4, value); + } + + /** + * Getter for Account.accounts.coins. + */ + public java.lang.Integer getCoins() { + return (java.lang.Integer) getValue(4); + } + /** * Setter for Account.accounts.donorRank. */ public void setDonorRank(java.lang.String value) { - setValue(4, value); + setValue(5, value); } /** * Getter for Account.accounts.donorRank. */ public java.lang.String getDonorRank() { - return (java.lang.String) getValue(4); + return (java.lang.String) getValue(5); } /** * Setter for Account.accounts.rank. */ public void setRank(java.lang.String value) { - setValue(5, value); + setValue(6, value); } /** * Getter for Account.accounts.rank. */ public java.lang.String getRank() { - return (java.lang.String) getValue(5); + return (java.lang.String) getValue(6); } /** * Setter for Account.accounts.rankPerm. */ public void setRankPerm(java.lang.Byte value) { - setValue(6, value); + setValue(7, value); } /** * Getter for Account.accounts.rankPerm. */ public java.lang.Byte getRankPerm() { - return (java.lang.Byte) getValue(6); + return (java.lang.Byte) getValue(7); } /** * Setter for Account.accounts.rankExpire. */ - public void setRankExpire(java.lang.String value) { - setValue(7, value); + public void setRankExpire(java.sql.Timestamp value) { + setValue(8, value); } /** * Getter for Account.accounts.rankExpire. */ - public java.lang.String getRankExpire() { - return (java.lang.String) getValue(7); + public java.sql.Timestamp getRankExpire() { + return (java.sql.Timestamp) getValue(8); } /** * Setter for Account.accounts.lastLogin. */ public void setLastLogin(java.sql.Timestamp value) { - setValue(8, value); + setValue(9, value); } /** * Getter for Account.accounts.lastLogin. */ public java.sql.Timestamp getLastLogin() { - return (java.sql.Timestamp) getValue(8); + return (java.sql.Timestamp) getValue(9); } /** * Setter for Account.accounts.totalPlayTime. */ public void setTotalPlayTime(java.lang.String value) { - setValue(9, value); + setValue(10, value); } /** * Getter for Account.accounts.totalPlayTime. */ public java.lang.String getTotalPlayTime() { - return (java.lang.String) getValue(9); + return (java.lang.String) getValue(10); } // ------------------------------------------------------------------------- @@ -166,23 +180,23 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return (org.jooq.Row10) super.fieldsRow(); + public org.jooq.Row11 fieldsRow() { + return (org.jooq.Row11) super.fieldsRow(); } /** * {@inheritDoc} */ @Override - public org.jooq.Row10 valuesRow() { - return (org.jooq.Row10) super.valuesRow(); + public org.jooq.Row11 valuesRow() { + return (org.jooq.Row11) super.valuesRow(); } /** @@ -221,8 +235,8 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field5() { - return mineplex.database.tables.Accounts.accounts.donorRank; + public org.jooq.Field field5() { + return mineplex.database.tables.Accounts.accounts.coins; } /** @@ -230,6 +244,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field6() { + return mineplex.database.tables.Accounts.accounts.donorRank; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field7() { return mineplex.database.tables.Accounts.accounts.rank; } @@ -237,7 +259,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field7() { + public org.jooq.Field field8() { return mineplex.database.tables.Accounts.accounts.rankPerm; } @@ -245,7 +267,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field8() { + public org.jooq.Field field9() { return mineplex.database.tables.Accounts.accounts.rankExpire; } @@ -253,7 +275,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field9() { + public org.jooq.Field field10() { return mineplex.database.tables.Accounts.accounts.lastLogin; } @@ -261,7 +283,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl field10() { + public org.jooq.Field field11() { return mineplex.database.tables.Accounts.accounts.totalPlayTime; } @@ -301,8 +323,8 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record15 { +public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record16 { - private static final long serialVersionUID = -202208690; + private static final long serialVersionUID = -1872308957; /** * Setter for Account.npcs.id. @@ -139,88 +139,102 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImplAccount.npcs.entityMeta. + */ + public void setEntityMeta(java.lang.String value) { + setValue(9, value); + } + + /** + * Getter for Account.npcs.entityMeta. + */ + public java.lang.String getEntityMeta() { + return (java.lang.String) getValue(9); + } + /** * Setter for Account.npcs.adult. */ public void setAdult(java.lang.Boolean value) { - setValue(9, value); + setValue(10, value); } /** * Getter for Account.npcs.adult. */ public java.lang.Boolean getAdult() { - return (java.lang.Boolean) getValue(9); + return (java.lang.Boolean) getValue(10); } /** * Setter for Account.npcs.helmet. */ public void setHelmet(java.lang.String value) { - setValue(10, value); + setValue(11, value); } /** * Getter for Account.npcs.helmet. */ public java.lang.String getHelmet() { - return (java.lang.String) getValue(10); + return (java.lang.String) getValue(11); } /** * Setter for Account.npcs.chestplate. */ public void setChestplate(java.lang.String value) { - setValue(11, value); + setValue(12, value); } /** * Getter for Account.npcs.chestplate. */ public java.lang.String getChestplate() { - return (java.lang.String) getValue(11); + return (java.lang.String) getValue(12); } /** * Setter for Account.npcs.leggings. */ public void setLeggings(java.lang.String value) { - setValue(12, value); + setValue(13, value); } /** * Getter for Account.npcs.leggings. */ public java.lang.String getLeggings() { - return (java.lang.String) getValue(12); + return (java.lang.String) getValue(13); } /** * Setter for Account.npcs.boots. */ public void setBoots(java.lang.String value) { - setValue(13, value); + setValue(14, value); } /** * Getter for Account.npcs.boots. */ public java.lang.String getBoots() { - return (java.lang.String) getValue(13); + return (java.lang.String) getValue(14); } /** * Setter for Account.npcs.inHand. */ public void setInHand(java.lang.String value) { - setValue(14, value); + setValue(15, value); } /** * Getter for Account.npcs.inHand. */ public java.lang.String getInHand() { - return (java.lang.String) getValue(14); + return (java.lang.String) getValue(15); } // ------------------------------------------------------------------------- @@ -236,23 +250,23 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return (org.jooq.Row15) super.fieldsRow(); + public org.jooq.Row16 fieldsRow() { + return (org.jooq.Row16) super.fieldsRow(); } /** * {@inheritDoc} */ @Override - public org.jooq.Row15 valuesRow() { - return (org.jooq.Row15) super.valuesRow(); + public org.jooq.Row16 valuesRow() { + return (org.jooq.Row16) super.valuesRow(); } /** @@ -331,7 +345,15 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl field10() { + public org.jooq.Field field10() { + return mineplex.database.tables.Npcs.npcs.entityMeta; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field11() { return mineplex.database.tables.Npcs.npcs.adult; } @@ -339,7 +361,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl field11() { + public org.jooq.Field field12() { return mineplex.database.tables.Npcs.npcs.helmet; } @@ -347,7 +369,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl field12() { + public org.jooq.Field field13() { return mineplex.database.tables.Npcs.npcs.chestplate; } @@ -355,7 +377,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl field13() { + public org.jooq.Field field14() { return mineplex.database.tables.Npcs.npcs.leggings; } @@ -363,7 +385,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl field14() { + public org.jooq.Field field15() { return mineplex.database.tables.Npcs.npcs.boots; } @@ -371,7 +393,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl field15() { + public org.jooq.Field field16() { return mineplex.database.tables.Npcs.npcs.inHand; } @@ -451,7 +473,15 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl