Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics

Plugins/Mineplex.Core.Common/pom.xml

@@ -16,6 +16,10 @@
             <groupId>com.mineplex</groupId>
             <artifactId>spigot</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java

@@ -1,29 +1,40 @@
 package mineplex.core.common;
 
+import mineplex.core.common.util.C;
 import org.bukkit.Material;
 
 public enum CurrencyType
 {
-	Tokens("Tokens", Material.EMERALD),
+	TOKEN("Tokens", "Token", C.cWhite, Material.EMERALD),
-	Coins("Treasure Shards", Material.PRISMARINE_SHARD),
+	TREASURE_SHARD("Treasure Shards", "Treasure Shard", C.cAqua, Material.PRISMARINE_SHARD),
-	Gems("Gems", Material.EMERALD),
+	GEM("Gems", "Gem", C.cGreen, Material.EMERALD),
-	Gold("Gold", Material.GOLD_NUGGET);
+	GOLD("Gold", "Gold", C.cGold, Material.GOLD_NUGGET);
 
-	private String _prefix;
+	private String _plural;
+	private String _single;
+	private String _color;
 	private Material _displayMaterial;
 	
-	CurrencyType(String prefix, Material displayMaterial)
+	CurrencyType(String plural, String single, String color, Material displayMaterial)
 	{
-		_prefix = prefix;
+		_plural = plural;
+		_single = single;
+		_color = color;
 		_displayMaterial = displayMaterial;
 	}
 
-	public String Prefix()
+	@Deprecated
+	public String getPrefix()
 	{
-		return _prefix;
+		return _plural;
 	}
 
-	public Material GetDisplayMaterial()
+	public String getString(int amount)
+	{
+		return _color + amount + " " + (amount == 1 ? _single : _plural);
+	}
+	
+	public Material getDisplayMaterial()
 	{
 		return _displayMaterial;
 	}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/MaterialData.java

@@ -23,6 +23,16 @@ public class MaterialData
 		return new MaterialData(material, data);
 	}
 
+	public Material getMaterial()
+	{
+		return _material;
+	}
+
+	public byte getData()
+	{
+		return _data;
+	}
+
 	@Override
 	public boolean equals(Object o)
 	{

Plugins/Mineplex.Core.Common/src/mineplex/core/common/SortedSchematicLoader.java

@@ -0,0 +1,48 @@
+package mineplex.core.common;
+
+import mineplex.core.common.block.schematic.Schematic;
+import org.bukkit.Location;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Loads schematics based on an ordered input value. A good example of usage would be to load schematics in the
+ * ordering of a progress bar.
+ *
+ * @author Shaun Bennett
+ */
+public class SortedSchematicLoader<T>
+{
+	private final TreeMap<T, Schematic> _schematicMap;
+	private final Location _pasteLocation;
+	private T _currentValue = null;
+
+	public SortedSchematicLoader(Location pasteLocation)
+	{
+		this(pasteLocation, null);
+	}
+
+	public SortedSchematicLoader(Location pasteLocation, Comparator<T> comparator)
+	{
+		_schematicMap = new TreeMap<>(comparator);
+		_pasteLocation = pasteLocation;
+	}
+
+	public void addSchematic(T minValue, Schematic schematic)
+	{
+		_schematicMap.put(minValue, schematic);
+	}
+
+	public void update(T value)
+	{
+		Map.Entry<T, Schematic> entry = _schematicMap.floorEntry(value);
+
+		if (entry != null && !entry.getKey().equals(_currentValue))
+		{
+			_currentValue = entry.getKey();
+			entry.getValue().paste(_pasteLocation, false);
+		}
+	}
+}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/api/ApiEndpoint.java

@@ -0,0 +1,25 @@
+package mineplex.core.common.api;
+
+import com.google.gson.Gson;
+
+/**
+ * @author Shaun Bennett
+ */
+public class ApiEndpoint
+{
+	private static final String API_HOST = "10.33.53.12";
+	private static final int API_PORT = 7979;
+
+	private ApiWebCall _webCall;
+
+	public ApiEndpoint(String path, Gson gson)
+	{
+		String url = "http://" + API_HOST + ":" + API_PORT + path;
+		_webCall = new ApiWebCall(url, gson);
+	}
+
+	protected ApiWebCall getWebCall()
+	{
+		return _webCall;
+	}
+}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/api/ApiFieldNamingStrategy.java

@@ -0,0 +1,17 @@
+package mineplex.core.common.api;
+
+import com.google.gson.FieldNamingStrategy;
+
+import java.lang.reflect.Field;
+
+/**
+ * @author Shaun Bennett
+ */
+public class ApiFieldNamingStrategy implements FieldNamingStrategy
+{
+	@Override
+	public String translateName(Field field)
+	{
+		return (field.getName().startsWith("_") ? field.getName().substring(1) : field.getName());
+	}
+}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/api/ApiResponse.java

@@ -0,0 +1,36 @@
+package mineplex.core.common.api;
+
+import java.util.Date;
+
+/**
+ * @author Shaun Bennett
+ */
+public class ApiResponse
+{
+	private boolean success;
+	private String error;
+
+	public ApiResponse()
+	{
+
+	}
+
+	public boolean isSuccess()
+	{
+		return success;
+	}
+
+	public String getError()
+	{
+		return error;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "ApiResponse{" +
+				"success=" + success +
+				", error='" + error + '\'' +
+				'}';
+	}
+}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/api/ApiWebCall.java

@@ -0,0 +1,97 @@
+package mineplex.core.common.api;
+
+import com.google.gson.Gson;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.protocol.HTTP;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+
+/**
+ * @author Shaun Bennett
+ */
+public class ApiWebCall
+{
+	private String _url;
+	private Gson _gson;
+	private PoolingHttpClientConnectionManager _cm;
+	private CloseableHttpClient _httpClient;
+
+	public ApiWebCall(String url, Gson gson)
+	{
+		_url = url;
+		_gson = gson;
+
+		_cm = new PoolingHttpClientConnectionManager();
+		_cm.setMaxTotal(200);
+		_cm.setDefaultMaxPerRoute(20);
+		_httpClient = HttpClients.custom().setConnectionManager(_cm).build();
+	}
+
+	public <T> T get(String resource, Class<T> clazz)
+	{
+		return get(resource, (Type)clazz);
+	}
+
+	public <T> T get(String resource, Type type)
+	{
+		T returnData = null;
+
+		HttpGet httpGet = new HttpGet(_url + resource);
+		try (CloseableHttpResponse response = _httpClient.execute(httpGet)) {
+			returnData = parseResponse(response, type);
+		} catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+
+		return returnData;
+	}
+
+	public <T> T post(String resource, Class<T> clazz, Object data)
+	{
+		T returnData = null;
+
+		HttpPost httpPost = new HttpPost(_url + resource);
+		try
+		{
+			if (data != null)
+			{
+				StringEntity params = new StringEntity(_gson.toJson(data));
+				params.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
+				httpPost.setEntity(params);
+			}
+
+			try (CloseableHttpResponse response = _httpClient.execute(httpPost))
+			{
+				returnData = parseResponse(response, clazz);
+			} catch (IOException e)
+			{
+				e.printStackTrace();
+			}
+
+		} catch (UnsupportedEncodingException e)
+		{
+			e.printStackTrace();
+		}
+
+		return returnData;
+	}
+
+	private <T> T parseResponse(CloseableHttpResponse response, Type type) throws IOException
+	{
+		HttpEntity entity = response.getEntity();
+		return _gson.fromJson(new InputStreamReader(entity.getContent()), type);
+	}
+}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/api/ListResponseType.java

@@ -0,0 +1,36 @@
+package mineplex.core.common.api;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+/**
+ * @author Shaun Bennett
+ */
+public class ListResponseType<Data> implements ParameterizedType
+{
+	private Class<Data> _wrapped;
+
+	public ListResponseType(Class<Data> wrapped)
+	{
+		_wrapped = wrapped;
+	}
+
+	@Override
+	public Type[] getActualTypeArguments()
+	{
+		return new Type[] { _wrapped };
+	}
+
+	@Override
+	public Type getRawType()
+	{
+		return List.class;
+	}
+
+	@Override
+	public Type getOwnerType()
+	{
+		return null;
+	}
+}

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java

@@ -1,5 +1,6 @@
 package mineplex.core.common.util;
 
+import mineplex.core.common.CurrencyType;
 import mineplex.core.common.Rank;
 
 import java.util.LinkedList;
@@ -200,6 +201,11 @@ public class F
 		return out;
 	}
 
+	public static String currency(CurrencyType type, int amount)
+	{
+		return type.getString(amount) + ChatColor.RESET + C.mBody;
+	}
+
 	public static String vowelAN(String word)
 	{
 		return word.toLowerCase().startsWith("a")

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/ProfileLoader.java

@@ -44,9 +44,9 @@ public class ProfileLoader
 		return profile;
 	}
 
-	private void addProperties(GameProfile profile)
+	public static boolean addProperties(GameProfile profile)
 	{
-		String uuid = getUUID(skinOwner);
+		String uuid = profile.getId().toString().replaceAll("-", "");
 		try
 		{
 			// Get the name from SwordPVP
@@ -85,11 +85,15 @@ public class ProfileLoader
 					Bukkit.getLogger().log(Level.WARNING, "Failed to apply auth property", e);
 				}
 			}
+
+			return true;
 		}
 		catch (Exception e)
 		{
 			e.printStackTrace();
 		}
+
+		return false;
 	}
 
 	@SuppressWarnings("deprecation")

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java

@@ -1549,15 +1549,18 @@ public class UtilBlock
 			world.loadChunk(cx, cz, true);
 		}
 
-		net.minecraft.server.v1_8_R3.Chunk chunk = ((CraftWorld) world).getHandle().getChunkAt(x >> 4, z >> 4);
+		WorldServer nmsWorld = ((CraftWorld) world).getHandle();
+
+		net.minecraft.server.v1_8_R3.Chunk chunk = nmsWorld.getChunkAt(x >> 4, z >> 4);
 		BlockPosition pos = new BlockPosition(x, y, z);
 		IBlockData ibd = net.minecraft.server.v1_8_R3.Block.getById(type).fromLegacyData(data);
 		chunk.a(pos, ibd);
+		nmsWorld.notify(pos);
 
