Merge pull request #242 from AuthMe-Team/master

Stuff from the team repo

pom.xml

@@ -86,7 +86,9 @@
 				<artifactId>maven-shade-plugin</artifactId>
 				<version>2.4.1</version>
 				<configuration>
-					<artifactSet>
+					<createDependencyReducedPom>false</createDependencyReducedPom>
+					<minimizeJar>true</minimizeJar>
+					<!-- <artifactSet>
 						<includes>
 							<include>com.zaxxer:HikariCP</include>
 							<include>org.slf4j:slf4j-jdk14</include>
@@ -97,7 +99,7 @@
 							<include>org.mcstats.bukkit:metrics</include>
 							<include>com.google.code.gson:gson</include>
 						</includes>
-					</artifactSet>
+					</artifactSet> -->
 					<relocations>
 						<relocation>
 							<pattern>org.mcstats</pattern>
@@ -139,10 +141,16 @@
 
 		<!-- Attribute Repo -->
 		<repository>
-			<id>comphenix-snapshots</id>
+			<id>comphenix-repo</id>
 			<url>http://repo.comphenix.net/content/repositories/public</url>
 		</repository>
 
+		<!-- ProtocolLib Repo -->
+		<repository>
+			<id>dmulloy2-repo</id>
+			<url>http://repo.dmulloy2.net/content/groups/public/</url>
+		</repository>
+
 		<!-- Multiverse Repo -->
 		<repository>
 			<id>onarandombox</id>
@@ -161,18 +169,17 @@
 			<url>http://repo.luricos.de/content/repositories/releases</url>
 		</repository>
 
-		<!-- Xephi Repo
+		<!-- Xephi Repo (Metrics)-->
 		<repository>
 			<id>xephi-repo</id>
 			<url>http://ci.xephi.fr/plugin/repository/everything/</url>
 		</repository>
-		-->
 
-		<!-- Metrics Snapshots Repo -->
+		<!-- Metrics Snapshots Repo (Too instable! 60% UPTIME)
 		<repository>
 			<id>mcstats-snapshots</id>
 			<url>http://repo.mcstats.org/content/repositories/snapshots/</url>
-		</repository>
+		</repository> -->
 
 	</repositories>
 
@@ -206,28 +213,20 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
+			<!-- Can't use newer versions due to api changes! -->
 			<version>2.0-beta9</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
-		<!-- SQLite Connector -->
+		<!-- Java Email API and Implementation
-		<dependency>
-			<groupId>org.xerial</groupId>
-			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.8.11.2</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
-
-		<!-- Java Email API and Implementation -->
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>javax.mail-api</artifactId>
 			<version>1.5.4</version>
 			<scope>compile</scope>
 			<optional>true</optional>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>com.sun.mail</groupId>
 			<artifactId>javax.mail</artifactId>
@@ -292,6 +291,10 @@
 					<artifactId>json-simple</artifactId>
 					<groupId>com.googlecode.json-simple</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>gson</artifactId>
+					<groupId>com.google.code.gson</groupId>
+				</exclusion>
 				<exclusion>
 					<artifactId>persistence-api</artifactId>
 					<groupId>javax.persistence</groupId>
@@ -322,7 +325,7 @@
 		<dependency>
 			<groupId>com.comphenix.protocol</groupId>
 			<artifactId>ProtocolLib</artifactId>
-			<version>3.4.0</version>
+			<version>3.6.5-SNAPSHOT</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 			<exclusions>

src/main/java/fr/xephi/authme/AuthMe.java

@@ -10,8 +10,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
-import org.apache.logging.log4j.LogManager;
 
+import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;
@@ -22,12 +22,11 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
-
 import org.mcstats.Metrics;
-import net.milkbowl.vault.permission.Permission;
+import org.mcstats.Metrics.Graph;
-import com.onarandombox.MultiverseCore.MultiverseCore;
+
 import com.earth2me.essentials.Essentials;
-import net.minelink.ctplus.CombatTagPlus;
+import com.onarandombox.MultiverseCore.MultiverseCore;
 
 import fr.xephi.authme.api.API;
 import fr.xephi.authme.api.NewAPI;
