Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite

Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
	src/main/java/fr/xephi/authme/settings/Settings.java
	src/main/java/fr/xephi/authme/settings/custom/NewSetting.java

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

@@ -33,8 +33,7 @@ public class RoyalAuthConverter implements Converter {
                 PlayerAuth auth = new PlayerAuth(name, ra.getHash(), "127.0.0.1", ra.getLastLogin(), "your@email.com", o.getName());
                 data.saveAuth(auth);
             } catch (Exception e) {
-                ConsoleLogger.writeStackTrace(e);
-                ConsoleLogger.showError("Error while trying to import " + o.getName() + " RoyalAuth datas");
+                ConsoleLogger.logException("Error while trying to import " + o.getName() + " RoyalAuth data", e);
             }
         }
     }

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

@@ -8,6 +8,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Scanner;
 import java.util.UUID;
 
@@ -27,7 +28,7 @@ class vAuthFileReader {
     }
 
     public void convert() {
-        final File file = new File(plugin.getDataFolder().getParent() + "" + File.separator + "vAuth" + File.separator + "passwords.yml");
+        final File file = new File(plugin.getDataFolder().getParent() + File.separator + "vAuth" + File.separator + "passwords.yml");
         Scanner scanner;
         try {
             scanner = new Scanner(file);
@@ -52,8 +53,8 @@ class vAuthFileReader {
                 database.saveAuth(auth);
             }
             scanner.close();
-        } catch (Exception e) {
-            ConsoleLogger.writeStackTrace(e);
+        } catch (IOException e) {
+            ConsoleLogger.logException("Error while trying to import some vAuth data", e);
         }
 
     }
@@ -63,12 +64,10 @@ class vAuthFileReader {
     }
 
     private String getName(UUID uuid) {
-        try {
-            for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
-                if (op.getUniqueId().compareTo(uuid) == 0)
-                    return op.getName();
+        for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
+            if (op.getUniqueId().compareTo(uuid) == 0) {
+                return op.getName();
             }
-        } catch (Exception ignored) {
         }
         return null;
     }