diff --git a/Plugins/Mineplex.Bungee.Mineplexer/pom.xml b/Plugins/Mineplex.Bungee.Mineplexer/pom.xml index b32fcf94a..4b46f2b44 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/pom.xml +++ b/Plugins/Mineplex.Bungee.Mineplexer/pom.xml @@ -28,10 +28,6 @@ commons-codec commons-codec - - net.kencochrane.raven - raven - net.md-5 bungeecord-proxy diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java index e780804a7..91039533d 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java @@ -1,35 +1,16 @@ package mineplex.bungee; -import java.util.logging.Handler; -import java.util.logging.Level; import mineplex.bungee.lobbyBalancer.LobbyBalancer; import mineplex.bungee.motd.MotdManager; import mineplex.bungee.playerCount.PlayerCount; import mineplex.bungee.playerStats.PlayerStats; import mineplex.bungee.playerTracker.PlayerTracker; -import net.kencochrane.raven.DefaultRavenFactory; -import net.kencochrane.raven.dsn.Dsn; -import net.kencochrane.raven.jul.SentryHandler; import net.md_5.bungee.api.plugin.Plugin; public class Mineplexer extends Plugin { @Override public void onEnable() { - getProxy().getScheduler().runAsync(this, new Runnable() - { - @Override - public void run() - { - // Sentry setup - Handler sentry = new SentryHandler(new DefaultRavenFactory().createRavenInstance( - new Dsn("https://470f12378af3453ba089e0c0a0c9aae6:292516b722594784807aebb06db8ec38@app.getsentry.com/66323" - ))); - sentry.setLevel(Level.SEVERE); - getProxy().getLogger().addHandler(sentry); - } - }); - new MotdManager(this); new LobbyBalancer(this); new PlayerCount(this); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java index 2bd3903b3..bf74a6d2e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java @@ -1,16 +1,22 @@ package mineplex.core.antihack; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map.Entry; - +import mineplex.core.MiniPlugin; +import mineplex.core.account.CoreClientManager; +import mineplex.core.antihack.types.Fly; +import mineplex.core.antihack.types.Idle; +import mineplex.core.antihack.types.Reach; +import mineplex.core.antihack.types.Speed; +import mineplex.core.common.Rank; +import mineplex.core.common.util.*; +import mineplex.core.portal.Portal; +import mineplex.core.preferences.PreferencesManager; +import mineplex.core.punish.Punish; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -21,26 +27,11 @@ import org.bukkit.event.player.PlayerVelocityEvent; import org.bukkit.event.server.ServerListPingEvent; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniPlugin; -import mineplex.core.account.CoreClientManager; -import mineplex.core.antihack.types.Fly; -import mineplex.core.antihack.types.Idle; -import mineplex.core.antihack.types.Reach; -import mineplex.core.antihack.types.Speed; -import mineplex.core.common.Rank; -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilEnt; -import mineplex.core.common.util.UtilInv; -import mineplex.core.common.util.UtilMath; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; -import mineplex.core.common.util.UtilTime; -import mineplex.core.portal.Portal; -import mineplex.core.preferences.PreferencesManager; -import mineplex.core.punish.Punish; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map.Entry; public class AntiHack extends MiniPlugin { @@ -351,42 +342,6 @@ public class AntiHack extends MiniPlugin } } - //Auto-Kick - if (!handled && - _clientManager.Get(player).GetRank() != Rank.YOUTUBE && - _clientManager.Get(player).GetRank() != Rank.YOUTUBE_SMALL && - _clientManager.Get(player).GetRank() != Rank.TWITCH) - { - player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 2f, 0.5f); - - if (_kick || _hubAttempted.remove(player)) - { - player.kickPlayer( - C.cGold + "Mineplex Anti-Cheat" + "\n" + - C.cWhite + "You were kicked for suspicious movement." + "\n" + - C.cWhite + "Cheating may result in a " + C.cRed + "Permanent Ban" + C.cWhite + "." + "\n" + - C.cWhite + "If you were not cheating, you will not be banned." - ); - } - else - { - _hubAttempted.add(player); - - UtilPlayer.message(player, C.cGold + C.Strike + "---------------------------------------------"); - UtilPlayer.message(player, ""); - UtilPlayer.message(player, C.cGold + "Mineplex Anti-Cheat"); - UtilPlayer.message(player, ""); - UtilPlayer.message(player, "You were kicked from the game for suspicious movement."); - UtilPlayer.message(player, "Cheating may result in a " + C.cRed + "Permanent Ban" + C.cWhite + "."); - UtilPlayer.message(player, "If you were not cheating, you will not be banned."); - UtilPlayer.message(player, ""); - UtilPlayer.message(player, C.cGold + C.Strike + "---------------------------------------------"); - Portal.sendPlayerToServer(player, "Lobby"); - } - - UtilServer.broadcast(F.main("MAC", player.getName() + " was kicked for suspicious movement.")); - } - //Record ServerListPingEvent event = new ServerListPingEvent(null, Bukkit.getServer().getMotd(), Bukkit.getServer().getOnlinePlayers().size(), Bukkit.getServer().getMaxPlayers()); getPluginManager().callEvent(event); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java index f31e9ce0a..52ee5f2f9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java @@ -14,7 +14,6 @@ import mineplex.core.bonuses.gui.BonusGui; import mineplex.core.bonuses.gui.SpinGui; import mineplex.core.bonuses.redis.VoteHandler; import mineplex.core.bonuses.redis.VotifierCommand; -import mineplex.core.boosters.BoosterManager; import mineplex.core.common.Rank; import mineplex.core.common.util.*; import mineplex.core.common.util.UtilParticle.ParticleType; @@ -35,6 +34,7 @@ import mineplex.core.recharge.Recharge; import mineplex.core.reward.RewardManager; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; +import mineplex.core.thank.ThankManager; import mineplex.core.treasure.TreasureType; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -123,7 +123,7 @@ public class BonusManager extends MiniClientPlugin implements I private StatsManager _statsManager; private FacebookManager _facebookManager; private YoutubeManager _youtubeManager; - private BoosterManager _boosterManager; + private ThankManager _thankManager; public boolean _enabled; private Npc _carlNpc; private AnimationCarl _animation; @@ -162,7 +162,7 @@ public class BonusManager extends MiniClientPlugin implements I updateOffSet(); } - public BonusManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, StatsManager statsManager, InventoryManager inventoryManager, PetManager petManager, FacebookManager facebookManager, YoutubeManager youtubeManager, GadgetManager gadgetManager, BoosterManager boosterManager) + public BonusManager(JavaPlugin plugin, CoreClientManager clientManager, ServerStatusManager statusManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, StatsManager statsManager, InventoryManager inventoryManager, PetManager petManager, FacebookManager facebookManager, YoutubeManager youtubeManager, GadgetManager gadgetManager, ThankManager thankManager) { super("Bonus", plugin); _repository = new BonusRepository(plugin, this, donationManager); @@ -171,7 +171,7 @@ public class BonusManager extends MiniClientPlugin implements I _npcManager = npcManager; _hologramManager = hologramManager; _inventoryManager = inventoryManager; - _boosterManager = boosterManager; + _thankManager = thankManager; _rewardManager = new RewardManager(_clientManager, _donationManager, _inventoryManager, petManager, statsManager, gadgetManager); @@ -825,7 +825,7 @@ public class BonusManager extends MiniClientPlugin implements I if (entity.equals(_carlNpc.getEntity())) { updateDailyStreak(event.getPlayer()); - new BonusGui(_plugin, event.getPlayer(), this, _rewardManager, _facebookManager, _youtubeManager, _boosterManager).openInventory(); + new BonusGui(_plugin, event.getPlayer(), this, _rewardManager, _facebookManager, _youtubeManager, _thankManager).openInventory(); } } @@ -841,7 +841,7 @@ public class BonusManager extends MiniClientPlugin implements I if (event.getEntity().equals(_carlNpc.getEntity())) { updateDailyStreak(player); - new BonusGui(_plugin, player, this, _rewardManager, _facebookManager, _youtubeManager, _boosterManager).openInventory(); + new BonusGui(_plugin, player, this, _rewardManager, _facebookManager, _youtubeManager, _thankManager).openInventory(); } } } @@ -908,7 +908,7 @@ public class BonusManager extends MiniClientPlugin implements I if (canDaily(player)) availableRewards++; if (getPollManager().getNextPoll(_pollManager.Get(player), _clientManager.Get(player).GetRank()) != null) availableRewards++; if (!_facebookManager.hasRedeemed(player)) availableRewards++; - if (_boosterManager.getTipManager().Get(player).getTips() > 0) availableRewards++; + if (_thankManager.Get(player).getThankToClaim() > 0) availableRewards++; Hologram hologram; @@ -1194,8 +1194,9 @@ public class BonusManager extends MiniClientPlugin implements I return "SELECT * FROM bonus WHERE accountId = '" + accountId + "';"; } - public BoosterManager getBoosterManager() + public ThankManager getThankManager() { - return _boosterManager; + return _thankManager; } + } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/GuiCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/GuiCommand.java index 649f964e3..7ed6615fd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/GuiCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/GuiCommand.java @@ -1,6 +1,5 @@ package mineplex.core.bonuses.commands; -import mineplex.core.boosters.BoosterManager; import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; @@ -18,7 +17,7 @@ public class GuiCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - new BonusGui(Plugin.getPlugin(), caller, Plugin, Plugin.getRewardManager(), Plugin.getFacebookManager(), Plugin.getYoutubeManager(), Plugin.getBoosterManager()).openInventory(); + new BonusGui(Plugin.getPlugin(), caller, Plugin, Plugin.getRewardManager(), Plugin.getFacebookManager(), Plugin.getYoutubeManager(), Plugin.getThankManager()).openInventory(); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/BonusGui.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/BonusGui.java index a8fef8c82..d5beff79e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/BonusGui.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/BonusGui.java @@ -2,10 +2,10 @@ package mineplex.core.bonuses.gui; import mineplex.core.bonuses.BonusManager; import mineplex.core.bonuses.gui.buttons.*; -import mineplex.core.boosters.BoosterManager; import mineplex.core.facebook.FacebookManager; import mineplex.core.gui.SimpleGui; import mineplex.core.reward.RewardManager; +import mineplex.core.thank.ThankManager; import mineplex.core.youtube.YoutubeManager; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -15,7 +15,7 @@ public class BonusGui extends SimpleGui private BonusManager manager; - public BonusGui(Plugin plugin, Player player, BonusManager manager, RewardManager rewardManager, FacebookManager facebookManager, YoutubeManager youtubeManager, BoosterManager boosterManager) + public BonusGui(Plugin plugin, Player player, BonusManager manager, RewardManager rewardManager, FacebookManager facebookManager, YoutubeManager youtubeManager, ThankManager thankManager) { super(plugin, player, player.getName() + "'s Bonuses", 5 * 9); @@ -35,7 +35,7 @@ public class BonusGui extends SimpleGui setItem(23, new TwitterButton(player)); - setItem(25, new ClaimTipsButton(getPlugin(), player, this, manager, boosterManager)); + setItem(25, new ClaimTipsButton(getPlugin(), player, this, manager, thankManager)); setItem(31, new CarlSpinButton(getPlugin(), player, manager, rewardManager)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/ClaimTipsButton.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/ClaimTipsButton.java index e8a3d062d..e866c415b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/ClaimTipsButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/ClaimTipsButton.java @@ -1,7 +1,6 @@ package mineplex.core.bonuses.gui.buttons; import mineplex.core.bonuses.BonusManager; -import mineplex.core.boosters.BoosterManager; import mineplex.core.common.currency.GlobalCurrency; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -12,6 +11,7 @@ import mineplex.core.gui.pages.LoadingWindow; import mineplex.core.gui.pages.TimedMessageWindow; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.shop.item.ShopItem; +import mineplex.core.thank.ThankManager; import org.bukkit.*; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; @@ -31,12 +31,12 @@ public class ClaimTipsButton implements GuiItem, Listener private ItemRefresher _gui; private BonusManager _bonusManager; - private BoosterManager _boosterManager; + private ThankManager _thankManager; - public ClaimTipsButton(Plugin plugin, Player player, ItemRefresher gui, BonusManager bonusManager, BoosterManager boosterManager) + public ClaimTipsButton(Plugin plugin, Player player, ItemRefresher gui, BonusManager bonusManager, ThankManager thankManager) { _bonusManager = bonusManager; - _boosterManager = boosterManager; + _thankManager = thankManager; _player = player; _plugin = plugin; _gui = gui; @@ -62,8 +62,8 @@ public class ClaimTipsButton implements GuiItem, Listener _item = ItemStackFactory.Instance.CreateStack(Material.LAPIS_BLOCK, (byte)0, 1, ChatColor.BLUE + "Processing..."); refreshItem(); new LoadingWindow(getPlugin(), getPlayer(), 6*9); - _boosterManager.getTipManager().claimTips(getPlayer(), claimed -> { - if (claimed > 0) + _thankManager.claimThanks(getPlayer(), claimThankResult -> { + if (claimThankResult != null && claimThankResult.getClaimed() > 0) { // Woo, success! setItem(); @@ -73,17 +73,17 @@ public class ClaimTipsButton implements GuiItem, Listener new TimedMessageWindow(getPlugin(), getPlayer(), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS_PANE, DyeColor.LIME.getData(), 1, ChatColor.GREEN + "Amplifier Thanks Collected"), "Thanks Collected", 6*9, 20*3, getGui()).openInventory(); } - UtilPlayer.message(getPlayer(), F.main("Carl", "You collected " + F.currency(GlobalCurrency.TREASURE_SHARD, claimed) + " from Amplifiers!")); + UtilPlayer.message(getPlayer(), F.main("Carl", "You collected " + F.currency(GlobalCurrency.TREASURE_SHARD, claimThankResult.getClaimed()) + " from " + F.elem(claimThankResult.getUniqueThanks()) + " players!")); // Pending explosions are strange.. Not sure why we are using strings. Either way, lets display a rank reward effect _bonusManager.addPendingExplosion(getPlayer(), "RANK"); getPlayer().playSound(getPlayer().getLocation(), Sound.NOTE_PLING, 1, 1.6f); } - else if (claimed == 0) + else if (claimThankResult != null && claimThankResult.getClaimed() == 0) { // No tips to claim if (getPlayer().getOpenInventory() != null) { - new TimedMessageWindow(getPlugin(), getPlayer(), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS_PANE, DyeColor.RED.getData(), 1, ChatColor.RED + "No Thanks to Claim!"), "You have no thanks to claim!", 6*9, 20*3, getGui()).openInventory(); + new TimedMessageWindow(getPlugin(), getPlayer(), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS_PANE, DyeColor.RED.getData(), 1, ChatColor.RED + "No Thanks to Claim!"), "You have no thank to claim!", 6*9, 20*3, getGui()).openInventory(); } UtilPlayer.message(getPlayer(), F.main("Carl", "You have no rewards to claim!")); @@ -119,7 +119,7 @@ public class ClaimTipsButton implements GuiItem, Listener if (isAvailable()) { material = Material.EMERALD; - itemName = C.cGreen + C.Bold + "Game Amplifiers"; + itemName = C.cGreen + C.Bold + "Thank Rewards"; lore.add(" "); lore.add(C.cYellow + "Your Rewards"); lore.add(" " + C.cWhite + getTips() + " Treasure Shards"); @@ -129,10 +129,11 @@ public class ClaimTipsButton implements GuiItem, Listener else { material = Material.REDSTONE_BLOCK; - itemName = C.cRed + C.Bold + "Game Amplifiers"; + itemName = C.cRed + C.Bold + "Thank Rewards"; lore.add(" "); - lore.add(C.cGray + "Use Amplifiers to earn rewards"); + lore.add(C.cGray + "Earn Thank Rewards from players using /thank"); + lore.add(C.cGray + "on you, or by enabling Game Amplifiers."); lore.add(" "); lore.add(C.cWhite + "Get Amplifiers at " + C.cGreen + "mineplex.com/shop"); } @@ -153,7 +154,7 @@ public class ClaimTipsButton implements GuiItem, Listener private int getTips() { - return _boosterManager.getTipManager().Get(getPlayer()).getTips(); + return _thankManager.Get(_player).getThankToClaim(); } private boolean isAvailable() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterManager.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterManager.java index 4254f6594..eec3e3c22 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterManager.java @@ -1,6 +1,5 @@ package mineplex.core.boosters; -import com.mojang.authlib.properties.PropertyMap; import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.boosters.command.BoosterCommand; @@ -10,7 +9,7 @@ import mineplex.core.boosters.event.BoosterItemGiveEvent; import mineplex.core.boosters.event.BoosterUpdateEvent; import mineplex.core.boosters.gui.BoosterShop; import mineplex.core.boosters.redis.BoosterUpdateRepository; -import mineplex.core.boosters.tips.BoosterTipManager; +import mineplex.core.boosters.tips.BoosterThankManager; import mineplex.core.common.util.C; import mineplex.core.common.util.Callback; import mineplex.core.common.util.UtilGear; @@ -19,12 +18,12 @@ import mineplex.core.common.util.UtilServer; import mineplex.core.donation.DonationManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.thank.ThankManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; @@ -64,8 +63,8 @@ public class BoosterManager extends MiniPlugin private CoreClientManager _clientManager; private DonationManager _donationManager; private InventoryManager _inventoryManager; + private BoosterThankManager _boosterThankManager; - private BoosterTipManager _tipManager; private BoosterShop _shop; private String _boosterGroup; @@ -74,7 +73,7 @@ public class BoosterManager extends MiniPlugin private long _cacheLastUpdated; private Map> _boosterCache = new HashMap<>(); - public BoosterManager(JavaPlugin plugin, String boosterGroup, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager) + public BoosterManager(JavaPlugin plugin, String boosterGroup, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, ThankManager thankManager) { super("Booster Manager", plugin); @@ -84,7 +83,7 @@ public class BoosterManager extends MiniPlugin _donationManager = donationManager; _inventoryManager = inventoryManager; - _tipManager = new BoosterTipManager(plugin, clientManager, donationManager); + _boosterThankManager = new BoosterThankManager(plugin, clientManager, thankManager); _shop = new BoosterShop(this, clientManager, donationManager); try @@ -335,9 +334,9 @@ public class BoosterManager extends MiniPlugin handleBoosterUpdate(event.getBoosterMap()); } - public BoosterTipManager getTipManager() + public BoosterThankManager getBoosterThankManager() { - return _tipManager; + return _boosterThankManager; } /** diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java index 0670ce643..b6a379fc0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java @@ -2,7 +2,7 @@ package mineplex.core.boosters.command; import mineplex.core.boosters.Booster; import mineplex.core.boosters.BoosterManager; -import mineplex.core.boosters.tips.BoosterTipManager; +import mineplex.core.boosters.tips.BoosterThankManager; import mineplex.core.boosters.tips.TipAddResult; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; @@ -56,12 +56,12 @@ public class ThankCommand extends CommandBase } else { - Plugin.getTipManager().addTip(caller, booster, result -> + Plugin.getBoosterThankManager().addTip(caller, booster, result -> { if (result == TipAddResult.SUCCESS) { - UtilPlayer.message(caller, F.main("Tip", "You thanked " + F.name(booster.getPlayerName()) + ". They earned " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterTipManager.TIP_FOR_SPONSOR) + " and you got " - + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterTipManager.TIP_FOR_TIPPER)) + " in return!"); + UtilPlayer.message(caller, F.main("Tip", "You thanked " + F.name(booster.getPlayerName()) + ". They earned " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_SPONSOR) + " and you got " + + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_TIPPER)) + " in return!"); caller.playSound(caller.getLocation(), Sound.LEVEL_UP, 1f, 1f); } else if (result.getFriendlyMessage() != null) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankManager.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankManager.java new file mode 100644 index 000000000..c3ae99372 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankManager.java @@ -0,0 +1,93 @@ +package mineplex.core.boosters.tips; + +import mineplex.core.MiniPlugin; +import mineplex.core.account.CoreClientManager; +import mineplex.core.boosters.Booster; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.recharge.Recharge; +import mineplex.core.thank.ThankManager; +import mineplex.core.thank.ThankResult; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +/** + * This class handles "thanking" Amplifiers. This is a way of rewarding players for activating Amplifiers. + * + * @author Shaun Bennett + */ +public class BoosterThankManager extends MiniPlugin +{ + public static final int TIP_FOR_SPONSOR = 5; + public static final int TIP_FOR_TIPPER = 5; + + private BoosterThankRepository _repository; + private CoreClientManager _clientManager; + private ThankManager _thankManager; + + public BoosterThankManager(JavaPlugin plugin, CoreClientManager clientManager, ThankManager thankManager) + { + super("Amplifier Thanks", plugin); + + _clientManager = clientManager; + _repository = new BoosterThankRepository(plugin); + _thankManager = thankManager; + } + + /** + * Attempt to "Thank" an Amplifier. This checks with {@link BoosterThankRepository} if a player hasn't already + * thanked that Amplifier. If they havent, we proceed to use {@link ThankManager} to send a thank you to the player + * who activated that Amplifier. + * + * @param player The player sending the thanks + * @param booster The Amplifier to be thanked + * @param callback Callback with the result of sending the thanks + */ + public void addTip(Player player, Booster booster, Callback callback) + { + if (!Recharge.Instance.use(player, "Amplifier Thanks", 1000 * 5, false, false)) + { + UtilPlayer.message(player, F.main("Amplifier", "Please wait before trying that again")); + callback.run(TipAddResult.ON_COOLDOWN); + return; + } + + int accountId = _clientManager.getAccountId(player); + + // Break out if client manager has a bad account id + if (accountId == -1) + { + callback.run(TipAddResult.INVALID_ACCOUNT_ID); + return; + } + + // You can't tip yourself, silly! + if (accountId == booster.getAccountId()) + { + callback.run(TipAddResult.CANNOT_TIP_SELF); + return; + } + + runAsync(() -> + { + if (_repository.checkAmplifierThank(accountId, booster.getId())) + { + // We can thank that amplifier! + _thankManager.thankPlayer(booster.getPlayerName(), booster.getAccountId(), player.getName(), accountId, + TIP_FOR_SPONSOR, TIP_FOR_TIPPER, "Amplifier", true, thankResult -> + runSync(() -> callback.run(fromThankResult(thankResult)))); + } + else + { + runSync(() -> callback.run(TipAddResult.ALREADY_TIPPED_BOOSTER)); + } + }); + } + + + private TipAddResult fromThankResult(ThankResult result) + { + return result == ThankResult.SUCCESS ? TipAddResult.SUCCESS : TipAddResult.UNKNOWN_ERROR; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java new file mode 100644 index 000000000..8fd26265e --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java @@ -0,0 +1,52 @@ +package mineplex.core.boosters.tips; + +import mineplex.core.database.MinecraftRepository; +import mineplex.database.routines.AddTip; +import mineplex.database.routines.CheckAmplifierThank; +import mineplex.database.routines.ClaimTips; +import mineplex.serverdata.database.DBPool; +import mineplex.serverdata.database.RepositoryBase; +import mineplex.serverdata.database.column.ColumnInt; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +/** + * @author Shaun Bennett + */ +public class BoosterThankRepository extends MinecraftRepository +{ + public BoosterThankRepository(JavaPlugin plugin) + { + super(plugin, DBPool.getAccount()); + } + + /** + * Checks the database if an accountId is allowed to thank a specific Amplifier. + * This will return true and update the database if the thank is okay, or false + * if that account ID has already thanked that Amplifier ID. + * + * @param accountId Account ID of the player trying to thank the Amplifier + * @param amplifierId The ID of the Amplifier the player is trying to thank + * @return True if the account id can thank the amplifier id, false otherwise + */ + public boolean checkAmplifierThank(int accountId, int amplifierId) + { + CheckAmplifierThank checkAmplifierThank = new CheckAmplifierThank(); + checkAmplifierThank.setInAccountId(accountId); + checkAmplifierThank.setInAmplifierId(amplifierId); + checkAmplifierThank.execute(jooq().configuration()); + return checkAmplifierThank.getCanThank() == 1; + } + + @Override + protected void initialize() + { + + } + + @Override + protected void update() + { + + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java deleted file mode 100644 index ff31ce07e..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java +++ /dev/null @@ -1,133 +0,0 @@ -package mineplex.core.boosters.tips; - -import mineplex.core.MiniDbClientPlugin; -import mineplex.core.account.CoreClientManager; -import mineplex.core.boosters.Booster; -import mineplex.core.common.util.Callback; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.donation.DonationManager; -import mineplex.core.recharge.Recharge; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; - -import java.sql.ResultSet; -import java.sql.SQLException; - -/** - * @author Shaun Bennett - */ -public class BoosterTipManager extends MiniDbClientPlugin -{ - public static final int TIP_FOR_SPONSOR = 5; - public static final int TIP_FOR_TIPPER = 5; - - private BoosterTipRepository _repository; - private DonationManager _donationManager; - - public BoosterTipManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager) - { - super("Amplifier Thanks", plugin, clientManager); - - _donationManager = donationManager; - _repository = new BoosterTipRepository(plugin); - } - - public void addTip(Player player, Booster booster, Callback callback) - { - if (!Recharge.Instance.use(player, "Amplifier Thanks", 1000 * 5, false, false)) - { - UtilPlayer.message(player, F.main("Amplifier", "Please wait before trying that again")); - callback.run(TipAddResult.ON_COOLDOWN); - return; - } - - int accountId = ClientManager.getAccountId(player); - - // Break out if client manager has a bad account id - if (accountId == -1) - { - callback.run(TipAddResult.INVALID_ACCOUNT_ID); - return; - } - - // You can't tip yourself, silly! - if (accountId == booster.getAccountId()) - { - callback.run(TipAddResult.CANNOT_TIP_SELF); - return; - } - - runAsync(() -> { - TipAddResult result; - if (_repository.addTip(accountId, booster.getAccountId(), booster.getId(), TIP_FOR_SPONSOR)) - { - _donationManager.rewardCoinsUntilSuccess(null, "Tips", player.getName(), accountId, TIP_FOR_TIPPER); - result = TipAddResult.SUCCESS; - } - else - result = TipAddResult.ALREADY_TIPPED_BOOSTER; - - runSync(() -> callback.run(result)); - }); - } - - /** - * Claim all tips for a player and add those tips to their account (Treasure Shards) - * This will call a database routine that handles the tip process. - * - * The callback will return -1 on a failed attempt or 0 if there was no tips to claim - * @param player The player with tips to claim - * @param callback Callback returning the amount of tips claimed - */ - public void claimTips(Player player, Callback callback) - { - String playerName = player.getName(); - int accountId = ClientManager.getAccountId(player); - - if (accountId == -1) - { - // uh oh, invalid account id! - if (callback != null) callback.run(-1); - } - - runAsync(() -> { - int tips = _repository.claimTips(accountId); - runSync(() -> { - if (tips > 0) - { - _donationManager.rewardCoinsUntilSuccess(null, "Tips", playerName, accountId, tips); - } - - // Reset tips back to 0 - if (Get(player) != null) Get(player).setTips(0); - if (callback != null) callback.run(tips); - }); - }); - } - - @Override - public String getQuery(int accountId, String uuid, String name) - { - return "SELECT tips FROM Account.accountTip WHERE accountTip.accountId = " + accountId + ";"; - } - - @Override - protected PlayerTipData addPlayer(String player) - { - return new PlayerTipData(); - } - - @Override - public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException - { - PlayerTipData data = new PlayerTipData(); - - while (resultSet.next()) - { - data.setTips(resultSet.getInt(1)); - } - - Set(playerName, data); - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipRepository.java deleted file mode 100644 index 6ece1a5b2..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipRepository.java +++ /dev/null @@ -1,55 +0,0 @@ -package mineplex.core.boosters.tips; - -import mineplex.core.database.MinecraftRepository; -import mineplex.database.routines.AddTip; -import mineplex.database.routines.ClaimTips; -import mineplex.serverdata.database.DBPool; -import mineplex.serverdata.database.RepositoryBase; -import mineplex.serverdata.database.column.ColumnInt; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; - -/** - * @author Shaun Bennett - */ -public class BoosterTipRepository extends MinecraftRepository -{ - public static String LOG_TIP = "INSERT INTO Account.accountTipLogs (accountId, boosterId) VALUES (?, ?)"; - public static String ADD_TIP = "INSERT INTO Account.accountTip (accountId, tips) VALUES (?, ?) ON DUPLICATE KEY UPDATE tips = tips + ?"; - - public BoosterTipRepository(JavaPlugin plugin) - { - super(plugin, DBPool.getAccount()); - } - - public boolean addTip(int tipperId, int receiverId, int boosterId, int tipAmount) - { - AddTip addTip = new AddTip(); - addTip.setTipperAccountId(tipperId); - addTip.setBoosterAccountId(receiverId); - addTip.setBoosterId(boosterId); - addTip.setTipAmount(tipAmount); - addTip.execute(jooq().configuration()); - return addTip.getSuccess() == 1; - } - - public int claimTips(int accountId) - { - ClaimTips claimTips = new ClaimTips(); - claimTips.setAccountId_in(accountId); - claimTips.execute(jooq().configuration()); - return claimTips.getTipsClaimed(); - } - - @Override - protected void initialize() - { - - } - - @Override - protected void update() - { - - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java index 965a8e738..aa657b6e2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java @@ -7,6 +7,7 @@ public enum TipAddResult { ALREADY_TIPPED_BOOSTER("You have already thanked this Amplifier!"), INVALID_ACCOUNT_ID("Uh oh, something went wrong. Try relogging"), + UNKNOWN_ERROR("An error occurred. Try again later"), CANNOT_TIP_SELF("You can't thank yourself, silly!"), ON_COOLDOWN(null), SUCCESS(null); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java index effa0f484..c27c6a00a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java @@ -1,40 +1,5 @@ package mineplex.core.chat; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.nio.charset.Charset; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; -import java.util.function.Function; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import org.apache.commons.lang3.Validate; -import org.bukkit.block.Sign; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.block.SignChangeEvent; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.plugin.java.JavaPlugin; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; - import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; @@ -53,6 +18,39 @@ import mineplex.core.preferences.PreferencesManager; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import org.apache.commons.lang3.Validate; +import org.bukkit.block.Sign; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.SignChangeEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.plugin.java.JavaPlugin; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.JSONValue; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.nio.charset.Charset; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; +import java.util.function.Function; public class Chat extends MiniPlugin { @@ -69,7 +67,6 @@ public class Chat extends MiniPlugin private int _chatSlow = 0; private long _silenced = 0; - private boolean _threeSecondDelay = true; private List> _highPriorityFilters = new ArrayList<>(); private List> _lowPriorityFilters = new ArrayList<>(); @@ -349,15 +346,6 @@ public class Chat extends MiniPlugin event.setCancelled(true); return; } - else if (_threeSecondDelay && - _clientManager.Get(sender).GetRank() == Rank.ALL && - _achievements.getMineplexLevelNumber(sender, Rank.ALL) < 25 && - !Recharge.Instance.use(sender, "All Chat Message", 3000, false, false)) - { - UtilPlayer.message(sender, C.cYellow + "You can only chat once every 3 seconds to prevent spam."); - UtilPlayer.message(sender, C.cYellow + "Buy a Rank at " + C.cGreen + "www.mineplex.com/shop" + C.cYellow + " to remove this limit!"); - event.setCancelled(true); - } else if (!_clientManager.Get(sender).GetRank().has(Rank.MODERATOR) && !Recharge.Instance.use(sender, "Chat Message", 400, false, false)) { @@ -645,11 +633,6 @@ public class Chat extends MiniPlugin _playerLastMessage.remove(event.getPlayer().getUniqueId()); } - public void setThreeSecondDelay(boolean b) - { - _threeSecondDelay = b; - } - /** * If the function returns Boolean.TRUE then the message will be CANCELLED. */ diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java index b05477683..bfff39b40 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java @@ -17,6 +17,7 @@ import net.md_5.bungee.api.chat.ClickEvent.Action; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; +import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; @@ -124,6 +125,7 @@ public class PartyInviteManager inviteTo(player.getUniqueId(), sender, sender, serverFrom); Lang.INVITE_RECEIVED.send(player, sender); sendAcceptOrDeny(player, sender); + player.playSound(player.getLocation(), Sound.NOTE_PLING, 1.0F, 1.0F); } /** diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java index 4f1d01473..993fe1a5f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java @@ -139,12 +139,7 @@ public class PartyRedisManager case PLAYER_FIND_RESPONSE: UUID uuid = UUID.fromString(third); - BukkitTask task = TASKS.remove(second); - - if (task != null) - { - task.cancel(); - } + cancelTask(second); Player inviter = Bukkit.getPlayerExact(contents[3]); if (_plugin.getInviteManager().isInvitedTo(uuid, inviter.getName())) @@ -177,12 +172,7 @@ public class PartyRedisManager private void handleNotAccepting(String second, String[] contents) { - BukkitTask task = TASKS.remove(second); - - if (task != null) - { - task.cancel(); - } + cancelTask(second); Player inviter = Bukkit.getPlayerExact(contents[3]); inviter.sendMessage(F.main("Party", F.name(second) + " is not accepting invites at this time.")); @@ -190,13 +180,7 @@ public class PartyRedisManager private void handleAlreadyIn(String second, String[] contents) { - BukkitTask task = TASKS.remove(second); - - if (task != null) - { - task.cancel(); - } - + cancelTask(second); Player inviter = Bukkit.getPlayerExact(contents[3]); Lang.ALREADY_IN.send(inviter, second); } @@ -215,6 +199,11 @@ public class PartyRedisManager @Override public void run() { + if(!TASKS.containsKey(player)) + { + cancel(); + return; + } TASKS.remove(player); Player senderPlayer = Bukkit.getPlayerExact(sender); if (senderPlayer == null) @@ -293,4 +282,14 @@ public class PartyRedisManager { return FIND_PLAYERS_CHANNEL; } + + public void cancelTask(String player) + { + BukkitTask task = TASKS.remove(player); + + if (task != null) + { + task.cancel(); + } + } } \ No newline at end of file diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java index 1b02de296..0e872a0c4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java @@ -9,6 +9,7 @@ import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilTabTitle; +import mineplex.core.party.Lang; import mineplex.core.party.Party; import mineplex.core.party.event.PartySendToServerEvent; import mineplex.core.portal.Commands.SendCommand; @@ -101,6 +102,11 @@ public class Portal extends MiniPlugin if (event.getParty() != null && override) { Party party = event.getParty(); + if(!party.getOwner().equalsIgnoreCase(player.getName())) + { + Lang.NOT_OWNER_SERVER.send(player); + return; + } sendParty(party); return; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/thank/ClaimThankResult.java b/Plugins/Mineplex.Core/src/mineplex/core/thank/ClaimThankResult.java new file mode 100644 index 000000000..c57c977da --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/thank/ClaimThankResult.java @@ -0,0 +1,26 @@ +package mineplex.core.thank; + +/** + * @author Shaun Bennett + */ +public class ClaimThankResult +{ + private final int _claimed; + private final int _uniqueThanks; + + public ClaimThankResult(int claimed, int uniqueThanks) + { + _claimed = claimed; + _uniqueThanks = uniqueThanks; + } + + public int getClaimed() + { + return _claimed; + } + + public int getUniqueThanks() + { + return _uniqueThanks; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankData.java b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankData.java new file mode 100644 index 000000000..2a25ead78 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankData.java @@ -0,0 +1,24 @@ +package mineplex.core.thank; + +/** + * @author Shaun Bennett + */ +public class ThankData +{ + private int _thankToClaim; + + public ThankData(int thankToClaim) + { + _thankToClaim = thankToClaim; + } + + public int getThankToClaim() + { + return _thankToClaim; + } + + public void setThankToClaim(int thankToClaim) + { + _thankToClaim = thankToClaim; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankManager.java b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankManager.java new file mode 100644 index 000000000..e258f82bb --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankManager.java @@ -0,0 +1,194 @@ +package mineplex.core.thank; + +import mineplex.core.MiniDbClientPlugin; +import mineplex.core.account.CoreClientManager; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.donation.DonationManager; +import mineplex.core.recharge.Recharge; +import mineplex.core.thank.command.ThankCommand; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * This class handles /thank and amplifier thanks, along with allowing players to claim the rewards they earn + */ +public class ThankManager extends MiniDbClientPlugin +{ + public static final int DEFAULT_RECEIVER_REWARD = 5; + public static final int DEFAULT_SENDER_REWARD = 5; + + private DonationManager _donationManager; + + private ThankRepository _thankRepository; + + public ThankManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager) + { + super("Thanks", plugin, clientManager); + + _donationManager = donationManager; + + _thankRepository = new ThankRepository(plugin); + } + + @Override + public void addCommands() + { + addCommand(new ThankCommand(this)); + } + + /** + * Attempt to thank a player. This can be used to distribute rewards to players, give players rewards for using + * amplifiers, and allow players to thank anyone inside a game. + * + * @param receiver The player who is being thanked + * @param sender The player thanking receiver + * @param receiverReward The Treasure Shard reward for the receiver + * @param senderReward The Treasure Shard reward for the sender + * @param reason The reason that player is being thanked + * @param ignoreCooldown Should we ignore all thank cooldowns + * @param callback Callback for processing the result + */ + public void thankPlayer(Player receiver, Player sender, int receiverReward, int senderReward, String reason, boolean ignoreCooldown, Callback callback) + { + if (!Recharge.Instance.use(sender, "Thank Player", 1000 * 5, false, false)) + { + UtilPlayer.message(sender, F.main("Thank", "Please wait before trying that again")); + callback.run(ThankResult.COOLDOWN_RECHARGE); + return; + } + + int senderAccountId = ClientManager.getAccountId(sender); + int receiverAccountId = ClientManager.getAccountId(receiver); + thankPlayer(receiver.getName(), receiverAccountId, sender.getName(), senderAccountId, receiverReward, senderReward, reason, ignoreCooldown, result -> + { + if (result == ThankResult.SUCCESS) + { + // Reload their thank data if the player is online! + runAsync(() -> { + try + { + Set(receiver, _thankRepository.getThankData(receiverAccountId)); + } catch (SQLException e) + { + e.printStackTrace(); + } + }); + } + + callback.run(result); + }); + } + + /** + * Called when a player wants to "claim" all pending rewards that they haven't claimed yet + * + * @param player The player claiming their thank rewards + * @param callback Callback with the result of the claim + */ + public void claimThanks(Player player, Callback callback) + { + int accountId = ClientManager.getAccountId(player); + + if (accountId == -1) + { + callback.run(null); + return; + } + + runAsync(() -> { + try + { + ClaimThankResult result = _thankRepository.claimThank(accountId); + runSync(() -> { + if (result != null && result.getClaimed() > 0) Set(player, new ThankData(0)); + callback.run(result); + }); + } + catch (RuntimeException ex) + { + ex.printStackTrace(); + runSync(() -> callback.run(null)); + } + }); + } + + /** + * Attempt to thank a player. This can be used to distribute rewards to players, give players rewards for using + * amplifiers, and allow players to thank anyone inside a game. + * + * @param receiverName Name of the player being thanked + * @param receiverAccountId Account id of the player being thanked + * @param senderName Name of the player sending the thanks + * @param senderAccountId Account id of the player sending the thanks + * @param receiverReward The Treasure Shard reward for the receiver + * @param senderReward The Treasure Shard reward for the sender + * @param reason The reason that player is being thanked + * @param ignoreCooldown Should we ignore all thank cooldowns + * @param callback Callback for processing the result + */ + public void thankPlayer(String receiverName, int receiverAccountId, String senderName, int senderAccountId, int receiverReward, int senderReward, String reason, boolean ignoreCooldown, Callback callback) + { + // Break out on bad account id + if (senderAccountId == -1 || receiverAccountId == -1) + { + callback.run(ThankResult.INVALID_ACCOUNT_ID); + return; + } + + // You can't thank yourself, silly! + if (receiverAccountId == senderAccountId) + { + callback.run(ThankResult.CANNOT_THANK_SELF); + return; + } + + runAsync(() -> { + try + { + boolean success = _thankRepository.thank(receiverAccountId, senderAccountId, receiverReward, reason, ignoreCooldown); + + runSync(() -> { + if (success) + { + _donationManager.rewardCoinsUntilSuccess(null, "Thank", receiverName, receiverAccountId, receiverReward); + _donationManager.rewardCoinsUntilSuccess(null, "Thank", senderName, senderAccountId, senderReward); + } + + callback.run(success ? ThankResult.SUCCESS : ThankResult.COOLDOWN_DATABASE); + }); + } + catch (RuntimeException ex) + { + ex.printStackTrace(); + runSync(() -> callback.run(ThankResult.DATABASE_ERROR)); + } + }); + } + + @Override + public String getQuery(int accountId, String uuid, String name) + { + return "SELECT SUM(thankAmount) FROM accountThankTransactions WHERE receiverId = " + accountId + " AND claimed = FALSE;"; + } + + @Override + public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException + { + if (resultSet.next()) + { + int thankToClaim = resultSet.getInt(1); + Set(playerName, new ThankData(thankToClaim)); + } + } + + @Override + protected ThankData addPlayer(String player) + { + return new ThankData(0); + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankRepository.java new file mode 100644 index 000000000..d426009fa --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankRepository.java @@ -0,0 +1,75 @@ +package mineplex.core.thank; + +import mineplex.core.database.MinecraftRepository; +import mineplex.database.routines.AddThank; +import mineplex.database.routines.ClaimThank; +import mineplex.serverdata.database.DBPool; +import mineplex.serverdata.database.ResultSetCallable; +import mineplex.serverdata.database.column.ColumnInt; +import org.bukkit.plugin.java.JavaPlugin; +import org.jooq.Configuration; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class ThankRepository extends MinecraftRepository +{ + private static final String GET_THANK_DATA = "SELECT SUM(thankAmount) FROM accountThankTransactions WHERE receiverId = ? AND claimed = FALSE"; + + public ThankRepository(JavaPlugin plugin) + { + super(plugin, DBPool.getAccount()); + } + + @Override + protected void initialize() + { + } + + @Override + protected void update() + { + + } + + public boolean thank(int receiverAccountId, int senderAccountId, int thankAmount, String reason, boolean ignoreCooldown) + { + AddThank addThank = new AddThank(); + addThank.setInReceiverAccountId(receiverAccountId); + addThank.setInSenderAccountId(senderAccountId); + addThank.setInThankAmount(thankAmount); + addThank.setInReason(reason); + addThank.setInIgnoreCooldown(ignoreCooldown ? (byte) 1 : 0); + + addThank.execute(jooq().configuration()); + return addThank.getSuccess() == 1; + } + + public ClaimThankResult claimThank(int accountId) + { + ClaimThank claimThank = new ClaimThank(); + claimThank.setInAccountId(accountId); + claimThank.execute(jooq().configuration()); + return new ClaimThankResult(claimThank.getAmountClaimed(), claimThank.getUniqueThank()); + } + + /** + * Get ThankData for an accountId. This is used to reload ThankData when a player is thanked on live servers + * @param accountId The account id of the player + * @return {@link ThankData} for that player + */ + public ThankData getThankData(int accountId) throws SQLException + { + ThankData thankData = new ThankData(0); + + executeQuery(GET_THANK_DATA, resultSet -> + { + if (resultSet != null && resultSet.next()) + { + thankData.setThankToClaim(resultSet.getInt(1)); + } + }, new ColumnInt("receiverId", accountId)); + + return thankData; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankResult.java b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankResult.java new file mode 100644 index 000000000..8b0c8e6c3 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/thank/ThankResult.java @@ -0,0 +1,14 @@ +package mineplex.core.thank; + +/** + * @author Shaun Bennett + */ +public enum ThankResult +{ + COOLDOWN_RECHARGE, + COOLDOWN_DATABASE, + SUCCESS, + INVALID_ACCOUNT_ID, + DATABASE_ERROR, + CANNOT_THANK_SELF +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/thank/command/ThankCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/thank/command/ThankCommand.java new file mode 100644 index 000000000..ac26750e1 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/thank/command/ThankCommand.java @@ -0,0 +1,74 @@ +package mineplex.core.thank.command; + +import mineplex.core.command.CommandBase; +import mineplex.core.common.Rank; +import mineplex.core.common.currency.GlobalCurrency; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.thank.ThankManager; +import mineplex.core.thank.ThankResult; +import org.bukkit.Sound; +import org.bukkit.entity.Player; + +/** + * @author Shaun Bennett + */ +public class ThankCommand extends CommandBase +{ + public ThankCommand(ThankManager plugin) + { + super(plugin, Rank.ALL, "thank"); + } + + @Override + public void Execute(Player caller, String[] args) + { + if (args.length != 1) + { + UtilPlayer.message(caller, F.main("Thank", "Usage: " + F.elem("/thank "))); + return; + } + + String playerName = args[0]; + Player player = UtilPlayer.searchOnline(caller, playerName, true); + if (player != null) + { + Plugin.thankPlayer(player, caller, ThankManager.DEFAULT_RECEIVER_REWARD, ThankManager.DEFAULT_SENDER_REWARD, + "ThankCommand", false, result -> + { + String message; + + switch (result) + { + case SUCCESS: + message = "You thanked " + F.name(player.getName()) + " and earned " + F.currency(GlobalCurrency.TREASURE_SHARD, ThankManager.DEFAULT_SENDER_REWARD) + "!"; + break; + case CANNOT_THANK_SELF: + message = "You cannot thank yourself!"; + break; + case COOLDOWN_DATABASE: + message = "You can only /thank once per day!"; + break; + case COOLDOWN_RECHARGE: + message = null; + break; + default: + message = "An error occurred. Try again later"; + } + + if (message != null) + { + UtilPlayer.message(caller, F.main("Thank", message)); + } + + if (result == ThankResult.SUCCESS && player.isOnline()) + { + UtilPlayer.message(player, F.main("Thank", F.name(caller.getName()) + " used " + F.elem("/thank") + " on you! +" + F.currency(GlobalCurrency.TREASURE_SHARD, ThankManager.DEFAULT_RECEIVER_REWARD) + "!")); + UtilPlayer.message(player, F.main("Thank", "You can claim your reward at " + F.name("Carl the Creeper"))); + player.playSound(player.getEyeLocation(), Sound.LEVEL_UP, 1f, 1.2f); + } + }); + } + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Account.java b/Plugins/Mineplex.Database/src/mineplex/database/Account.java index c9e7b6499..97cffe5a9 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Account.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Account.java @@ -16,7 +16,7 @@ package mineplex.database; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Account extends org.jooq.impl.SchemaImpl implements java.io.Serializable, java.lang.Cloneable { - private static final long serialVersionUID = -1965384171; + private static final long serialVersionUID = 1890093529; /** * The reference instance of Account @@ -39,6 +39,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.AccountAmplifierThank.accountAmplifierThank, mineplex.database.tables.AccountAuth.accountAuth, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, @@ -56,11 +57,14 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali mineplex.database.tables.Accounts.accounts, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountTasks.accountTasks, + mineplex.database.tables.AccountThank.accountThank, + mineplex.database.tables.AccountThankTransactions.accountThankTransactions, mineplex.database.tables.AccountTip.accountTip, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs, mineplex.database.tables.AccountTipLogs.accountTipLogs, mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountValentinesGift.accountValentinesGift, + mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode, mineplex.database.tables.ActiveTournaments.activeTournaments, mineplex.database.tables.BattlePets.battlePets, mineplex.database.tables.Bonus.bonus, @@ -68,13 +72,16 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali mineplex.database.tables.BotSpam.botSpam, mineplex.database.tables.Chatsnap.chatsnap, mineplex.database.tables.ClanAlliances.clanAlliances, + mineplex.database.tables.ClanBanners.clanBanners, mineplex.database.tables.ClanBans.clanBans, mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanMember.clanMember, mineplex.database.tables.ClanNameBlacklist.clanNameBlacklist, mineplex.database.tables.Clans.clans, mineplex.database.tables.ClanServer.clanServer, + mineplex.database.tables.ClansGold.clansGold, mineplex.database.tables.ClanShopItem.clanShopItem, + mineplex.database.tables.ClansNetherPortals.clansNetherPortals, mineplex.database.tables.ClansOutposts.clansOutposts, mineplex.database.tables.ClansPvpTimer.clansPvpTimer, mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons, @@ -95,13 +102,14 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali mineplex.database.tables.Items.items, mineplex.database.tables.Kitpreferences.kitpreferences, mineplex.database.tables.KitProgression.kitProgression, - mineplex.database.tables.Kit_progression.kit_progression, mineplex.database.tables.Mail.mail, mineplex.database.tables.Mailbox.mailbox, + mineplex.database.tables.NonPremiumJoinMessage.nonPremiumJoinMessage, mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Packages.packages, mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.Polls.polls, + mineplex.database.tables.PowerPlayClub.powerPlayClub, mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankedBans.rankedBans, mineplex.database.tables.ReportTickets.reportTickets, @@ -121,6 +129,8 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali mineplex.database.tables.TournamentLB.TournamentLB, mineplex.database.tables.Tournaments.tournaments, mineplex.database.tables.TournamentTeams.tournamentTeams, - mineplex.database.tables.Transactions.transactions); + mineplex.database.tables.Transactions.transactions, + mineplex.database.tables.Unicodereplacer.unicodereplacer, + mineplex.database.tables.Youtube.youtube); } } diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java index 84db331ea..3b8624355 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java @@ -35,6 +35,7 @@ public class Keys { public static final org.jooq.Identity IDENTITY_accountPurchases = Identities0.IDENTITY_accountPurchases; public static final org.jooq.Identity IDENTITY_accounts = Identities0.IDENTITY_accounts; public static final org.jooq.Identity IDENTITY_accountTasks = Identities0.IDENTITY_accountTasks; + public static final org.jooq.Identity IDENTITY_accountThankTransactions = Identities0.IDENTITY_accountThankTransactions; public static final org.jooq.Identity IDENTITY_accountTipClaimLogs = Identities0.IDENTITY_accountTipClaimLogs; public static final org.jooq.Identity IDENTITY_accountTransactions = Identities0.IDENTITY_accountTransactions; public static final org.jooq.Identity IDENTITY_battlePets = Identities0.IDENTITY_battlePets; @@ -48,6 +49,7 @@ public class Keys { public static final org.jooq.Identity IDENTITY_clans = Identities0.IDENTITY_clans; public static final org.jooq.Identity IDENTITY_clanServer = Identities0.IDENTITY_clanServer; public static final org.jooq.Identity IDENTITY_clanShopItem = Identities0.IDENTITY_clanShopItem; + public static final org.jooq.Identity IDENTITY_clansNetherPortals = Identities0.IDENTITY_clansNetherPortals; public static final org.jooq.Identity IDENTITY_clanTerritory = Identities0.IDENTITY_clanTerritory; public static final org.jooq.Identity IDENTITY_clanWar = Identities0.IDENTITY_clanWar; public static final org.jooq.Identity IDENTITY_customData = Identities0.IDENTITY_customData; @@ -76,11 +78,14 @@ public class Keys { public static final org.jooq.Identity IDENTITY_tournaments = Identities0.IDENTITY_tournaments; public static final org.jooq.Identity IDENTITY_tournamentTeams = Identities0.IDENTITY_tournamentTeams; public static final org.jooq.Identity IDENTITY_transactions = Identities0.IDENTITY_transactions; + public static final org.jooq.Identity IDENTITY_unicodereplacer = Identities0.IDENTITY_unicodereplacer; + public static final org.jooq.Identity IDENTITY_youtube = Identities0.IDENTITY_youtube; // ------------------------------------------------------------------------- // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- + public static final org.jooq.UniqueKey KEY_accountAmplifierThank_PRIMARY = UniqueKeys0.KEY_accountAmplifierThank_PRIMARY; public static final org.jooq.UniqueKey KEY_accountAuth_PRIMARY = UniqueKeys0.KEY_accountAuth_PRIMARY; 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; @@ -104,11 +109,14 @@ public class Keys { public static final org.jooq.UniqueKey KEY_accounts_uuidIndex = UniqueKeys0.KEY_accounts_uuidIndex; public static final org.jooq.UniqueKey KEY_accountStat_PRIMARY = UniqueKeys0.KEY_accountStat_PRIMARY; public static final org.jooq.UniqueKey KEY_accountTasks_PRIMARY = UniqueKeys0.KEY_accountTasks_PRIMARY; + public static final org.jooq.UniqueKey KEY_accountThank_PRIMARY = UniqueKeys0.KEY_accountThank_PRIMARY; + public static final org.jooq.UniqueKey KEY_accountThankTransactions_PRIMARY = UniqueKeys0.KEY_accountThankTransactions_PRIMARY; public static final org.jooq.UniqueKey KEY_accountTip_PRIMARY = UniqueKeys0.KEY_accountTip_PRIMARY; public static final org.jooq.UniqueKey KEY_accountTipClaimLogs_PRIMARY = UniqueKeys0.KEY_accountTipClaimLogs_PRIMARY; public static final org.jooq.UniqueKey KEY_accountTipLogs_PRIMARY = UniqueKeys0.KEY_accountTipLogs_PRIMARY; public static final org.jooq.UniqueKey KEY_accountTransactions_PRIMARY = UniqueKeys0.KEY_accountTransactions_PRIMARY; public static final org.jooq.UniqueKey KEY_accountValentinesGift_PRIMARY = UniqueKeys0.KEY_accountValentinesGift_PRIMARY; + public static final org.jooq.UniqueKey KEY_accountWebsiteLinkCode_PRIMARY = UniqueKeys0.KEY_accountWebsiteLinkCode_PRIMARY; public static final org.jooq.UniqueKey KEY_activeTournaments_PRIMARY = UniqueKeys0.KEY_activeTournaments_PRIMARY; public static final org.jooq.UniqueKey KEY_battlePets_PRIMARY = UniqueKeys0.KEY_battlePets_PRIMARY; public static final org.jooq.UniqueKey KEY_bonus_PRIMARY = UniqueKeys0.KEY_bonus_PRIMARY; @@ -117,6 +125,7 @@ public class Keys { public static final org.jooq.UniqueKey KEY_botSpam_unique_text = UniqueKeys0.KEY_botSpam_unique_text; public static final org.jooq.UniqueKey KEY_chatsnap_PRIMARY = UniqueKeys0.KEY_chatsnap_PRIMARY; public static final org.jooq.UniqueKey KEY_clanAlliances_PRIMARY = UniqueKeys0.KEY_clanAlliances_PRIMARY; + public static final org.jooq.UniqueKey KEY_clanBanners_PRIMARY = UniqueKeys0.KEY_clanBanners_PRIMARY; public static final org.jooq.UniqueKey KEY_clanBans_PRIMARY = UniqueKeys0.KEY_clanBans_PRIMARY; public static final org.jooq.UniqueKey KEY_clanEnemies_PRIMARY = UniqueKeys0.KEY_clanEnemies_PRIMARY; public static final org.jooq.UniqueKey KEY_clanEnemies_unique_clanId = UniqueKeys0.KEY_clanEnemies_unique_clanId; @@ -126,8 +135,10 @@ public class Keys { public static final org.jooq.UniqueKey KEY_clans_clanName = UniqueKeys0.KEY_clans_clanName; public static final org.jooq.UniqueKey KEY_clanServer_PRIMARY = UniqueKeys0.KEY_clanServer_PRIMARY; public static final org.jooq.UniqueKey KEY_clanServer_unique_serverName = UniqueKeys0.KEY_clanServer_unique_serverName; + public static final org.jooq.UniqueKey KEY_clansGold_PRIMARY = UniqueKeys0.KEY_clansGold_PRIMARY; public static final org.jooq.UniqueKey KEY_clanShopItem_PRIMARY = UniqueKeys0.KEY_clanShopItem_PRIMARY; public static final org.jooq.UniqueKey KEY_clanShopItem_shop_page_slot_UNIQUE = UniqueKeys0.KEY_clanShopItem_shop_page_slot_UNIQUE; + public static final org.jooq.UniqueKey KEY_clansNetherPortals_PRIMARY = UniqueKeys0.KEY_clansNetherPortals_PRIMARY; public static final org.jooq.UniqueKey KEY_clansOutposts_PRIMARY = UniqueKeys0.KEY_clansOutposts_PRIMARY; public static final org.jooq.UniqueKey KEY_clansPvpTimer_PRIMARY = UniqueKeys0.KEY_clansPvpTimer_PRIMARY; public static final org.jooq.UniqueKey KEY_clansSiegeWeapons_PRIMARY = UniqueKeys0.KEY_clansSiegeWeapons_PRIMARY; @@ -154,7 +165,6 @@ public class Keys { public static final org.jooq.UniqueKey KEY_items_name_UNIQUE = UniqueKeys0.KEY_items_name_UNIQUE; public static final org.jooq.UniqueKey KEY_items_uniqueNameCategoryIndex = UniqueKeys0.KEY_items_uniqueNameCategoryIndex; public static final org.jooq.UniqueKey KEY_kitProgression_PRIMARY = UniqueKeys0.KEY_kitProgression_PRIMARY; - public static final org.jooq.UniqueKey KEY_kit_progression_PRIMARY = UniqueKeys0.KEY_kit_progression_PRIMARY; public static final org.jooq.UniqueKey KEY_mail_PRIMARY = UniqueKeys0.KEY_mail_PRIMARY; public static final org.jooq.UniqueKey KEY_mailbox_PRIMARY = UniqueKeys0.KEY_mailbox_PRIMARY; public static final org.jooq.UniqueKey KEY_npcs_PRIMARY = UniqueKeys0.KEY_npcs_PRIMARY; @@ -162,6 +172,7 @@ public class Keys { public static final org.jooq.UniqueKey KEY_playerMap_PRIMARY = UniqueKeys0.KEY_playerMap_PRIMARY; 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_powerPlayClub_PRIMARY = UniqueKeys0.KEY_powerPlayClub_PRIMARY; public static final org.jooq.UniqueKey KEY_rankBenefits_PRIMARY = UniqueKeys0.KEY_rankBenefits_PRIMARY; public static final org.jooq.UniqueKey KEY_rankedBans_PRIMARY = UniqueKeys0.KEY_rankedBans_PRIMARY; public static final org.jooq.UniqueKey KEY_reportTickets_PRIMARY = UniqueKeys0.KEY_reportTickets_PRIMARY; @@ -183,11 +194,15 @@ public class Keys { public static final org.jooq.UniqueKey KEY_tournaments_PRIMARY = UniqueKeys0.KEY_tournaments_PRIMARY; public static final org.jooq.UniqueKey KEY_tournamentTeams_PRIMARY = UniqueKeys0.KEY_tournamentTeams_PRIMARY; public static final org.jooq.UniqueKey KEY_transactions_PRIMARY = UniqueKeys0.KEY_transactions_PRIMARY; + public static final org.jooq.UniqueKey KEY_unicodereplacer_PRIMARY = UniqueKeys0.KEY_unicodereplacer_PRIMARY; + public static final org.jooq.UniqueKey KEY_unicodereplacer_unicode = UniqueKeys0.KEY_unicodereplacer_unicode; + public static final org.jooq.UniqueKey KEY_youtube_PRIMARY = UniqueKeys0.KEY_youtube_PRIMARY; // ------------------------------------------------------------------------- // FOREIGN KEY definitions // ------------------------------------------------------------------------- + public static final org.jooq.ForeignKey accountAmplifierThank_accounts_id_fk = ForeignKeys0.accountAmplifierThank_accounts_id_fk; public static final org.jooq.ForeignKey accountAuth_accounts_id_fk = ForeignKeys0.accountAuth_accounts_id_fk; public static final org.jooq.ForeignKey FK_ACT_ACCOUNTS_ID = ForeignKeys0.FK_ACT_ACCOUNTS_ID; public static final org.jooq.ForeignKey CUSTOMDATA_ACCOUNT = ForeignKeys0.CUSTOMDATA_ACCOUNT; @@ -208,6 +223,9 @@ public class Keys { public static final org.jooq.ForeignKey accountStat_stat = ForeignKeys0.accountStat_stat; public static final org.jooq.ForeignKey ACCOUNTTASKS_ACCOUNTID = ForeignKeys0.ACCOUNTTASKS_ACCOUNTID; public static final org.jooq.ForeignKey ACCOUNTTASKS_TASKID = ForeignKeys0.ACCOUNTTASKS_TASKID; + public static final org.jooq.ForeignKey accountThank_accounts_id_fk = ForeignKeys0.accountThank_accounts_id_fk; + public static final org.jooq.ForeignKey accountThankTransactions_accounts_id_fk2 = ForeignKeys0.accountThankTransactions_accounts_id_fk2; + public static final org.jooq.ForeignKey accountThankTransactions_accounts_id_fk = ForeignKeys0.accountThankTransactions_accounts_id_fk; public static final org.jooq.ForeignKey accountTips_accounts_id_fk = ForeignKeys0.accountTips_accounts_id_fk; public static final org.jooq.ForeignKey accountTipClaimLogs_accounts_id_fk = ForeignKeys0.accountTipClaimLogs_accounts_id_fk; public static final org.jooq.ForeignKey accountTipLogs_accounts_id_fk = ForeignKeys0.accountTipLogs_accounts_id_fk; @@ -215,18 +233,23 @@ public class Keys { public static final org.jooq.ForeignKey ACCOUNTTRANSACTIONS_TRANSACTIONID = ForeignKeys0.ACCOUNTTRANSACTIONS_TRANSACTIONID; public static final org.jooq.ForeignKey accountValentines_sender_fk = ForeignKeys0.accountValentines_sender_fk; public static final org.jooq.ForeignKey accountValentines_target_fk = ForeignKeys0.accountValentines_target_fk; + public static final org.jooq.ForeignKey accountWebsiteLinkCode_ibfk_1 = ForeignKeys0.accountWebsiteLinkCode_ibfk_1; public static final org.jooq.ForeignKey bonus_ibfk_1 = ForeignKeys0.bonus_ibfk_1; public static final org.jooq.ForeignKey bonusLogAccountId = ForeignKeys0.bonusLogAccountId; public static final org.jooq.ForeignKey bonusLogItemId = ForeignKeys0.bonusLogItemId; + public static final org.jooq.ForeignKey clansGold_ibfk_1 = ForeignKeys0.clansGold_ibfk_1; + public static final org.jooq.ForeignKey clansGold_ibfk_2 = ForeignKeys0.clansGold_ibfk_2; public static final org.jooq.ForeignKey ELORATING_ACCOUNTID = ForeignKeys0.ELORATING_ACCOUNTID; public static final org.jooq.ForeignKey facebook_accounts_id_fk = ForeignKeys0.facebook_accounts_id_fk; public static final org.jooq.ForeignKey gadgets_ibfk_1 = ForeignKeys0.gadgets_ibfk_1; public static final org.jooq.ForeignKey mail_ibfk_1 = ForeignKeys0.mail_ibfk_1; public static final org.jooq.ForeignKey mailbox_ibfk_1 = ForeignKeys0.mailbox_ibfk_1; + public static final org.jooq.ForeignKey powerPlayClub_ibfk_1 = ForeignKeys0.powerPlayClub_ibfk_1; public static final org.jooq.ForeignKey rankBenefits_ibfk_1 = ForeignKeys0.rankBenefits_ibfk_1; public static final org.jooq.ForeignKey titanGiveaway_ibfk_1 = ForeignKeys0.titanGiveaway_ibfk_1; public static final org.jooq.ForeignKey TEAM_TOURNAMENT_KEY = ForeignKeys0.TEAM_TOURNAMENT_KEY; public static final org.jooq.ForeignKey TEAM_TOURNAMENT_ACCOUNT_ID = ForeignKeys0.TEAM_TOURNAMENT_ACCOUNT_ID; + public static final org.jooq.ForeignKey youtube_ibfk_1 = ForeignKeys0.youtube_ibfk_1; // ------------------------------------------------------------------------- // [#1459] distribute members to avoid static initialisers > 64kb @@ -247,6 +270,7 @@ public class Keys { public static org.jooq.Identity IDENTITY_accountPurchases = createIdentity(mineplex.database.tables.AccountPurchases.accountPurchases, mineplex.database.tables.AccountPurchases.accountPurchases.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_accountTasks = createIdentity(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id); + public static org.jooq.Identity IDENTITY_accountThankTransactions = createIdentity(mineplex.database.tables.AccountThankTransactions.accountThankTransactions, mineplex.database.tables.AccountThankTransactions.accountThankTransactions.id); public static org.jooq.Identity IDENTITY_accountTipClaimLogs = createIdentity(mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs.id); public static org.jooq.Identity IDENTITY_accountTransactions = createIdentity(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id); public static org.jooq.Identity IDENTITY_battlePets = createIdentity(mineplex.database.tables.BattlePets.battlePets, mineplex.database.tables.BattlePets.battlePets.petId); @@ -260,6 +284,7 @@ public class Keys { 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_clanServer = createIdentity(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id); public static org.jooq.Identity IDENTITY_clanShopItem = createIdentity(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.id); + public static org.jooq.Identity IDENTITY_clansNetherPortals = createIdentity(mineplex.database.tables.ClansNetherPortals.clansNetherPortals, mineplex.database.tables.ClansNetherPortals.clansNetherPortals.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_clanWar = createIdentity(mineplex.database.tables.ClanWar.clanWar, mineplex.database.tables.ClanWar.clanWar.id); public static org.jooq.Identity IDENTITY_customData = createIdentity(mineplex.database.tables.CustomData.customData, mineplex.database.tables.CustomData.customData.id); @@ -288,9 +313,12 @@ public class Keys { public static org.jooq.Identity IDENTITY_tournaments = createIdentity(mineplex.database.tables.Tournaments.tournaments, mineplex.database.tables.Tournaments.tournaments.id); public static org.jooq.Identity IDENTITY_tournamentTeams = createIdentity(mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.id); public static org.jooq.Identity IDENTITY_transactions = createIdentity(mineplex.database.tables.Transactions.transactions, mineplex.database.tables.Transactions.transactions.id); + public static org.jooq.Identity IDENTITY_unicodereplacer = createIdentity(mineplex.database.tables.Unicodereplacer.unicodereplacer, mineplex.database.tables.Unicodereplacer.unicodereplacer.id); + public static org.jooq.Identity IDENTITY_youtube = createIdentity(mineplex.database.tables.Youtube.youtube, mineplex.database.tables.Youtube.youtube.accountId); } private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys { + public static final org.jooq.UniqueKey KEY_accountAmplifierThank_PRIMARY = createUniqueKey(mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank, mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank.accountId, mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank.amplifierId); public static final org.jooq.UniqueKey KEY_accountAuth_PRIMARY = createUniqueKey(mineplex.database.tables.AccountAuth.accountAuth, mineplex.database.tables.AccountAuth.accountAuth.id); 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); @@ -314,11 +342,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_accountStat_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId, mineplex.database.tables.AccountStat.accountStat.statId); public static final org.jooq.UniqueKey KEY_accountTasks_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id); + public static final org.jooq.UniqueKey KEY_accountThank_PRIMARY = createUniqueKey(mineplex.database.tables.AccountThank.accountThank, mineplex.database.tables.AccountThank.accountThank.accountId); + public static final org.jooq.UniqueKey KEY_accountThankTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountThankTransactions.accountThankTransactions, mineplex.database.tables.AccountThankTransactions.accountThankTransactions.id); public static final org.jooq.UniqueKey KEY_accountTip_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTip.accountTip, mineplex.database.tables.AccountTip.accountTip.accountId); public static final org.jooq.UniqueKey KEY_accountTipClaimLogs_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs.id); public static final org.jooq.UniqueKey KEY_accountTipLogs_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTipLogs.accountTipLogs, mineplex.database.tables.AccountTipLogs.accountTipLogs.accountId, mineplex.database.tables.AccountTipLogs.accountTipLogs.boosterId); public static final org.jooq.UniqueKey KEY_accountTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id); public static final org.jooq.UniqueKey KEY_accountValentinesGift_PRIMARY = createUniqueKey(mineplex.database.tables.AccountValentinesGift.accountValentinesGift, mineplex.database.tables.AccountValentinesGift.accountValentinesGift.senderId, mineplex.database.tables.AccountValentinesGift.accountValentinesGift.targetId); + public static final org.jooq.UniqueKey KEY_accountWebsiteLinkCode_PRIMARY = createUniqueKey(mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode, mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode.accountId); public static final org.jooq.UniqueKey KEY_activeTournaments_PRIMARY = createUniqueKey(mineplex.database.tables.ActiveTournaments.activeTournaments, mineplex.database.tables.ActiveTournaments.activeTournaments.name); public static final org.jooq.UniqueKey KEY_battlePets_PRIMARY = createUniqueKey(mineplex.database.tables.BattlePets.battlePets, mineplex.database.tables.BattlePets.battlePets.petId); public static final org.jooq.UniqueKey KEY_bonus_PRIMARY = createUniqueKey(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId); @@ -327,6 +358,7 @@ public class Keys { public static final org.jooq.UniqueKey KEY_botSpam_unique_text = createUniqueKey(mineplex.database.tables.BotSpam.botSpam, mineplex.database.tables.BotSpam.botSpam.text); public static final org.jooq.UniqueKey KEY_chatsnap_PRIMARY = createUniqueKey(mineplex.database.tables.Chatsnap.chatsnap, mineplex.database.tables.Chatsnap.chatsnap.id); 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_clanBanners_PRIMARY = createUniqueKey(mineplex.database.tables.ClanBanners.clanBanners, mineplex.database.tables.ClanBanners.clanBanners.clanId); public static final org.jooq.UniqueKey KEY_clanBans_PRIMARY = createUniqueKey(mineplex.database.tables.ClanBans.clanBans, mineplex.database.tables.ClanBans.clanBans.id); public static final org.jooq.UniqueKey KEY_clanEnemies_PRIMARY = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id); public static final org.jooq.UniqueKey KEY_clanEnemies_unique_clanId = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.clanId); @@ -336,8 +368,10 @@ public class Keys { public static final org.jooq.UniqueKey KEY_clans_clanName = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.serverId, mineplex.database.tables.Clans.clans.name); public static final org.jooq.UniqueKey KEY_clanServer_PRIMARY = createUniqueKey(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id); public static final org.jooq.UniqueKey KEY_clanServer_unique_serverName = createUniqueKey(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.serverName); + public static final org.jooq.UniqueKey KEY_clansGold_PRIMARY = createUniqueKey(mineplex.database.tables.ClansGold.clansGold, mineplex.database.tables.ClansGold.clansGold.serverId, mineplex.database.tables.ClansGold.clansGold.id); public static final org.jooq.UniqueKey KEY_clanShopItem_PRIMARY = createUniqueKey(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.id); public static final org.jooq.UniqueKey KEY_clanShopItem_shop_page_slot_UNIQUE = createUniqueKey(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.shopName, mineplex.database.tables.ClanShopItem.clanShopItem.shopPage, mineplex.database.tables.ClanShopItem.clanShopItem.slot); + public static final org.jooq.UniqueKey KEY_clansNetherPortals_PRIMARY = createUniqueKey(mineplex.database.tables.ClansNetherPortals.clansNetherPortals, mineplex.database.tables.ClansNetherPortals.clansNetherPortals.id); public static final org.jooq.UniqueKey KEY_clansOutposts_PRIMARY = createUniqueKey(mineplex.database.tables.ClansOutposts.clansOutposts, mineplex.database.tables.ClansOutposts.clansOutposts.uniqueId); public static final org.jooq.UniqueKey KEY_clansPvpTimer_PRIMARY = createUniqueKey(mineplex.database.tables.ClansPvpTimer.clansPvpTimer, mineplex.database.tables.ClansPvpTimer.clansPvpTimer.accountId); public static final org.jooq.UniqueKey KEY_clansSiegeWeapons_PRIMARY = createUniqueKey(mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons, mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons.uniqueId); @@ -364,7 +398,6 @@ public class Keys { public static final org.jooq.UniqueKey KEY_items_name_UNIQUE = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name); public static final org.jooq.UniqueKey KEY_items_uniqueNameCategoryIndex = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name, mineplex.database.tables.Items.items.categoryId); public static final org.jooq.UniqueKey KEY_kitProgression_PRIMARY = createUniqueKey(mineplex.database.tables.KitProgression.kitProgression, mineplex.database.tables.KitProgression.kitProgression.uuid, mineplex.database.tables.KitProgression.kitProgression.kitId); - public static final org.jooq.UniqueKey KEY_kit_progression_PRIMARY = createUniqueKey(mineplex.database.tables.Kit_progression.kit_progression, mineplex.database.tables.Kit_progression.kit_progression.account_id, mineplex.database.tables.Kit_progression.kit_progression.kit_id); public static final org.jooq.UniqueKey KEY_mail_PRIMARY = createUniqueKey(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id); public static final org.jooq.UniqueKey KEY_mailbox_PRIMARY = createUniqueKey(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id); public static final org.jooq.UniqueKey KEY_npcs_PRIMARY = createUniqueKey(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id); @@ -372,6 +405,7 @@ public class Keys { public static final org.jooq.UniqueKey KEY_playerMap_PRIMARY = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id); 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_powerPlayClub_PRIMARY = createUniqueKey(mineplex.database.tables.PowerPlayClub.powerPlayClub, mineplex.database.tables.PowerPlayClub.powerPlayClub.accountId, mineplex.database.tables.PowerPlayClub.powerPlayClub.kvKey); 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_rankedBans_PRIMARY = createUniqueKey(mineplex.database.tables.RankedBans.rankedBans, mineplex.database.tables.RankedBans.rankedBans.accountId); public static final org.jooq.UniqueKey KEY_reportTickets_PRIMARY = createUniqueKey(mineplex.database.tables.ReportTickets.reportTickets, mineplex.database.tables.ReportTickets.reportTickets.reportId); @@ -393,9 +427,13 @@ public class Keys { public static final org.jooq.UniqueKey KEY_tournaments_PRIMARY = createUniqueKey(mineplex.database.tables.Tournaments.tournaments, mineplex.database.tables.Tournaments.tournaments.id); public static final org.jooq.UniqueKey KEY_tournamentTeams_PRIMARY = createUniqueKey(mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.id); public static final org.jooq.UniqueKey KEY_transactions_PRIMARY = createUniqueKey(mineplex.database.tables.Transactions.transactions, mineplex.database.tables.Transactions.transactions.id); + public static final org.jooq.UniqueKey KEY_unicodereplacer_PRIMARY = createUniqueKey(mineplex.database.tables.Unicodereplacer.unicodereplacer, mineplex.database.tables.Unicodereplacer.unicodereplacer.id); + public static final org.jooq.UniqueKey KEY_unicodereplacer_unicode = createUniqueKey(mineplex.database.tables.Unicodereplacer.unicodereplacer, mineplex.database.tables.Unicodereplacer.unicodereplacer.unicode); + public static final org.jooq.UniqueKey KEY_youtube_PRIMARY = createUniqueKey(mineplex.database.tables.Youtube.youtube, mineplex.database.tables.Youtube.youtube.accountId); } private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys { + public static final org.jooq.ForeignKey accountAmplifierThank_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank, mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank.accountId); public static final org.jooq.ForeignKey accountAuth_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountAuth.accountAuth, mineplex.database.tables.AccountAuth.accountAuth.accountId); public static final org.jooq.ForeignKey FK_ACT_ACCOUNTS_ID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accountId); public static final org.jooq.ForeignKey CUSTOMDATA_ACCOUNT = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountCustomData.accountCustomData, mineplex.database.tables.AccountCustomData.accountCustomData.accountId); @@ -416,6 +454,9 @@ public class Keys { public static final org.jooq.ForeignKey accountStat_stat = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.statId); public static final org.jooq.ForeignKey ACCOUNTTASKS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.accountId); public static final org.jooq.ForeignKey ACCOUNTTASKS_TASKID = createForeignKey(mineplex.database.Keys.KEY_tasks_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.taskId); + public static final org.jooq.ForeignKey accountThank_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountThank.accountThank, mineplex.database.tables.AccountThank.accountThank.accountId); + public static final org.jooq.ForeignKey accountThankTransactions_accounts_id_fk2 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountThankTransactions.accountThankTransactions, mineplex.database.tables.AccountThankTransactions.accountThankTransactions.receiverId); + public static final org.jooq.ForeignKey accountThankTransactions_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountThankTransactions.accountThankTransactions, mineplex.database.tables.AccountThankTransactions.accountThankTransactions.senderId); public static final org.jooq.ForeignKey accountTips_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTip.accountTip, mineplex.database.tables.AccountTip.accountTip.accountId); public static final org.jooq.ForeignKey accountTipClaimLogs_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs.accountId); public static final org.jooq.ForeignKey accountTipLogs_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTipLogs.accountTipLogs, mineplex.database.tables.AccountTipLogs.accountTipLogs.accountId); @@ -423,17 +464,22 @@ public class Keys { public static final org.jooq.ForeignKey ACCOUNTTRANSACTIONS_TRANSACTIONID = createForeignKey(mineplex.database.Keys.KEY_transactions_PRIMARY, mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.transactionId); public static final org.jooq.ForeignKey accountValentines_sender_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountValentinesGift.accountValentinesGift, mineplex.database.tables.AccountValentinesGift.accountValentinesGift.senderId); public static final org.jooq.ForeignKey accountValentines_target_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountValentinesGift.accountValentinesGift, mineplex.database.tables.AccountValentinesGift.accountValentinesGift.targetId); + public static final org.jooq.ForeignKey accountWebsiteLinkCode_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode, mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode.accountId); public static final org.jooq.ForeignKey bonus_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId); public static final org.jooq.ForeignKey bonusLogAccountId = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.BonusLog.bonusLog, mineplex.database.tables.BonusLog.bonusLog.accountId); public static final org.jooq.ForeignKey bonusLogItemId = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.BonusLog.bonusLog, mineplex.database.tables.BonusLog.bonusLog.itemId); + public static final org.jooq.ForeignKey clansGold_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.ClansGold.clansGold, mineplex.database.tables.ClansGold.clansGold.serverId); + public static final org.jooq.ForeignKey clansGold_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.ClansGold.clansGold, mineplex.database.tables.ClansGold.clansGold.id); public static final org.jooq.ForeignKey ELORATING_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.accountId); public static final org.jooq.ForeignKey facebook_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Facebook.facebook, mineplex.database.tables.Facebook.facebook.accountId); public static final org.jooq.ForeignKey gadgets_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Gadgets.gadgets, mineplex.database.tables.Gadgets.gadgets.accountId); 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 mailbox_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.accountId); + public static final org.jooq.ForeignKey powerPlayClub_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.PowerPlayClub.powerPlayClub, mineplex.database.tables.PowerPlayClub.powerPlayClub.accountId); public static final org.jooq.ForeignKey rankBenefits_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.accountId); public static final org.jooq.ForeignKey titanGiveaway_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.TitanGiveaway.titanGiveaway, mineplex.database.tables.TitanGiveaway.titanGiveaway.accountId); public static final org.jooq.ForeignKey TEAM_TOURNAMENT_KEY = createForeignKey(mineplex.database.Keys.KEY_tournaments_PRIMARY, mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.tournamentId); public static final org.jooq.ForeignKey TEAM_TOURNAMENT_ACCOUNT_ID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.accountId); + public static final org.jooq.ForeignKey youtube_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Youtube.youtube, mineplex.database.tables.Youtube.youtube.accountId); } } diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Routines.java b/Plugins/Mineplex.Database/src/mineplex/database/Routines.java index af540cee5..e4d6ad2b1 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Routines.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Routines.java @@ -28,6 +28,21 @@ public class Routines { return p.getSuccess(); } + /** + * Call Account.addThank + */ + public static java.lang.Byte callAddthank(org.jooq.Configuration configuration, java.lang.Integer inReceiverAccountId, java.lang.Integer inSenderAccountId, java.lang.Integer inThankAmount, java.lang.String inReason, java.lang.Byte inIgnoreCooldown) { + mineplex.database.routines.AddThank p = new mineplex.database.routines.AddThank(); + p.setInReceiverAccountId(inReceiverAccountId); + p.setInSenderAccountId(inSenderAccountId); + p.setInThankAmount(inThankAmount); + p.setInReason(inReason); + p.setInIgnoreCooldown(inIgnoreCooldown); + + p.execute(configuration); + return p.getSuccess(); + } + /** * Call Account.addTip */ @@ -42,6 +57,18 @@ public class Routines { return p.getSuccess(); } + /** + * Call Account.checkAmplifierThank + */ + public static java.lang.Byte callCheckamplifierthank(org.jooq.Configuration configuration, java.lang.Integer inAccountId, java.lang.Integer inAmplifierId) { + mineplex.database.routines.CheckAmplifierThank p = new mineplex.database.routines.CheckAmplifierThank(); + p.setInAccountId(inAccountId); + p.setInAmplifierId(inAmplifierId); + + p.execute(configuration); + return p.getCanThank(); + } + /** * Call Account.check_daily */ @@ -105,6 +132,17 @@ public class Routines { return p; } + /** + * Call Account.claimThank + */ + public static mineplex.database.routines.ClaimThank callClaimthank(org.jooq.Configuration configuration, java.lang.Integer inAccountId) { + mineplex.database.routines.ClaimThank p = new mineplex.database.routines.ClaimThank(); + p.setInAccountId(inAccountId); + + p.execute(configuration); + return p; + } + /** * Call Account.claimTips */ diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java index f4c26f567..c65a8a1c7 100644 --- a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java +++ b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java @@ -16,6 +16,11 @@ package mineplex.database; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { + /** + * The table Account.accountAmplifierThank + */ + public static final mineplex.database.tables.AccountAmplifierThank accountAmplifierThank = mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank; + /** * The table Account.accountAuth */ @@ -101,6 +106,16 @@ public class Tables { */ public static final mineplex.database.tables.AccountTasks accountTasks = mineplex.database.tables.AccountTasks.accountTasks; + /** + * The table Account.accountThank + */ + public static final mineplex.database.tables.AccountThank accountThank = mineplex.database.tables.AccountThank.accountThank; + + /** + * The table Account.accountThankTransactions + */ + public static final mineplex.database.tables.AccountThankTransactions accountThankTransactions = mineplex.database.tables.AccountThankTransactions.accountThankTransactions; + /** * The table Account.accountTip */ @@ -126,6 +141,11 @@ public class Tables { */ public static final mineplex.database.tables.AccountValentinesGift accountValentinesGift = mineplex.database.tables.AccountValentinesGift.accountValentinesGift; + /** + * The table Account.accountWebsiteLinkCode + */ + public static final mineplex.database.tables.AccountWebsiteLinkCode accountWebsiteLinkCode = mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode; + /** * The table Account.activeTournaments */ @@ -161,6 +181,11 @@ public class Tables { */ public static final mineplex.database.tables.ClanAlliances clanAlliances = mineplex.database.tables.ClanAlliances.clanAlliances; + /** + * The table Account.clanBanners + */ + public static final mineplex.database.tables.ClanBanners clanBanners = mineplex.database.tables.ClanBanners.clanBanners; + /** * The table Account.clanBans */ @@ -191,11 +216,21 @@ public class Tables { */ public static final mineplex.database.tables.ClanServer clanServer = mineplex.database.tables.ClanServer.clanServer; + /** + * The table Account.clansGold + */ + public static final mineplex.database.tables.ClansGold clansGold = mineplex.database.tables.ClansGold.clansGold; + /** * The table Account.clanShopItem */ public static final mineplex.database.tables.ClanShopItem clanShopItem = mineplex.database.tables.ClanShopItem.clanShopItem; + /** + * The table Account.clansNetherPortals + */ + public static final mineplex.database.tables.ClansNetherPortals clansNetherPortals = mineplex.database.tables.ClansNetherPortals.clansNetherPortals; + /** * The table Account.clansOutposts */ @@ -296,11 +331,6 @@ public class Tables { */ public static final mineplex.database.tables.KitProgression kitProgression = mineplex.database.tables.KitProgression.kitProgression; - /** - * The table Account.kit_progression - */ - public static final mineplex.database.tables.Kit_progression kit_progression = mineplex.database.tables.Kit_progression.kit_progression; - /** * The table Account.mail */ @@ -311,6 +341,11 @@ public class Tables { */ public static final mineplex.database.tables.Mailbox mailbox = mineplex.database.tables.Mailbox.mailbox; + /** + * The table Account.nonPremiumJoinMessage + */ + public static final mineplex.database.tables.NonPremiumJoinMessage nonPremiumJoinMessage = mineplex.database.tables.NonPremiumJoinMessage.nonPremiumJoinMessage; + /** * The table Account.npcs */ @@ -331,6 +366,11 @@ public class Tables { */ public static final mineplex.database.tables.Polls polls = mineplex.database.tables.Polls.polls; + /** + * The table Account.powerPlayClub + */ + public static final mineplex.database.tables.PowerPlayClub powerPlayClub = mineplex.database.tables.PowerPlayClub.powerPlayClub; + /** * The table Account.rankBenefits */ @@ -430,4 +470,14 @@ public class Tables { * The table Account.transactions */ public static final mineplex.database.tables.Transactions transactions = mineplex.database.tables.Transactions.transactions; + + /** + * The table Account.unicodereplacer + */ + public static final mineplex.database.tables.Unicodereplacer unicodereplacer = mineplex.database.tables.Unicodereplacer.unicodereplacer; + + /** + * The table Account.youtube + */ + public static final mineplex.database.tables.Youtube youtube = mineplex.database.tables.Youtube.youtube; } diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/AddThank.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/AddThank.java new file mode 100644 index 000000000..584e2c830 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/AddThank.java @@ -0,0 +1,106 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.routines; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AddThank extends org.jooq.impl.AbstractRoutine implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = -344701696; + + /** + * The parameter Account.addThank.inReceiverAccountId. + */ + public static final org.jooq.Parameter inReceiverAccountId = createParameter("inReceiverAccountId", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.addThank.inSenderAccountId. + */ + public static final org.jooq.Parameter inSenderAccountId = createParameter("inSenderAccountId", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.addThank.inThankAmount. + */ + public static final org.jooq.Parameter inThankAmount = createParameter("inThankAmount", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.addThank.inReason. + */ + public static final org.jooq.Parameter inReason = createParameter("inReason", org.jooq.impl.SQLDataType.VARCHAR.length(32), false); + + /** + * The parameter Account.addThank.inIgnoreCooldown. + */ + public static final org.jooq.Parameter inIgnoreCooldown = createParameter("inIgnoreCooldown", org.jooq.impl.SQLDataType.TINYINT, false); + + /** + * The parameter Account.addThank.success. + */ + public static final org.jooq.Parameter success = createParameter("success", org.jooq.impl.SQLDataType.TINYINT, false); + + /** + * Create a new routine call instance + */ + public AddThank() { + super("addThank", mineplex.database.Account.Account); + + addInParameter(inReceiverAccountId); + addInParameter(inSenderAccountId); + addInParameter(inThankAmount); + addInParameter(inReason); + addInParameter(inIgnoreCooldown); + addOutParameter(success); + } + + /** + * Set the inReceiverAccountId parameter IN value to the routine + */ + public void setInReceiverAccountId(java.lang.Integer value) { + setValue(mineplex.database.routines.AddThank.inReceiverAccountId, value); + } + + /** + * Set the inSenderAccountId parameter IN value to the routine + */ + public void setInSenderAccountId(java.lang.Integer value) { + setValue(mineplex.database.routines.AddThank.inSenderAccountId, value); + } + + /** + * Set the inThankAmount parameter IN value to the routine + */ + public void setInThankAmount(java.lang.Integer value) { + setValue(mineplex.database.routines.AddThank.inThankAmount, value); + } + + /** + * Set the inReason parameter IN value to the routine + */ + public void setInReason(java.lang.String value) { + setValue(mineplex.database.routines.AddThank.inReason, value); + } + + /** + * Set the inIgnoreCooldown parameter IN value to the routine + */ + public void setInIgnoreCooldown(java.lang.Byte value) { + setValue(mineplex.database.routines.AddThank.inIgnoreCooldown, value); + } + + /** + * Get the success parameter OUT value from the routine + */ + public java.lang.Byte getSuccess() { + return getValue(success); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/CheckAmplifierThank.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/CheckAmplifierThank.java new file mode 100644 index 000000000..2fd338361 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/CheckAmplifierThank.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.routines; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class CheckAmplifierThank extends org.jooq.impl.AbstractRoutine implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 522346006; + + /** + * The parameter Account.checkAmplifierThank.inAccountId. + */ + public static final org.jooq.Parameter inAccountId = createParameter("inAccountId", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.checkAmplifierThank.inAmplifierId. + */ + public static final org.jooq.Parameter inAmplifierId = createParameter("inAmplifierId", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.checkAmplifierThank.canThank. + */ + public static final org.jooq.Parameter canThank = createParameter("canThank", org.jooq.impl.SQLDataType.TINYINT, false); + + /** + * Create a new routine call instance + */ + public CheckAmplifierThank() { + super("checkAmplifierThank", mineplex.database.Account.Account); + + addInParameter(inAccountId); + addInParameter(inAmplifierId); + addOutParameter(canThank); + } + + /** + * Set the inAccountId parameter IN value to the routine + */ + public void setInAccountId(java.lang.Integer value) { + setValue(mineplex.database.routines.CheckAmplifierThank.inAccountId, value); + } + + /** + * Set the inAmplifierId parameter IN value to the routine + */ + public void setInAmplifierId(java.lang.Integer value) { + setValue(mineplex.database.routines.CheckAmplifierThank.inAmplifierId, value); + } + + /** + * Get the canThank parameter OUT value from the routine + */ + public java.lang.Byte getCanThank() { + return getValue(canThank); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/ClaimThank.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/ClaimThank.java new file mode 100644 index 000000000..d88ec80e7 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/ClaimThank.java @@ -0,0 +1,67 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.routines; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClaimThank extends org.jooq.impl.AbstractRoutine implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 856582355; + + /** + * The parameter Account.claimThank.inAccountId. + */ + public static final org.jooq.Parameter inAccountId = createParameter("inAccountId", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.claimThank.amountClaimed. + */ + public static final org.jooq.Parameter amountClaimed = createParameter("amountClaimed", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * The parameter Account.claimThank.uniqueThank. + */ + public static final org.jooq.Parameter uniqueThank = createParameter("uniqueThank", org.jooq.impl.SQLDataType.INTEGER, false); + + /** + * Create a new routine call instance + */ + public ClaimThank() { + super("claimThank", mineplex.database.Account.Account); + + addInParameter(inAccountId); + addOutParameter(amountClaimed); + addOutParameter(uniqueThank); + } + + /** + * Set the inAccountId parameter IN value to the routine + */ + public void setInAccountId(java.lang.Integer value) { + setValue(mineplex.database.routines.ClaimThank.inAccountId, value); + } + + /** + * Get the amountClaimed parameter OUT value from the routine + */ + public java.lang.Integer getAmountClaimed() { + return getValue(amountClaimed); + } + + /** + * Get the uniqueThank parameter OUT value from the routine + */ + public java.lang.Integer getUniqueThank() { + return getValue(uniqueThank); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountAmplifierThank.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountAmplifierThank.java new file mode 100644 index 000000000..5e3e7f0b5 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountAmplifierThank.java @@ -0,0 +1,109 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountAmplifierThank extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = -810649551; + + /** + * The reference instance of Account.accountAmplifierThank + */ + public static final mineplex.database.tables.AccountAmplifierThank accountAmplifierThank = new mineplex.database.tables.AccountAmplifierThank(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.AccountAmplifierThankRecord.class; + } + + /** + * The column Account.accountAmplifierThank.accountId. + */ + public final org.jooq.TableField accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountAmplifierThank.amplifierId. + */ + public final org.jooq.TableField amplifierId = createField("amplifierId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountAmplifierThank.time. + */ + public final org.jooq.TableField time = createField("time", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, ""); + + /** + * Create a Account.accountAmplifierThank table reference + */ + public AccountAmplifierThank() { + this("accountAmplifierThank", null); + } + + /** + * Create an aliased Account.accountAmplifierThank table reference + */ + public AccountAmplifierThank(java.lang.String alias) { + this(alias, mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank); + } + + private AccountAmplifierThank(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private AccountAmplifierThank(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.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_accountAmplifierThank_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountAmplifierThank_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.accountAmplifierThank_accounts_id_fk); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.AccountAmplifierThank as(java.lang.String alias) { + return new mineplex.database.tables.AccountAmplifierThank(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.AccountAmplifierThank rename(java.lang.String name) { + return new mineplex.database.tables.AccountAmplifierThank(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountThank.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountThank.java new file mode 100644 index 000000000..1ede4b1b3 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountThank.java @@ -0,0 +1,104 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountThank extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = -1744584483; + + /** + * The reference instance of Account.accountThank + */ + public static final mineplex.database.tables.AccountThank accountThank = new mineplex.database.tables.AccountThank(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.AccountThankRecord.class; + } + + /** + * The column Account.accountThank.accountId. + */ + public final org.jooq.TableField accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountThank.thanks. + */ + public final org.jooq.TableField thanks = createField("thanks", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, ""); + + /** + * Create a Account.accountThank table reference + */ + public AccountThank() { + this("accountThank", null); + } + + /** + * Create an aliased Account.accountThank table reference + */ + public AccountThank(java.lang.String alias) { + this(alias, mineplex.database.tables.AccountThank.accountThank); + } + + private AccountThank(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private AccountThank(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.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_accountThank_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountThank_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.accountThank_accounts_id_fk); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.AccountThank as(java.lang.String alias) { + return new mineplex.database.tables.AccountThank(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.AccountThank rename(java.lang.String name) { + return new mineplex.database.tables.AccountThank(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountThankTransactions.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountThankTransactions.java new file mode 100644 index 000000000..dafbe15d1 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountThankTransactions.java @@ -0,0 +1,147 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountThankTransactions extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 809892717; + + /** + * The reference instance of Account.accountThankTransactions + */ + public static final mineplex.database.tables.AccountThankTransactions accountThankTransactions = new mineplex.database.tables.AccountThankTransactions(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.AccountThankTransactionsRecord.class; + } + + /** + * The column Account.accountThankTransactions.id. + */ + public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountThankTransactions.receiverId. + */ + public final org.jooq.TableField receiverId = createField("receiverId", org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column Account.accountThankTransactions.senderId. + */ + public final org.jooq.TableField senderId = createField("senderId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountThankTransactions.thankAmount. + */ + public final org.jooq.TableField thankAmount = createField("thankAmount", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, ""); + + /** + * The column Account.accountThankTransactions.reason. + */ + public final org.jooq.TableField reason = createField("reason", org.jooq.impl.SQLDataType.VARCHAR.length(32), this, ""); + + /** + * The column Account.accountThankTransactions.ignoreCooldown. + */ + public final org.jooq.TableField ignoreCooldown = createField("ignoreCooldown", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, ""); + + /** + * The column Account.accountThankTransactions.claimed. + */ + public final org.jooq.TableField claimed = createField("claimed", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, ""); + + /** + * The column Account.accountThankTransactions.sentTime. + */ + public final org.jooq.TableField sentTime = createField("sentTime", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, ""); + + /** + * The column Account.accountThankTransactions.claimTime. + */ + public final org.jooq.TableField claimTime = createField("claimTime", org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); + + /** + * Create a Account.accountThankTransactions table reference + */ + public AccountThankTransactions() { + this("accountThankTransactions", null); + } + + /** + * Create an aliased Account.accountThankTransactions table reference + */ + public AccountThankTransactions(java.lang.String alias) { + this(alias, mineplex.database.tables.AccountThankTransactions.accountThankTransactions); + } + + private AccountThankTransactions(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private AccountThankTransactions(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_accountThankTransactions; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_accountThankTransactions_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountThankTransactions_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.accountThankTransactions_accounts_id_fk2, mineplex.database.Keys.accountThankTransactions_accounts_id_fk); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.AccountThankTransactions as(java.lang.String alias) { + return new mineplex.database.tables.AccountThankTransactions(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.AccountThankTransactions rename(java.lang.String name) { + return new mineplex.database.tables.AccountThankTransactions(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountWebsiteLinkCode.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountWebsiteLinkCode.java new file mode 100644 index 000000000..9afc65380 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountWebsiteLinkCode.java @@ -0,0 +1,109 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountWebsiteLinkCode extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 2114439433; + + /** + * The reference instance of Account.accountWebsiteLinkCode + */ + public static final mineplex.database.tables.AccountWebsiteLinkCode accountWebsiteLinkCode = new mineplex.database.tables.AccountWebsiteLinkCode(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.AccountWebsiteLinkCodeRecord.class; + } + + /** + * The column Account.accountWebsiteLinkCode.accountId. + */ + public final org.jooq.TableField accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.accountWebsiteLinkCode.confirmationCode. + */ + public final org.jooq.TableField confirmationCode = createField("confirmationCode", org.jooq.impl.SQLDataType.CHAR.length(6).nullable(false), this, ""); + + /** + * The column Account.accountWebsiteLinkCode.date. + */ + public final org.jooq.TableField date = createField("date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, ""); + + /** + * Create a Account.accountWebsiteLinkCode table reference + */ + public AccountWebsiteLinkCode() { + this("accountWebsiteLinkCode", null); + } + + /** + * Create an aliased Account.accountWebsiteLinkCode table reference + */ + public AccountWebsiteLinkCode(java.lang.String alias) { + this(alias, mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode); + } + + private AccountWebsiteLinkCode(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private AccountWebsiteLinkCode(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.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_accountWebsiteLinkCode_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_accountWebsiteLinkCode_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.accountWebsiteLinkCode_ibfk_1); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.AccountWebsiteLinkCode as(java.lang.String alias) { + return new mineplex.database.tables.AccountWebsiteLinkCode(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.AccountWebsiteLinkCode rename(java.lang.String name) { + return new mineplex.database.tables.AccountWebsiteLinkCode(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/ClanBanners.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/ClanBanners.java new file mode 100644 index 000000000..737c017b1 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/ClanBanners.java @@ -0,0 +1,101 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClanBanners extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = -633858329; + + /** + * The reference instance of Account.clanBanners + */ + public static final mineplex.database.tables.ClanBanners clanBanners = new mineplex.database.tables.ClanBanners(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.ClanBannersRecord.class; + } + + /** + * The column Account.clanBanners.clanId. + */ + public final org.jooq.TableField clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.clanBanners.baseColor. + */ + public final org.jooq.TableField baseColor = createField("baseColor", org.jooq.impl.SQLDataType.VARCHAR.length(15), this, ""); + + /** + * The column Account.clanBanners.patterns. + */ + public final org.jooq.TableField patterns = createField("patterns", org.jooq.impl.SQLDataType.VARCHAR.length(300), this, ""); + + /** + * Create a Account.clanBanners table reference + */ + public ClanBanners() { + this("clanBanners", null); + } + + /** + * Create an aliased Account.clanBanners table reference + */ + public ClanBanners(java.lang.String alias) { + this(alias, mineplex.database.tables.ClanBanners.clanBanners); + } + + private ClanBanners(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private ClanBanners(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.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_clanBanners_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_clanBanners_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.ClanBanners as(java.lang.String alias) { + return new mineplex.database.tables.ClanBanners(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.ClanBanners rename(java.lang.String name) { + return new mineplex.database.tables.ClanBanners(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/ClansGold.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/ClansGold.java new file mode 100644 index 000000000..a8618fea5 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/ClansGold.java @@ -0,0 +1,109 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClansGold extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 950104617; + + /** + * The reference instance of Account.clansGold + */ + public static final mineplex.database.tables.ClansGold clansGold = new mineplex.database.tables.ClansGold(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.ClansGoldRecord.class; + } + + /** + * The column Account.clansGold.serverId. + */ + public final org.jooq.TableField serverId = createField("serverId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.clansGold.id. + */ + public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.clansGold.gold. + */ + public final org.jooq.TableField gold = createField("gold", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * Create a Account.clansGold table reference + */ + public ClansGold() { + this("clansGold", null); + } + + /** + * Create an aliased Account.clansGold table reference + */ + public ClansGold(java.lang.String alias) { + this(alias, mineplex.database.tables.ClansGold.clansGold); + } + + private ClansGold(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private ClansGold(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.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_clansGold_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_clansGold_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.clansGold_ibfk_1, mineplex.database.Keys.clansGold_ibfk_2); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.ClansGold as(java.lang.String alias) { + return new mineplex.database.tables.ClansGold(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.ClansGold rename(java.lang.String name) { + return new mineplex.database.tables.ClansGold(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/ClansNetherPortals.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/ClansNetherPortals.java new file mode 100644 index 000000000..200912a7d --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/ClansNetherPortals.java @@ -0,0 +1,114 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClansNetherPortals extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = -1556693012; + + /** + * The reference instance of Account.clansNetherPortals + */ + public static final mineplex.database.tables.ClansNetherPortals clansNetherPortals = new mineplex.database.tables.ClansNetherPortals(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.ClansNetherPortalsRecord.class; + } + + /** + * The column Account.clansNetherPortals.id. + */ + public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.clansNetherPortals.cornerOne. + */ + public final org.jooq.TableField cornerOne = createField("cornerOne", org.jooq.impl.SQLDataType.VARCHAR.length(30), this, ""); + + /** + * The column Account.clansNetherPortals.cornerTwo. + */ + public final org.jooq.TableField cornerTwo = createField("cornerTwo", org.jooq.impl.SQLDataType.VARCHAR.length(30), this, ""); + + /** + * The column Account.clansNetherPortals.returnPortal. + */ + public final org.jooq.TableField returnPortal = createField("returnPortal", org.jooq.impl.SQLDataType.TINYINT, this, ""); + + /** + * Create a Account.clansNetherPortals table reference + */ + public ClansNetherPortals() { + this("clansNetherPortals", null); + } + + /** + * Create an aliased Account.clansNetherPortals table reference + */ + public ClansNetherPortals(java.lang.String alias) { + this(alias, mineplex.database.tables.ClansNetherPortals.clansNetherPortals); + } + + private ClansNetherPortals(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private ClansNetherPortals(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_clansNetherPortals; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_clansNetherPortals_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_clansNetherPortals_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.ClansNetherPortals as(java.lang.String alias) { + return new mineplex.database.tables.ClansNetherPortals(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.ClansNetherPortals rename(java.lang.String name) { + return new mineplex.database.tables.ClansNetherPortals(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Kit_progression.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Kit_progression.java deleted file mode 100644 index 836eaf7c7..000000000 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/Kit_progression.java +++ /dev/null @@ -1,116 +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", - "jOOQ version:3.5.2" - }, - comments = "This class is generated by jOOQ" -) -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Kit_progression extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { - - private static final long serialVersionUID = 144258751; - - /** - * The reference instance of Account.kit_progression - */ - public static final mineplex.database.tables.Kit_progression kit_progression = new mineplex.database.tables.Kit_progression(); - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return mineplex.database.tables.records.Kit_progressionRecord.class; - } - - /** - * The column Account.kit_progression.account_id. - */ - public final org.jooq.TableField account_id = createField("account_id", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, ""); - - /** - * The column Account.kit_progression.kit_id. - */ - public final org.jooq.TableField kit_id = createField("kit_id", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false).defaulted(true), this, ""); - - /** - * The column Account.kit_progression.level. - */ - public final org.jooq.TableField level = createField("level", org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * The column Account.kit_progression.xp. - */ - public final org.jooq.TableField xp = createField("xp", org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * The column Account.kit_progression.upgrade_level. - */ - public final org.jooq.TableField upgrade_level = createField("upgrade_level", org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * The column Account.kit_progression.default. - */ - public final org.jooq.TableField default_ = createField("default", org.jooq.impl.SQLDataType.TINYINT, this, ""); - - /** - * Create a Account.kit_progression table reference - */ - public Kit_progression() { - this("kit_progression", null); - } - - /** - * Create an aliased Account.kit_progression table reference - */ - public Kit_progression(java.lang.String alias) { - this(alias, mineplex.database.tables.Kit_progression.kit_progression); - } - - private Kit_progression(java.lang.String alias, org.jooq.Table aliased) { - this(alias, aliased, null); - } - - private Kit_progression(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.UniqueKey getPrimaryKey() { - return mineplex.database.Keys.KEY_kit_progression_PRIMARY; - } - - /** - * {@inheritDoc} - */ - @Override - public java.util.List> getKeys() { - return java.util.Arrays.>asList(mineplex.database.Keys.KEY_kit_progression_PRIMARY); - } - - /** - * {@inheritDoc} - */ - @Override - public mineplex.database.tables.Kit_progression as(java.lang.String alias) { - return new mineplex.database.tables.Kit_progression(alias, this); - } - - /** - * Rename this table - */ - public mineplex.database.tables.Kit_progression rename(java.lang.String name) { - return new mineplex.database.tables.Kit_progression(name, null); - } -} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/NonPremiumJoinMessage.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/NonPremiumJoinMessage.java new file mode 100644 index 000000000..16d497ab8 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/NonPremiumJoinMessage.java @@ -0,0 +1,75 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class NonPremiumJoinMessage extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 1100695916; + + /** + * The reference instance of Account.nonPremiumJoinMessage + */ + public static final mineplex.database.tables.NonPremiumJoinMessage nonPremiumJoinMessage = new mineplex.database.tables.NonPremiumJoinMessage(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.NonPremiumJoinMessageRecord.class; + } + + /** + * The column Account.nonPremiumJoinMessage.message. + */ + public final org.jooq.TableField message = createField("message", org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * Create a Account.nonPremiumJoinMessage table reference + */ + public NonPremiumJoinMessage() { + this("nonPremiumJoinMessage", null); + } + + /** + * Create an aliased Account.nonPremiumJoinMessage table reference + */ + public NonPremiumJoinMessage(java.lang.String alias) { + this(alias, mineplex.database.tables.NonPremiumJoinMessage.nonPremiumJoinMessage); + } + + private NonPremiumJoinMessage(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private NonPremiumJoinMessage(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { + super(alias, mineplex.database.Account.Account, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.NonPremiumJoinMessage as(java.lang.String alias) { + return new mineplex.database.tables.NonPremiumJoinMessage(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.NonPremiumJoinMessage rename(java.lang.String name) { + return new mineplex.database.tables.NonPremiumJoinMessage(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/PowerPlayClub.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/PowerPlayClub.java new file mode 100644 index 000000000..148384d3f --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/PowerPlayClub.java @@ -0,0 +1,109 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class PowerPlayClub extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = -521671017; + + /** + * The reference instance of Account.powerPlayClub + */ + public static final mineplex.database.tables.PowerPlayClub powerPlayClub = new mineplex.database.tables.PowerPlayClub(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.PowerPlayClubRecord.class; + } + + /** + * The column Account.powerPlayClub.accountId. + */ + public final org.jooq.TableField accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.powerPlayClub.kvKey. + */ + public final org.jooq.TableField kvKey = createField("kvKey", org.jooq.impl.SQLDataType.VARCHAR.length(255).nullable(false), this, ""); + + /** + * The column Account.powerPlayClub.kvValue. + */ + public final org.jooq.TableField kvValue = createField("kvValue", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * Create a Account.powerPlayClub table reference + */ + public PowerPlayClub() { + this("powerPlayClub", null); + } + + /** + * Create an aliased Account.powerPlayClub table reference + */ + public PowerPlayClub(java.lang.String alias) { + this(alias, mineplex.database.tables.PowerPlayClub.powerPlayClub); + } + + private PowerPlayClub(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private PowerPlayClub(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.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_powerPlayClub_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_powerPlayClub_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.powerPlayClub_ibfk_1); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.PowerPlayClub as(java.lang.String alias) { + return new mineplex.database.tables.PowerPlayClub(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.PowerPlayClub rename(java.lang.String name) { + return new mineplex.database.tables.PowerPlayClub(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Unicodereplacer.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Unicodereplacer.java new file mode 100644 index 000000000..5e9e15ac0 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Unicodereplacer.java @@ -0,0 +1,119 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Unicodereplacer extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 613849358; + + /** + * The reference instance of Account.unicodereplacer + */ + public static final mineplex.database.tables.Unicodereplacer unicodereplacer = new mineplex.database.tables.Unicodereplacer(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.UnicodereplacerRecord.class; + } + + /** + * The column Account.unicodereplacer.id. + */ + public final org.jooq.TableField id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.unicodereplacer.unicode. + */ + public final org.jooq.TableField unicode = createField("unicode", org.jooq.impl.SQLDataType.VARCHAR.length(4), this, ""); + + /** + * The column Account.unicodereplacer.replacement. + */ + public final org.jooq.TableField replacement = createField("replacement", org.jooq.impl.SQLDataType.VARCHAR.length(8), this, ""); + + /** + * The column Account.unicodereplacer.created_by. + */ + public final org.jooq.TableField created_by = createField("created_by", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, ""); + + /** + * The column Account.unicodereplacer.removed_by. + */ + public final org.jooq.TableField removed_by = createField("removed_by", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, ""); + + /** + * Create a Account.unicodereplacer table reference + */ + public Unicodereplacer() { + this("unicodereplacer", null); + } + + /** + * Create an aliased Account.unicodereplacer table reference + */ + public Unicodereplacer(java.lang.String alias) { + this(alias, mineplex.database.tables.Unicodereplacer.unicodereplacer); + } + + private Unicodereplacer(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private Unicodereplacer(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_unicodereplacer; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_unicodereplacer_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_unicodereplacer_PRIMARY, mineplex.database.Keys.KEY_unicodereplacer_unicode); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.Unicodereplacer as(java.lang.String alias) { + return new mineplex.database.tables.Unicodereplacer(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.Unicodereplacer rename(java.lang.String name) { + return new mineplex.database.tables.Unicodereplacer(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Youtube.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Youtube.java new file mode 100644 index 000000000..e150be718 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Youtube.java @@ -0,0 +1,112 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Youtube extends org.jooq.impl.TableImpl implements java.io.Serializable, java.lang.Cloneable { + + private static final long serialVersionUID = 1588929727; + + /** + * The reference instance of Account.youtube + */ + public static final mineplex.database.tables.Youtube youtube = new mineplex.database.tables.Youtube(); + + /** + * The class holding records for this type + */ + @Override + public java.lang.Class getRecordType() { + return mineplex.database.tables.records.YoutubeRecord.class; + } + + /** + * The column Account.youtube.accountId. + */ + public final org.jooq.TableField accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column Account.youtube.clicktime. + */ + public final org.jooq.TableField clicktime = createField("clicktime", org.jooq.impl.SQLDataType.DATE, this, ""); + + /** + * Create a Account.youtube table reference + */ + public Youtube() { + this("youtube", null); + } + + /** + * Create an aliased Account.youtube table reference + */ + public Youtube(java.lang.String alias) { + this(alias, mineplex.database.tables.Youtube.youtube); + } + + private Youtube(java.lang.String alias, org.jooq.Table aliased) { + this(alias, aliased, null); + } + + private Youtube(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_youtube; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.UniqueKey getPrimaryKey() { + return mineplex.database.Keys.KEY_youtube_PRIMARY; + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getKeys() { + return java.util.Arrays.>asList(mineplex.database.Keys.KEY_youtube_PRIMARY); + } + + /** + * {@inheritDoc} + */ + @Override + public java.util.List> getReferences() { + return java.util.Arrays.>asList(mineplex.database.Keys.youtube_ibfk_1); + } + + /** + * {@inheritDoc} + */ + @Override + public mineplex.database.tables.Youtube as(java.lang.String alias) { + return new mineplex.database.tables.Youtube(alias, this); + } + + /** + * Rename this table + */ + public mineplex.database.tables.Youtube rename(java.lang.String name) { + return new mineplex.database.tables.Youtube(name, null); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountAmplifierThankRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountAmplifierThankRecord.java new file mode 100644 index 000000000..0e6af2e8e --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountAmplifierThankRecord.java @@ -0,0 +1,199 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountAmplifierThankRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3 { + + private static final long serialVersionUID = 1203692620; + + /** + * Setter for Account.accountAmplifierThank.accountId. + */ + public void setAccountId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.accountAmplifierThank.accountId. + */ + public java.lang.Integer getAccountId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.accountAmplifierThank.amplifierId. + */ + public void setAmplifierId(java.lang.Integer value) { + setValue(1, value); + } + + /** + * Getter for Account.accountAmplifierThank.amplifierId. + */ + public java.lang.Integer getAmplifierId() { + return (java.lang.Integer) getValue(1); + } + + /** + * Setter for Account.accountAmplifierThank.time. + */ + public void setTime(java.sql.Timestamp value) { + setValue(2, value); + } + + /** + * Getter for Account.accountAmplifierThank.time. + */ + public java.sql.Timestamp getTime() { + return (java.sql.Timestamp) getValue(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record2 key() { + return (org.jooq.Record2) super.key(); + } + + // ------------------------------------------------------------------------- + // Record3 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 fieldsRow() { + return (org.jooq.Row3) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 valuesRow() { + return (org.jooq.Row3) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank.accountId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank.amplifierId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank.time; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value2() { + return getAmplifierId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.sql.Timestamp value3() { + return getTime(); + } + + /** + * {@inheritDoc} + */ + @Override + public AccountAmplifierThankRecord value1(java.lang.Integer value) { + setAccountId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountAmplifierThankRecord value2(java.lang.Integer value) { + setAmplifierId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountAmplifierThankRecord value3(java.sql.Timestamp value) { + setTime(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountAmplifierThankRecord values(java.lang.Integer value1, java.lang.Integer value2, java.sql.Timestamp value3) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountAmplifierThankRecord + */ + public AccountAmplifierThankRecord() { + super(mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank); + } + + /** + * Create a detached, initialised AccountAmplifierThankRecord + */ + public AccountAmplifierThankRecord(java.lang.Integer accountId, java.lang.Integer amplifierId, java.sql.Timestamp time) { + super(mineplex.database.tables.AccountAmplifierThank.accountAmplifierThank); + + setValue(0, accountId); + setValue(1, amplifierId); + setValue(2, time); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountThankRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountThankRecord.java new file mode 100644 index 000000000..6b932a8f2 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountThankRecord.java @@ -0,0 +1,159 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountThankRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record2 { + + private static final long serialVersionUID = -183734569; + + /** + * Setter for Account.accountThank.accountId. + */ + public void setAccountId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.accountThank.accountId. + */ + public java.lang.Integer getAccountId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.accountThank.thanks. + */ + public void setThanks(java.lang.Integer value) { + setValue(1, value); + } + + /** + * Getter for Account.accountThank.thanks. + */ + public java.lang.Integer getThanks() { + return (java.lang.Integer) getValue(1); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record2 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row2 fieldsRow() { + return (org.jooq.Row2) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row2 valuesRow() { + return (org.jooq.Row2) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.AccountThank.accountThank.accountId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.AccountThank.accountThank.thanks; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value2() { + return getThanks(); + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankRecord value1(java.lang.Integer value) { + setAccountId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankRecord value2(java.lang.Integer value) { + setThanks(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankRecord values(java.lang.Integer value1, java.lang.Integer value2) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountThankRecord + */ + public AccountThankRecord() { + super(mineplex.database.tables.AccountThank.accountThank); + } + + /** + * Create a detached, initialised AccountThankRecord + */ + public AccountThankRecord(java.lang.Integer accountId, java.lang.Integer thanks) { + super(mineplex.database.tables.AccountThank.accountThank); + + setValue(0, accountId); + setValue(1, thanks); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountThankTransactionsRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountThankTransactionsRecord.java new file mode 100644 index 000000000..d4cd2c004 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountThankTransactionsRecord.java @@ -0,0 +1,439 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountThankTransactionsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9 { + + private static final long serialVersionUID = -1604313652; + + /** + * Setter for Account.accountThankTransactions.id. + */ + public void setId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.accountThankTransactions.id. + */ + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.accountThankTransactions.receiverId. + */ + public void setReceiverId(java.lang.Integer value) { + setValue(1, value); + } + + /** + * Getter for Account.accountThankTransactions.receiverId. + */ + public java.lang.Integer getReceiverId() { + return (java.lang.Integer) getValue(1); + } + + /** + * Setter for Account.accountThankTransactions.senderId. + */ + public void setSenderId(java.lang.Integer value) { + setValue(2, value); + } + + /** + * Getter for Account.accountThankTransactions.senderId. + */ + public java.lang.Integer getSenderId() { + return (java.lang.Integer) getValue(2); + } + + /** + * Setter for Account.accountThankTransactions.thankAmount. + */ + public void setThankAmount(java.lang.Integer value) { + setValue(3, value); + } + + /** + * Getter for Account.accountThankTransactions.thankAmount. + */ + public java.lang.Integer getThankAmount() { + return (java.lang.Integer) getValue(3); + } + + /** + * Setter for Account.accountThankTransactions.reason. + */ + public void setReason(java.lang.String value) { + setValue(4, value); + } + + /** + * Getter for Account.accountThankTransactions.reason. + */ + public java.lang.String getReason() { + return (java.lang.String) getValue(4); + } + + /** + * Setter for Account.accountThankTransactions.ignoreCooldown. + */ + public void setIgnoreCooldown(java.lang.Byte value) { + setValue(5, value); + } + + /** + * Getter for Account.accountThankTransactions.ignoreCooldown. + */ + public java.lang.Byte getIgnoreCooldown() { + return (java.lang.Byte) getValue(5); + } + + /** + * Setter for Account.accountThankTransactions.claimed. + */ + public void setClaimed(java.lang.Byte value) { + setValue(6, value); + } + + /** + * Getter for Account.accountThankTransactions.claimed. + */ + public java.lang.Byte getClaimed() { + return (java.lang.Byte) getValue(6); + } + + /** + * Setter for Account.accountThankTransactions.sentTime. + */ + public void setSentTime(java.sql.Timestamp value) { + setValue(7, value); + } + + /** + * Getter for Account.accountThankTransactions.sentTime. + */ + public java.sql.Timestamp getSentTime() { + return (java.sql.Timestamp) getValue(7); + } + + /** + * Setter for Account.accountThankTransactions.claimTime. + */ + public void setClaimTime(java.sql.Timestamp value) { + setValue(8, value); + } + + /** + * Getter for Account.accountThankTransactions.claimTime. + */ + public java.sql.Timestamp getClaimTime() { + return (java.sql.Timestamp) getValue(8); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record9 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row9 fieldsRow() { + return (org.jooq.Row9) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row9 valuesRow() { + return (org.jooq.Row9) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.id; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.receiverId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.senderId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field4() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.thankAmount; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field5() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.reason; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field6() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.ignoreCooldown; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field7() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.claimed; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field8() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.sentTime; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field9() { + return mineplex.database.tables.AccountThankTransactions.accountThankTransactions.claimTime; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value2() { + return getReceiverId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value3() { + return getSenderId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value4() { + return getThankAmount(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value5() { + return getReason(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Byte value6() { + return getIgnoreCooldown(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Byte value7() { + return getClaimed(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.sql.Timestamp value8() { + return getSentTime(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.sql.Timestamp value9() { + return getClaimTime(); + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value1(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value2(java.lang.Integer value) { + setReceiverId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value3(java.lang.Integer value) { + setSenderId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value4(java.lang.Integer value) { + setThankAmount(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value5(java.lang.String value) { + setReason(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value6(java.lang.Byte value) { + setIgnoreCooldown(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value7(java.lang.Byte value) { + setClaimed(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value8(java.sql.Timestamp value) { + setSentTime(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord value9(java.sql.Timestamp value) { + setClaimTime(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountThankTransactionsRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.Integer value4, java.lang.String value5, java.lang.Byte value6, java.lang.Byte value7, java.sql.Timestamp value8, java.sql.Timestamp value9) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountThankTransactionsRecord + */ + public AccountThankTransactionsRecord() { + super(mineplex.database.tables.AccountThankTransactions.accountThankTransactions); + } + + /** + * Create a detached, initialised AccountThankTransactionsRecord + */ + public AccountThankTransactionsRecord(java.lang.Integer id, java.lang.Integer receiverId, java.lang.Integer senderId, java.lang.Integer thankAmount, java.lang.String reason, java.lang.Byte ignoreCooldown, java.lang.Byte claimed, java.sql.Timestamp sentTime, java.sql.Timestamp claimTime) { + super(mineplex.database.tables.AccountThankTransactions.accountThankTransactions); + + setValue(0, id); + setValue(1, receiverId); + setValue(2, senderId); + setValue(3, thankAmount); + setValue(4, reason); + setValue(5, ignoreCooldown); + setValue(6, claimed); + setValue(7, sentTime); + setValue(8, claimTime); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountWebsiteLinkCodeRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountWebsiteLinkCodeRecord.java new file mode 100644 index 000000000..c71003242 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountWebsiteLinkCodeRecord.java @@ -0,0 +1,199 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountWebsiteLinkCodeRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3 { + + private static final long serialVersionUID = -505757434; + + /** + * Setter for Account.accountWebsiteLinkCode.accountId. + */ + public void setAccountId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.accountWebsiteLinkCode.accountId. + */ + public java.lang.Integer getAccountId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.accountWebsiteLinkCode.confirmationCode. + */ + public void setConfirmationCode(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.accountWebsiteLinkCode.confirmationCode. + */ + public java.lang.String getConfirmationCode() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.accountWebsiteLinkCode.date. + */ + public void setDate(java.sql.Timestamp value) { + setValue(2, value); + } + + /** + * Getter for Account.accountWebsiteLinkCode.date. + */ + public java.sql.Timestamp getDate() { + return (java.sql.Timestamp) getValue(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record3 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 fieldsRow() { + return (org.jooq.Row3) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 valuesRow() { + return (org.jooq.Row3) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode.accountId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode.confirmationCode; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode.date; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getConfirmationCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.sql.Timestamp value3() { + return getDate(); + } + + /** + * {@inheritDoc} + */ + @Override + public AccountWebsiteLinkCodeRecord value1(java.lang.Integer value) { + setAccountId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountWebsiteLinkCodeRecord value2(java.lang.String value) { + setConfirmationCode(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountWebsiteLinkCodeRecord value3(java.sql.Timestamp value) { + setDate(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public AccountWebsiteLinkCodeRecord values(java.lang.Integer value1, java.lang.String value2, java.sql.Timestamp value3) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountWebsiteLinkCodeRecord + */ + public AccountWebsiteLinkCodeRecord() { + super(mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode); + } + + /** + * Create a detached, initialised AccountWebsiteLinkCodeRecord + */ + public AccountWebsiteLinkCodeRecord(java.lang.Integer accountId, java.lang.String confirmationCode, java.sql.Timestamp date) { + super(mineplex.database.tables.AccountWebsiteLinkCode.accountWebsiteLinkCode); + + setValue(0, accountId); + setValue(1, confirmationCode); + setValue(2, date); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanBannersRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanBannersRecord.java new file mode 100644 index 000000000..5ae2da306 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanBannersRecord.java @@ -0,0 +1,199 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClanBannersRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3 { + + private static final long serialVersionUID = 830973431; + + /** + * Setter for Account.clanBanners.clanId. + */ + public void setClanId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.clanBanners.clanId. + */ + public java.lang.Integer getClanId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.clanBanners.baseColor. + */ + public void setBaseColor(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.clanBanners.baseColor. + */ + public java.lang.String getBaseColor() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.clanBanners.patterns. + */ + public void setPatterns(java.lang.String value) { + setValue(2, value); + } + + /** + * Getter for Account.clanBanners.patterns. + */ + public java.lang.String getPatterns() { + return (java.lang.String) getValue(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record3 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 fieldsRow() { + return (org.jooq.Row3) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 valuesRow() { + return (org.jooq.Row3) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.ClanBanners.clanBanners.clanId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.ClanBanners.clanBanners.baseColor; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.ClanBanners.clanBanners.patterns; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getClanId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getBaseColor(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value3() { + return getPatterns(); + } + + /** + * {@inheritDoc} + */ + @Override + public ClanBannersRecord value1(java.lang.Integer value) { + setClanId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClanBannersRecord value2(java.lang.String value) { + setBaseColor(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClanBannersRecord value3(java.lang.String value) { + setPatterns(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClanBannersRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ClanBannersRecord + */ + public ClanBannersRecord() { + super(mineplex.database.tables.ClanBanners.clanBanners); + } + + /** + * Create a detached, initialised ClanBannersRecord + */ + public ClanBannersRecord(java.lang.Integer clanId, java.lang.String baseColor, java.lang.String patterns) { + super(mineplex.database.tables.ClanBanners.clanBanners); + + setValue(0, clanId); + setValue(1, baseColor); + setValue(2, patterns); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansGoldRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansGoldRecord.java new file mode 100644 index 000000000..3f693103c --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansGoldRecord.java @@ -0,0 +1,199 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClansGoldRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3 { + + private static final long serialVersionUID = -90641108; + + /** + * Setter for Account.clansGold.serverId. + */ + public void setServerId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.clansGold.serverId. + */ + public java.lang.Integer getServerId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.clansGold.id. + */ + public void setId(java.lang.Integer value) { + setValue(1, value); + } + + /** + * Getter for Account.clansGold.id. + */ + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(1); + } + + /** + * Setter for Account.clansGold.gold. + */ + public void setGold(java.lang.Integer value) { + setValue(2, value); + } + + /** + * Getter for Account.clansGold.gold. + */ + public java.lang.Integer getGold() { + return (java.lang.Integer) getValue(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record2 key() { + return (org.jooq.Record2) super.key(); + } + + // ------------------------------------------------------------------------- + // Record3 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 fieldsRow() { + return (org.jooq.Row3) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 valuesRow() { + return (org.jooq.Row3) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.ClansGold.clansGold.serverId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.ClansGold.clansGold.id; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.ClansGold.clansGold.gold; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getServerId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value2() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value3() { + return getGold(); + } + + /** + * {@inheritDoc} + */ + @Override + public ClansGoldRecord value1(java.lang.Integer value) { + setServerId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansGoldRecord value2(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansGoldRecord value3(java.lang.Integer value) { + setGold(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansGoldRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ClansGoldRecord + */ + public ClansGoldRecord() { + super(mineplex.database.tables.ClansGold.clansGold); + } + + /** + * Create a detached, initialised ClansGoldRecord + */ + public ClansGoldRecord(java.lang.Integer serverId, java.lang.Integer id, java.lang.Integer gold) { + super(mineplex.database.tables.ClansGold.clansGold); + + setValue(0, serverId); + setValue(1, id); + setValue(2, gold); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansNetherPortalsRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansNetherPortalsRecord.java new file mode 100644 index 000000000..018a7a89e --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansNetherPortalsRecord.java @@ -0,0 +1,239 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ClansNetherPortalsRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4 { + + private static final long serialVersionUID = -1366559485; + + /** + * Setter for Account.clansNetherPortals.id. + */ + public void setId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.clansNetherPortals.id. + */ + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.clansNetherPortals.cornerOne. + */ + public void setCornerOne(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.clansNetherPortals.cornerOne. + */ + public java.lang.String getCornerOne() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.clansNetherPortals.cornerTwo. + */ + public void setCornerTwo(java.lang.String value) { + setValue(2, value); + } + + /** + * Getter for Account.clansNetherPortals.cornerTwo. + */ + public java.lang.String getCornerTwo() { + return (java.lang.String) getValue(2); + } + + /** + * Setter for Account.clansNetherPortals.returnPortal. + */ + public void setReturnPortal(java.lang.Byte value) { + setValue(3, value); + } + + /** + * Getter for Account.clansNetherPortals.returnPortal. + */ + public java.lang.Byte getReturnPortal() { + return (java.lang.Byte) 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.ClansNetherPortals.clansNetherPortals.id; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.ClansNetherPortals.clansNetherPortals.cornerOne; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.ClansNetherPortals.clansNetherPortals.cornerTwo; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field4() { + return mineplex.database.tables.ClansNetherPortals.clansNetherPortals.returnPortal; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getCornerOne(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value3() { + return getCornerTwo(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Byte value4() { + return getReturnPortal(); + } + + /** + * {@inheritDoc} + */ + @Override + public ClansNetherPortalsRecord value1(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansNetherPortalsRecord value2(java.lang.String value) { + setCornerOne(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansNetherPortalsRecord value3(java.lang.String value) { + setCornerTwo(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansNetherPortalsRecord value4(java.lang.Byte value) { + setReturnPortal(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public ClansNetherPortalsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Byte value4) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ClansNetherPortalsRecord + */ + public ClansNetherPortalsRecord() { + super(mineplex.database.tables.ClansNetherPortals.clansNetherPortals); + } + + /** + * Create a detached, initialised ClansNetherPortalsRecord + */ + public ClansNetherPortalsRecord(java.lang.Integer id, java.lang.String cornerOne, java.lang.String cornerTwo, java.lang.Byte returnPortal) { + super(mineplex.database.tables.ClansNetherPortals.clansNetherPortals); + + setValue(0, id); + setValue(1, cornerOne); + setValue(2, cornerTwo); + setValue(3, returnPortal); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/Kit_progressionRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/Kit_progressionRecord.java deleted file mode 100644 index b38e32b8c..000000000 --- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/Kit_progressionRecord.java +++ /dev/null @@ -1,319 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package mineplex.database.tables.records; - -/** - * This class is generated by jOOQ. - */ -@javax.annotation.Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.5.2" - }, - comments = "This class is generated by jOOQ" -) -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Kit_progressionRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record6 { - - private static final long serialVersionUID = 1893691977; - - /** - * Setter for Account.kit_progression.account_id. - */ - public void setAccount_id(java.lang.Integer value) { - setValue(0, value); - } - - /** - * Getter for Account.kit_progression.account_id. - */ - public java.lang.Integer getAccount_id() { - return (java.lang.Integer) getValue(0); - } - - /** - * Setter for Account.kit_progression.kit_id. - */ - public void setKit_id(java.lang.String value) { - setValue(1, value); - } - - /** - * Getter for Account.kit_progression.kit_id. - */ - public java.lang.String getKit_id() { - return (java.lang.String) getValue(1); - } - - /** - * Setter for Account.kit_progression.level. - */ - public void setLevel(java.lang.Integer value) { - setValue(2, value); - } - - /** - * Getter for Account.kit_progression.level. - */ - public java.lang.Integer getLevel() { - return (java.lang.Integer) getValue(2); - } - - /** - * Setter for Account.kit_progression.xp. - */ - public void setXp(java.lang.Integer value) { - setValue(3, value); - } - - /** - * Getter for Account.kit_progression.xp. - */ - public java.lang.Integer getXp() { - return (java.lang.Integer) getValue(3); - } - - /** - * Setter for Account.kit_progression.upgrade_level. - */ - public void setUpgrade_level(java.lang.Integer value) { - setValue(4, value); - } - - /** - * Getter for Account.kit_progression.upgrade_level. - */ - public java.lang.Integer getUpgrade_level() { - return (java.lang.Integer) getValue(4); - } - - /** - * Setter for Account.kit_progression.default. - */ - public void setDefault(java.lang.Byte value) { - setValue(5, value); - } - - /** - * Getter for Account.kit_progression.default. - */ - public java.lang.Byte getDefault() { - return (java.lang.Byte) getValue(5); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Record2 key() { - return (org.jooq.Record2) 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.Kit_progression.kit_progression.account_id; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field2() { - return mineplex.database.tables.Kit_progression.kit_progression.kit_id; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field3() { - return mineplex.database.tables.Kit_progression.kit_progression.level; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field4() { - return mineplex.database.tables.Kit_progression.kit_progression.xp; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field5() { - return mineplex.database.tables.Kit_progression.kit_progression.upgrade_level; - } - - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Field field6() { - return mineplex.database.tables.Kit_progression.kit_progression.default_; - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Integer value1() { - return getAccount_id(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.String value2() { - return getKit_id(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Integer value3() { - return getLevel(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Integer value4() { - return getXp(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Integer value5() { - return getUpgrade_level(); - } - - /** - * {@inheritDoc} - */ - @Override - public java.lang.Byte value6() { - return getDefault(); - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord value1(java.lang.Integer value) { - setAccount_id(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord value2(java.lang.String value) { - setKit_id(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord value3(java.lang.Integer value) { - setLevel(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord value4(java.lang.Integer value) { - setXp(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord value5(java.lang.Integer value) { - setUpgrade_level(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord value6(java.lang.Byte value) { - setDefault(value); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public Kit_progressionRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.Integer value3, java.lang.Integer value4, java.lang.Integer value5, java.lang.Byte value6) { - return this; - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached Kit_progressionRecord - */ - public Kit_progressionRecord() { - super(mineplex.database.tables.Kit_progression.kit_progression); - } - - /** - * Create a detached, initialised Kit_progressionRecord - */ - public Kit_progressionRecord(java.lang.Integer account_id, java.lang.String kit_id, java.lang.Integer level, java.lang.Integer xp, java.lang.Integer upgrade_level, java.lang.Byte default_) { - super(mineplex.database.tables.Kit_progression.kit_progression); - - setValue(0, account_id); - setValue(1, kit_id); - setValue(2, level); - setValue(3, xp); - setValue(4, upgrade_level); - setValue(5, default_); - } -} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/NonPremiumJoinMessageRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/NonPremiumJoinMessageRecord.java new file mode 100644 index 000000000..1c1396a12 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/NonPremiumJoinMessageRecord.java @@ -0,0 +1,107 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class NonPremiumJoinMessageRecord extends org.jooq.impl.TableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record1 { + + private static final long serialVersionUID = 988609111; + + /** + * Setter for Account.nonPremiumJoinMessage.message. + */ + public void setMessage(java.lang.String value) { + setValue(0, value); + } + + /** + * Getter for Account.nonPremiumJoinMessage.message. + */ + public java.lang.String getMessage() { + return (java.lang.String) getValue(0); + } + + // ------------------------------------------------------------------------- + // Record1 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row1 fieldsRow() { + return (org.jooq.Row1) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row1 valuesRow() { + return (org.jooq.Row1) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.NonPremiumJoinMessage.nonPremiumJoinMessage.message; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value1() { + return getMessage(); + } + + /** + * {@inheritDoc} + */ + @Override + public NonPremiumJoinMessageRecord value1(java.lang.String value) { + setMessage(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public NonPremiumJoinMessageRecord values(java.lang.String value1) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached NonPremiumJoinMessageRecord + */ + public NonPremiumJoinMessageRecord() { + super(mineplex.database.tables.NonPremiumJoinMessage.nonPremiumJoinMessage); + } + + /** + * Create a detached, initialised NonPremiumJoinMessageRecord + */ + public NonPremiumJoinMessageRecord(java.lang.String message) { + super(mineplex.database.tables.NonPremiumJoinMessage.nonPremiumJoinMessage); + + setValue(0, message); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/PowerPlayClubRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/PowerPlayClubRecord.java new file mode 100644 index 000000000..cea0382f0 --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/PowerPlayClubRecord.java @@ -0,0 +1,199 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class PowerPlayClubRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3 { + + private static final long serialVersionUID = 1651396391; + + /** + * Setter for Account.powerPlayClub.accountId. + */ + public void setAccountId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.powerPlayClub.accountId. + */ + public java.lang.Integer getAccountId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.powerPlayClub.kvKey. + */ + public void setKvKey(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.powerPlayClub.kvKey. + */ + public java.lang.String getKvKey() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.powerPlayClub.kvValue. + */ + public void setKvValue(java.lang.Integer value) { + setValue(2, value); + } + + /** + * Getter for Account.powerPlayClub.kvValue. + */ + public java.lang.Integer getKvValue() { + return (java.lang.Integer) getValue(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record2 key() { + return (org.jooq.Record2) super.key(); + } + + // ------------------------------------------------------------------------- + // Record3 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 fieldsRow() { + return (org.jooq.Row3) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row3 valuesRow() { + return (org.jooq.Row3) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.PowerPlayClub.powerPlayClub.accountId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.PowerPlayClub.powerPlayClub.kvKey; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.PowerPlayClub.powerPlayClub.kvValue; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getKvKey(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value3() { + return getKvValue(); + } + + /** + * {@inheritDoc} + */ + @Override + public PowerPlayClubRecord value1(java.lang.Integer value) { + setAccountId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public PowerPlayClubRecord value2(java.lang.String value) { + setKvKey(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public PowerPlayClubRecord value3(java.lang.Integer value) { + setKvValue(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public PowerPlayClubRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.Integer value3) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached PowerPlayClubRecord + */ + public PowerPlayClubRecord() { + super(mineplex.database.tables.PowerPlayClub.powerPlayClub); + } + + /** + * Create a detached, initialised PowerPlayClubRecord + */ + public PowerPlayClubRecord(java.lang.Integer accountId, java.lang.String kvKey, java.lang.Integer kvValue) { + super(mineplex.database.tables.PowerPlayClub.powerPlayClub); + + setValue(0, accountId); + setValue(1, kvKey); + setValue(2, kvValue); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/UnicodereplacerRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/UnicodereplacerRecord.java new file mode 100644 index 000000000..591491a4e --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/UnicodereplacerRecord.java @@ -0,0 +1,279 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class UnicodereplacerRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record5 { + + private static final long serialVersionUID = -155015394; + + /** + * Setter for Account.unicodereplacer.id. + */ + public void setId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.unicodereplacer.id. + */ + public java.lang.Integer getId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.unicodereplacer.unicode. + */ + public void setUnicode(java.lang.String value) { + setValue(1, value); + } + + /** + * Getter for Account.unicodereplacer.unicode. + */ + public java.lang.String getUnicode() { + return (java.lang.String) getValue(1); + } + + /** + * Setter for Account.unicodereplacer.replacement. + */ + public void setReplacement(java.lang.String value) { + setValue(2, value); + } + + /** + * Getter for Account.unicodereplacer.replacement. + */ + public java.lang.String getReplacement() { + return (java.lang.String) getValue(2); + } + + /** + * Setter for Account.unicodereplacer.created_by. + */ + public void setCreated_by(java.lang.String value) { + setValue(3, value); + } + + /** + * Getter for Account.unicodereplacer.created_by. + */ + public java.lang.String getCreated_by() { + return (java.lang.String) getValue(3); + } + + /** + * Setter for Account.unicodereplacer.removed_by. + */ + public void setRemoved_by(java.lang.String value) { + setValue(4, value); + } + + /** + * Getter for Account.unicodereplacer.removed_by. + */ + public java.lang.String getRemoved_by() { + return (java.lang.String) getValue(4); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record5 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row5 fieldsRow() { + return (org.jooq.Row5) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row5 valuesRow() { + return (org.jooq.Row5) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.Unicodereplacer.unicodereplacer.id; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.Unicodereplacer.unicodereplacer.unicode; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field3() { + return mineplex.database.tables.Unicodereplacer.unicodereplacer.replacement; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field4() { + return mineplex.database.tables.Unicodereplacer.unicodereplacer.created_by; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field5() { + return mineplex.database.tables.Unicodereplacer.unicodereplacer.removed_by; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value2() { + return getUnicode(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value3() { + return getReplacement(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value4() { + return getCreated_by(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.String value5() { + return getRemoved_by(); + } + + /** + * {@inheritDoc} + */ + @Override + public UnicodereplacerRecord value1(java.lang.Integer value) { + setId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public UnicodereplacerRecord value2(java.lang.String value) { + setUnicode(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public UnicodereplacerRecord value3(java.lang.String value) { + setReplacement(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public UnicodereplacerRecord value4(java.lang.String value) { + setCreated_by(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public UnicodereplacerRecord value5(java.lang.String value) { + setRemoved_by(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public UnicodereplacerRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.lang.String value5) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached UnicodereplacerRecord + */ + public UnicodereplacerRecord() { + super(mineplex.database.tables.Unicodereplacer.unicodereplacer); + } + + /** + * Create a detached, initialised UnicodereplacerRecord + */ + public UnicodereplacerRecord(java.lang.Integer id, java.lang.String unicode, java.lang.String replacement, java.lang.String created_by, java.lang.String removed_by) { + super(mineplex.database.tables.Unicodereplacer.unicodereplacer); + + setValue(0, id); + setValue(1, unicode); + setValue(2, replacement); + setValue(3, created_by); + setValue(4, removed_by); + } +} diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/YoutubeRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/YoutubeRecord.java new file mode 100644 index 000000000..13fc1242f --- /dev/null +++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/YoutubeRecord.java @@ -0,0 +1,159 @@ +/** + * This class is generated by jOOQ + */ +package mineplex.database.tables.records; + +/** + * This class is generated by jOOQ. + */ +@javax.annotation.Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.5.2" + }, + comments = "This class is generated by jOOQ" +) +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class YoutubeRecord extends org.jooq.impl.UpdatableRecordImpl implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record2 { + + private static final long serialVersionUID = -581486771; + + /** + * Setter for Account.youtube.accountId. + */ + public void setAccountId(java.lang.Integer value) { + setValue(0, value); + } + + /** + * Getter for Account.youtube.accountId. + */ + public java.lang.Integer getAccountId() { + return (java.lang.Integer) getValue(0); + } + + /** + * Setter for Account.youtube.clicktime. + */ + public void setClicktime(java.sql.Date value) { + setValue(1, value); + } + + /** + * Getter for Account.youtube.clicktime. + */ + public java.sql.Date getClicktime() { + return (java.sql.Date) getValue(1); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Record1 key() { + return (org.jooq.Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Record2 type implementation + // ------------------------------------------------------------------------- + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row2 fieldsRow() { + return (org.jooq.Row2) super.fieldsRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Row2 valuesRow() { + return (org.jooq.Row2) super.valuesRow(); + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field1() { + return mineplex.database.tables.Youtube.youtube.accountId; + } + + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Field field2() { + return mineplex.database.tables.Youtube.youtube.clicktime; + } + + /** + * {@inheritDoc} + */ + @Override + public java.lang.Integer value1() { + return getAccountId(); + } + + /** + * {@inheritDoc} + */ + @Override + public java.sql.Date value2() { + return getClicktime(); + } + + /** + * {@inheritDoc} + */ + @Override + public YoutubeRecord value1(java.lang.Integer value) { + setAccountId(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public YoutubeRecord value2(java.sql.Date value) { + setClicktime(value); + return this; + } + + /** + * {@inheritDoc} + */ + @Override + public YoutubeRecord values(java.lang.Integer value1, java.sql.Date value2) { + return this; + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached YoutubeRecord + */ + public YoutubeRecord() { + super(mineplex.database.tables.Youtube.youtube); + } + + /** + * Create a detached, initialised YoutubeRecord + */ + public YoutubeRecord(java.lang.Integer accountId, java.sql.Date clicktime) { + super(mineplex.database.tables.Youtube.youtube); + + setValue(0, accountId); + setValue(1, clicktime); + } +} diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldRepository.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldRepository.java index 10fdd5270..d6f8958f8 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldRepository.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldRepository.java @@ -35,7 +35,7 @@ public class GoldRepository { if (callback != null) { - callback.run(true); + Bukkit.getScheduler().runTask(UtilServer.getPlugin(), () -> callback.run(true)); } } catch (SQLException e) @@ -44,7 +44,7 @@ public class GoldRepository { if (callback != null) { - callback.run(false); + Bukkit.getScheduler().runTask(UtilServer.getPlugin(), () -> callback.run(false)); } } }); @@ -67,8 +67,10 @@ public class GoldRepository { statement.setInt(3, gold); statement.setInt(4, gold); statement.executeUpdate(); - if (callback != null) { - callback.run(true); + + if (callback != null) + { + Bukkit.getScheduler().runTask(UtilServer.getPlugin(), () -> callback.run(true)); } } catch (SQLException e) @@ -77,7 +79,7 @@ public class GoldRepository { if (callback != null) { - callback.run(false); + Bukkit.getScheduler().runTask(UtilServer.getPlugin(), () -> callback.run(false)); } } }); diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java index 3b40034b0..df03752b3 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java @@ -44,6 +44,7 @@ import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; import mineplex.core.teleport.Teleport; +import mineplex.core.thank.ThankManager; import mineplex.core.titangiveaway.TitanGiveawayManager; import mineplex.core.updater.FileUpdater; import mineplex.core.updater.Updater; @@ -130,8 +131,9 @@ public class ClansHub extends JavaPlugin CustomDataManager customDataManager = new CustomDataManager(this, clientManager); ConditionManager condition = new ConditionManager(this); - BoosterManager boosterManager = new BoosterManager(this, "", clientManager, donationManager, inventoryManager); - HubManager hubManager = new HubManager(this, blockRestore, clientManager, incognito, donationManager, inventoryManager, condition, disguiseManager, new TaskManager(this, clientManager, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this, packetHandler), npcManager, packetHandler, punish, serverStatusManager, customDataManager, boosterManager); + ThankManager thankManager = new ThankManager(this, clientManager, donationManager); + BoosterManager boosterManager = new BoosterManager(this, "", clientManager, donationManager, inventoryManager, thankManager); + HubManager hubManager = new HubManager(this, blockRestore, clientManager, incognito, donationManager, inventoryManager, condition, disguiseManager, new TaskManager(this, clientManager, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this, packetHandler), npcManager, packetHandler, punish, serverStatusManager, customDataManager, thankManager, boosterManager); HologramManager hologramManager = new HologramManager(this, packetHandler); ClansTransferManager serverManager = new ClansTransferManager(this, clientManager, donationManager, partyManager, portal, hubManager); diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java index 26f7065f6..0c598db11 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/HubManager.java @@ -63,6 +63,7 @@ import mineplex.core.punish.Punish; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; +import mineplex.core.thank.ThankManager; import mineplex.core.treasure.TreasureLocation; import mineplex.core.treasure.TreasureManager; import mineplex.core.updater.UpdateType; @@ -156,7 +157,7 @@ public class HubManager extends MiniPlugin private HashMap> _creativeAdmin = new HashMap>(); - public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, IncognitoManager incognito, DonationManager donationManager, InventoryManager inventoryManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager, StatsManager statsManager, AchievementManager achievementManager, HologramManager hologramManager, NpcManager npcManager, PacketHandler packetHandler, Punish punish, ServerStatusManager serverStatusManager, CustomDataManager customDataManager, BoosterManager boosterManager) + public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, IncognitoManager incognito, DonationManager donationManager, InventoryManager inventoryManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager, StatsManager statsManager, AchievementManager achievementManager, HologramManager hologramManager, NpcManager npcManager, PacketHandler packetHandler, Punish punish, ServerStatusManager serverStatusManager, CustomDataManager customDataManager, ThankManager thankManager, BoosterManager boosterManager) { super("Hub Manager", plugin); @@ -192,7 +193,7 @@ public class HubManager extends MiniPlugin FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager); YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager); - _bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, boosterManager); + _bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, thankManager); World world = _spawn.getWorld(); _treasureManager = new TreasureManager(_plugin, clientManager, serverStatusManager, donationManager, _inventoryManager, petManager, _gadgetManager, _blockRestore, hologramManager, statsManager, _bonusManager.getRewardManager()); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index b00dc44f1..6422c454f 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -1,6 +1,7 @@ package mineplex.hub; import mineplex.core.brawl.fountain.FountainManager; +import mineplex.core.thank.ThankManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -148,8 +149,9 @@ public class Hub extends JavaPlugin implements IRelation PersonalServerManager personalServerManager = new PersonalServerManager(this, clientManager); String boosterGroup = serverConfiguration.getServerGroup().getBoosterGroup(); - BoosterManager boosterManager = new BoosterManager(this, boosterGroup, clientManager, donationManager, inventoryManager); - HubManager hubManager = new HubManager(this, blockRestore, clientManager, incognito, donationManager, inventoryManager, conditionManager, disguiseManager, new TaskManager(this, clientManager, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this, packetHandler), npcManager, personalServerManager, packetHandler, punish, serverStatusManager, customDataManager, boosterManager); + ThankManager thankManager = new ThankManager(this, clientManager, donationManager); + BoosterManager boosterManager = new BoosterManager(this, boosterGroup, clientManager, donationManager, inventoryManager, thankManager); + HubManager hubManager = new HubManager(this, blockRestore, clientManager, incognito, donationManager, inventoryManager, conditionManager, disguiseManager, new TaskManager(this, clientManager, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this, packetHandler), npcManager, personalServerManager, packetHandler, punish, serverStatusManager, customDataManager, thankManager, boosterManager); HologramManager hologramManager = new HologramManager(this, packetHandler); QueueManager queueManager = new QueueManager(this, clientManager, donationManager, new EloManager(this, clientManager), partyManager); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index ab253345d..21e497f61 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -51,6 +51,7 @@ import mineplex.core.punish.Punish; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; +import mineplex.core.thank.ThankManager; import mineplex.core.treasure.TreasureManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -102,6 +103,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Random; +import java.util.stream.Collectors; public class HubManager extends MiniClientPlugin { @@ -161,7 +163,7 @@ public class HubManager extends MiniClientPlugin // private final String[] _songNames = {"JingleBells.nbs", "TheFirstNoel.nbs", "Hark.nbs", "DeckTheHalls.nbs", "Joy.nbs", "MerryChristmas.nbs"}; private final ArrayList _songs; - public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, IncognitoManager incognito, DonationManager donationManager, InventoryManager inventoryManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager, StatsManager statsManager, AchievementManager achievementManager, HologramManager hologramManager, NpcManager npcManager, PersonalServerManager personalServerManager, PacketHandler packetHandler, Punish punish, ServerStatusManager serverStatusManager, CustomDataManager customDataManager, BoosterManager boosterManager) + public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, IncognitoManager incognito, DonationManager donationManager, InventoryManager inventoryManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager, StatsManager statsManager, AchievementManager achievementManager, HologramManager hologramManager, NpcManager npcManager, PersonalServerManager personalServerManager, PacketHandler packetHandler, Punish punish, ServerStatusManager serverStatusManager, CustomDataManager customDataManager, ThankManager thankManager, BoosterManager boosterManager) { super("Hub Manager", plugin); @@ -198,7 +200,7 @@ public class HubManager extends MiniClientPlugin FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager); YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager); - _bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, boosterManager); + _bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, thankManager); _treasureManager = new TreasureManager(_plugin, clientManager, serverStatusManager, donationManager, _inventoryManager, petManager, _gadgetManager, _blockRestore, hologramManager, statsManager, _bonusManager.getRewardManager()); new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager, boosterManager); @@ -601,14 +603,7 @@ public class HubManager extends MiniClientPlugin event.setMessage(event.getMessage().substring(1, event.getMessage().length())); event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + playerName + " " + C.cPurple + "%2$s"); - - for (String name : party.getMembers()) - { - Player other = UtilPlayer.searchExact(name); - - if (other != null) - event.getRecipients().add(other); - } + event.getRecipients().addAll(party.getMembersByUUID().stream().map(Bukkit::getPlayer).collect(Collectors.toList())); } else { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/valentines/Courtship.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/valentines/Courtship.java index 948a334aa..f76644b16 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/valentines/Courtship.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/valentines/Courtship.java @@ -38,15 +38,15 @@ public class Courtship * Created by: Mysticate * Timestamp: February 6, 2016 */ - + private ValentinesManager _manager; private Player _player; private Sheep _sheep; private String _prefix; private final boolean _success; - + private int _tick = 0; - + public Courtship(ValentinesManager manager, Player player, Sheep sheep, String prefix, boolean success) { _manager = manager; @@ -55,14 +55,14 @@ public class Courtship _prefix = prefix; _success = success; } - + public boolean tick() { if (!_player.isOnline()) return true; - + _tick++; - + { Vector vec = UtilAlg.getTrajectory(_sheep, _player); UtilEnt.CreatureForceLook(_sheep, UtilAlg.GetPitch(vec), UtilAlg.GetYaw(vec)); @@ -77,21 +77,21 @@ public class Courtship Entity bottom = player; while (bottom.getVehicle() != null) bottom = bottom.getVehicle(); - + UtilAction.velocity(bottom, UtilAlg.getTrajectory2d(_sheep, bottom), .5, true, 0.8, 0, 10, true); player.playSound(player.getLocation(), Sound.CHICKEN_EGG_POP, 2f, 0.5f); - + UtilPlayer.message(player, F.main(_prefix, "I'm talking to someone else right now!")); } } } - + if (_tick == 20) { message("What do we have here?"); _sheep.getWorld().playSound(_sheep.getLocation(), Sound.NOTE_BASS, 1F, 1F); } - + if (_tick == 40) { if (_success) @@ -105,16 +105,16 @@ public class Courtship _sheep.getWorld().playSound(_sheep.getLocation(), Sound.NOTE_BASS, .5F, 1F); } } - + if (_tick > 40 && _tick < 80) { if (_tick % 2 == 0) { _sheep.getWorld().playSound(_sheep.getLocation(), Sound.DIG_GRASS, 1F, 1F); - + UtilParticle.PlayParticle(ParticleType.HEART, _sheep.getLocation().clone().add(0, 1, 0), new Vector(), 0F, 1, ViewDist.NORMAL, _player); UtilParticle.PlayParticle(ParticleType.FIREWORKS_SPARK, _sheep.getLocation(), 1F, 1F, 1F, 0F, 1, ViewDist.NORMAL, _player); - + _sheep.setColor(DyeColor.PINK); } else @@ -122,7 +122,7 @@ public class Courtship _sheep.setColor(DyeColor.WHITE); } } - + if (_tick == 80) { if (_success) @@ -134,10 +134,10 @@ public class Courtship { message(UtilMath.randomElement(FAIL_MESSAGES)); _sheep.getWorld().playSound(_sheep.getLocation(), Sound.ANVIL_BREAK, 1F, 1F); - _sheep.setColor(DyeColor.BLACK); + _sheep.setColor(DyeColor.BLACK); } } - + if (_tick > 80 && _tick < 120 && _success) { if (_tick % 2 == 0) @@ -149,31 +149,31 @@ public class Courtship _sheep.setColor(DyeColor.RED); } } - + if (_tick == 90 && _success) { message("I think..."); _sheep.getWorld().playSound(_sheep.getLocation(), Sound.FIZZ, 1F, 1F); } - + if (_tick == 100 && _success) { message("I think I'm in love!"); _sheep.getWorld().playSound(_sheep.getLocation(), Sound.LEVEL_UP, 1F, 1F); } - + if (_tick == 120 && _success) { message("Here, take this present as a token of my admiration."); - _sheep.getWorld().playSound(_sheep.getLocation(), Sound.LEVEL_UP, 1F, 1F); - + _sheep.getWorld().playSound(_sheep.getLocation(), Sound.LEVEL_UP, 1F, 1F); + _manager.giveReward(_player); - + _sheep.setColor(DyeColor.RED); - + UtilServer.broadcast(C.cYellowB + _player.getName() + C.cWhiteB + " tricked " + C.cGoldB + "Polly the Pink Sheep" + C.cWhiteB + " with a love potion!"); } - + if (_tick == 130) { _sheep.setColor(DyeColor.PINK); @@ -183,7 +183,7 @@ public class Courtship return false; } - + private void message(String message) { UtilPlayer.message(_player, " "); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 08de28ad9..e1a22a7bf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.HashMap; import mineplex.core.boosters.BoosterManager; +import mineplex.core.thank.ThankManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -159,7 +160,8 @@ public class Arcade extends JavaPlugin PetManager petManager = new PetManager(this, _clientManager, _donationManager, inventoryManager, disguiseManager, creature, blockRestore, webServerAddress); MountManager mountManager = new MountManager(this, _clientManager, _donationManager, blockRestore, disguiseManager); GadgetManager gadgetManager = new GadgetManager(this, _clientManager, _donationManager, inventoryManager, mountManager, petManager, preferenceManager, disguiseManager, blockRestore, projectileManager, achievementManager, packetHandler, hologramManager); - BoosterManager boosterManager = new BoosterManager(this, _serverConfiguration.getServerGroup().getBoosterGroup(), _clientManager, _donationManager, inventoryManager); + ThankManager thankManager = new ThankManager(this, _clientManager, _donationManager); + BoosterManager boosterManager = new BoosterManager(this, _serverConfiguration.getServerGroup().getBoosterGroup(), _clientManager, _donationManager, inventoryManager, thankManager); CosmeticManager cosmeticManager = new CosmeticManager(this, _clientManager, _donationManager, inventoryManager, gadgetManager, mountManager, petManager, null, boosterManager); cosmeticManager.setInterfaceSlot(6); cosmeticManager.disableTeamArmor(); @@ -168,7 +170,7 @@ public class Arcade extends JavaPlugin //Arcade Manager PollManager pollManager = new PollManager(this, _clientManager, _donationManager); - _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, statsManager, incognito, achievementManager, disguiseManager, creature, teleport, new Blood(this), chat, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress, pollManager, npcmanager, customDataManager, punish, eloManager, boosterManager); + _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, statsManager, incognito, achievementManager, disguiseManager, creature, teleport, new Blood(this), chat, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress, pollManager, npcmanager, customDataManager, punish, eloManager, thankManager, boosterManager); new GlobalPacketManager(this, _clientManager, serverStatusManager, inventoryManager, _donationManager, petManager, statsManager, _gameManager.getBonusManager().getRewardManager()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 7bffad2da..9ad8f7c99 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -47,6 +47,7 @@ import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; import mineplex.core.teleport.Teleport; +import mineplex.core.thank.ThankManager; import mineplex.core.timing.TimingManager; import mineplex.core.titangiveaway.TitanGiveawayManager; import mineplex.core.valentines.ValentinesGiftManager; @@ -203,7 +204,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation StatsManager statsManager, IncognitoManager incognitoManager, AchievementManager achievementManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Chat chat, Portal portal, PreferencesManager preferences, InventoryManager inventoryManager, PacketHandler packetHandler, CosmeticManager cosmeticManager, ProjectileManager projectileManager, PetManager petManager, HologramManager hologramManager, String webAddress, PollManager pollManager, - NpcManager npcManager, CustomDataManager customDataManager, Punish punish, EloManager eloManager, BoosterManager boosterManager) + NpcManager npcManager, CustomDataManager customDataManager, Punish punish, EloManager eloManager, ThankManager thankManager, BoosterManager boosterManager) { super("Game Manager", plugin); @@ -288,7 +289,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation new GameStatManager(this); FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager); YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager); - _bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _cosmeticManager.getGadgetManager(), boosterManager); + _bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _cosmeticManager.getGadgetManager(), thankManager); new GameLootManager(this, petManager, _bonusManager.getRewardManager()); _spectatorManager = new GameSpectatorManager(this); _gameWorldManager = new GameWorldManager(this); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java index 8c6139b9f..11ee67957 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java @@ -4,7 +4,7 @@ import mineplex.core.MiniPlugin; import mineplex.core.boosters.Booster; import mineplex.core.boosters.event.BoosterActivateEvent; import mineplex.core.boosters.event.BoosterExpireEvent; -import mineplex.core.boosters.tips.BoosterTipManager; +import mineplex.core.boosters.tips.BoosterThankManager; import mineplex.core.common.util.*; import mineplex.core.disguise.DisguiseManager; import mineplex.core.hologram.Hologram; @@ -177,7 +177,7 @@ public class BoosterPodium extends MiniPlugin return new String[] { C.cGreen + "Amplified by " + C.cWhite + booster.getPlayerName(), C.cWhite + booster.getTimeRemainingString() + " Remaining", - C.cAqua + "Click to Thank. You get " + BoosterTipManager.TIP_FOR_TIPPER + " Treasure Shards" + C.cAqua + "Click to Thank. You get " + BoosterThankManager.TIP_FOR_TIPPER + " Treasure Shards" }; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java index 01f2172df..90d0aad03 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java @@ -4,7 +4,7 @@ import mineplex.core.MiniPlugin; import mineplex.core.boosters.Booster; import mineplex.core.boosters.BoosterManager; import mineplex.core.boosters.event.BoosterActivateEvent; -import mineplex.core.boosters.tips.BoosterTipManager; +import mineplex.core.boosters.tips.BoosterThankManager; import mineplex.core.boosters.tips.TipAddResult; import mineplex.core.common.currency.GlobalCurrency; import mineplex.core.common.jsonchat.ClickEvent; @@ -59,11 +59,11 @@ public class GameBoosterManager extends MiniPlugin return; } - _boosterManager.getTipManager().addTip(player, active, result -> { + _boosterManager.getBoosterThankManager().addTip(player, active, result -> { if (result == TipAddResult.SUCCESS) { - UtilPlayer.message(player, F.main("Tip", "You thanked " + F.name(active.getPlayerName()) + ". They earned " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterTipManager.TIP_FOR_SPONSOR) + " and you got " - + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterTipManager.TIP_FOR_TIPPER)) + " in return!"); + UtilPlayer.message(player, F.main("Tip", "You thanked " + F.name(active.getPlayerName()) + ". They earned " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_SPONSOR) + " and you got " + + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_TIPPER)) + " in return!"); player.playSound(player.getLocation(), Sound.LEVEL_UP, 1f, 1f); } else { @@ -79,17 +79,24 @@ public class GameBoosterManager extends MiniPlugin public void onActivate(BoosterActivateEvent event) { Booster booster = event.getBooster(); + + boolean isTesting = event.getBoosterGroup().equalsIgnoreCase("Testing"); + if (event.getBoosterGroup().equals(_boosterGroup)) { Bukkit.broadcastMessage(F.main("Amplifier", F.name(booster.getPlayerName()) + " has activated a Game Amplifier for " + booster.getMultiplier() + "x Shards!")); - } else + } + else if (!isTesting) { Bukkit.broadcastMessage(F.main("Amplifier", F.name(booster.getPlayerName()) + " has activated a Game Amplifier on " + F.elem(event.getBoosterGroup().replaceAll("_", " ")) + "!")); } - JsonMessage message = new JsonMessage(F.main("Amplifier", F.elem("Click here") + " to thank them and receive " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterTipManager.TIP_FOR_TIPPER) + "!")); - message.click(ClickEvent.RUN_COMMAND, "/amplifier thank " + _boosterGroup); - message.hover(HoverEvent.SHOW_TEXT, C.cGreen + "Click to Thank"); - message.send(JsonMessage.MessageType.CHAT_BOX, UtilServer.getPlayers()); + if (event.getBoosterGroup().equals(_boosterGroup) || !isTesting) + { + JsonMessage message = new JsonMessage(F.main("Amplifier", F.elem("Click here") + " to thank them and get " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_TIPPER) + "!")); + message.click(ClickEvent.RUN_COMMAND, "/amplifier thank " + event.getBoosterGroup()); + message.hover(HoverEvent.SHOW_TEXT, C.cGreen + "Click to Thank"); + message.send(JsonMessage.MessageType.CHAT_BOX, UtilServer.getPlayers()); + } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/CardFactory.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/CardFactory.java index ac0f3834d..8f3ef9115 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/CardFactory.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/CardFactory.java @@ -10,57 +10,57 @@ import mineplex.core.map.MapText; public class CardFactory { private MapText _mapText; - + public CardFactory() { _mapText = new MapText(); } - + private String[] _questions = new String[] { - "When I get home from school, I crave _____.", "I was playing One in the Quiver when I ran into ____.", "Ultra+ now get free _____ every month.", "Everything was fine until _____ joined.", "Help me! My mom is _______.", "_________ crashed the server again…", "_______ ate his pet rabbit when he saw __________.", "My mouse batteries died because I was using it for ______.", "______ is the #1 reason of deaths on the server.", "Ugh, I'm lagging thanks to _____!", "I need to go to the doctor, I'm sick with _________!", "My best friend thinks he is _____.", "The cure for all diseases is partially made out of _____.", "When i was little i wanted to become a ______ and use _____ to save the world.", "I painted a beautiful painting of ____!", "When you grow up you will realize that ______ is all you need.", "_______ knew he had made the wrong choice when he realised he was _______.", "While falling asleep, I dreamt of ______ kissing ______.", "I went to a fancy restaurant, but the chef gave me _____!", "What am I supposed to do when I see _____ ______?", "There is absolutely nothing worse in this world than ___________.", "I get all excited and tingly when I see ________!", "I would rather be _________ than _________.", "I think my brother is a big fan of _______.", "Why can't I sleep at night?", "What's that smell?", "I got 99 problems but ________ ain't one.", "What's the next game coming out on Mineplex?", "What is the next trend on YouTube?", "It's a pity that kids these days are getting involved with ________.", "What's that sound?", "What should I look for in a girlfriend?", "I wish I could forget about _______.", "What don't you want to find in your treasure chest?", "I can't take you seriously when you are always _________.", "I'm sorry, but I couldn't finish my homework because of _________.", "What does Batman do in his spare time?", "What's a girl's best friend?", "___________. That's how I want to die.", "For my next trick, I will pull _______ out of ________.", "________ is a slippery slope that leads to ________.", "Instead of coal, Santa now gives the bad children ________.", "An exciting game of The Bridges would be incomplete without _________.", "War! What is it good for?", "While mining diamonds, I like to think about ________.", "What are my parents hiding from me?", "What will always make girls like you?", "What did I bring back from the Nether?", "What don't you want to find in your Mushroom Soup?", "Step 1: __________, Step 2: __________, Step 3: Profit!" ,"What makes you need to fart?", "What do old people smell like?", "What's your secret power?", "The class field trip was completely ruined by _______.", "I never understood _______, until I found ________.", "What does Justin Beiber enjoy in his spare time?", "Why is the Villager sticky?", "Scientists think that Creepers explode because of _________.", "Why do you hurt all over?", "When you are a billionaire, you will spend all of your money on ________.", "How do you cheer up a sad friend?", "What is the new diet everyone is trying?", "What is the secret ingredient in Mountain Dew?", "________ is one of the few things that makes me happy.", "The most important thing you need to build a house is ________.", "What is the best way to get unbanned from Mineplex?", "_________ is the secret to winning at Super Smash Mobs.", + "When I get home from school, I crave _____.", "I was playing One in the Quiver when I ran into ____.", "Ultra+ now get free _____ every month.", "Everything was fine until _____ joined.", "Help me! My mom is _______.", "_________ crashed the server again…", "_______ ate his pet rabbit when he saw __________.", "My mouse batteries died because I was using it for ______.", "______ is the #1 reason of deaths on the server.", "Ugh, I'm lagging thanks to _____!", "I need to go to the doctor, I'm sick with _________!", "My best friend thinks he is _____.", "The cure for all diseases is partially made out of _____.", "When i was little i wanted to become a ______ and use _____ to save the world.", "I painted a beautiful painting of ____!", "When you grow up you will realize that ______ is all you need.", "_______ knew he had made the wrong choice when he realised he was _______.", "While falling asleep, I dreamt of ______ kissing ______.", "I went to a fancy restaurant, but the chef gave me _____!", "What am I supposed to do when I see _____ ______?", "There is absolutely nothing worse in this world than ___________.", "I get all excited and tingly when I see ________!", "I would rather be _________ than _________.", "I think my brother is a big fan of _______.", "Why can't I sleep at night?", "What's that smell?", "I got 99 problems but ________ ain't one.", "What's the next game coming out on Mineplex?", "What is the next trend on YouTube?", "It's a pity that kids these days are getting involved with ________.", "What's that sound?", "What should I look for in a girlfriend?", "I wish I could forget about _______.", "What don't you want to find in your treasure chest?", "I can't take you seriously when you are always _________.", "I'm sorry, but I couldn't finish my homework because of _________.", "What does Batman do in his spare time?", "What's a girl's best friend?", "___________. That's how I want to die.", "For my next trick, I will pull _______ out of ________.", "________ is a slippery slope that leads to ________.", "Instead of coal, Santa now gives the bad children ________.", "An exciting game of The Bridges would be incomplete without _________.", "War! What is it good for?", "While mining diamonds, I like to think about ________.", "What are my parents hiding from me?", "What will always make girls like you?", "What did I bring back from the Nether?", "What don't you want to find in your Mushroom Soup?", "Step 1: __________, Step 2: __________, Step 3: Profit!" ,"What makes you need to fart?", "What do old people smell like?", "What's your secret power?", "The class field trip was completely ruined by _______.", "I never understood _______, until I found ________.", "What does Justin Beiber enjoy in his spare time?", "Why is the Villager sticky?", "Scientists think that Creepers explode because of _________.", "Why do you hurt all over?", "When you are a billionaire, you will spend all of your money on ________.", "How do you cheer up a sad friend?", "What is the new diet everyone is trying?", "What is the secret ingredient in Mountain Dew?", "________ is one of the few things that makes me happy.", "The most important thing you need to build a house is ________.", "What is the best way to get unbanned from Mineplex?", "_________ is the secret to winning at Super Smash Mobs.", }; - + private String[] _answers = new String[] { - "A Stinky Pig Butt", "Mouldy Raw Fish", "A sawed off 10-foot pole", "billions of diamonds", "A whiny forum post", "Sparkling Diamonds", "Sheep that don’t know when to stop", "Villager Legs", "Curdled cow milk", "That one popcorn piece stuck in your teeth.", "THE DIAMOND DANCE!", "an unstoppable addiction to fly hacks", "the biggest pile of poop you've ever seen!", "Bed time", "A bag of Doritos and a Mountain Dew.", "zombies chewing on my butt", "Jazz hands", "Brain surgery", "A disappointing birthday party.", "Overly friendly Iron Golems", "An Endermans favourite block", "Puppies!", "your friend who deleted you from Skype", "being on fire", "two cows stealing your wallet", "a lifetime of sadness", "a golden notch apple", "dragon eggs", "holding hands", "kissing", "wearing parents on your head", "soup that is too hot", "edible underpants", "people who are terrible at PvP", "obesity", "sheep eating potatoes", "my collection of spider eyes", "oversized fishing rods", "working as a team", "horse meat", "zombies screaming while on fire", "a ghast calling her dad to say happy birthday", "Microsoft releasing a good game", "bad childhood memories", "a bad haircut", "a steamy locker room", "armed robbery", "bankruptcy", "stacks of TNT", "a block of dirt", "cold pizza", "a pack of angry wolves", "eternal sadness", "the Nether", "a blaze having a barbeque", "Endermen robbing your house", "dental surgery", "religious villagers", "poor villagers", "flesh-eating bacteria", "the drive to win", "friends who take all your loot", "Morgan Freeman", "Darth Vader", "Villager #17", "Barrack Obama", "Lady Gaga", "That one hobo that lives down the street", "A Sad Creeper", "Parker Games", "A shaved sheep", "CaptainSparklez", "DanTDM", "SkyDoesMinecraft", "Mineplex", "A Mineplex Administrator", "Miley Cyrus", "Notch", "Mojang", "Pikachu", "BATMAN!!!", "The Hulk", "Justin Beiber", "Herobrine", "Pirates", "Vikings", "Ninjas", "Uncontrollably pooping", "Dancing until a helper warned me", "Making passive aggressive tweets", "complaining about balance on the forums", "Chopping down the mineplex lobby tree", "crashing servers", "falling off a cliff", "Realizing that you arent actually a ninja.", "Eating a hot pepper", "Digging straight down", "using xray hacks", "picking your nose", "Playing against a team in SSM", "Mining diamond with a stone pickaxe", "stepping on Legos", "Shaking it off", "Watching Parker games", "Accidentally hiding an egg as Easter bunny morph", "doing a poop and realizing there is no toilet paper", "Eating rotten flesh", "Understanding how magnets work", "watching videos on YouTube", "finding Legendary loot in a Treasure Chest", "Doing homework", "dividing by 0", "Finding out the meaning of life", "banning players for no reason", "dying", "so angry that he pooped himself.", "spending hours planting carrots", "doing the right thing", "sleeping in a cave", "getting drunk on potions", "trolling on the internet", "punching a tree", "leaving a stinky surprise", "doing math", "being devoured by zombie pigmen", "farting and walking away", "sneakily doing a poop", "blowing everything up with TNT", "peeing a little bit", "Tweeting about cats", "reading the instructions carefully", - "leaving some poop in the corner of the room", "eating a balanced breakfast", "puking", "shooting arrows at bats", "typing /kill", "watching Frozen repeatedly", "building a house out of dirt", "winking at chickens", "yelling at a toaster", "putting in 110% effort", "paying a lot of money", "bribing with candy", "throwing rocks at people", "crying until everything is better" + "A Stinky Pig Butt", "Mouldy Raw Fish", "A sawed off 10-foot pole", "billions of diamonds", "A whiny forum post", "Sparkling Diamonds", "Sheep that don’t know when to stop", "Villager Legs", "Curdled cow milk", "That one popcorn piece stuck in your teeth.", "THE DIAMOND DANCE!", "an unstoppable addiction to fly hacks", "the biggest pile of poop you've ever seen!", "Bed time", "A bag of Doritos and a Mountain Dew.", "zombies chewing on my butt", "Jazz hands", "Brain surgery", "A disappointing birthday party.", "Overly friendly Iron Golems", "An Endermans favourite block", "Puppies!", "your friend who deleted you from Skype", "being on fire", "two cows stealing your wallet", "a lifetime of sadness", "a golden notch apple", "dragon eggs", "holding hands", "kissing", "wearing parents on your head", "soup that is too hot", "edible underpants", "people who are terrible at PvP", "obesity", "sheep eating potatoes", "my collection of spider eyes", "oversized fishing rods", "working as a team", "horse meat", "zombies screaming while on fire", "a ghast calling her dad to say happy birthday", "Microsoft releasing a good game", "bad childhood memories", "a bad haircut", "a steamy locker room", "armed robbery", "bankruptcy", "stacks of TNT", "a block of dirt", "cold pizza", "a pack of angry wolves", "eternal sadness", "the Nether", "a blaze having a barbeque", "Endermen robbing your house", "dental surgery", "religious villagers", "poor villagers", "flesh-eating bacteria", "the drive to win", "friends who take all your loot", "Morgan Freeman", "Darth Vader", "Villager #17", "Barrack Obama", "Lady Gaga", "That one hobo that lives down the street", "A Sad Creeper", "Parker Games", "A shaved sheep", "CaptainSparklez", "DanTDM", "SkyDoesMinecraft", "Mineplex", "A Mineplex Administrator", "Miley Cyrus", "Notch", "Mojang", "Pikachu", "BATMAN!!!", "The Hulk", "Justin Beiber", "Herobrine", "Pirates", "Vikings", "Ninjas", "Uncontrollably pooping", "Dancing until a helper warned me", "Making passive aggressive tweets", "complaining about balance on the forums", "Chopping down the mineplex lobby tree", "crashing servers", "falling off a cliff", "Realizing that you arent actually a ninja.", "Eating a hot pepper", "Digging straight down", "using xray hacks", "picking your nose", "Playing against a team in SSM", "Mining diamond with a stone pickaxe", "stepping on Legos", "Shaking it off", "Watching Parker games", "Accidentally hiding an egg as Easter bunny morph", "doing a poop and realizing there is no toilet paper", "Eating rotten flesh", "Understanding how magnets work", "watching videos on YouTube", "finding Legendary loot in a Treasure Chest", "Doing homework", "dividing by 0", "Finding out the meaning of life", "banning players for no reason", "dying", "so angry that he pooped himself.", "spending hours planting carrots", "doing the right thing", "sleeping in a cave", "getting drunk on potions", "trolling on the internet", "punching a tree", "leaving a stinky surprise", "doing math", "being devoured by zombie pigmen", "farting and walking away", "sneakily doing a poop", "blowing everything up with TNT", "peeing a little bit", "Tweeting about cats", "reading the instructions carefully", + "leaving some poop in the corner of the room", "eating a balanced breakfast", "puking", "shooting arrows at bats", "typing /kill", "watching Frozen repeatedly", "building a house out of dirt", "winking at chickens", "yelling at a toaster", "putting in 110% effort", "paying a lot of money", "bribing with candy", "throwing rocks at people", "crying until everything is better" }; - + public String getQuestionCard() { return _questions[UtilMath.r(_questions.length)]; } - + public String getAnswerCard() { return _answers[UtilMath.r(_answers.length)]; } - public ItemStack getAnswerStack() + public ItemStack getAnswerStack() { String text = getAnswerCard(); - + ItemStack stack = _mapText.getMap(true, text); - + ItemMeta meta = stack.getItemMeta(); meta.setDisplayName(C.cGreen + text); stack.setItemMeta(meta); - + return stack; } - + public ItemStack getQuestionStack() { String text = getQuestionCard(); - + ItemStack stack = _mapText.getMap(true, text); - + ItemMeta meta = stack.getItemMeta(); meta.setDisplayName(C.cYellow + text); stack.setItemMeta(meta); - + return stack; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java index d357ced98..ea5d5e663 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java @@ -1009,7 +1009,7 @@ public abstract class SurvivalGames extends Game handlePickup(event.getItem().getItemStack()); } - private void handlePickup(ItemStack stack) + public void handlePickup(ItemStack stack) { if (stack.getType() == Material.CARROT || stack.getType() == Material.POTATO diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/UHCSurvivalgames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/UHCSurvivalgames.java index e7d1a30f2..8c2ba3e65 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/UHCSurvivalgames.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/UHCSurvivalgames.java @@ -1,21 +1,38 @@ package nautilus.game.arcade.game.games.survivalgames.modes; +import org.bukkit.Bukkit; import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.Chest; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; +import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Objective; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilTime; +import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.loot.RandomItem; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.games.AbsorptionFix; import nautilus.game.arcade.game.games.survivalgames.SoloSurvivalGames; +import nautilus.game.arcade.game.games.survivalgames.SupplyChestOpenEvent; +import nautilus.game.arcade.game.games.survivalgames.kit.KitLooter; +import nautilus.game.arcade.game.games.survivalgames.modes.kit.KitSurvivalist; +import nautilus.game.arcade.kit.Kit; /** * UHCSurvivalgames gamemode for Survivalgames @@ -25,14 +42,73 @@ import nautilus.game.arcade.game.games.survivalgames.SoloSurvivalGames; public class UHCSurvivalgames extends SoloSurvivalGames { + private long _peacePhase; + private boolean _peace; + public UHCSurvivalgames(ArcadeManager manager) { - super(manager, GameType.Brawl); + super(manager, new Kit[] + { + new KitSurvivalist(manager) + }, + GameType.Brawl); + _peacePhase = 45000; // 45 Seconds SoupEnabled = false; + DamagePvP = false; + + BlockBreak = true; + BlockPlace = true; + + BlockBreakDeny.add(Material.DIAMOND_BLOCK.getId()); + BlockBreakDeny.add(Material.IRON_BLOCK.getId()); + BlockBreakDeny.add(Material.GOLD_BLOCK.getId()); + BlockBreakDeny.add(Material.REDSTONE_ORE.getId()); + BlockBreakDeny.add(Material.REDSTONE_WIRE.getId()); + BlockBreakDeny.add(Material.REDSTONE.getId()); + BlockBreakDeny.add(Material.TNT.getId()); + BlockBreakDeny.add(Material.CHEST.getId()); + + BlockPlaceDeny.add(Material.REDSTONE.getId()); + BlockPlaceDeny.add(Material.REDSTONE_ORE.getId()); + BlockPlaceDeny.add(Material.REDSTONE_WIRE.getId()); + BlockPlaceDeny.add(Material.CHEST.getId()); + new AbsorptionFix(this); } + + @EventHandler + public void enableDamage(UpdateEvent event) + { + if (event.getType() != UpdateType.SEC) + return; + + if (!IsLive()) + return; + + if (!UtilTime.elapsed(GetStateTime(), _peacePhase)) + return; + + if (!_peace) + return; + + _peace = false; + + Announce(F.main("Game", "The Peace Phase has ended! You can now fight each other!")); + DamagePvP = true; + } + + @EventHandler + public void informPeace(GameStateChangeEvent event) + { + if (event.GetState() != GameState.Live) + return; + + _peace = true; + + Announce(F.main("Game", "A Peace Phase of " + F.time((_peacePhase/1000) + "") + " seconds has started!")); + } @EventHandler public void registerObj(GameStateChangeEvent event) @@ -58,14 +134,243 @@ public class UHCSurvivalgames extends SoloSurvivalGames { if (event.getEntity() instanceof Player) { - event.getDrops().add(new ItemStack(Material.GOLDEN_APPLE)); + event.getDrops().add(new ItemStack(Material.GOLDEN_APPLE, 2)); } } + + @EventHandler(priority=EventPriority.LOWEST) + public void spawnBreak(BlockBreakEvent event) + { + if (UtilMath.offset(event.getBlock().getLocation(), getSpawn()) < 40) + event.setCancelled(true); + } + + @EventHandler(priority=EventPriority.LOWEST) + public void spawnPlace(BlockPlaceEvent event) + { + if (UtilMath.offset(event.getBlock().getLocation(), getSpawn()) < 40) + event.setCancelled(true); + } + public void setupLoot() + { + // Build material + getBaseLoot().addLoot(new RandomItem(Material.WOOD, 40, 7, 15)); + + // Food + getBaseLoot().addLoot(new RandomItem(Material.BAKED_POTATO, 40, 1, 3)); + getBaseLoot().addLoot(new RandomItem(Material.COOKED_BEEF, 40, 1, 2)); + getBaseLoot().addLoot(new RandomItem(Material.COOKED_CHICKEN, 40, 1, 2)); + getBaseLoot().addLoot(new RandomItem(Material.MUSHROOM_SOUP, 10, 1, 1)); + getBaseLoot().addLoot(new RandomItem(Material.PORK, 35, 1, 4)); + + // Weapons + getBaseLoot().addLoot(new RandomItem(Material.IRON_AXE, 80)); + getBaseLoot().addLoot(new RandomItem(Material.IRON_SWORD, 70)); + getBaseLoot().addLoot(new RandomItem(Material.DIAMOND_AXE, 60)); + getBaseLoot().addLoot(new RandomItem(Material.DIAMOND_SWORD, 30)); + + // Gold armor + getBaseLoot().addLoot(new RandomItem(Material.GOLD_BOOTS, 25)); + getBaseLoot().addLoot(new RandomItem(Material.GOLD_CHESTPLATE, 25)); + getBaseLoot().addLoot(new RandomItem(Material.GOLD_HELMET, 25)); + getBaseLoot().addLoot(new RandomItem(Material.GOLD_LEGGINGS, 25)); + + // Chain armor + getBaseLoot().addLoot(new RandomItem(Material.CHAINMAIL_BOOTS, 20)); + getBaseLoot().addLoot(new RandomItem(Material.CHAINMAIL_CHESTPLATE, 20)); + getBaseLoot().addLoot(new RandomItem(Material.CHAINMAIL_HELMET, 20)); + getBaseLoot().addLoot(new RandomItem(Material.CHAINMAIL_LEGGINGS, 20)); + + // Throwable + getBaseLoot().addLoot(new RandomItem(Material.FISHING_ROD, 30)); + getBaseLoot().addLoot(new RandomItem(Material.BOW, 20)); + getBaseLoot().addLoot(new RandomItem(Material.ARROW, 40, 2, 4)); + + // Misc + getBaseLoot().addLoot(new RandomItem(Material.EXP_BOTTLE, 40, 1, 2)); + getBaseLoot().addLoot(new RandomItem(Material.COMPASS, 20)); + getBaseLoot().addLoot(new RandomItem(Material.STICK, 30, 1, 2)); + getBaseLoot().addLoot(new RandomItem(Material.BOAT, 15)); + getBaseLoot().addLoot(new RandomItem(Material.GOLD_INGOT, 20)); + getBaseLoot().addLoot(new RandomItem(Material.GOLDEN_APPLE, 2)); + getBaseLoot().addLoot(new RandomItem(ItemStackFactory.Instance.CreateStack( + Material.TNT, (byte) 0, 1, F.item("Throwing TNT")), 15)); + getSpawnLoot().addLoot(new RandomItem(Material.MUSHROOM_SOUP, 15)); + + getSpawnLoot().cloneLoot(getBaseLoot()); + + // Food + getSpawnLoot().addLoot(new RandomItem(Material.BAKED_POTATO, 30, 1, 5)); + getSpawnLoot().addLoot(new RandomItem(Material.CAKE, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.MUSHROOM_SOUP, 30, 1, 1)); + getSpawnLoot().addLoot(new RandomItem(Material.COOKED_BEEF, 30, 1, 3)); + getSpawnLoot().addLoot(new RandomItem(Material.COOKED_CHICKEN, 30, 1, 3)); + getSpawnLoot().addLoot(new RandomItem(Material.COOKED_FISH, 30, 1, 6)); + getSpawnLoot().addLoot(new RandomItem(Material.GRILLED_PORK, 30, 1, 3)); + getSpawnLoot().addLoot(new RandomItem(Material.COOKIE, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.PUMPKIN_PIE, 30, 1, 3)); + getSpawnLoot().addLoot(new RandomItem(Material.APPLE, 30, 2, 6)); + + // Loot for chests in spawn + // Weaponry and ores + getSpawnLoot().addLoot(new RandomItem(Material.STONE_SWORD, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.IRON_AXE, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.IRON_INGOT, 40, 1, 2)); + getSpawnLoot().addLoot(new RandomItem(Material.DIAMOND, 30)); + + // Iron gear + getSpawnLoot().addLoot(new RandomItem(Material.IRON_BOOTS, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.IRON_CHESTPLATE, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.IRON_HELMET, 30)); + getSpawnLoot().addLoot(new RandomItem(Material.IRON_LEGGINGS, 30)); + + // Supply crate loot + // Diamond gear + getCrateLoot().addLoot(new RandomItem(Material.DIAMOND_HELMET, 10)); + getCrateLoot().addLoot(new RandomItem(Material.DIAMOND_CHESTPLATE, 6)); + getCrateLoot().addLoot(new RandomItem(Material.DIAMOND_LEGGINGS, 8)); + getCrateLoot().addLoot(new RandomItem(Material.DIAMOND_BOOTS, 10)); + + // Iron gear + getCrateLoot().addLoot(new RandomItem(Material.IRON_HELMET, 30)); + getCrateLoot().addLoot(new RandomItem(Material.IRON_CHESTPLATE, 24)); + getCrateLoot().addLoot(new RandomItem(Material.IRON_LEGGINGS, 27)); + getCrateLoot().addLoot(new RandomItem(Material.IRON_BOOTS, 30)); + + // Weapons + getCrateLoot().addLoot(new RandomItem(Material.IRON_SWORD, 24)); + getCrateLoot().addLoot(new RandomItem(Material.DIAMOND_SWORD, 8)); + getCrateLoot().addLoot(new RandomItem(Material.DIAMOND_AXE, 16)); + + // Cooked furnace + getFurnace().addLoot(new RandomItem(Material.COOKED_BEEF, 3, 1, 2)); + getFurnace().addLoot(new RandomItem(Material.COOKED_CHICKEN, 3, 1, 2)); + getFurnace().addLoot(new RandomItem(Material.COOKED_FISH, 3, 1, 2)); + getFurnace().addLoot(new RandomItem(Material.GRILLED_PORK, 3, 1, 2)); + getFurnace().addLoot(new RandomItem(Material.BAKED_POTATO, 3, 1, 1)); + getFurnace().addLoot(new RandomItem(Material.PUMPKIN_PIE, 3, 1, 1)); + getFurnace().addLoot(new RandomItem(Material.IRON_INGOT, 1, 1, 1)); + + // Raw furnace + getRawFurnace().addLoot(new RandomItem(Material.RAW_BEEF, 1, 1, 3)); + getRawFurnace().addLoot(new RandomItem(Material.RAW_CHICKEN, 1, 1, 3)); + getRawFurnace().addLoot(new RandomItem(Material.RAW_FISH, 1, 1, 3)); + getRawFurnace().addLoot(new RandomItem(Material.PORK, 1, 1, 3)); + getRawFurnace().addLoot(new RandomItem(Material.POTATO_ITEM, 1, 1, 3)); + + // Deathmatch Loot + getDeathMatch().addLoot(new RandomItem(Material.PUMPKIN_PIE, 4)); + getDeathMatch().addLoot(new RandomItem(Material.BAKED_POTATO, 4)); + getDeathMatch().addLoot(new RandomItem(Material.CAKE, 4)); + getDeathMatch().addLoot(new RandomItem(Material.APPLE, 4)); + getDeathMatch().addLoot(new RandomItem(Material.WOOD_SWORD, 3)); + getDeathMatch().addLoot(new RandomItem(Material.WOOD_AXE, 3)); + getDeathMatch().addLoot(new RandomItem(Material.STONE_AXE, 3)); + getDeathMatch().addLoot(new RandomItem(Material.STONE_SWORD, 1)); + } + + public void fillChest(Player looter, Block block) + { + getLootedBlocks().add(block.getLocation()); + + Chest chest = (Chest) block.getState(); + + chest.getBlockInventory().clear(); + + int items = 2; + if (Math.random() > 0.50) + items++; + if (Math.random() > 0.65) + items++; + if (Math.random() > 0.80) + items++; + if (Math.random() > 0.95) + items++; + + boolean spawnChest = getChestRefillTime() > 0 + && UtilMath.offset(chest.getLocation(), getSpawn()) < 8; + + if (spawnChest) + items += 3; + + if (GetKit(looter) instanceof KitLooter) + { + items += UtilMath.r(3); + } + + if (getSupplyBlocks().contains(block)) + { + items = 2; + if (Math.random() > 0.75) + items++; + if (Math.random() > 0.95) + items++; + } + + for (int i = 0; i < items; i++) + { + ItemStack item; + + if (spawnChest) + { + item = getSpawnLoot().getLoot(); + } + else if (isDeathMatchTeleported()) + { + item = getDeathMatch().getLoot(); + } + else + { + boolean drop = getSupplyBlocks().contains(block); + item = GetChestItem(drop); + + // Golden apple spawn + if (drop && i == items) + item = new ItemStack(Material.GOLDEN_APPLE); + } + + if (item.getType() == Material.COMPASS) + { + item = buildCompass(5); + } + + handlePickup(item); + + chest.getBlockInventory().setItem(UtilMath.r(27), item); + } + + if (getSupplyBlocks().contains(block)) + { + Bukkit.getPluginManager().callEvent( + new SupplyChestOpenEvent(looter, block)); + } + + getSupplyBlocks().remove(block); + } + + @Override + @EventHandler + public void preventCrafting(PrepareItemCraftEvent event) + { + ItemStack result = event.getInventory().getResult(); + + if (result != null) + { + Material type = result.getType(); + + if (type == Material.BUCKET + || type == Material.FLINT_AND_STEEL) + { + event.getInventory().setResult(new ItemStack(Material.AIR)); + } + } + } + @Override public String GetMode() { - return "UHC Survivalagmes"; + return "UHC Survivalgames"; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/kit/KitSurvivalist.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/kit/KitSurvivalist.java new file mode 100644 index 000000000..d2165eeea --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/modes/kit/KitSurvivalist.java @@ -0,0 +1,48 @@ +package nautilus.game.arcade.game.games.survivalgames.modes.kit; + +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.kit.KitAvailability; +import nautilus.game.arcade.kit.Perk; + +/** + * KitSurvivalist + * + * @author xXVevzZXx + */ +public class KitSurvivalist extends Kit +{ + public KitSurvivalist(ArcadeManager manager) + { + super(manager, "Survivalist", KitAvailability.Free, + new String[] + { + "You are a survival expert!", + }, + new Perk[] + { + + }, + EntityType.PLAYER, + new ItemStack(Material.AIR)); + + } + + @Override + public void GiveItems(Player player) + { + + } + + @Override + public void SpawnCustom(LivingEntity ent) + { + + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java index 368746c24..00beb0a37 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java @@ -11,6 +11,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.GameTeam; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -25,6 +26,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; import java.util.Map; +import java.util.stream.Collectors; public class GameChatManager implements Listener { @@ -131,20 +133,14 @@ public class GameChatManager implements Listener event.setMessage(event.getMessage().substring(1, event.getMessage().length())); event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + event.getPlayer().getName() + " " + C.cPurple + "%2$s"); - - for (String member : party.getMembers()) - { - Player other = UtilPlayer.searchExact(member); - - if (other != null) - event.getRecipients().add(other); - } + event.getRecipients().addAll(party.getMembersByUUID().stream().map(Bukkit::getPlayer).collect(Collectors.toList())); } else { - UtilPlayer.message(sender, F.main("Party", "You are not in a Party.")); + UtilPlayer.message(event.getPlayer(), F.main("Party", "You are not in a Party.")); event.setCancelled(true); } + return; } @@ -156,7 +152,7 @@ public class GameChatManager implements Listener format = event.getFormat().split(rankStr)[0]; name = _manager.GetColor(sender) + sender.getName() + C.Reset; - if (event.getMessage().charAt(0) == '@') + if (event.getMessage().charAt(0) == '#') message = event.getFormat().split(sender.getName())[1].replace("%2$s", "") + _manager.GetChat().getFilteredMessage(sender, event.getMessage().substring(1, event.getMessage().length())); else message = event.getFormat().split(sender.getName())[1].replace("%2$s", "") + _manager.GetChat().getFilteredMessage(sender, event.getMessage());