diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 88972ace..919b4d62 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -635,19 +635,4 @@ 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 62e7396d..2e3b600d 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -7,7 +7,6 @@ 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; @@ -25,9 +24,6 @@ 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 cbe9bc47..8c056445 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -13,6 +13,7 @@ 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; @@ -66,6 +67,9 @@ public class AsynchronousJoin implements AsynchronousProcess { @Inject private PlayerDataTaskManager playerDataTaskManager; + @Inject + private Management management; + AsynchronousJoin() { } @@ -138,7 +142,7 @@ public class AsynchronousJoin implements AsynchronousProcess { playerCache.removePlayer(name); if (auth != null && auth.getIp().equals(ip)) { service.send(player, MessageKey.SESSION_RECONNECTION); - plugin.getManagement().performLogin(player, "dontneed", true); + management.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 056ae36c..17b49140 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -8,6 +8,7 @@ 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; @@ -32,9 +33,6 @@ import static fr.xephi.authme.permission.PlayerStatePermission.ALLOW_MULTIPLE_AC public class AsyncRegister implements AsynchronousProcess { - @Inject - private AuthMe plugin; - @Inject private DataSource database; @@ -59,6 +57,9 @@ public class AsyncRegister implements AsynchronousProcess { @Inject private SendMailSSL sendMailSsl; + @Inject + private Management management; + AsyncRegister() { } private boolean preRegisterCheck(Player player, String password) { @@ -163,7 +164,7 @@ public class AsyncRegister implements AsynchronousProcess { } if (!service.getProperty(RegistrationSettings.FORCE_LOGIN_AFTER_REGISTER) && autoLogin) { - plugin.getManagement().performLogin(player, "dontneed", true); + management.performLogin(player, "dontneed", true); } syncProcessManager.processSyncPasswordRegister(player);