-		if(_quickChangeRecorder != null)
+//		if(_quickChangeRecorder != null)
-		{
+//		{
-			_quickChangeRecorder.addBlock(world.getBlockAt(x, y, z));
+//			_quickChangeRecorder.addBlock(world.getBlockAt(x, y, z));
-		}
+//		}
 	}
 	
 	/**

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java

@@ -19,7 +19,7 @@ import org.bukkit.inventory.PlayerInventory;
 public class UtilInv
 {
 	private static Field _enchantmentNew;
-	private static DullEnchantment _enchantment;
+	private static DullEnchantment DULL_ENCHANTMENT;
 	
 	static 
 	{
@@ -29,8 +29,8 @@ public class UtilInv
 			_enchantmentNew.setAccessible(true);
 			_enchantmentNew.set(null, true);
 			
-			_enchantment = new DullEnchantment();
+			DULL_ENCHANTMENT = new DullEnchantment();
-			EnchantmentWrapper.registerEnchantment(_enchantment);
+			EnchantmentWrapper.registerEnchantment(DULL_ENCHANTMENT);
 		}
 		catch (Exception e)
 		{
@@ -40,17 +40,17 @@ public class UtilInv
 	
 	public static void addDullEnchantment(ItemStack itemStack)
 	{
-		itemStack.addEnchantment(_enchantment, 1);
+		itemStack.addEnchantment(DULL_ENCHANTMENT, 1);
 	}
 	
 	public static void removeDullEnchantment(ItemStack itemStack)
 	{
-	    itemStack.removeEnchantment(_enchantment);
+	    itemStack.removeEnchantment(DULL_ENCHANTMENT);
 	}
 	
 	public static DullEnchantment getDullEnchantment()
 	{
-	    return _enchantment;
+	    return DULL_ENCHANTMENT;
 	}
 	
 	@SuppressWarnings("deprecation")

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilSkull.java

@@ -40,6 +40,7 @@ public class UtilSkull
 		if (displayHead)
 			meta.setOwner(playerName);
 		meta.setDisplayName(itemName);
+		if (itemLore != null)
 			meta.setLore(itemLore);
 		skull.setItemMeta(meta);
 		return skull;

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java

@@ -672,18 +672,23 @@ public class UtilText
 	}
 
 	public static String getProgress(String prefix, double amount, String suffix, boolean progressDirectionSwap, int bars)
+	{
+		return getProgress(prefix, amount, suffix, progressDirectionSwap, bars, C.cRed, C.cGreen);
+	}
+	
+	public static String getProgress(String prefix, double amount, String suffix, boolean progressDirectionSwap, int bars, String emptyColor, String fillColor)
 	{
 		if (progressDirectionSwap)
 			amount = 1 - amount;
 		
 		//Generate Bar
-		String progressBar = C.cGreen + "";
+		String progressBar = fillColor + "";
 		boolean colorChange = false;
 		for (int i=0 ; i<bars ; i++)
 		{
 			if (!colorChange && (float)i/(float)bars >= amount)
 			{
-				progressBar += C.cRed;
+				progressBar += emptyColor;
 				colorChange = true;
 			}
 			

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTime.java

@@ -79,6 +79,11 @@ public class UtilTime
 		{
 			return _ms;
 		}
+
+		public static TimeUnit[] decreasingOrder()
+		{
+			return new TimeUnit[]{ DAYS, HOURS, MINUTES, SECONDS, MILLISECONDS };
+		}
 	}
 
 	/**
@@ -122,6 +127,41 @@ public class UtilTime
 		return convertString(Math.max(0, time), trim, TimeUnit.FIT);
 	}
 
+	public static String convertColonString(long time)
+	{
+		return convertColonString(time, TimeUnit.HOURS, TimeUnit.SECONDS);
+	}
+
+	/**
+	 * Converts a time into a colon separated string, displaying max to min units.
+	 *
+	 * @param time Time in milliseconds
+	 * @param max The max {@link TimeUnit} to display, inclusive
+	 * @param min The min {@link TimeUnit} to display, inclusive
+	 * @return A colon separated string to represent the time
+	 */
+	public static String convertColonString(long time, TimeUnit max, TimeUnit min)
+	{
+		if (time == -1)     return "Permanent";
+		else if (time == 0) return "0";
+
+		StringBuilder sb = new StringBuilder();
+		long curr = time;
+		for (TimeUnit unit : TimeUnit.decreasingOrder())
+		{
+			if (unit.getMilliseconds() >= min.getMilliseconds() && unit.getMilliseconds() <= max.getMilliseconds())
+			{
+				long amt = curr / unit.getMilliseconds();
+				if (amt < 10 && unit.getMilliseconds() != max.getMilliseconds()) sb.append('0'); // prefix single digit numbers with a 0
+				sb.append(amt);
+				if (unit.getMilliseconds() > min.getMilliseconds()) sb.append(':');
+				curr -= amt * unit.getMilliseconds();
+			}
+		}
+
+		return sb.toString();
+	}
+	
 	public static String convertString(long time, int trim, TimeUnit type)
 	{
 		if (time == -1)						return "Permanent";

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

@@ -23,7 +23,6 @@ import net.minecraft.server.v1_8_R3.Entity;
 import net.minecraft.server.v1_8_R3.EntityArmorStand;
 import net.minecraft.server.v1_8_R3.Packet;
 import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity;
-import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity.EnumEntityUseAction;
 import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity;
 import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy;
 import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
@@ -59,7 +58,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 	private NautHashMap<String, NautHashMap<Integer, Integer>> _entityRiding = new NautHashMap<String, NautHashMap<Integer, Integer>>();
 
 	private HashSet<String> _loggedIn = new HashSet<String>();
-	private HashSet<Integer> _ignoreSkulls = new HashSet<Integer>();
+	private HashSet<Integer> _ignoreIds = new HashSet<Integer>();
 
 	private NautHashMap<UUID, Long> _exemptTimeMap = new NautHashMap<UUID, Long>();
 	private NautHashMap<UUID, NautHashMap<CheckType, Long>> _doubleStrike = new NautHashMap<UUID, NautHashMap<CheckType, Long>>();
@@ -220,12 +219,11 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 				PacketPlayOutSpawnEntityLiving spawnPacket = (PacketPlayOutSpawnEntityLiving) packet;
 
 				// Ignore Armor stand packets
-				if (spawnPacket.b == EntityType.ARMOR_STAND.getTypeId() || spawnPacket.l == null || spawnPacket.l.c() == null
+				if (spawnPacket.b == EntityType.ARMOR_STAND.getTypeId() || spawnPacket.l == null || spawnPacket.l.c() == null)
-						|| spawnPacket.a == 777777)
 				{
 					if (spawnPacket.b == EntityType.ARMOR_STAND.getTypeId())
 					{
-						_ignoreSkulls.add(spawnPacket.a);
+						_ignoreIds.add(spawnPacket.a);
 					}
 
 					return;
@@ -322,7 +320,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 			{
 				PacketPlayOutEntityMetadata metaPacket = (PacketPlayOutEntityMetadata) packet;
 
-				if (metaPacket.a != 777777 && !_ignoreSkulls.contains(metaPacket.a) && metaPacket.a != owner.getEntityId())
+				if (metaPacket.a != 777777 && !_ignoreIds.contains(metaPacket.a) && metaPacket.a != owner.getEntityId())
 				{
 					boolean isDisplaying = _entityMap.get(owner.getName()).containsKey(metaPacket.a);
 					String currentName = _entityNameMap.get(owner.getName()).get(metaPacket.a);
@@ -423,9 +421,9 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
 			else if (packet instanceof PacketPlayOutSpawnEntity)
 			{
 				PacketPlayOutSpawnEntity spawnPacket = (PacketPlayOutSpawnEntity) packet;
-				if (spawnPacket.j == 66 && spawnPacket.a != 777777)
+				if (spawnPacket.j == 78) // Armor Stand Object ID
 				{
-					_ignoreSkulls.add(spawnPacket.a);
+					_ignoreIds.add(spawnPacket.a);
 				}
 			}
 			else if (packet instanceof PacketPlayInUseEntity)

Plugins/Mineplex.Core/src/mineplex/core/achievement/command/StatsCommand.java

@@ -5,6 +5,8 @@ import org.bukkit.entity.Player;
 import mineplex.core.achievement.AchievementManager;
 import mineplex.core.command.CommandBase;
 import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 
 public class StatsCommand extends CommandBase<AchievementManager>
@@ -32,6 +34,9 @@ public class StatsCommand extends CommandBase<AchievementManager>
 			
 			if (/* StaffServer special case */Plugin.getIncognito() != null && Plugin.getIncognito().Get(target).Hidden)
 			{
+				UtilPlayer.message(caller,
+						F.main("Online Player Search", "" + C.mCount + "0" + C.mBody + " matches for [" + C.mElem
+								+ args[0] + C.mBody + "]."));
 				return;
 			}
 

Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java

@@ -15,6 +15,7 @@ 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;
@@ -121,6 +122,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
 	private RewardManager _rewardManager;
 	private StatsManager _statsManager;
 	private FacebookManager _facebookManager;
+//	private BoosterManager _boosterManager;
 	public boolean _enabled;
 	private Npc _carlNpc;
 	private AnimationCarl _animation;
@@ -903,6 +905,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> 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++;
 
 		Hologram hologram;
 

Plugins/Mineplex.Core/src/mineplex/core/bonuses/commands/GuiCommand.java

@@ -1,5 +1,6 @@
 package mineplex.core.bonuses.commands;
 
+import mineplex.core.boosters.BoosterManager;
 import org.bukkit.entity.Player;
 
 import mineplex.core.command.CommandBase;
@@ -7,8 +8,8 @@ import mineplex.core.common.Rank;
 import mineplex.core.bonuses.BonusManager;
 import mineplex.core.bonuses.gui.BonusGui;
 
-public class GuiCommand extends CommandBase<BonusManager>{
+public class GuiCommand extends CommandBase<BonusManager>
-	
+{
 	public GuiCommand(BonusManager plugin)
 	{
 		super(plugin, Rank.DEVELOPER, "bonus");

Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/BonusGui.java

@@ -1,15 +1,11 @@
 package mineplex.core.bonuses.gui;
 
-import mineplex.core.bonuses.gui.buttons.FacebookButton;
+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.bonuses.BonusManager;
-import mineplex.core.bonuses.gui.buttons.CarlSpinButton;
-import mineplex.core.bonuses.gui.buttons.DailyBonusButton;
-import mineplex.core.bonuses.gui.buttons.PollButton;
-import mineplex.core.bonuses.gui.buttons.RankBonusButton;
-import mineplex.core.bonuses.gui.buttons.VoteButton;
 
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -35,6 +31,8 @@ public class BonusGui extends SimpleGui
 
 		setItem(17, new FacebookButton(player, facebookManager));
 
+//		setItem(19, new ClaimTipsButton(getPlugin(), player, this, manager, boosterManager));
+		
 		setItem(31, new CarlSpinButton(getPlugin(), player, manager, rewardManager));
 	}
 	

Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/ClaimTipsButton.java

@@ -0,0 +1,190 @@
+package mineplex.core.bonuses.gui.buttons;
+
+import java.util.ArrayList;
+
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.common.CurrencyType;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.gui.GuiItem;
+import mineplex.core.gui.ItemRefresher;
+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.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.core.bonuses.BonusAmount;
+import mineplex.core.bonuses.BonusClientData;
+import mineplex.core.bonuses.BonusManager;
+import mineplex.core.bonuses.StreakRecord;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
+
+public class ClaimTipsButton implements GuiItem, Listener
+{
+	private ItemStack _item;
+
+	private Player _player;
+	private Plugin _plugin;
+	private ItemRefresher _gui;
+
+	private BonusManager _bonusManager;
+	private BoosterManager _boosterManager;
+
+	public ClaimTipsButton(Plugin plugin, Player player, ItemRefresher gui, BonusManager bonusManager, BoosterManager boosterManager)
+	{
+		_bonusManager = bonusManager;
+		_boosterManager = boosterManager;
+		_player = player;
+		_plugin = plugin;
+		_gui = gui;
+	}
+
+	@Override
+	public void setup()
+	{
+		Bukkit.getPluginManager().registerEvents(this, getPlugin());
+		setItem();
+	}
+
+	@Override
+	public void close()
+	{
+		HandlerList.unregisterAll(this);
+	}
+
+	@Override
+	public void click(ClickType clickType)
+	{
+		if (isAvailable()) {
+			_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)
+				{
+					// Woo, success!
+					setItem();
+
+					if (getPlayer().getOpenInventory() != null)
+					{
+						new TimedMessageWindow(getPlugin(), getPlayer(), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS_PANE, DyeColor.LIME.getData(), 1, ChatColor.GREEN + "Booster Tips Collected"), "Tips Collected", 6*9, 20*3, getGui()).openInventory();
+					}
+
+					UtilPlayer.message(getPlayer(), F.main("Carl", "You collected " + F.currency(CurrencyType.TREASURE_SHARD, claimed) + " from Booster Tips!"));
+					// 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)
+				{
+					// 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 Tips to Claim!"), "You have no tips to claim!", 6*9, 20*3, getGui()).openInventory();
+					}
+
+					UtilPlayer.message(getPlayer(), F.main("Carl", "You have no tips to claim!"));
+					getPlayer().playSound(getPlayer().getLocation(), Sound.ENDERDRAGON_GROWL, 1, 10);
+				}
+				else
+				{
+					// Failed to claim
+					if (getPlayer().getOpenInventory() != null)
+					{
+						new TimedMessageWindow(getPlugin(), getPlayer(), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS_PANE, DyeColor.RED.getData(), 1, ChatColor.RED + "Error collecting tips. Try again later."), "Error", 6*9, 20*3, getGui()).openInventory();
+					}
+
+					UtilPlayer.message(getPlayer(), F.main("Carl", "Error collecting tips. Try again later."));
+					getPlayer().playSound(getPlayer().getLocation(), Sound.ENDERDRAGON_GROWL, 1, 10);
+				}
+
+				getPlayer().closeInventory();
+			});
+		}
+		else
+		{
+			getPlayer().playSound(getPlayer().getLocation(), Sound.ITEM_BREAK, 1, 10);
+		}
+	}
+
+	private void setItem()
+	{
+		ArrayList<String> lore = new ArrayList<String>();
+		Material material;
+		String itemName;
+
+		if (isAvailable())
+		{
+			material = Material.EMERALD;
+			itemName = C.cGreen + C.Bold + "Booster Tips";
+			lore.add(" ");
+			lore.add(C.cYellow + "Your Tips");
+			lore.add("  " + C.cWhite + getTips() + " Treasure Shards");
+			lore.add(" ");
+			lore.add(ChatColor.RESET + "Click to Claim!");
+		}
+		else
+		{
+			material = Material.REDSTONE_BLOCK;
+			itemName = C.cRed + C.Bold + "Booster Tips";
+
+			lore.add(" ");
+			lore.add(C.Reset + "Activate Game Boosters to receive tips");
+		}
+
+		_item =  new ShopItem(material, itemName, lore.toArray(new String[0]), 1, false, false);
+	}
+
+	@Override
+	public ItemStack getObject()
+	{
+		return _item;
+	}
+
+	public void refreshItem()
+	{
+		getGui().refreshItem(this);
+	}
+
+	private int getTips()
+	{
+		return _boosterManager.getTipManager().Get(getPlayer()).getTips();
+	}
+
+	private boolean isAvailable()
+	{
+		return getTips() > 0;
+	}
+
+	public Plugin getPlugin()
+	{
+		return _plugin;
+	}
+
+	public Player getPlayer()
+	{
+		return _player;
+	}
+
+	public ItemRefresher getGui()
+	{
+		return _gui;
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/Booster.java

@@ -0,0 +1,122 @@
+package mineplex.core.boosters;
+
+import mineplex.core.common.util.UtilTime;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author Shaun Bennett
+ */
+public class Booster
+{
+	private int _boosterId;
+	private String _playerName;
+	private UUID _uuid;
+	private int _accountId;
+	private int _duration;
+	private double _multiplier;
+	private Date _startTime;
+	private Date _endTime;
+	private Date _activationTime;
+
+	public Booster()
+	{
+	}
+
+	public int getBoosterId()
+	{
+		return _boosterId;
+	}
+
+	public String getPlayerName()
+	{
+		return _playerName;
+	}
+
+	public UUID getUuid()
+	{
+		return _uuid;
+	}
+
+	public int getAccountId()
+	{
+		return _accountId;
+	}
+
+	public int getDuration()
+	{
+		return _duration;
+	}
+
+	public Date getStartTime()
+	{
+		return _startTime;
+	}
+
+	public Date getEndTime()
+	{
+		return _endTime;
+	}
+
+	public Date getActivationTime()
+	{
+		return _activationTime;
+	}
+
+	public boolean isActive()
+	{
+		return getEndTime().before(new Date());
+	}
+
+	public long getTimeRemaining()
+	{
+		return Math.max(0, getEndTime().getTime() - System.currentTimeMillis());
+	}
+
+	public String getTimeRemainingString()
+	{
+		return UtilTime.convertColonString(getTimeRemaining(), UtilTime.TimeUnit.MINUTES, UtilTime.TimeUnit.SECONDS);
+	}
+
+	public double getMultiplier()
+	{
+		return _multiplier;
+	}
+
+	@Override
+	public boolean equals(Object o)
+	{
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Booster booster = (Booster) o;
+
+		if (_boosterId != booster._boosterId) return false;
+		return _accountId == booster._accountId;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		int result = _boosterId;
+		result = 31 * result + _accountId;
+		return result;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Booster{" +
+				"_boosterId=" + _boosterId +
+				", _playerName='" + _playerName + '\'' +
+				", _uuid=" + _uuid +
+				", _accountId=" + _accountId +
+				", _duration=" + _duration +
+				", _multiplier=" + _multiplier +
+				", _startTime=" + _startTime +
+				", _endTime=" + _endTime +
+				", _activationTime=" + _activationTime +
+				'}';
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterApiResponse.java

@@ -0,0 +1,26 @@
+package mineplex.core.boosters;
+
+import mineplex.core.common.api.ApiResponse;
+
+import java.util.Date;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterApiResponse extends ApiResponse
+{
+	private Date startTime;
+
+	public Date getStartTime()
+	{
+		return startTime;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "BoosterApiResponse{" +
+				"startTime='" + startTime + '\'' +
+				"} " + super.toString();
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterCategory.java

@@ -0,0 +1,12 @@
+package mineplex.core.boosters;
+
+import mineplex.core.game.GameDisplay;
+
+/**
+ * @author Shaun Bennett
+ */
+public enum BoosterCategory
+{
+
+
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterManager.java

@@ -0,0 +1,208 @@
+package mineplex.core.boosters;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.boosters.command.BoosterCommand;
+import mineplex.core.boosters.event.BoosterActivateEvent;
+import mineplex.core.boosters.event.BoosterDeactivateEvent;
+import mineplex.core.boosters.gui.BoosterShop;
+import mineplex.core.boosters.tips.BoosterTipManager;
+import mineplex.core.common.util.Callback;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.inventory.InventoryManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.*;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterManager extends MiniPlugin
+{
+	private BoosterRepository _repository;
+	private CoreClientManager _clientManager;
+	private DonationManager _donationManager;
+	private InventoryManager _inventoryManager;
+
+	private BoosterTipManager _tipManager;
+	private BoosterShop _shop;
+
+	private long _cacheLastUpdated;
+	private Map<String, List<Booster>> _boosterCache = new HashMap<>();
+
+	public BoosterManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager)
+	{
+		super("Booster Manager", plugin);
+
+		_repository = new BoosterRepository();
+		_clientManager = clientManager;
+		_donationManager = donationManager;
+		_inventoryManager = inventoryManager;
+
+		_tipManager = new BoosterTipManager(plugin, clientManager, donationManager);
+		_shop = new BoosterShop(this, clientManager, donationManager);
+
+		try
+		{
+			_boosterCache = _repository.getBoosters();
+		}
+		catch (Exception e)
+		{
+			System.out.println("Failed to load boosters on server start.");
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void addCommands()
+	{
+		addCommand(new BoosterCommand(this));
+	}
+
+	public void getBoostersAsync(Callback<Map<String, List<Booster>>> callback)
+	{
+		runAsync(() -> {
+			try
+			{
+				long time = System.currentTimeMillis();
+				Map<String, List<Booster>> boosters = _repository.getBoosters();
+				long timeTaken = System.currentTimeMillis() - time;
+				runSync(() -> {
+
+					_boosterCache.entrySet().stream()
+							.filter(entry -> entry.getValue().size() > 0)
+							.filter(entry -> boosters.get(entry.getKey()) == null)
+							.forEach(entry -> callNextTick(new BoosterDeactivateEvent(entry.getValue().get(0))));
+
+					for (Map.Entry<String, List<Booster>> entry : boosters.entrySet())
+					{
+						List<Booster> current = _boosterCache.get(entry.getKey());
+						if (current == null || current.get(0) == null)
+						{
+							callNextTick(new BoosterActivateEvent(entry.getValue().get(0)));
+						}
+						else if (!current.get(0).equals(entry.getValue().get(0)))
+						{
+							callNextTick(new BoosterDeactivateEvent(current.get(0)));
+							callNextTick(new BoosterActivateEvent(entry.getValue().get(0)));
+						}
+
+					}
+
+					_cacheLastUpdated = System.currentTimeMillis();
+					_boosterCache = boosters;
+					if (callback != null) callback.run(boosters);
+				});
+			}
+			catch (Exception e)
+			{
+				System.err.println("Failed to grab boosters;");
+				e.printStackTrace();
+			}
+		});
+	}
+
+	public Booster getActiveBoosterFromCache(String serverGroup)
+	{
+		List<Booster> boosters = _boosterCache.get(serverGroup);
+		if (boosters != null)
+		{
+			for (Booster booster : boosters)
+			{
+				if (booster.getEndTime().after(new Date()))
+					return booster;
+			}
+		}
+
+		return null;
+	}
+
+	public void getBoostersAsync(String serverGroup, Callback<List<Booster>> callback)
+	{
+		runAsync(() -> {
+			try
+			{
+				List<Booster> boosters = _repository.getBoosters(serverGroup);
+				if (callback != null) runSync(() -> callback.run(boosters));
+			}
+			catch (Exception e)
+			{
+				System.err.println("Failed to grab boosters for servergroup: " + serverGroup);
+				e.printStackTrace();
+			}
+		});
+	}
+
+	public void activateBooster(String serverGroup, Player player, Callback<BoosterApiResponse> callback)
+	{
+		String playerName = player.getName();
+		UUID uuid = player.getUniqueId();
+		int accountId = _clientManager.getAccountId(player);
+
+		runAsync(() -> {
+			BoosterApiResponse response = _repository.addBooster(serverGroup, playerName, uuid, accountId, 3600);
+			callback.run(response);
+		});
+	}
+
+	public void openShop(Player player)
+	{
+		_shop.attemptShopOpen(player);
+	}
+
+	@EventHandler
+	public void updateCache(UpdateEvent event)
+	{
+		if (event.getType() == UpdateType.SEC_30)
+		{
+			getBoostersAsync(null);
+		}
+	}
+
+	public BoosterTipManager getTipManager()
+	{
+		return _tipManager;
+	}
+
+	/**
+	 * Returns the number of unactivated game boosters a player owns
+	 * @param player
+	 * @return The amount of unactivated game boosters the player owns
+	 */
+	public int getAvailableBoosterCount(Player player)
+	{
+		return _inventoryManager.Get(player).getItemCount("Game Booster");
+	}
+
+	/**
+	 * Can players activate boosters on this server?
+	 * @return true if players are able to activate a booster on this server
+	 */
+	public boolean canActivateBoosters()
+	{
+		return true;
+	}
+
+	public static void main(String[] args) throws IOException, URISyntaxException, InterruptedException
+	{
+		BoosterRepository repository = new BoosterRepository();
+		Map<String, List<Booster>> boosters = repository.getBoosters();
+		boosters.entrySet().forEach((entry) -> {
+			System.out.println("Booster Entry: " + entry.getKey());
+			System.out.println("Booster Size: " + entry.getValue().size());
+			entry.getValue().forEach(System.out::println);
+		});
+	}
+
+	private void callNextTick(Event event)
+	{
+		runSync(() -> getPluginManager().callEvent(event));
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterMap.java

@@ -0,0 +1,8 @@
+package mineplex.core.boosters;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterMap
+{
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterRepository.java

@@ -0,0 +1,47 @@
+package mineplex.core.boosters;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import mineplex.core.common.api.ApiEndpoint;
+import mineplex.core.common.api.ApiFieldNamingStrategy;
+import mineplex.core.common.api.ApiResponse;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterRepository extends ApiEndpoint
+{
+	public BoosterRepository()
+	{
+		super("/booster", new GsonBuilder().setFieldNamingStrategy(new ApiFieldNamingStrategy())
+				.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX").create());
+	}
+
+	public Map<String, List<Booster>> getBoosters()
+	{
+		return getWebCall().get("/", new TypeToken<Map<String, List<Booster>>>(){}.getType());
+	}
+
+	public List<Booster> getBoosters(String serverGroup)
+	{
+		return Arrays.asList(getWebCall().get("/" + serverGroup, Booster[].class));
+	}
+
+	public BoosterApiResponse addBooster(String serverGroup, String playerName, UUID uuid, int accountId, int duration)
+	{
+		JsonObject body = new JsonObject();
+		body.addProperty("playerName", playerName);
+		body.addProperty("uuid", uuid.toString());
+		body.addProperty("accountId", accountId);
+		body.addProperty("duration", duration);
+
+		return getWebCall().post("/" + serverGroup, BoosterApiResponse.class, body);
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/command/AddCommand.java

@@ -0,0 +1,54 @@
+package mineplex.core.boosters.command;
+
+import mineplex.core.boosters.BoosterApiResponse;
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class AddCommand extends CommandBase<BoosterManager>
+{
+	public AddCommand(BoosterManager plugin)
+	{
+		super(plugin, Rank.DEVELOPER, "add");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		if (args != null && args.length > 0)
+		{
+			String serverGroup = args[0];
+			Plugin.activateBooster(serverGroup, caller, new Callback<BoosterApiResponse>()
+			{
+				@Override
+				public void run(BoosterApiResponse response)
+				{
+					if (response.isSuccess())
+					{
+						UtilPlayer.message(caller, F.main("Booster", "Successfully added booster to " + F.elem(serverGroup)));
+					}
+					else
+					{
+						UtilPlayer.message(caller, F.main("Booster", "Failed to add booster. Error: " + F.elem(response.getError())));
+					}
+				}
+			});
+		}
+		else
+		{
+			help(caller);
+		}
+	}
+
+	private void help(Player caller)
+	{
+		UtilPlayer.message(caller, F.help("booster add <servergroup>", "Add a booster to that server group", Rank.DEVELOPER));
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/command/BoosterCommand.java

@@ -0,0 +1,28 @@
+package mineplex.core.boosters.command;
+
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.command.CommandBase;
+import mineplex.core.command.MultiCommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterCommand extends MultiCommandBase<BoosterManager>
+{
+	public BoosterCommand(BoosterManager plugin)
+	{
+		super(plugin, Rank.DEVELOPER, "booster");
+
+		AddCommand(new AddCommand(plugin));
+	}
+
+	@Override
+	protected void Help(Player caller, String[] args)
+	{
+		UtilPlayer.message(caller, F.help("booster add <servergroup>", "Add a booster to that server group", Rank.DEVELOPER));
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/event/BoosterActivateEvent.java

@@ -0,0 +1,36 @@
+package mineplex.core.boosters.event;
+
+import mineplex.core.boosters.Booster;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterActivateEvent extends Event
+{
+	private Booster _booster;
+
+	public BoosterActivateEvent(Booster booster)
+	{
+		_booster = booster;
+	}
+
+	public Booster getBooster()
+	{
+		return _booster;
+	}
+
+	private static final HandlerList _handlers = new HandlerList();
+	private static HandlerList getHandlerList()
+	{
+		return _handlers;
+	}
+
+	@Override
+	public HandlerList getHandlers()
+	{
+		return getHandlerList();
+	}
+
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/event/BoosterDeactivateEvent.java

@@ -0,0 +1,36 @@
+package mineplex.core.boosters.event;
+
+import mineplex.core.boosters.Booster;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterDeactivateEvent extends Event
+{
+	private Booster _booster;
+
+	public BoosterDeactivateEvent(Booster booster)
+	{
+		_booster = booster;
+	}
+
+	public Booster getBooster()
+	{
+		return _booster;
+	}
+
+	private static final HandlerList _handlers = new HandlerList();
+	private static HandlerList getHandlerList()
+	{
+		return _handlers;
+	}
+
+	@Override
+	public HandlerList getHandlers()
+	{
+		return getHandlerList();
+	}
+
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/gui/ActivateBoosterButton.java

@@ -0,0 +1,48 @@
+package mineplex.core.boosters.gui;
+
+import mineplex.core.boosters.BoosterApiResponse;
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.shop.item.IButton;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+/**
+ * @author Shaun Bennett
+ */
+public class ActivateBoosterButton implements IButton
+{
+	private BoosterShop _boosterShop;
+	private BoosterManager _boosterManager;
+
+	public ActivateBoosterButton(BoosterShop boosterShop, BoosterManager boosterManager)
+	{
+		_boosterShop = boosterShop;
+		_boosterManager = boosterManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		player.closeInventory();
+		_boosterManager.activateBooster("Testing", player, new Callback<BoosterApiResponse>()
+		{
+			@Override
+			public void run(BoosterApiResponse response)
+			{
+				if (response.isSuccess())
+				{
+					long timeToStart = response.getStartTime().getTime() - System.currentTimeMillis();
+					if (timeToStart <= 0) player.sendMessage(C.cGreen + "Booster activated and enabled now!");
+					else                  player.sendMessage(C.cGreen + "Booster activated. Enabled in " + UtilTime.convertString(timeToStart, 2, UtilTime.TimeUnit.FIT));
+				}
+				else
+				{
+					player.sendMessage(C.cRed + "There was an error trying to enable your booster :(");
+				}
+			}
+		});
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/gui/BoosterPage.java

@@ -0,0 +1,43 @@
+package mineplex.core.boosters.gui;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.boosters.BoosterCategory;
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.common.util.C;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
+{
+	public BoosterPage(BoosterManager plugin, BoosterShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player, BoosterCategory category)
+	{
+		super(plugin, shop, clientManager, donationManager, "Booster", player);
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		ArrayList<String> lore = new ArrayList<>();
+
+		lore.add(" ");
+		lore.add(C.cWhite + "You Own: " + getPlugin().getAvailableBoosterCount(getPlayer()));
+		if (getPlugin().canActivateBoosters())
+		{
+			lore.add(" ");
+			lore.add(C.cWhite + "Click to Activate");
+		}
+
+		ShopItem booster = new ShopItem(Material.SUGAR, "Game Booster", lore.toArray(new String[0]), 0, false, false);
+		setItem(4, booster);
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/gui/BoosterShop.java

@@ -0,0 +1,25 @@
+package mineplex.core.boosters.gui;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterShop extends ShopBase<BoosterManager>
+{
+	public BoosterShop(BoosterManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Boosters");
+	}
+
+	@Override
+	protected ShopPageBase<BoosterManager, ? extends ShopBase<BoosterManager>> buildPagesFor(Player player)
+	{
+		return new MenuPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/gui/MenuPage.java

@@ -0,0 +1,37 @@
+package mineplex.core.boosters.gui;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.boosters.Booster;
+import mineplex.core.boosters.BoosterManager;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.UtilSkull;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Shaun Bennett
+ */
+public class MenuPage extends ShopPageBase<BoosterManager,BoosterShop>
+{
+	public MenuPage(BoosterManager plugin, BoosterShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Boosters", player);
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java

@@ -0,0 +1,130 @@
+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.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<PlayerTipData>
+{
+	public static final int TIP_FOR_SPONSOR = 30;
+	public static final int TIP_FOR_TIPPER = 10;
+
+	private BoosterTipRepository _repository;
+	private DonationManager _donationManager;
+
+	public BoosterTipManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super("Booster Tips", plugin, clientManager);
+
+		_donationManager = donationManager;
+		_repository = new BoosterTipRepository(plugin);
+	}
+
+	public void addTip(Player player, Booster booster, Callback<TipAddResult> callback)
+	{
+		if (!Recharge.Instance.use(player, "Booster Tip", 1000 * 60 * 10, true, false))
+		{
+			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.getBoosterId(), 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<Integer> 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);
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipRepository.java

@@ -0,0 +1,55 @@
+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()
+	{
+
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/PlayerTipData.java

@@ -0,0 +1,24 @@
+package mineplex.core.boosters.tips;
+
+/**
+ * @author Shaun Bennett
+ */
+public class PlayerTipData
+{
+	private int _tips;
+
+	public PlayerTipData()
+	{
+		_tips = 0;
+	}
+
+	public int getTips()
+	{
+		return _tips;
+	}
+
+	public void setTips(int tips)
+	{
+		_tips = tips;
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java

@@ -0,0 +1,25 @@
+package mineplex.core.boosters.tips;
+
+/**
+ * @author Shaun Bennett
+ */
+public enum TipAddResult
+{
+	ALREADY_TIPPED_BOOSTER("You have already tipped!"),
+	INVALID_ACCOUNT_ID("Uh oh, something went wrong. Try relogging"),
+	CANNOT_TIP_SELF("You can't tip yourself, silly!"),
+	ON_COOLDOWN(null),
+	SUCCESS(null);
+
+	private String _friendlyMessage;
+
+	TipAddResult(String friendlyMessage)
+	{
+		_friendlyMessage = friendlyMessage;
+	}
+
+	public String getFriendlyMessage()
+	{
+		return _friendlyMessage;
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/BlockProgressBar.java

@@ -0,0 +1,57 @@
+package mineplex.core.brawl.fountain;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+
+/**
+ * This class handled filling a vertical area with a specific block based off a percent
+ *
+ * @author Shaun Bennett
+ */
+public class BlockProgressBar
+{
+	// Starting block for the block fill
+	private final Block _startBlock;
+	// Direction the blockfill takes place in
+	private final BlockFace _direction;
+	// Blocks in order from lowest to highes
+	private final Block[] _blocks;
+	// Material used to fill the blocks
+	private final Material _material;
+
+	public BlockProgressBar(Block startBlock, Material material, BlockFace direction)
+	{
+		_startBlock = startBlock;
+		_material = material;
+		_direction = direction;
+
+		// Add blocks to array
+		int i;
+		Block curr;
+		Block[] blocks = new Block[100]; // max of 100 to prevent blocking
+		for (i = 0, curr = startBlock; (curr.getType() == Material.AIR || curr.getType() == material) && i < blocks.length; i++)
+		{
+			blocks[i] = curr;
+			curr = curr.getRelative(direction);
+		}
+
+		_blocks = new Block[i];
+		System.arraycopy(blocks, 0, _blocks, 0, i);
+	}
+
+	// Update the blockfill based on fill percent
+	public void update(double percent)
+	{
+		double percentPerBlock = 1D / _blocks.length;
+		double check = 0;
+
+		for (int i = 0; i < _blocks.length; i++)
+		{
+			_blocks[i].setType(percent > check ? _material : Material.AIR);
+
+			check += percentPerBlock;
+		}
+	}
+
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/BrawlShopProvider.java

@@ -0,0 +1,11 @@
+package mineplex.core.brawl.fountain;
+
+import mineplex.core.shop.ShopBase;
+
+/**
+ * @author Shaun Bennett
+ */
+public interface BrawlShopProvider
+{
+	public ShopBase getBrawlShop();
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/Fountain.java

@@ -0,0 +1,250 @@
+package mineplex.core.brawl.fountain;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.brawl.fountain.gui.FountainShop;
+import mineplex.core.common.SortedSchematicLoader;
+import mineplex.core.common.block.schematic.UtilSchematic;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilText;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.hologram.Hologram;
+import mineplex.core.hologram.HologramManager;
+import mineplex.core.stats.StatsManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.serverdata.redis.counter.GoalCounter;
+import mineplex.serverdata.redis.counter.GoalCounterListener;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+/**
+ * Represents a fountain that players can add gems to, with a reward for reaching specific goals
+ * @author Shaun Bennett
+ */
+public class Fountain implements GoalCounterListener
+{
+	// Manager Injections
+	private final HologramManager _hologramManager;
+	private final StatsManager _statsManager;
+
+	private boolean _brawlActive;
+	private final String _name;
+	private final String _dataKey;
+	private final Location _location;
+	private final Hologram _hologram;
+	private final GoalCounter _counter;
+//	private final BlockProgressBar _blockProgressBar;
+	private final SortedSchematicLoader<Double> _schematicLoader;
+
+	private final FountainShop _shop;
+
+	public Fountain(Location location, Location pasteLocation, String name, String dataKey, long goal, FountainManager fountainManager,
+	                CoreClientManager clientManager, DonationManager donationManager, HologramManager hologramManager,
+	                StatsManager statsManager)
+	{
+		_hologramManager = hologramManager;
+		_statsManager = statsManager;
+
+		_name = name;
+		_dataKey = dataKey;
+		_location = location;
+		_hologram = new Hologram(hologramManager, location.clone().add(4, 3, -3), name).start();
+		_counter = new GoalCounter(dataKey, 5000, goal);
+		_counter.addListener(this);
+		_brawlActive = false;
+//		_blockProgressBar = new BlockProgressBar(_lavaLocation.getBlock(), Material.LAVA, BlockFace.UP);
+		_schematicLoader = new SortedSchematicLoader<>(pasteLocation);
+		loadSchematics();
+
+		_shop = new FountainShop(this, fountainManager, clientManager, donationManager);
+
+		updateVisuals();
+	}
+
+	private void loadSchematics()
+	{
+		try
+		{
+			_schematicLoader.addSchematic(0.0, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain0.schematic")));
+			_schematicLoader.addSchematic(0.2, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain20.schematic")));
+			_schematicLoader.addSchematic(0.4, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain40.schematic")));
+			_schematicLoader.addSchematic(0.6, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain60.schematic")));
+			_schematicLoader.addSchematic(0.8, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain80.schematic")));
+			_schematicLoader.addSchematic(1.0, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain100.schematic")));
+			_schematicLoader.addSchematic(2.0, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain200.schematic")));
+			_schematicLoader.addSchematic(3.0, UtilSchematic.loadSchematic(new File("../../update/schematic/fountain300.schematic")));
+		}
+		catch (IOException e)
+		{
+			System.err.println("Failed to load Gem Fountain Schematics");
+			e.printStackTrace();
+		}
+	}
+
+	protected void updateVisuals()
+	{
+		double fillPercent = getFillPercent();
+
+		if (isBrawlActive())
+		{
+			ArrayList<String> text = new ArrayList<>();
+			if (fillPercent >= 1)
+			{
+				text.add(C.cRed + C.Bold + "Weekend Brawl is Active!");
+				if (fillPercent >= 2)
+				{
+					text.add("Bonus Reward Unlocked:");
+					if (fillPercent >= 3)
+					{
+						text.add(C.cGreen + "3X Experience in Brawl");
+					}
+					else
+					{
+						text.add(C.cGreen + "2X Experience in Brawl");
+					}
+				}
+				text.add(" ");
+				text.add("Speak to the Fountain Keeper to Join!");
+			}
+			else
+			{
+				text.add(C.cRed + "Brawl goal was not met");
+				text.add("Come back next week");
+			}
+
+			_hologram.setText(text.toArray(new String[text.size()]));
+			_schematicLoader.update(fillPercent);
+		}
+		else
+		{
+			double flatPercent = fillPercent - (int) fillPercent;
+
+			String fillColor;
+			String emptyColor;
+			String goalMessage;
+
+			if (fillPercent < 1)
+			{
+				fillColor = C.cGreen;
+				emptyColor = C.cRed;
+				goalMessage = "100% to Unlock Weekend Brawl";
+			} else if (fillPercent < 2)
+			{
+				fillColor = C.cYellow;
+				emptyColor = C.cGreen;
+				goalMessage = "200% to Unlock 2x XP for Weekend Brawl";
+			} else if (fillPercent < 3)
+			{
+				fillColor = C.cAqua;
+				emptyColor = C.cYellow;
+				goalMessage = "300% to Unlock 3x XP for Weekend Brawl";
+			} else
+			{
+				fillColor = C.cAqua;
+				emptyColor = C.cYellow;
+				goalMessage = "All Rewards Unlocked!";
+				flatPercent = 1;
+			}
+
+			int intPercent = (int) (fillPercent * 100);
+			String progressBar = UtilText.getProgress(null, flatPercent, null, false, 30, emptyColor, fillColor);
+			_hologram.setText(_name + C.Reset + " " + intPercent + "%", goalMessage, progressBar);
+			_schematicLoader.update(fillPercent);
+		}
+	}
+
+	public void increment(Player player, long amount)
+	{
+		_statsManager.incrementStat(player, getStatName(), amount);
+		_counter.addAndGet(amount);
+		updateVisuals();
+	}
+
+	public long getAmountAdded(Player player)
+	{
+		return _statsManager.Get(player).getStat(getStatName());
+	}
+
+	private final String getStatName()
+	{
+		return "Global.Fountain." + getDataKey();
+	}
+
+	public String getName()
+	{
+		return _name;
+	}
+
+	public String getDataKey()
+	{
+		return _dataKey;
+	}
+
+	public void openShop(Player player)
+	{
+		_shop.attemptShopOpen(player);
+	}
+
+	public double getFillPercent()
+	{
+		return Math.min(3, _counter.getFillPercent());
+	}
+
+	public long getCount()
+	{
+		return _counter.getCount();
+	}
+
+	public void reset()
+	{
+		_counter.reset();
+		updateVisuals();
+	}
+
+	@Override
+	public void onMilestone(GoalCounter counter, int milestone)
+	{
+		switch (milestone)
+		{
+			case 1:
+				Bukkit.broadcastMessage(F.main("Fountain", "The Gem Fountain has reached 100%! Brawl Game unlocked this week"));
+				break;
+			case 2:
+				Bukkit.broadcastMessage(F.main("Fountain", "The Gem Fountain has reached 200%! 2x XP enabled for Brawl!"));
+				break;
+			case 3:
+				Bukkit.broadcastMessage(F.main("Fountain", "The Gem Fountain has reached 300%! 3x XP enabled for Brawl!"));
+				break;
+		}
+	}
+
+	public void updateBrawlActive()
+	{
+		Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("PST"));
+		int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+		if (dayOfWeek == Calendar.FRIDAY || dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY)
+		{
+			_brawlActive = true;
+		}
+		else
+		{
+			_brawlActive = false;
+		}
+	}
+
+	public boolean isBrawlActive()
+	{
+		return _brawlActive;
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/FountainManager.java

@@ -0,0 +1,113 @@
+package mineplex.core.brawl.fountain;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.brawl.fountain.command.FountainCommand;
+import mineplex.core.brawl.fountain.gui.FountainShop;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.hologram.HologramManager;
+import mineplex.core.stats.StatsManager;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.serverdata.redis.counter.Counter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+/**
+ * @author Shaun Bennett
+ */
+public class FountainManager extends MiniPlugin
+{
+	private HologramManager _hologramManager;
+	private StatsManager _statsManager;
+	private DonationManager _donationManager;
+	// used so we can inject the brawl shop (only on hub) into fountain code
+	private BrawlShopProvider _brawlShopProvider;
+
+	private Fountain _gemFountain;
+
+	public FountainManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, HologramManager hologramManager, StatsManager statsManager, BrawlShopProvider shopProvider)
+	{
+		super("Counter", plugin);
+
+		_hologramManager = hologramManager;
+		_statsManager = statsManager;
+		_donationManager = donationManager;
+		_brawlShopProvider = shopProvider;
+
+		World world = Bukkit.getWorlds().get(0);//-43.5, 66, -38.5
+		_gemFountain = new Fountain(new Location(world, -32.5, 72, -23.5), new Location(world, -43.5, 67, -38.5),
+				C.cGreen + "Gem Fountain", "GemFountain_01", 10000000, this, clientManager, donationManager, _hologramManager, _statsManager);
+	}
+
+	@Override
+	public void addCommands()
+	{
+		addCommand(new FountainCommand(this));
+	}
+
+	@EventHandler
+	public void updateFountainCount(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+			return;
+
+		_gemFountain.updateBrawlActive();
+		_gemFountain.updateVisuals();
+	}
+
+	@EventHandler
+	public void onInteractAtEntity(PlayerInteractAtEntityEvent event)
+	{
+		Entity entity = event.getRightClicked();
+		if (entity.getCustomName() != null && entity.isCustomNameVisible())
+		{
+			if (entity.getCustomName().contains("Weekend Brawl") && getBrawlShopProvider() != null)
+			{
+				getBrawlShopProvider().getBrawlShop().attemptShopOpen(event.getPlayer());
+			}
+		}
+	}
+
+	@EventHandler
+	public void onDamage(EntityDamageByEntityEvent event)
+	{
+		if (!(event.getDamager() instanceof Player))
+			return;
+
+		Entity entity = event.getEntity();
+		if (entity.getCustomName() != null && entity.isCustomNameVisible())
+		{
+			if (entity.getCustomName().contains("Weekend Brawl") && getBrawlShopProvider() != null)
+			{
+				getBrawlShopProvider().getBrawlShop().attemptShopOpen(((Player) event.getDamager()));
+			}
+		}
+	}
+
+	public Fountain getGemFountain()
+	{
+		return _gemFountain;
+	}
+
+	public DonationManager getDonationManager()
+	{
+		return _donationManager;
+	}
+
+	public BrawlShopProvider getBrawlShopProvider()
+	{
+		return _brawlShopProvider;
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java

@@ -0,0 +1,27 @@
+package mineplex.core.brawl.fountain;
+
+import mineplex.core.common.CurrencyType;
+import mineplex.core.shop.item.SalesPackageBase;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class GemFountainSalesPackage extends SalesPackageBase
+{
+	public GemFountainSalesPackage(int gems)
+	{
+		super("Add " + gems + " Gems", Material.EMERALD, (byte) 0, new String[] {}, gems, 1);
+
+		CurrencyCostMap.put(CurrencyType.GEM, gems);
+		KnownPackage = false;
+		OneTimePurchaseOnly = false;
+	}
+
+	@Override
+	public void Sold(Player player, CurrencyType currencyType)
+	{
+
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/AddCommand.java

@@ -0,0 +1,68 @@
+package mineplex.core.brawl.fountain.command;
+
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.CurrencyType;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.server.util.TransactionResponse;
+import org.bukkit.entity.Player;
+
+/**
+ * Command to add gems to the fountain
+ * @author Shaun Bennett
+ */
+public class AddCommand extends CommandBase<FountainManager>
+{
+	public AddCommand(FountainManager plugin)
+	{
+		super(plugin, Rank.DEVELOPER, "add");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		if (args == null || args.length != 1)
+		{
+			help(caller);
+			return;
+		}
+
+		try
+		{
+			int amount = Integer.parseInt(args[0]);
+
+			Plugin.getDonationManager().purchaseUnknownSalesPackage(new Callback<TransactionResponse>()
+			{
+				@Override
+				public void run(TransactionResponse result)
+				{
+					if (result == TransactionResponse.Success)
+					{
+						Plugin.getGemFountain().increment(caller, amount);
+						UtilPlayer.message(caller, F.main("Fountain", "Added " + F.elem(amount) + " to the fountain!"));
+					}
+					else if (result == TransactionResponse.InsufficientFunds)
+					{
+						UtilPlayer.message(caller, F.main("Fountain", "You do not have enough gems!"));
+					}
+					else
+					{
+						UtilPlayer.message(caller, F.main("Fountain", "There was an error processing your request!"));
+					}
+				}
+			}, caller, "GemFountain.Add", CurrencyType.GEM, amount, false);
+		}
+		catch (NumberFormatException ex)
+		{
+			help(caller);
+		}
+	}
+
+	private void help(Player player)
+	{
+		UtilPlayer.message(player, F.help("/fountain add", "<amount>", Rank.DEVELOPER));
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/FountainCommand.java

@@ -0,0 +1,27 @@
+package mineplex.core.brawl.fountain.command;
+
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.command.MultiCommandBase;
+import mineplex.core.common.Rank;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class FountainCommand extends MultiCommandBase<FountainManager>
+{
+	public FountainCommand(FountainManager plugin)
+	{
+		super(plugin, Rank.DEVELOPER, "fountain");
+
+		AddCommand(new AddCommand(plugin));
+		AddCommand(new GuiCommand(plugin));
+		AddCommand(new ResetCommand(plugin));
+	}
+
+	@Override
+	protected void Help(Player caller, String[] args)
+	{
+
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/GuiCommand.java

@@ -0,0 +1,26 @@
+package mineplex.core.brawl.fountain.command;
+
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * Command to open the fountain gui without speaking to the fountain keeper
+ * @author Shaun Bennett
+ */
+public class GuiCommand extends CommandBase<FountainManager>
+{
+	public GuiCommand(FountainManager plugin)
+	{
+		super(plugin, Rank.DEVELOPER, "gui");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		Plugin.getGemFountain().openShop(caller);
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/ResetCommand.java

@@ -0,0 +1,26 @@
+package mineplex.core.brawl.fountain.command;
+
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * Command to reset the fountain
+ * @author Shaun Bennett
+ */
+public class ResetCommand extends CommandBase<FountainManager>
+{
+	public ResetCommand(FountainManager plugin)
+	{
+		super(plugin, Rank.DEVELOPER, "reset");
+	}
+
+	@Override
+	public void Execute(Player caller, String[] args)
+	{
+		Plugin.getGemFountain().reset();
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/FountainPage.java

@@ -0,0 +1,92 @@
+package mineplex.core.brawl.fountain.gui;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.brawl.fountain.Fountain;
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.brawl.fountain.gui.button.FountainAddButton;
+import mineplex.core.common.CurrencyType;
+import mineplex.core.common.MaterialData;
+import mineplex.core.common.util.C;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class FountainPage extends ShopPageBase<FountainManager, FountainShop>
+{
+	private final MaterialData EMPTY_XP = MaterialData.of(Material.STAINED_GLASS_PANE, (byte) 7);
+	private final MaterialData XP = MaterialData.of(Material.STAINED_GLASS_PANE, (byte) 5);
+	private final MaterialData EMPTY_XP100 = MaterialData.of(Material.STAINED_GLASS_PANE, (byte) 5);
+	private final MaterialData XP100 = MaterialData.of(Material.STAINED_GLASS_PANE, (byte) 4);
+	private final MaterialData EMPTY_XP200 = MaterialData.of(Material.STAINED_GLASS_PANE, (byte) 4);
+	private final MaterialData XP200 = MaterialData.of(Material.STAINED_GLASS_PANE, (byte) 3);
+	private final int[] XP_SLOTS = { 2, 3, 4, 5, 6 };
+
+	private Fountain _fountain;
+
+	public FountainPage(FountainManager plugin, FountainShop shop, CoreClientManager clientManager, DonationManager donationManager, Fountain fountain, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Fountain Keeper", player, 27);
+
+		_fountain = fountain;
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		// Experience Bar
+		long added = _fountain.getAmountAdded(getPlayer());
+		final double fillPercent = _fountain.getFillPercent();
+		String title = ((int)(fillPercent * 100)) + "% Complete";
+		boolean canAdd = fillPercent < 3;
+
+		String unlockMessage;
+		if (fillPercent < 1)      unlockMessage = "Reach 100% to unlock Weekend Brawl Game";
+		else if (fillPercent < 2) unlockMessage = "Reach 200% to unlock 2x XP in Brawl";
+		else if (fillPercent < 3) unlockMessage = "Reach 300% to unlock 3x XP in Brawl";
+		else                      unlockMessage = "All rewards unlocked!";
+
+		String[] lore = new String[] {
+				" ",
+				C.cWhite + unlockMessage,
+				" ",
+				C.cWhite + "You have added " + C.cGreen + added + " Gems"};
+
+		final double percentForEach = 1D / XP_SLOTS.length;
+		double check = percentForEach;
+
+		double flatPercent = fillPercent == 3 ? 1 : fillPercent - ((int) fillPercent);
+		for (int i = 0; i < XP_SLOTS.length; i++)
+		{
+			MaterialData data;
+			if (fillPercent < 1)        data = flatPercent >= check ? XP : EMPTY_XP;
+			else if (fillPercent < 2)   data = flatPercent >= check ? XP100 : EMPTY_XP100;
+			else                        data = flatPercent >= check ? XP200 : EMPTY_XP200;
+			ShopItem shopItem = new ShopItem(data.getMaterial(), data.getData(), title,
+					lore, 1, false, false);
+
+			setItem(XP_SLOTS[i], shopItem);
+			check += percentForEach;
+		}
+
+		if (canAdd)
+		{
+			int playerGems = getDonationManager().Get(getPlayer()).GetGems();
+			ShopItem add1 = new ShopItem(Material.EMERALD, "Add 100 Gems", new String[]{}, 1, playerGems < 100, false);
+			ShopItem add2 = new ShopItem(Material.EMERALD, "Add 1,000 Gems", new String[]{}, 64, playerGems < 1000, false);
+			ShopItem add3 = new ShopItem(Material.EMERALD_BLOCK, "Add 10,000 Gems", new String[]{}, 1, playerGems < 10000, false);
+			ShopItem add4 = new ShopItem(Material.EMERALD_BLOCK, "Add 100,000 Gems", new String[]{}, 64, playerGems < 100000, false);
+			// Buttons
+			addButton(19, add1, new FountainAddButton(this, 100));
+			addButton(21, add2, new FountainAddButton(this, 1000));
+			addButton(23, add3, new FountainAddButton(this, 10000));
+			addButton(25, add4, new FountainAddButton(this, 100000));
+		}
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/FountainShop.java

@@ -0,0 +1,48 @@
+package mineplex.core.brawl.fountain.gui;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.brawl.fountain.Fountain;
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.ShopBase;
+import mineplex.core.shop.page.ShopPageBase;
+import org.bukkit.entity.Player;
+
+/**
+ * @author Shaun Bennett
+ */
+public class FountainShop extends ShopBase<FountainManager>
+{
+	private final Fountain _fountain;
+
+	public FountainShop(Fountain fountain, FountainManager plugin, CoreClientManager clientManager, DonationManager donationManager)
+	{
+		super(plugin, clientManager, donationManager, "Fountain Keeper");
+
+		_fountain = fountain;
+	}
+
+	@Override
+	protected ShopPageBase<FountainManager, ? extends ShopBase<FountainManager>> buildPagesFor(Player player)
+	{
+		return new FountainPage(getPlugin(), this, getClientManager(), getDonationManager(), _fountain, player);
+	}
+
+	public Fountain getFountain()
+	{
+		return _fountain;
+	}
+
+	@Override
+	public boolean attemptShopOpen(Player player)
+	{
+		if (_fountain.isBrawlActive() &&  getPlugin().getBrawlShopProvider() != null)
+		{
+			return getPlugin().getBrawlShopProvider().getBrawlShop().attemptShopOpen(player);
+		}
+		else
+		{
+			return super.attemptShopOpen(player);
+		}
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/button/FountainAddButton.java

@@ -0,0 +1,42 @@
+package mineplex.core.brawl.fountain.gui.button;
+
+import mineplex.core.brawl.fountain.FountainManager;
+import mineplex.core.brawl.fountain.GemFountainSalesPackage;
+import mineplex.core.brawl.fountain.gui.FountainPage;
+import mineplex.core.brawl.fountain.gui.FountainShop;
+import mineplex.core.common.CurrencyType;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.SalesPackageBase;
+import mineplex.core.shop.page.ConfirmationPage;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+/**
+ * @author Shaun Bennett
+ */
+public class FountainAddButton implements IButton
+{
+	private final FountainPage _page;
+	private final int _gems;
+	private final SalesPackageBase _salesPackage;
+
+	public FountainAddButton(FountainPage page, int gems)
+	{
+		_page = page;
+		_gems = gems;
+		_salesPackage = new GemFountainSalesPackage(gems);
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_page.getShop().openPageForPlayer(player, new ConfirmationPage<FountainManager, FountainShop>(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable()
+		{
+			public void run()
+			{
+				_page.getPlugin().getGemFountain().increment(player, _gems);
+				_page.refresh();
+			}
+		}, _page, _salesPackage, CurrencyType.GEM, player));
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java

@@ -1,5 +1,6 @@
 package mineplex.core.cosmetic;
 
+import mineplex.core.boosters.BoosterManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -35,13 +36,14 @@ public class CosmeticManager extends MiniPlugin
 	private MountManager _mountManager;
 	private PetManager _petManager;
 	private TreasureManager _treasureManager;
+	private BoosterManager _boosterManager;
 	
 	private CosmeticShop _shop;
 	
 	private boolean _showInterface = true;
 	private int _interfaceSlot = 4;
 
-	public CosmeticManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, GadgetManager gadgetManager, MountManager mountManager, PetManager petManager, TreasureManager treasureManager)
+	public CosmeticManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, GadgetManager gadgetManager, MountManager mountManager, PetManager petManager, TreasureManager treasureManager, BoosterManager boosterManager)
 	{
 		super("Cosmetic Manager", plugin);
 		
@@ -50,6 +52,7 @@ public class CosmeticManager extends MiniPlugin
 		_mountManager = mountManager;
 		_petManager = petManager;
 		_treasureManager = treasureManager;
+		_boosterManager = boosterManager;
 
 		_shop = new CosmeticShop(this, clientManager, donationManager, _moduleName);
 	}
@@ -195,6 +198,11 @@ public class CosmeticManager extends MiniPlugin
 		return _treasureManager;
 	}
 
+	public BoosterManager getBoosterManager()
+	{
+		return _boosterManager;
+	}
+
 	public void disableTeamArmor()
 	{
 		for (Gadget gadget : getGadgetManager().getGadgets(GadgetType.Costume))

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java

@@ -1,5 +1,6 @@
 package mineplex.core.cosmetic.ui;
 
+import mineplex.core.cosmetic.ui.page.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.plugin.messaging.PluginMessageListener;
@@ -7,10 +8,6 @@ import org.bukkit.plugin.messaging.PluginMessageListener;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.CurrencyType;
 import mineplex.core.cosmetic.CosmeticManager;
-import mineplex.core.cosmetic.ui.page.GadgetPage;
-import mineplex.core.cosmetic.ui.page.Menu;
-import mineplex.core.cosmetic.ui.page.PetTagPage;
-import mineplex.core.cosmetic.ui.page.TreasurePage;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.gadget.event.ItemGadgetOutOfAmmoEvent;
 import mineplex.core.shop.ShopBase;
@@ -22,7 +19,7 @@ public class CosmeticShop extends ShopBase<CosmeticManager> implements PluginMes
 {
 	public CosmeticShop(CosmeticManager plugin, CoreClientManager clientManager, DonationManager donationManager, String name)
 	{
-		super(plugin, clientManager, donationManager, name, CurrencyType.Gems, CurrencyType.Coins);
+		super(plugin, clientManager, donationManager, name, CurrencyType.GEM, CurrencyType.TREASURE_SHARD);
 		
 		plugin.getPlugin().getServer().getMessenger().registerIncomingPluginChannel(plugin.getPlugin(), "MC|ItemName", this);
 	}
@@ -57,15 +54,15 @@ public class CosmeticShop extends ShopBase<CosmeticManager> implements PluginMes
 	}
 	
 	@EventHandler
-	public void updateTreasure(UpdateEvent event)
+	public void updatePages(UpdateEvent event)
 	{
-		if (event.getType() != UpdateType.TICK)
+		if (event.getType() != UpdateType.SEC)
 			return;
 
 		for (ShopPageBase<CosmeticManager, ? extends ShopBase<CosmeticManager>> shop : getPlayerPageMap().values())
 		{
-			if (shop instanceof TreasurePage)
+			if (shop instanceof BoosterPage)
-				((TreasurePage) shop).update();
+				((BoosterPage) shop).updatePage();
 		}
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/MountButton.java

@@ -32,6 +32,6 @@ public class MountButton implements IButton
 				_page.getPlugin().getInventoryManager().addItemToInventory(null, player, _mount.getName(), 1);
 				_page.refresh();
 			}
-		}, _page, _mount, CurrencyType.Coins, player));
+		}, _page, _mount, CurrencyType.TREASURE_SHARD, player));
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BoosterPage.java

@@ -0,0 +1,45 @@
+package mineplex.core.cosmetic.ui.page;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.cosmetic.CosmeticManager;
+import mineplex.core.cosmetic.ui.CosmeticShop;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import java.util.ArrayList;
+
+/**
+ * @author Shaun Bennett
+ */
+public class BoosterPage extends ShopPageBase<CosmeticManager, CosmeticShop>
+{
+	public BoosterPage(CosmeticManager plugin, CosmeticShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
+	{
+		super(plugin, shop, clientManager, donationManager, "Game Boosters", player, 9);
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		ArrayList<String> lore = new ArrayList<>();
+
+		lore.add(" ");
+		lore.add("You Own: " + _plugin.getBoosterManager().getAvailableBoosterCount(getPlayer()));
+
+		ShopItem booster = new ShopItem(Material.SUGAR, "Game Booster", lore.toArray(new String[0]), 0, false, false);
+		setItem(4, booster);
+	}
+
+	public void updatePage()
+	{
+		refresh();
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java

@@ -38,7 +38,11 @@ public class CostumePage extends GadgetPage
 
 		for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Costume))
 		{
+<<<<<<< HEAD
 			if (gadget.getCost(CurrencyType.Coins) == -1)
+=======
+			if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -1)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 				continue;
 			
 			OutfitGadget outfitGadget = ((OutfitGadget) gadget);

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java

@@ -48,7 +48,11 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 
 		for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Item))
 		{
+<<<<<<< HEAD
 			if (gadget.getCost(CurrencyType.Coins) == -3)
+=======
+			if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -3)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 				continue;
 
 			addGadget(gadget, slot);
@@ -103,37 +107,65 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 
 		if (!gadget.ownsGadget(getPlayer()))
 		{
+<<<<<<< HEAD
 			if (gadget.getCost(CurrencyType.Coins) == -1)
+=======
+			if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -1)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				//Nothing
 			}
 			//Chest Unlocks
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -2 || gadget.getCost(CurrencyType.Coins) > 0)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -2 || gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Treasure Chests");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -3)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -3)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Winter Holiday Treasure");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -4)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -4)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -5)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -5)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Easter Holiday Treasure");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -6)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -6)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Valentines Gifts");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -7)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -7)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Purchased from shop.mineplex.com");
@@ -145,22 +177,38 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 			}
 
 			//Rank Unlocks
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -10)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -10)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cAqua + "Unlocked with Ultra Rank");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -11)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -11)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cPurple + "Unlocked with Hero Rank");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -12)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -12)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cGreen + "Unlocked with Legend Rank");
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) == -13)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -13)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cRed + "Unlocked with Titan Rank");
@@ -237,6 +285,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 			}
 			else
 			{
+<<<<<<< HEAD
 				if (gadget.getCost(CurrencyType.Coins) > 0)
 				{
 					itemLore.add(C.cBlack);
@@ -244,13 +293,26 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 				}
 
 				if (gadget.getCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= gadget.getCost(CurrencyType.Coins))
+=======
+				if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+				{
+					itemLore.add(C.cBlack);
+					itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
+				}
+
+				if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= gadget.GetCost(CurrencyType.TREASURE_SHARD))
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 				{
 					itemLore.add(C.cBlack);
 					itemLore.add(C.cGreen + "Click to Purchase");
 
 					addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, gadget.getName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).hideInfo(), new GadgetButton(gadget, this));
 				}
+<<<<<<< HEAD
 				else if (gadget.getCost(CurrencyType.Coins) > 0)
+=======
+				else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 				{
 					itemLore.add(C.cBlack);
 					itemLore.add(C.cRed + "Not enough Treasure Shards.");
@@ -321,6 +383,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 		}
 		else 
 		{	
+<<<<<<< HEAD
 			if (gadget.getCost(CurrencyType.Coins) > 0)
 			{
 				itemLore.add(C.cBlack);
@@ -328,13 +391,26 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 			}
 
 			if (gadget.getCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= gadget.getCost(CurrencyType.Coins))
+=======
+			if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+			{
+				itemLore.add(C.cBlack);
+				itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
+			}
+
+			if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= gadget.GetCost(CurrencyType.TREASURE_SHARD))
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cGreen + "Click to Purchase");
 
 				addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, gadget.getName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).hideInfo(), new GadgetButton(gadget, this));
 			}
+<<<<<<< HEAD
 			else if (gadget.getCost(CurrencyType.Coins) > 0)
+=======
+			else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cRed + "Not enough Treasure Shards.");
@@ -355,7 +431,11 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 		{
 			ItemGadget itemGadget = (ItemGadget)gadget;
 
+<<<<<<< HEAD
 			if (itemGadget.getAmmo().getCost(CurrencyType.Coins) < 0)
+=======
+			if (itemGadget.getAmmo().GetCost(CurrencyType.TREASURE_SHARD) < 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 				return;
 		}
 
@@ -371,7 +451,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 				getPlugin().getInventoryManager().addItemToInventory(getPlayer(), gadget.getName(), (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo().getQuantity() : gadget.getQuantity()));
 				refresh();
 			}
-		}, this, (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo() : gadget), CurrencyType.Coins, getPlayer()));
+		}, this, (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo() : gadget), CurrencyType.TREASURE_SHARD, getPlayer()));
 	}
 
 	public void activateGadget(Player player, Gadget gadget)

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java

@@ -67,6 +67,7 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
 		int tauntSlot = 49;//slots[11];
 		int winEffectSlot = 51;
 		int gameModifierSlot = 53;
+		int boosterSlot = 52;// TODO
 
 		EnumMap<GadgetType, Integer> ownedCount = new EnumMap<GadgetType, Integer>(GadgetType.class);
 		EnumMap<GadgetType, Integer> maxCount = new EnumMap<GadgetType, Integer>(GadgetType.class);
@@ -196,10 +197,16 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
 		addButton(gameModifierSlot, new ShopItem(Material.TORCH, "Game Modifiers", lore, 1, false), new OpenGameModifiers(this, enabled.get(type)));
 		if (enabled.containsKey(type)) addGlow(gameModifierSlot);
 
+<<<<<<< HEAD
 		/*type = GadgetType.Balloon;
 		lore = getLore(ownedCount.get(type), maxCount.get(type), "Placeholder", "Placeholder", enabled.get(type));
 		addButton(balloonSlot, new ShopItem(Material.BANNER, "Balloons", lore, 1, false), new OpenBalloons(this, enabled.get(type)));
 		if (enabled.containsKey(type)) addGlow(balloonSlot);*/
+=======
+//		addButton(boosterSlot, new ShopItem(Material.EMERALD, "Game Boosters",
+//				new String[]{C.Bold + "", C.cDGreen + C.Italics + "Coming soon!"}, 1, false),
+//				(player, clickType) -> openBoosters(player));
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 	}
 
 	private String[] getLore(int ownedCount, int maxCount, String info, String visibility, Gadget enabled)
@@ -247,4 +254,9 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
 	{
 		getShop().openPageForPlayer(player, new MusicPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), "Music", player));
 	}
+
+	public void openBoosters(Player player)
+	{
+		getShop().openPageForPlayer(player, new BoosterPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java

@@ -62,32 +62,56 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 
 		if (!getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(mount.getName()))
 		{
+<<<<<<< HEAD
 			if (mount.getCost(CurrencyType.Coins) == -1)
+=======
+			if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -1)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				//Nothing
 			}
 			//Chest Unlocks
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -2 || mount.getCost(CurrencyType.Coins) > 0)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -2 || mount.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Treasure Chests");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -3)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -3)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Winter Holiday Treasure");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -4)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -4)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -5)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -5)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Easter Holiday Treasure");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -6)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -6)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cBlue + "Found in Valentines Holiday Treasure");
@@ -98,22 +122,38 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 				itemLore.add(C.cBlue + "Found in Freedom Chests");
 			}
 			//Rank Unlocks
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -10)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -10)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cAqua + "Unlocked with Ultra Rank");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -11)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -11)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cPurple + "Unlocked with Hero Rank");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -12)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -12)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cGreen + "Unlocked with Legend Rank");
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) == -13)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -13)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cRed + "Unlocked with Titan Rank");
@@ -139,6 +179,7 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 		}
 		else
 		{
+<<<<<<< HEAD
 			if (mount.getCost(CurrencyType.Coins) > 0)
 			{
 				itemLore.add(C.cBlack);
@@ -146,13 +187,26 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 			}
 
 			if (mount.getCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= mount.getCost(CurrencyType.Coins))
+=======
+			if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+			{
+				itemLore.add(C.cBlack);
+				itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + mount.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
+			}
+
+			if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= mount.GetCost(CurrencyType.TREASURE_SHARD))
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cGreen + "Click to Purchase");
 
 				addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, mount.getName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false), new MountButton(mount, this));
 			}
