B39 release

Bump org.apache.commons:commons-email from 1.6-SNAPSHOT to 1.6.0

.github/dependabot.yml

@@ -10,3 +10,5 @@ updates:
   - dependency-name: com.google.guava:guava
   - dependency-name: org.apache.logging.log4j:log4j-core
   - dependency-name: com.zaxxer:HikariCP
+  - dependency-name: "org.mockito:mockito-core" # Mockito 5 requires Java 11
+    versions: ">= 5"

.github/workflows/maven.yml

@@ -10,8 +10,8 @@ jobs:
   Build:
     strategy:
       matrix:
-        jdkversion: [11]
+        jdkversion: [ 11 ]
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -19,5 +19,29 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.jdkversion }}
           cache: 'maven'
-    - name: 使用Maven构建
+      - name: Build
         run: mvn -V -B clean package --file pom.xml
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: Download
+          path: ./target/AuthMe-5.6.0-FORK-Spigot-Universal.jar
+  runtime-test:
+    name: Plugin Runtime Test 
+    needs: [Build]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - mcVersion: '1.8.8'
+            javaVersion: '8'
+          - mcVersion: '1.12.2'
+            javaVersion: '8'
+          - mcVersion: '1.20.2'
+            javaVersion: '20'   
+    steps:        
+      - uses: HaHaWTH/minecraft-plugin-runtime-test@paper
+        with:
+          server-version: ${{ matrix.mcVersion }}
+          java-version: ${{ matrix.javaVersion }}
+          artifact-name: Download

README.md

@@ -1,21 +1,33 @@
 # AuthMeReReloaded
-**"A fork of the best authentication plugin for the Bukkit modding API!"**
+**"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)
+<p align="center">
+  <img src="https://img.shields.io/github/languages/code-size/HaHaWTH/AuthMeReReloaded.svg" alt="Code size"/>
+  <img src="https://img.shields.io/github/repo-size/HaHaWTH/AuthMeReReloaded.svg" alt="GitHub repo size"/>
+</p>
 
 **Detailed Changes:**
  1. Improved mail sending logic & support more emails
  2. Shutdown mail sending(When server is closed, email you)
- 3. Old bug fixes
+ 3. Legacy bug fixes
  4. Anti Ghost Player(Doubled login bug)
  5. Use the best performance method by server brand
