Localized GUI Captcha

Bump org.xerial:sqlite-jdbc from 3.43.2.1 to 3.43.2.2

.github/workflows/maven-publish.yml

@@ -1,34 +0,0 @@
-# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
-
-name: Maven Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
-      env:
-        GITHUB_TOKEN: ${{ github.token }}

.github/workflows/maven.yml

@@ -21,4 +21,3 @@ jobs:
         cache: 'maven'
     - name: 使用Maven构建
       run: mvn -V -B clean package --file pom.xml
-      

.gitignore

@@ -21,10 +21,11 @@ hs_err_pid*
 
 # Ignore IDEA directory
 .idea/*
+.idea/
+
 
 # Include the project's code style settings file
-!.idea/codeStyleSettings.xml
-/target/class/
+
 # File-based project format:
 *.ipr
 *.iws

.idea/.gitignore

@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml

README.md

@@ -1,4 +1,21 @@
 # AuthMeReReloaded
 **"A fork of the best authentication plugin for the Bukkit modding API!"**
-
+MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471495)
 ![Graph](https://bstats.org/signatures/bukkit/AuthMeReloaded-Fork.svg)
+
+**Detailed Changes:**
+ 1. Improved mail sending logic & support more emails
+ 2. Shutdown mail sending(When server is closed, email you)
+ 3. Old bug fixes
+ 4. Anti Ghost Player(Doubled login bug)
+ 5. Use the best performance method by server brand
+ 6. Bedrock Compatibility(Floodgate needed)(based on UUID)
+ 7. Update checker
+ 8. Integrated GUI Captcha feature(Bedrock compatibility & ProtocolLib needed)(70% Asynchronous)
+ 9. Improved listeners
+ 10. Player login logic improvement to reduce lag
+ 11. Automatically purge bot data
+ 12. Folia compatibility [Here](https://github.com/HaHaWTH/AuthMeReReloaded/releases/download/b20/AuthMe-5.6.0-FORK-Folia.jar)
+ 13. Offhand Menu compatibility(Thats amazing)
+ 14. Automatically fix portal stuck issue
+ 15. More......

pom.xml

@@ -67,11 +67,11 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.19.2-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.2-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
-        <project.buildNumber>CUSTOM</project.buildNumber>
+        <project.buildNumber>28</project.buildNumber>
         <project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
         <project.finalNameBase>${project.outputName}-${project.version}</project.finalNameBase>
 
@@ -217,7 +217,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.8</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -608,6 +608,16 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>jitpack</id>
+            <url>https://jitpack.io/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -616,7 +626,7 @@
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>api</artifactId>
             <version>2.2.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <!-- Jalu Injector -->
         <dependency>
@@ -690,7 +700,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.9</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
+            <version>2.0.5</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
             <optional>true</optional>
         </dependency>
 
@@ -706,13 +716,13 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>8.1.0</version>
+            <version>8.0.33</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.2.0</version>
+            <version>3.1.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -774,13 +784,11 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Bukkit Libraries  -->
-
         <!-- ConfigMe -->
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>configme</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -790,7 +798,7 @@
             </exclusions>
         </dependency>
 
-        <!-- bStats metrics -->
+        <!-- bStats metrics  -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
@@ -802,7 +810,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -1017,7 +1025,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.6.0</version>
+            <version>42.5.4</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1047,7 +1055,7 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
-            <version>5.4.0</version>
+            <version>5.2.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>hamcrest-core</artifactId>
@@ -1060,7 +1068,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.37.0</version>
+            <version>3.40.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -1068,13 +1076,13 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.42.0.1</version>
+            <version>3.43.2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.2.220</version>
+            <version>2.1.214</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/fr/xephi/authme/AuthMe.java

@@ -2,37 +2,26 @@ package fr.xephi.authme;
 
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
-import com.google.gson.annotations.Since;
 import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.DataSourceProvider;
 import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
 import fr.xephi.authme.initialization.OnStartupTasks;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import fr.xephi.authme.initialization.SettingsProvider;
 import fr.xephi.authme.initialization.TaskCloser;
+import fr.xephi.authme.listener.BedrockAutoLoginListener;
 import fr.xephi.authme.listener.BlockListener;
+import fr.xephi.authme.listener.DoubleLoginFixListener;
 import fr.xephi.authme.listener.EntityListener;
+import fr.xephi.authme.listener.GuiCaptchaHandler;
+import fr.xephi.authme.listener.LoginLocationFixListener;
 import fr.xephi.authme.listener.PlayerListener;
 import fr.xephi.authme.listener.PlayerListener111;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.PlayerListener19Spigot;
-import fr.xephi.authme.listener.PlayerQuitListener;
-import fr.xephi.authme.listener.RegisterListener;
+import fr.xephi.authme.listener.PlayerListenerHigherThan18;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
@@ -45,40 +34,35 @@ import fr.xephi.authme.service.yaml.YamlParseException;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsWarner;
 import fr.xephi.authme.settings.properties.EmailSettings;
-import fr.xephi.authme.settings.properties.RegistrationSettings;
+import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.task.CleanupTask;
 import fr.xephi.authme.task.purge.PurgeService;
 import fr.xephi.authme.util.ExceptionUtils;
-import fr.xephi.authme.util.TeleportUtils;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.jetbrains.annotations.NotNull;
-import fr.xephi.authme.listener.PlayerQuitListener;
+
 import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 import java.util.Scanner;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 
 import static fr.xephi.authme.service.BukkitService.TICKS_PER_MINUTE;
 import static fr.xephi.authme.util.Utils.isClassLoaded;
-import static org.bukkit.Bukkit.getServer;
-import static org.bukkit.Bukkit.isHardcore;
 
 /**
  * The AuthMe main class.
@@ -93,26 +77,25 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "17";
+    private static String pluginBuildNumber = "31";
     protected final Boolean SHAEnabled = false;
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
     @Inject
-    private Settings settings;
+    public static Settings settings;
     private DataSource database;
     private BukkitService bukkitService;
     private Injector injector;
     private BackupService backupService;
-    private ConsoleLogger logger;
-
+    public static ConsoleLogger logger;
     /**
      * Constructor.
      */
     public AuthMe() {
     }