+<<<<<<< HEAD
 			else if (mount.getCost(CurrencyType.Coins) > 0)
+=======
+			else if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 			{
 				itemLore.add(C.cBlack);
 				itemLore.add(C.cRed + "Not enough Treasure Shards.");

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java

@@ -63,49 +63,85 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
         	//Chest Unlocks
         	if (!getPlugin().getPetManager().Get(getPlayer()).GetPets().containsKey(pet.GetPetType()))
         	{
+<<<<<<< HEAD
         		if (pet.getCost(CurrencyType.Coins) == -1)
+=======
+        		if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -1)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		//Nothing
             	}
         		
+<<<<<<< HEAD
         		else if (pet.getCost(CurrencyType.Coins) == -2 || pet.getCost(CurrencyType.Coins) > 0)
+=======
+        		else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -2 || pet.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cBlue + "Found in Treasure Chests");
             	}
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -3)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -3)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cBlue + "Found in Winter Holiday Treasure");
             	}
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -4)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -4)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure");
             	}
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -5)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -5)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cBlue + "Found in Easter Holiday Treasure");
             	}
         		
         		//Rank Unlocks
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -10)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -10)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cAqua + "Unlocked with Ultra Rank");
             	}
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -11)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -11)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cPurple + "Unlocked with Hero Rank");
             	}
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -12)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -12)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cGreen + "Unlocked with Legend Rank");
             	}
