From fcc34c28aa0cfeb7c8872a9861e2d32b8b72d9ab Mon Sep 17 00:00:00 2001
From: HaHaWTH <id_cn00@outlook.com>
Date: Sat, 11 Nov 2023 10:00:27 +0800
Subject: [PATCH] Migrate to @Inject

---
 src/main/java/fr/xephi/authme/AuthMe.java            |  9 ++++++---
 .../authme/listener/BedrockAutoLoginListener.java    | 12 ++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 6d7d982f..0077079e 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -231,9 +231,9 @@ public class AuthMe extends JavaPlugin {
         if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND) || settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
             getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this);
         }
-        if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().getPlugin("floodgate") != null) {
-            getServer().getPluginManager().registerEvents(new BedrockAutoLoginListener((Plugin) this), this);
-        }
+//        if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().getPlugin("floodgate") != null) {
+//            getServer().getPluginManager().registerEvents(new BedrockAutoLoginListener((Plugin) this), this);
+//        }
 //        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
 //            getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this);
 //            logger.info("(Beta)GUICaptcha is enabled successfully!");
@@ -344,6 +344,9 @@ public class AuthMe extends JavaPlugin {
         } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
             logger.warning("ProtocolLib is not loaded, can't enable GUI Captcha.");
         }
+        if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().getPlugin("floodgate") != null) {
+            pluginManager.registerEvents(injector.getSingleton(BedrockAutoLoginListener.class), this);
+        }
 
 
         // Try to register 1.8+ player listeners
diff --git a/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java b/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java
index 177602d3..e711f839 100644
--- a/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java
+++ b/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java
@@ -3,6 +3,7 @@ package fr.xephi.authme.listener;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.bukkit.entity.Player;
@@ -10,18 +11,21 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.plugin.Plugin;
 
+import javax.inject.Inject;
 import java.util.UUID;
 
 import static org.bukkit.Bukkit.getServer;
 
 public class BedrockAutoLoginListener implements Listener {
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-    private final Plugin plugin;
+    @Inject
+    private BukkitService bukkitService;
+    @Inject
+    private AuthMe plugin;
 
-    public BedrockAutoLoginListener(Plugin plugin) {
-        this.plugin = plugin;
+
+    public BedrockAutoLoginListener() {
     }
 
     private boolean isBedrockPlayer(UUID uuid) {