-    public static Boolean SATEnabled = false;
-    public static Boolean GUIEnabled = false;
+
+
     /**
      * Get the plugin's name.
      *
@@ -141,33 +124,34 @@ public class AuthMe extends JavaPlugin {
     }
 
 
+
     /**
      * Method called when the server enables the plugin.
      */
     @Override
     public void onEnable() {
-        AuthMe.GUIEnabled = false;
-        AuthMe.SATEnabled = false;
         // Load the plugin version data from the plugin description file
         loadPluginInfo(getDescription().getVersion());
 
         // Set the Logger instance and log file path
         ConsoleLogger.initialize(getLogger(), new File(getDataFolder(), LOG_FILENAME));
         logger = ConsoleLoggerFactory.get(AuthMe.class);
-        logger.info("您正在加载的是由第三方Fork并修复众多错误的 AuthMeReReloaded!");
+        logger.info("You are running an unofficial fork version of AuthMe!");
+
 
         // Check server version
         if (!isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")
             || !isClassLoaded("org.bukkit.event.player.PlayerInteractAtEntityEvent")) {
-            logger.warning("你正在运行不受支持的服务器版本 (" + getServerNameVersionSafe() + "). "
-                + "AuthMe 仅支持Spigot 1.9及之后的版本!");
+            logger.warning("You are running an unsupported server version (" + getServerNameVersionSafe() + "). "
+                + "AuthMe requires Spigot 1.8.X or later!");
             stopOrUnload();
             return;
         }
+
         // Prevent running AuthMeBridge due to major exploit issues
         if (getServer().getPluginManager().isPluginEnabled("AuthMeBridge")) {
-            logger.warning("检测到 AuthMeBridge被加载, 对AuthMeBridge的支持已经停止 "
-                + "且可能会造成严重漏洞! 已中止加载!");
+            logger.warning("Detected AuthMeBridge, support for it has been dropped as it was "
+                + "causing exploit issues, please use AuthMeBungee instead! Aborting!");
             stopOrUnload();
             return;
         }
@@ -178,11 +162,11 @@ public class AuthMe extends JavaPlugin {
         } catch (Throwable th) {
             YamlParseException yamlParseException = ExceptionUtils.findThrowableInCause(YamlParseException.class, th);
             if (yamlParseException == null) {
-                logger.logException("已中止AuthMeReReloaded的初始化,原因:", th);
+                logger.logException("Aborting initialization of AuthMe:", th);
                 th.printStackTrace();
             } else {
-                logger.logException("文件 '" + yamlParseException.getFile() + "' 包含YAML语法错误. "
-                    + "请尝试在 https://yamllint.com 中运行文件内容", yamlParseException);
+                logger.logException("File '" + yamlParseException.getFile() + "' contains invalid YAML. "
+                    + "Please run its contents through http://yamllint.com", yamlParseException);
             }
             stopOrUnload();
             return;
@@ -199,39 +183,65 @@ public class AuthMe extends JavaPlugin {
 
         // Set up Metrics
         OnStartupTasks.sendMetrics(this, settings);
-
+        if(settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
+            String loadColorConfig = settings.getProperty(SecuritySettings.STARTUP_BANNER_COLOR);
+            if (loadColorConfig.startsWith("§")) {
+                logger.info("\n" + loadColorConfig + "    ___         __  __    __  ___   \n" +
+                    loadColorConfig + "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
+                    loadColorConfig + "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
+                    loadColorConfig + " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                    loadColorConfig + "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                    loadColorConfig + "                                    ");
+            }else {
+                logger.info("\n"+"    ___         __  __    __  ___   \n" +
+                    "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
+                    "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
+                    " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                    "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                    "                                    ");
+            }
+        }
         // Successful message
-        logger.info("AuthMeReReloaded 已成功启动!");
+        //detect server brand with classloader
+        checkServerType();
+        logger.info("AuthMeReReloaded is enabled successfully!");
         // Purge on start if enabled
         PurgeService purgeService = injector.getSingleton(PurgeService.class);
         purgeService.runAutoPurge();
-        // 注册玩家退出事件监听
-        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS) || settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)/* || settings.getProperty(SecuritySettings.GUI_CAPTCHA)*/) {
-            if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
-                getServer().getPluginManager().registerEvents(new PlayerQuitListener((Plugin) this), this);
-            }
-            if (settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
-                logger.info("(RC2)SmartAsyncTeleport功能已注册");
-                AuthMe.SATEnabled = true;
-            }
-            if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-                getServer().getPluginManager().registerEvents(new RegisterListener((Plugin) this), this);
-                logger.info("(RC2)GUI验证码功能已注册");
-                AuthMe.GUIEnabled = true;
-            } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && !getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-                logger.warning("ProtocolLib未加载,GUI验证码功能无法使用");
-            }
-            logger.info("以上功能尚在测试中,如有问题请反馈,如需关闭请前往config.yml修改");
-            logger.info("反馈地址: github.com/HaHaWTH/AuthMeReReloaded/issues");
-        }
+        // 注册玩家加入事件监听
+//        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS) || settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)/* || settings.getProperty(SecuritySettings.GUI_CAPTCHA)*/) {
+        register3rdPartyListeners();
+        logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/");
+
         if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) {
             checkForUpdates();
         }
-        if (SHAEnabled){
+
+        if (SHAEnabled) {
             //shaChecker();
         }
     }
+
     public File pluginfile = getFile();