+<<<<<<< HEAD
             	else if (pet.getCost(CurrencyType.Coins) == -13)
+=======
+            	else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -13)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
             	{
             		itemLore.add(C.cBlack);
             		itemLore.add(C.cRed + "Unlocked with Titan Rank");
@@ -145,6 +181,7 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
         	//Not Owned
         	else
         	{
+<<<<<<< HEAD
         		if (pet.getCost(CurrencyType.Coins) > 0)
     			{
         			itemLore.add(C.cBlack);
@@ -152,13 +189,26 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
     			}
         
         		if (pet.getCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= pet.getCost(CurrencyType.Coins))
+=======
+        		if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+    			{
+        			itemLore.add(C.cBlack);
+        			itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + pet.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
+    			}
+        
+        		if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= pet.GetCost(CurrencyType.TREASURE_SHARD))
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
         		{
         			itemLore.add(C.cBlack);
         			itemLore.add(C.cGreen + "Click to Purchase");
         			
         			addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, pet.GetPetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false), new PetButton(pet, this));
         		}
+<<<<<<< HEAD
         		else if (pet.getCost(CurrencyType.Coins) > 0)
+=======
+        		else if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0)
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
         		{
         			itemLore.add(C.cBlack);
         			itemLore.add(C.cRed + "Not enough Treasure Shards.");
@@ -194,7 +244,11 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 					|| getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.VILLAGER
 					|| getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.ZOMBIE)
         	{
+<<<<<<< HEAD
         		addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.getCost(CurrencyType.Coins) + C.cGreen + " Shards", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this));
+=======
+        		addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.TREASURE_SHARD) + C.cGreen + " Shards", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this));
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
         	}
             
         	slot++;

Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java

@@ -130,7 +130,7 @@ public class PetTagPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 
 				getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), getPlayer()));
 			}
-		}, null, _petPurchase ? _pet : tag, CurrencyType.Coins, getPlayer()));
+		}, null, _petPurchase ? _pet : tag, CurrencyType.TREASURE_SHARD, getPlayer()));
 	}
 
 	public void SetTagName(String tagName)

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

@@ -74,6 +74,11 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 		//_repository.updateGemsAndCoins(uuid, Get(token.Name).GetGems(), Get(token.Name).getCoins());
 	}
 
+	public void purchaseUnknownSalesPackage(Callback<TransactionResponse> callback, Player player, String packageName, CurrencyType currencyType, int cost, boolean oneTimePurchase)
+	{
+		PurchaseUnknownSalesPackage(callback, player.getName(), getClientManager().getAccountId(player), packageName, currencyType, cost, oneTimePurchase);
+	}
+	
 	public void PurchaseUnknownSalesPackage(final Callback<TransactionResponse> callback, final String name, final int accountId, final String packageName, final CurrencyType currencyType, final int cost, boolean oneTimePurchase)
 	{
 		final Donor donor = Bukkit.getPlayerExact(name) != null ? Get(name) : null;

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

@@ -69,15 +69,15 @@ public class Donor
     {
     	switch (currencyType)
     	{
-			case Gems:
+			case GEM:
 				_gems -= cost;
 				_update = true;
 				break;
-			case Coins:
+			case TREASURE_SHARD:
 				_coins -= cost;
 				_update = true;
 				break;
-			case Gold:
+			case GOLD:
 				_gold -= cost;
 				_update = true;
 				break;
@@ -90,13 +90,13 @@ public class Donor
 	{
     	switch (currencyType)
     	{
-			case Gems:
+			case GEM:
 				return _gems;
-			case Coins:
+			case TREASURE_SHARD:
 				return _coins;
-			case Gold:
+			case GOLD:
 				return _gold;
-			case Tokens:
+			case TOKEN:
 				return 0;
 			default:
 				return 0;

Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java

@@ -11,7 +11,6 @@ import mineplex.core.common.CurrencyType;
 import mineplex.core.common.util.Callback;
 import mineplex.serverdata.database.DBPool;
 import mineplex.serverdata.database.DatabaseRunnable;
-import mineplex.serverdata.database.RepositoryBase;
 import mineplex.serverdata.database.column.ColumnInt;
 import mineplex.core.donation.Donor;
 import mineplex.core.donation.repository.token.GemRewardToken;
@@ -76,7 +75,7 @@ public class DonationRepository extends MinecraftRepository
 		final UnknownPurchaseToken token = new UnknownPurchaseToken();
 		token.AccountName = name;
 		token.SalesPackageName = packageName;
-		token.CoinPurchase = currencyType == CurrencyType.Coins;
+		token.CoinPurchase = currencyType == CurrencyType.TREASURE_SHARD;
 		token.Cost = cost;
 		token.Premium = false;
 
@@ -86,12 +85,12 @@ public class DonationRepository extends MinecraftRepository
 			{
 				if (response == TransactionResponse.Success)
 				{
-					if (currencyType == CurrencyType.Coins)
+					if (currencyType == CurrencyType.TREASURE_SHARD)
 					{
 						executeUpdate(UPDATE_ACCOUNT_COINS, new ColumnInt("coins", -cost), new ColumnInt("id", accountId));
 						//executeUpdate(INSERT_COIN_TRANSACTION, new ColumnInt("id", accountId), new ColumnVarChar("reason", 100, "Purchased " + packageName), new ColumnInt("coins", -cost));
 					}
-					else if (currencyType == CurrencyType.Gold)
+					else if (currencyType == CurrencyType.GOLD)
 					{
 						executeUpdate(UPDATE_ACCOUNT_GOLD, new ColumnInt("gold", -cost), new ColumnInt("id", accountId));
 					}

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

@@ -7,12 +7,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import mineplex.core.MiniDbClientPlugin;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.Rank;
@@ -29,12 +23,17 @@ import mineplex.core.friend.command.FriendsDisplay;
 import mineplex.core.friend.data.FriendData;
 import mineplex.core.friend.data.FriendRepository;
 import mineplex.core.friend.data.FriendStatus;
-import mineplex.core.incognito.IncognitoManager;
 import mineplex.core.portal.Portal;
 import mineplex.core.preferences.PreferencesManager;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.plugin.java.JavaPlugin;
+
 public class FriendManager extends MiniDbClientPlugin<FriendData>
 {
     private static FriendSorter _friendSorter = new FriendSorter();
@@ -378,7 +377,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
 
         message.add(C.cDAqua + "Toggle GUI").click("run_command", "/friendsdisplay");
 
-        message.hover("show_text", C.cAqua + "Toggle friends to display in a inventory");
+        message.hover("show_text", C.cAqua + "Toggle friends to display in an inventory");
 
         message.add(C.cAqua + C.Strike + "======================");
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemGemBooster.java

@@ -0,0 +1,30 @@
+package mineplex.core.gadget.gadgets.item;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.LineFormat;
+import mineplex.core.common.util.UtilText;
+import mineplex.core.cosmetic.event.ActivateGemBoosterEvent;
+import mineplex.core.gadget.GadgetManager;
+import mineplex.core.gadget.gadgets.Ammo;
+import mineplex.core.gadget.types.ItemGadget;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+public class ItemGemBooster extends ItemGadget
+{
+
+	public static final String NAME = "Gem Booster";
+	private static final String[] LORE = UtilText.splitLineToArray(C.cGray + "Get triple gems in any game on this server!", LineFormat.LORE);
+
+	public ItemGemBooster(GadgetManager manager)
+	{
+		super(manager, NAME, LORE, 1, Material.EMERALD, (byte) -1, 0,
+				new Ammo(NAME, NAME, Material.EMERALD, (byte) 0, LORE, -1, 0));
+	}
+
+	@Override
+	public void ActivateCustom(Player player)
+	{
+		player.getServer().getPluginManager().callEvent(new ActivateGemBoosterEvent(player));
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java

@@ -151,7 +151,7 @@ public class MorphBunny extends MorphGadget
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 		
-		if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Coins) < 500)
+		if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.TREASURE_SHARD) < 500)
 		{
 			UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards."));
 			return;

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java

@@ -81,7 +81,7 @@ public class MorphVillager extends MorphGadget implements IThrown
 		if (!UtilEvent.isAction(event, ActionType.L))
 			return;
 		
-		if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Gems) < 20)
+		if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.GEM) < 20)
 		{
 			UtilPlayer.message(player, F.main("Gadget", "You do not have enough Gems."));
 			return;

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

@@ -81,7 +81,9 @@ public enum GameDisplay
 	
 	Valentines("Valentines Vendetta", Material.LEATHER, (byte)0, GameCategory.EXTRA, 61),
 
-	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
+	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999),
+	
+	Brawl("Brawl", Material.DIAMOND, (byte) 0, GameCategory.EVENT, 998);
 
 	String _name;
 	String _lobbyName;

Plugins/Mineplex.Core/src/mineplex/core/gamebooster/BoostGame.java

@@ -0,0 +1,14 @@
+package mineplex.core.gamebooster;
+
+/**
+ * A boost game represents a specific game that can be boosted. I use this over GameType so we can allow
+ * different games to share the same booster queue (mixed arcade using the same boosters being an example)
+ *
+ * @author Shaun Bennett
+ */
+public enum BoostGame
+{
+	MIXED_ARCADE,
+	BRIDGES,
+	SURVIVAL_GAMES
+}

Plugins/Mineplex.Core/src/mineplex/core/gamebooster/BoosterData.java

@@ -0,0 +1,58 @@
+package mineplex.core.gamebooster;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import mineplex.serverdata.data.Data;
+
+public class BoosterData implements Data
+{
+	private BoostGame _game;
+	private long _timeRemaining;
+	private List<BoostedGame> _boostQueue = new ArrayList<>();
+
+	public BoosterData(BoostGame game)
+	{
+		_game = game;
+		_timeRemaining = 1000 * 60 * 60;
+	}
+
+	public List<BoostedGame> getBoostQueue()
+	{
+		return _boostQueue;
+	}
+
+	public long getTimeRemaining()
+	{
+		return _timeRemaining;
+	}
+
+	@Override
+	public String getDataId()
+	{
+		return _game.name();
+	}
+
+	public static class BoostedGame
+	{
+		private String _playerName;
+		private UUID _playerUUID;
+
+		public BoostedGame(String playerName, UUID playerUUID)
+		{
+			_playerName = playerName;
+			_playerUUID = playerUUID;
+		}
+
+		public String getPlayerName()
+		{
+			return _playerName;
+		}
+
+		public UUID getPlayerUUID()
+		{
+			return _playerUUID;
+		}
+	}
+}

Plugins/Mineplex.Core/src/mineplex/core/gamebooster/GameBoosterManager.java

@@ -0,0 +1,87 @@
+package mineplex.core.gamebooster;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.cosmetic.ui.page.BoosterPage;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.inventory.InventoryManager;
+import mineplex.serverdata.Region;
+import mineplex.serverdata.data.DataRepository;
+import mineplex.serverdata.redis.RedisDataRepository;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Handles activation of GameBoosters
+ *
+ * @author Shaun Bennett
+ */
+public class GameBoosterManager extends MiniPlugin
+{
+	// The item name used for InventoryManager
+	private static final String BOOSTER_INVENTORY_ITEM = "Global.GameBooster";
+
+	private final CoreClientManager _clientManager;
+	private final DonationManager _donationManager;
+	private final InventoryManager _inventoryManager;
+
+	private final DataRepository<BoosterData> _boosterRepository;
+	private BoostGame _activeBoostGame;
+
+	public GameBoosterManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager)
+	{
+		super("Game Boosters", plugin);
+
+		_clientManager = clientManager;
+		_donationManager = donationManager;
+		_inventoryManager = inventoryManager;
+
+		_boosterRepository = new RedisDataRepository(Region.currentRegion(), BoosterData.class, "gemBooster");
+	}
+
+
+	/**
+	 * Get the number of boosters available for a player for a specific BoostGame. Currently the BoostGame has no
+	 * affect on the output (there aren't separate types of boosters), but we may need to introduce different booster
+	 * items for different games in the future.
+	 *
+	 * @param player The player that owns the boosters
+	 * @param game The game to check for boosters
+	 * @return The amount of unactivated boosters that player owns
+	 */
+	public int getAvailableBoosters(Player player, BoostGame game)
+	{
+		return _inventoryManager.Get(player).getItemCount(BOOSTER_INVENTORY_ITEM);
+	}
+
+	/**
+	 * Attempt to activate a booster from a player for a specific game. This will do all the required checks to make sure
+	 * the player has boosters available and removes that booster from the player's account. This will return true if
+	 * the booster was successfully added, or false if it wasn't
+	 *
+	 * @param player The player that owns the booster item
+	 * @param game The game to be boosted
+	 * @return True if the booster has been enabled and removed from the player account, false otherwise
+	 */
+	public boolean activateBooster(Player player, BoostGame game)
+	{
+		// TODO
+		return false;
+	}
+
+	/**
+	 * Return the BoosterData for a specific BoostGame
+	 * @param game The BoostGame we want data for
+	 * @return The BoosterData instance for that game
+	 */
+	public BoosterData getBoosterData(BoostGame game)
+	{
+		BoosterData data = new BoosterData(game);
+		data.getBoostQueue().add(new BoosterData.BoostedGame("Phinary", UUID.randomUUID()));
+		return data;
+	}
+
+}

Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemBuilder.java

@@ -8,6 +8,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import mineplex.core.common.util.UtilInput;
+import mineplex.core.common.util.UtilInv;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
@@ -24,7 +26,6 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilInv;
 
 public class ItemBuilder
 {
@@ -57,7 +58,7 @@ public class ItemBuilder
 	private Material _mat;
 	private String _title = null;
 	private boolean _unbreakable;
-	private boolean _dullEnchantment;
+	private boolean _glow;
 	private String _playerHeadName = null;
 	private HashSet<ItemFlag> _itemFlags = new HashSet<ItemFlag>();
 
@@ -134,6 +135,13 @@ public class ItemBuilder
 		return this;
 	}
 
+	public ItemBuilder setGlow(boolean glow)
+	{
+		_glow = glow;
+
+		return this;
+	}
+
 	public ItemBuilder setItemFlags(Collection<ItemFlag> flags)
 	{
 		getItemFlags().clear();
@@ -269,11 +277,7 @@ public class ItemBuilder
 		}
 
 		item.addUnsafeEnchantments(_enchants);
-
+		if (_glow) item.addEnchantment(UtilInv.getDullEnchantment(), 1);
-		if (_dullEnchantment)
-		{
-			UtilInv.addDullEnchantment(item);
-		}
 
 		return item;
 	}
@@ -420,11 +424,4 @@ public class ItemBuilder
 		return this;
 	}
 
