B44 release

Bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0

.github/dependabot.yml

@@ -10,3 +10,7 @@ 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"
+  - dependency-name: "org.slf4j:slf4j-simple"
+    versions: ">= 1.7.36"

.github/workflows/maven-publish.yml

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

.github/workflows/maven.yml

@@ -10,8 +10,8 @@ jobs:
   Build:
     strategy:
       matrix:
-        jdkversion: [11]
+        jdkversion: [ 17 ]
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -19,6 +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

.gitignore

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

.idea/.gitignore

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

LICENSE

@@ -1,23 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
+  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works.
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users.
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
+  Developers that use our General Public Licenses protect your rights
-these rights or asking you to surrender the rights.  Therefore, you have
+with two steps: (1) assert copyright on the software, and (2) offer
-certain responsibilities if you distribute copies of the software, or if
+you this License which gives you legal permission to copy, distribute
-you modify it: responsibilities to respect the freedom of others.
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
+  A secondary benefit of defending all users' freedom is that
-gratis or for a fee, you must pass on to the recipients the same
+improvements made in alternate versions of the program, if they
-freedoms that you received.  You must make sure that they, too, receive
+receive widespread use, become available for other developers to
-or can get the source code.  And you must show them these terms so they
+incorporate.  Many developers of free software are heartened and
-know their rights.
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
+  The GNU Affero General Public License is designed specifically to
-(1) assert copyright on the software, and (2) offer you this License
+ensure that, in such cases, the modified source code becomes available
-giving you legal permission to copy, distribute and/or modify it.
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
+  An older license, called the Affero General Public License and
-that there is no warranty for this free software.  For both users' and
+published by Affero, was designed to accomplish similar goals.  This is
-authors' sake, the GPL requires that modified versions be marked as
+a different license, not a version of the Affero GPL, but Affero has
-changed, so that their problems will not be attributed erroneously to
+released a new version of the Affero GPL which permits relicensing under
-authors of previous versions.
+this license.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
+but the work with which it is combined will remain governed by version
-section 13, concerning interaction through a network will apply to the
+3 of the GNU General Public License.
-combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+the GNU Affero General Public License from time to time.  Such new versions
-be similar in spirit to the present version, but may differ in detail to
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -631,44 +629,33 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {one line to give the program's name and a brief idea of what it does.}
+    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) {year}  {name of author}
+    Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    it under the terms of the GNU Affero General Public License as published
-    the Free Software Foundation, either version 3 of the License, or
+    by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
+  If your software can interact with users remotely through a computer
-notice like this when it starts in an interactive mode:
+network, you should also make sure that it provides a way for users to
-
+get its source.  For example, if your program is a web application, its
-    {project}  Copyright (C) {year}  {fullname}
+interface could display a "Source" link that leads users to an archive
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+of the code.  There are many ways you could offer source, and different
-    This is free software, and you are welcome to redistribute it
+solutions will be better for different programs; see section 13 for the
-    under certain conditions; type `show c' for details.
+specific requirements.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,21 +1,48 @@
 # AuthMeReReloaded
-**"A Fork of Authme that contains many bug fixes!"**
+**"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
-**请前往Releases下载最新版本**(**Download the latest version from Releases**)
 
+![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"/>
+  <img src="https://www.codefactor.io/repository/github/hahawth/authmerereloaded/badge" alt="CodeFactor" />
+</p>
 
+**Detailed Changes:**
+ 1. Improved mail sending logic & support more emails
+ 2. Shutdown mail sending(When server is closed, email you)
+ 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)(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 (Still WIP)
+ 13. Offhand Menu compatibility(Thats amazing)
+ 14. Automatically fix portal stuck issue
+ 15. Automatically login for Bedrock players(configurable)
+ 16. Fix shulker box crash bug on legacy versions(MC 1.13-)
+ 17. **H2 database support**
+ 18. **100% compatibility with original authme and extensions**
+ 19. 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)
 
-Changes to the original AuthMe(相较于原版AuthMe的变化):
+If you are using FRP(内网穿透) for your server, this plugin may help [HAProxy-Detector](https://github.com/HaHaWTH/HAProxy-Detector)
-1.Memory improvement
-2.Fixed GeoIP database
-3.Hook floodgate
-4.Choose the best performance method by server brand
-5.Anti ghost player
-6.GUI captcha for unregistered players
-7.Block unsafe passwords by querying API
-8.Self hash check to prevent jar virus infection
-9.Updater
 
+**Pull Requests and suggestions are welcome!**
 
-**Known Folia issue**
+<picture>
-1.If the teleport distance too far away,the player may be frozen
+  <source
+    media="(prefers-color-scheme: dark)"
+    srcset="
+      https://api.star-history.com/svg?repos=HaHaWTH/AuthMeReReloaded&type=Date&theme=dark
+    "
+  />
+  <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=HaHaWTH/AuthMeReReloaded&type=Date" />
+</picture>

b10.sha

@@ -1 +0,0 @@
-d91307767d8526ac84a3055ac0e773e91f88d452b4b0031f7ecfed721ac6b641

b11.sha

@@ -1 +0,0 @@
-d0aab9856defbd8ef31a9cd7257c5b5761e61a7e39807708c81decf82f599323

b12.sha

@@ -1 +0,0 @@
-176a6c6ea03ad8cc37d1d11c3e3608d8b59c09f9f923eae287e8192731642ec8

b13.sha

@@ -1 +0,0 @@
-61b1a691490d78af1028a442143f649d432618b92c5a9a7031eb4f94817d768b

b14.sha

@@ -1 +0,0 @@
-222eb5ecb4c58f279b8e2f75d38a45495ceb875f249ae3217e3f2a36e50b7d39

b15.sha

@@ -1 +0,0 @@
-da53060e21d7135e479a6a6a6fd090b8f41e1423742b94e4dbb1a9230b5621fd

b6.sha

@@ -1 +0,0 @@
-423084f2a50c27f62d1b5c85a95e78b9bc3df49d5bd9cefd6fe1aa9227b856c1

b7.sha

@@ -1 +0,0 @@
-410df26b12703b82987b9d739c19211346418f1c954d214827805c13b5f82c98

b8.sha

@@ -1 +0,0 @@
-20569ebc44a9847da0946de5a3bf2cd2b7855dffb03abc9d29204afcaa64b8bb

b9.sha

@@ -1 +0,0 @@
-51a067778ad9b0938d57fd4e2975e0f8dce4914ee060efd0fd6755a8810da4f3

docs/config.md

@@ -9,7 +9,7 @@ the generated config.yml file.
 ```yml
 DataSource:
     # What type of database do you want to use?
-    # Valid values: SQLITE, MARIADB, MYSQL, POSTGRESQL
+    # Valid values: H2, SQLITE, MARIADB, MYSQL, POSTGRESQL
     backend: SQLITE
     # Enable the database caching system, should be disabled on bungeecord environments
     # or when a website integration is being used.
@@ -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

@@ -6,10 +6,10 @@
 
     <groupId>fr.xephi</groupId>
     <artifactId>authme</artifactId>
-    <version>5.6.0-SNAPSHOT</version>
+    <version>5.6.0-FORK</version>
 
-    <name>AuthMeReloaded</name>
+    <name>AuthMeReReloaded</name>
-    <description>The first authentication plugin for the Bukkit API!</description>
+    <description>Fork of the first authentication plugin for the Bukkit API!</description>
     <inceptionYear>2013</inceptionYear>
     <url>https://github.com/AuthMe/AuthMeReloaded</url>
 
@@ -67,11 +67,11 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.19.2-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.4-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 -->
@@ -155,6 +155,11 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.4.1</version>
+                    <configuration>
+                        <failOnError>false</failOnError>
+                        <failOnWarnings>false</failOnWarnings>
+                        <skip>true</skip>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -164,7 +169,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>enforce-environment</id>
@@ -189,13 +194,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 +211,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.source}</source>
                     <target>${java.target}</target>
@@ -217,7 +222,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -277,7 +282,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 +299,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.2</version>
                 <executions>
                     <execution>
                         <id>shaded-jar</id>
@@ -318,13 +323,13 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>shaded-jar-legacy</id>
+                        <id>shaded-jar-relocate</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.finalNameBase}-legacy</finalName>
+                            <finalName>${project.finalNameBase}-Spigot-Universal</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
@@ -334,6 +339,10 @@
                                     <pattern>com.google.thirdparty</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.com.google.thirdparty</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.cryptomorin.xseries</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.xseries</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.google.j2objc</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.com.google.j2objc</shadedPattern>
@@ -346,6 +355,50 @@
                                     <pattern>com.google.gson</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.com.google.gson</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.h2</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.org.h2</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.http</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.org.apache.http</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.org.apache.commons</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.activation</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.javax.annotation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.mail</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>waffle</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.waffle</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.sun.mail</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.sun.mail</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.sun.jna</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.sun.jna</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.sun.activation</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.sun.activation</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.github.benmanes.caffeine</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
@@ -432,6 +485,10 @@
                             <pattern>org.mariadb.jdbc</pattern>
                             <shadedPattern>fr.xephi.authme.libs.org.mariadb.jdbc</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.github.Anon8281.universalScheduler</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.com.github.Anon8281.universalScheduler</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>com.mysql</pattern>
                             <shadedPattern>fr.xephi.authme.libs.com.mysql</shadedPattern>
@@ -440,6 +497,14 @@
                             <pattern>com.google.protobuf</pattern>
                             <shadedPattern>fr.xephi.authme.libs.com.google.protobuf</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>io.netty</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.io.netty</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.validator</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.apache.commons.validator</shadedPattern>
+                        </relocation>
                     </relocations>
 
                     <filters>
@@ -472,7 +537,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
             </plugin>
             <!-- Deploy the jars as artifacts into the remote repository -->
             <plugin>
@@ -507,6 +572,15 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>opencollab-snapshot-main</id>
+            <url>https://repo.opencollab.dev/main/</url>
+        </repository>
+        <repository>
+            <id>opencollab-maven-snapshots</id>
+            <url>https://repo.opencollab.dev/maven-snapshots/</url>
+        </repository>
+
         <!-- Apache snapshots repo -->
         <repository>
             <id>apache-snapshots</id>
@@ -598,6 +672,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>
@@ -608,6 +689,16 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>jitpack</id>
+            <url>https://jitpack.io/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -615,9 +706,10 @@
         <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 -->
         <dependency>
             <groupId>ch.jalu</groupId>
@@ -661,7 +753,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>
 
@@ -677,7 +769,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>
@@ -690,7 +782,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>
 
@@ -706,13 +798,13 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.32</version>
+            <version>8.0.33</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.1.2</version>
+            <version>3.3.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -757,7 +849,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>31.1-jre</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -770,17 +862,15 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.10.1</version>
             <optional>true</optional>
         </dependency>
 
-        <!-- Bukkit Libraries  -->
-
         <!-- ConfigMe -->
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>configme</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -794,7 +884,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -802,7 +892,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
+            <version>5.1.0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -846,6 +936,20 @@
             </exclusions>
         </dependency>
 
+        <!-- dependencies used by HAProxy feature -->
+        <!--        <dependency>-->
+        <!--            <groupId>io.netty</groupId>-->
+        <!--            <artifactId>netty-codec-haproxy</artifactId>-->
+        <!--            <version>4.1.104.Final</version>-->
+        <!--            <scope>compile</scope>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>commons-validator</groupId>-->
+        <!--            <artifactId>commons-validator</artifactId>-->
+        <!--            <version>1.8.0</version>-->
+        <!--            <scope>provided</scope>-->
+        <!--        </dependency>-->
+
         <!-- zPermissions plugin -->
         <dependency>
             <groupId>org.tyrannyofheaven.bukkit</groupId>
@@ -945,7 +1049,7 @@
         <dependency>
             <groupId>net.essentialsx</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.19.7</version>
+            <version>2.20.1</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -1017,7 +1121,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.5.4</version>
+            <version>42.7.3</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1060,22 +1164,30 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.32.0</version>
+            <version>3.40.0</version>
             <scope>test</scope>
         </dependency>
 
+        <!-- Universal Scheduler -->
+        <dependency>
+            <groupId>com.github.Anon8281</groupId>
+            <artifactId>UniversalScheduler</artifactId>
+            <version>0.1.6</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- JDBC drivers for datasource integration tests -->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.39.3.0</version>
+            <version>3.45.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.1.214</version>
+            <version>2.2.224</version>
-            <scope>test</scope>
+            <scope>compile</scope>
         </dependency>
 
     </dependencies>

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