+
+    private void register3rdPartyListeners() {
+        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
+            getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this);
+        }
+        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.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+//            getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this);
+//            logger.info("(Beta)GUICaptcha is enabled successfully!");
+//            logger.info("These features are still in early development, if you encountered any problem, please report.");
+//        } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
+//            logger.warning("ProtocolLib is not loaded, can't enable GUI Captcha.");
+//        }
+    }
     /**
      * Load the version and build number of the plugin from the description file.
      *
@@ -326,11 +336,31 @@ public class AuthMe extends JavaPlugin {
         pluginManager.registerEvents(injector.getSingleton(EntityListener.class), this);
         pluginManager.registerEvents(injector.getSingleton(ServerListener.class), this);
 
-        // Try to register 1.9 player listeners
-        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+        //Register 3rd party listeners
+        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+            pluginManager.registerEvents(injector.getSingleton(GuiCaptchaHandler.class), this);
+            logger.info("(Beta)GUICaptcha is enabled successfully!");
+            logger.info("These features are still in early development, if you encountered any problem, please report.");
+        } 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
+        if (isClassLoaded("org.bukkit.event.entity.EntityPickupItemEvent") && isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+            pluginManager.registerEvents(injector.getSingleton(PlayerListenerHigherThan18.class), this);
+        } else if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
         }
 
+        // Try to register 1.9 player listeners(Moved to else-if)
+//        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+//            pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
+//        }
+
         // Try to register 1.9 spigot player listeners
         if (isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19Spigot.class), this);
@@ -365,7 +395,7 @@ public class AuthMe extends JavaPlugin {
             onShutdownPlayerSaver.saveAllPlayers();
         }
         if (settings.getProperty(EmailSettings.SHUTDOWN_MAIL)){
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'.'MM'.'dd'.' HH:mm:ss");
             Date date = new Date(System.currentTimeMillis());
             emailService.sendShutDown(settings.getProperty(EmailSettings.SHUTDOWN_MAIL_ADDRESS),dateFormat.format(date));
         }
@@ -380,18 +410,20 @@ public class AuthMe extends JavaPlugin {
 
         // Disabled correctly
         Consumer<String> infoLogMethod = logger == null ? getLogger()::info : logger::info;
-        infoLogMethod.accept("AuthMe " + this.getDescription().getVersion() + " 已卸载!");
+        HandlerList.unregisterAll(this);
+        infoLogMethod.accept("AuthMe " + this.getDescription().getVersion() + " is unloaded successfully!");
         ConsoleLogger.closeFileWriter();
     }
+
     private static final String owner = "HaHaWTH";
     private static final String owner_gitee = "Shixuehan114514";
     private static final String repo = "AuthMeReReloaded";
+
     private void checkForUpdates() {
-        logger.info("正在检查更新...");
+        logger.info("Checking for updates...");
         Bukkit.getScheduler().runTaskAsynchronously(this, () -> {
             try {
-                // Get the latest version number from GitHub
-
+                // 从南通集线器获取最新版本号
                 URL url = new URL("https://api.github.com/repos/" + owner + "/" + repo + "/releases/latest");
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                 conn.setConnectTimeout(10000); // 设置连接超时为10秒
@@ -400,23 +432,59 @@ public class AuthMe extends JavaPlugin {
                 String response = scanner.useDelimiter("\\Z").next();
                 scanner.close();
 
-                // Parse JSON response and extract version number
+                // 处理JSON响应
                 String latestVersion = response.substring(response.indexOf("tag_name") + 11);
                 latestVersion = latestVersion.substring(0, latestVersion.indexOf("\""));
-                if ((pluginBuild + pluginBuildNumber).equals(latestVersion)) {
-                    getLogger().log(Level.INFO,"当前为最新版本");
-                }
-                if (!(pluginBuild + pluginBuildNumber).equals(latestVersion)) {
-                    // Display update message to users
-                    String message = "有新版本可用! 最新版本:" + latestVersion + " 当前版本:" + pluginBuild + pluginBuildNumber;
+                if (isUpdateAvailable(latestVersion)) {
+                    String message = "New version available! Latest:" + latestVersion + " Current:" + pluginBuild + pluginBuildNumber;
                     getLogger().log(Level.INFO, message);
-                    getLogger().log(Level.INFO,"下载地址:github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
-                }
-            }catch (IOException e) {
-                getLogger().log(Level.WARNING,"从GitHub检查更新时出现错误,原因: " + e.getMessage());
+                    getLogger().log(Level.INFO, "Download from here: github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
+                } else {
+                    getLogger().log(Level.INFO, "You are running the latest version.");
                 }
+            } catch (IOException e) {
+                String formattedException = ExceptionUtils.formatException(e);
+                getLogger().log(Level.WARNING, "Error occurred while checking updates from GitHub. Reason: " + formattedException);
+            }
         });
+    }
+    private boolean isUpdateAvailable(String latestVersion) {
+        // Extract the first character and the remaining digits from the version string
+        char latestChar = latestVersion.charAt(0);
+        int latestNumber = Integer.parseInt(latestVersion.substring(1));
+
+        char currentChar = pluginBuild.charAt(0);
+        int currentNumber = Integer.parseInt(pluginBuildNumber);
+
+        // Compare the characters first
+        if (latestChar > currentChar) {
+            return true;
+        } else if (latestChar < currentChar) {
+            return false;
+        } else {
+            // If the characters are the same, compare the numbers
+            return latestNumber > currentNumber;
         }
+    }
+
+
+    private void checkServerType() {
+        if (isClassLoaded("com.destroystokyo.paper.PaperConfig")) {
+            logger.info("AuthMeReReloaded is running on Paper");
+        }else if (isClassLoaded("catserver.server.CatServerConfig")) {
+            logger.info("AuthMeReReloaded is running on CatServer");
+        } else if (isClassLoaded("org.spigotmc.SpigotConfig")) {
+            logger.info("AuthMeReReloaded is running on Spigot");
+        } else if (isClassLoaded("org.bukkit.craftbukkit.CraftServer")) {
+            logger.info("AuthMeReReloaded is running on Bukkit");
+        } else {
+            logger.info("AuthMeReReloaded is running on Unknown*");
+        }
+    }
+    // 其他方法和事件处理
+
+
+    // 其他方法和事件处理
     private static final String SHA_URL = "https://raw.githubusercontent.com/"+ owner +"/"+ repo + "/master/"+pluginBuild +pluginBuildNumber+ ".sha";
     private static final String ALGORITHM = "SHA-256";
     private static final String PROXY_URL = "https://ghproxy.com/";

src/main/java/fr/xephi/authme/ConsoleLogger.java

@@ -106,7 +106,7 @@ public final class ConsoleLogger {
      */
     public void warning(String message) {
         logger.warning(message);
-        writeLog("[警告] " + message);
+        writeLog("[WARN] " + message);
     }
 
     /**
@@ -128,7 +128,7 @@ public final class ConsoleLogger {
      */
     public void info(String message) {
         logger.info(message);
-        writeLog("[信息] " + message);
+        writeLog("[INFO] " + message);
     }
 
     /**
@@ -142,7 +142,7 @@ public final class ConsoleLogger {
     public void fine(String message) {
         if (logLevel.includes(LogLevel.FINE)) {
             logger.info(message);
-            writeLog("[信息:调试] " + message);
+            writeLog("[INFO:FINE] " + message);
         }
     }
 
@@ -215,7 +215,7 @@ public final class ConsoleLogger {
     }
 
     private void logAndWriteWithDebugPrefix(String message) {
-        String debugMessage = "[信息:调试] " + message;
+        String debugMessage = "[INFO:DEBUG] " + message;
         logger.info(debugMessage);
         writeLog(debugMessage);
     }

src/main/java/fr/xephi/authme/command/PlayerCommand.java

@@ -17,9 +17,9 @@ public abstract class PlayerCommand implements ExecutableCommand {
         } else {
             String alternative = getAlternativeCommand();
             if (alternative != null) {
-                sender.sendMessage("此命令仅限玩家使用!请使用 " + alternative + " .");
+                sender.sendMessage("Player only! Please use " + alternative + " instead.");
             } else {
-                sender.sendMessage("此命令只能被玩家执行.");
+                sender.sendMessage("This command is only for players.");
             }
         }
     }

src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java

@@ -25,7 +25,7 @@ public class FirstSpawnCommand extends PlayerCommand {
             player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
         } else {
             //String name= player.getName();
-            if(AuthMe.SATEnabled) {
+            if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
                 TeleportUtils.teleport(player, spawnLoader.getFirstSpawn());
             } else {
                 player.teleport(spawnLoader.getFirstSpawn());

src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java

@@ -0,0 +1,56 @@
+package fr.xephi.authme.listener;
+/* Inspired by DongShaoNB/BedrockPlayerSupport **/
+
+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;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+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();
+    @Inject
+    private BukkitService bukkitService;
+    @Inject
+    private AuthMe plugin;
+
+
+    public BedrockAutoLoginListener() {
+    }
+
+    private boolean isBedrockPlayer(UUID uuid) {
+        return AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        String name = event.getPlayer().getName();
+        UUID uuid = event.getPlayer().getUniqueId();
+        if (isBedrockPlayer(uuid) && !authmeApi.isAuthenticated(player) && authmeApi.isRegistered(name)) {
+            authmeApi.forceLogin(player);
+            player.sendMessage("§a基岩版自动登录完成!");
+        }
+    }
+
+    /* prevent sending duplicate messages */
+//    @EventHandler(priority = EventPriority.HIGHEST)
+//    public void onPlayerRestoreSession(RestoreSessionEvent event) {
+//        Player player = event.getPlayer();
+//        String name = event.getPlayer().getName();
+//        UUID uuid = event.getPlayer().getUniqueId();
+//        if (isBedrockPlayer(uuid) && !authmeApi.isAuthenticated(player) && authmeApi.isRegistered(name)) {
+//            event.setCancelled(true);
+//        }
+//    }
+}