- 6. Bedrock Compatibility(Floodgate needed)
+ 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)
+ 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......
+ 15. Automatically login for Bedrock players(configurable)
+ 16. More......
+
+**Download links:**
+[Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
+[Actions(Dev builds, use at your own risk!)](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
+
+**Pull Requests and suggestions are welcome!**

docs/config.md

@@ -396,6 +396,8 @@ Protection:
     # Apply the protection also to registered usernames
     enableProtectionRegistered: true
     geoIpDatabase:
+        # Enable GeoIp database
+        enabled: true
         # The MaxMind clientId used to download the GeoIp database,
         # get one at https://www.maxmind.com/en/accounts/current/license-key
         # The EssentialsX project has a very useful tutorial on how to generate

docs/translations.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Sun Apr 04 21:31:44 CEST 2021. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Wed Jun 21 12:14:29 CEST 2023. See docs/translations/translations.tpl.md -->
 
 # AuthMe Translations
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
@@ -22,10 +22,11 @@ Code | Language | Translated | &nbsp;
 [hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 93% | <img src="https://via.placeholder.com/93x7/77dd44?text=%20" alt="93" />
 [it](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_it.yml) | Italian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[ja](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ja.yml) | Japanese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
-[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 36% | <img src="https://via.placeholder.com/36x7/aa4400?text=%20" alt="36" />
+[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
@@ -34,13 +35,13 @@ Code | Language | Translated | &nbsp;
 [sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml) | Serbian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 77% | <img src="https://via.placeholder.com/77x7/bb9900?text=%20" alt="77" />
+[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 64% | <img src="https://via.placeholder.com/64x7/bb7700?text=%20" alt="64" />
-[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 86% | <img src="https://via.placeholder.com/86x7/99bb22?text=%20" alt="86" />
+[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 04 21:31:44 CEST 2021
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Wed Jun 21 12:14:29 CEST 2023

pom.xml

@@ -67,11 +67,11 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.20.1-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>
 
@@ -79,7 +79,7 @@
         <pluginDescription.name>${project.outputName}</pluginDescription.name>
         <pluginDescription.version>${project.versionCode}</pluginDescription.version>
         <pluginDescription.main>${project.groupId}.${project.artifactId}.${pluginDescription.name}</pluginDescription.main>
-        <pluginDescription.authors>sgdc3, ljacqu, games647, Hex3l, krusic22</pluginDescription.authors>
+        <pluginDescription.authors>sgdc3, games647, Hex3l, krusic22</pluginDescription.authors>
     </properties>
 
     <!-- Jenkins profile -->
@@ -189,13 +189,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.2</version>
             </plugin>
             <!-- Include resource files -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <configuration>
                     <nonFilteredFileExtensions>
                         <nonFilteredFileExtension>mmdb</nonFilteredFileExtension>
@@ -206,7 +206,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${java.source}</source>
                     <target>${java.target}</target>
@@ -277,7 +277,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
                 <configuration>
                     <finalName>${project.finalNameBase}</finalName>
                 </configuration>
@@ -294,7 +294,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>shaded-jar</id>
@@ -346,6 +346,10 @@
                                     <pattern>com.google.gson</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.com.google.gson</shadedPattern>
                                 </relocation>
+                                <!--                                <relocation>-->
+                                <!--                                    <pattern>com.cryptomorin.xseries</pattern>-->
+                                <!--                                    <shadedPattern>fr.xephi.authme.libs.com.cryptomorin.xseries</shadedPattern>-->
+                                <!--                                </relocation>-->
                             </relocations>
                         </configuration>
                     </execution>
@@ -598,6 +602,13 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+
+        <!-- FoliaLib -->
+        <repository>
+            <id>devmart-other</id>
+            <url>https://nexuslite.gcnt.net/repos/other/</url>
+        </repository>
+
         <repository>
             <id>opencollab-snapshot</id>
             <url>https://repo.opencollab.dev/maven-snapshots/</url>
@@ -618,6 +629,10 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>opencollab-snapshot-main</id>
+            <url>https://repo.opencollab.dev/main/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -625,7 +640,7 @@
         <dependency>
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>api</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
+            <version>2.2.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- Jalu Injector -->
@@ -671,7 +686,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>1.6.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -687,7 +702,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>5.0.1</version> <!-- Latest java 8 release -->
+            <version>4.0.3</version> <!-- Latest java 8 release -->
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -700,7 +715,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.5</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
+            <version>1.7.36</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
             <optional>true</optional>
         </dependency>
 
@@ -722,7 +737,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.1.2</version>
+            <version>3.1.4</version>
             <optional>true</optional>
         </dependency>
 
@@ -784,8 +799,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Bukkit Libraries  -->
-
         <!-- ConfigMe -->
         <dependency>
             <groupId>ch.jalu</groupId>
@@ -804,7 +817,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -856,6 +869,14 @@
             </exclusions>
         </dependency>
 
+        <!--        &lt;!&ndash; XSeries &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.github.cryptomorin</groupId>-->
+        <!--            <artifactId>XSeries</artifactId>-->
+        <!--            <version>9.8.0</version>-->
+        <!--            <scope>compile</scope>-->
+        <!--        </dependency>-->
+
         <!-- zPermissions plugin -->
         <dependency>
             <groupId>org.tyrannyofheaven.bukkit</groupId>
@@ -1027,7 +1048,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.4</version>
+            <version>42.6.0</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1070,7 +1091,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.39.0</version>
+            <version>3.40.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -1078,7 +1099,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.40.1.0</version>
+            <version>3.44.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -9,22 +9,18 @@ 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.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-
 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.DoubleLoginFixListener;
-import fr.xephi.authme.listener.GuiCaptchaHandler;
 import fr.xephi.authme.listener.PlayerListenerHigherThan18;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.mail.EmailService;
@@ -38,21 +34,23 @@ 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.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 org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-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 javax.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -76,8 +74,7 @@ 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 = "26";
+    private static String pluginBuildNumber = "39";
-    protected final Boolean SHAEnabled = false;
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
@@ -88,12 +85,22 @@ public class AuthMe extends JavaPlugin {
     private Injector injector;
     private BackupService backupService;
     public static ConsoleLogger logger;
+
     /**
      * Constructor.
      */
     public AuthMe() {
     }
 
+    /**
+     * Get the plugin's build
+     *
+     * @return The plugin's build
+     */
+    public static String getPluginBuild() {
+        return pluginBuild;
+    }
+
 
     /**
      * Get the plugin's name.
@@ -123,6 +130,7 @@ public class AuthMe extends JavaPlugin {
     }
 
 
+
     /**
      * Method called when the server enables the plugin.
      */
@@ -178,20 +186,19 @@ public class AuthMe extends JavaPlugin {
         cleanupTask.runTaskTimerAsynchronously(this, CLEANUP_INTERVAL, CLEANUP_INTERVAL);
         // Do a backup on start
         backupService.doBackup(BackupService.BackupCause.START);
-
         // Set up Metrics
         OnStartupTasks.sendMetrics(this, settings);
-        if(settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
+        if (settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
             String loadColorConfig = settings.getProperty(SecuritySettings.STARTUP_BANNER_COLOR);
-            if (loadColorConfig.startsWith("§")) {
+            if (loadColorConfig.startsWith("§") && !loadColorConfig.endsWith("§") && (loadColorConfig.length() % 2 == 0)) {
                 logger.info("\n" + loadColorConfig + "    ___         __  __    __  ___   \n" +
                     loadColorConfig + "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
                     loadColorConfig + "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
                     loadColorConfig + " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
                     loadColorConfig + "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
                     loadColorConfig + "                                    ");
-            }else {
+            } else {
-                logger.info("\n"+"    ___         __  __    __  ___   \n" +
+                logger.info("\n" + "    ___         __  __    __  ___   \n" +
                     "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
                     "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
                     " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
@@ -207,31 +214,16 @@ public class AuthMe extends JavaPlugin {
         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)*/) {
+//        register3rdPartyListeners();
-        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
-            getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this);
-        }
-        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX)) {
-            getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this);
-        }
-        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-            getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this);
-            logger.info("(Alpha4)GUICaptcha Feature is enabled successfully!");
-            logger.info("These features are still in development, if you encountered any problem, please report.");
-        } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && !getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
-            logger.warning("ProtocolLib is not loaded, we can't enable GUI Captcha.");
-        }
         logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/");
-
         if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) {
             checkForUpdates();
         }
+    }
+
+
+    //Migrated
 
-        if (SHAEnabled){
-            //shaChecker();
-        }
-    }
-    public File pluginfile = getFile();
     /**
      * Load the version and build number of the plugin from the description file.
      *
@@ -326,14 +318,14 @@ public class AuthMe extends JavaPlugin {
         pluginManager.registerEvents(injector.getSingleton(EntityListener.class), this);
         pluginManager.registerEvents(injector.getSingleton(ServerListener.class), this);
 
+
         // Try to register 1.8+ player listeners
-        if (isClassLoaded("org.bukkit.event.entity.EntityPickupItemEvent") && isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")){
+        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)
-        // 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);
 //        }
@@ -347,6 +339,26 @@ public class AuthMe extends JavaPlugin {
         if (isClassLoaded("org.bukkit.event.entity.EntityAirChangeEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener111.class), this);
         }
+
+        //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);
+        } else if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && (!settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) || getServer().getPluginManager().getPlugin("floodgate") == null)) {
+            logger.warning("Failed to enable BedrockAutoLogin, ensure hookFloodgate: true and floodgate is loaded.");
+        }
+        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND) || settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
+            pluginManager.registerEvents(injector.getSingleton(LoginLocationFixListener.class), this);
+        }
+        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
+            pluginManager.registerEvents(injector.getSingleton(DoubleLoginFixListener.class), this);
+        }
     }
 
     /**
@@ -390,15 +402,16 @@ public class AuthMe extends JavaPlugin {
         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 owner_gitee = "Shixuehan114514";
     private static final String repo = "AuthMeReReloaded";
+
     private void checkForUpdates() {
         logger.info("Checking for updates...");
-        Bukkit.getScheduler().runTaskAsynchronously(this, () -> {
+        bukkitService.runTaskAsynchronously(() -> {
             try {
                 // 从南通集线器获取最新版本号
-
                 URL url = new URL("https://api.github.com/repos/" + owner + "/" + repo + "/releases/latest");
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                 conn.setConnectTimeout(10000); // 设置连接超时为10秒
@@ -410,25 +423,43 @@ public class AuthMe extends JavaPlugin {
                 // 处理JSON响应
                 String latestVersion = response.substring(response.indexOf("tag_name") + 11);
                 latestVersion = latestVersion.substring(0, latestVersion.indexOf("\""));
-                if ((pluginBuild + pluginBuildNumber).equals(latestVersion)) {
+                if (isUpdateAvailable(latestVersion)) {
-                    getLogger().log(Level.INFO,"You are running the latest version.");
-                }
-                if (!(pluginBuild + pluginBuildNumber).equals(latestVersion)) {
-                    // Display update message
                     String message = "New version available! Latest:" + latestVersion + " Current:" + pluginBuild + pluginBuildNumber;
-                    getLogger().log(Level.INFO, message);
+                    getLogger().log(Level.WARNING, message);
-                    getLogger().log(Level.INFO,"Download from here:github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
+                    getLogger().log(Level.WARNING, "Download from here: github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
+                } else {
+                    getLogger().log(Level.INFO, "You are running the latest version.");
                 }
-            }catch (IOException e) {
+            } catch (IOException e) {
-                getLogger().log(Level.WARNING,"Error occurred while checking updates from GitHub. Reason: " + e.getMessage());
+                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")) {
+        } 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");
@@ -438,72 +469,6 @@ public class AuthMe extends JavaPlugin {
             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/";
-    private static final String SHA_URL_GITEE = "https://gitee.com/"+ owner_gitee +"/"+ repo + "/raw/master/"+pluginBuild+pluginBuildNumber+ ".sha";
-
-//    public void shaChecker() {
-//        // 请求SHA文件
-//
-//        String actualSha;
-//        try {
-//            URL url;
-//            if(settings.getProperty(SecuritySettings.SHA_CHECK_METHOD).equals("github")) {
-//                url = new URL(SHA_URL);
-//                logger.info("正在检查文件完整性...(GitHub)");
-//            } else if(settings.getProperty(SecuritySettings.SHA_CHECK_METHOD).equals("ghproxy")) {
-//                url = new URL(PROXY_URL + SHA_URL);
-//                logger.info("正在检查文件完整性...(GhProxy)");
-//            } else if (settings.getProperty(SecuritySettings.SHA_CHECK_METHOD).equals("gitee")) {
-//                url = new URL(SHA_URL_GITEE);
-//                logger.info("正在检查文件完整性...(Gitee)");
-//            }else {
-//                logger.warning("未知的SHA检查方法,将从GitHub获取SHA文件");
-//                url = new URL(SHA_URL);
-//            }
-//
-//
-//            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-//            conn.setConnectTimeout(10000);
-//            conn.setReadTimeout(9000);
-//            conn.setRequestMethod("GET");
-//            InputStream stream = conn.getInputStream();
-//            ByteArrayOutputStream result = new ByteArrayOutputStream();
-//            byte[] buffer = new byte[1024];
-//            int length;
-//            while ((length = stream.read(buffer)) != -1) {
-//                result.write(buffer, 0, length);
-//            }
-//            String expectedSha = result.toString().trim();
-//            // 计算插件文件的SHA值
-//            MessageDigest md = MessageDigest.getInstance(ALGORITHM);
-//            byte[] fileBytes = Files.readAllBytes(pluginfile.toPath());
-//            byte[] hashBytes = md.digest(fileBytes);
-//            StringBuilder sb = new StringBuilder();
-//            for (byte b : hashBytes) {
-//                sb.append(String.format("%02x", b));
-//            }
-//            actualSha = sb.toString();
-//
-//            // 比较SHA值并加载插件
-//            if (expectedSha.equals(actualSha)) {
-//                logger.info("SHA联网安全校验完毕");
-//            } else {
-//                // SHA值不匹配，插件可能被篡改
-//                logger.warning("SHA值不匹配,插件被篡改");
-//                stopOrUnload();
-//            }
-//        }catch (NoSuchAlgorithmException | IOException e){
-//            logger.warning("SHA校验失败,请尝试切换校验API");
-//            logger.warning("您当前请求的API为:" + settings.getProperty(SecuritySettings.SHA_CHECK_METHOD));
-//            stopOrUnload();
-//        }
-//    }
 
 
     /**

src/main/java/fr/xephi/authme/datasource/DataSourceType.java

@@ -4,6 +4,7 @@ package fr.xephi.authme.datasource;
  * DataSource type.
  */
 public enum DataSourceType {
+//    H2,
 
     MYSQL,
 

src/main/java/fr/xephi/authme/datasource/H2.java

@@ -0,0 +1,408 @@
+//package fr.xephi.authme.datasource;
+//
+//import com.google.common.annotations.VisibleForTesting;
+//import fr.xephi.authme.ConsoleLogger;
+//import fr.xephi.authme.data.auth.PlayerAuth;
+//import fr.xephi.authme.datasource.columnshandler.AuthMeColumnsHandler;
+//import fr.xephi.authme.output.ConsoleLoggerFactory;
+//import fr.xephi.authme.settings.Settings;
+//import fr.xephi.authme.settings.properties.DatabaseSettings;
+//
+//import java.io.File;
+//import java.sql.Connection;
+//import java.sql.DatabaseMetaData;
+//import java.sql.DriverManager;
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.SQLException;
+//import java.sql.Statement;
+//import java.util.ArrayList;
+//import java.util.Collection;
+//import java.util.HashSet;
+//import java.util.List;
+//import java.util.Locale;
+//import java.util.Set;
+//
+//import static fr.xephi.authme.datasource.SqlDataSourceUtils.getNullableLong;
+//import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
+//
+///**
+// * H2 data source.
+// */
+//@SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore
+//public class H2 extends AbstractSqlDataSource {
+//
+//    private final ConsoleLogger logger = ConsoleLoggerFactory.get(H2.class);
+//    private final Settings settings;
+//    private final File dataFolder;
+//    private final String database;
+//    private final String tableName;
+//    private final Columns col;
+//    private Connection con;
+//
+//    /**
+//     * Constructor for H2.
+//     *
+//     * @param settings   The settings instance
+//     * @param dataFolder The data folder
+//     * @throws SQLException when initialization of a SQL datasource failed
+//     */
+//    public H2(Settings settings, File dataFolder) throws SQLException {
+//        this.settings = settings;
+//        this.dataFolder = dataFolder;
+//        this.database = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
+//        this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
+//        this.col = new Columns(settings);
+//
+//        try {
+//            this.connect();
+//            this.setup();
+//        } catch (Exception ex) {
+//            logger.logException("Error during H2 initialization:", ex);
+//            throw ex;
+//        }
+//    }
+//
+//    @VisibleForTesting
+//    H2(Settings settings, File dataFolder, Connection connection) {
+//        this.settings = settings;
+//        this.dataFolder = dataFolder;
+//        this.database = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
+//        this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
+//        this.col = new Columns(settings);
+//        this.con = connection;
+//        this.columnsHandler = AuthMeColumnsHandler.createForSqlite(con, settings);
+//    }
+//
+//    /**
+//     * Initializes the connection to the H2 database.
+//     *
+//     * @throws SQLException when an SQL error occurs while connecting
+//     */
+//    protected void connect() throws SQLException {
+//        try {
+//            Class.forName("org.h2.Driver");
+//        } catch (ClassNotFoundException e) {
+//            throw new IllegalStateException("Failed to load H2 JDBC class", e);
+//        }
+//
+//        logger.debug("H2 driver loaded");
+//        this.con = DriverManager.getConnection(this.getJdbcUrl(this.dataFolder.getAbsolutePath(), "", this.database));
+//        this.columnsHandler = AuthMeColumnsHandler.createForSqlite(con, settings);
+//    }
+//
+//    /**
+//     * Creates the table if necessary, or adds any missing columns to the table.
+//     *
+//     * @throws SQLException when an SQL error occurs while initializing the database
+//     */
+//    @VisibleForTesting
+//    @SuppressWarnings("checkstyle:CyclomaticComplexity")
+//    protected void setup() throws SQLException {
+//        try (Statement st = con.createStatement()) {
+//            // Note: cannot add unique fields later on in SQLite, so we add it on initialization
+//            st.executeUpdate("CREATE TABLE IF NOT EXISTS " + tableName + " ("
+//                + col.ID + " INTEGER AUTO_INCREMENT, "
+//                + col.NAME + " VARCHAR(255) NOT NULL UNIQUE, "
+//                + "CONSTRAINT table_const_prim PRIMARY KEY (" + col.ID + "));");
+//
+//            DatabaseMetaData md = con.getMetaData();
+//
+//            if (isColumnMissing(md, col.REAL_NAME)) {
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
+//                    + col.REAL_NAME + " VARCHAR(255) NOT NULL DEFAULT 'Player';");
+//            }
+//
+//            if (isColumnMissing(md, col.PASSWORD)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.PASSWORD + " VARCHAR(255) NOT NULL DEFAULT '';");
+//            }
+//
+//            if (!col.SALT.isEmpty() && isColumnMissing(md, col.SALT)) {
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + col.SALT + " VARCHAR(255);");
+//            }
+//
+//            if (isColumnMissing(md, col.LAST_IP)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.LAST_IP + " VARCHAR(40);");
+//            }
+//
+//            if (isColumnMissing(md, col.LAST_LOGIN)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.LAST_LOGIN + " TIMESTAMP;");
+//            }
+//
+//            if (isColumnMissing(md, col.REGISTRATION_IP)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.REGISTRATION_IP + " VARCHAR(40);");
+//            }
+//
+//            if (isColumnMissing(md, col.REGISTRATION_DATE)) {
+//                addRegistrationDateColumn(st);
+//            }
+//
+//            if (isColumnMissing(md, col.LASTLOC_X)) {
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + col.LASTLOC_X
+//                    + " DOUBLE NOT NULL DEFAULT '0.0';");
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + col.LASTLOC_Y
+//                    + " DOUBLE NOT NULL DEFAULT '0.0';");
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + col.LASTLOC_Z
+//                    + " DOUBLE NOT NULL DEFAULT '0.0';");
+//            }
+//
+//            if (isColumnMissing(md, col.LASTLOC_WORLD)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.LASTLOC_WORLD + " VARCHAR(255) NOT NULL DEFAULT 'world';");
+//            }
+//
+//            if (isColumnMissing(md, col.LASTLOC_YAW)) {
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
+//                    + col.LASTLOC_YAW + " FLOAT;");
+//            }
+//
+//            if (isColumnMissing(md, col.LASTLOC_PITCH)) {
+//                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN "
+//                    + col.LASTLOC_PITCH + " FLOAT;");
+//            }
+//
+//            if (isColumnMissing(md, col.EMAIL)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.EMAIL + " VARCHAR(255);");
+//            }
+//
+//            if (isColumnMissing(md, col.IS_LOGGED)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.IS_LOGGED + " INT NOT NULL DEFAULT '0';");
+//            }
+//
+//            if (isColumnMissing(md, col.HAS_SESSION)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.HAS_SESSION + " INT NOT NULL DEFAULT '0';");
+//            }
+//
+//            if (isColumnMissing(md, col.TOTP_KEY)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.TOTP_KEY + " VARCHAR(32);");
+//            }
+//
+//            if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) {
+//                st.executeUpdate("ALTER TABLE " + tableName
+//                    + " ADD COLUMN " + col.PLAYER_UUID + " VARCHAR(36)");
+//            }
+//        }
+//        logger.info("H2 Setup finished");
+//    }
+//
+//
+//    private boolean isColumnMissing(DatabaseMetaData metaData, String columnName) throws SQLException {
+//        try (ResultSet rs = metaData.getColumns(null, null, tableName, columnName)) {
+//            return !rs.next();
+//        }
+//    }
+//
+//    @Override
+//    public void reload() {
+//        close(con);
+//        try {
+//            this.connect();
+//            this.setup();
+//        } catch (SQLException ex) {
+//            logger.logException("Error while reloading H2:", ex);
+//        }
+//    }
+//
+//    @Override
+//    public PlayerAuth getAuth(String user) {
+//        String sql = "SELECT * FROM " + tableName + " WHERE LOWER(" + col.NAME + ")=LOWER(?);";
+//        try (PreparedStatement pst = con.prepareStatement(sql)) {
+//            pst.setString(1, user);
+//            try (ResultSet rs = pst.executeQuery()) {
+//                if (rs.next()) {
+//                    return buildAuthFromResultSet(rs);
+//                }
+//            }
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public Set<String> getRecordsToPurge(long until) {
+//        Set<String> list = new HashSet<>();
+//        String select = "SELECT " + col.NAME + " FROM " + tableName + " WHERE MAX("
+//            + " COALESCE(" + col.LAST_LOGIN + ", 0),"
+//            + " COALESCE(" + col.REGISTRATION_DATE + ", 0)"
+//            + ") < ?;";
+//        try (PreparedStatement selectPst = con.prepareStatement(select)) {
+//            selectPst.setLong(1, until);
+//            try (ResultSet rs = selectPst.executeQuery()) {
+//                while (rs.next()) {
+//                    list.add(rs.getString(col.NAME));
+//                }
+//            }
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//
+//        return list;
+//    }
+//
+//    @Override
+//    public void purgeRecords(Collection<String> toPurge) {
+//        String delete = "DELETE FROM " + tableName + " WHERE " + col.NAME + "=?;";
+//        try (PreparedStatement deletePst = con.prepareStatement(delete)) {
+//            for (String name : toPurge) {
+//                deletePst.setString(1, name.toLowerCase(Locale.ROOT));
+//                deletePst.executeUpdate();
+//            }
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//    }
+//
+//    @Override
+//    public boolean removeAuth(String user) {
+//        String sql = "DELETE FROM " + tableName + " WHERE " + col.NAME + "=?;";
+//        try (PreparedStatement pst = con.prepareStatement(sql)) {
+//            pst.setString(1, user.toLowerCase(Locale.ROOT));
+//            pst.executeUpdate();
+//            return true;
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//        return false;
+//    }
+//
+//    @Override
+//    public void closeConnection() {
+//        try {
+//            if (con != null && !con.isClosed()) {
+//                con.close();
+//            }
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//    }
+//
+//    @Override
+//    public DataSourceType getType() {
+//        return DataSourceType.H2;
+//    }
+//
+//    @Override
+//    public List<PlayerAuth> getAllAuths() {
+//        List<PlayerAuth> auths = new ArrayList<>();
+//        String sql = "SELECT * FROM " + tableName + ";";
+//        try (PreparedStatement pst = con.prepareStatement(sql); ResultSet rs = pst.executeQuery()) {
+//            while (rs.next()) {
+//                PlayerAuth auth = buildAuthFromResultSet(rs);
+//                auths.add(auth);
+//            }
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//        return auths;
+//    }
+//
+//    @Override
+//    public List<String> getLoggedPlayersWithEmptyMail() {
+//        List<String> players = new ArrayList<>();
+//        String sql = "SELECT " + col.REAL_NAME + " FROM " + tableName + " WHERE " + col.IS_LOGGED + " = 1"
+//            + " AND (" + col.EMAIL + " = 'your@email.com' OR " + col.EMAIL + " IS NULL);";
+//        try (Statement st = con.createStatement(); ResultSet rs = st.executeQuery(sql)) {
+//            while (rs.next()) {
+//                players.add(rs.getString(1));
+//            }
+//        } catch (SQLException ex) {
+//            logSqlException(ex);
+//        }
+//        return players;
+//    }
+//
+//    @Override
+//    public List<PlayerAuth> getRecentlyLoggedInPlayers() {
+//        List<PlayerAuth> players = new ArrayList<>();
+//        String sql = "SELECT * FROM " + tableName + " ORDER BY " + col.LAST_LOGIN + " DESC LIMIT 10;";
+//        try (Statement st = con.createStatement(); ResultSet rs = st.executeQuery(sql)) {
+//            while (rs.next()) {
+//                players.add(buildAuthFromResultSet(rs));
+//            }
+//        } catch (SQLException e) {
+//            logSqlException(e);
+//        }
+//        return players;
+//    }
+//
+//
+//    @Override
+//    public boolean setTotpKey(String user, String totpKey) {
+//        String sql = "UPDATE " + tableName + " SET " + col.TOTP_KEY + " = ? WHERE " + col.NAME + " = ?";
+//        try (PreparedStatement pst = con.prepareStatement(sql)) {
+//            pst.setString(1, totpKey);
+//            pst.setString(2, user.toLowerCase(Locale.ROOT));
+//            pst.executeUpdate();
+//            return true;
+//        } catch (SQLException e) {
+//            logSqlException(e);
+//        }
+//        return false;
+//    }
+//
+//    private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
+//        String salt = !col.SALT.isEmpty() ? row.getString(col.SALT) : null;
+//
+//        return PlayerAuth.builder()
+//            .name(row.getString(col.NAME))
+//            .email(row.getString(col.EMAIL))
+//            .realName(row.getString(col.REAL_NAME))
+//            .password(row.getString(col.PASSWORD), salt)
+//            .totpKey(row.getString(col.TOTP_KEY))
+//            .lastLogin(getNullableLong(row, col.LAST_LOGIN))
+//            .lastIp(row.getString(col.LAST_IP))
+//            .registrationDate(row.getLong(col.REGISTRATION_DATE))
+//            .registrationIp(row.getString(col.REGISTRATION_IP))
+//            .locX(row.getDouble(col.LASTLOC_X))
+//            .locY(row.getDouble(col.LASTLOC_Y))
+//            .locZ(row.getDouble(col.LASTLOC_Z))
+//            .locWorld(row.getString(col.LASTLOC_WORLD))
+//            .locYaw(row.getFloat(col.LASTLOC_YAW))
+//            .locPitch(row.getFloat(col.LASTLOC_PITCH))
+//            .build();
+//    }
+//
+//    /**
+//     * Creates the column for registration date and sets all entries to the current timestamp.
+//     * We do so in order to avoid issues with purging, where entries with 0 / NULL might get
+//     * purged immediately on startup otherwise.
+//     *
+//     * @param st Statement object to the database
+//     */
+//    private void addRegistrationDateColumn(Statement st) throws SQLException {
+//        st.executeUpdate("ALTER TABLE " + tableName
+//            + " ADD COLUMN " + col.REGISTRATION_DATE + " TIMESTAMP NOT NULL DEFAULT '0';");
+//
+//        // Use the timestamp from Java to avoid timezone issues in case JVM and database are out of sync
+//        long currentTimestamp = System.currentTimeMillis();
+//        int updatedRows = st.executeUpdate(String.format("UPDATE %s SET %s = %d;",
+//            tableName, col.REGISTRATION_DATE, currentTimestamp));
+//        logger.info("Created column '" + col.REGISTRATION_DATE + "' and set the current timestamp, "
+//            + currentTimestamp + ", to all " + updatedRows + " rows");
+//    }
+//
+//    @Override
+//    String getJdbcUrl(String dataPath, String ignored, String database) {
+//        return "jdbc:h2:" + dataPath + File.separator + database + ".db";
+//    }
+//
+//    private static void close(Connection con) {
+//        if (con != null) {
+//            try {
+//                con.close();
+//            } catch (SQLException ex) {
+//                logSqlException(ex);
+//            }
+//        }
+//    }
+//}
+//

src/main/java/fr/xephi/authme/initialization/DataSourceProvider.java

@@ -76,6 +76,9 @@ public class DataSourceProvider implements Provider<DataSource> {
             case SQLITE:
                 dataSource = new SQLite(settings, dataFolder);
                 break;
+//            case H2:
+//                dataSource = new H2(settings, dataFolder);
+//                break;
             default:
                 throw new UnsupportedOperationException("Unknown data source type '" + dataSourceType + "'");
         }

src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java

@@ -109,6 +109,6 @@ public class OnStartupTasks {
                     }
                 });
             }
-        }, 1, TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
+        }, 1, (long) TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
     }
 }

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