-	public ItemBuilder addDullEnchantment(boolean dullEnchantment)
-	{
-		_dullEnchantment = dullEnchantment;
-		
-		return this;
-	}
-
 }

Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import mineplex.core.MiniPlugin;
@@ -770,7 +771,7 @@ public class ItemStackFactory extends MiniPlugin
 
 	public ItemStack CreateStack(Material type, byte data, int amount, String name, String[] lore, String owner, boolean unbreakable)
 	{
-		return CreateStack(type.getId(), data, amount, (short)0, name, ArrayToList(lore), owner, unbreakable);
+		return CreateStack(type.getId(), data, amount, (short)0, name, ArrayToList(lore), owner, unbreakable, 0, null);
 	}
 
 	public ItemStack CreateStack(int id,  byte data, int amount, String name, String[] lore, String owner)
@@ -790,7 +791,7 @@ public class ItemStackFactory extends MiniPlugin
 
 	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, String[] lore, String owner, boolean unbreakable)
 	{
-		return CreateStack(id, data, amount, damage, name, ArrayToList(lore), owner, unbreakable);
+		return CreateStack(id, data, amount, damage, name, ArrayToList(lore), owner, unbreakable, 0, null);
 	}
 
 
@@ -801,13 +802,19 @@ public class ItemStackFactory extends MiniPlugin
 
 	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner)
 	{
-		return CreateStack(id, data, amount, damage, name, lore, owner, true);
+		return CreateStack(id, data, amount, damage, name, lore, owner, true, 0, null);
+	}
+
+	@SuppressWarnings("deprecation")
+	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner, boolean unbreakable)
+	{
+		return CreateStack(id, data, amount, damage, name, lore, owner, unbreakable, 0, null);
 	}
 	
 	//XXX Owner Variant End
 
 	@SuppressWarnings("deprecation")
-	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner, boolean unbreakable)
+	public ItemStack CreateStack(int id, byte data, int amount, short damage, String name, List<String> lore, String owner, boolean unbreakable, Integer enchLevel, Enchantment... enchantments)
 	{	
 		ItemStack stack;
 		if (data == 0) 	
@@ -875,6 +882,14 @@ public class ItemStackFactory extends MiniPlugin
 		if (setMeta)
 			stack.setItemMeta(itemMeta);
 		
+		if(enchantments != null)
+		{
+			for(Enchantment enchantment : enchantments)
+			{
+				stack.addEnchantment(enchantment, enchLevel);
+			}
+		}
+		
 		//Unbreakable
 		if (unbreakable)
 		{

Plugins/Mineplex.Core/src/mineplex/core/party/Party.java

@@ -82,7 +82,7 @@ public class Party
 			for (Rank rank : Rank.values())
 			{
 				if (rank != Rank.ALL)
-					_scoreboard.registerNewTeam(rank.Name).setPrefix(rank.getTag(true, false) + ChatColor.RESET + " ");
+					_scoreboard.registerNewTeam(rank.Name).setPrefix(rank.getTag(true, true) + ChatColor.RESET + " ");
 				else
 					_scoreboard.registerNewTeam(rank.Name).setPrefix("");
 			}

Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java

@@ -160,7 +160,7 @@ public class PersonalServerManager extends MiniPlugin
 				}
 				
 				final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers, 
-						true, false, false, games, "Player", true, event, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", "");
+						true, false, false, games, "", "Player", true, event, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", "");
 				
 				getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
 				{

Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java

@@ -19,7 +19,7 @@ public class Pet extends SalesPackageBase
 		
 		_name = name;
 		_petType = petType;
-		CurrencyCostMap.put(CurrencyType.Coins, cost);
+		CurrencyCostMap.put(CurrencyType.TREASURE_SHARD, cost);
 		
 		KnownPackage = false;
 	}

Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java

@@ -18,7 +18,7 @@ public class PetExtra extends SalesPackageBase
 		
 		_name = name;
 		_material = material;
-		CurrencyCostMap.put(CurrencyType.Coins, cost);
+		CurrencyCostMap.put(CurrencyType.TREASURE_SHARD, cost);
 		
 		KnownPackage = false;
 		OneTimePurchaseOnly = false;

Plugins/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java

@@ -31,6 +31,8 @@ import mineplex.serverdata.servers.ServerManager;
 
 public class ProfileCacheManager extends MiniPlugin implements GameProfileRepository
 {
+	private static ProfileCacheManager INSTANCE;
+
 	private YggdrasilGameProfileRepository _mojangProfileRepository;
 	private RedisDataRepository<ProfileData> _profileRepository;
 	private Gson _gson;
@@ -65,8 +67,9 @@ public class ProfileCacheManager extends MiniPlugin implements GameProfileReposi
 			System.out.println("Are you using the correct modified Craftbukkit?");
 			System.out.println("================================================");
 		}
-	}
 
+		INSTANCE = this;
+	}
 
 	public GameProfile attemptToLoadProfile(String playerName)
 	{
@@ -131,4 +134,9 @@ public class ProfileCacheManager extends MiniPlugin implements GameProfileReposi
 		ProfileData data = new ProfileData(profile.getId(), profile.getName(), _gson.toJson(profile.getProperties()));
 		_profileRepository.addElement(data, 60 * 60 * 24); // 1 day
 	}
+
+	public static ProfileCacheManager getInstance()
+	{
+		return INSTANCE;
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java

@@ -7,7 +7,6 @@ import mineplex.core.common.CurrencyType;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.reward.Reward;
 import mineplex.core.reward.RewardData;
-import mineplex.core.reward.RewardManager;
 import mineplex.core.reward.RewardRarity;
 import mineplex.core.reward.RewardType;
 
@@ -35,7 +34,7 @@ public class UnknownPackageReward extends Reward
 	@Override
 	protected RewardData giveRewardCustom(Player player, RewardType type)
 	{
-		_donationManager.PurchaseUnknownSalesPackage(null, player.getName(), _donationManager.getClientManager().Get(player).getAccountId(), _packageName, CurrencyType.Coins, 0, true);
+		_donationManager.PurchaseUnknownSalesPackage(null, player.getName(), _donationManager.getClientManager().Get(player).getAccountId(), _packageName, CurrencyType.TREASURE_SHARD, 0, true);
 
 		return new RewardData(getRarity().getDarkColor() + _header, getRarity().getColor() + _name, _itemStack, getRarity());
 	}

Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java

@@ -14,7 +14,7 @@ public class ScoreboardElementCoinCount implements ScoreboardElement
 	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
 		List<String> output = new ArrayList<String>();
-		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Coins) + "");
+		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.TREASURE_SHARD) + "");
 		return output;
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java

@@ -14,7 +14,7 @@ public class ScoreboardElementGemCount implements ScoreboardElement
 	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
 		List<String> output = new ArrayList<String>();
-		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Gems) + "");
+		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.GEM) + "");
 		return output;
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java

@@ -14,7 +14,7 @@ public class ScoreboardElementGoldCount implements ScoreboardElement
 	public List<String> getLines(ScoreboardManager manager, Player player, List<String> out)
 	{
 		List<String> output = new ArrayList<String>();
-		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Gold) + "");
+		output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.GOLD) + "");
 		return output;
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/server/remotecall/JsonWebCall.java

@@ -69,7 +69,7 @@ public class JsonWebCall
         }
         catch (Exception ex) 
         {
-            System.out.println("Error executing JsonWebCall: \n" + ex.getMessage());
+            System.out.println("Error executing ApiWebCall: \n" + ex.getMessage());
             System.out.println("Result: \n" + result);
             
             for (StackTraceElement trace : ex.getStackTrace())
@@ -123,7 +123,7 @@ public class JsonWebCall
         }
         catch (Exception ex) 
         {
-            System.out.println("JsonWebCall.Execute() Error:\n" + ex.getMessage());
+            System.out.println("ApiWebCall.Execute() Error:\n" + ex.getMessage());
             
             for (StackTraceElement trace : ex.getStackTrace())
             {
@@ -186,7 +186,7 @@ public class JsonWebCall
         }
         catch (Exception ex) 
         {
-            System.out.println("Error executing JsonWebCall: \n" + ex.getMessage());
+            System.out.println("Error executing ApiWebCall: \n" + ex.getMessage());
             System.out.println("Result: \n" + result);
             
             for (StackTraceElement trace : ex.getStackTrace())
@@ -247,7 +247,7 @@ public class JsonWebCall
         }
         catch (Exception ex) 
         {
-            System.out.println("Error executing JsonWebCall: \n" + ex.getMessage());
+            System.out.println("Error executing ApiWebCall: \n" + ex.getMessage());
             System.out.println("Result: \n" + result);
             
             for (StackTraceElement trace : ex.getStackTrace())
@@ -312,7 +312,7 @@ public class JsonWebCall
         }
         catch (Exception ex) 
         {
-            System.out.println("Error executing JsonWebCall: \n" + ex.getMessage());
+            System.out.println("Error executing ApiWebCall: \n" + ex.getMessage());
             UtilSystem.printStackTrace(ex.getStackTrace());
             System.out.println("Result: \n" + result);
         } 

Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java

@@ -49,7 +49,7 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack
 		_displayMaterial = material;
 		_displayData = displayData;
 		
-		CurrencyCostMap.put(CurrencyType.Coins, coins);
+		CurrencyCostMap.put(CurrencyType.TREASURE_SHARD, coins);
 		Quantity = quantity;
 	}
 	
@@ -105,7 +105,7 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack
 		
 		if (token.Gems > 0)
 		{
-			CurrencyCostMap.put(CurrencyType.Gems, token.Gems);
+			CurrencyCostMap.put(CurrencyType.GEM, token.Gems);
 		}
 	}
 	

Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java

@@ -79,7 +79,11 @@ public class ConfirmationPage<PluginType extends MiniPlugin, ShopType extends Sh
 		buildSquareAt(_okSquareSlotStart, new ShopItem(Material.EMERALD_BLOCK, (byte) 0, ChatColor.GREEN + "OK", null, 1, false, true), okClicked);
 		buildSquareAt(_okSquareSlotStart + 6, new ShopItem(Material.REDSTONE_BLOCK, (byte) 0, ChatColor.RED + "CANCEL", null, 1, false, true), cancelClicked);
 		
+<<<<<<< HEAD
 		this.getInventory().setItem(4, new ShopItem(getCurrencyType().GetDisplayMaterial(), (byte)0, getCurrencyType().Prefix(), new String[] { C.cGray + _salesItem.getCost(getCurrencyType()) + " " + getCurrencyType().Prefix() + " will be", C.cGray + "deducted from your account balance." }, 1, false, true).getHandle());
+=======
+		this.getInventory().setItem(4, new ShopItem(getCurrencyType().getDisplayMaterial(), (byte)0, getCurrencyType().getPrefix(), new String[] { C.cGray + _salesItem.GetCost(getCurrencyType()) + " " + getCurrencyType().getPrefix() + " will be", C.cGray + "deducted from your account balance." }, 1, false, true).getHandle());
+>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
 	}
 	
 	protected void okClicked(Player player)
@@ -129,7 +133,7 @@ public class ConfirmationPage<PluginType extends MiniPlugin, ShopType extends Sh
 		
 		_processing = true;
 
-		if (getCurrencyType() == CurrencyType.Gold)
+		if (getCurrencyType() == CurrencyType.GOLD)
 		{
 			int goldCount = getDonationManager().Get(getPlayer()).getGold();
 			int cost = _salesItem.getCost(getCurrencyType());

Plugins/Mineplex.Core/src/mineplex/core/tournament/ui/TournamentShop.java

@@ -14,7 +14,7 @@ public class TournamentShop extends ShopBase<TournamentManager>
 {
 	public TournamentShop(TournamentManager plugin, CoreClientManager clientManager, DonationManager donationManager)
 	{
-		super(plugin, clientManager, donationManager, "Tournaments", CurrencyType.Gems);
+		super(plugin, clientManager, donationManager, "Tournaments", CurrencyType.GEM);
 	}
 
 	@Override

Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java

@@ -55,6 +55,6 @@ public class BuyChestButton implements IButton
           _page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), () -> {
               _inventoryManager.addItemToInventory(player, _chestName, 1);
               _page.refresh();
-          }, _page, new ChestPackage(_chestName, _chestMat, _chestCost), CurrencyType.Coins, player));
+          }, _page, new ChestPackage(_chestName, _chestMat, _chestCost), CurrencyType.TREASURE_SHARD, player));
 	}
 }

Plugins/Mineplex.Database/pom.xml

@@ -16,5 +16,9 @@
             <groupId>org.jooq</groupId>
             <artifactId>jooq-codegen</artifactId>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
     </dependencies>
 </project>

Plugins/Mineplex.Database/src/jOOQConfig.xml

@@ -3,9 +3,9 @@
 	<!-- Configure the database connection here -->
 	<jdbc>
 		<driver>com.mysql.jdbc.Driver</driver>