src/main/java/fr/xephi/authme/listener/DoubleLoginFixListener.java

@@ -0,0 +1,35 @@
+package fr.xephi.authme.listener;
+//Prevent Ghost Players
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.Plugin;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+public class DoubleLoginFixListener implements Listener {
+    private final Plugin plugin;
+
+
+
+    public DoubleLoginFixListener(Plugin plugin) {
+        this.plugin = plugin;
+
+    }
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Collection<? extends Player> PlayerList = Bukkit.getServer().getOnlinePlayers();
+        HashSet<String> PlayerSet = new HashSet<String>();
+        for (Player ep : PlayerList) {
+            if (PlayerSet.contains(ep.getName().toLowerCase())) {
+                ep.kickPlayer("You have been disconnected due to doubled login.");
+                break;
+            }
+            PlayerSet.add(ep.getName().toLowerCase());
+        }
+    }
+}

src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java

@@ -0,0 +1,267 @@
+package fr.xephi.authme.listener;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketEvent;
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.service.CommonService;
+import fr.xephi.authme.settings.properties.HooksSettings;
+import fr.xephi.authme.settings.properties.RestrictionSettings;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+
+import static fr.xephi.authme.util.PlayerUtils.isNpc;
+import static org.bukkit.Bukkit.getLogger;
+import static org.bukkit.Bukkit.getServer;
+
+public class GuiCaptchaHandler implements Listener {
+    //define AuthMeApi
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+    @Inject
+    private BukkitService bukkitService;
+    @Inject
+    private AuthMe plugin;
+    @Inject
+    private Messages messages;
+    @Inject
+    private CommonService service;
+
+    private PacketAdapter chatPacketListener;
+    private PacketAdapter windowPacketListener;
+    //define timesLeft
+    private int timesLeft = 3;
+    //Use ConcurrentHashMap to store player and their close reason
+    /* We used many async tasks so there is concurrent**/
+    public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
+    //define randomStringSet
+    String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
+    String randomString = "";
+    Random randomItemSet = new Random();
+    Random howManyRandom = new Random();
+
+
+    int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+
+    public GuiCaptchaHandler() {
+    }
+
+    private boolean isBedrockPlayer(UUID uuid) {
+        return AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
+    }
+
+    private void removePacketListeners() {
+        ProtocolLibrary.getProtocolManager().removePacketListener(windowPacketListener);
+        ProtocolLibrary.getProtocolManager().removePacketListener(chatPacketListener);
+    }
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        if (event.getWhoClicked() instanceof Player) {
+            Player player = (Player) event.getWhoClicked();
+            ItemStack currentItem = event.getCurrentItem();
+            if (!authmeApi.isRegistered(player.getName()) && !closeReasonMap.containsKey(player)) {
+                if (isBedrockPlayer(player.getUniqueId())) {
+                    return;
+                }
+                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)) {
+                    event.setCancelled(true);
+                    closeReasonMap.put(player, "verified");
+                    player.closeInventory();
+                    messages.send(player, MessageKey.GUI_CAPTCHA_VERIFIED);
+                }
+            }
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        randomString = "";
+        Player playerunreg = event.getPlayer();
+        String name = playerunreg.getName();
+        if (!authmeApi.isRegistered(name) && !isNpc(playerunreg)) {
+            if (isBedrockPlayer(playerunreg.getUniqueId())) {
+                closeReasonMap.put(playerunreg, "verified");
+                messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
+                return;
+            }
+            bukkitService.runTaskAsynchronously(() -> {
+                StringBuilder sb = new StringBuilder();
+                howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+                for (int i = 0; i < howLongIsRandomString; i++) {
+                    //生成随机索引号
+                    int index = randomItemSet.nextInt(randomSet.length());
+
+                    // 从字符串中获取由索引 index 指定的字符
+                    char randomChar = randomSet.charAt(index);
+
+                    // 将字符追加到字符串生成器
+                    sb.append(randomChar);
+                }
+
+                bukkitService.runTask(() -> {
+                    randomString = sb.toString();
+                    Random random_blockpos = new Random();
+                    AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
+                    Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
+                    ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
+                    ItemMeta meta = item.getItemMeta();
+                    try {
+                        if (meta != null) {
+                            meta.setDisplayName(messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_CLICKABLE_NAME, randomString));
+                            item.setItemMeta(meta);
+                        }
+                    } catch (NullPointerException e) {
+                        getLogger().log(Level.WARNING, "Unexpected error occurred while setting item meta.");
+                    }
+                    menu.setItem(random_num.get(), item);
+                    playerunreg.openInventory(menu);
+                    if (AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > 0) {
+                        long timeOut = AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT);
+                        if (AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > AuthMe.settings.getProperty(RestrictionSettings.TIMEOUT)) {
+                            bukkitService.runTask(() -> {
+                                getLogger().warning("AuthMe detected that your GUI captcha timeout seconds(" + AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) + ") is bigger than the Login timeout seconds(" +
+                                    AuthMe.settings.getProperty(RestrictionSettings.TIMEOUT) + "). To prevent issues, we will let the GUI captcha follow the Login timeout seconds, please check and modify your config.");
+                            });
+                            timeOut = AuthMe.settings.getProperty(RestrictionSettings.TIMEOUT);
+                        }
+                        long finalTimeOut = timeOut;
+                        bukkitService.runTask(() -> {
+                            bukkitService.runTaskLater(() -> {
+                                if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_TIMEOUT));
+                                    timesLeft = 3; // Reset the attempt counter
+                                }
+                            }, finalTimeOut * 20L);
+                        });
+                    }
+
+                    bukkitService.runTask(() -> {
+                        windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
+                            @Override
+                            public void onPacketReceiving(PacketEvent event) {
+                                if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    if (timesLeft <= 0) {
+                                        bukkitService.runTask(() -> {
+                                            playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_FAILED));
+                                        });
+                                        timesLeft = 3;
+                                    } else {
+                                        --timesLeft;
+                                        if (timesLeft <= 0) {
+                                            bukkitService.runTask(() -> {
+                                                playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_FAILED));
+                                            });
+                                            timesLeft = 3;
+                                            return;
+                                        }
+                                        messages.send(playerunreg, MessageKey.GUI_CAPTCHA_RETRY_MESSAGE, String.valueOf(timesLeft));
+                                        event.setCancelled(true);
+                                        random_num.set(random_blockpos.nextInt(26));
+                                        bukkitService.runTask(() -> {
+                                            menu.clear();
+                                            menu.setItem(random_num.get(), item);
+                                            playerunreg.openInventory(menu);
+                                        });
+                                    }
+                                }
+                            }
+                        };
+                        ProtocolLibrary.getProtocolManager().addPacketListener(windowPacketListener);
+                    });
+                    bukkitService.runTask(() -> {
+                        chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
+                            @Override
+                            public void onPacketReceiving(PacketEvent event) {
+                                if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    messages.send(playerunreg, MessageKey.GUI_CAPTCHA_DENIED_MESSAGE);
+                                    event.setCancelled(true);
+                                }
+                            }
+                        };
+                        ProtocolLibrary.getProtocolManager().addPacketListener(chatPacketListener);
+                    });
+                });
+            });
+        }
+    }
+
+    private void deletePlayerData(UUID playerUUID) {
+        // 获取服务器的存储文件夹路径
+        File serverFolder = Bukkit.getServer().getWorldContainer();
+        String worldFolderName = AuthMe.settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        // 构建playerdata文件夹路径
+        File playerDataFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "playerdata");
+
+        // 构建玩家数据文件路径
+        File playerDataFile = new File(playerDataFolder, File.separator + playerUUID + ".dat");
+
+        // 删除玩家数据文件
+        if (playerDataFile.exists()) {
+            playerDataFile.delete();
+        }
+    }
+    private void deletePlayerStats(UUID playerUUID) {
+        // 获取服务器的存储文件夹路径
+        File serverFolder = Bukkit.getServer().getWorldContainer();
+        String worldFolderName = AuthMe.settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        // 构建stats文件夹路径
+        File statsFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "stats");
+        // 构建玩家统计数据文件路径
+        File statsFile = new File(statsFolder, File.separator + playerUUID + ".json");
+        // 删除玩家统计数据文件
+        if (statsFile.exists()) {
+            statsFile.delete();
+        }
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        String name = player.getName();
+        UUID playerUUID = event.getPlayer().getUniqueId();
+        if (!authmeApi.isRegistered(name)) {
+            if (AuthMe.settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)) {
+                closeReasonMap.remove(player);
+                bukkitService.runTaskLater(() -> {
+                    if (!player.isOnline()) {
+                        deletePlayerData(playerUUID);
+                        deletePlayerStats(playerUUID);
+                    }
+                }, 100L);
+                removePacketListeners();
+                return;
+            }
+            removePacketListeners();
+            closeReasonMap.remove(player);
+        }
+    }
+}
+
+
+
+