@@ -0,0 +1,62 @@
+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.events.RestoreSessionEvent;
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.settings.Settings;
+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;
+    @Inject
+    private Messages messages;
+
+    @Inject
+    private Settings settings;
+
+    public BedrockAutoLoginListener() {
+    }
+
+    private boolean isBedrockPlayer(UUID uuid) {
+        return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    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);
+            messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerAuthMeSessionRestore(RestoreSessionEvent event) {
+        Player player = event.getPlayer();
+        UUID uuid = player.getUniqueId();
+        if (isBedrockPlayer(uuid)) {
+            event.setCancelled(true);
+        }
+    }
+}

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

@@ -1,32 +1,32 @@
 package fr.xephi.authme.listener;
 //Prevent Ghost Players
 
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.service.CommonService;
 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 javax.inject.Inject;
 import java.util.Collection;
 import java.util.HashSet;
 
 public class DoubleLoginFixListener implements Listener {
-    private final Plugin plugin;
+    @Inject
-
+    private CommonService service;
-
-
-    public DoubleLoginFixListener(Plugin plugin) {
-        this.plugin = plugin;
 
+    public DoubleLoginFixListener() {
     }
+
     @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.");
+                ep.kickPlayer(service.retrieveSingleMessage(ep.getPlayer(), MessageKey.DOUBLE_LOGIN_FIX));
                 break;
             }
             PlayerSet.add(ep.getName().toLowerCase());

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

@@ -1,12 +1,18 @@
 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.earth2me.essentials.libs.checkerframework.checker.nullness.qual.NonNull;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.events.LoginEvent;
+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.Settings;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -18,31 +24,53 @@ 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.PlayerLoginEvent;
 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 javax.inject.Inject;
 import java.io.File;
-import java.util.Objects;
+import java.util.List;
 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.getPlayerIp;
+import static fr.xephi.authme.util.PlayerUtils.isNpc;
 import static org.bukkit.Bukkit.getLogger;
 import static org.bukkit.Bukkit.getServer;
+
+/**
+ * This class handles ALL the GUI captcha features in the plugin.
+ */
 public class GuiCaptchaHandler implements Listener {
     //define AuthMeApi
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-    private final Plugin plugin;
+    @Inject
+    private BukkitService bukkitService;
+    @Inject
+    private AuthMe plugin;
+    @Inject
+    private Messages messages;
+    @Inject
+    private CommonService service;
 
+    @Inject
+    private Settings settings;
+
+
+    private PacketAdapter chatPacketListener;
+    private PacketAdapter windowPacketListener;
 
     //define timesLeft
-    public int timesLeft = 3;
+    private int timesLeft = 3;
     //Use ConcurrentHashMap to store player and their close reason
     /* We used many async tasks so there is concurrent**/
-    protected static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
+    public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
     //define randomStringSet
     String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
     String randomString = "";
@@ -50,10 +78,28 @@ public class GuiCaptchaHandler implements Listener {
     Random howManyRandom = new Random();
 
 
-    int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+    private boolean isPacketListenersActive = false;
 
-    public GuiCaptchaHandler(Plugin plugin) {
+    public GuiCaptchaHandler() {
-        this.plugin = plugin;
+    }
+
+    private StringBuilder sb;
+    private final List<String> whiteList = AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_COUNTRY_WHITELIST);
+
+    private boolean isBedrockPlayer(UUID uuid) {
+        if (getServer().getPluginManager().getPlugin("floodgate") != null) {
+            return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid);
+        }
+        return false;
+    }
+
+
+    private void initializePacketListeners() {
+        if (!isPacketListenersActive) {
+            ProtocolLibrary.getProtocolManager().addPacketListener(windowPacketListener);
+            ProtocolLibrary.getProtocolManager().addPacketListener(chatPacketListener);
+            isPacketListenersActive = true;
+        }
     }
 
 
@@ -63,42 +109,27 @@ public class GuiCaptchaHandler implements Listener {
             Player player = (Player) event.getWhoClicked();
             ItemStack currentItem = event.getCurrentItem();
             if (!authmeApi.isRegistered(player.getName()) && !closeReasonMap.containsKey(player)) {
-                if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getWhoClicked().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
+                if (isBedrockPlayer(player.getUniqueId())) {
-                    if (!closeReasonMap.containsKey(player)) {
-                        closeReasonMap.put(player,"verified");
                     return;
                 }
-                    return;
+                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)) {
-                }
-                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)){
                     event.setCancelled(true);
+                    if (!closeReasonMap.containsKey(player)) {
                         closeReasonMap.put(player, "verified");
+                    }
                     player.closeInventory();
-                    player.sendMessage("§a验证完成");
+                    messages.send(player, MessageKey.GUI_CAPTCHA_VERIFIED);
-                } else {
-                    player.sendMessage("§c验证失败,你还有" + timesLeft + "§c次机会");
-                    timesLeft--;
                 }
-                //force to string
             }
         }
     }
 
-
+    @EventHandler(priority = EventPriority.HIGHEST)
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPlayerLogin(PlayerLoginEvent event) {
-    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
-        randomString = "";
+        bukkitService.runTaskAsynchronously(() -> {
-        Player playerunreg = event.getPlayer();
+            sb = new StringBuilder();
-        String name = playerunreg.getName();
+            int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
-        if (!authmeApi.isRegistered(name)) {
-            if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getPlayer().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
-                closeReasonMap.put(playerunreg, "verified");
-                playerunreg.sendMessage("§a基岩版自动验证完成");
-                return;
-            }
-            Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> {
-                StringBuilder sb = new StringBuilder();
-                howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
             for (int i = 0; i < howLongIsRandomString; i++) {
                 //生成随机索引号
                 int index = randomItemSet.nextInt(randomSet.length());
@@ -109,102 +140,128 @@ public class GuiCaptchaHandler implements Listener {
                 // 将字符追加到字符串生成器
                 sb.append(randomChar);
             }
+            if (!whiteList.isEmpty()) {
+                String ip = getPlayerIp(player);
+                if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) {
+                    if (!closeReasonMap.containsKey(player)) {
+                        closeReasonMap.put(player, "verified:whitelist");
+                    }
+                }
+            }
+        });
+    }
 
-                Bukkit.getScheduler().runTask(this.plugin, () -> {
+    @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) && !closeReasonMap.containsKey(playerunreg)) {
+            if (isBedrockPlayer(playerunreg.getUniqueId())) {
+                if (!closeReasonMap.containsKey(playerunreg)) {
+                    closeReasonMap.put(playerunreg, "verified:bedrock");
+                }
+                messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
+                return;
+            }
+
+            bukkitService.runTaskAsynchronously(() -> {
+                bukkitService.runTask(() -> {
                     randomString = sb.toString();
                     Random random_blockpos = new Random();
                     AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
-                    Inventory menu = Bukkit.createInventory(null, 27, randomString + "请验证你是真人");
+                    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("§a我是真人");
+                            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.");
                     }
-                    Bukkit.getScheduler().runTask(this.plugin, () -> {
+                    windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
-                        menu.setItem(random_num.get(), item);
-                    });
-                    menu.setItem(random_num.get(), item);
-                    Bukkit.getScheduler().runTask(this.plugin, () -> {
-                        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)) {
-                            Bukkit.getScheduler().runTask(this.plugin, () -> {
-                                Bukkit.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;
-                        Bukkit.getScheduler().runTask(this.plugin, () -> {
-                            Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
-                                if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
-                                    playerunreg.kickPlayer("§c验证超时");
-                                    timesLeft = 3; // Reset the attempt counter
-                                }
-                            }, finalTimeOut * 20L);
-                        });
-                    }
-
-                    Bukkit.getScheduler().runTask(this.plugin, () -> {
-                        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) && !authmeApi.isRegistered(playerunreg.getName())) {
+                            Player packetPlayer = event.getPlayer();
+                            if (!closeReasonMap.containsKey(packetPlayer) && !authmeApi.isRegistered(packetPlayer.getName())) {
                                 if (timesLeft <= 0) {
-                                        Bukkit.getScheduler().runTask(this.plugin, () -> {
+                                    bukkitService.runTask(() -> {
-                                            playerunreg.kickPlayer("§c请先完成人机验证!");
+                                        packetPlayer.kickPlayer(service.retrieveSingleMessage(packetPlayer, MessageKey.GUI_CAPTCHA_KICK_FAILED));
+                                    });
+                                    timesLeft = 3;
+                                } else {
+                                    --timesLeft;
+                                    if (timesLeft <= 0) {
+                                        bukkitService.runTask(() -> {
+                                            packetPlayer.kickPlayer(service.retrieveSingleMessage(packetPlayer, MessageKey.GUI_CAPTCHA_KICK_FAILED));
                                         });
                                         timesLeft = 3;
                                         return;
-                                    } else {
-                                        timesLeft--;
-                                        playerunreg.sendMessage("§c请先完成验证!,你还有" + timesLeft + "次机会");
-
                                     }
+                                    messages.send(packetPlayer, MessageKey.GUI_CAPTCHA_RETRY_MESSAGE, String.valueOf(timesLeft));
                                     event.setCancelled(true);
                                     random_num.set(random_blockpos.nextInt(26));
-                                    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                                    bukkitService.runTask(() -> {
-                                        Bukkit.getScheduler().runTask(plugin, () -> {
                                         menu.clear();
                                         menu.setItem(random_num.get(), item);
-                                        });
+                                        packetPlayer.openInventory(menu);
-
-                                        Bukkit.getScheduler().runTask(plugin, () -> {
-                                            playerunreg.openInventory(menu);
-                                        });
                                     });
                                 }
                             }
-                        });
+                        }
-                    });
+                    };
-                    Bukkit.getScheduler().runTask(this.plugin, () -> {
+                    chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
-
-                        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) && !authmeApi.isRegistered(playerunreg.getName())) {
+                            Player packetPlayer = event.getPlayer();
-                                    playerunreg.sendMessage("§c请先完成验证!");
+                            if (!closeReasonMap.containsKey(packetPlayer) && !authmeApi.isRegistered(packetPlayer.getName())) {
+                                messages.send(packetPlayer, MessageKey.GUI_CAPTCHA_DENIED_MESSAGE);
                                 event.setCancelled(true);
                             }
                         }
+                    };
+                    initializePacketListeners();
+                    //Open captcha inventory
+                    menu.setItem(random_num.get(), item);
+                    playerunreg.openInventory(menu);
+                    if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > 0) {
+                        long timeOut = settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT);
+                        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > settings.getProperty(RestrictionSettings.TIMEOUT)) {
+                            bukkitService.runTask(() -> {
+                                getLogger().warning("AuthMe detected that your GUI captcha timeout seconds(" + settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) + ") is bigger than the Login timeout seconds(" +
+                                    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 = settings.getProperty(RestrictionSettings.TIMEOUT);
+                        }
+                        long finalTimeOut = timeOut;
+                        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);
+                    }
                 });
             });
         }
     }
 