@@ -2,8 +2,11 @@ package fr.xephi.authme;
 
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
+import com.github.Anon8281.universalScheduler.UniversalScheduler;
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.command.CommandHandler;
+import fr.xephi.authme.command.TabCompleteHandler;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.DataSourceProvider;
@@ -11,12 +14,19 @@ import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
 import fr.xephi.authme.initialization.OnStartupTasks;
 import fr.xephi.authme.initialization.SettingsProvider;
 import fr.xephi.authme.initialization.TaskCloser;
+import fr.xephi.authme.listener.AdvancedShulkerFixListener;
+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.PlayerListenerHigherThan18;
+import fr.xephi.authme.listener.PurgeListener;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
@@ -29,6 +39,7 @@ 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;
@@ -38,14 +49,19 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 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;
 import java.util.Objects;
+import java.util.Scanner;
 import java.util.function.Consumer;
+import java.util.logging.Level;
 
 import static fr.xephi.authme.service.BukkitService.TICKS_PER_MINUTE;
 import static fr.xephi.authme.util.Utils.isClassLoaded;
@@ -61,18 +77,20 @@ public class AuthMe extends JavaPlugin {
     private static final int CLEANUP_INTERVAL = 5 * TICKS_PER_MINUTE;
 
     // Version and build number values
-    private static String pluginVersion = "5.6.0";
+    private static String pluginVersion = "5.6.0-Fork";
-    private static String pluginBuildNumber = "Custom";
+    private static final String pluginBuild = "b";
-
+    private static String pluginBuildNumber = "44";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
-    private Settings settings;
+    private static TaskScheduler scheduler;
+    @Inject
+    public static Settings settings;
     private DataSource database;
     private BukkitService bukkitService;
     private Injector injector;
     private BackupService backupService;
-    private ConsoleLogger logger;
+    public static ConsoleLogger logger;
 
     /**
      * Constructor.
@@ -80,6 +98,16 @@ public class AuthMe extends JavaPlugin {
     public AuthMe() {
     }
 
+    /**
+     * Get the plugin's build
+     *
+     * @return The plugin's build
+     */
+    public static String getPluginBuild() {
+        return pluginBuild;
+    }
+
+
     /**
      * Get the plugin's name.
      *
@@ -107,6 +135,13 @@ public class AuthMe extends JavaPlugin {
         return pluginBuildNumber;
     }
 
+    /**
+     * Get the scheduler
+     */
+    public static TaskScheduler getScheduler() {
+        return scheduler;
+    }
+
     /**
      * Method called when the server enables the plugin.
      */
@@ -114,10 +149,13 @@ public class AuthMe extends JavaPlugin {
     public void onEnable() {
         // Load the plugin version data from the plugin description file
         loadPluginInfo(getDescription().getVersion());
+        scheduler = UniversalScheduler.getScheduler(this);
 
         // Set the Logger instance and log file path
         ConsoleLogger.initialize(getLogger(), new File(getDataFolder(), LOG_FILENAME));
         logger = ConsoleLoggerFactory.get(AuthMe.class);
+        logger.info("You are running an unofficial fork version of AuthMe!");
+
 
         // Check server version
         if (!isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")
@@ -146,7 +184,7 @@ public class AuthMe extends JavaPlugin {
                 th.printStackTrace();
             } else {
                 logger.logException("File '" + yamlParseException.getFile() + "' contains invalid YAML. "
-                    + "Please run its contents through https://yamllint.com", yamlParseException);
+                    + "Please run its contents through http://yamllint.com", yamlParseException);
             }
             stopOrUnload();
             return;
@@ -158,26 +196,43 @@ public class AuthMe extends JavaPlugin {
         // Schedule clean up task
         CleanupTask cleanupTask = injector.getSingleton(CleanupTask.class);
         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)) {
-        // Successful message
+            logger.info("\n" + "    ___         __  __    __  ___   \n" +
-        logger.info("AuthMeReloaded successfully enabled!");
+                "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
-
+                "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
+                " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                "                                    ");
+        }
+        //detect server brand with classloader
+        checkServerType();
+        Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler());
+        Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler());
+        logger.info("AuthMeReReloaded is enabled successfully!");
         // Purge on start if enabled
         PurgeService purgeService = injector.getSingleton(PurgeService.class);
         purgeService.runAutoPurge();
+        // 注册玩家加入事件监听
+//        register3rdPartyListeners();
+        logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/");
+        if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) {
+            checkForUpdates();
         }
+    }
+
+
+    //Migrated
 
     /**
      * Load the version and build number of the plugin from the description file.
      *
      * @param versionRaw the version as given by the plugin description file
      */
+
     private static void loadPluginInfo(String versionRaw) {
         int index = versionRaw.lastIndexOf("-");
         if (index != -1) {
@@ -203,7 +258,6 @@ public class AuthMe extends JavaPlugin {
         injector.register(AuthMe.class, this);
         injector.register(Server.class, getServer());
         injector.register(PluginManager.class, getServer().getPluginManager());
-        injector.register(BukkitScheduler.class, getServer().getScheduler());
         injector.provide(DataFolder.class, getDataFolder());
         injector.registerProvider(Settings.class, SettingsProvider.class);
         injector.registerProvider(DataSource.class, DataSourceProvider.class);
@@ -266,10 +320,17 @@ public class AuthMe extends JavaPlugin {
         pluginManager.registerEvents(injector.getSingleton(EntityListener.class), this);
         pluginManager.registerEvents(injector.getSingleton(ServerListener.class), this);
 
-        // Try to register 1.9 player listeners
+
-        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+        // Try to register 1.8+ player listeners
+        if (isClassLoaded("org.bukkit.event.entity.EntityPickupItemEvent") && isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+            pluginManager.registerEvents(injector.getSingleton(PlayerListenerHigherThan18.class), this);
+        } else if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
         }
+// Try to register 1.9 player listeners(Moved to else-if)
+//        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+//            pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
+//        }
 
         // Try to register 1.9 spigot player listeners
         if (isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")) {
@@ -280,6 +341,34 @@ 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);
+        }
+        if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && !isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
+            pluginManager.registerEvents(injector.getSingleton(AdvancedShulkerFixListener.class), this);
+        } else if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
+            logger.warning("You are running an 1.13+ minecraft server, advancedShulkerFix won't enable.");
+        }
+        if (settings.getProperty(SecuritySettings.PURGE_DATA_ON_QUIT)) {
+            pluginManager.registerEvents(injector.getSingleton(PurgeListener.class), this);
+        }
     }
 
     /**
@@ -305,7 +394,7 @@ public class AuthMe extends JavaPlugin {
             onShutdownPlayerSaver.saveAllPlayers();
         }
         if (settings.getProperty(EmailSettings.SHUTDOWN_MAIL)){
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'.'MM'.'dd'.' HH:mm:ss");
             Date date = new Date(System.currentTimeMillis());
             emailService.sendShutDown(settings.getProperty(EmailSettings.SHUTDOWN_MAIL_ADDRESS),dateFormat.format(date));
         }
@@ -320,10 +409,76 @@ public class AuthMe extends JavaPlugin {
 
         // Disabled correctly
         Consumer<String> infoLogMethod = logger == null ? getLogger()::info : logger::info;
-        infoLogMethod.accept("AuthMe " + this.getDescription().getVersion() + " disabled!");
+        infoLogMethod.accept("AuthMe " + this.getDescription().getVersion() + " is unloaded successfully!");
         ConsoleLogger.closeFileWriter();
     }
 
+    private static final String owner = "HaHaWTH";
+//    private static final String owner_gitee = "Shixuehan114514";
+    private static final String repo = "AuthMeReReloaded";
+
+    private void checkForUpdates() {
+        logger.info("Checking for updates...");
+        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秒
+                conn.setReadTimeout(10000); // 设置读取超时为10秒
+                Scanner scanner = new Scanner(conn.getInputStream());
+                String response = scanner.useDelimiter("\\Z").next();
+                scanner.close();
+
+                // 处理JSON响应
+                String latestVersion = response.substring(response.indexOf("tag_name") + 11);
+                latestVersion = latestVersion.substring(0, latestVersion.indexOf("\""));
+                if (isUpdateAvailable(latestVersion)) {
+                    String message = "New version available! Latest:" + latestVersion + " Current:" + pluginBuild + pluginBuildNumber;
+                    getLogger().log(Level.WARNING, message);
+                    getLogger().log(Level.WARNING, "Download from here: https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
+                } else {
+                    getLogger().log(Level.INFO, "You are running the latest version.");
+                }
+            } catch (IOException ignored) {
+            }
+        });
+    }
+    private boolean isUpdateAvailable(String latestVersion) {
+        // Extract the first character and the remaining digits from the version string
+        char latestChar = latestVersion.charAt(0);
+        int latestNumber = Integer.parseInt(latestVersion.substring(1));
+
+        char currentChar = pluginBuild.charAt(0);
+        int currentNumber = Integer.parseInt(pluginBuildNumber);
+
+        // Compare the characters first
+        if (latestChar > currentChar) {
+            return true;
+        } else if (latestChar < currentChar) {
+            return false;
+        } else {
+            // If the characters are the same, compare the numbers
+            return latestNumber > currentNumber;
+        }
+    }
+
+
+    private void checkServerType() {
+        if (isClassLoaded("com.destroystokyo.paper.PaperConfig")) {
+            logger.info("AuthMeReReloaded is running on Paper");
+        } else if (isClassLoaded("catserver.server.CatServerConfig")) {
+            logger.info("AuthMeReReloaded is running on CatServer");
+        } else if (isClassLoaded("org.spigotmc.SpigotConfig")) {
+            logger.info("AuthMeReReloaded is running on Spigot");
+        } else if (isClassLoaded("org.bukkit.craftbukkit.CraftServer")) {
+            logger.info("AuthMeReReloaded is running on Bukkit");
+        } else {
+            logger.info("AuthMeReReloaded is running on Unknown*");
+        }
+    }
+
+
     /**
      * Handle Bukkit commands.
      *

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

@@ -142,7 +142,7 @@ public final class ConsoleLogger {
     public void fine(String message) {
         if (logLevel.includes(LogLevel.FINE)) {
             logger.info(message);
-            writeLog("[FINE] " + message);
+            writeLog("[INFO:FINE] " + message);
         }
     }
 
@@ -215,7 +215,7 @@ public final class ConsoleLogger {
     }
 
     private void logAndWriteWithDebugPrefix(String message) {
-        String debugMessage = "[DEBUG] " + message;
+        String debugMessage = "[INFO:DEBUG] " + message;
         logger.info(debugMessage);
         writeLog(debugMessage);
     }

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

@@ -84,14 +84,14 @@ public final class CommandUtils {
      * @return formatted command syntax incl. arguments
      */
     public static String buildSyntax(CommandDescription command, List<String> correctLabels) {
-        String commandSyntax = ChatColor.WHITE + "/" + correctLabels.get(0) + ChatColor.YELLOW;
+        StringBuilder commandSyntax = new StringBuilder(ChatColor.WHITE + "/" + correctLabels.get(0) + ChatColor.YELLOW);
         for (int i = 1; i < correctLabels.size(); ++i) {
-            commandSyntax += " " + correctLabels.get(i);
+            commandSyntax.append(" ").append(correctLabels.get(i));
         }
         for (CommandArgumentDescription argument : command.getArguments()) {
-            commandSyntax += " " + formatArgument(argument);
+            commandSyntax.append(" ").append(formatArgument(argument));
         }
-        return commandSyntax;
+        return commandSyntax.toString();
     }
 
     /**

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

@@ -0,0 +1,17 @@
+package fr.xephi.authme.command;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TabCompleteHandler implements TabCompleter {
+
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
+        return new ArrayList<>();
+    }
+}

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

@@ -11,6 +11,7 @@ import fr.xephi.authme.datasource.converter.LoginSecurityConverter;
 import fr.xephi.authme.datasource.converter.MySqlToSqlite;
 import fr.xephi.authme.datasource.converter.RakamakConverter;
 import fr.xephi.authme.datasource.converter.RoyalAuthConverter;
+import fr.xephi.authme.datasource.converter.SqliteToH2;
 import fr.xephi.authme.datasource.converter.SqliteToSql;
 import fr.xephi.authme.datasource.converter.VAuthConverter;
 import fr.xephi.authme.datasource.converter.XAuthConverter;
@@ -89,6 +90,7 @@ public class ConverterCommand implements ExecutableCommand {
             .put("vauth", VAuthConverter.class)
             .put("sqlitetosql", SqliteToSql.class)
             .put("mysqltosqlite", MySqlToSqlite.class)
+            .put("sqlitetoh2", SqliteToH2.class)
             .put("loginsecurity", LoginSecurityConverter.class)
             .build();
     }

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

@@ -1,7 +1,10 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -11,16 +14,22 @@ import java.util.List;
  * Teleports the player to the first spawn.
  */
 public class FirstSpawnCommand extends PlayerCommand {
-
+    @Inject
+    private Settings settings;
     @Inject
     private SpawnLoader spawnLoader;
-
     @Override
     public void runCommand(Player player, List<String> arguments) {
         if (spawnLoader.getFirstSpawn() == null) {
             player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
+        } else {
+            //String name= player.getName();
+            if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                TeleportUtils.teleport(player, spawnLoader.getFirstSpawn());
             } else {
                 player.teleport(spawnLoader.getFirstSpawn());
             }
+            //player.teleport(spawnLoader.getFirstSpawn());
+        }
     }
 }

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

