Fix the instance of database

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

@@ -5,6 +5,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+
 import org.bukkit.command.CommandSender;
 
 import fr.xephi.authme.AuthMe;
@@ -23,10 +24,9 @@ public class CrazyLoginConverter implements Converter {
     public DataSource database;
     public CommandSender sender;
 
-    public CrazyLoginConverter(AuthMe instance, DataSource database,
-            CommandSender sender) {
+    public CrazyLoginConverter(AuthMe instance, CommandSender sender) {
         this.instance = instance;
-        this.database = database;
+        this.database = instance.database;
         this.sender = sender;
     }
 

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

@@ -29,10 +29,9 @@ public class RakamakConverter implements Converter {
     public DataSource database;
     public CommandSender sender;
 
-    public RakamakConverter(AuthMe instance, DataSource database,
-            CommandSender sender) {
+    public RakamakConverter(AuthMe instance, CommandSender sender) {
         this.instance = instance;
-        this.database = database;
+        this.database = instance.database;
         this.sender = sender;
     }
 

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

@@ -17,9 +17,9 @@ public class SqlToFlat implements Converter {
     public DataSource database;
     public CommandSender sender;
 
-    public SqlToFlat(AuthMe plugin, DataSource database, CommandSender sender) {
+    public SqlToFlat(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
-        this.database = database;
+        this.database = plugin.database;
         this.sender = sender;
     }
 

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

@@ -12,17 +12,16 @@ public class vAuthConverter implements Converter {
     public DataSource database;
     public CommandSender sender;
 
-    public vAuthConverter(AuthMe plugin, DataSource database,
-            CommandSender sender) {
+    public vAuthConverter(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
-        this.database = database;
+        this.database = plugin.database;
         this.sender = sender;
     }
 
     @Override
     public void run() {
         try {
-            new vAuthFileReader(plugin, database, sender).convert();
+            new vAuthFileReader(plugin, sender).convert();
         } catch (Exception e) {
             sender.sendMessage(e.getMessage());
             ConsoleLogger.showError(e.getMessage());

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

@@ -19,10 +19,9 @@ public class vAuthFileReader {
     public DataSource database;
     public CommandSender sender;
 
-    public vAuthFileReader(AuthMe plugin, DataSource database,
-            CommandSender sender) {
+    public vAuthFileReader(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
-        this.database = database;
+        this.database = plugin.database;
         this.sender = sender;
     }
 

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

@@ -3,18 +3,14 @@ package fr.xephi.authme.converter;
 import org.bukkit.command.CommandSender;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.datasource.DataSource;
 
 public class xAuthConverter implements Converter {
 
     public AuthMe plugin;
-    public DataSource database;
     public CommandSender sender;
 
-    public xAuthConverter(AuthMe plugin, DataSource database,
-            CommandSender sender) {
+    public xAuthConverter(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
-        this.database = database;
         this.sender = sender;
     }
 
@@ -22,7 +18,7 @@ public class xAuthConverter implements Converter {
     public void run() {
         try {
             Class.forName("de.luricos.bukkit.xAuth.xAuth");
-            xAuthToFlat converter = new xAuthToFlat(plugin, database, sender);
+            xAuthToFlat converter = new xAuthToFlat(plugin, sender);
             converter.convert();
         } catch (ClassNotFoundException ce) {
             sender.sendMessage("xAuth has not been found, please put xAuth.jar in your plugin folder and restart!");

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

@@ -23,10 +23,9 @@ public class xAuthToFlat {
     public DataSource database;
     public CommandSender sender;
 
-    public xAuthToFlat(AuthMe instance, DataSource database,
-            CommandSender sender) {
+    public xAuthToFlat(AuthMe instance, CommandSender sender) {
         this.instance = instance;
-        this.database = database;
+        this.database = instance.database;
         this.sender = sender;
     }