src/main/java/fr/xephi/authme/listener/ListenerService.java

@@ -10,19 +10,12 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.PlayerUtils;
-import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
 
 import javax.inject.Inject;
-import java.util.Objects;
 
 /**
  * Service class for the AuthMe listeners to determine whether an event should be canceled.
@@ -93,7 +86,7 @@ class ListenerService implements SettingsDependent {
     }
     public boolean shouldCancelInvEvent(Player player) {
         try {
-            return !AuthMe.GUIEnabled || authmeApi.isRegistered(player.getName()) || RegisterListener.closeReasonMap.containsKey(player)/* || !player.getOpenInventory().getTitle().equals("请验证你是真人")*/;
+            return !AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA) || authmeApi.isRegistered(player.getName()) || GuiCaptchaHandler.closeReasonMap.containsKey(player)/* || !player.getOpenInventory().getTitle().equals("请验证你是真人")*/;
         } catch (Exception e) {
             return true;
         }

src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java

@@ -0,0 +1,103 @@
+package fr.xephi.authme.listener;
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.TeleportUtils;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.Plugin;
+
+
+public class LoginLocationFixListener implements Listener {
+    private final Plugin plugin;
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+
+    public LoginLocationFixListener(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    private static Material materialPortal = Material.matchMaterial("PORTAL");
+    private final boolean isSmartAsyncTeleport = AuthMe.settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT);
+    private final boolean isFixPortalStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL);
+    private final boolean isFixGroundStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND);
+    BlockFace[] faces = {BlockFace.WEST, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.SOUTH_EAST, BlockFace.SOUTH_WEST, BlockFace.NORTH_EAST, BlockFace.NORTH_WEST};
+
+    static {
+        if (materialPortal == null) {
+            materialPortal = Material.matchMaterial("PORTAL_BLOCK");
+            if (materialPortal == null) {
+                materialPortal = Material.matchMaterial("NETHER_PORTAL");
+            }
+        }
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        Location JoinLocation = player.getLocation().getBlock().getLocation().add(0.5, 0.1, 0.5);
+        if (isFixPortalStuck) {
+            if (!JoinLocation.getBlock().getType().equals(materialPortal) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(materialPortal)) {
+                return;
+            }
+            Block JoinBlock = JoinLocation.getBlock();
+            boolean solved = false;
+            for (BlockFace face : faces) {
+                if (JoinBlock.getRelative(face).getType().equals(Material.AIR) && JoinBlock.getRelative(face).getRelative(BlockFace.UP).getType().equals(Material.AIR)) {
+                    if (isSmartAsyncTeleport) {
+                        TeleportUtils.teleport(player, JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    }
+                    solved = true;
+                    break;
+                }
+            }
+            if (!solved) {
+                JoinBlock.getRelative(BlockFace.UP).breakNaturally();
+                JoinBlock.breakNaturally();
+            }
+            player.sendMessage("§a你在登录时卡在了地狱门, 现已修正");
+        } else if (isFixGroundStuck) {
+            Material UpType = JoinLocation.getBlock().getRelative(BlockFace.UP).getType();
+            World world = player.getWorld();
+            int MaxHeight = world.getMaxHeight();
+            int MinHeight = world.getMinHeight();
+            if (!UpType.isOccluding() && !UpType.equals(Material.LAVA)) {
+                return;
+            }
+            for (int i = MinHeight; i <= MaxHeight; i++) {
+                JoinLocation.setY(i);
+                Block JoinBlock = JoinLocation.getBlock();
+                if ((JoinBlock.getRelative(BlockFace.DOWN).getType().isBlock())
+                    && JoinBlock.getType().equals(Material.AIR)
+                    && JoinBlock.getRelative(BlockFace.UP).getType().equals(Material.AIR)) {
+                    if (JoinBlock.getRelative(BlockFace.DOWN).getType().equals(Material.LAVA)) {
+                        JoinBlock.getRelative(BlockFace.DOWN).setType(Material.DIRT);
+                    }
+                    if (isSmartAsyncTeleport) {
+                        TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    }
+                    player.sendMessage("§a你被埋住了, 坐标已修正, 下次下线之前请小心!");
+                    break;
+                }
+                if (i == MaxHeight) {
+                    if (isSmartAsyncTeleport) {
+                        TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    }
+                    player.sendMessage("§a你被埋住了, 坐标无法修正, 只好送你去了最高点, 自求多福吧少年~");
+                }
+            }
+        }
+    }
+}

src/main/java/fr/xephi/authme/listener/PlayerListener.java