-		<url>jdbc:mysql://db.mineplex.com:3306</url>
+		<url>jdbc:mysql://10.35.74.133:3306</url>
-		<user>MilitaryPolice</user>
+		<user>MonetaryPulitzer</user>
-		<password>CUPr6Wuw2Rus$qap</password>
+		<password>MaprebruvUsw6Fre</password>
 	</jdbc>
 
 	<generator>

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 = 2034846771;
+	private static final long serialVersionUID = -1965384171;
 
 	/**
 	 * The reference instance of <code>Account</code>
@@ -39,48 +39,88 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 
 	private final java.util.List<org.jooq.Table<?>> getTables0() {
 		return java.util.Arrays.<org.jooq.Table<?>>asList(
+			mineplex.database.tables.AccountAuth.accountAuth,
 			mineplex.database.tables.AccountClan.accountClan,
 			mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions,
+			mineplex.database.tables.AccountCustomData.accountCustomData,
 			mineplex.database.tables.AccountFriend.accountFriend,
 			mineplex.database.tables.AccountGemTransactions.accountGemTransactions,
+			mineplex.database.tables.AccountGiveaway.accountGiveaway,
 			mineplex.database.tables.AccountIgnore.accountIgnore,
 			mineplex.database.tables.AccountInventory.accountInventory,
+			mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest,
+			mineplex.database.tables.AccountPets.accountPets,
 			mineplex.database.tables.AccountPolls.accountPolls,
 			mineplex.database.tables.AccountPreferences.accountPreferences,
+			mineplex.database.tables.AccountPurchases.accountPurchases,
 			mineplex.database.tables.Accounts.accounts,
 			mineplex.database.tables.AccountStat.accountStat,
-			mineplex.database.tables.AccountStats.accountStats,
 			mineplex.database.tables.AccountTasks.accountTasks,
+			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.ActiveTournaments.activeTournaments,
+			mineplex.database.tables.BattlePets.battlePets,
 			mineplex.database.tables.Bonus.bonus,
+			mineplex.database.tables.BonusLog.bonusLog,
+			mineplex.database.tables.BotSpam.botSpam,
 			mineplex.database.tables.Chatsnap.chatsnap,
 			mineplex.database.tables.ClanAlliances.clanAlliances,
+			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.ClanShopItem.clanShopItem,
+			mineplex.database.tables.ClansOutposts.clansOutposts,
+			mineplex.database.tables.ClansPvpTimer.clansPvpTimer,
+			mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons,
+			mineplex.database.tables.ClansTutorial.clansTutorial,
 			mineplex.database.tables.ClanTerritory.clanTerritory,
+			mineplex.database.tables.ClanWar.clanWar,
+			mineplex.database.tables.CustomData.customData,
 			mineplex.database.tables.EloRating.eloRating,
+			mineplex.database.tables.Facebook.facebook,
 			mineplex.database.tables.FieldBlock.fieldBlock,
 			mineplex.database.tables.FieldMonster.fieldMonster,
 			mineplex.database.tables.FieldOre.fieldOre,
+			mineplex.database.tables.Gadgets.gadgets,
+			mineplex.database.tables.Giveaway.giveaway,
+			mineplex.database.tables.GiveawayCooldown.giveawayCooldown,
+			mineplex.database.tables.IncognitoStaff.incognitoStaff,
 			mineplex.database.tables.ItemCategories.itemCategories,
 			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.Npcs.npcs,
+			mineplex.database.tables.Packages.packages,
 			mineplex.database.tables.PlayerMap.playerMap,
 			mineplex.database.tables.Polls.polls,
 			mineplex.database.tables.RankBenefits.rankBenefits,
+			mineplex.database.tables.RankedBans.rankedBans,
+			mineplex.database.tables.ReportTickets.reportTickets,
+			mineplex.database.tables.Selectedgadgets.selectedgadgets,
+			mineplex.database.tables.Selectedmodifiers.selectedmodifiers,
+			mineplex.database.tables.SelectedMounts.selectedMounts,
+			mineplex.database.tables.SelectedPets.selectedPets,
 			mineplex.database.tables.ServerPassword.serverPassword,
 			mineplex.database.tables.Spawns.spawns,
+			mineplex.database.tables.StaffMotd.staffMotd,
 			mineplex.database.tables.StatEvents.statEvents,
 			mineplex.database.tables.Stats.stats,
 			mineplex.database.tables.StatTypes.statTypes,
+			mineplex.database.tables.Streamers.streamers,
 			mineplex.database.tables.Tasks.tasks,
+			mineplex.database.tables.TitanGiveaway.titanGiveaway,
 			mineplex.database.tables.TournamentLB.TournamentLB,
+			mineplex.database.tables.Tournaments.tournaments,
+			mineplex.database.tables.TournamentTeams.tournamentTeams,
 			mineplex.database.tables.Transactions.transactions);
 	}
 }

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

@@ -21,281 +21,419 @@ public class Keys {
 	// IDENTITY definitions
 	// -------------------------------------------------------------------------
 
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountAuthRecord, java.lang.Integer> IDENTITY_accountAuth = Identities0.IDENTITY_accountAuth;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> IDENTITY_accountClan = Identities0.IDENTITY_accountClan;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> IDENTITY_accountCoinTransactions = Identities0.IDENTITY_accountCoinTransactions;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountFriendRecord, java.lang.Integer> IDENTITY_accountFriend = Identities0.IDENTITY_accountFriend;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> IDENTITY_accountGemTransactions = Identities0.IDENTITY_accountGemTransactions;
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountGiveawayRecord, java.lang.Integer> IDENTITY_accountGiveaway = Identities0.IDENTITY_accountGiveaway;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountIgnoreRecord, java.lang.Integer> IDENTITY_accountIgnore = Identities0.IDENTITY_accountIgnore;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountInventoryRecord, java.lang.Integer> IDENTITY_accountInventory = Identities0.IDENTITY_accountInventory;
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountMortenSpamTestRecord, java.lang.Integer> IDENTITY_accountMortenSpamTest = Identities0.IDENTITY_accountMortenSpamTest;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPollsRecord, java.lang.Integer> IDENTITY_accountPolls = Identities0.IDENTITY_accountPolls;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = Identities0.IDENTITY_accountPreferences;
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPurchasesRecord, java.lang.Long> IDENTITY_accountPurchases = Identities0.IDENTITY_accountPurchases;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> IDENTITY_accounts = Identities0.IDENTITY_accounts;
-	public static final org.jooq.Identity<mineplex.database.tables.records.AccountStatsRecord, java.lang.Integer> IDENTITY_accountStats = Identities0.IDENTITY_accountStats;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTasksRecord, java.lang.Integer> IDENTITY_accountTasks = Identities0.IDENTITY_accountTasks;
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTipClaimLogsRecord, java.lang.Integer> IDENTITY_accountTipClaimLogs = Identities0.IDENTITY_accountTipClaimLogs;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTransactionsRecord, java.lang.Integer> IDENTITY_accountTransactions = Identities0.IDENTITY_accountTransactions;
+	public static final org.jooq.Identity<mineplex.database.tables.records.BattlePetsRecord, java.lang.Integer> IDENTITY_battlePets = Identities0.IDENTITY_battlePets;
 	public static final org.jooq.Identity<mineplex.database.tables.records.BonusRecord, java.lang.Integer> IDENTITY_bonus = Identities0.IDENTITY_bonus;
+	public static final org.jooq.Identity<mineplex.database.tables.records.BonusLogRecord, java.lang.Integer> IDENTITY_bonusLog = Identities0.IDENTITY_bonusLog;
+	public static final org.jooq.Identity<mineplex.database.tables.records.BotSpamRecord, java.lang.Integer> IDENTITY_botSpam = Identities0.IDENTITY_botSpam;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> IDENTITY_chatsnap = Identities0.IDENTITY_chatsnap;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = Identities0.IDENTITY_clanAlliances;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClanBansRecord, java.lang.Integer> IDENTITY_clanBans = Identities0.IDENTITY_clanBans;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> IDENTITY_clanEnemies = Identities0.IDENTITY_clanEnemies;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = Identities0.IDENTITY_clans;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanServerRecord, java.lang.Integer> IDENTITY_clanServer = Identities0.IDENTITY_clanServer;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanShopItemRecord, java.lang.Integer> IDENTITY_clanShopItem = Identities0.IDENTITY_clanShopItem;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> IDENTITY_clanTerritory = Identities0.IDENTITY_clanTerritory;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClanWarRecord, java.lang.Integer> IDENTITY_clanWar = Identities0.IDENTITY_clanWar;
+	public static final org.jooq.Identity<mineplex.database.tables.records.CustomDataRecord, java.lang.Integer> IDENTITY_customData = Identities0.IDENTITY_customData;
 	public static final org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> IDENTITY_eloRating = Identities0.IDENTITY_eloRating;
 	public static final org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> IDENTITY_fieldBlock = Identities0.IDENTITY_fieldBlock;
 	public static final org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> IDENTITY_fieldMonster = Identities0.IDENTITY_fieldMonster;
 	public static final org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> IDENTITY_fieldOre = Identities0.IDENTITY_fieldOre;
+	public static final org.jooq.Identity<mineplex.database.tables.records.GiveawayRecord, java.lang.Integer> IDENTITY_giveaway = Identities0.IDENTITY_giveaway;
+	public static final org.jooq.Identity<mineplex.database.tables.records.GiveawayCooldownRecord, java.lang.Integer> IDENTITY_giveawayCooldown = Identities0.IDENTITY_giveawayCooldown;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = Identities0.IDENTITY_itemCategories;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = Identities0.IDENTITY_items;
 	public static final org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = Identities0.IDENTITY_mail;
 	public static final org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = Identities0.IDENTITY_mailbox;
 	public static final org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = Identities0.IDENTITY_npcs;
+	public static final org.jooq.Identity<mineplex.database.tables.records.PackagesRecord, java.lang.Integer> IDENTITY_packages = Identities0.IDENTITY_packages;
 	public static final org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = Identities0.IDENTITY_playerMap;
 	public static final org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = Identities0.IDENTITY_polls;
 	public static final org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = Identities0.IDENTITY_rankBenefits;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = Identities0.IDENTITY_serverPassword;
 	public static final org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = Identities0.IDENTITY_spawns;
+	public static final org.jooq.Identity<mineplex.database.tables.records.StaffMotdRecord, java.lang.Integer> IDENTITY_staffMotd = Identities0.IDENTITY_staffMotd;
 	public static final org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = Identities0.IDENTITY_statEvents;
 	public static final org.jooq.Identity<mineplex.database.tables.records.StatsRecord, java.lang.Integer> IDENTITY_stats = Identities0.IDENTITY_stats;
+	public static final org.jooq.Identity<mineplex.database.tables.records.StreamersRecord, java.lang.Integer> IDENTITY_streamers = Identities0.IDENTITY_streamers;
 	public static final org.jooq.Identity<mineplex.database.tables.records.TasksRecord, java.lang.Integer> IDENTITY_tasks = Identities0.IDENTITY_tasks;
+	public static final org.jooq.Identity<mineplex.database.tables.records.TournamentsRecord, java.lang.Integer> IDENTITY_tournaments = Identities0.IDENTITY_tournaments;
+	public static final org.jooq.Identity<mineplex.database.tables.records.TournamentTeamsRecord, java.lang.Integer> IDENTITY_tournamentTeams = Identities0.IDENTITY_tournamentTeams;
 	public static final org.jooq.Identity<mineplex.database.tables.records.TransactionsRecord, java.lang.Integer> IDENTITY_transactions = Identities0.IDENTITY_transactions;
 
 	// -------------------------------------------------------------------------
 	// UNIQUE and PRIMARY KEY definitions
 	// -------------------------------------------------------------------------
 
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountAuthRecord> KEY_accountAuth_PRIMARY = UniqueKeys0.KEY_accountAuth_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord> KEY_accountClan_PRIMARY = UniqueKeys0.KEY_accountClan_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord> KEY_accountCoinTransactions_PRIMARY = UniqueKeys0.KEY_accountCoinTransactions_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountCustomDataRecord> KEY_accountCustomData_PRIMARY = UniqueKeys0.KEY_accountCustomData_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_PRIMARY = UniqueKeys0.KEY_accountFriend_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_uuidIndex = UniqueKeys0.KEY_accountFriend_uuidIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord> KEY_accountGemTransactions_PRIMARY = UniqueKeys0.KEY_accountGemTransactions_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountGiveawayRecord> KEY_accountGiveaway_PRIMARY = UniqueKeys0.KEY_accountGiveaway_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountIgnoreRecord> KEY_accountIgnore_PRIMARY = UniqueKeys0.KEY_accountIgnore_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_PRIMARY = UniqueKeys0.KEY_accountInventory_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_accountItemIndex = UniqueKeys0.KEY_accountInventory_accountItemIndex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountMortenSpamTestRecord> KEY_accountMortenSpamTest_PRIMARY = UniqueKeys0.KEY_accountMortenSpamTest_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPetsRecord> KEY_accountPets_PRIMARY = UniqueKeys0.KEY_accountPets_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPetsRecord> KEY_accountPets_UNIQUE_ACCOUNT_PET = UniqueKeys0.KEY_accountPets_UNIQUE_ACCOUNT_PET;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPollsRecord> KEY_accountPolls_PRIMARY = UniqueKeys0.KEY_accountPolls_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPollsRecord> KEY_accountPolls_accountPollIndex = UniqueKeys0.KEY_accountPolls_accountPollIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_PRIMARY = UniqueKeys0.KEY_accountPreferences_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = UniqueKeys0.KEY_accountPreferences_uuid_index;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPurchasesRecord> KEY_accountPurchases_PRIMARY = UniqueKeys0.KEY_accountPurchases_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = UniqueKeys0.KEY_accounts_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = UniqueKeys0.KEY_accounts_uuidIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = UniqueKeys0.KEY_accountStat_PRIMARY;
-	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = UniqueKeys0.KEY_accountStats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = UniqueKeys0.KEY_accountTasks_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTipRecord> KEY_accountTip_PRIMARY = UniqueKeys0.KEY_accountTip_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTipClaimLogsRecord> KEY_accountTipClaimLogs_PRIMARY = UniqueKeys0.KEY_accountTipClaimLogs_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTipLogsRecord> KEY_accountTipLogs_PRIMARY = UniqueKeys0.KEY_accountTipLogs_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = UniqueKeys0.KEY_accountTransactions_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountValentinesGiftRecord> KEY_accountValentinesGift_PRIMARY = UniqueKeys0.KEY_accountValentinesGift_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ActiveTournamentsRecord> KEY_activeTournaments_PRIMARY = UniqueKeys0.KEY_activeTournaments_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BattlePetsRecord> KEY_battlePets_PRIMARY = UniqueKeys0.KEY_battlePets_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusRecord> KEY_bonus_PRIMARY = UniqueKeys0.KEY_bonus_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusLogRecord> KEY_bonusLog_PRIMARY = UniqueKeys0.KEY_bonusLog_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BotSpamRecord> KEY_botSpam_PRIMARY = UniqueKeys0.KEY_botSpam_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BotSpamRecord> KEY_botSpam_unique_text = UniqueKeys0.KEY_botSpam_unique_text;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord> KEY_chatsnap_PRIMARY = UniqueKeys0.KEY_chatsnap_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = UniqueKeys0.KEY_clanAlliances_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanBansRecord> KEY_clanBans_PRIMARY = UniqueKeys0.KEY_clanBans_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_PRIMARY = UniqueKeys0.KEY_clanEnemies_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_clanId = UniqueKeys0.KEY_clanEnemies_unique_clanId;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_otherClanId = UniqueKeys0.KEY_clanEnemies_unique_otherClanId;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanNameBlacklistRecord> KEY_clanNameBlacklist_PRIMARY = UniqueKeys0.KEY_clanNameBlacklist_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_PRIMARY = UniqueKeys0.KEY_clans_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_clanName = UniqueKeys0.KEY_clans_clanName;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_PRIMARY = UniqueKeys0.KEY_clanServer_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_unique_serverName = UniqueKeys0.KEY_clanServer_unique_serverName;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_PRIMARY = UniqueKeys0.KEY_clanShopItem_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_shop_page_slot_UNIQUE = UniqueKeys0.KEY_clanShopItem_shop_page_slot_UNIQUE;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansOutpostsRecord> KEY_clansOutposts_PRIMARY = UniqueKeys0.KEY_clansOutposts_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansPvpTimerRecord> KEY_clansPvpTimer_PRIMARY = UniqueKeys0.KEY_clansPvpTimer_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansSiegeWeaponsRecord> KEY_clansSiegeWeapons_PRIMARY = UniqueKeys0.KEY_clansSiegeWeapons_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansTutorialRecord> KEY_clansTutorial_PRIMARY = UniqueKeys0.KEY_clansTutorial_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_PRIMARY = UniqueKeys0.KEY_clanTerritory_PRIMARY;
-	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_territory_server_chunk_UNIQUE = UniqueKeys0.KEY_clanTerritory_territory_server_chunk_UNIQUE;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanWarRecord> KEY_clanWar_PRIMARY = UniqueKeys0.KEY_clanWar_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.CustomDataRecord> KEY_customData_PRIMARY = UniqueKeys0.KEY_customData_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_PRIMARY = UniqueKeys0.KEY_eloRating_PRIMARY;
-	public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = UniqueKeys0.KEY_eloRating_uuid_gameType_index;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FacebookRecord> KEY_facebook_PRIMARY = UniqueKeys0.KEY_facebook_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FacebookRecord> KEY_facebook_facebook_code_uindex = UniqueKeys0.KEY_facebook_facebook_code_uindex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FacebookRecord> KEY_facebook_facebook_accountId_uindex = UniqueKeys0.KEY_facebook_facebook_accountId_uindex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> KEY_fieldBlock_PRIMARY = UniqueKeys0.KEY_fieldBlock_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord> KEY_fieldMonster_PRIMARY = UniqueKeys0.KEY_fieldMonster_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord> KEY_fieldOre_PRIMARY = UniqueKeys0.KEY_fieldOre_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GadgetsRecord> KEY_gadgets_PRIMARY = UniqueKeys0.KEY_gadgets_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayRecord> KEY_giveaway_PRIMARY = UniqueKeys0.KEY_giveaway_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayRecord> KEY_giveaway_giveaway_name_uindex = UniqueKeys0.KEY_giveaway_giveaway_name_uindex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayCooldownRecord> KEY_giveawayCooldown_PRIMARY = UniqueKeys0.KEY_giveawayCooldown_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayCooldownRecord> KEY_giveawayCooldown_giveawayCooldown_name_uindex = UniqueKeys0.KEY_giveawayCooldown_giveawayCooldown_name_uindex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.IncognitoStaffRecord> KEY_incognitoStaff_PRIMARY = UniqueKeys0.KEY_incognitoStaff_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemCategoriesRecord> KEY_itemCategories_PRIMARY = UniqueKeys0.KEY_itemCategories_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemCategoriesRecord> KEY_itemCategories_nameIndex = UniqueKeys0.KEY_itemCategories_nameIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = UniqueKeys0.KEY_items_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_name_UNIQUE = UniqueKeys0.KEY_items_name_UNIQUE;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = UniqueKeys0.KEY_items_uniqueNameCategoryIndex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.KitProgressionRecord> KEY_kitProgression_PRIMARY = UniqueKeys0.KEY_kitProgression_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.Kit_progressionRecord> KEY_kit_progression_PRIMARY = UniqueKeys0.KEY_kit_progression_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = UniqueKeys0.KEY_mail_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = UniqueKeys0.KEY_mailbox_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = UniqueKeys0.KEY_npcs_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PackagesRecord> KEY_packages_PRIMARY = UniqueKeys0.KEY_packages_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = UniqueKeys0.KEY_playerMap_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = UniqueKeys0.KEY_playerMap_playerIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = UniqueKeys0.KEY_polls_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = UniqueKeys0.KEY_rankBenefits_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankedBansRecord> KEY_rankedBans_PRIMARY = UniqueKeys0.KEY_rankedBans_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ReportTicketsRecord> KEY_reportTickets_PRIMARY = UniqueKeys0.KEY_reportTickets_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = UniqueKeys0.KEY_serverPassword_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = UniqueKeys0.KEY_spawns_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StaffMotdRecord> KEY_staffMotd_PRIMARY = UniqueKeys0.KEY_staffMotd_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = UniqueKeys0.KEY_statEvents_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_UK_DailyEntry = UniqueKeys0.KEY_statEvents_UK_DailyEntry;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_PRIMARY = UniqueKeys0.KEY_stats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_nameIndex = UniqueKeys0.KEY_stats_nameIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_PRIMARY = UniqueKeys0.KEY_statTypes_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_name = UniqueKeys0.KEY_statTypes_name;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StreamersRecord> KEY_streamers_PRIMARY = UniqueKeys0.KEY_streamers_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_PRIMARY = UniqueKeys0.KEY_tasks_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_name_UNIQUE = UniqueKeys0.KEY_tasks_name_UNIQUE;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TitanGiveawayRecord> KEY_titanGiveaway_PRIMARY = UniqueKeys0.KEY_titanGiveaway_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_PRIMARY = UniqueKeys0.KEY_TournamentLB_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_UK_PlayerEntry = UniqueKeys0.KEY_TournamentLB_UK_PlayerEntry;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentsRecord> KEY_tournaments_PRIMARY = UniqueKeys0.KEY_tournaments_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentTeamsRecord> KEY_tournamentTeams_PRIMARY = UniqueKeys0.KEY_tournamentTeams_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TransactionsRecord> KEY_transactions_PRIMARY = UniqueKeys0.KEY_transactions_PRIMARY;
 
 	// -------------------------------------------------------------------------
 	// FOREIGN KEY definitions
 	// -------------------------------------------------------------------------
 
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> FK_accountClan_accounts = ForeignKeys0.FK_accountClan_accounts;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountAuthRecord, mineplex.database.tables.records.AccountsRecord> accountAuth_accounts_id_fk = ForeignKeys0.accountAuth_accounts_id_fk;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> FK_accountClan_clans2 = ForeignKeys0.FK_accountClan_clans2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> FK_ACT_ACCOUNTS_ID = ForeignKeys0.FK_ACT_ACCOUNTS_ID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCustomDataRecord, mineplex.database.tables.records.AccountsRecord> CUSTOMDATA_ACCOUNT = ForeignKeys0.CUSTOMDATA_ACCOUNT;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCustomDataRecord, mineplex.database.tables.records.CustomDataRecord> ACCOUNTDATA_CUSTOMDATA = ForeignKeys0.ACCOUNTDATA_CUSTOMDATA;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountGemTransactions_ibfk_1 = ForeignKeys0.accountGemTransactions_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGiveawayRecord, mineplex.database.tables.records.GiveawayRecord> accountGiveaway_giveaway_id_fk = ForeignKeys0.accountGiveaway_giveaway_id_fk;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGiveawayRecord, mineplex.database.tables.records.AccountsRecord> accountGiveaway_accounts_id_fk = ForeignKeys0.accountGiveaway_accounts_id_fk;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGiveawayRecord, mineplex.database.tables.records.GiveawayCooldownRecord> accountGiveaway_giveawayCooldown_id_fk = ForeignKeys0.accountGiveaway_giveawayCooldown_id_fk;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.AccountsRecord> accountInventory_ibfk_1 = ForeignKeys0.accountInventory_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountMortenSpamTestRecord, mineplex.database.tables.records.AccountsRecord> MORTEN_ACCOUNT = ForeignKeys0.MORTEN_ACCOUNT;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPetsRecord, mineplex.database.tables.records.AccountsRecord> accountIdKEY = ForeignKeys0.accountIdKEY;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = ForeignKeys0.accountPolls_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = ForeignKeys0.accountPolls_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPurchasesRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNT_PURCHASE_ID = ForeignKeys0.ACCOUNT_PURCHASE_ID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPurchasesRecord, mineplex.database.tables.records.PackagesRecord> PACKAGENAME_ID = ForeignKeys0.PACKAGENAME_ID;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = ForeignKeys0.accountStat_account;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = ForeignKeys0.accountStat_stat;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = ForeignKeys0.accountStats_ibfk_1;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = ForeignKeys0.accountStats_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = ForeignKeys0.ACCOUNTTASKS_ACCOUNTID;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.TasksRecord> ACCOUNTTASKS_TASKID = ForeignKeys0.ACCOUNTTASKS_TASKID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTipRecord, mineplex.database.tables.records.AccountsRecord> accountTips_accounts_id_fk = ForeignKeys0.accountTips_accounts_id_fk;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTipClaimLogsRecord, mineplex.database.tables.records.AccountsRecord> accountTipClaimLogs_accounts_id_fk = ForeignKeys0.accountTipClaimLogs_accounts_id_fk;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTipLogsRecord, mineplex.database.tables.records.AccountsRecord> accountTipLogs_accounts_id_fk = ForeignKeys0.accountTipLogs_accounts_id_fk;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTRANSACTIONS_ACCOUNTID = ForeignKeys0.ACCOUNTTRANSACTIONS_ACCOUNTID;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.TransactionsRecord> ACCOUNTTRANSACTIONS_TRANSACTIONID = ForeignKeys0.ACCOUNTTRANSACTIONS_TRANSACTIONID;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountValentinesGiftRecord, mineplex.database.tables.records.AccountsRecord> accountValentines_sender_fk = ForeignKeys0.accountValentines_sender_fk;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountValentinesGiftRecord, mineplex.database.tables.records.AccountsRecord> accountValentines_target_fk = ForeignKeys0.accountValentines_target_fk;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusRecord, mineplex.database.tables.records.AccountsRecord> bonus_ibfk_1 = ForeignKeys0.bonus_ibfk_1;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_2 = ForeignKeys0.clanAlliances_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusLogRecord, mineplex.database.tables.records.AccountsRecord> bonusLogAccountId = ForeignKeys0.bonusLogAccountId;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_1 = ForeignKeys0.clanAlliances_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusLogRecord, mineplex.database.tables.records.ItemsRecord> bonusLogItemId = ForeignKeys0.bonusLogItemId;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_1 = ForeignKeys0.clanEnemies_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.EloRatingRecord, mineplex.database.tables.records.AccountsRecord> ELORATING_ACCOUNTID = ForeignKeys0.ELORATING_ACCOUNTID;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_2 = ForeignKeys0.clanEnemies_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.FacebookRecord, mineplex.database.tables.records.AccountsRecord> facebook_accounts_id_fk = ForeignKeys0.facebook_accounts_id_fk;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClansRecord, mineplex.database.tables.records.ClanServerRecord> clans_ibfk_1 = ForeignKeys0.clans_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.GadgetsRecord, mineplex.database.tables.records.AccountsRecord> gadgets_ibfk_1 = ForeignKeys0.gadgets_ibfk_1;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClansRecord> clanTerritory_ibfk_1 = ForeignKeys0.clanTerritory_ibfk_1;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = ForeignKeys0.clanTerritory_ibfk_2;
-	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = ForeignKeys0.items_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = ForeignKeys0.mail_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = ForeignKeys0.mailbox_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = ForeignKeys0.rankBenefits_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.TitanGiveawayRecord, mineplex.database.tables.records.AccountsRecord> titanGiveaway_ibfk_1 = ForeignKeys0.titanGiveaway_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.TournamentTeamsRecord, mineplex.database.tables.records.TournamentsRecord> TEAM_TOURNAMENT_KEY = ForeignKeys0.TEAM_TOURNAMENT_KEY;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.TournamentTeamsRecord, mineplex.database.tables.records.AccountsRecord> TEAM_TOURNAMENT_ACCOUNT_ID = ForeignKeys0.TEAM_TOURNAMENT_ACCOUNT_ID;
 
 	// -------------------------------------------------------------------------
 	// [#1459] distribute members to avoid static initialisers > 64kb
 	// -------------------------------------------------------------------------
 
 	private static class Identities0 extends org.jooq.impl.AbstractKeys {
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountAuthRecord, java.lang.Integer> IDENTITY_accountAuth = createIdentity(mineplex.database.tables.AccountAuth.accountAuth, mineplex.database.tables.AccountAuth.accountAuth.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> IDENTITY_accountClan = createIdentity(mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> IDENTITY_accountCoinTransactions = createIdentity(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountFriendRecord, java.lang.Integer> IDENTITY_accountFriend = createIdentity(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> IDENTITY_accountGemTransactions = createIdentity(mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountGiveawayRecord, java.lang.Integer> IDENTITY_accountGiveaway = createIdentity(mineplex.database.tables.AccountGiveaway.accountGiveaway, mineplex.database.tables.AccountGiveaway.accountGiveaway.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountIgnoreRecord, java.lang.Integer> IDENTITY_accountIgnore = createIdentity(mineplex.database.tables.AccountIgnore.accountIgnore, mineplex.database.tables.AccountIgnore.accountIgnore.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountInventoryRecord, java.lang.Integer> IDENTITY_accountInventory = createIdentity(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountMortenSpamTestRecord, java.lang.Integer> IDENTITY_accountMortenSpamTest = createIdentity(mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest, mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountPollsRecord, java.lang.Integer> IDENTITY_accountPolls = createIdentity(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = createIdentity(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountPurchasesRecord, java.lang.Long> IDENTITY_accountPurchases = createIdentity(mineplex.database.tables.AccountPurchases.accountPurchases, mineplex.database.tables.AccountPurchases.accountPurchases.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> IDENTITY_accounts = createIdentity(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
-		public static org.jooq.Identity<mineplex.database.tables.records.AccountStatsRecord, java.lang.Integer> IDENTITY_accountStats = createIdentity(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountTasksRecord, java.lang.Integer> IDENTITY_accountTasks = createIdentity(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountTipClaimLogsRecord, java.lang.Integer> IDENTITY_accountTipClaimLogs = createIdentity(mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountTransactionsRecord, java.lang.Integer> IDENTITY_accountTransactions = createIdentity(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.BattlePetsRecord, java.lang.Integer> IDENTITY_battlePets = createIdentity(mineplex.database.tables.BattlePets.battlePets, mineplex.database.tables.BattlePets.battlePets.petId);
 		public static org.jooq.Identity<mineplex.database.tables.records.BonusRecord, java.lang.Integer> IDENTITY_bonus = createIdentity(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
+		public static org.jooq.Identity<mineplex.database.tables.records.BonusLogRecord, java.lang.Integer> IDENTITY_bonusLog = createIdentity(mineplex.database.tables.BonusLog.bonusLog, mineplex.database.tables.BonusLog.bonusLog.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.BotSpamRecord, java.lang.Integer> IDENTITY_botSpam = createIdentity(mineplex.database.tables.BotSpam.botSpam, mineplex.database.tables.BotSpam.botSpam.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> IDENTITY_chatsnap = createIdentity(mineplex.database.tables.Chatsnap.chatsnap, mineplex.database.tables.Chatsnap.chatsnap.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = createIdentity(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClanBansRecord, java.lang.Integer> IDENTITY_clanBans = createIdentity(mineplex.database.tables.ClanBans.clanBans, mineplex.database.tables.ClanBans.clanBans.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> IDENTITY_clanEnemies = createIdentity(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = createIdentity(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanServerRecord, java.lang.Integer> IDENTITY_clanServer = createIdentity(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanShopItemRecord, java.lang.Integer> IDENTITY_clanShopItem = createIdentity(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> IDENTITY_clanTerritory = createIdentity(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClanWarRecord, java.lang.Integer> IDENTITY_clanWar = createIdentity(mineplex.database.tables.ClanWar.clanWar, mineplex.database.tables.ClanWar.clanWar.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.CustomDataRecord, java.lang.Integer> IDENTITY_customData = createIdentity(mineplex.database.tables.CustomData.customData, mineplex.database.tables.CustomData.customData.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, org.jooq.types.UInteger> IDENTITY_eloRating = createIdentity(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> IDENTITY_fieldBlock = createIdentity(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> IDENTITY_fieldMonster = createIdentity(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> IDENTITY_fieldOre = createIdentity(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.GiveawayRecord, java.lang.Integer> IDENTITY_giveaway = createIdentity(mineplex.database.tables.Giveaway.giveaway, mineplex.database.tables.Giveaway.giveaway.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.GiveawayCooldownRecord, java.lang.Integer> IDENTITY_giveawayCooldown = createIdentity(mineplex.database.tables.GiveawayCooldown.giveawayCooldown, mineplex.database.tables.GiveawayCooldown.giveawayCooldown.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = createIdentity(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = createIdentity(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = createIdentity(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = createIdentity(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = createIdentity(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.PackagesRecord, java.lang.Integer> IDENTITY_packages = createIdentity(mineplex.database.tables.Packages.packages, mineplex.database.tables.Packages.packages.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = createIdentity(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = createIdentity(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = createIdentity(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = createIdentity(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = createIdentity(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.StaffMotdRecord, java.lang.Integer> IDENTITY_staffMotd = createIdentity(mineplex.database.tables.StaffMotd.staffMotd, mineplex.database.tables.StaffMotd.staffMotd.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = createIdentity(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
 		public static org.jooq.Identity<mineplex.database.tables.records.StatsRecord, java.lang.Integer> IDENTITY_stats = createIdentity(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.StreamersRecord, java.lang.Integer> IDENTITY_streamers = createIdentity(mineplex.database.tables.Streamers.streamers, mineplex.database.tables.Streamers.streamers.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.TasksRecord, java.lang.Integer> IDENTITY_tasks = createIdentity(mineplex.database.tables.Tasks.tasks, mineplex.database.tables.Tasks.tasks.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.TournamentsRecord, java.lang.Integer> IDENTITY_tournaments = createIdentity(mineplex.database.tables.Tournaments.tournaments, mineplex.database.tables.Tournaments.tournaments.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.TournamentTeamsRecord, java.lang.Integer> IDENTITY_tournamentTeams = createIdentity(mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.TransactionsRecord, java.lang.Integer> IDENTITY_transactions = createIdentity(mineplex.database.tables.Transactions.transactions, mineplex.database.tables.Transactions.transactions.id);
 	}
 
 	private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountAuthRecord> KEY_accountAuth_PRIMARY = createUniqueKey(mineplex.database.tables.AccountAuth.accountAuth, mineplex.database.tables.AccountAuth.accountAuth.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord> KEY_accountClan_PRIMARY = createUniqueKey(mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord> KEY_accountCoinTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountCustomDataRecord> KEY_accountCustomData_PRIMARY = createUniqueKey(mineplex.database.tables.AccountCustomData.accountCustomData, mineplex.database.tables.AccountCustomData.accountCustomData.customDataId, mineplex.database.tables.AccountCustomData.accountCustomData.accountId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_PRIMARY = createUniqueKey(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_uuidIndex = createUniqueKey(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.uuidSource, mineplex.database.tables.AccountFriend.accountFriend.uuidTarget);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord> KEY_accountGemTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountGiveawayRecord> KEY_accountGiveaway_PRIMARY = createUniqueKey(mineplex.database.tables.AccountGiveaway.accountGiveaway, mineplex.database.tables.AccountGiveaway.accountGiveaway.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountIgnoreRecord> KEY_accountIgnore_PRIMARY = createUniqueKey(mineplex.database.tables.AccountIgnore.accountIgnore, mineplex.database.tables.AccountIgnore.accountIgnore.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_PRIMARY = createUniqueKey(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_accountItemIndex = createUniqueKey(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId, mineplex.database.tables.AccountInventory.accountInventory.itemId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountMortenSpamTestRecord> KEY_accountMortenSpamTest_PRIMARY = createUniqueKey(mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest, mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPetsRecord> KEY_accountPets_PRIMARY = createUniqueKey(mineplex.database.tables.AccountPets.accountPets, mineplex.database.tables.AccountPets.accountPets.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPetsRecord> KEY_accountPets_UNIQUE_ACCOUNT_PET = createUniqueKey(mineplex.database.tables.AccountPets.accountPets, mineplex.database.tables.AccountPets.accountPets.accountId, mineplex.database.tables.AccountPets.accountPets.petId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPollsRecord> KEY_accountPolls_PRIMARY = createUniqueKey(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPollsRecord> KEY_accountPolls_accountPollIndex = createUniqueKey(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId, mineplex.database.tables.AccountPolls.accountPolls.pollId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_PRIMARY = createUniqueKey(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = createUniqueKey(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.uuid);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPurchasesRecord> KEY_accountPurchases_PRIMARY = createUniqueKey(mineplex.database.tables.AccountPurchases.accountPurchases, mineplex.database.tables.AccountPurchases.accountPurchases.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.uuid);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId, mineplex.database.tables.AccountStat.accountStat.statId);
-		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTipRecord> KEY_accountTip_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTip.accountTip, mineplex.database.tables.AccountTip.accountTip.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTipClaimLogsRecord> KEY_accountTipClaimLogs_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs, mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTipLogsRecord> 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<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountValentinesGiftRecord> 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<mineplex.database.tables.records.ActiveTournamentsRecord> KEY_activeTournaments_PRIMARY = createUniqueKey(mineplex.database.tables.ActiveTournaments.activeTournaments, mineplex.database.tables.ActiveTournaments.activeTournaments.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BattlePetsRecord> KEY_battlePets_PRIMARY = createUniqueKey(mineplex.database.tables.BattlePets.battlePets, mineplex.database.tables.BattlePets.battlePets.petId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusRecord> KEY_bonus_PRIMARY = createUniqueKey(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusLogRecord> KEY_bonusLog_PRIMARY = createUniqueKey(mineplex.database.tables.BonusLog.bonusLog, mineplex.database.tables.BonusLog.bonusLog.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BotSpamRecord> KEY_botSpam_PRIMARY = createUniqueKey(mineplex.database.tables.BotSpam.botSpam, mineplex.database.tables.BotSpam.botSpam.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BotSpamRecord> KEY_botSpam_unique_text = createUniqueKey(mineplex.database.tables.BotSpam.botSpam, mineplex.database.tables.BotSpam.botSpam.text);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord> KEY_chatsnap_PRIMARY = createUniqueKey(mineplex.database.tables.Chatsnap.chatsnap, mineplex.database.tables.Chatsnap.chatsnap.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = createUniqueKey(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanBansRecord> KEY_clanBans_PRIMARY = createUniqueKey(mineplex.database.tables.ClanBans.clanBans, mineplex.database.tables.ClanBans.clanBans.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_PRIMARY = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_clanId = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.clanId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_otherClanId = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.otherClanId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanNameBlacklistRecord> KEY_clanNameBlacklist_PRIMARY = createUniqueKey(mineplex.database.tables.ClanNameBlacklist.clanNameBlacklist, mineplex.database.tables.ClanNameBlacklist.clanNameBlacklist.clanName);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_PRIMARY = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_clanName = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.serverId, mineplex.database.tables.Clans.clans.name);
-		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_PRIMARY = createUniqueKey(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id, mineplex.database.tables.ClanServer.clanServer.serverName);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_PRIMARY = createUniqueKey(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanServerRecord> KEY_clanServer_unique_serverName = createUniqueKey(mineplex.database.tables.ClanServer.clanServer, mineplex.database.tables.ClanServer.clanServer.serverName);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_PRIMARY = createUniqueKey(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanShopItemRecord> KEY_clanShopItem_shop_page_slot_UNIQUE = createUniqueKey(mineplex.database.tables.ClanShopItem.clanShopItem, mineplex.database.tables.ClanShopItem.clanShopItem.shopName, mineplex.database.tables.ClanShopItem.clanShopItem.shopPage, mineplex.database.tables.ClanShopItem.clanShopItem.slot);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansOutpostsRecord> KEY_clansOutposts_PRIMARY = createUniqueKey(mineplex.database.tables.ClansOutposts.clansOutposts, mineplex.database.tables.ClansOutposts.clansOutposts.uniqueId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansPvpTimerRecord> KEY_clansPvpTimer_PRIMARY = createUniqueKey(mineplex.database.tables.ClansPvpTimer.clansPvpTimer, mineplex.database.tables.ClansPvpTimer.clansPvpTimer.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansSiegeWeaponsRecord> KEY_clansSiegeWeapons_PRIMARY = createUniqueKey(mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons, mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons.uniqueId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansTutorialRecord> KEY_clansTutorial_PRIMARY = createUniqueKey(mineplex.database.tables.ClansTutorial.clansTutorial, mineplex.database.tables.ClansTutorial.clansTutorial.uuid);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_PRIMARY = createUniqueKey(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id);
-		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_territory_server_chunk_UNIQUE = createUniqueKey(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.serverId, mineplex.database.tables.ClanTerritory.clanTerritory.chunk);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanWarRecord> KEY_clanWar_PRIMARY = createUniqueKey(mineplex.database.tables.ClanWar.clanWar, mineplex.database.tables.ClanWar.clanWar.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.CustomDataRecord> KEY_customData_PRIMARY = createUniqueKey(mineplex.database.tables.CustomData.customData, mineplex.database.tables.CustomData.customData.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_PRIMARY = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
-		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.uuid, mineplex.database.tables.EloRating.eloRating.gamemode);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FacebookRecord> KEY_facebook_PRIMARY = createUniqueKey(mineplex.database.tables.Facebook.facebook, mineplex.database.tables.Facebook.facebook.code);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FacebookRecord> KEY_facebook_facebook_code_uindex = createUniqueKey(mineplex.database.tables.Facebook.facebook, mineplex.database.tables.Facebook.facebook.code);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FacebookRecord> KEY_facebook_facebook_accountId_uindex = createUniqueKey(mineplex.database.tables.Facebook.facebook, mineplex.database.tables.Facebook.facebook.accountId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> KEY_fieldBlock_PRIMARY = createUniqueKey(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord> KEY_fieldMonster_PRIMARY = createUniqueKey(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord> KEY_fieldOre_PRIMARY = createUniqueKey(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GadgetsRecord> KEY_gadgets_PRIMARY = createUniqueKey(mineplex.database.tables.Gadgets.gadgets, mineplex.database.tables.Gadgets.gadgets.accountId, mineplex.database.tables.Gadgets.gadgets.kvKey);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayRecord> KEY_giveaway_PRIMARY = createUniqueKey(mineplex.database.tables.Giveaway.giveaway, mineplex.database.tables.Giveaway.giveaway.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayRecord> KEY_giveaway_giveaway_name_uindex = createUniqueKey(mineplex.database.tables.Giveaway.giveaway, mineplex.database.tables.Giveaway.giveaway.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayCooldownRecord> KEY_giveawayCooldown_PRIMARY = createUniqueKey(mineplex.database.tables.GiveawayCooldown.giveawayCooldown, mineplex.database.tables.GiveawayCooldown.giveawayCooldown.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GiveawayCooldownRecord> KEY_giveawayCooldown_giveawayCooldown_name_uindex = createUniqueKey(mineplex.database.tables.GiveawayCooldown.giveawayCooldown, mineplex.database.tables.GiveawayCooldown.giveawayCooldown.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.IncognitoStaffRecord> KEY_incognitoStaff_PRIMARY = createUniqueKey(mineplex.database.tables.IncognitoStaff.incognitoStaff, mineplex.database.tables.IncognitoStaff.incognitoStaff.accountId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemCategoriesRecord> KEY_itemCategories_PRIMARY = createUniqueKey(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemCategoriesRecord> KEY_itemCategories_nameIndex = createUniqueKey(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.name);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_name_UNIQUE = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name, mineplex.database.tables.Items.items.categoryId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.KitProgressionRecord> 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<mineplex.database.tables.records.Kit_progressionRecord> 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<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = createUniqueKey(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = createUniqueKey(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = createUniqueKey(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PackagesRecord> KEY_packages_PRIMARY = createUniqueKey(mineplex.database.tables.Packages.packages, mineplex.database.tables.Packages.packages.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.playerName);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = createUniqueKey(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = createUniqueKey(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankedBansRecord> KEY_rankedBans_PRIMARY = createUniqueKey(mineplex.database.tables.RankedBans.rankedBans, mineplex.database.tables.RankedBans.rankedBans.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ReportTicketsRecord> KEY_reportTickets_PRIMARY = createUniqueKey(mineplex.database.tables.ReportTickets.reportTickets, mineplex.database.tables.ReportTickets.reportTickets.reportId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = createUniqueKey(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = createUniqueKey(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StaffMotdRecord> KEY_staffMotd_PRIMARY = createUniqueKey(mineplex.database.tables.StaffMotd.staffMotd, mineplex.database.tables.StaffMotd.staffMotd.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = createUniqueKey(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_UK_DailyEntry = createUniqueKey(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.accountId, mineplex.database.tables.StatEvents.statEvents.date, mineplex.database.tables.StatEvents.statEvents.gamemode, mineplex.database.tables.StatEvents.statEvents.serverGroup, mineplex.database.tables.StatEvents.statEvents.type);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_PRIMARY = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_nameIndex = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.name);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_PRIMARY = createUniqueKey(mineplex.database.tables.StatTypes.statTypes, mineplex.database.tables.StatTypes.statTypes.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatTypesRecord> KEY_statTypes_name = createUniqueKey(mineplex.database.tables.StatTypes.statTypes, mineplex.database.tables.StatTypes.statTypes.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StreamersRecord> KEY_streamers_PRIMARY = createUniqueKey(mineplex.database.tables.Streamers.streamers, mineplex.database.tables.Streamers.streamers.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_PRIMARY = createUniqueKey(mineplex.database.tables.Tasks.tasks, mineplex.database.tables.Tasks.tasks.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TasksRecord> KEY_tasks_name_UNIQUE = createUniqueKey(mineplex.database.tables.Tasks.tasks, mineplex.database.tables.Tasks.tasks.name);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TitanGiveawayRecord> KEY_titanGiveaway_PRIMARY = createUniqueKey(mineplex.database.tables.TitanGiveaway.titanGiveaway, mineplex.database.tables.TitanGiveaway.titanGiveaway.accountId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_PRIMARY = createUniqueKey(mineplex.database.tables.TournamentLB.TournamentLB, mineplex.database.tables.TournamentLB.TournamentLB.rank);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLBRecord> KEY_TournamentLB_UK_PlayerEntry = createUniqueKey(mineplex.database.tables.TournamentLB.TournamentLB, mineplex.database.tables.TournamentLB.TournamentLB.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentsRecord> KEY_tournaments_PRIMARY = createUniqueKey(mineplex.database.tables.Tournaments.tournaments, mineplex.database.tables.Tournaments.tournaments.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentTeamsRecord> KEY_tournamentTeams_PRIMARY = createUniqueKey(mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TransactionsRecord> KEY_transactions_PRIMARY = createUniqueKey(mineplex.database.tables.Transactions.transactions, mineplex.database.tables.Transactions.transactions.id);
 	}
 
 	private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys {
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> FK_accountClan_accounts = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountAuthRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> FK_accountClan_clans2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.clanId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> FK_ACT_ACCOUNTS_ID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCustomDataRecord, mineplex.database.tables.records.AccountsRecord> CUSTOMDATA_ACCOUNT = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountCustomData.accountCustomData, mineplex.database.tables.AccountCustomData.accountCustomData.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCustomDataRecord, mineplex.database.tables.records.CustomDataRecord> ACCOUNTDATA_CUSTOMDATA = createForeignKey(mineplex.database.Keys.KEY_customData_PRIMARY, mineplex.database.tables.AccountCustomData.accountCustomData, mineplex.database.tables.AccountCustomData.accountCustomData.customDataId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountGemTransactions_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_uuidIndex, mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.accounts_uuid);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGiveawayRecord, mineplex.database.tables.records.GiveawayRecord> accountGiveaway_giveaway_id_fk = createForeignKey(mineplex.database.Keys.KEY_giveaway_PRIMARY, mineplex.database.tables.AccountGiveaway.accountGiveaway, mineplex.database.tables.AccountGiveaway.accountGiveaway.giveawayId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGiveawayRecord, mineplex.database.tables.records.AccountsRecord> accountGiveaway_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountGiveaway.accountGiveaway, mineplex.database.tables.AccountGiveaway.accountGiveaway.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGiveawayRecord, mineplex.database.tables.records.GiveawayCooldownRecord> accountGiveaway_giveawayCooldown_id_fk = createForeignKey(mineplex.database.Keys.KEY_giveawayCooldown_PRIMARY, mineplex.database.tables.AccountGiveaway.accountGiveaway, mineplex.database.tables.AccountGiveaway.accountGiveaway.cooldownId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.AccountsRecord> accountInventory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.itemId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountMortenSpamTestRecord, mineplex.database.tables.records.AccountsRecord> MORTEN_ACCOUNT = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest, mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPetsRecord, mineplex.database.tables.records.AccountsRecord> accountIdKEY = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPets.accountPets, mineplex.database.tables.AccountPets.accountPets.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_polls_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.pollId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPurchasesRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNT_PURCHASE_ID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPurchases.accountPurchases, mineplex.database.tables.AccountPurchases.accountPurchases.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPurchasesRecord, mineplex.database.tables.records.PackagesRecord> PACKAGENAME_ID = createForeignKey(mineplex.database.Keys.KEY_packages_PRIMARY, mineplex.database.tables.AccountPurchases.accountPurchases, mineplex.database.tables.AccountPurchases.accountPurchases.packageId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.statId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.accountId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.statId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.TasksRecord> ACCOUNTTASKS_TASKID = createForeignKey(mineplex.database.Keys.KEY_tasks_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.taskId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTipRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.AccountTipClaimLogsRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.AccountTipLogsRecord, mineplex.database.tables.records.AccountsRecord> accountTipLogs_accounts_id_fk = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTipLogs.accountTipLogs, mineplex.database.tables.AccountTipLogs.accountTipLogs.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTRANSACTIONS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTransactionsRecord, mineplex.database.tables.records.TransactionsRecord> ACCOUNTTRANSACTIONS_TRANSACTIONID = createForeignKey(mineplex.database.Keys.KEY_transactions_PRIMARY, mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.transactionId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountValentinesGiftRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.AccountValentinesGiftRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.BonusRecord, mineplex.database.tables.records.AccountsRecord> bonus_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.clanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusLogRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.otherClanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.BonusLogRecord, mineplex.database.tables.records.ItemsRecord> 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<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.clanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.EloRatingRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.ClanEnemiesRecord, mineplex.database.tables.records.ClansRecord> clanEnemies_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.otherClanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.FacebookRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.ClansRecord, mineplex.database.tables.records.ClanServerRecord> clans_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.serverId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.GadgetsRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClansRecord> clanTerritory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.clanId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.serverId);
-		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_itemCategories_PRIMARY, mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.categoryId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.TitanGiveawayRecord, mineplex.database.tables.records.AccountsRecord> 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<mineplex.database.tables.records.TournamentTeamsRecord, mineplex.database.tables.records.TournamentsRecord> 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<mineplex.database.tables.records.TournamentTeamsRecord, mineplex.database.tables.records.AccountsRecord> TEAM_TOURNAMENT_ACCOUNT_ID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.TournamentTeams.tournamentTeams, mineplex.database.tables.TournamentTeams.tournamentTeams.accountId);
 	}
 }

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

@@ -28,6 +28,20 @@ public class Routines {
 		return p.getSuccess();
 	}
 
+	/**
+	 * Call <code>Account.addTip</code>
+	 */
+	public static java.lang.Byte callAddtip(org.jooq.Configuration configuration, java.lang.Integer tipperAccountId, java.lang.Integer boosterAccountId, java.lang.Integer boosterId, java.lang.Integer tipAmount) {
+		mineplex.database.routines.AddTip p = new mineplex.database.routines.AddTip();
+		p.setTipperAccountId(tipperAccountId);
+		p.setBoosterAccountId(boosterAccountId);
+		p.setBoosterId(boosterId);
+		p.setTipAmount(tipAmount);
+
+		p.execute(configuration);
+		return p.getSuccess();
+	}
+
 	/**
 	 * Call <code>Account.check_daily</code>
 	 */