+    //This prevents players from unregistering by Admins
+    @EventHandler
+    public void onPlayerAuthMeLogin(LoginEvent event) {
+        Player player = event.getPlayer();
+        if (!closeReasonMap.containsKey(player)) {
+            closeReasonMap.put(player, "verified:login");
+        }
+    }
+
+
     private void deletePlayerData(UUID playerUUID) {
         // 获取服务器的存储文件夹路径
         File serverFolder = Bukkit.getServer().getWorldContainer();
-        String worldFolderName = AuthMe.settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        String worldFolderName = settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
         // 构建playerdata文件夹路径
         File playerDataFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "playerdata");
 
@@ -216,34 +273,45 @@ public class GuiCaptchaHandler implements Listener {
             playerDataFile.delete();
         }
     }
+
     private void deletePlayerStats(UUID playerUUID) {
         // 获取服务器的存储文件夹路径
         File serverFolder = Bukkit.getServer().getWorldContainer();
-        String worldFolderName = AuthMe.settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        String worldFolderName = 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();
         }
     }
 
+    private void deleteAuthMePlayerData(UUID playerUUID) {
+        File pluginFolder = plugin.getDataFolder();
+        File path = new File(pluginFolder, File.separator + "playerdata" + File.separator + playerUUID);
+        File dataFile = new File(path, File.separator + "data.json");
+        if (dataFile.exists()) {
+            dataFile.delete();
+            path.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)){
+            if (settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)) {
-                Bukkit.getScheduler().runTaskLater(this.plugin , () -> {
+                bukkitService.runTaskLater(() -> {
-                    if(!player.isOnline()) {
+                    if (!player.isOnline()) {
                         deletePlayerData(playerUUID);
                         deletePlayerStats(playerUUID);
+                        deleteAuthMePlayerData(playerUUID);
                     }
-                },100L);
+                }, 100L);
                 return;
             }
             closeReasonMap.remove(player);

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

@@ -1,47 +1,94 @@
 package fr.xephi.authme.listener;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.events.LoginEvent;
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.settings.Settings;
 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.Event;
 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{
+import javax.inject.Inject;
-    private final Plugin plugin;
+import java.lang.reflect.Method;
+
+
+public class LoginLocationFixListener implements Listener {
+    @Inject
+    private AuthMe plugin;
+    @Inject
+    private Messages messages;
+    @Inject
+    private Settings settings;
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-    public LoginLocationFixListener(Plugin plugin) {
+
-        this.plugin = plugin;
+    public LoginLocationFixListener() {
     }
+
+    private static Material materialPortal = Material.matchMaterial("PORTAL");
+
+    private boolean isChecked = false;
+    private boolean isGetMinHeight = false;
+    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");
+            }
+        }
+    }
+
+    private int getMinHeight(World world) {
+        //This keeps compatibility of 1.16.x and lower
+        try {
+            if (!isChecked) {
+                Method getMinHeightMethod = World.class.getMethod("getMinHeight");
+                getMinHeightMethod.setAccessible(true);
+                isChecked = true;
+                isGetMinHeight = true;
+                return world.getMinHeight();
+            } else if (isGetMinHeight) {
+                return world.getMinHeight();
+            } else {
+                return 0;
+            }
+        } catch (NoSuchMethodException e) {
+            isChecked = true;
+            return 0;
+        }
+    }
+
+
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        if (authmeApi.isRegistered(player.getName())) {
+        Location JoinLocation = player.getLocation();
-            Material material = Material.matchMaterial("PORTAL");
+        if (isFixPortalStuck) {
-            if (material == null) {
+            if (!JoinLocation.getBlock().getType().equals(materialPortal) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(materialPortal)) {
-                material = Material.matchMaterial("PORTAL_BLOCK");
-            } else {
-                material = Material.matchMaterial("NETHER_PORTAL");
-            }
-            Location JoinLocation = player.getLocation().getBlock().getLocation().add(0.5, 0.1, 0.5);
-            if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
-                if (!JoinLocation.getBlock().getType().equals(material) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(material)) {
                 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;
                 }
@@ -50,16 +97,16 @@ public class LoginLocationFixListener implements Listener{
                 JoinBlock.getRelative(BlockFace.UP).breakNaturally();
                 JoinBlock.breakNaturally();
             }
-                player.sendMessage("§a你在登录时卡在了地狱门, 现已修正");
+            messages.send(player, MessageKey.LOCATION_FIX_PORTAL);
-            } else if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND)) {
+        }
+        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++) {
+            for (int i = getMinHeight(world); i <= MaxHeight; i++) {
                 JoinLocation.setY(i);
                 Block JoinBlock = JoinLocation.getBlock();
                 if ((JoinBlock.getRelative(BlockFace.DOWN).getType().isBlock())
@@ -68,16 +115,24 @@ public class LoginLocationFixListener implements Listener{
                     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你被埋住了, 坐标已修正, 下次下线之前请小心!");
+                    }
+                    messages.send(player, MessageKey.LOCATION_FIX_UNDERGROUND);
                     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你被埋住了, 坐标无法修正, 只好送你去了最高点, 自求多福吧少年~");
+                    }
-                    }
+                    messages.send(player, MessageKey.LOCATION_FIX_UNDERGROUND_CANT_FIX);
                 }
             }
         }
+
     }
 }

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

@@ -1,17 +1,7 @@
 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 fr.xephi.authme.settings.properties.PluginSettings;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -26,18 +16,26 @@ public class PlayerListenerHigherThan18 implements Listener {
     @Inject
     private ListenerService listenerService;
 
+    @Inject
+    private Settings settings;
+
     @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"))
+        if ((!player.isSneaking() || !player.hasPermission("keybindings.use")) &&
+            settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
             return;
+        }
         event.setCancelled(true);
+        if (settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
             Bukkit.dispatchCommand(event.getPlayer(), "help");
         }
+    }
 }

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