@@ -1,12 +1,6 @@
 package fr.xephi.authme.listener;
 
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.PacketAdapter;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.listener.RegisterListener;
-import com.comphenix.protocol.events.PacketEvent;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.data.QuickCommandsProtectionManager;
 import fr.xephi.authme.data.auth.PlayerAuth;
@@ -31,7 +25,6 @@ import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -39,7 +32,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityPickupItemEvent;
+//import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -61,16 +54,13 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
-import org.bukkit.inventory.Inventory;
+//import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 import org.bukkit.inventory.InventoryView;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.plugin.Plugin;
+
+import static org.bukkit.Bukkit.getServer;
 
 import javax.inject.Inject;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.Set;
 
 import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOWED_MOVEMENT_RADIUS;
@@ -134,8 +124,10 @@ public class PlayerListener implements Listener{
         if (validationService.isUnrestricted(name)) {
             return;
         }
-        if (settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())){
-            return;
+        if (settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER)) {
+            if (getServer().getPluginManager().getPlugin("floodgate") != null) {
+                if (org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())) return;
+            }
         }
         // Non-blocking checks
         try {
@@ -387,13 +379,13 @@ public class PlayerListener implements Listener{
         Location spawn = spawnLoader.getSpawnLocation(player);
         if (spawn != null && spawn.getWorld() != null) {
             if (!player.getWorld().equals(spawn.getWorld())) {
-                if(AuthMe.SATEnabled) {
+                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
                     TeleportUtils.teleport(player,spawn);
                 } else {
                     player.teleport(spawn);
                 }
             } else if (spawn.distance(player.getLocation()) > settings.getProperty(ALLOWED_MOVEMENT_RADIUS)) {
-                if(AuthMe.SATEnabled) {
+                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
                     TeleportUtils.teleport(player,spawn);
                 } else {
                     player.teleport(spawn);
@@ -488,12 +480,12 @@ public class PlayerListener implements Listener{
      * Inventory interactions
      */
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
-    public void onPlayerPickupItem(EntityPickupItemEvent event) {
-        if (listenerService.shouldCancelEvent(event)) {
-            event.setCancelled(true);
-        }
-    }
+//    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+//    public void onPlayerPickupItem(EntityPickupItemEvent event) {
+//        if (listenerService.shouldCancelEvent(event)) {
+//            event.setCancelled(true);
+//        }
+//    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
@@ -548,12 +540,12 @@ public class PlayerListener implements Listener{
             event.setCancelled(true);
         }
     }
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
-        Player player = event.getPlayer();
-        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
-            return;
-        event.setCancelled(true);
-        Bukkit.dispatchCommand(event.getPlayer(), "help");
-    }
+//    @EventHandler(priority = EventPriority.LOWEST)
+//    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+//        Player player = event.getPlayer();
+//        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
+//            return;
+//        event.setCancelled(true);
+//        Bukkit.dispatchCommand(event.getPlayer(), "help");
+//    }
 }

src/main/java/fr/xephi/authme/listener/PlayerListenerHigherThan18.java

@@ -0,0 +1,43 @@
+package fr.xephi.authme.listener;
+
+import fr.xephi.authme.data.QuickCommandsProtectionManager;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.process.Management;
+import fr.xephi.authme.service.AntiBotService;
+import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.service.JoinMessageService;
+import fr.xephi.authme.service.TeleportationService;
+import fr.xephi.authme.service.ValidationService;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.SpawnLoader;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+
+import javax.inject.Inject;
+
+public class PlayerListenerHigherThan18 implements Listener {
+    @Inject
+    private ListenerService listenerService;
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    public void onPlayerPickupItem(EntityPickupItemEvent event) {
+        if (listenerService.shouldCancelEvent(event)) {
+            event.setCancelled(true);
+        }
+    }
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+        Player player = event.getPlayer();
+        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
+            return;
+        event.setCancelled(true);
+        Bukkit.dispatchCommand(event.getPlayer(), "help");
+    }
+}

src/main/java/fr/xephi/authme/listener/PlayerQuitListener.java

@@ -1,31 +0,0 @@
-package fr.xephi.authme.listener;
-//Prevent Ghost Players
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.plugin.Plugin;
-
-import java.util.Objects;
-
-public class PlayerQuitListener implements Listener {
-    private final Plugin plugin;
-    public PlayerQuitListener(Plugin plugin) {
-        this.plugin = plugin;
-    }
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        String LastAddr = Objects.requireNonNull(player.getAddress()).getAddress().getHostAddress();
-        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
-            @Override
-            public void run() {
-                if (player.isOnline()) {
-                    player.kickPlayer("You have been disconnected.");
-                }
-            }
-        }, 20L); // 20 ticks = 1 second
-    }
-}

src/main/java/fr/xephi/authme/listener/RegisterListener.java

@@ -1,133 +0,0 @@
-package fr.xephi.authme.listener;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.events.PacketListener;
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.api.v3.AuthMeApi;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.plugin.Plugin;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Random;
-import java.util.UUID;
-import java.util.logging.Level;
-
-import static org.bukkit.Bukkit.getLogger;
-
-public class RegisterListener implements Listener {
-    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-    private final Plugin plugin;
-    public static boolean enabled=true;
-    // 创建一个储存玩家关闭箱子GUI的原因的HashMap
-    public static HashMap<Player, String> closeReasonMap = new HashMap<>();
-    // Add a timer to kick the player if they don't verify in time
-
-
-    public RegisterListener(Plugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onInventoryClick(InventoryClickEvent event) {
-        if (event.getWhoClicked() instanceof Player) {
-            Player player = (Player) event.getWhoClicked();
-            ItemStack item = event.getCurrentItem();
-            // 获取点击事件的容器
-            Inventory inventory = event.getInventory();
-            if (event.getView().getTitle().equals("请验证你是真人")&&!authmeApi.isRegistered(player.getName())) {
-                if (Objects.requireNonNull(event.getCurrentItem()).getType().equals(Material.REDSTONE_BLOCK)) {
-                    event.setCancelled(true);
-                    closeReasonMap.put(player, "verified");
-                    player.closeInventory();
-                    player.sendMessage("§a验证完成");
-                    //force to string
-
-//                    ProtocolLibrary.getProtocolManager().removePacketListeners(this.plugin);
-                }
-            }
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true,priority = EventPriority.HIGHEST)
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Random random_blockpos = new Random();
-        int random_num = random_blockpos.nextInt(26);
-        Inventory menu = Bukkit.createInventory(null, 27, "请验证你是真人");
-        ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
-        ItemMeta meta = item.getItemMeta();
-        if (meta != null) {
-            meta.setDisplayName("§a我是真人");
-        }
-        item.setItemMeta(meta);
-        menu.setItem(random_num, item);
-        Player playerunreg = event.getPlayer();
-        String name = playerunreg.getName();
-        if (!authmeApi.isRegistered(name)) {
-//            getLogger().log(Level.INFO, "TESTTEST");
-            Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
-                playerunreg.openInventory(menu);
-            }, 1L);
-            ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
-                @Override
-                public void onPacketReceiving(PacketEvent event) {
-                    if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg)) {
-                        playerunreg.sendMessage("§c请先完成验证!");
-                        event.setCancelled(true);
-                        Bukkit.getScheduler().runTask(plugin, () -> {
-                            playerunreg.openInventory(menu);
-                            //playerunreg.kickPlayer("§c请先完成人机验证!");
-                        });
-                    }
-                }
-            });
-
-            ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
-                @Override
-                public void onPacketReceiving(PacketEvent event) {
-                    if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg)) {
-                        playerunreg.sendMessage("§c请先完成验证!");
-                        event.setCancelled(true);
-                    }
-                }
-            });
-//            chatListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
-//                @Override
-//                public void onPacketReceiving(PacketEvent event) {
-//                    if (event.getPlayer() == player) {
-//                        event.setCancelled(true);
-//
-//                    }
-//                }
-//            };
-        }
-    }
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event){
-        Player player = event.getPlayer();
-        String name = player.getName();
-        if (!authmeApi.isRegistered(name)){closeReasonMap.remove(player);}
-    }
-
-
-}
-
-