@@ -41,6 +55,19 @@ public class Routines {
 		return p;
 	}
 
+	/**
+	 * Call <code>Account.check_giveaway</code>
+	 */
+	public static java.lang.Byte callCheckGiveaway(org.jooq.Configuration configuration, java.lang.Integer playerId, java.lang.String giveawayName, java.lang.String cooldownName) {
+		mineplex.database.routines.Check_giveaway p = new mineplex.database.routines.Check_giveaway();
+		p.setPlayerId(playerId);
+		p.setGiveawayName(giveawayName);
+		p.setCooldownName(cooldownName);
+
+		p.execute(configuration);
+		return p.getCanGive();
+	}
+
 	/**
 	 * Call <code>Account.check_rank</code>
 	 */
@@ -54,6 +81,17 @@ public class Routines {
 		return p;
 	}
 
+	/**
+	 * Call <code>Account.check_titanGiveaway</code>
+	 */
+	public static mineplex.database.routines.Check_titanGiveaway callCheckTitangiveaway(org.jooq.Configuration configuration, java.lang.String checkRegion) {
+		mineplex.database.routines.Check_titanGiveaway p = new mineplex.database.routines.Check_titanGiveaway();
+		p.setCheckRegion(checkRegion);
+
+		p.execute(configuration);
+		return p;
+	}
+
 	/**
 	 * Call <code>Account.check_vote</code>
 	 */