@@ -78,7 +78,8 @@ public class RegisterAdminCommand implements ExecutableCommand {
             final Player player = bukkitService.getPlayerExact(playerName);
             if (player != null) {
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() ->
-                    player.kickPlayer(commonService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER)));
+                    // AuthMeReReloaded - Folia compatibility
+                    bukkitService.runTaskIfFolia(player, () -> player.kickPlayer(commonService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER))));
             }
         });
     }

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

@@ -45,9 +45,7 @@ public class SetEmailCommand implements ExecutableCommand {
             return;
         }
 
-        bukkitService.runTaskOptionallyAsync(new Runnable() {
+        bukkitService.runTaskOptionallyAsync(() -> { // AuthMeReReloaded - Folia compatibility
-            @Override
-            public void run() {
             // Validate the user
             PlayerAuth auth = dataSource.getAuth(playerName);
             if (auth == null) {
@@ -72,7 +70,6 @@ public class SetEmailCommand implements ExecutableCommand {
 
             // Show a status message
             commonService.send(sender, MessageKey.EMAIL_CHANGED_SUCCESS);
-            }
         });
     }
 }

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

@@ -3,6 +3,8 @@ package fr.xephi.authme.command.executable.authme;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.DatabaseSettings;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,6 +19,8 @@ public class VersionCommand implements ExecutableCommand {
 
     @Inject
     private BukkitService bukkitService;
+    @Inject
+    private Settings settings;
 
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments) {
@@ -24,6 +28,7 @@ public class VersionCommand implements ExecutableCommand {
         sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.getPluginName() + " ABOUT ]==========");
         sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.getPluginName()
             + " v" + AuthMe.getPluginVersion() + ChatColor.GRAY + " (build: " + AuthMe.getPluginBuildNumber() + ")");
+        sender.sendMessage(ChatColor.GOLD + "Database Implementation: " + ChatColor.WHITE + settings.getProperty(DatabaseSettings.BACKEND).toString());
         sender.sendMessage(ChatColor.GOLD + "Authors:");
         Collection<Player> onlinePlayers = bukkitService.getOnlinePlayers();
         printDeveloper(sender, "Gabriele C.", "sgdc3", "Project manager, Contributor", onlinePlayers);

src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java

@@ -42,6 +42,12 @@ public class ChangePasswordCommand extends PlayerCommand {
             commonService.send(player, MessageKey.NOT_LOGGED_IN);
             return;
         }
+        // Check if the user has been verified or not
+        if (codeManager.isVerificationRequired(player)) {
+            codeManager.codeExistOrGenerateNew(name);
+            commonService.send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
+            return;
+        }
 
         String oldPassword = arguments.get(0);
         String newPassword = arguments.get(1);

src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java

@@ -70,7 +70,7 @@ public class TotpCodeCommand extends PlayerCommand {
         boolean isCodeValid = totpAuthenticator.checkCode(auth, inputCode);
         if (isCodeValid) {
             logger.debug("Successfully checked TOTP code for `{0}`", player.getName());
-            asynchronousLogin.performLogin(player, auth,false);
+            asynchronousLogin.performLogin(player, auth);
         } else {
             logger.debug("Input TOTP code was invalid for player `{0}`", player.getName());
             messages.send(player, MessageKey.TWO_FACTOR_INVALID_CODE);

src/main/java/fr/xephi/authme/data/TempbanManager.java

@@ -103,7 +103,7 @@ public class TempbanManager implements SettingsDependent, HasCleanup {
             long newTime = expires.getTime() + (length * MILLIS_PER_MINUTE);
             expires.setTime(newTime);
 
-            bukkitService.scheduleSyncDelayedTask(() -> {
+            bukkitService.runTask(player,() -> { // AuthMeReReloaded - Folia compatibility
                 if (customCommand.isEmpty()) {
                     bukkitService.banIp(ip, reason, expires, "AuthMe");
                     player.kickPlayer(reason);

src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.data.limbo;
 
+import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import fr.xephi.authme.task.MessageTask;
 import org.bukkit.Location;
-import org.bukkit.scheduler.BukkitTask;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,8 +22,10 @@ public class LimboPlayer {
     private final Location loc;
     private final float walkSpeed;
     private final float flySpeed;
-    private BukkitTask timeoutTask = null;
+    private MyScheduledTask timeoutTask = null;
     private MessageTask messageTask = null;
+    private MyScheduledTask inter;
+
     private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED;
 
     public LimboPlayer(Location loc, boolean operator, Collection<UserGroup> groups, boolean fly, float walkSpeed,
@@ -81,7 +83,7 @@ public class LimboPlayer {
      *
      * @return The timeout task associated to the player
      */
-    public BukkitTask getTimeoutTask() {
+    public MyScheduledTask getTimeoutTask() {
         return timeoutTask;
     }
 
@@ -91,7 +93,7 @@ public class LimboPlayer {
      *
      * @param timeoutTask The task to set
      */
-    public void setTimeoutTask(BukkitTask timeoutTask) {
+    public void setTimeoutTask(MyScheduledTask timeoutTask) {
         if (this.timeoutTask != null) {
             this.timeoutTask.cancel();
         }
@@ -112,18 +114,19 @@ public class LimboPlayer {
      *
      * @param messageTask The message task to set
      */
-    public void setMessageTask(MessageTask messageTask) {
+    public void setMessageTask(MessageTask messageTask, MyScheduledTask inter) {
-        if (this.messageTask != null) {
+        if (this.messageTask != null && this.inter != null) {
-            this.messageTask.cancel();
+            this.inter.cancel();
         }
         this.messageTask = messageTask;
+        this.inter = inter;
     }
 
     /**
      * Clears all tasks associated to the player.
      */
     public void clearTasks() {
-        setMessageTask(null);
+        setMessageTask(null, null);
         setTimeoutTask(null);
     }
 

src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.data.limbo;
 
+import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.data.captcha.RegistrationCaptchaManager;
 import fr.xephi.authme.message.MessageKey;
@@ -11,7 +12,6 @@ import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
 
@@ -53,8 +53,8 @@ class LimboPlayerTaskManager {
         if (interval > 0) {
             String[] joinMessage = messages.retrieveSingle(player, result.messageKey, result.args).split("\n");
             MessageTask messageTask = new MessageTask(player, joinMessage);
-            bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
+            MyScheduledTask task = bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, (long) interval * TICKS_PER_SECOND);
-            limbo.setMessageTask(messageTask);
+            limbo.setMessageTask(messageTask, task);
         }
     }
 
@@ -68,7 +68,7 @@ class LimboPlayerTaskManager {
         final int timeout = settings.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
         if (timeout > 0) {
             String message = messages.retrieveSingle(player, MessageKey.LOGIN_TIMEOUT_ERROR);
-            BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
+            MyScheduledTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
             limbo.setTimeoutTask(task);
         }
     }

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,422 @@
+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.createForH2(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 IF NOT EXISTS "
+                    + col.REAL_NAME + " VARCHAR(255) NOT NULL DEFAULT 'Player';");
+            }
+
+            if (isColumnMissing(md, col.PASSWORD)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.PASSWORD + " VARCHAR(255) NOT NULL DEFAULT '';");
+            }
+
+            if (!col.SALT.isEmpty() && isColumnMissing(md, col.SALT)) {
+                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN IF NOT EXISTS " + col.SALT + " VARCHAR(255);");
+            }
+
+            if (isColumnMissing(md, col.LAST_IP)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.LAST_IP + " VARCHAR(40);");
+            }
+
+            if (isColumnMissing(md, col.LAST_LOGIN)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.LAST_LOGIN + " BIGINT;");
+            }
+
+            if (isColumnMissing(md, col.REGISTRATION_IP)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + 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 IF NOT EXISTS " + col.LASTLOC_X
+                    + " DOUBLE NOT NULL DEFAULT '0.0';");
+                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN IF NOT EXISTS " + col.LASTLOC_Y
+                    + " DOUBLE NOT NULL DEFAULT '0.0';");
+                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN IF NOT EXISTS " + col.LASTLOC_Z
+                    + " DOUBLE NOT NULL DEFAULT '0.0';");
+            }
+
+            if (isColumnMissing(md, col.LASTLOC_WORLD)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.LASTLOC_WORLD + " VARCHAR(255) NOT NULL DEFAULT 'world';");
+            }
+
+            if (isColumnMissing(md, col.LASTLOC_YAW)) {
+                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN IF NOT EXISTS "
+                    + col.LASTLOC_YAW + " FLOAT;");
+            }
+
+            if (isColumnMissing(md, col.LASTLOC_PITCH)) {
+                st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN IF NOT EXISTS "
+                    + col.LASTLOC_PITCH + " FLOAT;");
+            }
+
+            if (isColumnMissing(md, col.EMAIL)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.EMAIL + " VARCHAR_IGNORECASE(255);");
+            }
+
+            if (isColumnMissing(md, col.IS_LOGGED)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.IS_LOGGED + " INT NOT NULL DEFAULT '0';");
+            }
+
+            if (isColumnMissing(md, col.HAS_SESSION)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.HAS_SESSION + " INT NOT NULL DEFAULT '0';");
+            }
+
+            if (isColumnMissing(md, col.TOTP_KEY)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.TOTP_KEY + " VARCHAR(32);");
+            }
+
+            if (!col.PLAYER_UUID.isEmpty() && isColumnMissing(md, col.PLAYER_UUID)) {
+                st.executeUpdate("ALTER TABLE " + tableName
+                    + " ADD COLUMN IF NOT EXISTS " + col.PLAYER_UUID + " VARCHAR(36)");
+            }
+        }
+        logger.info("H2 Setup finished");
+    }
+
+    /**
+     * Checks if a column is missing in the specified table.
+     * @param columnName the name of the column to look for
+     * @return true if the column is missing, false if it exists
+     * @throws SQLException if an error occurs while executing SQL or accessing the result set
+     * @deprecated Not work in H2, it always returns true
+     */
+    @Deprecated
+    private boolean isColumnMissing(DatabaseMetaData metaData, String columnName) throws SQLException {
+        String query = "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?";
+//        try (PreparedStatement preparedStatement = con.prepareStatement(query)) {
+//            preparedStatement.setString(1, tableName);
+//            preparedStatement.setString(2, columnName.toUpperCase());
+//            try (ResultSet rs = preparedStatement.executeQuery()) {
+//                return !rs.next();
+//            }
+//        }
+        return true;
+    }
+
+
+    @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 {
+        int affect = st.executeUpdate("ALTER TABLE " + tableName
+            + " ADD COLUMN IF NOT EXISTS " + col.REGISTRATION_DATE + " BIGINT NOT NULL DEFAULT '0';");
+        if (affect > 0) {
+            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;
+    }
+
+    private static void close(Connection con) {
+        if (con != null) {
+            try {
+                con.close();
+            } catch (SQLException ex) {
+                logSqlException(ex);
+            }
+        }
+    }
+}
+

src/main/java/fr/xephi/authme/datasource/columnshandler/AuthMeColumnsHandler.java

@@ -51,6 +51,26 @@ public final class AuthMeColumnsHandler {
         return new AuthMeColumnsHandler(sqlColHandler);
     }
 
+    /**
+     * Creates a column handler for H2.
+     *
+     * @param connection the connection to the database
+     * @param settings plugin settings
+     * @return created column handler
+     */
+    public static AuthMeColumnsHandler createForH2(Connection connection, Settings settings) {
+        ColumnContext columnContext = new ColumnContext(settings, false);
+        String tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
+        String nameColumn = settings.getProperty(DatabaseSettings.MYSQL_COL_NAME);
+
+        SqlColumnsHandler<ColumnContext, String> sqlColHandler = new SqlColumnsHandler<>(
+            forSingleConnection(connection, tableName, nameColumn, columnContext)
+                .setPredicateSqlGenerator(new PredicateSqlGenerator<>(columnContext, false))
+        );
+        return new AuthMeColumnsHandler(sqlColHandler);
+    }
+
+
     /**
      * Creates a column handler for MySQL.
      *

src/main/java/fr/xephi/authme/datasource/converter/SqliteToH2.java

@@ -0,0 +1,33 @@
+package fr.xephi.authme.datasource.converter;
+
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.datasource.DataSourceType;
+import fr.xephi.authme.datasource.SQLite;
+import fr.xephi.authme.initialization.DataFolder;
+import fr.xephi.authme.settings.Settings;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.sql.SQLException;
+
+/**
+ * Converts SQLite to H2
+ *
+ */
+public class SqliteToH2 extends AbstractDataSourceConverter<SQLite>{
+
+    private final Settings settings;
+    private final File dataFolder;
+
+    @Inject
+    SqliteToH2(Settings settings, DataSource dataSource, @DataFolder File dataFolder) {
+        super(dataSource, DataSourceType.H2);
+        this.settings = settings;
+        this.dataFolder = dataFolder;
+    }
+
+    @Override
+    protected SQLite getSource() throws SQLException {
+        return new SQLite(settings, dataFolder);
+    }
+}

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

@@ -5,6 +5,7 @@ import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.CacheDataSource;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.DataSourceType;
+import fr.xephi.authme.datasource.H2;
 import fr.xephi.authme.datasource.MariaDB;
 import fr.xephi.authme.datasource.MySQL;
 import fr.xephi.authme.datasource.PostgreSqlDataSource;
@@ -76,6 +77,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

@@ -1,5 +1,6 @@
 package fr.xephi.authme.initialization;
 
+import com.github.Anon8281.universalScheduler.UniversalRunnable;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
@@ -18,7 +19,6 @@ import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import javax.inject.Inject;
 import java.util.List;
@@ -53,7 +53,7 @@ public class OnStartupTasks {
      * @param settings the settings
      */
     public static void sendMetrics(AuthMe plugin, Settings settings) {
-        final Metrics metrics = new Metrics(plugin, 164);
+        final Metrics metrics = new Metrics(plugin, 18479);
 
         metrics.addCustomChart(new SimplePie("messages_language",
             () -> settings.getProperty(PluginSettings.MESSAGES_LANGUAGE)));
@@ -96,7 +96,7 @@ public class OnStartupTasks {
         if (!settings.getProperty(RECALL_PLAYERS)) {
             return;
         }
-        bukkitService.runTaskTimerAsynchronously(new BukkitRunnable() {
+        bukkitService.runTaskTimerAsynchronously(new UniversalRunnable() {
             @Override
             public void run() {
                 List<String> loggedPlayersWithEmptyMail = dataSource.getLoggedPlayersWithEmptyMail();
@@ -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/initialization/TaskCloser.java

@@ -1,15 +1,9 @@
 package fr.xephi.authme.initialization;
 
-import com.google.common.annotations.VisibleForTesting;
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.datasource.DataSource;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitWorker;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -18,7 +12,7 @@ import java.util.logging.Logger;
  */
 public class TaskCloser implements Runnable {
 
-    private final BukkitScheduler scheduler;
+    private final TaskScheduler scheduler;
     private final Logger logger;
     private final AuthMe plugin;
     private final DataSource dataSource;
@@ -30,7 +24,7 @@ public class TaskCloser implements Runnable {
      * @param dataSource the data source (nullable)
      */
     public TaskCloser(AuthMe plugin, DataSource dataSource) {
-        this.scheduler = plugin.getServer().getScheduler();
+        this.scheduler = AuthMe.getScheduler();
         this.logger = plugin.getLogger();
         this.plugin = plugin;
         this.dataSource = dataSource;
@@ -38,58 +32,9 @@ public class TaskCloser implements Runnable {
 
     @Override
     public void run() {
-        List<Integer> pendingTasks = getPendingTasks();
+        scheduler.cancelTasks();
-        logger.log(Level.INFO, "Waiting for {0} tasks to finish", pendingTasks.size());
-        int progress = 0;
-
-        //one minute + some time checking the running state
-        int tries = 60;
-        while (!pendingTasks.isEmpty()) {
-            if (tries <= 0) {
-                logger.log(Level.INFO, "Async tasks times out after to many tries {0}", pendingTasks);
-                break;
-            }
-
-            try {
-                sleep();
-            } catch (InterruptedException ignored) {
-                Thread.currentThread().interrupt();
-                break;
-            }
-
-            for (Iterator<Integer> iterator = pendingTasks.iterator(); iterator.hasNext(); ) {
-                int taskId = iterator.next();
-                if (!scheduler.isCurrentlyRunning(taskId)) {
-                    iterator.remove();
-                    progress++;
-                    logger.log(Level.INFO, "Progress: {0} / {1}", new Object[]{progress, pendingTasks.size()});
-                }
-            }
-
-            tries--;
-        }
-
         if (dataSource != null) {
             dataSource.closeConnection();
         }
     }
-
-    /** Makes the current thread sleep for one second. */
-    @VisibleForTesting
-    void sleep() throws InterruptedException {
-        Thread.sleep(1000);
-    }
-
-    private List<Integer> getPendingTasks() {
-        List<Integer> pendingTasks = new ArrayList<>();
-        //returns only the async tasks
-        for (BukkitWorker pendingTask : scheduler.getActiveWorkers()) {
-            if (pendingTask.getOwner().equals(plugin)
-                //it's not a periodic task
-                && !scheduler.isQueued(pendingTask.getTaskId())) {
-                pendingTasks.add(pendingTask.getTaskId());
-            }
-        }
-        return pendingTasks;
-    }
 }

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

@@ -0,0 +1,20 @@
+package fr.xephi.authme.listener;
+
+import org.bukkit.block.Block;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockDispenseEvent;
+
+//This fix is only for Minecraft 1.13-
+public class AdvancedShulkerFixListener implements Listener {
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onDispenserActivate(BlockDispenseEvent event) {
+        Block block = event.getBlock();
+
+        if (block.getY() <= 0 || block.getY() >= block.getWorld().getMaxHeight() - 1) {
+            event.setCancelled(true);
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+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.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.HIGHEST)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        String name = event.getPlayer().getName();
+        UUID uuid = event.getPlayer().getUniqueId();
+        if (isBedrockPlayer(uuid) && !authmeApi.isAuthenticated(player) && authmeApi.isRegistered(name)) {
+            authmeApi.forceLogin(player);
+            messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN);
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+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 javax.inject.Inject;
+import java.util.Collection;
+import java.util.HashSet;
+
+public class DoubleLoginFixListener implements Listener {
+    @Inject
+    private CommonService service;
+
+    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(service.retrieveSingleMessage(ep.getPlayer(), MessageKey.DOUBLE_LOGIN_FIX));
+                break;
+            }
+            PlayerSet.add(ep.getName().toLowerCase());
+        }
+    }
+}

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

@@ -0,0 +1,263 @@
+package fr.xephi.authme.listener;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketEvent;
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.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;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import javax.inject.Inject;
+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();
+    @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
+    private int timesLeft = 3;
+    //Use ConcurrentHashMap to store player and their close reason
+    /* We used many async tasks so there is concurrent**/
+    public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
+    //define randomStringSet
+    String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
+    String randomString = "";
+    Random randomItemSet = new Random();
+    Random howManyRandom = new Random();
+    private Material captchaMaterial = getRandomMaterial();
+
+
+    private boolean isPacketListenersActive = false;
+
+    public GuiCaptchaHandler() {
+    }
+
+    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;
+        }
+    }
+
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        if (event.getWhoClicked() instanceof Player) {
+            Player player = (Player) event.getWhoClicked();
+            ItemStack currentItem = event.getCurrentItem();
+            if (!authmeApi.isRegistered(player.getName())) {
+                if (isBedrockPlayer(player.getUniqueId())) {
+                    return;
+                }
+                if (currentItem != null && currentItem.getType().equals(captchaMaterial)) {
+                    event.setCancelled(true);
+                    if (!closeReasonMap.containsKey(player)) {
+                        closeReasonMap.put(player, "verified");
+                    }
+                    player.closeInventory();
+                    messages.send(player, MessageKey.GUI_CAPTCHA_VERIFIED);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Player player = event.getPlayer();
+        bukkitService.runTaskAsynchronously(() -> {
+            sb = new StringBuilder();
+            int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+            for (int i = 0; i < howLongIsRandomString; i++) {
+                //生成随机索引号
+                int index = randomItemSet.nextInt(randomSet.length());
+
+                // 从字符串中获取由索引 index 指定的字符
+                char randomChar = randomSet.charAt(index);
+
+                // 将字符追加到字符串生成器
+                sb.append(randomChar);
+            }
+            if (!whiteList.isEmpty()) {
+                String ip = getPlayerIp(player);
+                if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) {
+                    if (!closeReasonMap.containsKey(player)) {
+                        closeReasonMap.put(player, "verified:whitelist");
+                    }
+                }
+            }
+        });
+    }
+
+    @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;
+            }
+            randomString = sb.toString();
+            Random random_blockpos = new Random();
+            AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(27));
+            Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
+            ItemStack item = new ItemStack(captchaMaterial);
+            ItemMeta meta = item.getItemMeta();
+            try {
+                if (meta != null) {
+                    meta.setDisplayName(messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_CLICKABLE_NAME, randomString));
+                    item.setItemMeta(meta);
+                }
+            } catch (NullPointerException e) {
+                getLogger().log(Level.WARNING, "Unexpected error occurred while setting item meta.");
+            }
+            windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
+                @Override
+                public void onPacketReceiving(PacketEvent event) {
+                    Player packetPlayer = event.getPlayer();
+                    if (!closeReasonMap.containsKey(packetPlayer) && !authmeApi.isRegistered(packetPlayer.getName())) {
+                        if (timesLeft <= 0) {
+                            bukkitService.runTask(() -> {
+                                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;
+                            }
+                            messages.send(packetPlayer, MessageKey.GUI_CAPTCHA_RETRY_MESSAGE, String.valueOf(timesLeft));
+                            event.setCancelled(true);
+                            random_num.set(random_blockpos.nextInt(26));
+                            bukkitService.runTask(() -> {
+                                menu.clear();
+                                menu.setItem(random_num.get(), item);
+                                packetPlayer.openInventory(menu);
+                            });
+                        }
+                    }
+                }
+            };
+            chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
+                @Override
+                public void onPacketReceiving(PacketEvent event) {
+                    Player packetPlayer = event.getPlayer();
+                    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 Material getRandomMaterial() {
+        Material[] allMaterials = Material.values();
+        Random random = new Random();
+        return allMaterials[random.nextInt(allMaterials.length)];
+    }
+}
+
+
+
+

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

@@ -1,11 +1,14 @@
 package fr.xephi.authme.listener;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
+import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -18,13 +21,13 @@ import javax.inject.Inject;
  * Service class for the AuthMe listeners to determine whether an event should be canceled.
  */
 class ListenerService implements SettingsDependent {
-
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
     private final DataSource dataSource;
     private final PlayerCache playerCache;
     private final ValidationService validationService;
-
     private boolean isRegistrationForced;
 
+
     @Inject
     ListenerService(Settings settings, DataSource dataSource, PlayerCache playerCache,
                     ValidationService validationService) {
@@ -76,9 +79,18 @@ class ListenerService implements SettingsDependent {
      * @param player the player to verify
      * @return true if the associated event should be canceled, false otherwise
      */
+
     public boolean shouldCancelEvent(Player player) {
+
         return player != null && !checkAuth(player.getName()) && !PlayerUtils.isNpc(player);
     }
+    public boolean shouldCancelInvEvent(Player player) {
+        try {
+            return !AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA) || authmeApi.isRegistered(player.getName()) || GuiCaptchaHandler.closeReasonMap.containsKey(player)/* || !player.getOpenInventory().getTitle().equals("请验证你是真人")*/;
+        } catch (Exception e) {
+            return true;
+        }
+    }
 
     @Override
     public void reload(Settings settings) {
@@ -93,7 +105,7 @@ class ListenerService implements SettingsDependent {
      * @return true if the player may play, false otherwise
      */
     private boolean checkAuth(String name) {
-        if (validationService.isUnrestricted(name) || playerCache.isAuthenticated(name)) {
+        if (validationService.isUnrestricted(name) || playerCache.isAuthenticated(name)){
             return true;
         }
         if (!isRegistrationForced && !dataSource.isAuthAvailable(name)) {

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

@@ -0,0 +1,130 @@
+package fr.xephi.authme.listener;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.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.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import javax.inject.Inject;
+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() {
+    }
+
+    private static Material materialPortal = Material.matchMaterial("PORTAL");
+
+    private static boolean isAvailable; // false: unchecked/method not available   true: method is available
+    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");
+            }
+        }
+        try {
+            Method getMinHeightMethod = World.class.getMethod("getMinHeight");
+            isAvailable = true;
+        } catch (NoSuchMethodException e) {
+            isAvailable = false;
+        }
+    }
+
+    private int getMinHeight(World world) {
+        //This keeps compatibility of 1.16.x and lower
+        if (isAvailable) {
+            return world.getMinHeight();
+        } else {
+            return 0;
+        }
+    }
+
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        Location JoinLocation = player.getLocation();
+        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
+            if (!JoinLocation.getBlock().getType().equals(materialPortal) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(materialPortal)) {
+                return;
+            }
+            Block JoinBlock = JoinLocation.getBlock();
+            boolean solved = false;
+            for (BlockFace face : faces) {
+                if (JoinBlock.getRelative(face).getType().equals(Material.AIR) && JoinBlock.getRelative(face).getRelative(BlockFace.UP).getType().equals(Material.AIR)) {
+                    if (settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                        TeleportUtils.teleport(player, JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    }
+                    solved = true;
+                    break;
+                }
+            }
+            if (!solved) {
+                JoinBlock.getRelative(BlockFace.UP).breakNaturally();
+                JoinBlock.breakNaturally();
+            }
+            messages.send(player, MessageKey.LOCATION_FIX_PORTAL);
+        }
+        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND)) {
+            Material UpType = JoinLocation.getBlock().getRelative(BlockFace.UP).getType();
+            World world = player.getWorld();
+            int MaxHeight = world.getMaxHeight();
+            int MinHeight = getMinHeight(world);
+            if (!UpType.isOccluding() && !UpType.equals(Material.LAVA)) {
+                return;
+            }
+            for (int i = MinHeight; i <= MaxHeight; i++) {
+                JoinLocation.setY(i);
+                Block JoinBlock = JoinLocation.getBlock();
+                if ((JoinBlock.getRelative(BlockFace.DOWN).getType().isBlock())
+                    && JoinBlock.getType().equals(Material.AIR)
+                    && JoinBlock.getRelative(BlockFace.UP).getType().equals(Material.AIR)) {
+                    if (JoinBlock.getRelative(BlockFace.DOWN).getType().equals(Material.LAVA)) {
+                        JoinBlock.getRelative(BlockFace.DOWN).setType(Material.DIRT);
+                    }
+                    if (settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                        TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    }
+                    messages.send(player, MessageKey.LOCATION_FIX_UNDERGROUND);
+                    break;
+                }
+                if (i == MaxHeight) {
+                    if (settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                        TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    } else {
+                        player.teleport(JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    }
+                    messages.send(player, MessageKey.LOCATION_FIX_UNDERGROUND_CANT_FIX);
+                }
+            }
+        }
+
+    }
+}

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

@@ -139,7 +139,8 @@ public class OnJoinVerifier implements Reloadable {
         }
         Player nonVipPlayer = generateKickPlayer(onlinePlayers);
         if (nonVipPlayer != null) {
-            nonVipPlayer.kickPlayer(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP));
+            // AuthMeReReloaded - Folia compatibility
+            bukkitService.runTaskIfFolia(nonVipPlayer, () -> nonVipPlayer.kickPlayer(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP)));
             event.allow();
             return false;
         } else {

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

@@ -1,5 +1,6 @@
 package fr.xephi.authme.listener;
 
+import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.data.QuickCommandsProtectionManager;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
@@ -18,7 +19,8 @@ import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
-import org.bukkit.Bukkit;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.HumanEntity;
@@ -28,7 +30,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -50,7 +51,6 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 import org.bukkit.inventory.InventoryView;
 
 import javax.inject.Inject;
@@ -59,11 +59,16 @@ import java.util.Set;
 
 import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOWED_MOVEMENT_RADIUS;
 import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT;
+import static org.bukkit.Bukkit.getServer;
 
 /**
  * Listener class for player events.
  */
-public class PlayerListener implements Listener {
+public class PlayerListener implements Listener{
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+
+
+
 
     @Inject
     private Settings settings;
@@ -93,9 +98,12 @@ public class PlayerListener implements Listener {
     private PermissionsManager permissionsManager;
     @Inject
     private QuickCommandsProtectionManager quickCommandsProtectionManager;
+
+
     // Lowest priority to apply fast protection checks
     @EventHandler(priority = EventPriority.LOWEST)
     public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) {
+
         if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
             return;
         }
@@ -111,9 +119,10 @@ public class PlayerListener implements Listener {
         if (validationService.isUnrestricted(name)) {
             return;
         }
-        
+        if (settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER)) {
-        if (settings.getProperty(RestrictionSettings.HOOK_FLOODGATE_PLAYER) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())){
+            if (getServer().getPluginManager().getPlugin("floodgate") != null) {
-            return;
+                if (org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())) return;
+            }
         }
         // Non-blocking checks
         try {
@@ -121,9 +130,9 @@ public class PlayerListener implements Listener {
         } catch (FailedVerificationException e) {
             event.setKickMessage(messages.retrieveSingle(name, e.getReason(), e.getArgs()));
             event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
-        }
 
         }
+    }
 
     /*
      * Login/join/leave events
@@ -184,7 +193,7 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerJoin(PlayerJoinEvent event) {
         final Player player = event.getPlayer();
-
+        final AuthMeApi authmeApi = AuthMeApi.getInstance();
         if (!PlayerListener19Spigot.isPlayerSpawnLocationEventCalled()) {
             teleportationService.teleportOnJoin(player);
         }
@@ -194,12 +203,15 @@ public class PlayerListener implements Listener {
         management.performJoin(player);
 
         teleportationService.teleportNewPlayerToFirstSpawn(player);
+
     }
 
+
     @EventHandler(priority = EventPriority.HIGH) // HIGH as EssentialsX listens at HIGHEST
     public void onJoinMessage(PlayerJoinEvent event) {
         final Player player = event.getPlayer();
 
+
         // Note: join message can be null, despite api documentation says not
         if (settings.getProperty(RegistrationSettings.REMOVE_JOIN_MESSAGE)) {
             event.setJoinMessage(null);
@@ -308,7 +320,8 @@ public class PlayerListener implements Listener {
         final Player player = event.getPlayer();
         if (!quickCommandsProtectionManager.isAllowed(player.getName())) {
             event.setCancelled(true);
-            player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK));
+            bukkitService.runTaskIfFolia(player, () -> player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK)));
+            // AuthMeReReloaded - Folia compatibility
             return;
         }
         if (listenerService.shouldCancelEvent(player)) {
@@ -334,12 +347,12 @@ public class PlayerListener implements Listener {
         }
 
         /*
-         * Limit player X and Z movements to 1 block
+         * Limit player X and Z movements
          * Deny player Y+ movements (allows falling)
          */
 
-        if (from.getBlockX() == to.getBlockX()
+        if (from.getX() == to.getX()
-            && from.getBlockZ() == to.getBlockZ()
+            && from.getZ() == to.getZ()
             && from.getY() - to.getY() >= 0) {
             return;
         }
@@ -362,12 +375,20 @@ public class PlayerListener implements Listener {
         Location spawn = spawnLoader.getSpawnLocation(player);
         if (spawn != null && spawn.getWorld() != null) {
             if (!player.getWorld().equals(spawn.getWorld())) {
+                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                    TeleportUtils.teleport(player,spawn);
+                } else {
                     player.teleport(spawn);
+                }
             } else if (spawn.distance(player.getLocation()) > settings.getProperty(ALLOWED_MOVEMENT_RADIUS)) {
+                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                    TeleportUtils.teleport(player,spawn);
+                } else {
                     player.teleport(spawn);
                 }
             }
         }
+    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onPlayerRespawn(PlayerRespawnEvent event) {
@@ -455,12 +476,12 @@ public class PlayerListener implements Listener {
      * Inventory interactions
      */
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+//    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
-    public void onPlayerPickupItem(EntityPickupItemEvent event) {
+//    public void onPlayerPickupItem(EntityPickupItemEvent event) {
-        if (listenerService.shouldCancelEvent(event)) {
+//        if (listenerService.shouldCancelEvent(event)) {
-            event.setCancelled(true);
+//            event.setCancelled(true);
-        }
+//        }
-    }
+//    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
@@ -488,15 +509,16 @@ public class PlayerListener implements Listener {
             return false;
         }
         Set<String> whitelist = settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES);
+        //append a string for String whitelist
         return whitelist.contains(ChatColor.stripColor(inventory.getTitle()).toLowerCase(Locale.ROOT));
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerInventoryOpen(InventoryOpenEvent event) {
         final HumanEntity player = event.getPlayer();
-
+        Player ply = (Player) event.getPlayer();
         if (listenerService.shouldCancelEvent(player)
-            && !isInventoryWhitelisted(event.getView())) {
+            && !isInventoryWhitelisted(event.getView()) && listenerService.shouldCancelInvEvent(ply)) {
             event.setCancelled(true);
 
             /*
@@ -514,12 +536,12 @@ public class PlayerListener implements Listener {
             event.setCancelled(true);
         }
     }
-    @EventHandler(priority = EventPriority.LOWEST)
+//    @EventHandler(priority = EventPriority.LOWEST)
-    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+//    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
-        Player player = event.getPlayer();
+//        Player player = event.getPlayer();
-        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
+//        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
-            return;
+//            return;
-        event.setCancelled(true);
+//        event.setCancelled(true);
-        Bukkit.dispatchCommand(event.getPlayer(), "help");
+//        Bukkit.dispatchCommand(event.getPlayer(), "help");
-    }
+//    }
 }

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

@@ -0,0 +1,37 @@
+package fr.xephi.authme.listener;
+
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.PluginSettings;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+
+import javax.inject.Inject;
+
+public class PlayerListenerHigherThan18 implements Listener {
+    @Inject
+    private ListenerService listenerService;
+
+    @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") && settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
+            event.setCancelled(true);
+            Bukkit.dispatchCommand(event.getPlayer(), "help");
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package fr.xephi.authme.listener;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.util.UUID;
+
+public class PurgeListener implements Listener {
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+
+    @Inject
+    private Settings settings;
+    @Inject
+    private BukkitService bukkitService;
+    @Inject
+    private AuthMe plugin;
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        String name = player.getName();
+        UUID playerUUID = event.getPlayer().getUniqueId();
+        if (!authmeApi.isRegistered(name)) {
+            if (settings.getProperty(SecuritySettings.PURGE_DATA_ON_QUIT)) {
+                bukkitService.runTaskLater(() -> {
+                    if (!player.isOnline()) {
+                        deletePlayerData(playerUUID);
+                        deletePlayerStats(playerUUID);
+                        deleteAuthMePlayerData(playerUUID);
+                    }
+                }, 100L);
+            }
+        }
+    }
+
+    private void deletePlayerData(UUID playerUUID) {
+        // 获取服务器的存储文件夹路径
+        File serverFolder = Bukkit.getServer().getWorldContainer();
+        String worldFolderName = settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        // 构建playerdata文件夹路径
+        File playerDataFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "playerdata");
+
+        // 构建玩家数据文件路径
+        File playerDataFile = new File(playerDataFolder, File.separator + playerUUID + ".dat");
+
+        // 删除玩家数据文件
+        if (playerDataFile.exists()) {
+            playerDataFile.delete();
+        }
+    }
+
+    private void 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();
+        }
+    }
+
+    private void deletePlayerStats(UUID playerUUID) {
+        // 获取服务器的存储文件夹路径
+        File serverFolder = Bukkit.getServer().getWorldContainer();
+        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();
+        }
+    }
+}

src/main/java/fr/xephi/authme/listener/protocollib/InventoryPacketAdapter.java

@@ -34,7 +34,6 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -114,10 +113,6 @@ class InventoryPacketAdapter extends PacketAdapter {
             itemListModifier.write(0, Arrays.asList(blankInventory));
         }
 
-        try {
         protocolManager.sendServerPacket(player, inventoryPacket, false);
-        } catch (InvocationTargetException invocationExc) {
-            logger.logException("Error during sending blank inventory", invocationExc);
-        }
     }
 }

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

@@ -4,14 +4,84 @@ package fr.xephi.authme.message;
  * Keys for translatable messages managed by {@link Messages}.
  */
 public enum MessageKey {
+    /**
+     * You have been disconnected due to doubled login.
+     */
+    DOUBLE_LOGIN_FIX("double_login_fix.fix_message"),
 
-    /** In order to use this command you must be authenticated! */
+    /**
+     * 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. */
@@ -35,6 +105,9 @@ public enum MessageKey {
     /** In-game registration is disabled! */
     REGISTRATION_DISABLED("registration.disabled"),
 
+    /** Logged-in due to Session Reconnection. */
+    SESSION_RECONNECTION("session.valid_session"),
+
     /** Successful login! */
     LOGIN_SUCCESS("login.success"),
 
@@ -77,6 +150,9 @@ public enum MessageKey {
     /** The chosen password isn't safe, please choose another one... */
     PASSWORD_UNSAFE_ERROR("password.unsafe_password"),
 
+    /** Your chosen password is not secure. It was used %pwned_count times already! Please use a stronger password... */
+    PASSWORD_PWNED_ERROR("password.pwned_password", "%pwned_count"),
+
     /** Your password contains illegal characters. Allowed chars: %valid_chars */
     PASSWORD_CHARACTERS_ERROR("password.forbidden_characters", "%valid_chars"),
 

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/message/updater/OldMessageKeysMigrater.java

@@ -30,6 +30,7 @@ final class OldMessageKeysMigrater {
         .put(MessageKey.WRONG_PASSWORD, "wrong_pwd")
         .put(MessageKey.UNREGISTERED_SUCCESS, "unregistered")
         .put(MessageKey.REGISTRATION_DISABLED, "reg_disabled")
+        .put(MessageKey.SESSION_RECONNECTION, "valid_session")
         .put(MessageKey.ACCOUNT_NOT_ACTIVATED, "vb_nonActiv")
         .put(MessageKey.NAME_ALREADY_REGISTERED, "user_regged")
         .put(MessageKey.NO_PERMISSION, "no_perm")

src/main/java/fr/xephi/authme/process/Management.java

@@ -54,7 +54,7 @@ public class Management {
     }
 
     public void forceLogin(Player player) {
-        runTask(() -> asynchronousLogin.forceLogin(player,0));
+        runTask(() -> asynchronousLogin.forceLogin(player));
     }
 
     public void forceLogin(Player player, boolean quiet) {

src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java

@@ -19,7 +19,6 @@ import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.HooksSettings;
-import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.InternetProtocolUtils;
@@ -129,16 +128,18 @@ public class AsynchronousJoin implements AsynchronousProcess {
 
             // Session logic
             if (sessionService.canResumeSession(player)) {
+                service.send(player, MessageKey.SESSION_RECONNECTION);
                 // Run commands
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
                     () -> commandManager.runCommandsOnSessionLogin(player));
-                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player,service.getProperty(PluginSettings.HIDE_SESSIONS_LOGIN) ? 1 : 0));
+                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player));
                 return;
             } else if (proxySessionManager.shouldResumeSession(name)) {
+                service.send(player, MessageKey.SESSION_RECONNECTION);
                 // Run commands
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
                     () -> commandManager.runCommandsOnSessionLogin(player));
-                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player,service.getProperty(PluginSettings.HIDE_SESSIONS_LOGIN) ? 1 : 0));
+                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player));
                 logger.info("The user " + player.getName() + " has been automatically logged in, "
                     + "as present in autologin queue.");
                 return;
@@ -188,7 +189,9 @@ public class AsynchronousJoin implements AsynchronousProcess {
             if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
                 // Allow infinite blindness effect
                 int blindTimeOut = (registrationTimeout <= 0) ? 99999 : registrationTimeout;
-                player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2));
+
+                // AuthMeReReloaded - Fix potion apply on Folia
+                bukkitService.runTaskIfFolia(player,() -> player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2)));
             }
             commandManager.runCommandsOnJoin(player);
         });

src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -102,7 +102,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
                 limboService.getLimboPlayer(player.getName()).setState(LimboPlayerState.TOTP_REQUIRED);
                 // TODO #1141: Check if we should check limbo state before processing password
             } else {
-                performLogin(player, auth, false);
+                performLogin(player, auth);
             }
         }
     }