src/main/java/fr/xephi/authme/message/MessageKey.java

@@ -4,14 +4,59 @@ package fr.xephi.authme.message;
  * Keys for translatable messages managed by {@link Messages}.
  */
 public enum MessageKey {
+    /**
+     * %random Verification
+     */
+    GUI_CAPTCHA_WINDOW_NAME("gui_captcha.captcha_window_name", "%random"),
 
-    /** In order to use this command you must be authenticated! */
+    /**
+     * %random I am human
+     */
+    GUI_CAPTCHA_CLICKABLE_NAME("gui_captcha.captcha_clickable_name", "%random"),
+
+    /**
+     * Verification failed, you have %times retries left
+     */
+    GUI_CAPTCHA_RETRY_MESSAGE("gui_captcha.message_on_retry", "%times"),
+
+    /**
+     * Bedrock verification success!
+     */
+    GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK("gui_captcha.bedrock_auto_verify_success"),
+
+    /**
+     * Please be verified before chatting!
+     */
+    GUI_CAPTCHA_DENIED_MESSAGE("gui_captcha.denied_message_sending"),
+
+    /**
+     * Verification timed out!
+     */
+    GUI_CAPTCHA_KICK_TIMEOUT("gui_captcha.kick_on_timeout"),
+
+    /**
+     * Please complete the verification!
+     */
+    GUI_CAPTCHA_KICK_FAILED("gui_captcha.kick_on_failed"),
+
+    /**
+     * Verification success!
+     */
+    GUI_CAPTCHA_VERIFIED("gui_captcha.success"),
+
+    /**
+     * In order to use this command you must be authenticated!
+     */
     DENIED_COMMAND("error.denied_command"),
 
-    /** A player with the same IP is already in game! */
+    /**
+     * A player with the same IP is already in game!
+     */
     SAME_IP_ONLINE("on_join_validation.same_ip_online"),
 
-    /** In order to chat you must be authenticated! */
+    /**
+     * In order to chat you must be authenticated!
+     */
     DENIED_CHAT("error.denied_chat"),
 
     /** AntiBot protection mode is enabled! You have to wait some minutes before joining the server. */

src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java

@@ -149,6 +149,7 @@ public class MessageUpdater {
             .put("verification", "Verification code")
             .put("time", "Time units")
             .put("two_factor", "Two-factor authentication")
+            .put("gui_captcha", "3rd party features: GUI Captcha")
             .build();
 
         Set<String> addedKeys = new HashSet<>();

src/main/java/fr/xephi/authme/security/crypts/Whirlpool.java

@@ -308,7 +308,7 @@ public class Whirlpool extends UnsaltedMethod {
         if (bufferRem + sourceBits < 8) {
             // all remaining data fits on buffer[bufferPos], and there still
             // remains some space.
-            bufferBits += sourceBits;
+            bufferBits += (int) sourceBits;
         } else {
             // buffer[bufferPos] is full:
             bufferPos++;

src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java

@@ -175,7 +175,7 @@ public final class RestrictionSettings implements SettingsHolder {
 
     @Comment("Regex syntax for allowed chars in email.")
     public static final Property<String> ALLOWED_EMAIL_REGEX =
-        newProperty("settings.restrictions.allowedEmailCharacters", "^[A-Za-z0-9]{4,15}@(qq|outlook|163|gmail|icloud).com$");
+        newProperty("settings.restrictions.allowedEmailCharacters", "^[A-Za-z0-9_]{4,15}@(qq|outlook|163|gmail|icloud)\\.com$");
 
 
     @Comment("Force survival gamemode when player joins?")

src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java

@@ -2,12 +2,12 @@ package fr.xephi.authme.settings.properties;
 
 import ch.jalu.configme.Comment;
 import ch.jalu.configme.SettingsHolder;
-import ch.jalu.configme.properties.BooleanProperty;
 import ch.jalu.configme.properties.Property;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.settings.EnumSetProperty;
+
 import java.util.Set;
-import fr.xephi.authme.listener.PlayerQuitListener;
+
 import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseStringSetProperty;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
@@ -17,21 +17,47 @@ public final class SecuritySettings implements SettingsHolder {
         "Take care with this, if you set this to false,",
         "AuthMe will automatically disable and the server won't be protected!"})
     public static final Property<Boolean> STOP_SERVER_ON_PROBLEM =
-        newProperty("Security.SQLProblem.stopServer", true);
+        newProperty("Security.SQLProblem.stopServer", false);
+
+    @Comment({"Should we let Bedrock players login automatically?",
+        "(Requires hookFloodgate to be true & floodgate loaded)"})
+    public static final Property<Boolean> FORCE_LOGIN_BEDROCK = newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
 
     @Comment("Enable the new feature to prevent ghost players?")
     public static final Property<Boolean> ANTI_GHOST_PLAYERS = newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
 
-    @Comment({"(BETA Feature)Choose the best teleport method by server brand?",
+    @Comment({"Choose the best teleport method by server brand?",
         "(Enable this if you are using Paper)"})
-    public static final Property<Boolean> SMART_ASYNC_TELEPORT = newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport",false);
+    public static final Property<Boolean> SMART_ASYNC_TELEPORT = newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport", false);
+
+    @Comment("Send a GUI captcha to unregistered players?(Requires ProtocolLib)")
+    public static final Property<Boolean> GUI_CAPTCHA = newProperty("3rdPartyFeature.captcha.guiCaptcha", false);
+
+    @Comment({"Should we kick the players when they don't finish the GUI captcha in seconds?",
+        "(less than or equals 0 is disabled)"})
+    public static final Property<Integer> GUI_CAPTCHA_TIMEOUT = newProperty("3rdPartyFeature.captcha.timeOut",0);
+
+    @Comment({"Should we ignore floodgate players when sending GUI captcha?",
+        "(Requires floodgate and hookFloodgate: true)"})
+    public static final Property<Boolean> GUI_CAPTCHA_BE_COMPATIBILITY = newProperty("3rdPartyFeature.captcha.ignoreBedrock",false);
+
+    @Comment("Should we delete player data and stats when they didn't finish the captcha?")
+    public static final Property<Boolean> DELETE_UNVERIFIED_PLAYER_DATA = newProperty("3rdPartyFeature.captcha.purgePlayerData",false);
+
+    @Comment("Which world's player data should be deleted?(Enter the world *FOLDER* name where your players first logged in)")
+    public static final Property<String> DELETE_PLAYER_DATA_WORLD = newProperty("3rdPartyFeature.captcha.purgeWorldFolderName","world");
+
+    @Comment("Should we fix the location when players logged in the portal?")
+    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_PORTAL = newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);
+
+    @Comment("Should we fix the location when players logged underground?")
+    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_UNDERGROUND = newProperty("3rdPartyFeature.fixes.loginLocationFix.fixGroundStuck", false);
+
+//    @Comment({"Should we kick the players when they failed captcha too many times?",
+//    "(Minimum value is 1)(Default: 3)"})
+//    public static final Property<Integer> GUI_CAPTCHA_MAX_TRY = newProperty("3rdPartyFeature.captcha.maxTryTimes",3);
 
-    @Comment("(BETA Feature)Send a GUI captcha to unregistered players?")
-    public static final Property<Boolean> GUI_CAPTCHA = newProperty("3rdPartyFeature.captcha.guiCaptcha",false);
 
-//    @Comment({"Kick the players when they didn't finish the gui captcha in time? " ,
-//        "(0 is disabled)"})
-//    public static final Property<Integer> CAPTCHA_TIMEOUT = newProperty("3rdPartyFeature.captcha.timeout",0);
     //@Comment({"Using which API to get hash data?",
         //"Available options: github, gitee, ghproxy (if your server is in China, please use gitee or ghproxy.)"})
     //public static final Property<String> SHA_CHECK_METHOD = newProperty("Plugin.hashing.hashApi","github");
@@ -63,6 +89,14 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Boolean> CHECK_FOR_UPDATES =
         newProperty("Plugin.updates.checkForUpdates", true);
 
+    @Comment("Should we show the AuthMe banner on startup?")
+    public static final Property<Boolean> SHOW_STARTUP_BANNER =
+        newProperty("Plugin.banners.showBanners", true);
+
+    @Comment("Change the banner colors here (Default: §r)")
+    public static final Property<String> STARTUP_BANNER_COLOR =
+        newProperty("Plugin.banners.bannerColor", "§r");
+
     @Comment("Max allowed tries before a captcha is required")
     public static final Property<Integer> MAX_LOGIN_TRIES_BEFORE_CAPTCHA =
         newProperty("Security.captcha.maxLoginTry", 8);

src/main/java/fr/xephi/authme/util/TeleportUtils.java

@@ -1,15 +1,10 @@
 package fr.xephi.authme.util;
 
-import fr.xephi.authme.ConsoleLogger;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.logging.Level;
-
-import java.util.logging.Logger;
 
 //
 //public class TeleportUtils {
@@ -33,6 +28,7 @@ public class TeleportUtils {
         try {//Detect Paper class
             Class<?> paperClass = Class.forName("com.destroystokyo.paper.PaperConfig");
             teleportAsyncMethod = Player.class.getMethod("teleportAsync", Location.class);
+            teleportAsyncMethod.setAccessible(true);
             // if detected,use teleportAsync()
         } catch (ClassNotFoundException | NoSuchMethodException e) {
             teleportAsyncMethod = null;
@@ -43,7 +39,6 @@ public class TeleportUtils {
     public static void teleport(Player player, Location location) {
         if (teleportAsyncMethod != null) {
             try {
-                teleportAsyncMethod.setAccessible(true);
                 teleportAsyncMethod.invoke(player, location);
             } catch (IllegalAccessException | InvocationTargetException e) {
                 player.teleport(location);

src/main/resources/messages/messages_en.yml

@@ -155,3 +155,14 @@ time:
   hours: 'hours'
   day: 'day'
   days: 'days'
+
+# 3rd party features: GUI Captcha
+gui_captcha:
+  success: '&aVerification success!'
+  bedrock_auto_verify_success: '&aBedrock verification success!'
+  captcha_window_name: '%random Verification'
+  captcha_clickable_name: '%random I am human'
+  message_on_retry: '&cVerification failed, you have %times retries left'
+  denied_message_sending: '&cPlease be verified before chatting!'
+  kick_on_failed: '&cPlease complete the verification!'
+  kick_on_timeout: '&cVerification timed out!'

src/main/resources/messages/messages_zhcn.yml

@@ -154,13 +154,24 @@ time:
 
 # Two-factor authentication
 two_factor:
-    code_created: '&7您正在激活双重验证, 请打开 &a%url &7扫描二维码'
-    confirmation_required: '&7请输入“/totp confirm <验证码>”来确认激活双重验证'
-    code_required: '&c请输入“/totp code <验证码>”来提交验证码'
-    already_enabled: '&a双重验证已启用'
-    enable_error_no_code: '&c验证码丢失'
-    enable_success: '&a已成功启用双重验证'
-    enable_error_wrong_code: '&c验证码错误或者已经过期,请重新执行“/totp add”'
-    not_enabled_error: '&c双重验证未在您的账号上启用,请使用“/totp add”来启用'
-    removed_success: '&c双重验证已从您的账号上禁用'
-    invalid_code: '&c无效的验证码'
+  code_created: '&7您正在激活双重验证, 请打开 &a%url &7扫描二维码'
+  confirmation_required: '&7请输入“/totp confirm <验证码>”来确认激活双重验证'
+  code_required: '&c请输入“/totp code <验证码>”来提交验证码'
+  already_enabled: '&a双重验证已启用'
+  enable_error_no_code: '&c验证码丢失'
+  enable_success: '&a已成功启用双重验证'
+  enable_error_wrong_code: '&c验证码错误或者已经过期,请重新执行“/totp add”'
+  not_enabled_error: '&c双重验证未在您的账号上启用,请使用“/totp add”来启用'
+  removed_success: '&c双重验证已从您的账号上禁用'
+  invalid_code: '&c无效的验证码'
+
+# 3rd party features: GUI Captcha
+gui_captcha:
+  success: '&a*** 验证完成 ***'
+  bedrock_auto_verify_success: '&a*** 基岩版自动验证完成 ***'
+  captcha_window_name: '&k%random&r&n请验证你是真人'
+  captcha_clickable_name: '&k%random&r&n我是真人'
+  message_on_retry: '&c验证失败,你还有 %times 次机会'
+  denied_message_sending: '&c请先完成验证再聊天!'
+  kick_on_failed: '&c请先完成验证!'
+  kick_on_timeout: '&c验证超时'

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b17
+version: 5.6.0-FORK-b31
 api-version: 1.13
 softdepend:
     - Vault