@@ -69,6 +68,8 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.OtherAccounts;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.Spawn;
+import net.milkbowl.vault.permission.Permission;
+import net.minelink.ctplus.CombatTagPlus;
 
 public class AuthMe extends JavaPlugin {
 
@@ -162,6 +163,25 @@ public class AuthMe extends JavaPlugin {
         // Start the metrics service
         try {
             Metrics metrics = new Metrics(this);
+            Graph messagesLanguage = metrics.createGraph("Messages language");
+            Graph databaseBackend = metrics.createGraph("Database backend");
+
+            // Custom graphs
+            if(Settings.messageFile.exists()) {
+                messagesLanguage.addPlotter(new Metrics.Plotter(Settings.messagesLanguage) {
+                    @Override
+                    public int getValue() {
+                            return 1;
+                    }
+                });
+            }
+            databaseBackend.addPlotter(new Metrics.Plotter(Settings.getDataSource.toString()) {
+                @Override
+                public int getValue() {
+                        return 1;
+                }
+            });
+
             metrics.start();
             ConsoleLogger.info("Metrics started successfully!");
         } catch (Exception e) {

src/main/java/fr/xephi/authme/ConsoleLogger.java

@@ -1,9 +1,5 @@
 package fr.xephi.authme;
 
-import com.google.common.base.Throwables;
-import fr.xephi.authme.api.NewAPI;
-import fr.xephi.authme.settings.Settings;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
@@ -12,6 +8,11 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Logger;
 
+import com.google.common.base.Throwables;
+
+import fr.xephi.authme.api.NewAPI;
+import fr.xephi.authme.settings.Settings;
+
 public class ConsoleLogger {
 
     private static final Logger log = AuthMe.getInstance().getLogger();

src/main/java/fr/xephi/authme/DataManager.java

@@ -104,20 +104,16 @@ public class DataManager {
         for (String name : cleared) {
             try {
                 org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
-                File playerFile = null;
                 if (player == null) {
                     continue;
                 }
 
-                try {
+                try {
-                    playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
+                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
-                } catch (Exception ignore) {
-                }
-                if (playerFile.exists()) {
                     playerFile.delete();
                     i++;
-                } else {
+                } catch(Exception ignore) {
-                    playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getName() + ".dat");
+                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getName() + ".dat");
                     if (playerFile.exists()) {
                         playerFile.delete();
                         i++;
@@ -133,23 +129,16 @@ public class DataManager {
     public void purgeEssentials(List<String> cleared) {
         int i = 0;
         for (String name : cleared) {
-            try {
+            try {
-                File playerFile = null;
+                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + plugin.getServer().getOfflinePlayer(name).getUniqueId() + ".yml");                    
-                try {
+                playerFile.delete();
-                    playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + plugin.getServer().getOfflinePlayer(name).getUniqueId() + ".yml");
+                i++;
-                } catch (Exception ignore) {
+            } catch (Exception e) {
-                }
+                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml");
                 if (playerFile.exists()) {
                     playerFile.delete();
                     i++;
-                } else {
-                    playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml");
-                    if (playerFile.exists()) {
-                        playerFile.delete();
-                        i++;
-                    }
                 }
-            } catch (Exception e) {
             }
         }
         ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " EssentialsFiles");

src/main/java/fr/xephi/authme/Utils.java

@@ -1,18 +1,5 @@
 package fr.xephi.authme;
 
-import com.maxmind.geoip.LookupService;
-import fr.xephi.authme.cache.auth.PlayerCache;
-import fr.xephi.authme.cache.limbo.LimboCache;
-import fr.xephi.authme.cache.limbo.LimboPlayer;
-import fr.xephi.authme.events.AuthMeTeleportEvent;
-import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -25,6 +12,21 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.zip.GZIPInputStream;
 
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import com.maxmind.geoip.LookupService;
+
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.cache.limbo.LimboCache;
+import fr.xephi.authme.cache.limbo.LimboPlayer;
+import fr.xephi.authme.events.AuthMeTeleportEvent;
+import fr.xephi.authme.settings.Settings;
+
 public class Utils {
 
     public static AuthMe plugin;

src/main/java/fr/xephi/authme/cache/backup/JsonCache.java

@@ -1,19 +1,27 @@
 package fr.xephi.authme.cache.backup;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.google.gson.*;
-
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.settings.Settings;
-
-import org.bukkit.entity.Player;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
 
+import org.bukkit.entity.Player;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.Utils;
+import fr.xephi.authme.settings.Settings;
+
 public class JsonCache {
 
     private final Gson gson;

src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java

@@ -1,5 +1,12 @@
 package fr.xephi.authme.cache.limbo;
 
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.backup.DataFileCache;
@@ -7,12 +14,6 @@ import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.events.ResetInventoryEvent;
 import fr.xephi.authme.events.StoreInventoryEvent;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-import java.util.concurrent.ConcurrentHashMap;
 
 public class LimboCache {
 

src/main/java/fr/xephi/authme/commands/AdminCommand.java

@@ -1,5 +1,23 @@
 package fr.xephi.authme.commands;
 
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -14,23 +32,6 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.Spawn;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
 
 public class AdminCommand implements CommandExecutor {
 
@@ -254,6 +255,7 @@ public class AdminCommand implements CommandExecutor {
                 }
             }
             plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+                @SuppressWarnings("deprecation")
                 @Override
                 public void run() {
                     try {

src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java

@@ -1,14 +1,15 @@
 package fr.xephi.authme.commands;
 
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ChangePasswordCommand implements CommandExecutor {
 

src/main/java/fr/xephi/authme/commands/RegisterCommand.java

@@ -1,14 +1,15 @@
 package fr.xephi.authme.commands;
 
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class RegisterCommand implements CommandExecutor {
 

src/main/java/fr/xephi/authme/commands/UnregisterCommand.java

@@ -1,5 +1,17 @@
 package fr.xephi.authme.commands;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -13,17 +25,6 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.security.NoSuchAlgorithmException;
 
 public class UnregisterCommand implements CommandExecutor {
 

src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java

@@ -1,16 +1,17 @@
 package fr.xephi.authme.converter;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
 
 /**
  * @author Xephi59

src/main/java/fr/xephi/authme/converter/FlatToSql.java

@@ -1,11 +1,16 @@
 package fr.xephi.authme.converter;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.settings.Settings;
 
-import java.io.*;
-
 /**
  * @author Xephi59
  */

src/main/java/fr/xephi/authme/converter/FlatToSqlite.java

@@ -1,14 +1,20 @@
 package fr.xephi.authme.converter;
 
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.settings.Settings;
 
 public class FlatToSqlite implements Converter {
 

src/main/java/fr/xephi/authme/converter/RakamakConverter.java

@@ -1,14 +1,5 @@
 package fr.xephi.authme.converter;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.security.PasswordSecurity;
-import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -17,6 +8,16 @@ import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.security.HashAlgorithm;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.settings.Settings;
+
 /**
  * @author Xephi59
  */

src/main/java/fr/xephi/authme/converter/RoyalAuthConverter.java

@@ -1,12 +1,13 @@
 package fr.xephi.authme.converter;
 
+import java.io.File;
+
+import org.bukkit.OfflinePlayer;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
-import org.bukkit.OfflinePlayer;
-
-import java.io.File;
 
 public class RoyalAuthConverter implements Converter {
 

src/main/java/fr/xephi/authme/converter/RoyalAuthYamlReader.java

@@ -1,9 +1,9 @@
 package fr.xephi.authme.converter;
 
-import fr.xephi.authme.settings.CustomConfiguration;
-
 import java.io.File;
 
+import fr.xephi.authme.settings.CustomConfiguration;
+
 public class RoyalAuthYamlReader extends CustomConfiguration {
 
     public RoyalAuthYamlReader(File file) {

src/main/java/fr/xephi/authme/converter/SqlToFlat.java

@@ -1,14 +1,15 @@
 package fr.xephi.authme.converter;
 
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.FlatFile;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class SqlToFlat implements Converter {
 

src/main/java/fr/xephi/authme/converter/vAuthConverter.java

@@ -1,9 +1,10 @@
 package fr.xephi.authme.converter;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
-import org.bukkit.command.CommandSender;
 
 public class vAuthConverter implements Converter {
 

src/main/java/fr/xephi/authme/converter/vAuthFileReader.java

@@ -1,18 +1,19 @@
 package fr.xephi.authme.converter;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.datasource.DataSource;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Scanner;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+
 public class vAuthFileReader {
 
     public AuthMe plugin;

src/main/java/fr/xephi/authme/converter/xAuthConverter.java

@@ -1,8 +1,9 @@
 package fr.xephi.authme.converter;
 
-import fr.xephi.authme.AuthMe;
 import org.bukkit.command.CommandSender;
 
+import fr.xephi.authme.AuthMe;
+
 public class xAuthConverter implements Converter {
 
     public AuthMe plugin;

src/main/java/fr/xephi/authme/converter/xAuthToFlat.java

@@ -1,13 +1,5 @@
 package fr.xephi.authme.converter;
 
-import de.luricos.bukkit.xAuth.database.DatabaseTables;
-import de.luricos.bukkit.xAuth.utils.xAuthLog;
-import de.luricos.bukkit.xAuth.xAuth;
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.datasource.DataSource;
-import org.bukkit.command.CommandSender;
-
 import java.io.File;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -16,6 +8,15 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.command.CommandSender;
+
+import de.luricos.bukkit.xAuth.xAuth;
+import de.luricos.bukkit.xAuth.database.DatabaseTables;
+import de.luricos.bukkit.xAuth.utils.xAuthLog;
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+
 public class xAuthToFlat {
 
     public AuthMe instance;

src/main/java/fr/xephi/authme/datasource/CacheDataSource.java

@@ -1,11 +1,5 @@
 package fr.xephi.authme.datasource;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.cache.auth.PlayerCache;
-import org.bukkit.entity.Player;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +7,13 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.bukkit.entity.Player;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.Utils;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+
 public class CacheDataSource implements DataSource {
 
     private final DataSource source;

src/main/java/fr/xephi/authme/datasource/DataSource.java

@@ -1,9 +1,9 @@
 package fr.xephi.authme.datasource;
 
-import fr.xephi.authme.cache.auth.PlayerAuth;
-
 import java.util.List;
 
+import fr.xephi.authme.cache.auth.PlayerAuth;
+
 public interface DataSource {
 
     enum DataSourceType {

src/main/java/fr/xephi/authme/datasource/DatabaseCalls.java

@@ -1,13 +1,13 @@
 package fr.xephi.authme.datasource;
 
-import fr.xephi.authme.cache.auth.PlayerAuth;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import fr.xephi.authme.cache.auth.PlayerAuth;
+
 public class DatabaseCalls implements DataSource {
 
     private DataSource database;

src/main/java/fr/xephi/authme/datasource/FlatFile.java

@@ -1,15 +1,21 @@
 package fr.xephi.authme.datasource;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.settings.Settings;
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
 public class FlatFile implements DataSource {
 
     /*

src/main/java/fr/xephi/authme/datasource/MySQL.java

@@ -1,20 +1,26 @@
 package fr.xephi.authme.datasource;
 
-import com.zaxxer.hikari.HikariConfig;
+import java.sql.Blob;
-import com.zaxxer.hikari.HikariDataSource;
+import java.sql.Connection;
-import com.zaxxer.hikari.pool.PoolInitializationException;
+import java.sql.PreparedStatement;
-import fr.xephi.authme.AuthMe;
+import java.sql.ResultSet;
-import fr.xephi.authme.ConsoleLogger;
+import java.sql.SQLException;
-import fr.xephi.authme.cache.auth.PlayerAuth;
+import java.sql.Statement;
-import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.settings.Settings;
-
-import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.Bukkit;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import com.zaxxer.hikari.pool.PoolInitializationException;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.security.HashAlgorithm;
+import fr.xephi.authme.settings.Settings;
+
 public class MySQL implements DataSource {
 
     private String host;

src/main/java/fr/xephi/authme/datasource/SQLite.java

@@ -1,13 +1,18 @@
 package fr.xephi.authme.datasource;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.settings.Settings;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
 public class SQLite implements DataSource {
 
     private String database;

src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java

@@ -1,16 +1,21 @@
 package fr.xephi.authme.datasource;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.settings.Settings;
 
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
 public class SQLite_HIKARI implements DataSource {
 
     private String database;

src/main/java/fr/xephi/authme/events/StoreInventoryEvent.java

@@ -1,9 +1,10 @@
 package fr.xephi.authme.events;
 
-import fr.xephi.authme.cache.backup.JsonCache;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import fr.xephi.authme.cache.backup.JsonCache;
+
 /**
  * This event is call just before write inventory content to cache
  *

src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java

@@ -1,13 +1,14 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.Utils;
+
 public class AuthMeBlockListener implements Listener {
 
     public AuthMe instance;

src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java

@@ -1,8 +1,5 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
-
 import java.lang.reflect.Method;
 
 import org.bukkit.entity.Entity;
@@ -12,9 +9,19 @@ import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityInteractEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.projectiles.ProjectileSource;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.Utils;
+
 public class AuthMeEntityListener implements Listener {
 
     public AuthMe instance;

src/main/java/fr/xephi/authme/listener/AuthMeInventoryPacketAdapter.java

@@ -16,23 +16,25 @@
  */
 package fr.xephi.authme.listener;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.logging.Level;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.logging.Level;
 
 public class AuthMeInventoryPacketAdapter extends PacketAdapter {
 

src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java

@@ -139,8 +139,13 @@ public class AuthMePlayerListener implements Listener {
             return;
 
         if (!Settings.isMovementAllowed) {
-            if (!event.getFrom().getBlock().equals(event.getTo().getBlock()))
+            if (Settings.isRemoveSpeedEnabled) {
+                player.setWalkSpeed(0.0f);
+                player.setFlySpeed(0.0f);
+            }
+            if (!event.getFrom().getBlock().equals(event.getTo().getBlock())) {
                 event.setTo(event.getFrom());
+            }
             return;
         }
 

src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java

@@ -1,12 +1,13 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerEditBookEvent;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.Utils;
 
 public class AuthMePlayerListener16 implements Listener {
 

src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java

@@ -1,12 +1,13 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.Utils;
 
 public class AuthMePlayerListener18 implements Listener {
 

src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java

@@ -1,10 +1,5 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.settings.Messages;
-import fr.xephi.authme.settings.Settings;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -12,6 +7,12 @@ import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.event.server.ServerListPingEvent;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.Utils;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+
 public class AuthMeServerListener implements Listener {
 
     public AuthMe plugin;

src/main/java/fr/xephi/authme/modules/ModuleManager.java

@@ -1,9 +1,5 @@
 package fr.xephi.authme.modules;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.settings.Settings;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -15,6 +11,10 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.settings.Settings;
+
 public class ModuleManager {
 
     private List<Module> modules = new ArrayList<>();

src/main/java/fr/xephi/authme/plugin/manager/BungeeCordMessage.java

@@ -1,10 +1,12 @@
 package fr.xephi.authme.plugin.manager;
 
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.messaging.PluginMessageListener;
+
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
+
 import fr.xephi.authme.AuthMe;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.PluginMessageListener;
 
 public class BungeeCordMessage implements PluginMessageListener {
 

src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java

@@ -1,5 +1,16 @@
 package fr.xephi.authme.process.join;
 
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -17,16 +28,6 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.Spawn;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 
 public class AsyncronousJoin {
 

src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java

@@ -1,5 +1,12 @@
 package fr.xephi.authme.process.login;
 
+import java.util.Date;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -14,12 +21,6 @@ import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.util.Date;
-import java.util.List;
 
 public class AsyncronousLogin {
 

src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java

@@ -1,5 +1,13 @@
 package fr.xephi.authme.process.register;
 
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -13,13 +21,6 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 
 public class ProcessSyncronousPasswordRegister implements Runnable {
 

src/main/java/fr/xephi/authme/security/PasswordSecurity.java

@@ -1,18 +1,19 @@
 package fr.xephi.authme.security;
 
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.HashMap;
+
+import org.bukkit.Bukkit;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.events.PasswordEncryptionEvent;
 import fr.xephi.authme.security.crypts.BCRYPT;
 import fr.xephi.authme.security.crypts.EncryptionMethod;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.HashMap;
 
 public class PasswordSecurity {
 

src/main/java/fr/xephi/authme/security/crypts/CryptPBKDF2Django.java

@@ -1,11 +1,12 @@
 package fr.xephi.authme.security.crypts;
 
+import java.security.NoSuchAlgorithmException;
+
+import javax.xml.bind.DatatypeConverter;
+
 import fr.xephi.authme.security.pbkdf2.PBKDF2Engine;
 import fr.xephi.authme.security.pbkdf2.PBKDF2Parameters;
 
-import javax.xml.bind.DatatypeConverter;
-import java.security.NoSuchAlgorithmException;
-
 public class CryptPBKDF2Django implements EncryptionMethod {
 
     @Override

src/main/java/fr/xephi/authme/settings/CustomConfiguration.java

@@ -1,10 +1,5 @@
 package fr.xephi.authme.settings;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -12,6 +7,12 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+
 public class CustomConfiguration extends YamlConfiguration {
 
     private File configFile;

src/main/java/fr/xephi/authme/settings/Messages.java

@@ -1,9 +1,11 @@
 package fr.xephi.authme.settings;
 
-import fr.xephi.authme.ConsoleLogger;
-import org.bukkit.command.CommandSender;
 import java.io.File;
 
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.ConsoleLogger;
+
 public class Messages extends CustomConfiguration {
 
     private static Messages singleton = null;

src/main/java/fr/xephi/authme/settings/Settings.java

@@ -1,16 +1,22 @@
 package fr.xephi.authme.settings;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.DataSource.DataSourceType;
 import fr.xephi.authme.security.HashAlgorithm;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 public final class Settings extends YamlConfiguration {
 

src/main/java/fr/xephi/authme/task/ChangePasswordTask.java

@@ -1,5 +1,9 @@
 package fr.xephi.authme.task;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -7,9 +11,6 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.entity.Player;
-
-import java.security.NoSuchAlgorithmException;
 
 public class ChangePasswordTask implements Runnable {
 

src/main/java/fr/xephi/authme/task/MessageTask.java

@@ -1,11 +1,12 @@
 package fr.xephi.authme.task;
 
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.Utils;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
 
 public class MessageTask implements Runnable {