Stuff from the common floobits workspace

Author: AuthMe-Team <AuthMeTeam@123NoEmail.com>
2015-11-23 20:20:42 +01:00
parent 69a09aec17
commit 9ec2d6d059
169 changed files with 5161 additions and 4806 deletions
@@ -1,17 +1,16 @@
 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
@@ -25,8 +24,9 @@ public class CrazyLoginConverter implements Converter {

    /**
     * Constructor for CrazyLoginConverter.
+     *
     * @param instance AuthMe
-     * @param sender CommandSender
+     * @param sender   CommandSender
     */
    public CrazyLoginConverter(AuthMe instance, CommandSender sender) {
        this.instance = instance;
@@ -36,14 +36,16 @@ public class CrazyLoginConverter implements Converter {

    /**
     * Method getInstance.
-    
-     * @return CrazyLoginConverter */
+     *
+     * @return CrazyLoginConverter
+     */
    public CrazyLoginConverter getInstance() {
        return this;
    }

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,16 +1,11 @@
 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
 * @version $Revision: 1.0 $
@@ -47,6 +42,7 @@ public class FlatToSql implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,20 +1,14 @@
 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.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;
+import java.sql.*;

 /**
 */
@@ -34,8 +28,10 @@ public class FlatToSqlite implements Converter {
    private String database;
    private String columnID;
    private Connection con;
+
    /**
     * Constructor for FlatToSqlite.
+     *
     * @param sender CommandSender
     */
    public FlatToSqlite(CommandSender sender) {
@@ -44,6 +40,7 @@ public class FlatToSqlite implements Converter {

    /**
     * Method close.
+     *
     * @param o AutoCloseable
     */
    private static void close(AutoCloseable o) {
@@ -58,6 +55,7 @@ public class FlatToSqlite implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -121,9 +119,9 @@ public class FlatToSqlite implements Converter {

    /**
     * Method connect.
-    
-    
-     * @throws ClassNotFoundException * @throws SQLException */
+     *
+     * @throws ClassNotFoundException * @throws SQLException
+     */
    private synchronized void connect() throws ClassNotFoundException, SQLException {
        Class.forName("org.sqlite.JDBC");
        con = DriverManager.getConnection("jdbc:sqlite:plugins/AuthMe/" + database + ".db");
@@ -131,8 +129,9 @@ public class FlatToSqlite implements Converter {

    /**
     * Method setup.
-    
-     * @throws SQLException */
+     *
+     * @throws SQLException
+     */
    private synchronized void setup() throws SQLException {
        Statement st = null;
        ResultSet rs = null;
@@ -178,9 +177,10 @@ public class FlatToSqlite implements Converter {

    /**
     * Method saveAuth.
+     *
     * @param s String
-    
-     * @return boolean */
+     * @return boolean
+     */
    private synchronized boolean saveAuth(String s) {
        PreparedStatement pst = null;
        try {
@@ -12,9 +12,11 @@ import fr.xephi.authme.settings.Settings;
 public class ForceFlatToSqlite implements Converter {

    private DataSource data;
+
    /**
     * Constructor for ForceFlatToSqlite.
-     * @param data DataSource
+     *
+     * @param data   DataSource
     * @param plugin AuthMe
     */
    public ForceFlatToSqlite(DataSource data, AuthMe plugin) {
@@ -23,6 +25,7 @@ public class ForceFlatToSqlite implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,15 +1,5 @@
 package fr.xephi.authme.converter;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-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;
@@ -17,6 +7,15 @@ 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;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map.Entry;

 /**
 * @author Xephi59
@@ -30,8 +29,9 @@ public class RakamakConverter implements Converter {

    /**
     * Constructor for RakamakConverter.
+     *
     * @param instance AuthMe
-     * @param sender CommandSender
+     * @param sender   CommandSender
     */
    public RakamakConverter(AuthMe instance, CommandSender sender) {
        this.instance = instance;
@@ -41,14 +41,16 @@ public class RakamakConverter implements Converter {

    /**
     * Method getInstance.
-    
-     * @return RakamakConverter */
+     *
+     * @return RakamakConverter
+     */
    public RakamakConverter getInstance() {
        return this;
    }

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,13 +1,12 @@
 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;

 /**
 */
@@ -18,6 +17,7 @@ public class RoyalAuthConverter implements Converter {

    /**
     * Constructor for RoyalAuthConverter.
+     *
     * @param plugin AuthMe
     */
    public RoyalAuthConverter(AuthMe plugin) {
@@ -27,6 +27,7 @@ public class RoyalAuthConverter implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,15 +1,16 @@
 package fr.xephi.authme.converter;

-import java.io.File;
-
 import fr.xephi.authme.settings.CustomConfiguration;

+import java.io.File;
+
 /**
 */
 public class RoyalAuthYamlReader extends CustomConfiguration {

    /**
     * Constructor for RoyalAuthYamlReader.
+     *
     * @param file File
     */
    public RoyalAuthYamlReader(File file) {
@@ -20,16 +21,18 @@ public class RoyalAuthYamlReader extends CustomConfiguration {

    /**
     * Method getLastLogin.
-    
-     * @return long */
+     *
+     * @return long
+     */
    public long getLastLogin() {
        return getLong("timestamps.quit");
    }

    /**
     * Method getHash.
-    
-     * @return String */
+     *
+     * @return String
+     */
    public String getHash() {
        return getString("login.password");
    }
@@ -1,15 +1,14 @@
 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;

 /**
 */
@@ -21,6 +20,7 @@ public class SqlToFlat implements Converter {

    /**
     * Constructor for SqlToFlat.
+     *
     * @param plugin AuthMe
     * @param sender CommandSender
     */
@@ -32,6 +32,7 @@ public class SqlToFlat implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,10 +1,9 @@
 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;

 /**
 */
@@ -16,6 +15,7 @@ public class vAuthConverter implements Converter {

    /**
     * Constructor for vAuthConverter.
+     *
     * @param plugin AuthMe
     * @param sender CommandSender
     */
@@ -27,6 +27,7 @@ public class vAuthConverter implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,18 +1,17 @@
 package fr.xephi.authme.converter;

-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;
+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;

 /**
 */
@@ -24,6 +23,7 @@ public class vAuthFileReader {

    /**
     * Constructor for vAuthFileReader.
+     *
     * @param plugin AuthMe
     * @param sender CommandSender
     */
@@ -35,8 +35,9 @@ public class vAuthFileReader {

    /**
     * Method convert.
-    
-     * @throws IOException */
+     *
+     * @throws IOException
+     */
    public void convert() throws IOException {
        final File file = new File(plugin.getDataFolder().getParent() + "" + File.separator + "vAuth" + File.separator + "passwords.yml");
        Scanner scanner;
@@ -70,9 +71,10 @@ public class vAuthFileReader {

    /**
     * Method isUUIDinstance.
+     *
     * @param s String
-    
-     * @return boolean */
+     * @return boolean
+     */
    private boolean isUUIDinstance(String s) {
        if (String.valueOf(s.charAt(8)).equalsIgnoreCase("-"))
            return true;
@@ -81,9 +83,10 @@ public class vAuthFileReader {

    /**
     * Method getName.
+     *
     * @param uuid UUID
-    
-     * @return String */
+     * @return String
+     */
    private String getName(UUID uuid) {
        try {
            for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
@@ -1,8 +1,7 @@
 package fr.xephi.authme.converter;

-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
+import org.bukkit.command.CommandSender;

 /**
 */
@@ -13,6 +12,7 @@ public class xAuthConverter implements Converter {

    /**
     * Constructor for xAuthConverter.
+     *
     * @param plugin AuthMe
     * @param sender CommandSender
     */
@@ -23,6 +23,7 @@ public class xAuthConverter implements Converter {

    /**
     * Method run.
+     *
     * @see java.lang.Runnable#run()
     */
    @Override
@@ -1,5 +1,13 @@
 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;
@@ -8,15 +16,6 @@ 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 {
@@ -27,8 +26,9 @@ public class xAuthToFlat {

    /**
     * Constructor for xAuthToFlat.
+     *
     * @param instance AuthMe
-     * @param sender CommandSender
+     * @param sender   CommandSender
     */
    public xAuthToFlat(AuthMe instance, CommandSender sender) {
        this.instance = instance;
@@ -38,8 +38,9 @@ public class xAuthToFlat {

    /**
     * Method convert.
-    
-     * @return boolean */
+     *
+     * @return boolean
+     */
    public boolean convert() {
        if (instance.getServer().getPluginManager().getPlugin("xAuth") == null) {
            sender.sendMessage("[AuthMe] xAuth plugin not found");
@@ -72,9 +73,10 @@ public class xAuthToFlat {

    /**
     * Method getIdPlayer.
+     *
     * @param id int
-    
-     * @return String */
+     * @return String
+     */
    public String getIdPlayer(int id) {
        String realPass = "";
        Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();
@@ -99,8 +101,9 @@ public class xAuthToFlat {

    /**
     * Method getXAuthPlayers.
-    
-     * @return List<Integer> */
+     *
+     * @return List<Integer>
+     */
    public List<Integer> getXAuthPlayers() {
        List<Integer> xP = new ArrayList<>();
        Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();
@@ -124,9 +127,10 @@ public class xAuthToFlat {

    /**
     * Method getPassword.
+     *
     * @param accountId int
-    
-     * @return String */
+     * @return String
+     */
    public String getPassword(int accountId) {
        String realPass = "";
        Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();