@@ -112,10 +112,10 @@ public class AsynchronousLogin implements AsynchronousProcess {
      *
      * @param player the player to log in
      */
-    public void forceLogin(Player player,int quiet) {
+    public void forceLogin(Player player) {
         PlayerAuth auth = getPlayerAuth(player);
         if (auth != null) {
-            performLogin(player, auth, quiet == 1);
+            performLogin(player, auth);
         }
     }
 
@@ -128,7 +128,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
     public void forceLogin(Player player, boolean quiet) {
         PlayerAuth auth = getPlayerAuth(player, quiet);
         if (auth != null) {
-            performLogin(player, auth, false);
+            performLogin(player, auth);
         }
     }
 
@@ -265,7 +265,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
      * @param player the player to log in
      * @param auth the associated PlayerAuth object
      */
-    public void performLogin(Player player, PlayerAuth auth, boolean quiet) {
+    public void performLogin(Player player, PlayerAuth auth) {
         if (player.isOnline()) {
             boolean isFirstLogin = (auth.getLastLogin() == null);
 
@@ -284,7 +284,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
             tempbanManager.resetCount(ip, name);
             player.setNoDamageTicks(0);
 
-            if (!quiet) {service.send(player, MessageKey.LOGIN_SUCCESS);}
+            service.send(player, MessageKey.LOGIN_SUCCESS);
 
             // Other auths
             List<String> auths = dataSource.getAllAuthsByIp(auth.getLastIp());

src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java

@@ -86,6 +86,13 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
         }
 
         final PlayerAuth auth = playerCache.getAuth(name);
+
+        // AuthMeReReloaded start - Fix #57
+        if (isFirstLogin) {
+            auth.setQuitLocation(player.getLocation());
+        }
+        // AuthMeReReloaded end - Fix #57
+
         teleportationService.teleportOnLogin(player, auth, limbo);
 
         // We can now display the join message (if delayed)

src/main/java/fr/xephi/authme/process/register/executors/AbstractPasswordRegisterExecutor.java

@@ -89,9 +89,9 @@ abstract class AbstractPasswordRegisterExecutor<P extends AbstractPasswordRegist
         final Player player = params.getPlayer();
         if (performLoginAfterRegister(params)) {
             if (commonService.getProperty(PluginSettings.USE_ASYNC_TASKS)) {
-                bukkitService.runTaskAsynchronously(() -> asynchronousLogin.forceLogin(player,0));
+                bukkitService.runTaskAsynchronously(() -> asynchronousLogin.forceLogin(player));
             } else {
-                bukkitService.scheduleSyncDelayedTask(() -> asynchronousLogin.forceLogin(player,0), SYNC_LOGIN_DELAY);
+                bukkitService.scheduleSyncDelayedTask(() -> asynchronousLogin.forceLogin(player), SYNC_LOGIN_DELAY);
             }
         }
         syncProcessManager.processSyncPasswordRegister(player);

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

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

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

@@ -1,5 +1,6 @@
 package fr.xephi.authme.service;
 
+import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
@@ -8,7 +9,6 @@ import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.ProtectionSettings;
 import fr.xephi.authme.util.AtomicIntervalCounter;
-import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
 import java.util.Locale;
@@ -32,7 +32,7 @@ public class AntiBotService implements SettingsDependent {
     // Service status
     private AntiBotStatus antiBotStatus;
     private boolean startup;
-    private BukkitTask disableTask;
+    private MyScheduledTask disableTask;
     private AtomicIntervalCounter flaggedCounter;
 
     @Inject
@@ -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/BackupService.java

@@ -94,6 +94,9 @@ public class BackupService {
             case SQLITE:
                 String dbName = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
                 return performFileBackup(dbName + ".db");
+            case H2:
+                String h2dbName = settings.getProperty(DatabaseSettings.MYSQL_DATABASE);
+                return performFileBackup(h2dbName + ".mv.db");
             default:
                 logger.warning("Unknown data source type '" + dataSourceType + "' for backup");
         }

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

@@ -1,20 +1,23 @@
 package fr.xephi.authme.service;
 
+import com.github.Anon8281.universalScheduler.UniversalRunnable;
+import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
+import fr.xephi.authme.util.Utils;
 import org.bukkit.BanEntry;
 import org.bukkit.BanList;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
 import java.util.Collection;
@@ -23,6 +26,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
+import static fr.xephi.authme.AuthMe.getScheduler;
+
 /**
  * Service for operations requiring the Bukkit API, such as for scheduling.
  */
@@ -32,7 +37,8 @@ public class BukkitService implements SettingsDependent {
     public static final int TICKS_PER_SECOND = 20;
     /** Number of ticks per minute. */
     public static final int TICKS_PER_MINUTE = 60 * TICKS_PER_SECOND;
-
+    /** Whether the server is running Folia. */
+    private static final boolean IS_FOLIA = Utils.isClassLoaded("io.papermc.paper.threadedregions.RegionizedServer");
     private final AuthMe authMe;
     private boolean useAsyncTasks;
 
@@ -48,10 +54,9 @@ public class BukkitService implements SettingsDependent {
      * This task will be executed by the main server thread.
      *
      * @param task Task to be executed
-     * @return Task id number (-1 if scheduling failed)
      */
-    public int scheduleSyncDelayedTask(Runnable task) {
+    public void scheduleSyncDelayedTask(Runnable task) {
-        return Bukkit.getScheduler().scheduleSyncDelayedTask(authMe, task);
+        getScheduler().runTask(task);
     }
 
     /**
@@ -61,10 +66,9 @@ public class BukkitService implements SettingsDependent {
      *
      * @param task  Task to be executed
      * @param delay Delay in server ticks before executing task
-     * @return Task id number (-1 if scheduling failed)
      */
-    public int scheduleSyncDelayedTask(Runnable task, long delay) {
+    public void scheduleSyncDelayedTask(Runnable task, long delay) {
-        return Bukkit.getScheduler().scheduleSyncDelayedTask(authMe, task, delay);
+        getScheduler().runTaskLater(task, delay);
     }
 
     /**
@@ -76,7 +80,7 @@ public class BukkitService implements SettingsDependent {
      */
     public void scheduleSyncTaskFromOptionallyAsyncTask(Runnable task) {
         if (Bukkit.isPrimaryThread()) {
-            task.run();
+            runTask(task);
         } else {
             scheduleSyncDelayedTask(task);
         }
@@ -86,14 +90,59 @@ public class BukkitService implements SettingsDependent {
      * Returns a task that will run on the next server tick.
      *
      * @param task the task to be run
-     * @return a BukkitTask that contains the id number
      * @throws IllegalArgumentException if plugin is null
      * @throws IllegalArgumentException if task is null
      */
-    public BukkitTask runTask(Runnable task) {
+    public void runTask(Runnable task) {
-        return Bukkit.getScheduler().runTask(authMe, task);
+        getScheduler().runTask(task);
     }
 
+    public void runTask(Entity entity, Runnable task) {
+        getScheduler().runTask(entity, task);
+    }
+
+    public void runTask(Location location, Runnable task) {
+        getScheduler().runTask(location, task);
+    }
+
+    /**
+     * Runs the task synchronously if we are running Folia, else do nothing but run it.
+     * @param task the task to be run
+     */
+    public void runTaskIfFolia(Runnable task) {
+        if (IS_FOLIA) {
+            runTask(task);
+        } else {
+            task.run();
+        }
+    }
+
+    /**
+     * Runs the task synchronously if we are running Folia, else do nothing but run it.
+     * @param task the task to be run
+     */
+    public void runTaskIfFolia(Entity entity, Runnable task) {
+        if (IS_FOLIA) {
+            runTask(entity, task);
+        } else {
+            task.run();
+        }
+    }
+
+    /**
+     * Runs the task synchronously if we are running Folia, else do nothing but run it.
+     * @param task the task to be run
+     */
+    public void runTaskIfFolia(Location location, Runnable task) {
+        if (IS_FOLIA) {
+            runTask(location, task);
+        } else {
+            task.run();
+        }
+    }
+
+
+
     /**
      * Returns a task that will run after the specified number of server
      * ticks.
@@ -104,8 +153,8 @@ public class BukkitService implements SettingsDependent {
      * @throws IllegalArgumentException if plugin is null
      * @throws IllegalArgumentException if task is null
      */
-    public BukkitTask runTaskLater(Runnable task, long delay) {
+    public MyScheduledTask runTaskLater(Runnable task, long delay) {
-        return Bukkit.getScheduler().runTaskLater(authMe, task, delay);
+        return getScheduler().runTaskLater(task, delay);
     }
 
     /**
@@ -118,7 +167,7 @@ public class BukkitService implements SettingsDependent {
         if (useAsyncTasks) {
             runTaskAsynchronously(task);
         } else {
-            task.run();
+            runTask(task);
         }
     }
 
@@ -129,12 +178,11 @@ public class BukkitService implements SettingsDependent {
      * Returns a task that will run asynchronously.
      *
      * @param task the task to be run
-     * @return a BukkitTask that contains the id number
      * @throws IllegalArgumentException if plugin is null
      * @throws IllegalArgumentException if task is null
      */
-    public BukkitTask runTaskAsynchronously(Runnable task) {
+    public void runTaskAsynchronously(Runnable task) {
-        return Bukkit.getScheduler().runTaskAsynchronously(authMe, task);
+        getScheduler().runTaskAsynchronously(task);
     }
 
     /**
@@ -152,7 +200,7 @@ public class BukkitService implements SettingsDependent {
      * @throws IllegalArgumentException if task is null
      * @throws IllegalStateException if this was already scheduled
      */
-    public BukkitTask runTaskTimerAsynchronously(BukkitRunnable task, long delay, long period) {
+    public MyScheduledTask runTaskTimerAsynchronously(UniversalRunnable task, long delay, long period) {
         return task.runTaskTimerAsynchronously(authMe, delay, period);
     }
 
@@ -167,7 +215,7 @@ public class BukkitService implements SettingsDependent {
      * @throws IllegalArgumentException if plugin is null
      * @throws IllegalStateException    if this was already scheduled
      */
-    public BukkitTask runTaskTimer(BukkitRunnable task, long delay, long period) {
+    public MyScheduledTask runTaskTimer(UniversalRunnable task, long delay, long period) {
         return task.runTaskTimer(authMe, delay, period);
     }
 

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

@@ -1,9 +1,6 @@
 package fr.xephi.authme.service;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.hash.HashCode;
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hashing;
 import com.maxmind.db.GeoIp2Provider;
 import com.maxmind.db.Reader;
 import com.maxmind.db.Reader.FileMode;
@@ -13,47 +10,34 @@ import com.maxmind.db.model.CountryResponse;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.ProtectionSettings;
-import fr.xephi.authme.util.FileUtils;
 import fr.xephi.authme.util.InternetProtocolUtils;
 
 import javax.inject.Inject;
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.net.InetAddress;
-import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.FileTime;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Base64;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.zip.GZIPInputStream;
 
 public class GeoIpService {
 
-    private static final String LICENSE =
+    //private static final String LICENSE =
-            "[LICENSE] This product includes GeoLite2 data created by MaxMind, available at https://www.maxmind.com";
+            //"[LICENSE] This product includes GeoLite2 data created by MaxMind, available at https://www.maxmind.com";
 
     private static final String DATABASE_NAME = "GeoLite2-Country";
     private static final String DATABASE_FILE = DATABASE_NAME + ".mmdb";
+
+
     private final ConsoleLogger logger = ConsoleLoggerFactory.get(GeoIpService.class);
     private final Path dataFile;
+
     private GeoIp2Provider databaseReader;
     private volatile boolean downloading;
 
     @Inject
-    GeoIpService(@DataFolder File dataFolder) {
+     GeoIpService(@DataFolder File dataFolder){
         this.dataFile = dataFolder.toPath().resolve(DATABASE_FILE);
 
         // Fires download of recent data or the initialization of the look up service
@@ -86,27 +70,63 @@ public class GeoIpService {
         if (Files.exists(dataFile)) {
             try {
                 startReading();
-                // don't fire the update task - we are up to date
                 return true;
             } catch (IOException ioEx) {
                 logger.logException("Failed to load GeoLiteAPI database", ioEx);
                 return false;
             }
         }
+
         // File is outdated or doesn't exist - let's try to download the data file!
         // use bukkit's cached threads
         return false;
     }
 
+    /**
+     *
+     */
 
     private void startReading() throws IOException {
         databaseReader = new Reader(dataFile.toFile(), FileMode.MEMORY, new CHMCache());
-        logger.info(LICENSE);
 
         // clear downloading flag, because we now have working reader instance
         downloading = false;
     }
 
+    /**
+     * Downloads the archive to the destination file if it's newer than the locally version.
+     *
+     * @param lastModified modification timestamp of the already present file
+     * @param destination save file
+     * @return null if no updates were found, the MD5 hash of the downloaded archive if successful
+     * @throws IOException if failed during downloading and writing to destination file
+     */
+
+    /**
+     * Downloads the archive to the destination file if it's newer than the locally version.
+     *
+     * @param destination save file
+     * @return null if no updates were found, the MD5 hash of the downloaded archive if successful
+     * @throws IOException if failed during downloading and writing to destination file
+     */
+
+    /**
+     * Verify if the expected checksum is equal to the checksum of the given file.
+     *
+     * @param function the checksum function like MD5, SHA256 used to generate the checksum from the file
+     * @param file the file we want to calculate the checksum from
+     * @param expectedChecksum the expected checksum
+     * @throws IOException on I/O error reading the file or the checksum verification failed
+     */
+
+    /**
+     * Extract the database from gzipped data. Existing outputFile will be replaced if it already exists.
+     *
+     * @param inputFile gzipped database input file
+     * @param outputFile destination file for the database
+     * @throws IOException on I/O error reading the archive, or writing the output
+     */
+
     /**
      * Get the country code of the given IP address.
      *

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;
@@ -140,8 +142,9 @@ public class TeleportationService implements Reloadable {
             logger.debug("Teleporting `{0}` to spawn because of 'force-spawn after login'", player.getName());
             teleportToSpawn(player, true);
         } else if (settings.getProperty(TELEPORT_UNAUTHED_TO_SPAWN)) {
-            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) {
+            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
                 Location location = buildLocationFromAuth(player, auth);
+                if (location.equals(player.getLocation())) return;
                 logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
                 teleportBackFromSpawn(player, location);
             } else if (limbo != null && limbo.getLocation() != null) {
@@ -184,7 +187,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/service/ValidationService.java

@@ -11,6 +11,7 @@ import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
+import fr.xephi.authme.security.HashUtils;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.ProtectionSettings;
@@ -23,7 +24,10 @@ import org.bukkit.entity.Player;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+import java.io.DataInputStream;
+import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
+import java.net.URL;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -84,7 +88,15 @@ public class ValidationService implements Reloadable {
             return new ValidationResult(MessageKey.INVALID_PASSWORD_LENGTH);
         } else if (settings.getProperty(SecuritySettings.UNSAFE_PASSWORDS).contains(passLow)) {
             return new ValidationResult(MessageKey.PASSWORD_UNSAFE_ERROR);
+        } else if (settings.getProperty(SecuritySettings.HAVE_I_BEEN_PWNED_CHECK)) {
+            HaveIBeenPwnedResults results = validatePasswordHaveIBeenPwned(password);
+            if (results != null
+            && results.isPwned()
+            && results.getPwnCount() > settings.getProperty(SecuritySettings.HAVE_I_BEEN_PWNED_LIMIT)) {
+            return new ValidationResult(MessageKey.PASSWORD_PWNED_ERROR, String.valueOf(results.getPwnCount()));
         }
+    }
+
         return new ValidationResult();
     }
 
@@ -225,6 +237,47 @@ public class ValidationService implements Reloadable {
         }
         return restrictions;
     }
+    /**
+     * Check haveibeenpwned.com for the given password.
+     *
+     * @param password password to check for
+     * @return Results of the check
+     */
+    public HaveIBeenPwnedResults validatePasswordHaveIBeenPwned(String password) {
+        String hash = HashUtils.sha1(password);
+
+        String hashPrefix = hash.substring(0, 5);
+
+        try {
+            String url = String.format("https://api.pwnedpasswords.com/range/%s", hashPrefix);
+            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.setRequestMethod("GET");
+            connection.setRequestProperty("User-Agent", "AuthMeReloaded");
+            connection.setConnectTimeout(5000);
+            connection.setReadTimeout(5000);
+            connection.setDoInput(true);
+            StringBuilder outStr = new StringBuilder();
+
+            try (DataInputStream input = new DataInputStream(connection.getInputStream())) {
+                for (int c = input.read(); c != -1; c = input.read())
+                    outStr.append((char) c);
+            }
+
+            String[] hashes = outStr.toString().split("\n");
+            for (String hashSuffix : hashes) {
+                String[] hashSuffixParts = hashSuffix.trim().split(":");
+                if (hashSuffixParts[0].equalsIgnoreCase(hash.substring(5))) {
+                    return new HaveIBeenPwnedResults(true, Integer.parseInt(hashSuffixParts[1]));
+                }
+            }
+            return new HaveIBeenPwnedResults(false, 0);
+        } catch (java.io.IOException e) {
+            logger.warning("验证密码时出现错误,这可能是由于网络问题,如果无法解决,请关闭HaveIBeenPwned检查");
+        }
+
+        return null;
+    }
+
 
     public static final class ValidationResult {
         private final MessageKey messageKey;
@@ -266,4 +319,22 @@ public class ValidationService implements Reloadable {
             return args;
         }
     }
+
+    public static final class HaveIBeenPwnedResults {
+        private final boolean isPwned;
+        private final int pwnCount;
+
+        public HaveIBeenPwnedResults(boolean isPwned, int pwnCount) {
+            this.isPwned = isPwned;
+            this.pwnCount = pwnCount;
+        }
+
+        public boolean isPwned() {
+            return isPwned;
+        }
+
+        public int getPwnCount() {
+            return pwnCount;
+        }
+    }
 }

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

@@ -10,7 +10,7 @@ import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 public final class DatabaseSettings implements SettingsHolder {
 
     @Comment({"What type of database do you want to use?",
-        "Valid values: SQLITE, MARIADB, MYSQL, POSTGRESQL"})
+        "Valid values: H2, SQLITE, MARIADB, MYSQL, POSTGRESQL"})
     public static final Property<DataSourceType> BACKEND =
         newProperty(DataSourceType.class, "DataSource.backend", DataSourceType.SQLITE);
 

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

@@ -19,6 +19,13 @@ public final class HooksSettings implements SettingsHolder {
     public static final Property<Boolean> BUNGEECORD =
         newProperty("Hooks.bungeecord", false);
 
+    @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);
+
+
     @Comment("Send player to this BungeeCord server after register/login")
     public static final Property<String> BUNGEECORD_SERVER =
         newProperty("Hooks.sendPlayerTo", "");

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", false);
 
     @Comment({
         "Do you want to enable the session feature?",
@@ -20,12 +27,6 @@ public final class PluginSettings implements SettingsHolder {
     public static final Property<Boolean> SESSIONS_ENABLED =
         newProperty("settings.sessions.enabled", true);
 
-    @Comment({
-        "Do you want to hide login success message to player?"
-    })
-    public static final Property<Boolean> HIDE_SESSIONS_LOGIN =
-        newProperty("settings.sessions.hidelogin", true);
-
     @Comment({
         "After how many minutes should a session expire?",
         "A player's session ends after the timeout or if his IP has changed"
@@ -38,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/RegistrationSettings.java

@@ -18,7 +18,7 @@ public final class RegistrationSettings implements SettingsHolder {
         "Send every X seconds a message to a player to",
         "remind him that he has to login/register"})
     public static final Property<Integer> MESSAGE_INTERVAL =
-        newProperty("settings.registration.messageInterval", 600);
+        newProperty("settings.registration.messageInterval", 5);
 
     @Comment({
         "Only registered and logged in players can play.",
@@ -33,7 +33,7 @@ public final class RegistrationSettings implements SettingsHolder {
         "More info at https://github.com/AuthMe/AuthMeReloaded/wiki/Registration"
     })
     public static final Property<RegistrationType> REGISTRATION_TYPE =
-        newProperty(RegistrationType.class, "settings.registration.type", RegistrationType.EMAIL);
+        newProperty(RegistrationType.class, "settings.registration.type", RegistrationType.PASSWORD);
 
     @Comment({
         "Second argument the /register command should take: ",
@@ -44,7 +44,7 @@ public final class RegistrationSettings implements SettingsHolder {
     })
     public static final Property<RegisterSecondaryArgument> REGISTER_SECOND_ARGUMENT =
         newProperty(RegisterSecondaryArgument.class, "settings.registration.secondArg",
-            RegisterSecondaryArgument.NONE);
+            RegisterSecondaryArgument.CONFIRMATION);
 
     @Comment({
         "Do we force kick a player after a successful registration?",

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

@@ -113,21 +113,19 @@ public final class RestrictionSettings implements SettingsHolder {
 
     @Comment("Can unregistered players walk around?")
     public static final Property<Boolean> ALLOW_UNAUTHED_MOVEMENT =
-        newProperty("settings.restrictions.allowMovement", true);
+        newProperty("settings.restrictions.allowMovement", false);
 
     @Comment({
         "After how many seconds should players who fail to login or register",
         "be kicked? Set to 0 to disable."})
     public static final Property<Integer> TIMEOUT =
-        newProperty("settings.restrictions.timeout", 0);
+        newProperty("settings.restrictions.timeout", 120);
 
     @Comment("Regex pattern of allowed characters in the player name.")
     public static final Property<String> ALLOWED_NICKNAME_CHARACTERS =
         newProperty("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_]*");
 
-    @Comment("Allow FloodGatePlayer Join Without checkIsValidName()")
+
-    public static final Property<Boolean> HOOK_FLOODGATE_PLAYER =
-        newProperty("settings.restrictions.hookFloodGatePlayer", false);
     @Comment({
         "How far can unregistered players walk?",
         "Set to 0 for unlimited radius"
@@ -163,7 +161,7 @@ public final class RestrictionSettings implements SettingsHolder {
 
     @Comment("AuthMe will NEVER teleport players if set to true!")
     public static final Property<Boolean> NO_TELEPORT =
-        newProperty("settings.restrictions.noTeleport", true);
+        newProperty("settings.restrictions.noTeleport", false);
 
     @Comment({
         "Regex syntax for allowed chars in passwords. The default [!-~] allows all visible ASCII",
@@ -175,7 +173,7 @@ public final class RestrictionSettings implements SettingsHolder {
 
     @Comment("Regex syntax for allowed chars in email.")
     public static final Property<String> ALLOWED_EMAIL_REGEX =
-        newProperty("settings.restrictions.allowedEmailCharacters", "^[A-Za-z0-9]{4,15}@(outlook|163|gmail|icloud).com$");
+        newProperty("settings.restrictions.allowedEmailCharacters", "^[A-Za-z0-9_]{4,15}@(qq|outlook|163|gmail|icloud)\\.com$");
 
 
     @Comment("Force survival gamemode when player joins?")
@@ -194,6 +192,7 @@ public final class RestrictionSettings implements SettingsHolder {
     public static final Property<Set<String>> UNRESTRICTED_NAMES =
         newLowercaseStringSetProperty("settings.unrestrictions.UnrestrictedName");
 
+
     @Comment({
         "Below you can list all inventories names that AuthMe will ignore",
         "for registration or login. Configure it at your own risk!!",
@@ -206,7 +205,9 @@ public final class RestrictionSettings implements SettingsHolder {
     public static final Property<Set<String>> UNRESTRICTED_INVENTORIES =
         newLowercaseStringSetProperty("settings.unrestrictions.UnrestrictedInventories");
 
+
     private RestrictionSettings() {
+
     }
 
 }

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

@@ -6,8 +6,10 @@ 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;
 
@@ -17,16 +19,87 @@ public final class SecuritySettings implements SettingsHolder {
         "Take care with this, if you set this to false,",
         "AuthMe will automatically disable and the server won't be protected!"})
     public static final Property<Boolean> STOP_SERVER_ON_PROBLEM =
-        newProperty("Security.SQLProblem.stopServer", true);
+        newProperty("Security.SQLProblem.stopServer", false);
+
+    @Comment({"Should 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)",
+        "(**THIS IS SAFE DO NOT WORRY**)"})
+    public static final Property<Boolean> FORCE_LOGIN_BEDROCK =
+        newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
+
+    @Comment("Should we purge data on non-registered players quit?")
+    public static final Property<Boolean> PURGE_DATA_ON_QUIT =
+        newProperty("3rdPartyFeature.features.purgeData.purgeOnQuit", 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.features.purgeData.purgeWorldFolderName", "world");
+    @Comment("Enable the new feature to prevent ghost players?")
+    public static final Property<Boolean> ANTI_GHOST_PLAYERS =
+        newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
+
+    @Comment({"(MC1.13- only)",
+        "Should we fix the shulker crash bug with advanced method?"})
+    public static final Property<Boolean> ADVANCED_SHULKER_FIX =
+        newProperty("3rdPartyFeature.fixes.advancedShulkerFix", 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", true);
+
+    @Comment("Send a GUI captcha to unregistered players?(Requires ProtocolLib)")
+    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.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.features.captcha.ignoreBedrock", 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);
+
+    @Comment("Should we fix the location when players logged underground?")
+    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_UNDERGROUND =
+        newProperty("3rdPartyFeature.fixes.loginLocationFix.fixGroundStuck", false);
 
     @Comment("Copy AuthMe log output in a separate file as well?")
     public static final Property<Boolean> USE_LOGGING =
         newProperty("Security.console.logConsole", true);
 
+    @Comment({"Query haveibeenpwned.com with a hashed version of the password.",
+        "This is used to check whether it is safe."})
+    public static final Property<Boolean> HAVE_I_BEEN_PWNED_CHECK =
+        newProperty("Security.account.haveIBeenPwned.check", false);
+
+    @Comment({"If the password is used more than this number of times, it is considered unsafe."})
+    public static final Property<Integer> HAVE_I_BEEN_PWNED_LIMIT =
+        newProperty("Security.account.haveIBeenPwned.limit", 0);
+
     @Comment("Enable captcha when a player uses wrong password too many times")
     public static final Property<Boolean> ENABLE_LOGIN_FAILURE_CAPTCHA =
         newProperty("Security.captcha.useCaptcha", false);
 
+    @Comment("Check for updates on enabled from GitHub?")
+    public static final Property<Boolean> CHECK_FOR_UPDATES =
+        newProperty("Plugin.updates.checkForUpdates", true);
+
+    @Comment("Should we show the AuthMe banner on startup?")
+    public static final Property<Boolean> SHOW_STARTUP_BANNER =
+        newProperty("Plugin.banners.showBanners", true);
+
     @Comment("Max allowed tries before a captcha is required")
     public static final Property<Integer> MAX_LOGIN_TRIES_BEFORE_CAPTCHA =
         newProperty("Security.captcha.maxLoginTry", 8);

src/main/java/fr/xephi/authme/task/CleanupTask.java

@@ -1,15 +1,15 @@
 package fr.xephi.authme.task;
 
 import ch.jalu.injector.factory.SingletonStore;
+import com.github.Anon8281.universalScheduler.UniversalRunnable;
 import fr.xephi.authme.initialization.HasCleanup;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import javax.inject.Inject;
 
 /**
  * Task run periodically to invoke the cleanup task on services.
  */
-public class CleanupTask extends BukkitRunnable {
+public class CleanupTask extends UniversalRunnable {
 
     @Inject
     private SingletonStore<HasCleanup> hasCleanupStore;

src/main/java/fr/xephi/authme/task/MessageTask.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.task;
 
+import com.github.Anon8281.universalScheduler.UniversalRunnable;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 /**
  * Message shown to a player in a regular interval as long as he is not logged in.
  */
-public class MessageTask extends BukkitRunnable {
+public class MessageTask extends UniversalRunnable {
 
     private final Player player;
     private final String[] message;

src/main/java/fr/xephi/authme/task/purge/PurgeTask.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.task.purge;
 
+import com.github.Anon8281.universalScheduler.UniversalRunnable;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
@@ -9,14 +10,13 @@ import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 
-class PurgeTask extends BukkitRunnable {
+class PurgeTask extends UniversalRunnable {
 
     //how many players we should check for each tick
     private static final int INTERVAL_CHECK = 5;

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

@@ -28,7 +28,7 @@ public final class PlayerUtils {
      * @return True if the player is an NPC, false otherwise
      */
     public static boolean isNpc(Player player) {
-        return player.hasMetadata("NPC");
+        return player.hasMetadata("NPC") || player.getAddress() == null;
     }
 
 }

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

@@ -0,0 +1,44 @@
+package fr.xephi.authme.util;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * This class is a utility class for handling async teleportation of players in game.
+ */
+public class TeleportUtils {
+    private static Method teleportAsyncMethod;
+
+    static {
+        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;
+            //if not, set method to null
+        }
+    }
+
+    /**
+     * 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.invoke(player, location);
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                player.teleport(location);
+            }
+        } else {
+            player.teleport(location);
+        }
+    }
+}

src/main/resources/commands.yml

@@ -41,10 +41,7 @@
 #     executor: CONSOLE
 #     ifNumberOfAccountsAtLeast: 5
 # Commands to run for players logging in whose 'last login date' was empty
-onFirstLogin:
+onFirstLogin: {}
-  broadcast:
-    command: 'cmi broadcast &b欢迎 &r%p &7( %ip ) &b光临服务器,请大家多多关照!'
-    executor: CONSOLE
 onJoin: {}
 onLogin: {}
 # These commands are called whenever a logged in player uses /logout or quits.

src/main/resources/email.html

@@ -102,8 +102,9 @@
                                     <tbody>
                                     <tr>
                                         <td>
-                                            <p style="color:#b0adc5;">© 2023 IrisCraft. All rights reserved.</p>
+                                            <p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
-                                            <a href="https://www.mcbbs.net/thread-1263385-1-1.html" target="_blank" style="text-decoration: none; font-size: 16px">iriscraft.work</a>
+                                            <a href="1919810.com" target="_blank"
+                                               style="text-decoration: none; font-size: 16px">wdsj.in</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_bg.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&2Сесията е продължена.'
     invalid_session: '&cТвоят IP се е променил и сесията беше прекратена.'
 
 # Error messages when joining

src/main/resources/messages/messages_br.yml

@@ -69,7 +69,7 @@ misc:
 
 # Mensagens de sessão
 session:
-    
+    valid_session: '&2Você deslogou recentemente, então sua sessão foi retomada!'
     invalid_session: '&fO seu IP foi alterado e sua sessão expirou!'
 
 # Mensagens de erro ao entrar

src/main/resources/messages/messages_cz.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&cAutomatické znovupřihlášení.'
     invalid_session: '&cChyba: Počkej než vyprší tvoje relace.'
 
 # Error messages when joining

src/main/resources/messages/messages_de.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&2Erfolgreich eingeloggt!'
     invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist.'
 
 # Error messages when joining

src/main/resources/messages/messages_en.yml

@@ -20,6 +20,7 @@ password:
   unsafe_password: '&cThe chosen password isn''t safe, please choose another one...'
   forbidden_characters: '&4Your password contains illegal characters. Allowed chars: %valid_chars'
   wrong_length: '&cYour password is too short or too long! Please try with another one!'
+  pwned_password: '&cYour chosen password is not secure. It was used %pwned_count times already! Please use a strong password...'
 
 # Login
 login:
@@ -66,7 +67,7 @@ misc:
 # Session messages
 session:
   invalid_session: '&cYour IP has been changed and your session data has expired!'
-  
+  valid_session: '&2Logged-in due to Session Reconnection.'
 
 # Error messages when joining
 on_join_validation:
@@ -154,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_eo.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&2Ensalutantojn pro Sesio Rekonektas.'
     invalid_session: '&cVia IP estis ŝanĝita kaj via seanco datumoj finiĝis!'
 
 # Error messages when joining

src/main/resources/messages/messages_es.yml

@@ -67,7 +67,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&cInicio de sesión'
     invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.'
 
 # Error messages when joining

src/main/resources/messages/messages_et.yml

@@ -66,7 +66,7 @@ misc:
 # Session messages
 session:
     invalid_session: '&cSinu IP-aadress muutus, seega sinu sessioon aegus!'
-    
+    valid_session: '&2Sisse logitud sessiooni jätkumise tõttu.'
 
 # Error messages when joining
 on_join_validation:

src/main/resources/messages/messages_eu.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&cSesioa mantendu eta beraz ez daukazu saioa hasi beharrik.'
     invalid_session: '&cZure IP helbidea aldatu da, eta horregatik zure sesioa iraungi da!'
 
 # Error messages when joining

src/main/resources/messages/messages_fi.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&cIstunto jatkettu!'
     invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun'
 
 # Error messages when joining

src/main/resources/messages/messages_fr.yml

@@ -69,7 +69,7 @@ misc:
 
 # Session
 session:
-    
+    valid_session: '&aVous avez été automatiquement connecté !'
     invalid_session: 'Session expirée suite à un changement d''IP.'
 
 # Erreurs lors d'une tentative connexion

src/main/resources/messages/messages_gl.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&cIdentificado mediante a sesión'
     invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión'
 
 # Error messages when joining

src/main/resources/messages/messages_hu.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&2A megadott időkereten belül csatlakoztál vissza, így a rendszer automatikusan beléptetett.'
     invalid_session: '&cAz IP címed megváltozott, ezért a visszacsatlakozási időkereted lejárt.'
 
 # Error messages when joining

src/main/resources/messages/messages_id.yml

@@ -66,7 +66,7 @@ misc:
 
 # Session messages
 session:
-    
+    valid_session: '&2Otomatis login, karena sesi masih terhubung.'
     invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!'
 
 # Error messages when joining