@@ -67,6 +105,17 @@ public class Routines {
 		return p;
 	}
 
+	/**
+	 * Call <code>Account.claimTips</code>
+	 */
+	public static java.lang.Integer callClaimtips(org.jooq.Configuration configuration, java.lang.Integer accountId_in) {
+		mineplex.database.routines.ClaimTips p = new mineplex.database.routines.ClaimTips();
+		p.setAccountId_in(accountId_in);
+
+		p.execute(configuration);
+		return p.getTipsClaimed();
+	}
+
 	/**
 	 * Call <code>Account.createLeaderboard</code>
 	 */
@@ -133,6 +182,20 @@ public class Routines {
 		p.execute(configuration);
 	}
 
+	/**
+	 * Call <code>Account.rankBonus</code>
+	 */
+	public static mineplex.database.routines.RankBonus callRankbonus(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange, java.lang.Integer mythicalChestChange) {
+		mineplex.database.routines.RankBonus p = new mineplex.database.routines.RankBonus();
+		p.setAccountId_in(accountId_in);
+		p.setCoinsChange(coinsChange);
+		p.setGemsChange(gemsChange);
+		p.setMythicalChestChange(mythicalChestChange);
+
+		p.execute(configuration);
+		return p;
+	}
+
 	/**
 	 * Call <code>Account.swapTableNames</code>
 	 */

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.accountAuth
+	 */
+	public static final mineplex.database.tables.AccountAuth accountAuth = mineplex.database.tables.AccountAuth.accountAuth;
+
 	/**
 	 * The table Account.accountClan
 	 */
@@ -26,6 +31,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountCoinTransactions accountCoinTransactions = mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions;
 
+	/**
+	 * The table Account.accountCustomData
+	 */
+	public static final mineplex.database.tables.AccountCustomData accountCustomData = mineplex.database.tables.AccountCustomData.accountCustomData;
+
 	/**
 	 * The table Account.accountFriend
 	 */
@@ -36,6 +46,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountGemTransactions accountGemTransactions = mineplex.database.tables.AccountGemTransactions.accountGemTransactions;
 
+	/**
+	 * The table Account.accountGiveaway
+	 */
+	public static final mineplex.database.tables.AccountGiveaway accountGiveaway = mineplex.database.tables.AccountGiveaway.accountGiveaway;
+
 	/**
 	 * The table Account.accountIgnore
 	 */
@@ -46,6 +61,16 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountInventory accountInventory = mineplex.database.tables.AccountInventory.accountInventory;
 
+	/**
+	 * The table Account.accountMortenSpamTest
+	 */
+	public static final mineplex.database.tables.AccountMortenSpamTest accountMortenSpamTest = mineplex.database.tables.AccountMortenSpamTest.accountMortenSpamTest;
+
+	/**
+	 * The table Account.accountPets
+	 */
+	public static final mineplex.database.tables.AccountPets accountPets = mineplex.database.tables.AccountPets.accountPets;
+
 	/**
 	 * The table Account.accountPolls
 	 */
@@ -56,6 +81,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountPreferences accountPreferences = mineplex.database.tables.AccountPreferences.accountPreferences;
 
+	/**
+	 * The table Account.accountPurchases
+	 */
+	public static final mineplex.database.tables.AccountPurchases accountPurchases = mineplex.database.tables.AccountPurchases.accountPurchases;
+
 	/**
 	 * The table Account.accounts
 	 */
@@ -66,31 +96,61 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountStat accountStat = mineplex.database.tables.AccountStat.accountStat;
 
-	/**
-	 * The table Account.accountStats
-	 */
-	public static final mineplex.database.tables.AccountStats accountStats = mineplex.database.tables.AccountStats.accountStats;
-
 	/**
 	 * The table Account.accountTasks
 	 */
 	public static final mineplex.database.tables.AccountTasks accountTasks = mineplex.database.tables.AccountTasks.accountTasks;
 
+	/**
+	 * The table Account.accountTip
+	 */
+	public static final mineplex.database.tables.AccountTip accountTip = mineplex.database.tables.AccountTip.accountTip;
+
+	/**
+	 * The table Account.accountTipClaimLogs
+	 */
+	public static final mineplex.database.tables.AccountTipClaimLogs accountTipClaimLogs = mineplex.database.tables.AccountTipClaimLogs.accountTipClaimLogs;
+
+	/**
+	 * The table Account.accountTipLogs
+	 */
+	public static final mineplex.database.tables.AccountTipLogs accountTipLogs = mineplex.database.tables.AccountTipLogs.accountTipLogs;
+
 	/**
 	 * The table Account.accountTransactions
 	 */
 	public static final mineplex.database.tables.AccountTransactions accountTransactions = mineplex.database.tables.AccountTransactions.accountTransactions;
 
+	/**
+	 * The table Account.accountValentinesGift
+	 */
+	public static final mineplex.database.tables.AccountValentinesGift accountValentinesGift = mineplex.database.tables.AccountValentinesGift.accountValentinesGift;
+
 	/**
 	 * The table Account.activeTournaments
 	 */
 	public static final mineplex.database.tables.ActiveTournaments activeTournaments = mineplex.database.tables.ActiveTournaments.activeTournaments;
 
+	/**
+	 * The table Account.battlePets
+	 */
+	public static final mineplex.database.tables.BattlePets battlePets = mineplex.database.tables.BattlePets.battlePets;
+
 	/**
 	 * The table Account.bonus
 	 */
 	public static final mineplex.database.tables.Bonus bonus = mineplex.database.tables.Bonus.bonus;
 
+	/**
+	 * The table Account.bonusLog
+	 */
+	public static final mineplex.database.tables.BonusLog bonusLog = mineplex.database.tables.BonusLog.bonusLog;
+
+	/**
+	 * The table Account.botSpam
+	 */
+	public static final mineplex.database.tables.BotSpam botSpam = mineplex.database.tables.BotSpam.botSpam;
+
 	/**
 	 * The table Account.chatsnap
 	 */
@@ -101,6 +161,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.ClanAlliances clanAlliances = mineplex.database.tables.ClanAlliances.clanAlliances;
 
+	/**
+	 * The table Account.clanBans
+	 */
+	public static final mineplex.database.tables.ClanBans clanBans = mineplex.database.tables.ClanBans.clanBans;
+
 	/**
 	 * The table Account.clanEnemies
 	 */
@@ -111,6 +176,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.ClanMember clanMember = mineplex.database.tables.ClanMember.clanMember;
 
+	/**
+	 * The table Account.clanNameBlacklist
+	 */
+	public static final mineplex.database.tables.ClanNameBlacklist clanNameBlacklist = mineplex.database.tables.ClanNameBlacklist.clanNameBlacklist;
+
 	/**
 	 * The table Account.clans
 	 */
@@ -126,16 +196,51 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.ClanShopItem clanShopItem = mineplex.database.tables.ClanShopItem.clanShopItem;
 
+	/**
+	 * The table Account.clansOutposts
+	 */
+	public static final mineplex.database.tables.ClansOutposts clansOutposts = mineplex.database.tables.ClansOutposts.clansOutposts;
+
+	/**
+	 * The table Account.clansPvpTimer
+	 */
+	public static final mineplex.database.tables.ClansPvpTimer clansPvpTimer = mineplex.database.tables.ClansPvpTimer.clansPvpTimer;
+
+	/**
+	 * The table Account.clansSiegeWeapons
+	 */
+	public static final mineplex.database.tables.ClansSiegeWeapons clansSiegeWeapons = mineplex.database.tables.ClansSiegeWeapons.clansSiegeWeapons;
+
+	/**
+	 * The table Account.clansTutorial
+	 */
+	public static final mineplex.database.tables.ClansTutorial clansTutorial = mineplex.database.tables.ClansTutorial.clansTutorial;
+
 	/**
 	 * The table Account.clanTerritory
 	 */
 	public static final mineplex.database.tables.ClanTerritory clanTerritory = mineplex.database.tables.ClanTerritory.clanTerritory;
 
+	/**
+	 * The table Account.clanWar
+	 */
+	public static final mineplex.database.tables.ClanWar clanWar = mineplex.database.tables.ClanWar.clanWar;
+
+	/**
+	 * The table Account.customData
+	 */
+	public static final mineplex.database.tables.CustomData customData = mineplex.database.tables.CustomData.customData;
+
 	/**
 	 * The table Account.eloRating
 	 */
 	public static final mineplex.database.tables.EloRating eloRating = mineplex.database.tables.EloRating.eloRating;
 
+	/**
+	 * The table Account.facebook
+	 */
+	public static final mineplex.database.tables.Facebook facebook = mineplex.database.tables.Facebook.facebook;
+
 	/**
 	 * The table Account.fieldBlock
 	 */
@@ -151,6 +256,26 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.FieldOre fieldOre = mineplex.database.tables.FieldOre.fieldOre;
 
+	/**
+	 * The table Account.gadgets
+	 */
+	public static final mineplex.database.tables.Gadgets gadgets = mineplex.database.tables.Gadgets.gadgets;
+
+	/**
+	 * The table Account.giveaway
+	 */
+	public static final mineplex.database.tables.Giveaway giveaway = mineplex.database.tables.Giveaway.giveaway;
+
+	/**
+	 * The table Account.giveawayCooldown
+	 */
+	public static final mineplex.database.tables.GiveawayCooldown giveawayCooldown = mineplex.database.tables.GiveawayCooldown.giveawayCooldown;
+
+	/**
+	 * The table Account.incognitoStaff
+	 */
+	public static final mineplex.database.tables.IncognitoStaff incognitoStaff = mineplex.database.tables.IncognitoStaff.incognitoStaff;
+
 	/**
 	 * The table Account.itemCategories
 	 */
@@ -161,6 +286,21 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Items items = mineplex.database.tables.Items.items;
 
+	/**
+	 * The table Account.kitpreferences
+	 */
+	public static final mineplex.database.tables.Kitpreferences kitpreferences = mineplex.database.tables.Kitpreferences.kitpreferences;
+
+	/**
+	 * The table Account.kitProgression
+	 */
+	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
 	 */
@@ -176,6 +316,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Npcs npcs = mineplex.database.tables.Npcs.npcs;
 
+	/**
+	 * The table Account.packages
+	 */
+	public static final mineplex.database.tables.Packages packages = mineplex.database.tables.Packages.packages;
+
 	/**
 	 * The table Account.playerMap
 	 */
@@ -191,6 +336,36 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.RankBenefits rankBenefits = mineplex.database.tables.RankBenefits.rankBenefits;
 
+	/**
+	 * The table Account.rankedBans
+	 */
+	public static final mineplex.database.tables.RankedBans rankedBans = mineplex.database.tables.RankedBans.rankedBans;
+
+	/**
+	 * The table Account.reportTickets
+	 */
+	public static final mineplex.database.tables.ReportTickets reportTickets = mineplex.database.tables.ReportTickets.reportTickets;
+
+	/**
+	 * The table Account.selectedgadgets
+	 */
+	public static final mineplex.database.tables.Selectedgadgets selectedgadgets = mineplex.database.tables.Selectedgadgets.selectedgadgets;
+
+	/**
+	 * The table Account.selectedmodifiers
+	 */
+	public static final mineplex.database.tables.Selectedmodifiers selectedmodifiers = mineplex.database.tables.Selectedmodifiers.selectedmodifiers;
+
+	/**
+	 * The table Account.selectedMounts
+	 */
+	public static final mineplex.database.tables.SelectedMounts selectedMounts = mineplex.database.tables.SelectedMounts.selectedMounts;
+
+	/**
+	 * The table Account.selectedPets
+	 */
+	public static final mineplex.database.tables.SelectedPets selectedPets = mineplex.database.tables.SelectedPets.selectedPets;
+
 	/**
 	 * The table Account.serverPassword
 	 */
@@ -201,6 +376,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Spawns spawns = mineplex.database.tables.Spawns.spawns;
 
+	/**
+	 * The table Account.staffMotd
+	 */
+	public static final mineplex.database.tables.StaffMotd staffMotd = mineplex.database.tables.StaffMotd.staffMotd;
+
 	/**
 	 * The table Account.statEvents
 	 */
@@ -216,16 +396,36 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.StatTypes statTypes = mineplex.database.tables.StatTypes.statTypes;
 
+	/**
+	 * The table Account.streamers
+	 */
+	public static final mineplex.database.tables.Streamers streamers = mineplex.database.tables.Streamers.streamers;
+
 	/**
 	 * The table Account.tasks
 	 */
 	public static final mineplex.database.tables.Tasks tasks = mineplex.database.tables.Tasks.tasks;
 
+	/**
+	 * The table Account.titanGiveaway
+	 */
+	public static final mineplex.database.tables.TitanGiveaway titanGiveaway = mineplex.database.tables.TitanGiveaway.titanGiveaway;
+
 	/**
 	 * The table Account.TournamentLB
 	 */
 	public static final mineplex.database.tables.TournamentLB TournamentLB = mineplex.database.tables.TournamentLB.TournamentLB;
 
+	/**
+	 * The table Account.tournaments
+	 */
+	public static final mineplex.database.tables.Tournaments tournaments = mineplex.database.tables.Tournaments.tournaments;
+
+	/**
+	 * The table Account.tournamentTeams
+	 */
+	public static final mineplex.database.tables.TournamentTeams tournamentTeams = mineplex.database.tables.TournamentTeams.tournamentTeams;
+
 	/**
 	 * The table Account.transactions
 	 */

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

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

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

@@ -0,0 +1,80 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Check_giveaway extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -262072055;
+
+	/**
+	 * The parameter <code>Account.check_giveaway.playerId</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> playerId = createParameter("playerId", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_giveaway.giveawayName</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> giveawayName = createParameter("giveawayName", org.jooq.impl.SQLDataType.VARCHAR.length(30), false);
+
+	/**
+	 * The parameter <code>Account.check_giveaway.cooldownName</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> cooldownName = createParameter("cooldownName", org.jooq.impl.SQLDataType.VARCHAR.length(20), false);
+
+	/**
+	 * The parameter <code>Account.check_giveaway.canGive</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> canGive = createParameter("canGive", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public Check_giveaway() {
+		super("check_giveaway", mineplex.database.Account.Account);
+
+		addInParameter(playerId);
+		addInParameter(giveawayName);
+		addInParameter(cooldownName);
+		addOutParameter(canGive);
+	}
+
+	/**
+	 * Set the <code>playerId</code> parameter IN value to the routine
+	 */
+	public void setPlayerId(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_giveaway.playerId, value);
+	}
+
+	/**
+	 * Set the <code>giveawayName</code> parameter IN value to the routine
+	 */
+	public void setGiveawayName(java.lang.String value) {
+		setValue(mineplex.database.routines.Check_giveaway.giveawayName, value);
+	}
+
+	/**
+	 * Set the <code>cooldownName</code> parameter IN value to the routine
+	 */
+	public void setCooldownName(java.lang.String value) {
+		setValue(mineplex.database.routines.Check_giveaway.cooldownName, value);
+	}
+
+	/**
+	 * Get the <code>canGive</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getCanGive() {
+		return getValue(canGive);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/routines/Check_titanGiveaway.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 Check_titanGiveaway extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -61265216;
+
+	/**
+	 * The parameter <code>Account.check_titanGiveaway.checkRegion</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> checkRegion = createParameter("checkRegion", org.jooq.impl.SQLDataType.VARCHAR.length(10), false);
+
+	/**
+	 * The parameter <code>Account.check_titanGiveaway.canGiveRank</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> canGiveRank = createParameter("canGiveRank", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * The parameter <code>Account.check_titanGiveaway.titanCount</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> titanCount = createParameter("titanCount", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public Check_titanGiveaway() {
+		super("check_titanGiveaway", mineplex.database.Account.Account);
+
+		addInParameter(checkRegion);
+		addOutParameter(canGiveRank);
+		addOutParameter(titanCount);
+	}
+
+	/**
+	 * Set the <code>checkRegion</code> parameter IN value to the routine
+	 */
+	public void setCheckRegion(java.lang.String value) {
+		setValue(mineplex.database.routines.Check_titanGiveaway.checkRegion, value);
+	}
+
+	/**
+	 * Get the <code>canGiveRank</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getCanGiveRank() {
+		return getValue(canGiveRank);
+	}
+
+	/**
+	 * Get the <code>titanCount</code> parameter OUT value from the routine
+	 */
+	public java.lang.Integer getTitanCount() {
+		return getValue(titanCount);
+	}
+}

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

@@ -0,0 +1,54 @@
+/**
+ * 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 ClaimTips extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -1769926553;
+
+	/**
+	 * The parameter <code>Account.claimTips.accountId_in</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.claimTips.tipsClaimed</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> tipsClaimed = createParameter("tipsClaimed", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public ClaimTips() {
+		super("claimTips", mineplex.database.Account.Account);
+
+		addInParameter(accountId_in);
+		addOutParameter(tipsClaimed);
+	}
+
+	/**
+	 * Set the <code>accountId_in</code> parameter IN value to the routine
+	 */
+	public void setAccountId_in(java.lang.Integer value) {
+		setValue(mineplex.database.routines.ClaimTips.accountId_in, value);
+	}
+
+	/**
+	 * Get the <code>tipsClaimed</code> parameter OUT value from the routine
+	 */
+	public java.lang.Integer getTipsClaimed() {
+		return getValue(tipsClaimed);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/routines/RankBonus.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 RankBonus extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 467761905;
+
+	/**
+	 * The parameter <code>Account.rankBonus.accountId_in</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.rankBonus.coinsChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.rankBonus.gemsChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.rankBonus.mythicalChestChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> mythicalChestChange = createParameter("mythicalChestChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.rankBonus.pass</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> pass = createParameter("pass", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * The parameter <code>Account.rankBonus.outTime</code>.
+	 */
+	public static final org.jooq.Parameter<java.sql.Date> outTime = createParameter("outTime", org.jooq.impl.SQLDataType.DATE, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public RankBonus() {
+		super("rankBonus", mineplex.database.Account.Account);
+
+		addInParameter(accountId_in);
+		addInParameter(coinsChange);
+		addInParameter(gemsChange);
+		addInParameter(mythicalChestChange);
+		addOutParameter(pass);
+		addOutParameter(outTime);
+	}
+
+	/**
+	 * Set the <code>accountId_in</code> parameter IN value to the routine
+	 */
+	public void setAccountId_in(java.lang.Integer value) {
+		setValue(mineplex.database.routines.RankBonus.accountId_in, value);
+	}
+
+	/**
+	 * Set the <code>coinsChange</code> parameter IN value to the routine
+	 */
+	public void setCoinsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.RankBonus.coinsChange, value);
+	}
+
+	/**
+	 * Set the <code>gemsChange</code> parameter IN value to the routine
+	 */
+	public void setGemsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.RankBonus.gemsChange, value);
+	}
+
+	/**
+	 * Set the <code>mythicalChestChange</code> parameter IN value to the routine
+	 */
+	public void setMythicalChestChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.RankBonus.mythicalChestChange, value);
+	}
+
+	/**
+	 * Get the <code>pass</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getPass() {
+		return getValue(pass);
+	}
+
+	/**
+	 * Get the <code>outTime</code> parameter OUT value from the routine
+	 */
+	public java.sql.Date getOutTime() {
+		return getValue(outTime);
+	}
+}