From b8d2d61ec53a86ec33849c1a8b6aa8887d9bba57 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Wed, 27 Jul 2016 09:51:01 +0200
Subject: [PATCH] Revert "Cleanup"

This reverts commit 7fc195336f9afde3f1baf4ca97eb94d4ad02c752.
---
 src/main/java/fr/xephi/authme/AuthMe.java         | 15 +++++++++++++++
 .../fr/xephi/authme/hooks/BungeeCordMessage.java  |  4 ++++
 .../authme/process/join/AsynchronousJoin.java     |  6 +-----
 .../authme/process/register/AsyncRegister.java    |  9 ++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 919b4d62..88972ace 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -635,4 +635,19 @@ public class AuthMe extends JavaPlugin {
         // Handle the command
         return commandHandler.processCommand(sender, commandLabel, args);
     }
+
+    // -------------
+    // Service getters (deprecated)
+    // Use @Inject fields instead
+    // -------------
+
+    /**
+     * @return process manager
+     *
+     * @deprecated should be used in API classes only (temporarily)
+     */
+    @Deprecated
+    public Management getManagement() {
+        return management;
+    }
 }
diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java
index 2e3b600d..62e7396d 100644
--- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java
+++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java
@@ -7,6 +7,7 @@ import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.security.crypts.HashedPassword;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.BukkitService;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
@@ -24,6 +25,9 @@ public class BungeeCordMessage implements PluginMessageListener {
 
     @Inject
     private PlayerCache playerCache;
+    
+    @Inject
+    private Settings settings;
 
     BungeeCordMessage() { }
 
diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
index 8c056445..cbe9bc47 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
@@ -13,7 +13,6 @@ import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.permission.AuthGroupType;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.process.AsynchronousProcess;
-import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.PluginSettings;
@@ -67,9 +66,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
     @Inject
     private PlayerDataTaskManager playerDataTaskManager;
 
-    @Inject
-    private Management management;
-
     AsynchronousJoin() {
     }
 
@@ -142,7 +138,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
                 playerCache.removePlayer(name);
                 if (auth != null && auth.getIp().equals(ip)) {
                     service.send(player, MessageKey.SESSION_RECONNECTION);
-                    management.performLogin(player, "dontneed", true);
+                    plugin.getManagement().performLogin(player, "dontneed", true);
                     return;
                 } else if (service.getProperty(PluginSettings.SESSIONS_EXPIRE_ON_IP_CHANGE)) {
                     service.send(player, MessageKey.SESSION_EXPIRED);
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index 17b49140..056ae36c 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -8,7 +8,6 @@ import fr.xephi.authme.mail.SendMailSSL;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.process.AsynchronousProcess;
-import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.process.SyncProcessManager;
 import fr.xephi.authme.security.HashAlgorithm;
@@ -33,6 +32,9 @@ import static fr.xephi.authme.permission.PlayerStatePermission.ALLOW_MULTIPLE_AC
 
 public class AsyncRegister implements AsynchronousProcess {
 
+    @Inject
+    private AuthMe plugin;
+
     @Inject
     private DataSource database;
 
@@ -57,9 +59,6 @@ public class AsyncRegister implements AsynchronousProcess {
     @Inject
     private SendMailSSL sendMailSsl;
 
-    @Inject
-    private Management management;
-
     AsyncRegister() { }
 
     private boolean preRegisterCheck(Player player, String password) {
@@ -164,7 +163,7 @@ public class AsyncRegister implements AsynchronousProcess {
         }
 
         if (!service.getProperty(RegistrationSettings.FORCE_LOGIN_AFTER_REGISTER) && autoLogin) {
-            management.performLogin(player, "dontneed", true);
+            plugin.getManagement().performLogin(player, "dontneed", true);
         }
         syncProcessManager.processSyncPasswordRegister(player);