@@ -4,13 +4,84 @@ package fr.xephi.authme.message;
  * Keys for translatable messages managed by {@link Messages}.
  */
 public enum MessageKey {
-    /** In order to use this command you must be authenticated! */
+    /**
+     * You have been disconnected due to doubled login.
+     */
+    DOUBLE_LOGIN_FIX("double_login_fix.fix_message"),
+
+    /**
+     * You are stuck in portal during Login.
+     */
+    LOCATION_FIX_PORTAL("login_location_fix.fix_portal"),
+
+    /**
+     * You are stuck underground during Login.
+     */
+    LOCATION_FIX_UNDERGROUND("login_location_fix.fix_underground"),
+
+    /**
+     * You are stuck underground during Login, but we cant fix it.
+     */
+    LOCATION_FIX_UNDERGROUND_CANT_FIX("login_location_fix.cannot_fix_underground"),
+
+    /**
+     * Bedrock auto login success!
+     */
+    BEDROCK_AUTO_LOGGED_IN("bedrock_auto_login.success"),
+
+    /**
+     * %random Verification
+     */
+    GUI_CAPTCHA_WINDOW_NAME("gui_captcha.captcha_window_name", "%random"),
+
+    /**
+     * %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,10 @@ 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")
+            .put("bedrock_auto_login", "3rd party features: Bedrock Auto Login")
+            .put("login_location_fix", "3rd party features: Login Location Fix")
+            .put("double_login_fix", "3rd party features: Double Login Fix")
             .build();
 
         Set<String> addedKeys = new HashSet<>();

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

@@ -36,4 +36,12 @@ public class MigraterYamlFileResource extends YamlFileResource {
         }
         return singleQuoteYaml;
     }
+
+    // Because we set the YAML object to put strings in single quotes, this method by default uses that YAML object
+    // and also puts all paths as single quotes. Override to just always return the same string since we know those
+    // are only message names (so never any conflicting strings like "true" or "0").
+    @Override
+    protected String escapePathElementIfNeeded(String path) {
+        return path;
+    }
 }

src/main/java/fr/xephi/authme/service/AntiBotService.java

@@ -73,7 +73,7 @@ public class AntiBotService implements SettingsDependent {
         // Delay the schedule on first start
         if (startup) {
             int delay = settings.getProperty(ProtectionSettings.ANTIBOT_DELAY);
-            bukkitService.scheduleSyncDelayedTask(enableTask, delay * TICKS_PER_SECOND);
+            bukkitService.scheduleSyncDelayedTask(enableTask, (long) delay * TICKS_PER_SECOND);
             startup = false;
         } else {
             enableTask.run();
@@ -91,7 +91,7 @@ public class AntiBotService implements SettingsDependent {
             disableTask.cancel();
         }
         // Schedule auto-disable
-        disableTask = bukkitService.runTaskLater(this::stopProtection, duration * TICKS_PER_MINUTE);
+        disableTask = bukkitService.runTaskLater(this::stopProtection, (long) duration * TICKS_PER_MINUTE);
         antiBotStatus = AntiBotStatus.ACTIVE;
         bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
             // Inform admins

src/main/java/fr/xephi/authme/service/TeleportationService.java

@@ -14,6 +14,8 @@ import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -184,7 +186,9 @@ public class TeleportationService implements Reloadable {
     private void performTeleportation(final Player player, final AbstractTeleportEvent event) {
         bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
             bukkitService.callEvent(event);
-            if (player.isOnline() && isEventValid(event)) {
+            if (player.isOnline() && isEventValid(event) && settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                TeleportUtils.teleport(player, event.getTo());
+            } else if (player.isOnline() && isEventValid(event)) {
                 player.teleport(event.getTo());
             }
         });

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

@@ -19,7 +19,9 @@ public final class HooksSettings implements SettingsHolder {
     public static final Property<Boolean> BUNGEECORD =
         newProperty("Hooks.bungeecord", false);
 
-    @Comment("Allow FloodGatePlayer Join Without checkIsValidName()")
+    @Comment({"Allow FloodGatePlayer Join Without checkIsValidName()",
+        "This must be true if you want to use other bedrock features."
+    })
     public static final Property<Boolean> HOOK_FLOODGATE_PLAYER =
         newProperty("Hooks.floodgate", false);
 

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

@@ -8,6 +8,13 @@ import fr.xephi.authme.output.LogLevel;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
 public final class PluginSettings implements SettingsHolder {
+    @Comment({
+        "Should we execute /help command when unregistered players press Shift+F?",
+        "This keeps compatibility with some menu plugins",
+        "If you are using TrMenu, don't enable this because TrMenu already implemented this."
+    })
+    public static final Property<Boolean> MENU_UNREGISTER_COMPATIBILITY =
+        newProperty("3rdPartyFeature.compatibility.menuPlugins", true);
 
     @Comment({
         "Do you want to enable the session feature?",
@@ -32,7 +39,7 @@ public final class PluginSettings implements SettingsHolder {
         "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/translations.md"
     })
     public static final Property<String> MESSAGES_LANGUAGE =
-        newProperty("settings.messagesLanguage", "zhcn");
+        newProperty("settings.messagesLanguage", "en");
 
     @Comment({
         "Enables switching a player to defined permission groups before they log in.",

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

@@ -14,11 +14,11 @@ public final class ProtectionSettings implements SettingsHolder {
 
     @Comment("Enable some servers protection (country based login, antibot)")
     public static final Property<Boolean> ENABLE_PROTECTION =
-        newProperty("Protection.enableProtection", true);
+        newProperty("Protection.enableProtection", false);
 
     @Comment("Apply the protection also to registered usernames")
     public static final Property<Boolean> ENABLE_PROTECTION_REGISTERED =
-        newProperty("Protection.enableProtectionRegistered", true);
+        newProperty("Protection.enableProtectionRegistered", false);
 
     @Comment({
         "Countries allowed to join the server and register. For country codes, see",
@@ -26,7 +26,7 @@ public final class ProtectionSettings implements SettingsHolder {
         "Use \"LOCALHOST\" for local addresses.",
         "PLEASE USE QUOTES!"})
     public static final Property<List<String>> COUNTRIES_WHITELIST =
-        newListProperty("Protection.countries", "CN", "LOCALHOST");
+        newListProperty("Protection.countries", "LOCALHOST");
 
     @Comment({
         "Countries not allowed to join the server and register",

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

@@ -2,12 +2,14 @@ package fr.xephi.authme.settings.properties;
 
 import ch.jalu.configme.Comment;
 import ch.jalu.configme.SettingsHolder;
-
 import ch.jalu.configme.properties.Property;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.settings.EnumSetProperty;
+
+import java.util.List;
 import java.util.Set;
 
+import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
 import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseStringSetProperty;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
@@ -19,53 +21,54 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Boolean> STOP_SERVER_ON_PROBLEM =
         newProperty("Security.SQLProblem.stopServer", false);
 
+    @Comment({"Should send GUI captcha by country code whitelist?",
+        "If the country of the player is in this list, the captcha won't be sent."})
+    public static final Property<List<String>> GUI_CAPTCHA_COUNTRY_WHITELIST =
+        newListProperty("3rdPartyFeature.features.captcha.whiteList");
+
+    @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);
+    public static final Property<Boolean> ANTI_GHOST_PLAYERS =
+        newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
 
     @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);
+    public static final Property<Boolean> GUI_CAPTCHA =
+        newProperty("3rdPartyFeature.features.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);
+    public static final Property<Integer> GUI_CAPTCHA_TIMEOUT =
+        newProperty("3rdPartyFeature.features.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);
+    public static final Property<Boolean> GUI_CAPTCHA_BE_COMPATIBILITY =
+        newProperty("3rdPartyFeature.features.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);
+    public static final Property<Boolean> DELETE_UNVERIFIED_PLAYER_DATA =
+        newProperty("3rdPartyFeature.features.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");
+    public static final Property<String> DELETE_PLAYER_DATA_WORLD =
-
+        newProperty("3rdPartyFeature.features.captcha.purgeWorldFolderName", "world");
-    @Comment("Should we enable the new LoginLocationFix feature?")
-    public static final Property<Boolean> LOGIN_LOC_FIX = newProperty("3rdPartyFeature.fixes.loginLocationFix.enabled", false);
 
     @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);
+    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);
+    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({"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");
-
-    //@Comment("Should we use the local cache sometimes instead of requesting API?")
-    //public static  final Property<Boolean> USE_LOCAL_CACHE = newProperty("Plugin.hashing.useLocalCache",false);
-
-    //@Comment("DON'T TOUCH!!!")
-    //public static final Property<String> SHA_CHECK_CACHE = newProperty("Plugin.hashing.hashCached","");
 
     @Comment("Copy AuthMe log output in a separate file as well?")
     public static final Property<Boolean> USE_LOGGING =

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

@@ -6,21 +6,9 @@ import org.bukkit.entity.Player;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-//
+/**
-//public class TeleportUtils {
+ * This class is a utility class for handling async teleportation of players in game.
-//    public static void teleport(Player player, Location location) {
+ */
-//        try {
-//            Class<?> paperClass = Class.forName("com.destroystokyo.paper.PaperConfig");
-//            // Paper API is loaded, use teleportAsync
-//            Method teleportAsyncMethod = player.getClass().getMethod("teleportAsync", Location.class);
-//            teleportAsyncMethod.setAccessible(true);
-//            teleportAsyncMethod.invoke(player, location);
-//        } catch (ClassNotFoundException | InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-//            // Paper API is not loaded, use normal teleport
-//            player.teleport(location);
-//        }
-//    }
-//}
 public class TeleportUtils {
     private static Method teleportAsyncMethod;
 
@@ -28,6 +16,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;
@@ -35,10 +24,15 @@ public class TeleportUtils {
         }
     }
 
+    /**
+     * Teleport a player to a specified location.
+     *
+     * @param player   The player to be teleported
+     * @param location Where should the player be teleported
+     */
     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/email.html

@@ -103,7 +103,8 @@
                                     <tr>
                                         <td>
                                             <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
-                                            <a href="1919810.com" target="_blank" style="text-decoration: none; font-size: 16px">homomc.cc</a>
+                                            <a href="1919810.com" target="_blank"
+                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/messages/help_ja.yml

@@ -0,0 +1,45 @@
+# Translation config for the AuthMe help, e.g. when /authme help or /authme help register is called
+
+# -------------------------------------------------------
+# List of texts used in the help section
+common:
+    header: '==========[ AuthMeReloaded ヘルプ ]=========='
+    optional: 'オプション'
+    hasPermission: '権限を持っています'
+    noPermission: '権限がありません'
+    default: 'デフォルト'
+    result: '結果'
+    defaultPermissions:
+        notAllowed: '権限がありません'
+        opOnly: 'OPのみ'
+        allowed: '全員に許可'
+
+# -------------------------------------------------------
+# Titles of the individual help sections
+# Set the translation text to empty text to disable the section, e.g. to hide alternatives:
+#   alternatives: ''
+section:
+    command: 'コマンド'
+    description: '簡単な説明'
+    detailedDescription: '詳細な説明'
+    arguments: '引数'
+    permissions: '権限'
+    alternatives: '代替'
+    children: 'コマンド'
+
+# -------------------------------------------------------
+# You can translate the data for all commands using the below pattern.
+# For example to translate /authme reload, create a section "authme.reload", or "login" for /login
+# If the command has arguments, you can use arg1 as below to translate the first argument, and so forth
+# Translations don't need to be complete; any missing section will be taken from the default silently
+# Important: Put main commands like "authme" before their children (e.g. "authme.reload")
+commands:
+    authme.register:
+        description: 'プレイヤーを登録します'
+        detailedDescription: '指定されたプレイヤーを指定されたパスワードで登録します。'
+        arg1:
+            label: 'プレイヤー名'
+            description: 'プレイヤー名'
+        arg2:
+            label: 'パスワード'
+            description: 'パスワード'

src/main/resources/messages/help_lt.yml

@@ -0,0 +1,45 @@
+# Translation config for the AuthMe help, e.g. when /authme help or /authme help register is called
+
+# -------------------------------------------------------
+# List of texts used in the help section
+common:
+    header: '==========[ AuthMeReloaded PAGALBA ]=========='
+    optional: 'Neprivaloma'
+    hasPermission: 'Jūs turite leidimą'
+    noPermission: 'Jūs neturite leidimo'
+    default: 'Numatytas'
+    result: 'Rezultatas'
+    defaultPermissions:
+        notAllowed: 'Nėra leidimo'
+        opOnly: 'Tik OP'
+        allowed: 'Visiems leistina'
+
+# -------------------------------------------------------
+# Titles of the individual help sections
+# Set the translation text to empty text to disable the section, e.g. to hide alternatives:
+#   alternatives: ''
+section:
+    command: 'Komanda'
+    description: 'Trumpas aprašas'
+    detailedDescription: 'Detalus aprašas'
+    arguments: 'Argumentai'
+    permissions: 'Leidimai'
+    alternatives: 'Alternatyvos'
+    children: 'Komandos'
+
+# -------------------------------------------------------
+# You can translate the data for all commands using the below pattern.
+# For example to translate /authme reload, create a section "authme.reload", or "login" for /login
+# If the command has arguments, you can use arg1 as below to translate the first argument, and so forth
+# Translations don't need to be complete; any missing section will be taken from the default silently
+# Important: Put main commands like "authme" before their children (e.g. "authme.reload")
+commands:
+    authme.register:
+        description: 'Užregistruoti žaidėją'
+        detailedDescription: 'Užregistruokite nurodytą žaidėją su nurodytu slaptažodžiu.'
+        arg1:
+            label: 'žaidėjas'
+            description: 'Žaidėjo vardas'
+        arg2:
+            label: 'slaptažodis'
+            description: 'Slaptažodis'

src/main/resources/messages/messages_en.yml

@@ -155,3 +155,28 @@ 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!'
+
+# 3rd party features: Bedrock Auto Login
+bedrock_auto_login:
+  success: '&aBedrock auto login success!'
+
+# 3rd party features: Login Location Fix
+login_location_fix:
+  fix_portal: '&aYou are stuck in portal during Login.'
+  fix_underground: '&aYou are stuck underground during Login.'
+  cannot_fix_underground: '&aYou are stuck underground during Login, but we cant fix it.'
+
+# 3rd party features: Double Login Fix
+double_login_fix:
+  fix_message: '&cYou have been disconnected due to doubled login.'

src/main/resources/messages/messages_ja.yml

@@ -0,0 +1,156 @@
+# List of global tags:
+# %nl% - Goes to new line.
+# %username% - Replaces the username of the player receiving the message.
+# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
+
+# Registration
+registration:
+  register_request: '&3サーバーに登録するには、次のコマンドを使用してください: /register <パスワード> <パスワードの確認>'
+  command_usage: '&c使用方法: /register <パスワード> <パスワードの確認>'
+  reg_only: '&4登録済みのユーザーのみサーバーに参加できます！ 自分自身を登録するには、http://example.com にアクセスしてください！'
+  kicked_admin_registered: '管理者があなたを登録しました。再度ログインしてください。'
+  success: '&2登録が完了しました！'
+  disabled: '&cゲーム内での登録は無効になっています！'
+  name_taken: '&cこのユーザー名はすでに登録されています！'
+
+# Password errors on registration
+password:
+  match_error: '&cパスワードが一致しません。もう一度確認してください！'
+  name_in_password: '&cパスワードには自分の名前を使用することはできません。別のパスワードを選択してください...'
+  unsafe_password: '&c選択したパスワードは安全ではありません。別のパスワードを選択してください...'
+  forbidden_characters: '&4パスワードに不正な文字が含まれています。許可されている文字: %valid_chars'
+  wrong_length: '&cパスワードが短すぎるか長すぎます！別のパスワードを試してください！'
+
+# Login
+login:
+  command_usage: '&c使用方法: /login <パスワード>'
+  wrong_password: '&cパスワードが間違っています！'
+  success: '&2ログインが成功しました！'
+  login_request: '&c次のコマンドを使用してログインしてください: /login <パスワード>'
+  timeout_error: '&4ログインのタイムアウトが発生しました。サーバーからキックされました。もう一度試してください！'
+
+# Errors
+error:
+  unregistered_user: '&cこのユーザーは登録されていません！'
+  denied_command: '&cこのコマンドを使用するには認証が必要です！'
+  denied_chat: '&cチャットするには認証が必要です！'
+  not_logged_in: '&cログインしていません！'
+  tempban_max_logins: '&cログインに失敗した回数が多すぎるため、一時的にアクセスが制限されています。'
+  max_registration: '&c接続ごとの登録数が最大値を超えています（%reg_count/%max_acc %reg_names）！'
+  no_permission: '&4この操作を実行する権限がありません！'
+  unexpected_error: '&4予期しないエラーが発生しました。管理者に連絡してください！'
+  kick_for_vip: '&3VIPプレイヤーがサーバーが満員の状態で参加しました！'
+  logged_in: '&cすでにログイン済みです！'
+  kick_unresolved_hostname: '&cエラーが発生しました：解決できないプレイヤーのホスト名！'
+
+# AntiBot
+antibot:
+  kick_antibot: 'AntiBot保護モードが有効です！サーバーに参加するまでにしばらくお待ちください。'
+  auto_enabled: '&4[AntiBotService] 接続数が非常に多いため、AntiBotが有効になりました！'
+  auto_disabled: '&2[AntiBotService] %m 分後にAntiBotが無効になりました！'
+
+unregister:
+  success: '&c登録が正常に解除されました！'
+  command_usage: '&c使用方法: /unregister <パスワード>'
+
+# Other messages
+misc:
+  accounts_owned_self: '所持しているアカウント数：%count 個'
+  accounts_owned_other: 'プレイヤー %name のアカウント数：%count 個'
+  account_not_activated: '&cアカウントはまだ有効化されていません。メールを確認してください！'
+  password_changed: '&2パスワードが正常に変更されました！'
+  logout: '&2正常にログアウトしました！'
+  reload: '&2設定とデータベースが正常に再読み込みされました！'
+  usage_change_password: '&c使用方法: /changepassword <旧パスワード> <新パスワード>'
+
+# Session messages
+session:
+  invalid_session: '&cIPアドレスが変更され、セッションのデータが期限切れです！'
+  valid_session: '&2セッションの再接続によるログインです。'
+
+# Error messages when joining
+on_join_validation:
+  name_length: '&4ユーザー名が短すぎるか長すぎます！'
+  characters_in_name: '&4ユーザー名に無効な文字が含まれています。許可される文字：%valid_chars'
+  country_banned: '&4このサーバーへのアクセスは、お使いの国から制限されています！'
+  not_owner_error: 'このアカウントの所有者ではありません。別の名前を選択してください！'
+  kick_full_server: '&4サーバーが満員です。後でもう一度お試しください！'
+  same_nick_online: '&4同じユーザー名のプレイヤーが既にサーバーでプレイしています！'
+  invalid_name_case: '正しいユーザー名は %valid です。%invalid ではなく、このユーザー名で参加してください。'
+  same_ip_online: '同じIPアドレスを持つプレイヤーが既にゲーム内にいます！'
+  quick_command: 'コマンドを速すぎる速度で使用しました！もう一度サーバーに参加してから、コマンドを使用する前にしばらくお待ちください。'
+
+# Email
+email:
+  usage_email_add: '&c使用方法：/email add <メールアドレス> <メールアドレスの確認>'
+  usage_email_change: '&c使用方法：/email change <古いメールアドレス> <新しいメールアドレス>'
+  new_email_invalid: '&c無効な新しいメールアドレスです。もう一度やり直してください！'
+  old_email_invalid: '&c無効な古いメールアドレスです。もう一度やり直してください！'
+  invalid: '&c無効なメールアドレスです。もう一度やり直してください！'
+  added: '&2メールアドレスがアカウントに正常に追加されました！'
+  request_confirmation: '&cメールアドレスを確認してください！'
+  changed: '&2メールアドレスが正しく変更されました！'
+  email_show: '&2現在のメールアドレスは：%email'
+  incomplete_settings: 'エラー：メールの送信に必要なすべての設定が設定されていません。管理者に連絡してください。'
+  already_used: '&4そのメールアドレスは既に使用されています'
+  send_failure: 'メールを送信できませんでした。管理者に連絡してください。'
+  no_email_for_account: '&2現在、このアカウントに関連付けられたメールアドレスはありません。'
+  add_email_request: '&3コマンド「/email add <あなたのメールアドレス> <確認用メールアドレス>」を使用して、アカウントにメールアドレスを追加してください。'
+  change_password_expired: 'このコマンドを使用してパスワードを変更することはできません。'
+  email_cooldown_error: '&c最近すでにメールが送信されています。新しいメールを送信する前に、%time 待つ必要があります。'
+  add_not_allowed: '&cメールアドレスの追加は許可されていません。'
+  change_not_allowed: '&cメールアドレスの変更は許可されていません。'
+
+# Password recovery by email
+recovery:
+  forgot_password_hint: '&3パスワードを忘れましたか？次のコマンドを使用してください：/email recovery <あなたのメールアドレス>'
+  command_usage: '&c使用方法：/email recovery <メールアドレス>'
+  email_sent: '&2パスワードの回復メールが正常に送信されました！メールの受信トレイを確認してください！'
+  code:
+    code_sent: 'パスワードをリセットするための回復コードがメールで送信されました。'
+    incorrect: '回復コードが正しくありません！残りの試行回数：%count'
+    tries_exceeded: '回復コードの入力試行回数が上限を超えました。新しいコードを生成するには、"/email recovery [メールアドレス]" を実行してください。'
+    correct: '回復コードが正しく入力されました！'
+    change_password: '即座にパスワードを変更するには、コマンド「/email setpassword <新しいパスワード>」を使用してください。'
+
+# Captcha
+captcha:
+  usage_captcha: '&3ログインするには、Captchaコードを解決する必要があります。次のコマンドを使用してください：/captcha %captcha_code'
+  wrong_captcha: '&cCaptchaコードが間違っています。チャットに「/captcha %captcha_code」と入力してください！'
+  valid_captcha: '&2Captchaコードが正しく解決されました！'
+  captcha_for_registration: '登録するには、まずCaptchaを解決する必要があります。次のコマンドを使用してください：/captcha %captcha_code'
+  register_captcha_valid: '&2有効なCaptchaです！/register を使用して登録できます'
+
+# Verification code
+verification:
+  code_required: '&3このコマンドはセンシティブな操作であり、メールの認証が必要です！受信トレイを確認し、メールの指示に従ってください。'
+  command_usage: '&c使用方法：/verification <コード>'
+  incorrect_code: '&cコードが正しくありません。メールで受け取ったコードを使用して、「/verification <コード>」とチャットに入力してください。'
+  success: '&2身元が確認されました！現在のセッション内ですべてのコマンドを実行できます！'
+  already_verified: '&2現在のセッションでは、既にすべてのセンシティブなコマンドを実行できます！'
+  code_expired: '&3コードの有効期限が切れています！新しいコードを取得するには、別のセンシティブなコマンドを実行してください！'
+  email_needed: '&3アカウントにはメールアドレスのリンクが必要です。身元を確認するためにはメールアドレスを関連付けてください！'
+
+# Two-factor authentication
+two_factor:
+  code_created: '&2秘密コードは %code です。こちらからスキャンできます：%url'
+  confirmation_required: 'コードを確認するには、/2fa confirm <コード> を使用してください'
+  code_required: '二要素認証コードを提出するには、/2fa code <コード> を使用してください'
+  already_enabled: 'アカウントで既に二要素認証が有効になっています！'
+  enable_error_no_code: '2要素認証キーが生成されていないか、期限が切れています。/2fa add を実行してください'
+  enable_success: 'アカウントでの二要素認証が正常に有効になりました'
+  enable_error_wrong_code: 'コードが間違っているか、期限が切れています。/2fa add を実行してください'
+  not_enabled_error: 'アカウントでは二要素認証が有効になっていません。/2fa add を実行してください'
+  removed_success: 'アカウントから二要素認証が正常に削除されました'
+  invalid_code: '無効なコードです！'
+
+# Time units
+time:
+  second: '秒'
+  seconds: '秒'
+  minute: '分'
+  minutes: '分'
+  hour: '時間'
+  hours: '時間'
+  day: '日'
+  days: '日'

src/main/resources/messages/messages_lt.yml

@@ -5,153 +5,153 @@
 
 # Registration
 registration:
-    disabled: '&6Registracija yra isjungta'
+    disabled: '&6Registracija yra išjungta'
-    name_taken: '&cVartotojo vardas jau uzregistruotas'
+    name_taken: '&cVartotojo vardas jau užregistruotas'
-    register_request: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi'
+    register_request: '&ePrašome prisiregistruoti: /register slaptažodis pakartotiSlaptažodį'
-    command_usage: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi'
+    command_usage: '&eNaudojimas: /register slaptažodis pakartotiSlaptažodį'
-    reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.'
+    reg_only: '&cTik prisiregistravusiems žaidėjams: apsilankykite: http://example.com tam, kad užsiregistruoti.'
-    success: '&aSekmingai prisiregistravote.'
+    success: '&aSėkmingai prisiregistravote.'
-    kicked_admin_registered: 'Administatorius jus uzregistravo. Prisijunkite isnaujo'
+    kicked_admin_registered: 'Administatorius Jus užregistravo. Prisijunkite iš naujo'
 
 # Password errors on registration
 password:
-    match_error: '&cSlaptazodziai nesutampa'
+    match_error: '&cSlaptažodžiai nesutampa'
-    name_in_password: '&cJus negalite naudoti savo varda slaptazodyje'
+    name_in_password: '&cJūs negalite naudoti savo vardo slaptažodyje'
-    unsafe_password: '&cSi slaptazodi lengva nulausti, pasirinkite kita slaptazodi'
+    unsafe_password: '&cŠį Slaptažodį lengva nulaužti, pasirinkite kitą slaptažodį'
-    forbidden_characters: '&4Jusus slaptazodis turi netinkamu simboliu. Leidziami simboliai: %valid_chars'
+    forbidden_characters: '&4Jūsų slaptažodis turi netinkamų simbolių. Leidžiami simboliai: %valid_chars'
-    wrong_length: '&cJusu slaptazodis buvo per ilgas arba per trumpas.'
+    wrong_length: '&cJūsų pasirinktas slaptažodis per ilgas arba per trumpas.'
 
 # Login
 login:
-    command_usage: '&eKomandos panaudojimas: /login slaptazodis'
+    command_usage: '&eKomandos panaudojimas: /login slaptažodis'
-    wrong_password: '&cNeteisingas slaptazosdis'
+    wrong_password: '&cNeteisingas Slaptažosdis'
-    success: '&aSekmingai prisijungete'
+    success: '&aSėkmingai prisijungėte'
-    login_request: '&ePrasome prisijungti: /login slaptazodis'
+    login_request: '&ePrašome prisijungti: /login slaptažodis'
-    timeout_error: '&cNespejote prisijungti'
+    timeout_error: '&cNespėjote prisijungti'
 
 # Errors
 error:
-    denied_command: '&cKad galetumete naudoti sia komanda turite buti prisijunge!'
+    denied_command: '&cKad galetumėte naudoti šią komandą turite būti prisijungę!'
-    denied_chat: '&cKad galetumete kalbeti jus turite buti prisijunge!'
+    denied_chat: '&cKad galetumėte kalbėti Jūs turite būti prisijungę!'
-    unregistered_user: '&cVartotojas neprisiregistraves'
+    unregistered_user: '&cVartotojas neprisiregistravęs'
-    not_logged_in: '&cTu neprisijunges!'
+    not_logged_in: '&cJūs neprisijungę!'
-    no_permission: '&cNera leidimo'
+    no_permission: '&cNėra leidimo'
-    unexpected_error: '&cAtsirado klaida, praneskite adminstratoriui.'
+    unexpected_error: '&cAtsirado klaida, praneškite adminstratoriui.'
-    max_registration: '&cJus pasiekete maksimalu registraciju skaiciu.'
+    max_registration: '&cJūs pasiekėte maksimalų registracijų skaičių.'
-    logged_in: '&cTu jau prisijunges!'
+    logged_in: '&cTu jau prisijungęs!'
-    kick_for_vip: '&cA VIP prisijunge i pilna serveri!'
+    kick_for_vip: '&cRėmėjas prisijungė į pilną serverį!'
-    kick_unresolved_hostname: '&cIvyko klaida: Ivyko klaida su zaidejo adresu!'
+    kick_unresolved_hostname: '&cĮvyko klaida su žaidejo adresu!'
-    tempban_max_logins: '&cJus laikinai uzblokuotas nes kelis kartus neteisingai suvedete salptazodi.'
+    tempban_max_logins: '&cJūs laikinai užblokuotas, nes kelis kartus neteisingai suvedėte slaptažodį.'
 
 # AntiBot
 antibot:
-    kick_antibot: 'AntiBot prevencija ijungta! Palaukite pries prisijungiant.'
+    kick_antibot: 'AntiBot prevencija įjungta! Palaukite prieš prisijungiant.'
-    auto_enabled: '&4[AntiBotService] AntiBot prevencija pajungta del didelio kiekio prisijungimu!'
+    auto_enabled: '&4[AntiBotService] AntiBot prevencija pajungta dėl didelio kiekio prisijungimų!'
-    auto_disabled: '&2[AntiBotService] AntiBot isjungtas po: %m minutes!'
+    auto_disabled: '&2[AntiBotService] AntiBot bus išjungtas po %m minučių!'
 
 # Unregister
 unregister:
-    success: '&aSekmingai issiregistravote!'
+    success: '&aSėkmingai išsiregistravote!'
-    command_usage: '&ePanaikinti registracija: "/unregister slaptazodis"'
+    command_usage: '&ePanaikinti registraciją: "/unregister slaptažodis"'
 
 # Other messages
 misc:
-    account_not_activated: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.'
+    account_not_activated: '&aJūsų vartotojas nėra patvirtintas, pasitikrinkite el.paštą.'
-    password_changed: '&aSlaptazodis pakeistas'
+    password_changed: '&aSlaptažodis pakeistas'
-    logout: '&aSekmingai atsijungete'
+    logout: '&aSėkmingai atsijungėte'
-    reload: '&aNustatymai ir duomenu baze buvo perkrauta.'
+    reload: '&aNustatymai ir duomenų bazė buvo perkrauta.'
-    usage_change_password: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis'
+    usage_change_password: '&ePanaudojimas: /changepassword senasSlaptažodis naujasSlaptažodis'
-    accounts_owned_self: 'Jus turite %count paskyra(-s):'
+    accounts_owned_self: 'Jūs turite %count paskyrą(-s):'
-    accounts_owned_other: 'Zaidejas %name turi %count paskyra(-s):'
+    accounts_owned_other: 'Žaidejas %name turi %count paskyrą(-s):'
 
 # Session messages
 session:
-    valid_session: '&aSesijos prisijungimas'
+    valid_session: '&aAutomatinis sesijos prisijungimas'
-    invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.'
+    invalid_session: '&cSesijos laikai nesutampa. Prašome palaukti kol sesija baigsis.'
 
 # Error messages when joining
 on_join_validation:
-    same_ip_online: 'Zaidejas su tuo paciu ip jau yra zaidime!'
+    same_ip_online: 'Žaidejas su tuo pačiu IP adresu jau yra žaidime!'
-    same_nick_online: '&cKazkas situo vardu jau zaidzia.'
+    same_nick_online: '&cKažkas šituo vardu jau žaidžia.'
-    name_length: '&cJusu varsdas yra per ilgas arba per trumpas.'
+    name_length: '&cJūsų vardas yra per ilgas arba per trumpas.'
-    characters_in_name: '&cJusu varde yra neledziamu simboliu, leidziami: %valid_chars'
+    characters_in_name: '&cJūsų varde yra neledziamų simbolių. Leidžiami: %valid_chars'
-    kick_full_server: '&cServeris yra pilnas, Atsiprasome.'
+    kick_full_server: '&cServeris yra pilnas, atsiprašome.'
-    country_banned: '&4Jusu salis yra uzblokuota siame serveryje!'
+    country_banned: '&4Jūsų šalis yra užblokuota šiame serveryje!'
-    not_owner_error: 'Tu neesi sios paskyros savininkas, pasirinkite kita varda!'
+    not_owner_error: 'J0s nesate šios paskyros savininkas, pasirinkite kitą vardą!'
-    invalid_name_case: 'Turetumete prisijungti su vardu: %valid, o ne su: %invalid.'
+    invalid_name_case: 'Turėtumėte prisijungti su vardu %valid, o ne su: %invalid.'
-    quick_command: 'Tu panaudojai komanda per greitai! Prisijunkite isnaujo ir siek tiek palaukite pries naudojant komandas.'
+    quick_command: 'Jūs panaudojote komandą per greitai! Prisijunkite iš naujo ir šiek tiek palaukite prieš naudojant komandas.'
 
 # Email
 email:
-    add_email_request: '&ePrasau pridekite savo el.pasta : /email add <el.pastas> <el.pastas>'
+    add_email_request: '&ePrašome jūsų pridėti savo el.paštą : /email add <el.paštas> <el.paštas>'
-    usage_email_add: '&cNaudojimas: /email add <el.pastas> <el.pastas>'
+    usage_email_add: '&cNaudojimas: /email add <el.paštas> <el.paštas>'
     usage_email_change: '&cNaudojimas: /email change <senas el.pastas> <naujas el.pastas>'
-    new_email_invalid: '&cNeteisingas el.pastas, bandykite isnaujo!'
+    new_email_invalid: '&cNeteisingas el.paštas, bandykite iš naujo!'
-    old_email_invalid: '&cNeteisingas senas el.pastas, bandykite isnaujo!'
+    old_email_invalid: '&cNeteisingas senas el.paštas, bandykite iš naujo!'
-    invalid: '&cNeteisingas el.pastas, bandykite isnaujo!'
+    invalid: '&cNeteisingas el.paštas, bandykite iš naujo!'
-    added: '&2El.pastas sekmingai pridetas!'
+    added: '&2El.paštas sėkmingai pridėtas!'
-    add_not_allowed: '&cNaujo el.pasto pridejimas nera galimas'
+    add_not_allowed: '&cNaujo el.pašto pridejimas nėra galimas'
-    request_confirmation: '&cPatvirtinkite savo el.pasta!'
+    request_confirmation: '&cPatvirtinkite savo el.paštą!'
-    changed: '&2El.pasta pakeistas sekmingai!'
+    changed: '&2El.paštą pakeistas sėkmingai!'
-    change_not_allowed: '&cEl.pasto keitimas nera galimas'
+    change_not_allowed: '&cEl.pašto keitimas nėra galimas'
-    email_show: '&2Jusu dabartinis el.pasto adresas: &f%email'
+    email_show: '&2Jūsų dabartinis el.pašto adresas: &f%email'
-    no_email_for_account: '&2Siuo metu jus neturite prideja jokio el.pasto adreso.'
+    no_email_for_account: '&2Šiuo metu Jūs neturite pridėję jokio el.pašto adreso.'
-    already_used: '&4Jis el.pasto adresas jau yra naudojamas'
+    already_used: '&4Jis el.pašto adresas jau yra naudojamas'
-    incomplete_settings: 'Klaidas: Nevisi nustatymai yra nustatyti laisko siuntimui. Susikietite su administratorium.'
+    incomplete_settings: 'Klaida: Ne visi nustatymai yra nustatyti laiško siuntimui. Susikietite su administratoriumi.'
-    send_failure: 'El.pasto laiskas nebuvo issiustas. Susikietite su administratorium.'
+    send_failure: 'El.pašto laiškas nebuvo išsiųstas. Susikietite su administratoriumi.'
-    change_password_expired: 'Jus nebegalite pakeisti savo slaptazodzio naudojant sia komanda.'
+    change_password_expired: 'Jūs nebegalite pakeisti savo slaptažodzio naudojant šią komandą.'
-    email_cooldown_error: '&cEl.pasto laiskas jau buvo issiustas. Palaukite %time pries siunciant nauja.'
+    email_cooldown_error: '&cEl.pašto laiškas jau buvo išsiųstas. Palaukite %time prieš šiunčiant naują.'
 
 # Password recovery by email
 recovery:
-    forgot_password_hint: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas'
+    forgot_password_hint: '&cPamiršote savo slaptažodį? Rašykite: /email recovery el.paštas'
-    command_usage: '&cNaudojimas: /email recovery el.pastas'
+    command_usage: '&cNaudojimas: /email recovery el.paštas'
-    email_sent: '&2Laiskas i jusu pasto adresa buvo issiustas!'
+    email_sent: '&2Laiškas į Jūsų el.pašto adresą buvo išsiųstas!'
     code:
-        code_sent: 'Kodas slaptazodzio atstatymui buvo issiustas i jusu pasta.'
+        code_sent: 'Kodas slaptažodžio atstatymui buvo išsiųstas į Jūsų el.paštą.'
-        incorrect: 'Kodas neteisingas! jums liko %count bandymai(-as).'
+        incorrect: 'Kodas neteisingas! Jums liko %count bandymai(-as).'
-        tries_exceeded: 'Jus isnaudojote visus bandymus. Naudokite "/email recovery el.pastas" kad gauti nauja koda.'
+        tries_exceeded: 'Jūs išnaudojote visus bandymus. Naudokite "/email recovery el.paštas", kad gauti naują kodą.'
-        correct: 'Kodas ivestas sekmingai!'
+        correct: 'Kodas įvestas sėkmingai!'
-        change_password: 'Naudokite /email setpassword <Naujas_Slaptazodis> kad pasikeistumete slaptazodi.'
+        change_password: 'Naudokite /email setpassword <Naujas_slaptažodis>, kad pasikeistumėte slaptažodį.'
 
 # Captcha
 captcha:
     usage_captcha: '&cPanaudojimas: /captcha %captcha_code'
-    wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha %captcha_code'
+    wrong_captcha: '&cNeteisinga captcha, naudokite : /captcha %captcha_code'
-    valid_captcha: '&cJusu captcha Teisinga!'
+    valid_captcha: '&cJūsų captcha teisinga!'
-    captcha_for_registration: 'Kad prisiregistruotumete turite ivygdyti captcha, rasykite: /captcha %captcha_code'
+    captcha_for_registration: 'Kad prisiregistruotumėte turite įvygdyti captchą. Rašykite: /captcha %captcha_code'
-    register_captcha_valid: '&2Captcha Teisinga! Galite naudoti /register'
+    register_captcha_valid: '&2Captcha teisinga! Galite naudoti /register'
 
 # Verification code
 verification:
-    code_required: '&3Kad naudotumete sia komanda turi patvirtinti savo pasto adresa! Sekite instrukcijas savo el.paste.'
+    code_required: '&3Kad galėtumėte naudoti šią komandą turite patvirtinti savo el.pašto adresą! Sekite instrukcijas savo el.pašte.'
     command_usage: '&cNaudojimas: /verification <kodas>'
-    incorrect_code: '&cNeteisingas kodas, naudokite "/verification <kodas>" ivesdami koda gauta savo el.paste'
+    incorrect_code: '&cNeteisingas kodas, naudokite "/verification <kodas>" įvesdami kodą gautą savo el.pašte'
-    success: '&2Jusu paskyra patvirtinta! Jus galite naudoti visas komandas!'
+    success: '&2Jūsų paskyra patvirtinta! Jūs galite naudoti visas komandas!'
-    already_verified: '&2Jus jau esate patvirtintas ir galite naudoti visas komandas!'
+    already_verified: '&2Jūs jau esate patvirtinę savo paskyrą ir galite naudoti visas komandas!'
-    code_expired: '&3Jusu kodo galiojimas baigesi! Panaudokite komanda isnaujo kad gauti nauja koda!'
+    code_expired: '&3Jūsų kodo galiojimas baigėsi! Panaudokite komandą iš naujo, kad gautumėte naują kodą!'
-    email_needed: '&3Kad patvirtinti savo paskyra turite prideti el.pasto adresa!'
+    email_needed: '&3Kad patvirtinti savo paskyra turite pridėti el.pašto adresą!'
 
 # Time units
 time:
-    second: 'sekunde'
+    second: 'sekundę'
     seconds: 'sekundes'
-    minute: 'minute'
+    minute: 'minutę'
     minutes: 'minutes'
-    hour: 'valanda'
+    hour: 'valandą'
     hours: 'valandas'
-    day: 'diena'
+    day: 'dieną'
     days: 'dienas'
 
 # Two-factor authentication
 two_factor:
-    code_created: '&2Tavo slaptas kodas yra %code. Ji gali nuskenuoti cia: %url'
+    code_created: '&2Jūsų slaptas kodas yra %code. Jį galite nuskenuoti čia: %url'
-    confirmation_required: 'Patvirtinkite savo koda su: /2fa confirm <kodas>'
+    confirmation_required: 'Patvirtinkite savo kodą su: /2fa confirm <kodas>'
-    code_required: 'Patvirkinkite savo koda su: /2fa code <kodas>'
+    code_required: 'Patvirkinkite savo kodą su: /2fa code <kodas>'
-    already_enabled: 'Jus jau turite dvieju faktoriu autentifikacija!'
+    already_enabled: 'Jūs jau turite dviejų faktorių autentifikaciją!'
-    enable_error_no_code: 'Jus neturite dvieju faktoriu autentifikacijos arba ji pasibaige. Rasykite /2fa add'
+    enable_error_no_code: 'Jūs neturite dviejų faktorių autentifikacijos arba ji pasibaigė. Rašykite /2fa add'
-    enable_success: 'Dvieju faktoriu autentifikacija sekmingai ijungta'
+    enable_success: 'Dviejų faktorių autentifikacija sėkmingai įjungta'
-    enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    enable_error_wrong_code: 'Neteisingas arba pasibaigęs kodas. Rašykite /2fa add'
-    not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    not_enabled_error: 'Dviejų faktorių autentifikavimas nėra įjungtas ant jūsų paskyros. Rašykite /2fa add'
-    removed_success: 'Successfully removed two-factor auth from your account'
+    removed_success: 'Dviejų faktorių autentifikavimas sėkmingai pašalintas iš jūsų paskyros.'
     invalid_code: 'Neteisingas kodas!'

src/main/resources/messages/messages_si.yml

@@ -5,13 +5,13 @@
 
 # Registration
 registration:
+    disabled: '&cRegistracija v igri je onemogočena!'
+    name_taken: '&cTo uporabniško ime ste ze registrirali!'
     register_request: '&3Registrirajte se z ukazom "/register <geslo> <PotrdiGeslo>"'
     command_usage: '&cUporaba: /register <geslo> <PotrdiGeslo>'
     reg_only: '&4Samo registrirani uporabniki se lahko povezejo! Obiscite http://example.com , da se registrirate!'
-    kicked_admin_registered: 'Administrator vas je registriral; prosimo, da se prijavite.'
     success: '&2Uspešno registriran!'
-    disabled: '&cRegistracija v igri je onemogočena!'
+    kicked_admin_registered: 'Administrator vas je registriral; prosimo, da se prijavite.'
-    name_taken: '&cTo uporabniško ime ste ze registrirali!'
 
 # Password errors on registration
 password:
@@ -40,6 +40,7 @@ error:
     max_registration: '&cPresegli ste največjo stevilo registracij (%reg_count/%max_acc %reg_names) za vašo povezavo!'
     logged_in: '&cSte že povezani!'
     kick_for_vip: '&3VIP igralec se je pridruzil serverju, ko je bil poln!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cBil si začasno izločen zaradi preveč neuspešnih prijav.'
 
 # AntiBot
@@ -131,6 +132,17 @@ verification:
     code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
     email_needed: '&3To verify your identity you need to link an email address with your account!'
 
+# Time units
+time:
+    second: 'sekunda'
+    seconds: 'sekund'
+    minute: 'minuta'
+    minutes: 'minut'
+    hour: 'ur'
+    hours: 'ure'
+    day: 'dan'
+    days: 'dni'
+
 # Two-factor authentication
 two_factor:
     code_created: '&2Vasa skrivna koda je %code. Lahko je skenirate tu %url!'
@@ -143,15 +155,3 @@ two_factor:
     not_enabled_error: 'Dvo stopična prijava ni vključena za vaš račun. Uporabite /2fa add'
     removed_success: 'Usprešno ste odstranili dvo stopično prijavo za vaš račun.'
     invalid_code: 'Nepravilna koda!'
-
-# Time units
-time:
-    second: 'sekunda'
-    seconds: 'sekund'
-    minute: 'minuta'
-    minutes: 'minut'
-    hour: 'ur'
-    hours: 'ure'
-    day: 'dan'
-    days: 'dni'
-    

src/main/resources/messages/messages_zhcn.yml

@@ -11,6 +11,7 @@ registration:
     command_usage: '&c正确用法:“/reg <密码> <重复密码>”'
     reg_only: '&c只允许注册过的玩家进服!'
     success: '&a*** 已成功注册 ***'
+    kicked_admin_registered: '&a*** 管理员刚刚注册了您; 请重新登录 ***'
 
 # Password errors on registration
 password:
@@ -164,3 +165,30 @@ two_factor:
   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验证超时'
+
+# 3rd party features: Bedrock Auto Login
+bedrock_auto_login:
+  success: "&a基岩版自动登录完成"
+
+# 3rd party features: Login Location Fix
+login_location_fix:
+  fix_portal: '&a你在登录时卡在了地狱门, 现已修正'
+  fix_underground: '&a你被埋住了, 坐标已修正, 下次下线之前请小心!'
+  cannot_fix_underground: '&a你被埋住了, 坐标无法修正, 只好送你去了最高点, 自求多福吧少年~'
+
+# 3rd party features: Double Login Fix
+double_login_fix:
+  fix_message: '&a已修复幽灵玩家, 请重新进入'
+
+

src/main/resources/messages/messages_zhtw.yml

@@ -7,132 +7,132 @@
 
 # Registration
 registration:
-    disabled: '&b【AuthMe】&6已關閉註冊功能'
+    disabled: '&b【AuthMe】&6已關閉註冊功能。'
-    name_taken: '&b【AuthMe】&6這個帳號已經被註冊過了!'
+    name_taken: '&b【AuthMe】&6這個帳號已經被註冊過了！'
     register_request: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。'
     command_usage: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"'
-    reg_only: '&b【AuthMe】&6請到下列網站 :「 https://example.tw 」 進行註冊'
+    reg_only: '&b【AuthMe】&6請到下列網站：「 https://example.tw 」進行註冊。'
-    success: '&b【AuthMe】&6您已成功註冊'
+    success: '&b【AuthMe】&6您已成功註冊！'
-    kicked_admin_registered: '&b【AuthMe】&6管理員已協助您註冊，請重新登入'
+    kicked_admin_registered: '&b【AuthMe】&6管理員已協助您註冊，請重新登入。'
 
 # Password errors on registration
 password:
-    match_error: '&b【AuthMe】&6兩次輸入的密碼不一致!'
+    match_error: '&b【AuthMe】&6兩次輸入的密碼不一致！'
-    name_in_password: '&b【AuthMe】&6您不可以用您的 ID (遊戲名稱) 來當作密碼 !'
+    name_in_password: '&b【AuthMe】&6您不可以用您的 ID (遊戲名稱) 來當作密碼！'
-    unsafe_password: '&b【AuthMe】&6您不可以使用這個不安全的密碼'
+    unsafe_password: '&b【AuthMe】&6您不可以使用這個不安全的密碼！'
-    forbidden_characters: '&b【AuthMe】&c密碼包含非法字符. 可使用: %valid_chars'
+    forbidden_characters: '&b【AuthMe】&c密碼包含非法字符，可使用：%valid_chars'
     wrong_length: '&b【AuthMe】&6您的密碼 超過最大字數 / 小於最小字數'
 
 # Login
 login:
     command_usage: '&b【AuthMe】&6用法: &c"/login <密碼>"'
-    wrong_password: '&b【AuthMe】&6密碼錯誤!'
+    wrong_password: '&b【AuthMe】&6密碼錯誤！'
-    success: '&b【AuthMe】&6密碼正確，您已成功登入!'
+    success: '&b【AuthMe】&6密碼正確，您已成功登入！'
     login_request: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。'
-    timeout_error: '&b【AuthMe】&6超過登入時間，請稍後再試一次'
+    timeout_error: '&b【AuthMe】&6超過登入時間，請稍後再試一次。'
 
 # Errors
 error:
-    denied_command: '&b【AuthMe】&c使用指令之前必須通過驗證!'
+    denied_command: '&b【AuthMe】&c使用指令之前必須通過驗證！'
-    denied_chat: '&b【AuthMe】&c說話之前必須通過驗證!'
+    denied_chat: '&b【AuthMe】&c說話之前必須通過驗證！'
-    unregistered_user: '&b【AuthMe】&6這個帳號還沒有註冊過'
+    unregistered_user: '&b【AuthMe】&6這個帳號還沒有註冊過。'
-    not_logged_in: '&b【AuthMe】&6您還沒有登入!'
+    not_logged_in: '&b【AuthMe】&6您還沒有登入！'
     no_permission: '&b【AuthMe】&6您沒有使用該指令的權限。'
     unexpected_error: '&b【AuthMe】&6發生錯誤，請聯繫管理員'
-    max_registration: '&b【AuthMe】&6您的 IP 位置所註冊的帳號數量已經達到最大。'
+    max_registration: '&b【AuthMe】&6您的 IP 位置所註冊的帳號數量已經達到最大限制。'
-    logged_in: '&b【AuthMe】&6您已經登入了!'
+    logged_in: '&b【AuthMe】&6您已經登入了！'
-    kick_for_vip: '&b【AuthMe】&6您已經被請出。&c原因 : 有 VIP 玩家登入伺服器'
+    kick_for_vip: '&b【AuthMe】&6您已經被請出。&c原因：有 VIP 玩家登入伺服器'
-    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
+    kick_unresolved_hostname: '&b【AuthMe】&6無法解析玩家主機名稱。'
-    tempban_max_logins: '&b【AuthMe】&c您已被暫時封鎖IP位置，因為您登入失敗太多次.'
+    tempban_max_logins: '&b【AuthMe】&c您已被暫時封鎖IP位置，因為您登入失敗太多次。'
 
 # AntiBot
 antibot:
     kick_antibot: '&b【AuthMe】&cAntiBotMod 正在啟用中，請稍後再嘗試登入吧！'
-    auto_enabled: '&b【AuthMe】&6AntiBotMod 已自動啟用!'
+    auto_enabled: '&b【AuthMe】&6AntiBotMod 已自動啟用！'
-    auto_disabled: '&b【AuthMe】&6AntiBotMod 將會於 &c%m &6分鐘後自動關閉'
+    auto_disabled: '&b【AuthMe】&6AntiBotMod 將於 &c%m &6分鐘後自動關閉'
 
 # Unregister
 unregister:
     success: '&b【AuthMe】&6您已經成功註銷。'
-    command_usage: '&b【AuthMe】&6用法: &c"/unregister <密碼>"'
+    command_usage: '&b【AuthMe】&6用法：&c"/unregister <密碼>"'
 
 # Other messages
 misc:
-    account_not_activated: '&b【AuthMe】&6您的帳號還沒有經過驗證! 檢查看看您的電子信箱 (Email) 吧!'
+    account_not_activated: '&b【AuthMe】&6您的帳號還沒有經過驗證！檢查看看您的電子郵件 (Email) 吧！'
-    password_changed: '&b【AuthMe】&6密碼變更成功!'
+    password_changed: '&b【AuthMe】&6密碼變更成功！'
-    logout: '&b【AuthMe】&6您已成功登出'
+    logout: '&b【AuthMe】&6您已成功登出。'
-    reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫'
+    reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫。'
-    usage_change_password: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"'
+    usage_change_password: '&b【AuthMe】&6用法：&c"/changepassword <舊密碼> <新密碼>"'
-    accounts_owned_self: '&b【AuthMe】&6您擁有 %count 個帳號:'
+    accounts_owned_self: '&b【AuthMe】&6您擁有 %count 個帳號：'
-    accounts_owned_other: '&b【AuthMe】&6玩家 %name 擁有 %count 個帳號:'
+    accounts_owned_other: '&b【AuthMe】&6玩家 %name 擁有 %count 個帳號：'
 
 # Session messages
 session:
-    valid_session: '&b【AuthMe】&6您已經成功登入!'
+    valid_session: '&b【AuthMe】&6您已經成功登入！'
-    invalid_session: '&b【AuthMe】&6Session驗證不相符!'
+    invalid_session: '&b【AuthMe】&6Session驗證不相符！'
 
 # Error messages when joining
 on_join_validation:
-    same_ip_online: '&b【AuthMe】&6同樣IP玩家在線上!'
+    same_ip_online: '&b【AuthMe】&6相同IP玩家在線上！'
-    same_nick_online: '&b【AuthMe】&6有同樣帳號的玩家在線上!'
+    same_nick_online: '&b【AuthMe】&6有同樣帳號的玩家在線上！'
-    name_length: '&b【AuthMe】&6您的暱稱 太長 / 太短 了!'
+    name_length: '&b【AuthMe】&6您的暱稱 太長 / 太短 了！'
     characters_in_name: '&b【AuthMe】&6暱稱裡能使用的字符為： %valid_chars'
-    kick_full_server: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次'
+    kick_full_server: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次。'
-    country_banned: '&b【AuthMe】&6您所在的地區無法進入此伺服器'
+    country_banned: '&b【AuthMe】&6您所在的地區無法進入此伺服器。'
     not_owner_error: '&b【AuthMe】&4警告！&c您並不是此帳戶持有人，請立即登出。'
     invalid_name_case: '&b【AuthMe】&4警告！&c您應該使用「%valid」而並非「%invalid」登入遊戲。'
-    # TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.'
+    quick_command: '&b【AuthMe】&4指令使用過快，請加入伺服器後稍等一下再使用指令。'
 
 # Email
 email:
-    add_email_request: '&b【AuthMe】&6請使用 &c"/email add <您的Email> <再次輸入您的Email>" &6來添加 Email'
+    add_email_request: '&b【AuthMe】&6請使用 &c"/email add <電子郵件> <再次輸入電子郵件>" &6來新增電子郵件'
-    usage_email_add: '&b【AuthMe】&6用法: &c"/email add <您的Email> <重複Email>"'
+    usage_email_add: '&b【AuthMe】&6用法: &c"/email add <電子郵件> <再次輸入電子郵件>"'
-    usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的Email> <新的Email>"'
+    usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的電子郵件> <新的電子郵件>"'
-    new_email_invalid: '&b【AuthMe】&6新的Email無效!'
+    new_email_invalid: '&b【AuthMe】&6新的電子郵件無效！'
-    old_email_invalid: '&b【AuthMe】&6舊的Email無效!'
+    old_email_invalid: '&b【AuthMe】&6舊的電子郵件無效！'
-    invalid: '&b【AuthMe】&6無效的Email!'
+    invalid: '&b【AuthMe】&6無效的電子郵件！'
-    added: '&b【AuthMe】&6已添加Email!'
+    added: '&b【AuthMe】&6已新增電子郵件！'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
+    add_not_allowed: '&b【AuthMe】&c不允許新增電子郵件'
-    request_confirmation: '&b【AuthMe】&6請驗證您的Email!'
+    request_confirmation: '&b【AuthMe】&6請驗證您的電子郵件！'
-    changed: '&b【AuthMe】&6Email已變更!'
+    changed: '&b【AuthMe】&6電子郵件已變更！'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
+    change_not_allowed: '&b【AuthMe】&c不允許變更電子郵件'
-    email_show: '&b【AuthMe】&2目前的電子郵件: &f%email'
+    email_show: '&b【AuthMe】&2目前的電子郵件：&f%email'
-    no_email_for_account: '&b【AuthMe】&2您目前沒有設置電子郵件.'
+    no_email_for_account: '&b【AuthMe】&2您目前沒有設定電子郵件。'
-    already_used: '&b【AuthMe】&4這個電郵地址已被使用。'
+    already_used: '&b【AuthMe】&4這個電子郵件已被使用。'
-    incomplete_settings: '&b【AuthMe】&4因為電子郵件設定無完整導致無法傳送，請聯絡管理員.'
+    incomplete_settings: '&b【AuthMe】&4因為電子郵件設定不完整導致無法傳送，請聯絡管理員。'
-    send_failure: '&b【AuthMe】&4無法傳送電子郵件，請聯絡管理員.'
+    send_failure: '&b【AuthMe】&4無法傳送電子郵件，請聯絡管理員。'
-    change_password_expired: '&b【AuthMe】&6您現在不能使用這個指令變更密碼了.'
+    change_password_expired: '&b【AuthMe】&6您現在不能使用這個指令變更密碼了。'
-    email_cooldown_error: '&b【AuthMe】&c電子郵件已經寄出了. 您只能在 %time 後才能傳送.'
+    email_cooldown_error: '&b【AuthMe】&c電子郵件已經寄出了，您只能在 %time 後才能傳送。'
 
 # Password recovery by email
 recovery:
-    forgot_password_hint: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <您的Email>"'
+    forgot_password_hint: '&b【AuthMe】&6忘記密碼了嗎？使用 &c"/email recovery <電子郵件>"'
-    command_usage: '&b【AuthMe】&6用法: &c"/email recovery <您的Email>"'
+    command_usage: '&b【AuthMe】&6用法: &c"/email recovery <電子郵件>"'
-    email_sent: '&b【AuthMe】&6已經送出重設密碼要求至您的Email , 請查收。'
+    email_sent: '&b【AuthMe】&6已經送出重設密碼要求至您的電子郵件，請查收。'
     code:
-        code_sent: '&b【AuthMe】&6忘記密碼的恢復密碼電子郵件已傳送至您的信箱中.'
+        code_sent: '&b【AuthMe】&6忘記密碼的恢復密碼電子郵件已傳送至您的信箱中。'
-        incorrect: '&b【AuthMe】&6恢復密碼錯誤! 您剩餘 %count 次嘗試機會.'
+        incorrect: '&b【AuthMe】&6恢復密碼錯誤！您剩餘 %count 次嘗試機會。'
-        tries_exceeded: '&b【AuthMe】&6恢復密碼過多次數錯誤. 使用 "/email recovery [email]" 取得新的恢復密碼.'
+        tries_exceeded: '&b【AuthMe】&6恢復密碼過多次數錯誤。使用 "/email recovery [電子郵件]" 取得新的恢復密碼。'
-        correct: '&b【AuthMe】&6恢復密碼正確!'
+        correct: '&b【AuthMe】&6恢復密碼正確！'
-        change_password: '&b【AuthMe】&6請使用 "/email setpassword <新密碼>" 變更您的密碼.'
+        change_password: '&b【AuthMe】&6請使用 "/email setpassword <新密碼>" 變更您的密碼。'
 
 # Captcha
 captcha:
-    usage_captcha: '&b【AuthMe】&6請用 &c"/captcha %captcha_code" &6來輸入您的驗證碼.'
+    usage_captcha: '&b【AuthMe】&6請用 &c"/captcha %captcha_code" &6來輸入您的驗證碼。'
-    wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 "/captcha %captcha_code" 再試一次.'
+    wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 "/captcha %captcha_code" 再試一次。'
-    valid_captcha: '&b【AuthMe】&6驗證碼無效!'
+    valid_captcha: '&b【AuthMe】&6驗證碼無效。'
-    # TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha %captcha_code'
+    captcha_for_registration: '&b【AuthMe】&6註冊前必須先提供驗證碼，使用 /captcha %captcha_code 來驗證。'
-    # TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
+    register_captcha_valid: '&b【AuthMe】&2驗證已通過，現在可以使用 /register 來進行註冊了。'
 
 # Verification code
 verification:
-    code_required: '&b【AuthMe】&3敏感指令，需要電子郵件驗證後才能執行，請檢查電子郵件.'
+    code_required: '&b【AuthMe】&3敏感指令，需要電子郵件驗證後才能執行，請檢查電子郵件。'
-    command_usage: '&b【AuthMe】&c用法: /verification <驗證碼>'
+    command_usage: '&b【AuthMe】&c用法：/verification <驗證碼>'
     incorrect_code: '&b【AuthMe】&c驗證碼錯誤，請在聊天室使用 "/verification <驗證碼>" 電子郵件收到的驗證碼'
-    success: '&b【AuthMe】&2身分已驗證，您現在可以使用所有指令!'
+    success: '&b【AuthMe】&2身分已驗證，您現在可以使用所有指令！'
-    already_verified: '&b【AuthMe】&2您已經可以使用所有指令!'
+    already_verified: '&b【AuthMe】&2您已經可以使用所有指令！'
-    code_expired: '&b【AuthMe】&3驗證碼已過期，請使用其他敏感指令來取得新的驗證碼!'
+    code_expired: '&b【AuthMe】&3驗證碼已過期，請使用其他敏感指令來取得新的驗證碼！'
-    email_needed: '&b【AuthMe】&3若需要身分驗證，請先添加電子郵件!!'
+    email_needed: '&b【AuthMe】&3若需要身分驗證，請先新增電子郵件！'
 
 # Time units
 time:
@@ -147,13 +147,13 @@ time:
 
 # Two-factor authentication
 two_factor:
-    code_created: '&b【AuthMe - 兩步驗證碼】&b您的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
+    code_created: '&b【AuthMe】&b您的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
-    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    confirmation_required: '&b【AuthMe】&6請使用 /2fa confirm <驗證碼> 來確認雙重驗證。'
-    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    code_required: '&b【AuthMe】&c請使用 /2fa code <驗證碼> 來完成驗證。'
-    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    already_enabled: '&b【AuthMe】&c雙重驗證已經開啟。'
-    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    enable_error_no_code: '&b【AuthMe】&6雙重驗證代碼不存在或失效，使用 /2fa add 來新增。'
-    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    enable_success: '&b【AuthMe】&6雙重驗證已開啟！'
-    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    enable_error_wrong_code: '&b【AuthMe】&6雙重驗證代碼錯誤或失效，使用 /2fa add 來新增。'
-    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    not_enabled_error: '&b【AuthMe】&6雙重驗證尚未開啟，使用 /2fa add 來開啟。'
-    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    removed_success: '&b【AuthMe】&6雙重驗證已成功移除！'
-    # TODO invalid_code: 'Invalid code!'
+    invalid_code: '&b【AuthMe】&c驗證碼錯誤。'

src/main/resources/new_email.html

@@ -109,7 +109,8 @@
                                     <tr>
                                         <td>
                                             <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
-                                            <a href="1919810.com" target="_blank" style="text-decoration: none; font-size: 16px">homomc.cc</a>
+                                            <a href="1919810.com" target="_blank"
+                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
                                         </td>
                                     </tr>
                                     </tbody>

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-b26
+version: 5.6.0-FORK-b39
 api-version: 1.13
 softdepend:
     - Vault

src/main/resources/recovery_code_email.html

@@ -102,7 +102,8 @@
                                     <tr>
                                         <td>
                                             <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
-                                            <a href="191980.com" target="_blank" style="text-decoration: none; font-size: 16px">homomc.cc</a>
+                                            <a href="1919810.com" target="_blank"
+                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/shutdown.html

@@ -100,7 +100,8 @@
                                     <tr>
                                         <td>
                                             <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
-                                            <a href="1919810.com" target="_blank" style="text-decoration: none; font-size: 16px">homomc.cc</a>
+                                            <a href="1919810.com" target="_blank"
+                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/verification_code_email.html

@@ -102,7 +102,8 @@
                                     <tr>
                                         <td>
                                             <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
-                                            <a href="1919810.com" target="_blank" style="text-decoration: none; font-size: 16px">homomc.cc</a>
+                                            <a href="1919810.com" target="_blank"
+                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
                                         </td>
                                     </tr>
                                     </tbody>