.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,10 +47,8 @@ body:
       description: Which server implementation are you using?
       multiple: false
       options:
-        - Standalone(Spigot)
+        - Standalone server (no proxy)
-        - Standalone(Folia)
         - BungeeCord
-        - Velocity
     validations:
       required: true
 
@@ -62,9 +60,6 @@ body:
       options:
         - SQLite
         - MySQL
-        - H2
-        - MariaDB
-        - PostgreSQL
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest an idea for AuthMe
-labels: 'enhancement'
+labels: 'Type: enhancement'
 
 body:
   - type: markdown

.github/dependabot.yml

@@ -10,7 +10,3 @@ 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.yml

@@ -10,42 +10,14 @@ jobs:
   Build:
     strategy:
       matrix:
-        jdkversion: [ 21 ]
+        jdkversion: [11]
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
-      - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v3
-        with:
+      with:
-          distribution: 'temurin'
+        distribution: 'temurin'
-          java-version: ${{ matrix.jdkversion }}
+        java-version: ${{ matrix.jdkversion }}
-          cache: 'maven'
+        cache: 'maven'
-      - name: Build
+    - name: 使用Maven构建
-        run: mvn -V -B clean package --file pom.xml
+      run: mvn -V -B clean package --file pom.xml
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Download
-          path: ./target/AuthMe-*-FORK-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.18.2'
-            javaVersion: '17'
-          - mcVersion: '1.20.4'
-            javaVersion: '21'
-          - mcVersion: '1.21.1'
-            javaVersion: '21'
-    steps:        
-      - uses: HaHaWTH/minecraft-plugin-runtime-test@paper
-        with:
-          server-version: ${{ matrix.mcVersion }}
-          java-version: ${{ matrix.javaVersion }}
-          artifact-name: Download

.gitignore

@@ -114,4 +114,3 @@ nb-configuration.xml
 ### Git ###
 # Don't exclude the .gitignore itself
 !.gitignore
-/samples/

LICENSE

@@ -1,21 +1,23 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
+  The GNU General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
+software and other kinds of works.
-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,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is 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.
+software for all its users.  We, the Free Software Foundation, use the
+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
@@ -24,34 +26,44 @@ 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.
 
-  Developers that use our General Public Licenses protect your rights
+  To protect your rights, we need to prevent others from denying you
-with two steps: (1) assert copyright on the software, and (2) offer
+these rights or asking you to surrender the rights.  Therefore, you have
-you this License which gives you legal permission to copy, distribute
+certain responsibilities if you distribute copies of the software, or if
-and/or modify the software.
+you modify it: responsibilities to respect the freedom of others.
 
-  A secondary benefit of defending all users' freedom is that
+  For example, if you distribute copies of such a program, whether
-improvements made in alternate versions of the program, if they
+gratis or for a fee, you must pass on to the recipients the same
-receive widespread use, become available for other developers to
+freedoms that you received.  You must make sure that they, too, receive
-incorporate.  Many developers of free software are heartened and
+or can get the source code.  And you must show them these terms so they
-encouraged by the resulting cooperation.  However, in the case of
+know their rights.
-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.
 
-  The GNU Affero General Public License is designed specifically to
+  Developers that use the GNU GPL protect your rights with two steps:
-ensure that, in such cases, the modified source code becomes available
+(1) assert copyright on the software, and (2) offer you this License
-to the community.  It requires the operator of a network server to
+giving you legal permission to copy, distribute and/or modify it.
-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.
 
-  An older license, called the Affero General Public License and
+  For the developers' and authors' protection, the GPL clearly explains
-published by Affero, was designed to accomplish similar goals.  This is
+that there is no warranty for this free software.  For both users' and
-a different license, not a version of the Affero GPL, but Affero has
+authors' sake, the GPL requires that modified versions be marked as
-released a new version of the Affero GPL which permits relicensing under
+changed, so that their problems will not be attributed erroneously to
-this license.
+authors of previous versions.
+
+  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.
@@ -60,7 +72,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -537,45 +549,35 @@ 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. Remote Network Interaction; Use with the GNU General Public License.
+  13. Use with the GNU Affero 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 General Public License into a single
+under version 3 of the GNU Affero 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 work with which it is combined will remain governed by version
+but the special requirements of the GNU Affero General Public License,
-3 of the GNU General Public License.
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
+the GNU General Public License from time to time.  Such new versions will
-will be similar in spirit to the present version, but may differ in detail to
+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 Affero General
+Program specifies that a certain numbered version of the GNU 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 Affero General Public License, you may choose any version ever published
+GNU 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 Affero General Public License can be used, that proxy's
+versions of the GNU 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.
 
@@ -629,33 +631,44 @@ 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 Affero General Public License as published
+    it under the terms of the GNU General Public License as published by
-    by the Free Software Foundation, either version 3 of the License, or
+    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 Affero General Public License for more details.
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Affero General Public License
+    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
+  If the program does terminal interaction, make it output a short
-network, you should also make sure that it provides a way for users to
+notice like this when it starts in an interactive mode:
-get its source.  For example, if your program is a web application, its
+
-interface could display a "Source" link that leads users to an archive
+    {project}  Copyright (C) {year}  {fullname}
-of the code.  There are many ways you could offer source, and different
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-solutions will be better for different programs; see section 13 for the
+    This is free software, and you are welcome to redistribute it
-specific requirements.
+    under certain conditions; type `show c' for details.
+
+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 AGPL, see
+For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://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-zh.md

@@ -1,51 +0,0 @@
-# AuthMeReReloaded
-**"Bukkit 的最佳身份验证插件的分支！"**
-
-![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" />
-  <img src="https://img.shields.io/github/downloads/HaHaWTH/AuthMeReReloaded/total" alt="Downloads" />
-</p>
-
-**详细改动：**
- 1. 改进邮件发送逻辑，支持更多邮件
- 2. 关闭邮件发送（当服务器关闭时，向您发送邮件）
- 3. 原有漏洞修复
- 4. 反幽灵玩家（重复登录错误）
- 5. 按服务器分支使用最佳性能方法
- 6. 基岩兼容性（需要Floodgate）（基于 UUID）
- 7. 更新检查器
- 8. 集成 GUI 验证码功能（需要 Bedrock 兼容性和 ProtocolLib）（70% 异步）
- 9. 改进监听器
- 10. 改进玩家登录逻辑以减少延迟
- 11. 自动清除机器人数据
- 12. 支持**Folia（正在测试中）**
- 13. F键菜单兼容
- 14. 自动修复传送卡传送门/地底问题
- 15. **Velocity支持 (详见 [Velocity Support](./vc-support.md))**
- 16. 基岩版玩家自动登录（可配置）
- 17. 修复旧版本（MC 1.13-）中的 "潜影盒 "崩溃问题
- 18. 支持 **H2 数据库**
- 19. 虚拟线程支持
- 20. **100% 兼容原版 authme 和扩展**
- 21. 更多......
-
-**下载链接：**
-[Release](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
-[Actions（开发版，使用风险自负！）](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
-
-如果您的服务器使用 FRP(内网穿透)，此插件可能会有所帮助 [HAProxy-Detector](https://github.com/HaHaWTH/HAProxy-Detector)
-
-**欢迎提出请求和建议!**
-
-<picture>
-  <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>

README.md

@@ -1,57 +1,21 @@
 # AuthMeReReloaded
-**"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
+**"A fork of the best authentication plugin for the Bukkit modding API!"**
-
+MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471495)
-[English](https://github.com/HaHaWTH/AuthMeReReloaded) | [简体中文](https://github.com/HaHaWTH/AuthMeReReloaded/blob/master/README-zh.md)
-
 ![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" />
-  <img alt="GitHub Downloads (all assets, all releases)" src="https://img.shields.io/github/downloads/HaHaWTH/AuthMeReReloaded/total?logo=github&label=GitHub%20Downloads&color=black">
-  <img alt="Spiget Downloads" src="https://img.shields.io/spiget/downloads/114010?logo=spigotmc&label=SpigotMC%20Downloads&color=orange">
-  <img alt="Modrinth Downloads" src="https://img.shields.io/modrinth/dt/3IEZ9vol?logo=modrinth&label=Modrinth%20Downloads&color=light-green">
-  <img alt="Hangar Downloads" src="https://img.shields.io/hangar/dt/AuthMeReReloaded?logo=hangar&label=Hangar%20Downloads&color=white">
-</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
+ 3. Old bug fixes
  4. Anti Ghost Player(Doubled login bug)
  5. Use the best performance method by server brand
- 6. Bedrock Compatibility(Floodgate needed)(based on UUID)
+ 6. Bedrock Compatibility(Floodgate needed)
  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 support (in active testing)**
+ 12. Folia compatibility [Here](https://github.com/HaHaWTH/AuthMeReReloaded/releases/download/b20/AuthMe-5.6.0-FORK-Folia.jar)
- 13. **Velocity support (See [Velocity Support](./vc-support.md))**
+ 13. Offhand Menu compatibility(Thats amazing)
- 14. Support Virtual Threads caching
+ 14. Automatically fix portal stuck issue
- 15. Automatically fix portal stuck issue
+ 15. More......
- 16. Automatically login for Bedrock players(configurable)
- 17. Fix shulker box crash bug on legacy versions(MC 1.13-)
- 18. **H2 database support**
- 19. **100% compatibility with original authme and extensions**
- 20. More......
-
-**Download links:**
-[Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
-[Actions(Dev builds, use at your own risk!)](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
-
-**Pull Requests and suggestions are welcome!**
-
-## License
-
-Only modifications to AuthMeReloaded is under AGPL-3.0 license, AuthMeReloaded is licensed under GPL-3.0.
-
-<picture>
-  <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>

docs/commands.md

@@ -108,4 +108,4 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
 
 ---
 
-This page was automatically generated on the [HaHaWTH/AuthMeReReloaded repository](https://github.com/HaHaWTH/AuthMeReReloaded/tree/master/docs/) on Sun Apr 04 21:31:42 CEST 2021
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 04 21:31:42 CEST 2021

docs/hash_algorithms.md

@@ -80,4 +80,4 @@ or bad.
 
 ---
 
-This page was automatically generated on the [HaHaWTH/AuthMeReReloaded repository](https://github.com/HaHaWTH/AuthMeReReloaded/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 Sun Apr 04 21:31:44 CEST 2021

docs/permission_nodes.md

@@ -73,4 +73,4 @@ The following are the permission nodes that are currently supported by the lates
 
 ---
 
-This page was automatically generated on the [HaHaWTH/AuthMeReReloaded repository](https://github.com/HaHaWTH/AuthMeReReloaded/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 Sun Apr 04 21:31:44 CEST 2021

docs/translations.md

@@ -1,49 +1,46 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Fri May 31 22:00:00 CST 2024. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Sun Apr 04 21:31:44 CEST 2021. See docs/translations/translations.tpl.md -->
 
 # AuthMe Translations
-
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
 in your config.yml to use the language, or use another language code to start a new translation.
 
-| Code                                                                                                       | Language            | Translated | &nbsp;                                                                    |
+Code | Language | Translated | &nbsp;
-|------------------------------------------------------------------------------------------------------------|---------------------|-----------:|---------------------------------------------------------------------------|
+---- | -------- | ---------: | ------
-| [en](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_en.yml)     | English             |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[en](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_en.yml) | English | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-| [bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml)     | Bulgarian           |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
-| [br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml)     | Brazilian           |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-| [cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml)     | Czech               |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-| [de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml)     | German              |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
-| [eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml)     | Esperanto           |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
-| [es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml)     | Spanish             |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
-| [et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml)     | Estonian            |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-| [eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml)     | Basque              |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-| [fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml)     | Finnish             |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 45% | <img src="https://via.placeholder.com/45x7/aa5500?text=%20" alt="45" />
-| [fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml)     | French              |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-| [gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml)     | Galician            |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 48% | <img src="https://via.placeholder.com/48x7/aa5500?text=%20" alt="48" />
-| [hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml)     | Hungarian           |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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          |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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" /> |
+[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" />
-| [ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml)     | Korean              |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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" />
-| [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" />
-| [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" />
-| [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" />
-| [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" /> |
+[si](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_si.yml) | Slovenian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
-| [si](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_si.yml)     | Slovenian           |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
-| [sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml)     | Slovakian           |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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" />
-| [sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml)     | Serbian             |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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" />
-| [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" />
-| [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" />
-| [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" />
-| [zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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" />
-| [zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau)     |       100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" /> |
+[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
+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
-the [HaHaWTH/AuthMeReReloaded repository](https://github.com/HaHaWTH/AuthMeReReloaded/tree/master/docs/) on Fri May 31
-22:00:00 CST 2024

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>fr.xephi</groupId>
     <artifactId>authme</artifactId>
-    <version>5.7.0-FORK</version>
+    <version>5.6.0-FORK</version>
 
     <name>AuthMeReReloaded</name>
     <description>Fork of the first authentication plugin for the Bukkit API!</description>
@@ -67,11 +67,11 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.1-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
-        <project.buildNumber>28</project.buildNumber>
+        <project.buildNumber>CUSTOM</project.buildNumber>
         <project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
         <project.finalNameBase>${project.outputName}-${project.version}</project.finalNameBase>
 
@@ -79,14 +79,57 @@
         <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, games647, Hex3l, krusic22</pluginDescription.authors>
+        <pluginDescription.authors>sgdc3, ljacqu, games647, Hex3l, krusic22</pluginDescription.authors>
     </properties>
 
+    <!-- Jenkins profile -->
+    <profiles>
+        <!-- Set the buildNumber using the jenkins env. variable -->
+        <profile>
+            <id>jenkins</id>
+            <activation>
+                <property>
+                    <name>env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <project.buildNumber>${env.BUILD_NUMBER}</project.buildNumber>
+            </properties>
+        </profile>
+        <!-- Skip long hash tests, reduce the test time of 20-30 seconds -->
+        <profile>
+            <id>skipLongHashTests</id>
+            <activation>
+                <property>
+                    <name>skipLongHashTests</name>
+                </property>
+            </activation>
+            <properties>
+                <project.skipExtendedHashTests>true</project.skipExtendedHashTests>
+            </properties>
+        </profile>
+        <!-- Skip javadoc generation for faster local build -->
+        <profile>
+            <id>skipJavadocGeneration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
     <build>
         <defaultGoal>clean package</defaultGoal>
         <!-- Little hack to make the shade plugin output a file with the right name -->
         <finalName>${project.finalNameBase}-noshade</finalName>
+
         <resources>
             <resource>
                 <directory>.</directory>
@@ -111,12 +154,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.11.1</version>
+                    <version>3.4.1</version>
-                    <configuration>
-                        <failOnError>false</failOnError>
-                        <failOnWarnings>false</failOnWarnings>
-                        <skip>true</skip>
-                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -126,7 +164,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>enforce-environment</id>
@@ -139,7 +177,7 @@
                                     <version>${maven.minimumVersion}</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>[17,)</version>
+                                    <version>[11,)</version>
                                 </requireJavaVersion>
                             </rules>
                             <fail>true</fail>
@@ -151,13 +189,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.2.0</version>
             </plugin>
             <!-- Include resource files -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.0</version>
                 <configuration>
                     <nonFilteredFileExtensions>
                         <nonFilteredFileExtension>mmdb</nonFilteredFileExtension>
@@ -168,7 +206,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>${java.source}</source>
                     <target>${java.target}</target>
@@ -179,7 +217,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
+                <version>0.8.8</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -195,18 +233,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Unit testing -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <!-- Force the right file encoding during unit testing -->
+                    <!-- Set language to English in order to get consistent results for localized time formatting -->
+                    <argLine>-Dfile.encoding=${project.build.sourceEncoding} -Duser.language=en @{argLine}</argLine>
+                    <systemPropertyVariables>
+                        <project.skipExtendedHashTests>${project.skipExtendedHashTests}</project.skipExtendedHashTests>
+                    </systemPropertyVariables>
+                    <!-- Don't trim stack traces -->
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
+            </plugin>
             <!-- Generate a jar containing classes and resources -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.3.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <!-- Generate a jar containing the source javadoc -->
             <plugin>
@@ -230,7 +277,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.1</version>
                 <configuration>
                     <finalName>${project.finalNameBase}</finalName>
                 </configuration>
@@ -247,7 +294,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>shaded-jar</id>
@@ -256,7 +303,6 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.finalNameBase}-Lite</finalName>
                             <artifactSet>
                                 <excludes>
                                     <!-- Guava -->
@@ -267,46 +313,18 @@
                                     <exclude>com.google.j2objc:j2objc-annotations</exclude>
                                     <!-- Gson -->
                                     <exclude>com.google.code.gson:gson</exclude>
-                               </excludes>
+                                </excludes>
                             </artifactSet>
-                            <relocations>
-                                <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>waffle</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.waffle</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.github.benmanes.caffeine</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>shaded-jar-relocate</id>
+                        <id>shaded-jar-legacy</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.finalNameBase}-Universal</finalName>
+                            <finalName>${project.finalNameBase}-Spigot-Universal</finalName>
                             <relocations>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
@@ -328,22 +346,6 @@
                                     <pattern>com.google.gson</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.com.google.gson</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>waffle</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.waffle</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.github.benmanes.caffeine</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
-                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
@@ -430,10 +432,6 @@
                             <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>
@@ -442,30 +440,6 @@
                             <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>
-                        <relocation>
-                            <pattern>com.alessiodp.libby</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.com.alessiodp.libby</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori.adventure</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.net.kyori.adventure</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori.examination</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.net.kyori.examination</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori.option</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.net.kyori.option</shadedPattern>
-                        </relocation>
                     </relocations>
 
                     <filters>
@@ -478,6 +452,7 @@
                                 <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
+                                <exclude>META-INF/*.MF</exclude>
                                 <exclude>META-INF/DEPENDENCIES</exclude>
                                 <exclude>META-INF/**/module-info.class</exclude>
                             </excludes>
@@ -497,19 +472,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>3.1.3</version>
+                <version>3.0.1</version>
             </plugin>
             <!-- Deploy the jars as artifacts into the remote repository -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.3</version>
+                <version>3.0.0</version>
             </plugin>
             <!-- Handle documentation generation, required by other plugins -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.21.0</version>
+                <version>3.12.1</version>
             </plugin>
             <!-- Publish coveralls test coverage reports, not included in the build cycle by default -->
             <plugin>
@@ -532,21 +507,6 @@
     </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>
-
-        <!-- Adventure API -->
-        <repository>
-            <id>sonatype-oss-snapshots1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-
         <!-- Apache snapshots repo -->
         <repository>
             <id>apache-snapshots</id>
@@ -617,23 +577,10 @@
             </snapshots>
         </repository>
 
-        <!-- Maven Central Snapshots Repository -->
-        <repository>
-            <id>maven-snapshots</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-
-        <!-- Placeholder API Repo -->
-        <repository>
-            <id>placeholderapi-repo</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
-
         <!-- Multiverse Repo -->
         <repository>
-            <id>multiverse-multiverse-releases</id>
+            <id>onarandombox-repo-releases</id>
-            <name>Multiverse Repository</name>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse/</url>
-            <url>https://repo.onarandombox.com/multiverse-releases</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -641,7 +588,16 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
+        <repository>
+            <id>onarandombox-repo-snapshots</id>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
         <repository>
             <id>opencollab-snapshot</id>
             <url>https://repo.opencollab.dev/maven-snapshots/</url>
@@ -669,10 +625,9 @@
         <dependency>
             <groupId>org.geysermc.floodgate</groupId>
             <artifactId>api</artifactId>
-            <version>2.2.2-SNAPSHOT</version>
+            <version>2.2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-
         <!-- Jalu Injector -->
         <dependency>
             <groupId>ch.jalu</groupId>
@@ -690,7 +645,7 @@
         </dependency>
 
         <!-- MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency -->
-        <!-- GSON is already included, and therefore it reduces the file size in comparison to the original version -->
+        <!-- GSON is already included and therefore it reduces the file size in comparison to the original version -->
         <dependency>
             <groupId>com.maxmind.db</groupId>
             <artifactId>maxmind-db-gson</artifactId>
@@ -728,19 +683,11 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Libby -->
-        <dependency>
-            <groupId>com.alessiodp.libby</groupId>
-            <artifactId>libby-bukkit</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- Database Connection Pool -->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version> <!-- Latest java 8 release -->
+            <version>5.0.1</version> <!-- Latest java 8 release -->
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -753,7 +700,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
+            <version>2.0.5</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
             <optional>true</optional>
         </dependency>
 
@@ -775,7 +722,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.3.3</version>
+            <version>3.1.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -806,6 +753,10 @@
                     <artifactId>junit</artifactId>
                     <groupId>junit</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>bungeecord-chat</artifactId>
+                    <groupId>net.md-5</groupId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.googlecode.json-simple</groupId>
                     <artifactId>json-simple</artifactId>
@@ -833,6 +784,8 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- Bukkit Libraries  -->
+
         <!-- ConfigMe -->
         <dependency>
             <groupId>ch.jalu</groupId>
@@ -847,11 +800,11 @@
             </exclusions>
         </dependency>
 
-        <!-- bStats metrics  -->
+        <!-- bStats metrics -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.1</version>
             <optional>true</optional>
         </dependency>
 
@@ -877,23 +830,6 @@
             </exclusions>
         </dependency>
 
-        <!-- Adventure API -->
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.17.0</version>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.4</version>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-serializer-gson</artifactId>
-            <version>4.17.0</version>
-        </dependency>
-             
         <!-- LuckPerms plugin -->
         <dependency>
             <groupId>net.luckperms</groupId>
@@ -920,20 +856,6 @@
             </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>
@@ -969,8 +891,8 @@
         <!-- Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/ -->
         <dependency>
             <groupId>com.onarandombox.multiversecore</groupId>
-            <artifactId>multiverse-core</artifactId>
+            <artifactId>Multiverse-Core</artifactId>
-            <version>4.3.14</version>
+            <version>4.3.1</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>
@@ -1029,14 +951,6 @@
             </exclusions>
         </dependency>
 
-        <!-- Placeholder API -->
-        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.11.6</version>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- EssentialsX plugin -->
         <dependency>
             <groupId>net.essentialsx</groupId>
@@ -1113,7 +1027,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.3</version>
+            <version>42.5.4</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1123,34 +1037,55 @@
             </exclusions>
         </dependency>
 
+        <!-- Unit Testing Libraries -->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+            <version>4.13.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>java-hamcrest</artifactId>
+            <scope>test</scope>
+            <version>2.0.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+            <version>5.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hamcrest-core</artifactId>
+                    <groupId>org.hamcrest</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- Required to mock the LuckPerms API-->
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.48.0</version>
+            <version>3.39.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.47.1.0</version>
+            <version>3.40.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.2.224</version>
+            <version>2.1.214</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

samples/NewConfig.yml

@@ -0,0 +1,564 @@
+# =======================================================================================================
+#     _____          __  .__       _____        __________       .__                   .___         .___
+#    /  _  \  __ ___/  |_|  |__   /     \   ____\______   \ ____ |  |   _________    __| _/____   __| _/
+#   /  /_\  \|  |  \   __|  |  \ /  \ /  \_/ __ \|       __/ __ \|  |  /  _ \__  \  / __ _/ __ \ / __ |
+#  /    |    |  |  /|  | |   Y  /    Y    \  ___/|    |   \  ___/|  |_(  <_> / __ \/ /_/ \  ___// /_/ |
+#  \____|__  |____/ |__| |___|  \____|__  /\___  |____|_  /\___  |____/\____(____  \____ |\___  \____ |
+#          \/                 \/        \/     \/       \/     \/                \/     \/    \/     \/
+#
+# =======================================================================================================
+#
+#                                      Authme Main Configuration File.
+#
+# =======================================================================================================
+
+# Plugin infos (overwritten on start, just a simple way to find out your plugin version).
+authors: ${pluginAuthors}
+version: ${project.version}
+buildNumber: ${buildNumber}
+
+# Set this setting to true when you have configured the plugin,
+# when false the server will be stopped with a warning message.
+enabled: false
+
+# Database settings.
+data_source:
+    # ===========================
+    # Database general settings.
+    # ===========================
+
+    # Database backend (sqlite, mysql).
+    backend: sqlite
+    # Enable database queries caching, should improve performance.
+    caching: true
+
+    # ===========================
+    # SqLite db parameters.
+    # ===========================
+
+    sqlite:
+        # The name of the database storage file.
+        filename: 'authme.db'
+
+    # ===========================
+    # MySql db parameters.
+    # ===========================
+
+    mysql:
+        # Connection parameters.
+        host: '127.0.0.1'
+        port: 3306
+        username: 'change_me'
+        password: 'change_me'
+        database: 'my_minecraft_server'
+        tablename: 'authme'
+
+        # Column names.
+        column_names:
+            id: id
+            # Column for storing nicknames (ignore case nickname).
+            name: username
+            # Column for storing the realname (case sensitive nickname).
+            real_name: realname
+            # Column for storing passwords.
+            password: password
+            # Column for storing email addresses.
+            email: email
+            # Column for storing the authentication status (logged or not).
+            login_status: isLogged
+            # Column for storing player IPs.
+            ip: ip
+            # Column for storing lastlogins date and time.
+            last_login_timestamp: lastlogin
+            # Latest logout location of the players.
+            last_location:
+                world: world
+                x: x
+                y: y
+                z: z
+                # Enabled only if the bungeecord integration is activated.
+                server: world
+
+        # Support for registrations via WebInterfaces/CSM.
+        # Disable some backend caching parameters.
+        disableAggressiveCaching: false
+
+# Main settings
+settings:
+
+    # ===========================
+    # Bungeecord integration
+    # ===========================
+
+    bungeecord:
+        # Enable bungeecord integration features
+        enabled: true
+
+        # Server name (must be unique, please use the name in the bungeecord configuration).
+        # Use 'auto' for auto configuration (requires the bungeecord module).
+        serverName: LoginLobby1
+        # Keep the auth status when the player moves between servers.
+        # Required if you're using the bungeecord module.
+        keepAuthBetweenServers: true
+
+        # Target server after login
+        send_after_login:
+            enabled: false
+            message: ''
+            delay: 5
+            # Server name ("ServerName") or group ("G:GroupName")
+            # Groups are avariable only when the bungeecord module is avariable.
+            # If the server change fails the player will be kicked.
+            target: Lobby1
+            failKickMessage: 'Failed to connect to the lobby! Please try to join the server again!'
+        # Target server after logout
+        send_after_logout:
+            enabled: false
+            message: ''
+            delay: 5
+            # Server name ("ServerName") or group ("G:GroupName")
+            # Groups are avariable only when the bungeecord module is avariable.
+            # If the server change fails the player will be kicked.
+            target: LoginLobby1
+            failKickMessage: 'Failed to connect to the lobby! Please try to join the server again!'
+
+        # Variables:
+        # %p playername
+        bungee_commands:
+            player_command_after_register:
+                enabled: false
+                cmd: ''
+            console_command_after_register:
+                enabled: false
+                cmd: 'alert %p joined for the first time the network!'
+            player_command_after_login:
+                enabled: false
+                cmd: 'glist'
+            console_command_after_login:
+                enabled: false
+                cmd: 'alert %p logged in correctly!'
+            player_command_after_join:
+                enabled: false
+                cmd: ''
+            console_command_after_join:
+                enabled: false
+                cmd: 'alert %p joined the network!'
+            player_command_first_join:
+                enabled: false
+                cmd: ''
+            console_command_first_join:
+                enabled: false
+                cmd: 'alert %p joined for the first time the network!'
+
+    # ===========================
+    # Sessions configuration.
+    # ===========================
+
+    sessions:
+        # Enable sessions.
+        # When a player is authenticated, his IP and his nickname is saved.
+        # The next time the player will join the server, if his IP is the same
+        # of the last time, and the timeout time hasn't expired, he will be
+        # automatically authenticated.
+        enabled: false
+        # Session timeout.
+        # 0 for unlimited time (Very dangerous, use it at your own risk!)
+        # Consider that if player's ip has changed but the timeout hasn't
+        # expired, player will be kicked out of the sever!
+        timeout: 10
+        # When enabled a player's session will expire if someone tries to
+        # login with a different IP Address.
+        expire_on_ip_change: true
+
+    # ===========================
+    # Registration settings.
+    # ===========================
+
+    registration:
+        # After how many time unregistered players should be kicked?
+        # Set to 0 to disable. (default: 30)
+        timeout: 30
+
+        nickname:
+            min_length: 4
+            max_lenght: 16
+            # Regex syntax.
+            allowed_characters: '[a-zA-Z0-9_]*'
+
+        password:
+            # Enable double check of password on registration:
+            # /register <password> <confirmPassword>
+            double_check: true
+            # Minimum password lenght.
+            min_length: 5
+            # Regex syntax.
+            allowed_characters: '[\x21-\x7E]*'
+            # Denied unsafe passwords.
+            unsafePasswords:
+            - '123456'
+            - 'password'
+            - 'qwerty'
+            - '12345'
+            - '54321'
+
+    # ===========================
+    # Login settings.
+    # ===========================
+
+    login:
+        # After how many time unlogged players should be kicked?
+        # Set to 0 to disable. (default: 30)
+        timeout: 30
+
+
+
+    # ===========================
+    # Encryption parameters.
+    # ===========================
+
+    password_encryption:
+        # The hashing algorithm.
+        # Possible values: MD5, SHA1, SHA256, WHIRLPOOL, XAUTH, MD5VB, PHPBB, MYBB, IPB3,
+        # PHPFUSION, SMF, XENFORO, SALTED2MD5, JOOMLA, BCRYPT, WBB3, SHA512, DOUBLEMD5,
+        # PBKDF2, PBKDF2DJANGO, WORDPRESS, ROYALAUTH, CUSTOM (developpers only).
+        encryption_algorithm: SHA256
+        # The salt length for the SALTED2MD5 and MD5(MD5(password)+salt) algorithms.
+        md5_salt_length: 8
+        # If password check fails try all the other hash algorithm.
+        # AuthMe will update the password to the new passwordHash.
+        enable_convertion: false
+
+    # ===========================
+    # Unlogged user restrictions.
+    # ===========================
+
+    unlogged_restrictions:
+        # Deny chat messages send for unlogged users.
+        deny_chat: true
+        # Hide chat to unlogged users.
+        # Only player messages, plugins will be able to send messages to the player anyway.
+        hide_chat: false
+
+        # Deny any command message not in the whitelist below.
+        deny_commands: true
+        command_whitelist:
+        - /login
+        - /register
+        - /l
+        - /reg
+        - /email
+        - /captcha
+
+        movements:
+            # Restrict player movements.
+            restrict: true
+            # Allowed radius.
+            allowed_radius: 0
+            # Should unlogged players have speed = 0?
+            # After the login the walking/flying speeed will be reset to the default value.
+            removeSpeed: true
+
+        # End is there atm xD
+
+        # This option will save the quit location of the players.
+        SaveQuitLocation: false
+        # Should not logged in players be teleported to the spawn?
+        # After the authentication, if SaveQuitLocation is enabled,
+        # they will be teleported back to their normal position.
+        teleportUnAuthedToSpawn: false
+
+        # If enabled, after the login, if the ForceSpawnOnTheseWorlds setting contains
+        # the player's world, he will be teleported to the world spawnpoint.
+        # The quit location of the player will be overwritten.
+        # This is different from "teleportUnAuthedToSpawn" that teleports player
+        # back to his quit location after the authentication.
+        ForceSpawnLocOnJoinEnabled: false
+        # WorldNames where we need to force the spawn location
+        # Warning: This setting is Case Sensitive!
+        ForceSpawnOnTheseWorlds:
+        - world
+        - world_nether
+        - world_the_end
+
+        # this is very important options,
+        # every time player join the server,
+        # if they are registered, AuthMe will switch him
+        # to unLoggedInGroup, this
+        # should prevent all major exploit.
+        # So you can set up on your Permission Plugin
+        # this special group with 0 permissions, or permissions to chat,
+        # or permission to
+        # send private message or all other perms that you want,
+        # the better way is to set up
+        # this group with few permissions,
+        # so if player try to exploit some account,
+        # they can
+        # do anything except what you set in perm Group.
+        # After a correct logged-in player will be
+        # moved to his correct permissions group!
+        # Pay attention group name is case sensitive,
+        # so Admin is different from admin,
+        # otherwise your group will be wiped,
+        # and player join in default group []!
+        # Example unLoggedinGroup: NotLogged
+        unLoggedinGroup: unLoggedinGroup
+
+        # ===========================
+        # Address restrictions
+        # ===========================
+
+        # Max number of registrations per IP (default: 1)
+        maxRegPerIp: 1
+        # Maximum allowed number of Logins per IP, 0 to disable (default: 0)
+        maxLoginPerIp: 0
+        # Maximum allowed number of Joins per IP, 0 to disable (default: 0)
+        maxJoinPerIp: 0
+
+        # When this setting is enabled, online players can't be kicked out
+        # due to "Logged in from another Location"
+        # This setting will prevent potential security exploits.
+        ForceSingleSession: true
+
+        # To activate the restricted user feature you need
+        # to enable this option and configure the
+        # AllowedRestrictedUser field.
+        AllowRestrictedUser: false
+        # The restricted user feature will kick players listed below
+        # if they dont match of the defined ip address.
+        # Example:
+        #   AllowedRestrictedUser:
+        #   - playername;127.0.0.1
+        AllowedRestrictedUser:
+        - playername;127.0.0.
+        # Ban ip when the ip is not the ip registered in database
+        banUnsafedIP: false
+
+
+
+        # ===============================
+        # Other restrictions
+        # ===============================
+
+        # Should we protect the player inventory before logging in?
+        # Warning: Requires the latest version of ProtocolLib!
+        ProtectInventoryBeforeLogIn: true
+
+        # Should unregistered players be kicked immediately?
+        kickNonRegistered: false
+        # Should players be kicked on wrong password?
+        kickOnWrongPassword: false
+
+        # Should we display all other accounts of a player when he joins?
+        # Required permission: authme.admin.accounts
+        displayOtherAccounts: true
+
+        # ===============================
+        # Restrictions compatibility
+        # ===============================
+
+        # Spawn Priority. Avariable values : authme, essentials, multiverse, default
+        spawnPriority: authme,essentials,multiverse,default
+        # AuthMe will NEVER teleport players!
+        noTeleport: false
+
+    GameMode:
+        # Do you want to set player's gamemode to survival when he joins?
+        # This enables also the settings below.
+        ForceSurvivalMode: false
+        # Do you want to reset player's inventory if player joins with creative mode?
+        ResetInventoryIfCreative: false
+        # Do you want to force the survival mode ONLY after the /login process?
+        ForceOnlyAfterLogin: false
+
+        # sgdc3: Ok, our configuration is shit.... xD Today I will stop there
+
+
+    registration:
+        # enable registration on the server?
+        enabled: true
+        # Send every X seconds a message to a player to
+        # remind him that he has to login/register
+        messageInterval: 5
+        # Only registered and logged in players can play.
+        # See restrictions for exceptions
+        force: true
+        # Does we replace password registration by an Email registration method ?
+        enableEmailRegistrationSystem: false
+        # Enable double check of email when you register
+        # when it's true, registration require that kind of command:
+        # /register <email> <confirmEmail>
+        doubleEmailCheck: false
+        # Do we force kicking player after a successful registration ?
+        # Do not use with login feature below
+        forceKickAfterRegister: false
+        # Does AuthMe need to enforce a /login after a successful registration ?
+        forceLoginAfterRegister: false
+    unrestrictions:
+        # below you can list all your account name, that
+        # AuthMe will ignore for registration or login, configure it
+        # at your own risk!! Remember that if you are going to add
+        # nickname with [], you have to delimit name with ' '.
+        # this option add compatibility with BuildCraft and some
+        # other mods.
+        # It is CaseSensitive!
+        UnrestrictedName: []
+    # Message language, available : en, de, br, cz, pl, fr, ru, hu, sk, es, zhtw, fi, zhcn, lt, it, ko, pt
+    messagesLanguage: en
+    # Force these commands after /login, without any '/', use %p for replace with player name
+    forceCommands: []
+    # Force these commands after /login as a server console, without any '/', use %p for replace with player name
+    forceCommandsAsConsole: []
+    # Force these commands after /register, without any '/', use %p for replace with player name
+    forceRegisterCommands: []
+    # Force these commands after /register as a server console, without any '/', use %p for replace with player name
+    forceRegisterCommandsAsConsole: []
+    # Do we need to broadcast the welcome message to all server or only to the player? set true for server or false for player
+    broadcastWelcomeMessage: false
+    # Do we need to delay the join/leave message to be displayed only when the player is authenticated ?
+    delayJoinMessage: false
+    removeJoinMessage: false
+    removeLeaveMessage: false
+    # Do we need to add potion effect Blinding before login/register ?
+    applyBlindEffect: false
+ExternalBoardOptions:
+    # MySQL column for the salt , needed for some forum/cms support
+    mySQLColumnSalt: ''
+    # MySQL column for the group, needed for some forum/cms support
+    mySQLColumnGroup: ''
+    # -1 mean disabled. If u want that only
+    # activated player can login in your server
+    # u can put in this options the group number
+    # of unactivated user, needed for some forum/cms support
+    nonActivedUserGroup: -1
+    # Other MySQL columns where we need to put the Username (case sensitive)
+    mySQLOtherUsernameColumns: []
+    # How much Log to Round needed in BCrypt(do not change it if you do not know what's your doing)
+    bCryptLog2Round: 10
+    # phpBB prefix defined during phpbb installation process
+    phpbbTablePrefix: 'phpbb_'
+    # phpBB activated group id , 2 is default registered group defined by phpbb
+    phpbbActivatedGroupId: 2
+    # WordPress prefix defined during WordPress installation process
+    wordpressTablePrefix: 'wp_'
+permission:
+    # Take care with this options, if you dont want
+    # to use Vault and Group Switching of
+    # AuthMe for unloggedIn players put true
+    # below, default is false.
+    EnablePermissionCheck: false
+BackupSystem:
+   # Enable or Disable Automatic Backup
+    ActivateBackup: false
+   # set Backup at every start of Server
+    OnServerStart: false
+   # set Backup at every stop of Server
+    OnServerStop: true
+   # Windows only mysql installation Path
+    MysqlWindowsPath: 'C:\\Program Files\\MySQL\\MySQL Server 5.1\\'
+Security:
+    SQLProblem:
+        # Stop the server if we can't contact the sql database
+        # Take care with this, if you set that to false,
+        # AuthMe automatically disable and the server is not protected!
+        stopServer: true
+    ReloadCommand:
+        # /reload support
+        useReloadCommandSupport: true
+    console:
+        # Remove spam console
+        noConsoleSpam: false
+    captcha:
+        # Player need to put a captcha when he fails too lot the password
+        useCaptcha: false
+        # Max allowed tries before request a captcha
+        maxLoginTry: 5
+        # Captcha length
+        captchaLength: 5
+Converter:
+    Rakamak:
+        # Rakamak file name
+        fileName: users.rak
+        # Rakamak use ip ?
+        useIP: false
+        # IP file name for rakamak
+        ipFileName: UsersIp.rak
+    CrazyLogin:
+        # CrazyLogin database file
+        fileName: accounts.db
+Email:
+    # Email SMTP server host
+    mailSMTP: smtp.gmail.com
+    # Email SMTP server port
+    mailPort: 465
+    # Email account that send the mail
+    mailAccount: ''
+    # Email account password
+    mailPassword: ''
+    # Custom SenderName, that replace the mailAccount name in the email
+    mailSenderName: ''
+    # Random password length
+    RecoveryPasswordLength: 8
+    # Email subject of password get
+    mailSubject: 'Your new AuthMe Password'
+    # Email text here
+    mailText: 'Dear <playername>, <br /><br /> This is your new AuthMe password for the server <br /><br /> <servername> : <br /><br /> <generatedpass><br /><br />Do not forget to change password after login! <br /> /changepassword <generatedpass> newPassword'
+    # Like maxRegPerIp but with email
+    maxRegPerEmail: 1
+    # Recall players to add an email ?
+    recallPlayers: false
+    # Delay in minute for the recall scheduler
+    delayRecall: 5
+    # Blacklist these domains for emails
+    emailBlacklisted:
+    - 10minutemail.com
+    # WhiteList only these domains for emails
+    emailWhitelisted: []
+    # Do we need to send new password draw in an image ?
+    generateImage: false
+Hooks:
+    # Do we need to hook with multiverse for spawn checking?
+    multiverse: true
+    # Do we need to hook with BungeeCord for get the real Player ip ?
+    bungeecord: false
+    # Do we need to disable Essentials SocialSpy on join ?
+    disableSocialSpy: true
+    # Do we need to force /motd Essentials command on join ?
+    useEssentialsMotd: false
+    # Do we need to cache custom Attributes ?
+    customAttributes: false
+Purge:
+    # On Enable , does AuthMe need to purge automatically old accounts unused ?
+    useAutoPurge: false
+    # Number of Days an account become Unused
+    daysBeforeRemovePlayer: 60
+    # Do we need to remove the player.dat file during purge process ?
+    removePlayerDat: false
+    # Do we need to remove the Essentials/users/player.yml file during purge process ?
+    removeEssentialsFile: false
+    # World where are players.dat stores
+    defaultWorld: 'world'
+    # Do we need to remove LimitedCreative/inventories/player.yml , player_creative.yml files during purge process ?
+    removeLimitedCreativesInventories: false
+    # Do we need to remove the AntiXRayData/PlayerData/player file during purge process ?
+    removeAntiXRayFile: false
+    # Do we need to remove permissions ?
+    removePermissions: false
+Protection:
+    # Enable some servers protection ( country based login, antibot )
+    enableProtection: false
+    # Countries allowed to join the server and register, see http://dev.bukkit.org/bukkit-plugins/authme-reloaded/pages/countries-codes/ for countries' codes
+    countries:
+    - US
+    - GB
+    # Countries blacklisted automatically ( without any needed to enable protection )
+    countriesBlacklist:
+    - A1
+    # Do we need to enable automatic antibot system?
+    enableAntiBot: false
+    # Max number of player allowed to login in 5 secs before enable AntiBot system automatically
+    antiBotSensibility: 5
+    # Duration in minutes of the antibot automatic system
+    antiBotDuration: 10
+VeryGames:
+    # These features are only available on VeryGames Server Provider
+    enableIpCheck: false

samples/NewPlugin.yml

@@ -0,0 +1,199 @@
+name: ${pluginName}
+authors: [${pluginAuthors}]
+website: ${project.url}
+description: ${project.description}
+main: ${mainClass}
+version: ${project.version}-b${buildNumber}
+softdepend:
+    - Vault
+    - PermissionsBukkit
+    - PermissionsEX
+    - EssentialsGroupManager
+    - Multiverse-Core
+    - Essentials
+    - EssentialsSpawn
+    - ProtocolLib
+commands:
+    authme:
+        description: AuthMe admin commands
+        usage: '/authme reload|register playername password|changepassword playername password|unregister playername|version|converter datatype'
+        permission: authme.admin
+    register:
+        description: Register an account
+        usage: /register password confirmpassword
+        aliases: [reg]
+        permission: authme.player.register
+    login:
+        description: Login into a account
+        usage: /login password
+        aliases: [l,log]
+        permission: authme.player.login
+    changepassword:
+        description: Change password of a account
+        usage: /changepassword oldPassword newPassword
+        permission: authme.player.changepassword
+    logout:
+        description: Logout from the server
+        usage: /logout
+        permission: authme.player.logout
+    unregister:
+        description: unregister your account
+        usage: /unregister password
+        permission: authme.player.unregister
+    email:
+        description: Add Email or recover password
+        usage: '/email add your@email.com your@email.com|change oldEmail newEmail|recovery your@email.com'
+        permission: authme.player.email
+    captcha:
+        description: Captcha command
+        usage: /captcha theCaptcha
+        permission: authme.player.captcha
+permissions:
+    authme.canbeforced:
+        description: Allow the user to be forced-logged via API
+        default: true
+    authme.player:
+        description: Gives access to all authme player commands
+        default: true
+        children:
+            authme.player.login: true
+            authme.player.logout: true
+            authme.player.register: true
+            authme.player.unregister: true
+            authme.player.changepassword: true
+            authme.player.captcha: true
+            authme.player.email: true
+    authme.player.register:
+        description: Register your account
+        default: false
+    authme.player.unregister:
+        description: Unregister your account
+        default: false
+    authme.player.login:
+        description: Login into your account
+        default: false
+    authme.player.logout:
+        description: Logout from your account
+        default: false
+    authme.player.changepassword:
+        description: Change password of your account
+        default: false
+    authme.player.email:
+        description: Gives access to player's email commands
+        default: false
+        children:
+            authme.player.email.add: true
+            authme.player.email.change: true
+            authme.player.email.recover: true
+    authme.player.email.add:
+        description: Add an email to your account
+        default: false
+    authme.player.email.change:
+        description: Change email of your account
+        default: false
+    authme.player.email.recover:
+        description: Recover your account
+        default: false
+    authme.player.captcha:
+        description: Captcha command
+        default: false
+    authme.admin:
+        description: Gives access to all authme admin commands
+        default: op
+        children:
+            authme.admin.forcelogin: true
+            authme.admin.forcelogout: true
+            authme.admin.register: true
+            authme.admin.unregister: true
+            authme.admin.changemail: true
+            authme.admin.changepassword: true
+            authme.admin.lastlogin: true
+            authme.admin.accounts: true
+            authme.admin.getemail: true
+            authme.admin.getip: true
+            authme.admin.setspawn: true
+            authme.admin.spawn: true
+            authme.admin.setfirstspawn: true
+            authme.admin.firstspawn: true
+            authme.admin.purge: true
+            authme.admin.purgebannedplayers: true
+            authme.admin.purgelastpos: true
+            authme.admin.converter: true
+            authme.admin.reload: true
+            authme.admin.switchantibot: true
+            authme.admin.seeotheraccounts: true
+    authme.admin.register:
+        description: Register an account
+        default: false
+    authme.admin.unregister:
+        description: Unregister an account
+        default: false
+    authme.admin.forcelogin:
+        description: Force login for that player
+        default: false
+    authme.admin.forcelogout:
+        description: Force logout for that player
+        default: false
+    authme.admin.changepassword:
+        description: Change the password of an account
+        default: false
+    authme.admin.getemail:
+        description: Get last email about a player
+        default: false
+    authme.admin.changeemail:
+        description: Change a player email
+        default: false
+    authme.admin.accounts:
+        description: Display Players Accounts
+        default: false
+    authme.admin.seeotheraccounts:
+        description: Display other accounts about a player when he logs in
+        default: false
+    authme.admin.lastlogin:
+        description: Get last login date about a player
+        default: false
+    authme.admin.getip:
+        description: Get IP from a player (fake and real)
+        default: false
+    authme.admin.setspawn:
+        description: Set the AuthMe spawn point
+        default: false
+    authme.admin.spawn:
+        description: Teleport to AuthMe spawn point
+        default: false
+    authme.admin.setfirstspawn:
+        description: Set the AuthMe First Spawn Point
+        default: false
+    authme.admin.firstspawn:
+        description: Teleport to AuthMe First Spawn Point
+        default: false
+    authme.admin.switchantibot:
+        description: Switch AntiBot mode on/off
+        default: false
+    authme.admin.purge:
+        description: Database purge command
+        default: false
+    authme.admin.purgebannedplayers:
+        description: Purge banned players
+        default: false
+    authme.admin.purgelastpos:
+        description: Purge last position of a player/players
+        default: false
+    authme.admin.converter:
+        description: Allow the /authme converter command
+        default: false
+    authme.admin.reload:
+        description: Reload the plugin
+        default: false
+    authme.vip:
+        description: Allow vip slot when the server is full
+        default: false
+    authme.bypassantibot:
+        description: Bypass the AntiBot check
+        default: false
+    authme.allowmultipleaccounts:
+        description: Allow more accounts for same ip
+        default: false
+    authme.bypassforcesurvival:
+        description: Bypass all ForceSurvival features
+        default: false

samples/website_integration/AuthMeController.php

@@ -0,0 +1,148 @@
+<?php
+
+/*****************************************************************************
+ * AuthMe website integration logic                                          *
+ * ------------------------------------------------------------------------- *
+ * Allows interaction with the AuthMe database (registration, password       *
+ * verification). Don't forget to update the AUTHME_TABLE value and your     *
+ * database credentials in getAuthmeMySqli().                                *
+ *                                                                           *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/                         *
+ *****************************************************************************/
+abstract class AuthMeController {
+
+    const AUTHME_TABLE = 'authme';
+
+    /**
+     * Entry point function to check supplied credentials against the AuthMe database.
+     *
+     * @param string $username the username
+     * @param string $password the password
+     * @return bool true iff the data is correct, false otherwise
+     */
+    function checkPassword($username, $password) {
+        if (is_scalar($username) && is_scalar($password)) {
+            $hash = $this->getHashFromDatabase($username);
+            if ($hash) {
+                return $this->isValidPassword($password, $hash);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns whether the user exists in the database or not.
+     *
+     * @param string $username the username to check
+     * @return bool true if the user exists; false otherwise
+     */
+    function isUserRegistered($username) {
+        $mysqli = $this->getAuthmeMySqli();
+        if ($mysqli !== null) {
+            $stmt = $mysqli->prepare('SELECT 1 FROM ' . self::AUTHME_TABLE . ' WHERE username = ?');
+            $stmt->bind_param('s', $username);
+            $stmt->execute();
+            return $stmt->fetch();
+        }
+
+        // Defensive default to true; we actually don't know
+        return true;
+    }
+
+    /**
+     * Registers a player with the given username.
+     *
+     * @param string $username the username to register
+     * @param string $password the password to associate to the user
+     * @param string $email the email (may be empty)
+     * @return bool whether or not the registration was successful
+     */
+    function register($username, $password, $email) {
+        $email = $email ? $email : 'your@email.com';
+        $mysqli = $this->getAuthmeMySqli();
+        if ($mysqli !== null) {
+            $hash = $this->hash($password);
+            $stmt = $mysqli->prepare('INSERT INTO ' . self::AUTHME_TABLE . ' (username, realname, password, email, ip) '
+                . 'VALUES (?, ?, ?, ?, ?)');
+            $username_low = strtolower($username);
+            $stmt->bind_param('sssss', $username_low, $username, $hash, $email, $_SERVER['REMOTE_ADDR']);
+            return $stmt->execute();
+        }
+        return false;
+    }
+    
+    
+    /**
+     * Changes password for player.
+     *
+     * @param string $username the username
+     * @param string $password the password
+     * @return bool true whether or not password change was successful 
+     */
+    function changePassword($username, $password) {
+        $mysqli = $this->getAuthmeMySqli();
+        if ($mysqli !== null) {
+            $hash = $this->hash($password);
+            $stmt = $mysqli->prepare('UPDATE ' . self::AUTHME_TABLE . ' SET password=? '
+                . 'WHERE username=?');
+            $username_low = strtolower($username);
+            $stmt->bind_param('ss', $hash, $username_low);
+            return $stmt->execute();
+        }
+        return false;
+    }
+
+    /**
+     * Hashes the given password.
+     *
+     * @param $password string the clear-text password to hash
+     * @return string the resulting hash
+     */
+    protected abstract function hash($password);
+
+    /**
+     * Checks whether the given password matches the hash.
+     *
+     * @param $password string the clear-text password
+     * @param $hash string the password hash
+     * @return boolean true if the password matches, false otherwise
+     */
+    protected abstract function isValidPassword($password, $hash);
+
+    /**
+     * Returns a connection to the database.
+     *
+     * @return mysqli|null the mysqli object or null upon error
+     */
+    private function getAuthmeMySqli() {
+        // CHANGE YOUR DATABASE DETAILS HERE BELOW: host, user, password, database name
+        $mysqli = new mysqli('localhost', 'root', '', 'authme');
+        if (mysqli_connect_error()) {
+            printf('Could not connect to AuthMe database. Errno: %d, error: "%s"',
+                mysqli_connect_errno(), mysqli_connect_error());
+            return null;
+        }
+        return $mysqli;
+    }
+
+    /**
+     * Retrieves the hash associated with the given user from the database.
+     *
+     * @param string $username the username whose hash should be retrieved
+     * @return string|null the hash, or null if unavailable (e.g. username doesn't exist)
+     */
+    private function getHashFromDatabase($username) {
+        $mysqli = $this->getAuthmeMySqli();
+        if ($mysqli !== null) {
+            $stmt = $mysqli->prepare('SELECT password FROM ' . self::AUTHME_TABLE . ' WHERE username = ?');
+            $stmt->bind_param('s', $username);
+            $stmt->execute();
+            $stmt->bind_result($password);
+            if ($stmt->fetch()) {
+                return $password;
+            }
+        }
+        return null;
+    }
+
+}

samples/website_integration/Bcrypt.php

@@ -0,0 +1,20 @@
+<?php
+
+/***********************************************************
+ * AuthMe website integration logic for BCrypt             *
+ * ------------------------------------------------------- *
+ * See AuthMeController for details.                       *
+ *                                                         *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/       *
+ ***********************************************************/
+class Bcrypt extends AuthMeController {
+
+    protected function hash($password) {
+        return password_hash($password, PASSWORD_BCRYPT);
+    }
+
+    protected function isValidPassword($password, $hash) {
+        return password_verify($password, $hash);
+    }
+
+}

samples/website_integration/Pbkdf2.php

@@ -0,0 +1,53 @@
+<?php
+
+/***********************************************************
+ * AuthMe website integration logic for PBKDF2             *
+ * ------------------------------------------------------- *
+ * See AuthMeController for details.                       *
+ *                                                         *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/       *
+ ***********************************************************/
+class Pbkdf2 extends AuthMeController {
+
+    /** @var string[] range of characters for salt generation */
+    private $CHARS;
+
+    const SALT_LENGTH = 16;
+    const NUMBER_OF_ITERATIONS = 10000;
+
+    public function __construct() {
+        $this->CHARS = self::initCharRange();
+    }
+
+    protected function isValidPassword($password, $hash) {
+        // hash := pbkdf2_sha256$iterations$salt$hash
+        $parts = explode('$', $hash);
+        return count($parts) === 4 && $hash === $this->computeHash($parts[1], $parts[2], $password);
+    }
+
+    protected function hash($password) {
+        $salt = $this->generateSalt();
+		return $this->computeHash(self::NUMBER_OF_ITERATIONS, $salt, $password);
+    }
+	
+	private function computeHash($iterations, $salt, $password) {
+	    return 'pbkdf2_sha256$' . self::NUMBER_OF_ITERATIONS . '$' . $salt 
+			. '$' . hash_pbkdf2('sha256', $password, $salt, self::NUMBER_OF_ITERATIONS, 64, false);
+	}
+
+    /**
+     * @return string randomly generated salt
+     */
+    private function generateSalt() {
+        $maxCharIndex = count($this->CHARS) - 1;
+        $salt = '';
+        for ($i = 0; $i < self::SALT_LENGTH; ++$i) {
+            $salt .= $this->CHARS[mt_rand(0, $maxCharIndex)];
+        }
+        return $salt;
+    }
+
+    private static function initCharRange() {
+        return array_merge(range('0', '9'), range('a', 'f'));
+    }
+}

samples/website_integration/Sha256.php

@@ -0,0 +1,48 @@
+<?php
+
+/***********************************************************
+ * AuthMe website integration logic for SHA256             *
+ * ------------------------------------------------------- *
+ * See AuthMeController for details.                       *
+ *                                                         *
+ * Source: https://github.com/AuthMe/AuthMeReloaded/       *
+ ***********************************************************/
+class Sha256 extends AuthMeController {
+
+    /** @var string[] range of characters for salt generation */
+    private $CHARS;
+
+    const SALT_LENGTH = 16;
+
+    public function __construct() {
+        $this->CHARS = self::initCharRange();
+    }
+
+    protected function isValidPassword($password, $hash) {
+        // $SHA$salt$hash, where hash := sha256(sha256(password) . salt)
+        $parts = explode('$', $hash);
+        return count($parts) === 4 && $parts[3] === hash('sha256', hash('sha256', $password) . $parts[2]);
+    }
+
+    protected function hash($password) {
+        $salt = $this->generateSalt();
+        return '$SHA$' . $salt . '$' . hash('sha256', hash('sha256', $password) . $salt);
+    }
+
+    /**
+     * @return string randomly generated salt
+     */
+    private function generateSalt() {
+        $maxCharIndex = count($this->CHARS) - 1;
+        $salt = '';
+        for ($i = 0; $i < self::SALT_LENGTH; ++$i) {
+            $salt .= $this->CHARS[mt_rand(0, $maxCharIndex)];
+        }
+        return $salt;
+    }
+
+    private static function initCharRange() {
+        return array_merge(range('0', '9'), range('a', 'f'));
+    }
+
+}

samples/website_integration/index.php

@@ -0,0 +1,102 @@
+<!--
+  This is a demo page for AuthMe website integration.
+  See AuthMeController.php and the extending classes for the PHP code you need.
+-->
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+   <title>AuthMe Integration Sample</title>
+   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
+ <body>
+<?php
+error_reporting(E_ALL);
+
+require 'AuthMeController.php';
+
+// Change this to the file of the hash encryption you need, e.g. Bcrypt.php or Sha256.php
+require 'Sha256.php';
+// The class name must correspond to the file you have in require above! e.g. require 'Sha256.php'; and new Sha256();
+$authme_controller = new Sha256();
+
+$action = get_from_post_or_empty('action');
+$user = get_from_post_or_empty('username');
+$pass = get_from_post_or_empty('password');
+$email = get_from_post_or_empty('email');
+
+$was_successful = false;
+if ($action && $user && $pass) {
+    if ($action === 'Log in') {
+        $was_successful = process_login($user, $pass, $authme_controller);
+    } else if ($action === 'Register') {
+        $was_successful = process_register($user, $pass, $email, $authme_controller);
+    }
+}
+
+if (!$was_successful) {
+    echo '<h1>Login sample</h1>
+This is a demo form for AuthMe website integration. Enter your AuthMe login details
+into the following form to test it.
+<form method="post">
+ <table>
+   <tr><td>Name</td><td><input type="text" value="' . htmlspecialchars($user) . '" name="username" /></td></tr>
+   <tr><td>Email</td><td><input type="text" value="' . htmlspecialchars($email) . '" name="email" /></td></tr>
+   <tr><td>Pass</td><td><input type="password" value="' . htmlspecialchars($pass) . '" name="password" /></td></tr>
+   <tr>
+     <td><input type="submit" name="action" value="Log in" /></td>
+     <td><input type="submit" name="action" value="Register" /></td>
+   </tr>
+ </table>
+</form>';
+}
+
+function get_from_post_or_empty($index_name) {
+    return trim(
+        filter_input(INPUT_POST, $index_name, FILTER_UNSAFE_RAW, FILTER_REQUIRE_SCALAR | FILTER_FLAG_STRIP_LOW)
+            ?: '');
+}
+
+
+// Login logic
+function process_login($user, $pass, AuthMeController $controller) {
+    if ($controller->checkPassword($user, $pass)) {
+        printf('<h1>Hello, %s!</h1>', htmlspecialchars($user));
+        echo 'Successful login. Nice to have you back!'
+            . '<br /><a href="index.php">Back to form</a>';
+        return true;
+    } else {
+        echo '<h1>Error</h1> Invalid username or password.';
+    }
+    return false;
+}
+
+// Register logic
+function process_register($user, $pass, $email, AuthMeController $controller) {
+    if ($controller->isUserRegistered($user)) {
+        echo '<h1>Error</h1> This user already exists.';
+    } else if (!is_email_valid($email)) {
+        echo '<h1>Error</h1> The supplied email is invalid.';
+    } else {
+        // Note that we don't validate the password or username at all in this demo...
+        $register_success = $controller->register($user, $pass, $email);
+        if ($register_success) {
+            printf('<h1>Welcome, %s!</h1>Thanks for registering', htmlspecialchars($user));
+            echo '<br /><a href="index.php">Back to form</a>';
+            return true;
+        } else {
+            echo '<h1>Error</h1>Unfortunately, there was an error during the registration.';
+        }
+    }
+    return false;
+}
+
+function is_email_valid($email) {
+    return trim($email) === ''
+        ? true // accept no email
+        : filter_var($email, FILTER_VALIDATE_EMAIL);
+}
+
+?>
+
+ </body>
+</html>

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

@@ -2,31 +2,30 @@ package fr.xephi.authme;
 
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
-import com.alessiodp.libby.BukkitLibraryManager;
-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;
 import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
 import fr.xephi.authme.initialization.OnStartupTasks;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
 import fr.xephi.authme.initialization.SettingsProvider;
 import fr.xephi.authme.initialization.TaskCloser;
-import fr.xephi.authme.listener.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.LoginLocationFixListener;
 import fr.xephi.authme.listener.PlayerListener;
 import fr.xephi.authme.listener.PlayerListener111;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.PlayerListener19Spigot;
+import fr.xephi.authme.listener.DoubleLoginFixListener;
+import fr.xephi.authme.listener.GuiCaptchaHandler;
 import fr.xephi.authme.listener.PlayerListenerHigherThan18;
-import fr.xephi.authme.listener.PurgeListener;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
@@ -35,30 +34,31 @@ import fr.xephi.authme.service.BackupService;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.MigrationService;
 import fr.xephi.authme.service.bungeecord.BungeeReceiver;
-import fr.xephi.authme.service.velocity.VelocityReceiver;
 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.Updater;
 import fr.xephi.authme.task.purge.PurgeService;
 import fr.xephi.authme.util.ExceptionUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitScheduler;
 import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
-import java.io.File;
+import java.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;
@@ -74,13 +74,13 @@ 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.7.0-Fork";
+    private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "53";
+    private static String pluginBuildNumber = "27";
+    protected final Boolean SHAEnabled = false;
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
-    private static TaskScheduler scheduler;
     @Inject
     public static Settings settings;
     private DataSource database;
@@ -88,22 +88,12 @@ public class AuthMe extends JavaPlugin {
     private Injector injector;
     private BackupService backupService;
     public static ConsoleLogger logger;
-
     /**
      * Constructor.
      */
     public AuthMe() {
     }
 
-    /**
-     * Get the plugin's build
-     *
-     * @return The plugin's build
-     */
-    public static String getPluginBuild() {
-        return pluginBuild;
-    }
-
 
     /**
      * Get the plugin's name.
@@ -132,17 +122,6 @@ public class AuthMe extends JavaPlugin {
         return pluginBuildNumber;
     }
 
-    /**
-     * Get the scheduler
-     */
-    public static TaskScheduler getScheduler() {
-        return scheduler;
-    }
-
-    /**
-     * The library manager
-     */
-    public static BukkitLibraryManager libraryManager;
 
     /**
      * Method called when the server enables the plugin.
@@ -151,8 +130,6 @@ 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);
-        libraryManager = new BukkitLibraryManager(this);
 
         // Set the Logger instance and log file path
         ConsoleLogger.initialize(getLogger(), new File(getDataFolder(), LOG_FILENAME));
@@ -201,34 +178,60 @@ public class AuthMe extends JavaPlugin {
         cleanupTask.runTaskTimerAsynchronously(this, CLEANUP_INTERVAL, CLEANUP_INTERVAL);
         // Do a backup on start
         backupService.doBackup(BackupService.BackupCause.START);
+
         // Set up Metrics
         OnStartupTasks.sendMetrics(this, settings);
-        if (settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
+        if(settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
-            logger.info("\n" + "    ___         __  __    __  ___   \n" +
+            String loadColorConfig = settings.getProperty(SecuritySettings.STARTUP_BANNER_COLOR);
-                "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
+            if (loadColorConfig.startsWith("§")) {
-                "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
+                logger.info("\n" + loadColorConfig + "    ___         __  __    __  ___   \n" +
-                " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                    loadColorConfig + "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
-                "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                    loadColorConfig + "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
-                "                                    ");
+                    loadColorConfig + " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                    loadColorConfig + "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                    loadColorConfig + "                                    ");
+            }else {
+                logger.info("\n"+"    ___         __  __    __  ___   \n" +
+                    "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
+                    "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
+                    " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                    "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                    "                                    ");
+            }
         }
+        // Successful message
         //detect server brand with classloader
         checkServerType();
-        try {
-            Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler());
-            Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler());
-        } catch (NullPointerException ignored) {
-        }
         logger.info("AuthMeReReloaded is enabled successfully!");
         // Purge on start if enabled
         PurgeService purgeService = injector.getSingleton(PurgeService.class);
         purgeService.runAutoPurge();
+        // 注册玩家加入事件监听
+//        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS) || settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)/* || settings.getProperty(SecuritySettings.GUI_CAPTCHA)*/) {
+        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
+            getServer().getPluginManager().registerEvents(new DoubleLoginFixListener((Plugin) this), this);
+        }
+        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX)) {
+            getServer().getPluginManager().registerEvents(new LoginLocationFixListener((Plugin) this), this);
+        }
+        if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
+            getServer().getPluginManager().registerEvents(new GuiCaptchaHandler((Plugin) this), this);
+            logger.info("(Alpha4)GUICaptcha Feature is enabled successfully!");
+            logger.info("These features are still in development, if you encountered any problem, please report.");
+        } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && !getServer().getPluginManager().isPluginEnabled("ProtocolLib")) {
+            logger.warning("ProtocolLib is not loaded, we can't enable GUI Captcha.");
+        }
         logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/");
+
         if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) {
             checkForUpdates();
         }
+
+        if (SHAEnabled){
+            //shaChecker();
+        }
     }
-
+    public File pluginfile = getFile();
-
     /**
      * Load the version and build number of the plugin from the description file.
      *
@@ -260,6 +263,7 @@ 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);
@@ -302,7 +306,6 @@ public class AuthMe extends JavaPlugin {
 
         // Trigger instantiation (class not used elsewhere)
         injector.getSingleton(BungeeReceiver.class);
-        injector.getSingleton(VelocityReceiver.class);
 
         // Trigger construction of API classes; they will keep track of the singleton
         injector.getSingleton(AuthMeApi.class);
@@ -323,14 +326,14 @@ public class AuthMe extends JavaPlugin {
         pluginManager.registerEvents(injector.getSingleton(EntityListener.class), this);
         pluginManager.registerEvents(injector.getSingleton(ServerListener.class), this);
 
-
         // Try to register 1.8+ player listeners
-        if (isClassLoaded("org.bukkit.event.entity.EntityPickupItemEvent") && isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+        if (isClassLoaded("org.bukkit.event.entity.EntityPickupItemEvent") && isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")){
             pluginManager.registerEvents(injector.getSingleton(PlayerListenerHigherThan18.class), this);
         } else if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
         }
-// Try to register 1.9 player listeners(Moved to else-if)
+
+        // Try to register 1.9 player listeners(Moved to else-if)
 //        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
 //            pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
 //        }
@@ -344,27 +347,6 @@ 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.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);
-        }
     }
 
     /**
@@ -389,7 +371,7 @@ public class AuthMe extends JavaPlugin {
         if (onShutdownPlayerSaver != null) {
             onShutdownPlayerSaver.saveAllPlayers();
         }
-        if (settings != null && settings.getProperty(EmailSettings.SHUTDOWN_MAIL)) {
+        if (settings.getProperty(EmailSettings.SHUTDOWN_MAIL)){
             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));
@@ -401,7 +383,7 @@ public class AuthMe extends JavaPlugin {
         }
 
         // Wait for tasks and close data source
-        new TaskCloser(database).run();
+        new TaskCloser(this, database).run();
 
         // Disabled correctly
         Consumer<String> infoLogMethod = logger == null ? getLogger()::info : logger::info;
@@ -409,27 +391,62 @@ public class AuthMe extends JavaPlugin {
         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...");
-        Updater updater = new Updater(pluginBuild + pluginBuildNumber);
+        Bukkit.getScheduler().runTaskAsynchronously(this, () -> {
-        bukkitService.runTaskAsynchronously(() -> {
+            try {
-            if (updater.isUpdateAvailable()) {
+                // 从南通集线器获取最新版本号
-                String message = "New version available! Latest:" + updater.getLatestVersion() + " Current:" + pluginBuild + pluginBuildNumber;
+                URL url = new URL("https://api.github.com/repos/" + owner + "/" + repo + "/releases/latest");
-                logger.warning(message);
+                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                logger.warning("Download from here: https://modrinth.com/plugin/authmerereloaded");
+                conn.setConnectTimeout(10000); // 设置连接超时为10秒
-            } else {
+                conn.setReadTimeout(10000); // 设置读取超时为10秒
-                logger.info("You are running the latest version.");
+                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.INFO, message);
+                    getLogger().log(Level.INFO, "Download from here: github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
+                } else {
+                    getLogger().log(Level.INFO, "You are running the latest version.");
+                }
+            } catch (IOException e) {
+                getLogger().log(Level.WARNING, "Error occurred while checking updates from GitHub. Reason: " + e.getMessage());
             }
         });
     }
+    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("io.papermc.paper.threadedregions.RegionizedServer")) {
+        if (isClassLoaded("com.destroystokyo.paper.PaperConfig")) {
-            logger.info("AuthMeReReloaded is running on Folia");
-        } else if (isClassLoaded("com.destroystokyo.paper.PaperConfig")) {
             logger.info("AuthMeReReloaded is running on Paper");
-        } else if (isClassLoaded("catserver.server.CatServerConfig")) {
+        }else if (isClassLoaded("catserver.server.CatServerConfig")) {
             logger.info("AuthMeReReloaded is running on CatServer");
         } else if (isClassLoaded("org.spigotmc.SpigotConfig")) {
             logger.info("AuthMeReReloaded is running on Spigot");
@@ -439,6 +456,72 @@ public class AuthMe extends JavaPlugin {
             logger.info("AuthMeReReloaded is running on Unknown*");
         }
     }
+    // 其他方法和事件处理
+
+
+    // 其他方法和事件处理
+    private static final String SHA_URL = "https://raw.githubusercontent.com/"+ owner +"/"+ repo + "/master/"+pluginBuild +pluginBuildNumber+ ".sha";
+    private static final String ALGORITHM = "SHA-256";
+    private static final String PROXY_URL = "https://ghproxy.com/";
+    private static final String SHA_URL_GITEE = "https://gitee.com/"+ owner_gitee +"/"+ repo + "/raw/master/"+pluginBuild+pluginBuildNumber+ ".sha";
+
+//    public void shaChecker() {
+//        // 请求SHA文件
+//
+//        String actualSha;
+//        try {
+//            URL url;
+//            if(settings.getProperty(SecuritySettings.SHA_CHECK_METHOD).equals("github")) {
+//                url = new URL(SHA_URL);
+//                logger.info("正在检查文件完整性...(GitHub)");
+//            } else if(settings.getProperty(SecuritySettings.SHA_CHECK_METHOD).equals("ghproxy")) {
+//                url = new URL(PROXY_URL + SHA_URL);
+//                logger.info("正在检查文件完整性...(GhProxy)");
+//            } else if (settings.getProperty(SecuritySettings.SHA_CHECK_METHOD).equals("gitee")) {
+//                url = new URL(SHA_URL_GITEE);
+//                logger.info("正在检查文件完整性...(Gitee)");
+//            }else {
+//                logger.warning("未知的SHA检查方法,将从GitHub获取SHA文件");
+//                url = new URL(SHA_URL);
+//            }
+//
+//
+//            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+//            conn.setConnectTimeout(10000);
+//            conn.setReadTimeout(9000);
+//            conn.setRequestMethod("GET");
+//            InputStream stream = conn.getInputStream();
+//            ByteArrayOutputStream result = new ByteArrayOutputStream();
+//            byte[] buffer = new byte[1024];
+//            int length;
+//            while ((length = stream.read(buffer)) != -1) {
+//                result.write(buffer, 0, length);
+//            }
+//            String expectedSha = result.toString().trim();
+//            // 计算插件文件的SHA值
+//            MessageDigest md = MessageDigest.getInstance(ALGORITHM);
+//            byte[] fileBytes = Files.readAllBytes(pluginfile.toPath());
+//            byte[] hashBytes = md.digest(fileBytes);
+//            StringBuilder sb = new StringBuilder();
+//            for (byte b : hashBytes) {
+//                sb.append(String.format("%02x", b));
+//            }
+//            actualSha = sb.toString();
+//
+//            // 比较SHA值并加载插件
+//            if (expectedSha.equals(actualSha)) {
+//                logger.info("SHA联网安全校验完毕");
+//            } else {
+//                // SHA值不匹配，插件可能被篡改
+//                logger.warning("SHA值不匹配,插件被篡改");
+//                stopOrUnload();
+//            }
+//        }catch (NoSuchAlgorithmException | IOException e){
+//            logger.warning("SHA校验失败,请尝试切换校验API");
+//            logger.warning("您当前请求的API为:" + settings.getProperty(SecuritySettings.SHA_CHECK_METHOD));
+//            stopOrUnload();
+//        }
+//    }
 
 
     /**

src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java

@@ -32,7 +32,6 @@ import java.util.Optional;
  * AuthMeApi authmeApi = AuthMeApi.getInstance();
  * </code>
  */
-@SuppressWarnings("unused")
 public class AuthMeApi {
 
     private static AuthMeApi singleton;
@@ -266,16 +265,6 @@ public class AuthMeApi {
         management.forceLogin(player);
     }
 
-    /**
-     * Force a player to login, i.e. the player is logged in without needing his password.
-     *
-     * @param player The player to log in
-     * @param quiet Whether to suppress the login message
-     */
-    public void forceLogin(Player player, boolean quiet) {
-        management.forceLogin(player, quiet);
-    }
-
     /**
      * Force a player to logout.
      *

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) {
-        StringBuilder commandSyntax = new StringBuilder(ChatColor.WHITE + "/" + correctLabels.get(0) + ChatColor.YELLOW);
+        String commandSyntax = ChatColor.WHITE + "/" + correctLabels.get(0) + ChatColor.YELLOW;
         for (int i = 1; i < correctLabels.size(); ++i) {
-            commandSyntax.append(" ").append(correctLabels.get(i));
+            commandSyntax += " " + correctLabels.get(i);
         }
         for (CommandArgumentDescription argument : command.getArguments()) {
-            commandSyntax.append(" ").append(formatArgument(argument));
+            commandSyntax += " " + formatArgument(argument);
         }
-        return commandSyntax.toString();
+        return commandSyntax;
     }
 
     /**

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

@@ -1,17 +0,0 @@
-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

@@ -7,12 +7,12 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.converter.Converter;
 import fr.xephi.authme.datasource.converter.CrazyLoginConverter;
-import fr.xephi.authme.datasource.converter.H2ToSqlite;
 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;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
@@ -84,11 +84,11 @@ public class ConverterCommand implements ExecutableCommand {
         return ImmutableSortedMap.<String, Class<? extends Converter>>naturalOrder()
             .put("xauth", XAuthConverter.class)
             .put("crazylogin", CrazyLoginConverter.class)
+            .put("rakamak", RakamakConverter.class)
             .put("royalauth", RoyalAuthConverter.class)
+            .put("vauth", VAuthConverter.class)
             .put("sqlitetosql", SqliteToSql.class)
             .put("mysqltosqlite", MySqlToSqlite.class)
-            .put("sqlitetoh2", SqliteToH2.class)
-            .put("h2tosqlite", H2ToSqlite.class)
             .put("loginsecurity", LoginSecurityConverter.class)
             .build();
     }

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

@@ -1,12 +1,13 @@
 package fr.xephi.authme.command.executable.authme;
 
+import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.service.BukkitService;
 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 fr.xephi.authme.AuthMe;
 import javax.inject.Inject;
 import java.util.List;
 
@@ -18,17 +19,17 @@ public class FirstSpawnCommand extends PlayerCommand {
     private Settings settings;
     @Inject
     private SpawnLoader spawnLoader;
-    @Inject
-    private BukkitService bukkitService;
     @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();
-            bukkitService.runTaskIfFolia(player, () -> {
+            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,8 +78,7 @@ public class RegisterAdminCommand implements ExecutableCommand {
             final Player player = bukkitService.getPlayerExact(playerName);
             if (player != null) {
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() ->
-                    // AuthMeReReloaded - Folia compatibility
+                    player.kickPlayer(commonService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER)));
-                    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,31 +45,34 @@ public class SetEmailCommand implements ExecutableCommand {
             return;
         }
 
-        bukkitService.runTaskOptionallyAsync(() -> { // AuthMeReReloaded - Folia compatibility
+        bukkitService.runTaskOptionallyAsync(new Runnable() {
-            // Validate the user
+            @Override
-            PlayerAuth auth = dataSource.getAuth(playerName);
+            public void run() {
-            if (auth == null) {
+                // Validate the user
-                commonService.send(sender, MessageKey.UNKNOWN_USER);
+                PlayerAuth auth = dataSource.getAuth(playerName);
-                return;
+                if (auth == null) {
-            } else if (!validationService.isEmailFreeForRegistration(playerEmail, sender)) {
+                    commonService.send(sender, MessageKey.UNKNOWN_USER);
-                commonService.send(sender, MessageKey.EMAIL_ALREADY_USED_ERROR);
+                    return;
-                return;
+                } else if (!validationService.isEmailFreeForRegistration(playerEmail, sender)) {
-            }
+                    commonService.send(sender, MessageKey.EMAIL_ALREADY_USED_ERROR);
+                    return;
+                }
 
-            // Set the email address
+                // Set the email address
-            auth.setEmail(playerEmail);
+                auth.setEmail(playerEmail);
-            if (!dataSource.updateEmail(auth)) {
+                if (!dataSource.updateEmail(auth)) {
-                commonService.send(sender, MessageKey.ERROR);
+                    commonService.send(sender, MessageKey.ERROR);
-                return;
+                    return;
-            }
+                }
 
-            // Update the player cache
+                // Update the player cache
-            if (playerCache.getAuth(playerName) != null) {
+                if (playerCache.getAuth(playerName) != null) {
-                playerCache.updatePlayer(auth);
+                    playerCache.updatePlayer(auth);
-            }
+                }
 
-            // Show a status message
+                // Show a status message
-            commonService.send(sender, MessageKey.EMAIL_CHANGED_SUCCESS);
+                commonService.send(sender, MessageKey.EMAIL_CHANGED_SUCCESS);
+            }
         });
     }
 }

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

@@ -1,9 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.SpawnLoader;
-import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -13,15 +11,13 @@ public class SpawnCommand extends PlayerCommand {
 
     @Inject
     private SpawnLoader spawnLoader;
-    @Inject
-    private BukkitService bukkitService;
 
     @Override
     public void runCommand(Player player, List<String> arguments) {
         if (spawnLoader.getSpawn() == null) {
             player.sendMessage("[AuthMe] Spawn has failed, please try to define the spawn");
         } else {
-            bukkitService.runTaskIfFolia(player, () -> TeleportUtils.teleport(player, spawnLoader.getSpawn()));
+            player.teleport(spawnLoader.getSpawn());
         }
     }
 }

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

@@ -3,8 +3,6 @@ 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;
@@ -19,8 +17,6 @@ public class VersionCommand implements ExecutableCommand {
 
     @Inject
     private BukkitService bukkitService;
-    @Inject
-    private Settings settings;
 
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments) {
@@ -28,7 +24,6 @@ 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

@@ -8,7 +8,6 @@ import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.service.ValidationService.ValidationResult;
-import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -43,14 +42,11 @@ public class ChangePasswordCommand extends PlayerCommand {
             commonService.send(player, MessageKey.NOT_LOGGED_IN);
             return;
         }
-
+        // Check if the user has been verified or not
-        if (commonService.getProperty(SecuritySettings.CHANGE_PASSWORD_EMAIL_VERIFICATION_REQUIRED)) {
+        if (codeManager.isVerificationRequired(player)) {
-            // Check if the user has been verified or not
+            codeManager.codeExistOrGenerateNew(name);
-            if (codeManager.isVerificationRequired(player)) {
+            commonService.send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
-                codeManager.codeExistOrGenerateNew(name);
+            return;
-                commonService.send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
-                return;
-            }
         }
 
         String oldPassword = arguments.get(0);

src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -15,7 +15,6 @@ import fr.xephi.authme.process.register.executors.PasswordRegisterParams;
 import fr.xephi.authme.process.register.executors.RegistrationMethod;
 import fr.xephi.authme.process.register.executors.TwoFactorRegisterParams;
 import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.properties.EmailSettings;
@@ -25,6 +24,8 @@ import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import static fr.xephi.authme.process.register.RegisterSecondaryArgument.CONFIRMATION;
 import static fr.xephi.authme.process.register.RegisterSecondaryArgument.EMAIL_MANDATORY;
@@ -45,9 +46,6 @@ public class RegisterCommand extends PlayerCommand {
     @Inject
     private CommonService commonService;
 
-    @Inject
-    private BukkitService bukkitService;
-
     @Inject
     private DataSource dataSource;
 
@@ -177,15 +175,20 @@ public class RegisterCommand extends PlayerCommand {
         } else if (isSecondArgValidForEmailRegistration(player, arguments)) {
             management.performRegister(RegistrationMethod.EMAIL_REGISTRATION,
                 EmailRegisterParams.of(player, email));
-            if (commonService.getProperty(RegistrationSettings.UNREGISTER_ON_EMAIL_VERIFICATION_FAILURE) && commonService.getProperty(RegistrationSettings.UNREGISTER_AFTER_MINUTES) > 0) {
+            Timer timer = new Timer();
-                bukkitService.runTaskLater(player, () -> {
+            timer.schedule(new TimerTask() {
+                @Override
+                public void run() {
                     if (dataSource.getAuth(player.getName()) != null) {
                         if (dataSource.getAuth(player.getName()).getLastLogin() == null) {
                             management.performUnregisterByAdmin(null, player.getName(), player);
+                            timer.cancel();
                         }
+                    } else {
+                        timer.cancel();
                     }
-                }, 60 * 20 * commonService.getProperty(RegistrationSettings.UNREGISTER_AFTER_MINUTES));
+                }
-            }
+            }, 600000);
         }
     }
 

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.runTask(player,() -> { // AuthMeReReloaded - Folia compatibility
+            bukkitService.scheduleSyncDelayedTask(() -> {
                 if (customCommand.isEmpty()) {
                     bukkitService.banIp(ip, reason, expires, "AuthMe");
                     player.kickPlayer(reason);

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

@@ -22,8 +22,6 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static fr.xephi.authme.AuthMe.getScheduler;
-
 public class VerificationCodeManager implements SettingsDependent, HasCleanup {
 
     private final EmailService emailService;
@@ -135,19 +133,17 @@ public class VerificationCodeManager implements SettingsDependent, HasCleanup {
      * @param name the name of the player to generate a code for
      */
     private void generateCode(String name) {
-        getScheduler().runTaskAsynchronously(() -> {
+        DataSourceValue<String> emailResult = dataSource.getEmail(name);
-            DataSourceValue<String> emailResult = dataSource.getEmail(name);
+        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());
-            Date date = new Date(System.currentTimeMillis());
+        if (emailResult.rowExists()) {
-            if (emailResult.rowExists()) {
+            final String email = emailResult.getValue();
-                final String email = emailResult.getValue();
+            if (!Utils.isEmailEmpty(email)) {
-                if (!Utils.isEmailEmpty(email)) {
+                String code = RandomStringUtils.generateNum(6); // 6 digits code
-                    String code = RandomStringUtils.generateNum(6); // 6 digits code
+                verificationCodes.put(name.toLowerCase(Locale.ROOT), code);
-                    verificationCodes.put(name.toLowerCase(Locale.ROOT), code);
+                emailService.sendVerificationMail(name, email, code, dateFormat.format(date));
-                    emailService.sendVerificationMail(name, email, code, dateFormat.format(date));
-                }
             }
-        });
+        }
     }
 
     /**

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,9 +22,8 @@ public class LimboPlayer {
     private final Location loc;
     private final float walkSpeed;
     private final float flySpeed;
-    private MyScheduledTask timeoutTask = null;
+    private BukkitTask timeoutTask = null;
     private MessageTask messageTask = null;
-
     private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED;
 
     public LimboPlayer(Location loc, boolean operator, Collection<UserGroup> groups, boolean fly, float walkSpeed,
@@ -82,7 +81,7 @@ public class LimboPlayer {
      *
      * @return The timeout task associated to the player
      */
-    public MyScheduledTask getTimeoutTask() {
+    public BukkitTask getTimeoutTask() {
         return timeoutTask;
     }
 
@@ -92,7 +91,7 @@ public class LimboPlayer {
      *
      * @param timeoutTask The task to set
      */
-    public void setTimeoutTask(MyScheduledTask timeoutTask) {
+    public void setTimeoutTask(BukkitTask timeoutTask) {
         if (this.timeoutTask != null) {
             this.timeoutTask.cancel();
         }

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

@@ -1,6 +1,5 @@
 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;
@@ -12,6 +11,7 @@ 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,7 +53,7 @@ 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, (long) interval * TICKS_PER_SECOND);
+            bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
             limbo.setMessageTask(messageTask);
         }
     }
@@ -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);
-            MyScheduledTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
+            BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
             limbo.setTimeoutTask(task);
         }
     }

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

@@ -9,22 +9,18 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.crypts.HashedPassword;
-import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.util.Utils;
 
-import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -32,10 +28,11 @@ import java.util.stream.Collectors;
 public class CacheDataSource implements DataSource {
 
     private final ConsoleLogger logger = ConsoleLoggerFactory.get(CacheDataSource.class);
+
     private final DataSource source;
     private final PlayerCache playerCache;
     private final LoadingCache<String, Optional<PlayerAuth>> cachedAuths;
-    private ListeningExecutorService executorService;
+    private final ListeningExecutorService executorService;
 
     /**
      * Constructor for CacheDataSource.
@@ -46,30 +43,13 @@ public class CacheDataSource implements DataSource {
     public CacheDataSource(DataSource source, PlayerCache playerCache) {
         this.source = source;
         this.playerCache = playerCache;
-        if (AuthMe.settings.getProperty(DatabaseSettings.USE_VIRTUAL_THREADS)) {
+
-            try {
+        executorService = MoreExecutors.listeningDecorator(
-                Method method = Executors.class.getMethod("newVirtualThreadPerTaskExecutor");
+            Executors.newCachedThreadPool(new ThreadFactoryBuilder()
-                method.setAccessible(true);
+                .setDaemon(true)
-                ExecutorService ex = (ExecutorService) method.invoke(null);
+                .setNameFormat("AuthMe-CacheLoader")
-                executorService = MoreExecutors.listeningDecorator(ex);
+                .build())
-                logger.info("Using virtual threads for cache loader");
+        );
-            } catch (Exception e) {
-                executorService = MoreExecutors.listeningDecorator(
-                    Executors.newCachedThreadPool(new ThreadFactoryBuilder()
-                        .setDaemon(true)
-                        .setNameFormat("AuthMe-CacheLoader")
-                        .build())
-                );
-                logger.info("Cannot enable virtual threads, fallback to CachedThreadPool");
-            }
-        } else {
-            executorService = MoreExecutors.listeningDecorator(
-                Executors.newCachedThreadPool(new ThreadFactoryBuilder()
-                    .setDaemon(true)
-                    .setNameFormat("AuthMe-CacheLoader")
-                    .build())
-            );
-        }
         cachedAuths = CacheBuilder.newBuilder()
             .refreshAfterWrite(5, TimeUnit.MINUTES)
             .expireAfterAccess(15, TimeUnit.MINUTES)

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

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

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

@@ -1,422 +0,0 @@
-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/MySQL.java

@@ -41,7 +41,6 @@ public class MySQL extends AbstractSqlDataSource {
     private boolean useSsl;
     private boolean serverCertificateVerification;
     private boolean allowPublicKeyRetrieval;
-    private String mariaDbSslMode;
     private String host;
     private String port;
     private String username;
@@ -122,7 +121,6 @@ public class MySQL extends AbstractSqlDataSource {
         this.useSsl = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
         this.serverCertificateVerification = settings.getProperty(DatabaseSettings.MYSQL_CHECK_SERVER_CERTIFICATE);
         this.allowPublicKeyRetrieval = settings.getProperty(DatabaseSettings.MYSQL_ALLOW_PUBLIC_KEY_RETRIEVAL);
-        this.mariaDbSslMode = settings.getProperty(DatabaseSettings.MARIADB_SSL_MODE);
     }
 
     /**
@@ -147,19 +145,12 @@ public class MySQL extends AbstractSqlDataSource {
         ds.setDriverClassName(this.getDriverClassName());
 
         // Request mysql over SSL
-        if (this instanceof MariaDB) {
+        ds.addDataSourceProperty("useSSL", String.valueOf(useSsl));
-            ds.addDataSourceProperty("sslMode", mariaDbSslMode);
-        } else {
-            ds.addDataSourceProperty("useSSL", String.valueOf(useSsl));
-
-            // Disabling server certificate verification on need
-            if (!serverCertificateVerification) {
-                ds.addDataSourceProperty("verifyServerCertificate", String.valueOf(false));
-            }
-        }
-
 
         // Disabling server certificate verification on need
+        if (!serverCertificateVerification) {
+            ds.addDataSourceProperty("verifyServerCertificate", String.valueOf(false));
+        }        // Disabling server certificate verification on need
         if (allowPublicKeyRetrieval) {
             ds.addDataSourceProperty("allowPublicKeyRetrieval", String.valueOf(true));
         }

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

@@ -51,26 +51,6 @@ 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/H2ToSqlite.java

@@ -1,33 +0,0 @@
-package fr.xephi.authme.datasource.converter;
-
-import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.datasource.DataSourceType;
-import fr.xephi.authme.datasource.H2;
-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 H2 to SQLite.
- *
- */
-public class H2ToSqlite extends AbstractDataSourceConverter<H2>{
-
-    private final Settings settings;
-    private final File dataFolder;
-
-    @Inject
-    H2ToSqlite(Settings settings, DataSource dataSource, @DataFolder File dataFolder) {
-        super(dataSource, DataSourceType.SQLITE);
-        this.settings = settings;
-        this.dataFolder = dataFolder;
-    }
-
-    @Override
-    protected H2 getSource() throws SQLException {
-        return new H2(settings, dataFolder);
-    }
-}

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

@@ -0,0 +1,96 @@
+package fr.xephi.authme.datasource.converter;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.data.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.initialization.DataFolder;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.security.crypts.HashedPassword;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.ConverterSettings;
+import fr.xephi.authme.util.Utils;
+import org.bukkit.command.CommandSender;
+
+import javax.inject.Inject;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @author Xephi59
+ */
+public class RakamakConverter implements Converter {
+
+    private final ConsoleLogger logger = ConsoleLoggerFactory.get(RakamakConverter.class);
+    private final DataSource database;
+    private final Settings settings;
+    private final File pluginFolder;
+    private final PasswordSecurity passwordSecurity;
+
+    @Inject
+    RakamakConverter(@DataFolder File dataFolder, DataSource dataSource, Settings settings,
+                     PasswordSecurity passwordSecurity) {
+        this.database = dataSource;
+        this.settings = settings;
+        this.pluginFolder = dataFolder;
+        this.passwordSecurity = passwordSecurity;
+    }
+
+    @Override
+    //TODO ljacqu 20151229: Restructure this into smaller portions
+    public void execute(CommandSender sender) {
+        boolean useIp = settings.getProperty(ConverterSettings.RAKAMAK_USE_IP);
+        String fileName = settings.getProperty(ConverterSettings.RAKAMAK_FILE_NAME);
+        String ipFileName = settings.getProperty(ConverterSettings.RAKAMAK_IP_FILE_NAME);
+        File source = new File(pluginFolder, fileName);
+        File ipFiles = new File(pluginFolder, ipFileName);
+        Map<String, String> playerIp = new HashMap<>();
+        Map<String, HashedPassword> playerPassword = new HashMap<>();
+        try {
+            BufferedReader ipFile = new BufferedReader(new FileReader(ipFiles));
+            String line;
+            if (useIp) {
+                String tempLine;
+                while ((tempLine = ipFile.readLine()) != null) {
+                    if (tempLine.contains("=")) {
+                        String[] args = tempLine.split("=");
+                        playerIp.put(args[0], args[1]);
+                    }
+                }
+            }
+            ipFile.close();
+
+            BufferedReader users = new BufferedReader(new FileReader(source));
+            while ((line = users.readLine()) != null) {
+                if (line.contains("=")) {
+                    String[] arguments = line.split("=");
+                    HashedPassword hashedPassword = passwordSecurity.computeHash(arguments[1], arguments[0]);
+                    playerPassword.put(arguments[0], hashedPassword);
+
+                }
+            }
+            users.close();
+            for (Entry<String, HashedPassword> m : playerPassword.entrySet()) {
+                String playerName = m.getKey();
+                HashedPassword psw = playerPassword.get(playerName);
+                String ip = playerIp.get(playerName);
+                PlayerAuth auth = PlayerAuth.builder()
+                    .name(playerName)
+                    .realName(playerName)
+                    .lastIp(ip)
+                    .password(psw)
+                    .build();
+                database.saveAuth(auth);
+                database.updateSession(auth);
+            }
+            Utils.logAndSendMessage(sender, "Rakamak database has been imported successfully");
+        } catch (IOException ex) {
+            logger.logException("Can't open the rakamak database file! Does it exist?", ex);
+        }
+    }
+}

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

@@ -1,33 +0,0 @@
-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/datasource/converter/VAuthConverter.java

@@ -0,0 +1,81 @@
+package fr.xephi.authme.datasource.converter;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.data.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.initialization.DataFolder;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Scanner;
+import java.util.UUID;
+
+import static fr.xephi.authme.util.FileUtils.makePath;
+
+public class VAuthConverter implements Converter {
+
+    private final ConsoleLogger logger = ConsoleLoggerFactory.get(VAuthConverter.class);
+    private final DataSource dataSource;
+    private final File vAuthPasswordsFile;
+
+    @Inject
+    VAuthConverter(@DataFolder File dataFolder, DataSource dataSource) {
+        vAuthPasswordsFile = new File(dataFolder.getParent(), makePath("vAuth", "passwords.yml"));
+        this.dataSource = dataSource;
+    }
+
+    @Override
+    public void execute(CommandSender sender) {
+        try (Scanner scanner = new Scanner(vAuthPasswordsFile)) {
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                String name = line.split(": ")[0];
+                String password = line.split(": ")[1];
+                PlayerAuth auth;
+                if (isUuidInstance(password)) {
+                    String pname;
+                    try {
+                        pname = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName();
+                    } catch (Exception | NoSuchMethodError e) {
+                        pname = getName(UUID.fromString(name));
+                    }
+                    if (pname == null) {
+                        continue;
+                    }
+                    auth = PlayerAuth.builder()
+                        .name(pname.toLowerCase(Locale.ROOT))
+                        .realName(pname)
+                        .password(password, null).build();
+                } else {
+                    auth = PlayerAuth.builder()
+                        .name(name.toLowerCase(Locale.ROOT))
+                        .realName(name)
+                        .password(password, null).build();
+                }
+                dataSource.saveAuth(auth);
+            }
+        } catch (IOException e) {
+            logger.logException("Error while trying to import some vAuth data", e);
+        }
+    }
+
+    private static boolean isUuidInstance(String s) {
+        return s.length() > 8 && s.charAt(8) == '-';
+    }
+
+    private String getName(UUID uuid) {
+        for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
+            if (op.getUniqueId().compareTo(uuid) == 0) {
+                return op.getName();
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -1,12 +1,10 @@
 package fr.xephi.authme.initialization;
 
-import com.alessiodp.libby.Library;
 import fr.xephi.authme.ConsoleLogger;
 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;
@@ -22,8 +20,6 @@ import javax.inject.Provider;
 import java.io.File;
 import java.sql.SQLException;
 
-import static fr.xephi.authme.AuthMe.libraryManager;
-
 /**
  * Creates the AuthMe data source.
  */
@@ -80,16 +76,6 @@ public class DataSourceProvider implements Provider<DataSource> {
             case SQLITE:
                 dataSource = new SQLite(settings, dataFolder);
                 break;
-            case H2:
-                Library h2 = Library.builder()
-                    .groupId("com.h2database")
-                    .artifactId("h2")
-                    .version("2.2.224")
-                    .build();
-                libraryManager.addMavenCentral();
-                libraryManager.loadLibrary(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,6 +1,5 @@
 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;
@@ -19,6 +18,7 @@ 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;
@@ -96,7 +96,7 @@ public class OnStartupTasks {
         if (!settings.getProperty(RECALL_PLAYERS)) {
             return;
         }
-        bukkitService.runTaskTimerAsynchronously(new UniversalRunnable() {
+        bukkitService.runTaskTimerAsynchronously(new BukkitRunnable() {
             @Override
             public void run() {
                 List<String> loggedPlayersWithEmptyMail = dataSource.getLoggedPlayersWithEmptyMail();
@@ -109,6 +109,6 @@ public class OnStartupTasks {
                     }
                 });
             }
-        }, 1, (long) TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
+        }, 1, TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
     }
 }

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

@@ -1,8 +1,16 @@
 package fr.xephi.authme.initialization;
 
-import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
+import com.google.common.annotations.VisibleForTesting;
 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;
 
 /**
  * Waits for asynchronous tasks to complete before closing the data source
@@ -10,24 +18,78 @@ import fr.xephi.authme.datasource.DataSource;
  */
 public class TaskCloser implements Runnable {
 
-    private final TaskScheduler scheduler;
+    private final BukkitScheduler scheduler;
+    private final Logger logger;
+    private final AuthMe plugin;
     private final DataSource dataSource;
 
     /**
      * Constructor.
      *
+     * @param plugin the plugin instance
      * @param dataSource the data source (nullable)
      */
-    public TaskCloser(DataSource dataSource) {
+    public TaskCloser(AuthMe plugin, DataSource dataSource) {
-        this.scheduler = AuthMe.getScheduler();
+        this.scheduler = plugin.getServer().getScheduler();
+        this.logger = plugin.getLogger();
+        this.plugin = plugin;
         this.dataSource = dataSource;
     }
 
     @Override
     public void run() {
-        scheduler.cancelTasks();
+        List<Integer> pendingTasks = getPendingTasks();
+        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

@@ -1,20 +0,0 @@
-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

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

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

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

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

@@ -0,0 +1,253 @@
+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.settings.properties.HooksSettings;
+import fr.xephi.authme.settings.properties.RestrictionSettings;
+import fr.xephi.authme.settings.properties.SecuritySettings;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.plugin.Plugin;
+import java.io.File;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import static org.bukkit.Bukkit.getLogger;
+import static org.bukkit.Bukkit.getServer;
+public class GuiCaptchaHandler implements Listener{
+    //define AuthMeApi
+    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+    private final Plugin plugin;
+
+    //define timesLeft
+    public int timesLeft = 3;
+    //Use ConcurrentHashMap to store player and their close reason
+    /* We used many async tasks so there is concurrent**/
+    public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
+    //define randomStringSet
+    String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
+    String randomString = "";
+    Random randomItemSet = new Random();
+    Random howManyRandom = new Random();
+
+
+    int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+
+    public GuiCaptchaHandler(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        if (event.getWhoClicked() instanceof Player) {
+            Player player = (Player) event.getWhoClicked();
+            ItemStack currentItem = event.getCurrentItem();
+            if (!authmeApi.isRegistered(player.getName()) && !closeReasonMap.containsKey(player)) {
+                if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getWhoClicked().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
+                    if (!closeReasonMap.containsKey(player)) {
+                        closeReasonMap.put(player,"verified");
+                        return;
+                    }
+                    return;
+                }
+                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)){
+                    event.setCancelled(true);
+                    closeReasonMap.put(player, "verified");
+                    player.closeInventory();
+                    player.sendMessage("§a验证完成");
+                } else {
+                    player.sendMessage("§c验证失败,你还有" + timesLeft + "§c次机会");
+                    timesLeft--;
+                }
+                //force to string
+            }
+        }
+    }
+
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        randomString = "";
+        Player playerunreg = event.getPlayer();
+        String name = playerunreg.getName();
+        if (!authmeApi.isRegistered(name)) {
+            if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getPlayer().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
+                closeReasonMap.put(playerunreg, "verified");
+                playerunreg.sendMessage("§a基岩版自动验证完成");
+                return;
+            }
+            Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+                StringBuilder sb = new StringBuilder();
+                howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
+                for (int i = 0; i < howLongIsRandomString; i++) {
+                    //生成随机索引号
+                    int index = randomItemSet.nextInt(randomSet.length());
+
+                    // 从字符串中获取由索引 index 指定的字符
+                    char randomChar = randomSet.charAt(index);
+
+                    // 将字符追加到字符串生成器
+                    sb.append(randomChar);
+                }
+
+                Bukkit.getScheduler().runTask(this.plugin, () -> {
+                    randomString = sb.toString();
+                    Random random_blockpos = new Random();
+                    AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
+                    Inventory menu = Bukkit.createInventory(null, 27, randomString + "请验证你是真人");
+                    ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
+                    ItemMeta meta = item.getItemMeta();
+                    try {
+                        if (meta != null) {
+                            meta.setDisplayName("§a我是真人");
+                            item.setItemMeta(meta);
+                        }
+                    } catch (NullPointerException e) {
+                        getLogger().log(Level.WARNING, "Unexpected error occurred while setting item meta.");
+                    }
+                    Bukkit.getScheduler().runTask(this.plugin, () -> {
+                        menu.setItem(random_num.get(), item);
+                    });
+                    menu.setItem(random_num.get(), item);
+                    Bukkit.getScheduler().runTask(this.plugin, () -> {
+                        playerunreg.openInventory(menu);
+                    });
+                    if (AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > 0) {
+                        long timeOut = AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT);
+                        if (AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > AuthMe.settings.getProperty(RestrictionSettings.TIMEOUT)) {
+                            Bukkit.getScheduler().runTask(this.plugin, () -> {
+                                getLogger().warning("AuthMe detected that your GUI captcha timeout seconds(" + AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) + ") is bigger than the Login timeout seconds(" +
+                                    AuthMe.settings.getProperty(RestrictionSettings.TIMEOUT) + "). To prevent issues, we will let the GUI captcha follow the Login timeout seconds, please check and modify your config.");
+                            });
+                            timeOut = AuthMe.settings.getProperty(RestrictionSettings.TIMEOUT);
+                        }
+                        long finalTimeOut = timeOut;
+                        Bukkit.getScheduler().runTask(this.plugin, () -> {
+                            Bukkit.getScheduler().runTaskLater(this.plugin, () -> {
+                                if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    playerunreg.kickPlayer("§c验证超时");
+                                    timesLeft = 3; // Reset the attempt counter
+                                }
+                            }, finalTimeOut * 20L);
+                        });
+                    }
+
+                    Bukkit.getScheduler().runTask(this.plugin, () -> {
+                        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
+                            @Override
+                            public void onPacketReceiving(PacketEvent event) {
+                                if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    if (timesLeft <= 0) {
+                                        Bukkit.getScheduler().runTask(this.plugin, () -> {
+                                            playerunreg.kickPlayer("§c请先完成人机验证!");
+                                        });
+                                        timesLeft = 3;
+                                        return;
+                                    } else {
+                                        timesLeft--;
+                                        playerunreg.sendMessage("§c请先完成验证!,你还有" + timesLeft + "次机会");
+
+                                    }
+                                    event.setCancelled(true);
+                                    random_num.set(random_blockpos.nextInt(26));
+                                    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+                                        Bukkit.getScheduler().runTask(plugin, () -> {
+                                            menu.clear();
+                                            menu.setItem(random_num.get(), item);
+                                        });
+
+                                        Bukkit.getScheduler().runTask(plugin, () -> {
+                                            playerunreg.openInventory(menu);
+                                        });
+                                    });
+                                }
+                            }
+                        });
+                    });
+                    Bukkit.getScheduler().runTask(this.plugin, () -> {
+
+                        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
+                            @Override
+                            public void onPacketReceiving(PacketEvent event) {
+                                if (event.getPlayer() == playerunreg && !closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
+                                    playerunreg.sendMessage("§c请先完成验证!");
+                                    event.setCancelled(true);
+                                }
+                            }
+                        });
+                    });
+                });
+            });
+        }
+    }
+
+    private void deletePlayerData(UUID playerUUID) {
+        // 获取服务器的存储文件夹路径
+        File serverFolder = Bukkit.getServer().getWorldContainer();
+        String worldFolderName = AuthMe.settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        // 构建playerdata文件夹路径
+        File playerDataFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "playerdata");
+
+        // 构建玩家数据文件路径
+        File playerDataFile = new File(playerDataFolder, File.separator + playerUUID + ".dat");
+
+        // 删除玩家数据文件
+        if (playerDataFile.exists()) {
+            playerDataFile.delete();
+        }
+    }
+    private void deletePlayerStats(UUID playerUUID) {
+        // 获取服务器的存储文件夹路径
+        File serverFolder = Bukkit.getServer().getWorldContainer();
+        String worldFolderName = AuthMe.settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
+        // 构建stats文件夹路径
+        File statsFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "stats");
+        // 构建玩家统计数据文件路径
+        File statsFile = new File(statsFolder, File.separator + playerUUID + ".json");
+        // 删除玩家统计数据文件
+
+        if (statsFile.exists()) {
+            statsFile.delete();
+        }
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        String name = player.getName();
+        UUID playerUUID = event.getPlayer().getUniqueId();
+        if (!authmeApi.isRegistered(name)) {
+            if(AuthMe.settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)){
+                Bukkit.getScheduler().runTaskLater(this.plugin , () -> {
+                    if(!player.isOnline()) {
+                        deletePlayerData(playerUUID);
+                        deletePlayerStats(playerUUID);
+                    }
+                },100L);
+                return;
+            }
+            closeReasonMap.remove(player);
+        }
+    }
+}
+
+
+
+

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,6 +21,7 @@ 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;
@@ -75,9 +79,19 @@ 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) {
         isRegistrationForced = settings.getProperty(RegistrationSettings.FORCE);

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

@@ -1,12 +1,7 @@
 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;
@@ -16,66 +11,36 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-
+import org.bukkit.plugin.Plugin;
-import javax.inject.Inject;
-import java.lang.reflect.Method;
 
 
-public class LoginLocationFixListener implements Listener {
+public class LoginLocationFixListener implements Listener{
-    @Inject
+    private final Plugin plugin;
-    private AuthMe plugin;
-    @Inject
-    private Messages messages;
-    @Inject
-    private Settings settings;
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-
+    public LoginLocationFixListener(Plugin plugin) {
-    public LoginLocationFixListener() {
+        this.plugin = plugin;
     }
-
-    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};
-
+    @EventHandler
-    static {
+    public void onPlayerJoin(PlayerJoinEvent event){
-        if (materialPortal == null) {
+        Player player = event.getPlayer();
-            materialPortal = Material.matchMaterial("PORTAL_BLOCK");
+        Material material = Material.matchMaterial("PORTAL");
-            if (materialPortal == null) {
+        if (material == null) {
-                materialPortal = Material.matchMaterial("NETHER_PORTAL");
+            material = Material.matchMaterial("PORTAL_BLOCK");
+            if(material == null){
+                material = Material.matchMaterial("NETHER_PORTAL");
             }
         }
-        try {
+        Location JoinLocation = player.getLocation().getBlock().getLocation().add(0.5, 0.1, 0.5);
-            Method getMinHeightMethod = World.class.getMethod("getMinHeight");
+        if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
-            isAvailable = true;
+            if (!JoinLocation.getBlock().getType().equals(material) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(material)) {
-        } 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)) {
-                    TeleportUtils.teleport(player, JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
+                    player.teleport(JoinBlock.getRelative(face).getLocation().add(0.5, 0.1, 0.5));
                     solved = true;
                     break;
                 }
@@ -84,13 +49,12 @@ public class LoginLocationFixListener implements Listener {
                 JoinBlock.getRelative(BlockFace.UP).breakNaturally();
                 JoinBlock.breakNaturally();
             }
-            messages.send(player, MessageKey.LOCATION_FIX_PORTAL);
+            player.sendMessage("§a你在登录时卡在了地狱门, 现已修正");
-        }
+        } else if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND)) {
-        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);
+            int MinHeight = world.getMinHeight();
             if (!UpType.isOccluding() && !UpType.equals(Material.LAVA)) {
                 return;
             }
@@ -103,16 +67,15 @@ public class LoginLocationFixListener implements Listener {
                     if (JoinBlock.getRelative(BlockFace.DOWN).getType().equals(Material.LAVA)) {
                         JoinBlock.getRelative(BlockFace.DOWN).setType(Material.DIRT);
                     }
-                    TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 0.1, 0.5));
+                    player.teleport(JoinBlock.getLocation().add(0.5, 0.1, 0.5));
-                    messages.send(player, MessageKey.LOCATION_FIX_UNDERGROUND);
+                    player.sendMessage("§a你被埋住了, 坐标已修正, 下次下线之前请小心!");
                     break;
                 }
                 if (i == MaxHeight) {
-                    TeleportUtils.teleport(player, JoinBlock.getLocation().add(0.5, 1.1, 0.5));
+                    player.teleport(JoinBlock.getLocation().add(0.5, 1.1, 0.5));
-                    messages.send(player, MessageKey.LOCATION_FIX_UNDERGROUND_CANT_FIX);
+                    player.sendMessage("§a你被埋住了, 坐标无法修正, 只好送你去了最高点, 自求多福吧少年~");
                 }
             }
         }
-
     }
 }

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

@@ -139,8 +139,7 @@ public class OnJoinVerifier implements Reloadable {
         }
         Player nonVipPlayer = generateKickPlayer(onlinePlayers);
         if (nonVipPlayer != null) {
-            // AuthMeReReloaded - Folia compatibility
+            nonVipPlayer.kickPlayer(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP));
-            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,7 @@
 package fr.xephi.authme.listener;
 
+import fr.xephi.authme.AuthMe;
+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;
@@ -16,12 +18,11 @@ import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
 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.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.TeleportUtils;
-import fr.xephi.authme.util.message.I18NUtils;
+import org.bukkit.Bukkit;
-import fr.xephi.authme.util.message.MiniMessageUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.HumanEntity;
@@ -31,6 +32,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+//import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -52,20 +54,27 @@ 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 static org.bukkit.Bukkit.getServer;
+
 import javax.inject.Inject;
 import java.util.Locale;
 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;
     @Inject
@@ -95,6 +104,7 @@ public class PlayerListener implements Listener {
     @Inject
     private QuickCommandsProtectionManager quickCommandsProtectionManager;
 
+
     // Lowest priority to apply fast protection checks
     @EventHandler(priority = EventPriority.LOWEST)
     public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) {
@@ -114,7 +124,7 @@ public class PlayerListener implements Listener {
         if (validationService.isUnrestricted(name)) {
             return;
         }
-        if (settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(HooksSettings.IGNORE_BEDROCK_NAME_CHECK)) {
+        if (settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER)) {
             if (getServer().getPluginManager().getPlugin("floodgate") != null) {
                 if (org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())) return;
             }
@@ -188,6 +198,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);
         }
@@ -214,7 +225,7 @@ public class PlayerListener implements Listener {
 
         String customJoinMessage = settings.getProperty(RegistrationSettings.CUSTOM_JOIN_MESSAGE);
         if (!customJoinMessage.isEmpty()) {
-            customJoinMessage = ChatColor.translateAlternateColorCodes('&', MiniMessageUtils.parseMiniMessageToLegacy(customJoinMessage));
+            customJoinMessage = ChatColor.translateAlternateColorCodes('&', customJoinMessage);
             event.setJoinMessage(customJoinMessage
                 .replace("{PLAYERNAME}", player.getName())
                 .replace("{DISPLAYNAME}", player.getDisplayName())
@@ -249,11 +260,6 @@ public class PlayerListener implements Listener {
             }
         }
 
-        // Remove data from locale map when player quit
-        if (settings.getProperty(PluginSettings.I18N_MESSAGES)) {
-            I18NUtils.removeLocale(player.getUniqueId());
-        }
-
         if (antiBotService.wasPlayerKicked(player.getName())) {
             return;
         }
@@ -319,8 +325,7 @@ public class PlayerListener implements Listener {
         final Player player = event.getPlayer();
         if (!quickCommandsProtectionManager.isAllowed(player.getName())) {
             event.setCancelled(true);
-            bukkitService.runTaskIfFolia(player, () -> player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK)));
+            player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK));
-            // AuthMeReReloaded - Folia compatibility
             return;
         }
         if (listenerService.shouldCancelEvent(player)) {
@@ -374,9 +379,17 @@ public class PlayerListener implements Listener {
         Location spawn = spawnLoader.getSpawnLocation(player);
         if (spawn != null && spawn.getWorld() != null) {
             if (!player.getWorld().equals(spawn.getWorld())) {
-                TeleportUtils.teleport(player,spawn);
+                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)) {
-                TeleportUtils.teleport(player,spawn);
+                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
+                    TeleportUtils.teleport(player,spawn);
+                } else {
+                    player.teleport(spawn);
+                }
             }
         }
     }
@@ -495,33 +508,21 @@ public class PlayerListener implements Listener {
         }
     }
 
-    @SuppressWarnings("all")
     private boolean isInventoryWhitelisted(InventoryView inventory) {
         if (inventory == null) {
             return false;
         }
         Set<String> whitelist = settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES);
-        if (whitelist.isEmpty()) {
-            return false;
-        }
         //append a string for String whitelist
-        String invName = ChatColor.stripColor(inventory.getTitle()).toLowerCase(Locale.ROOT);
+        return whitelist.contains(ChatColor.stripColor(inventory.getTitle()).toLowerCase(Locale.ROOT));
-        if (settings.getProperty(RestrictionSettings.STRICT_UNRESTRICTED_INVENTORIES_CHECK)) {
-            return whitelist.contains(invName);
-        }
-        for (String wl : whitelist) {
-            if (invName.contains(wl)) {
-                return true;
-            }
-        }
-        return false;
     }
 
     @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);
 
             /*
@@ -539,4 +540,12 @@ public class PlayerListener implements Listener {
             event.setCancelled(true);
         }
     }
+//    @EventHandler(priority = EventPriority.LOWEST)
+//    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+//        Player player = event.getPlayer();
+//        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
+//            return;
+//        event.setCancelled(true);
+//        Bukkit.dispatchCommand(event.getPlayer(), "help");
+//    }
 }

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

@@ -1,10 +1,24 @@
 package fr.xephi.authme.listener;
 
+import fr.xephi.authme.data.QuickCommandsProtectionManager;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.process.Management;
+import fr.xephi.authme.service.AntiBotService;
+import fr.xephi.authme.service.BukkitService;
+import fr.xephi.authme.service.JoinMessageService;
+import fr.xephi.authme.service.TeleportationService;
+import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.SpawnLoader;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
 import javax.inject.Inject;
 
@@ -12,14 +26,18 @@ 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"))
+            return;
+        event.setCancelled(true);
+        Bukkit.dispatchCommand(event.getPlayer(), "help");
+    }
 }

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

@@ -1,89 +0,0 @@
-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");
-        File playerDataOldFile = new File(playerDataFolder, File.separator + playerUUID + ".dat_old");
-
-        // 删除玩家数据文件
-        if (playerDataFile.exists()) {
-            playerDataFile.delete();
-        }
-        if (playerDataOldFile.exists()) {
-            playerDataOldFile.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/ServerListener.java

@@ -53,9 +53,6 @@ public class ServerListener implements Listener {
         } else if ("ProtocolLib".equalsIgnoreCase(pluginName)) {
             protocolLibService.disable();
             logger.warning("ProtocolLib has been disabled, unhooking packet adapters!");
-        } else if ("PlaceholderAPI".equalsIgnoreCase(pluginName)) {
-            pluginHookService.unhookPlaceholderApi();
-            logger.info("PlaceholderAPI has been disabled: unhooking placeholders");
         }
     }
 
@@ -77,8 +74,6 @@ public class ServerListener implements Listener {
             spawnLoader.loadCmiSpawn();
         } else if ("ProtocolLib".equalsIgnoreCase(pluginName)) {
             protocolLibService.setup();
-        } else if ("PlaceholderAPI".equalsIgnoreCase(pluginName)) {
-            pluginHookService.tryHookToPlaceholderApi();
         }
     }
 }

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

@@ -1,36 +0,0 @@
-package fr.xephi.authme.listener.protocollib;
-
-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.util.message.I18NUtils;
-
-import java.util.UUID;
-
-class I18NGetLocalePacketAdapter extends PacketAdapter {
-
-    I18NGetLocalePacketAdapter(AuthMe plugin) {
-        super(plugin, ListenerPriority.NORMAL, PacketType.Play.Client.SETTINGS);
-    }
-
-    @Override
-    public void onPacketReceiving(PacketEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.SETTINGS) {
-            String locale = event.getPacket().getStrings().read(0).toLowerCase();
-            UUID uuid = event.getPlayer().getUniqueId();
-
-            I18NUtils.addLocale(uuid, locale);
-        }
-    }
-
-    public void register() {
-        ProtocolLibrary.getProtocolManager().addPacketListener(this);
-    }
-
-    public void unregister() {
-        ProtocolLibrary.getProtocolManager().removePacketListener(this);
-    }
-}

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

@@ -34,6 +34,7 @@ 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;
 

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

@@ -9,9 +9,7 @@ import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -24,12 +22,10 @@ public class ProtocolLibService implements SettingsDependent {
     /* Packet Adapters */
     private InventoryPacketAdapter inventoryPacketAdapter;
     private TabCompletePacketAdapter tabCompletePacketAdapter;
-    private I18NGetLocalePacketAdapter i18nGetLocalePacketAdapter;
 
     /* Settings */
     private boolean protectInvBeforeLogin;
     private boolean denyTabCompleteBeforeLogin;
-    private boolean i18nMessagesSending;
 
     /* Service */
     private boolean isEnabled;
@@ -62,10 +58,6 @@ public class ProtocolLibService implements SettingsDependent {
                 logger.warning("WARNING! The denyTabComplete feature requires ProtocolLib! Disabling it...");
             }
 
-            if (i18nMessagesSending) {
-                logger.warning("WARNING! The i18n Messages feature requires ProtocolLib on lower version (< 1.15.2)! Disabling it...");
-            }
-
             this.isEnabled = false;
             return;
         }
@@ -92,16 +84,6 @@ public class ProtocolLibService implements SettingsDependent {
             tabCompletePacketAdapter = null;
         }
 
-        if (i18nMessagesSending) {
-            if (i18nGetLocalePacketAdapter == null) {
-                i18nGetLocalePacketAdapter = new I18NGetLocalePacketAdapter(plugin);
-                i18nGetLocalePacketAdapter.register();
-            }
-        } else if (i18nGetLocalePacketAdapter != null) {
-            i18nGetLocalePacketAdapter.unregister();
-            i18nGetLocalePacketAdapter = null;
-        }
-
         this.isEnabled = true;
     }
 
@@ -119,10 +101,6 @@ public class ProtocolLibService implements SettingsDependent {
             tabCompletePacketAdapter.unregister();
             tabCompletePacketAdapter = null;
         }
-        if (i18nGetLocalePacketAdapter != null) {
-            i18nGetLocalePacketAdapter.unregister();
-            i18nGetLocalePacketAdapter = null;
-        }
     }
 
     /**
@@ -142,7 +120,6 @@ public class ProtocolLibService implements SettingsDependent {
 
         this.protectInvBeforeLogin = settings.getProperty(RestrictionSettings.PROTECT_INVENTORY_BEFORE_LOGIN);
         this.denyTabCompleteBeforeLogin = settings.getProperty(RestrictionSettings.DENY_TABCOMPLETE_BEFORE_LOGIN);
-        this.i18nMessagesSending = settings.getProperty(PluginSettings.I18N_MESSAGES) && Utils.MAJOR_VERSION <= 15;
 
         //it was true and will be deactivated now, so we need to restore the inventory for every player
         if (oldProtectInventory && !protectInvBeforeLogin && inventoryPacketAdapter != null) {

src/main/java/fr/xephi/authme/mail/EmailService.java

@@ -158,7 +158,7 @@ public class EmailService {
         try {
             htmlEmail = sendMailSsl.initializeMail(email);
         } catch (EmailException e) {
-            logger.logException("Failed to create email for shutdown:", e);
+            logger.logException("Failed to create email for recovery code:", e);
             return;
         }
 

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

@@ -8,15 +8,12 @@ import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.FileUtils;
-import fr.xephi.authme.util.message.I18NUtils;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.io.File;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import static fr.xephi.authme.message.MessagePathHelper.DEFAULT_LANGUAGE;
 
@@ -36,7 +33,6 @@ public abstract class AbstractMessageFileHandler implements Reloadable {
 
     private String filename;
     private FileConfiguration configuration;
-    private Map<String, FileConfiguration> i18nConfiguration;
     private final String defaultFile;
 
     protected AbstractMessageFileHandler() {
@@ -50,7 +46,6 @@ public abstract class AbstractMessageFileHandler implements Reloadable {
         filename = createFilePath(language);
         File messagesFile = initializeFile(filename);
         configuration = YamlConfiguration.loadConfiguration(messagesFile);
-        i18nConfiguration = null;
     }
 
     protected String getLanguage() {
@@ -88,24 +83,6 @@ public abstract class AbstractMessageFileHandler implements Reloadable {
             : message;
     }
 
-    /**
-     * Returns the i18n message for the given key and given locale.
-     *
-     * @param key the key to retrieve the message for
-     * @param locale the locale that player client setting uses
-     * @return the message
-     */
-    public String getMessageByLocale(String key, String locale) {
-        if (locale == null || !settings.getProperty(PluginSettings.I18N_MESSAGES)) {
-            return getMessage(key);
-        }
-
-        String message = getI18nConfiguration(locale).getString(key);
-        return message == null
-            ? "Error retrieving message '" + key + "'"
-            : message;
-    }
-
     /**
      * Returns the message for the given key only if it exists,
      * i.e. without falling back to the default file.
@@ -117,27 +94,6 @@ public abstract class AbstractMessageFileHandler implements Reloadable {
         return configuration.getString(key);
     }
 
-    public FileConfiguration getI18nConfiguration(String locale) {
-        if (i18nConfiguration == null) {
-            i18nConfiguration = new ConcurrentHashMap<>();
-        }
-
-        locale = I18NUtils.localeToCode(locale, settings);
-
-        if (i18nConfiguration.containsKey(locale)) {
-            return i18nConfiguration.get(locale);
-        } else {
-            // Sync with reload();
-            String i18nFilename = createFilePath(locale);
-            File i18nMessagesFile = initializeFile(i18nFilename);
-            FileConfiguration config = YamlConfiguration.loadConfiguration(i18nMessagesFile);
-
-            i18nConfiguration.put(locale, config);
-
-            return config;
-        }
-    }
-
     /**
      * Creates the path to the messages file for the given language code.
      *

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

@@ -4,44 +4,13 @@ package fr.xephi.authme.message;
  * Keys for translatable messages managed by {@link Messages}.
  */
 public enum MessageKey {
-    /**
+    /** In order to use this command you must be authenticated! */
-     * You have been disconnected due to doubled login.
-     */
-    DOUBLE_LOGIN_FIX("double_login_fix.fix_message"),
-
-    /**
-     * You are stuck in portal during Login.
-     */
-    LOCATION_FIX_PORTAL("login_location_fix.fix_portal"),
-
-    /**
-     * You are stuck underground during Login.
-     */
-    LOCATION_FIX_UNDERGROUND("login_location_fix.fix_underground"),
-
-    /**
-     * You are stuck underground during Login, but we cant fix it.
-     */
-    LOCATION_FIX_UNDERGROUND_CANT_FIX("login_location_fix.cannot_fix_underground"),
-
-    /**
-     * Bedrock auto login success!
-     */
-    BEDROCK_AUTO_LOGGED_IN("bedrock_auto_login.success"),
-
-    /**
-     * In order to use this command you must be authenticated!
-     */
     DENIED_COMMAND("error.denied_command"),
 
-    /**
+    /** A player with the same IP is already in game! */
-     * A player with the same IP is already in game!
-     */
     SAME_IP_ONLINE("on_join_validation.same_ip_online"),
 
-    /**
+    /** In order to chat you must be authenticated! */
-     * In order to chat you must be authenticated!
-     */
     DENIED_CHAT("error.denied_chat"),
 
     /** AntiBot protection mode is enabled! You have to wait some minutes before joining the server. */

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

@@ -5,8 +5,6 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.util.expiring.Duration;
-import fr.xephi.authme.util.message.I18NUtils;
-import fr.xephi.authme.util.message.MiniMessageUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -122,16 +120,13 @@ public class Messages {
      * @return The message from the file
      */
     private String retrieveMessage(MessageKey key, CommandSender sender) {
-        String locale = sender instanceof Player
+        String message = messagesFileHandler.getMessage(key.getKey());
-            ? I18NUtils.getLocale((Player) sender)
-            : null;
-        String message = messagesFileHandler.getMessageByLocale(key.getKey(), locale);
         String displayName = sender.getName();
         if (sender instanceof Player) {
             displayName = ((Player) sender).getDisplayName();
         }
         
-        return ChatColor.translateAlternateColorCodes('&', MiniMessageUtils.parseMiniMessageToLegacy(message))
+        return ChatColor.translateAlternateColorCodes('&', message)
                 .replace(NEWLINE_TAG, "\n")
                 .replace(USERNAME_TAG, sender.getName())
                 .replace(DISPLAYNAME_TAG, displayName);
@@ -147,7 +142,7 @@ public class Messages {
     private String retrieveMessage(MessageKey key, String name) {
         String message = messagesFileHandler.getMessage(key.getKey());
         
-        return ChatColor.translateAlternateColorCodes('&', MiniMessageUtils.parseMiniMessageToLegacy(message))
+        return ChatColor.translateAlternateColorCodes('&', message)
                 .replace(NEWLINE_TAG, "\n")
                 .replace(USERNAME_TAG, name)
                 .replace(DISPLAYNAME_TAG, name);

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

@@ -149,9 +149,6 @@ public class MessageUpdater {
             .put("verification", "Verification code")
             .put("time", "Time units")
             .put("two_factor", "Two-factor authentication")
-            .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<>();
@@ -170,7 +167,7 @@ public class MessageUpdater {
 
         // Create ConfigurationData instance
         Map<String, List<String>> commentsMap = comments.entrySet().stream()
-            .collect(Collectors.toMap(Map.Entry::getKey, e -> singletonList(e.getValue())));
+            .collect(Collectors.toMap(e -> e.getKey(), e -> singletonList(e.getValue())));
         return new MessageKeyConfigurationData(builder, commentsMap);
     }
 

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

@@ -36,12 +36,4 @@ 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/process/join/AsynchronousJoin.java

@@ -17,9 +17,6 @@ import fr.xephi.authme.service.SessionService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
-import fr.xephi.authme.service.velocity.VMessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
-import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
@@ -29,6 +26,8 @@ import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 
 import javax.inject.Inject;
 import java.util.Locale;
@@ -46,9 +45,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
     @Inject
     private Server server;
 
-    @Inject
-    private Settings settings;
-
     @Inject
     private DataSource database;
 
@@ -79,9 +75,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
     @Inject
     private BungeeSender bungeeSender;
 
-    @Inject
-    private VelocitySender velocitySender;
-
     @Inject
     private ProxySessionManager proxySessionManager;
 
@@ -135,10 +128,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
 
             // Session logic
             if (sessionService.canResumeSession(player)) {
-                if (velocitySender.isEnabled()) {
-                    bukkitService.scheduleSyncDelayedTask(() ->
-                        velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), service.getProperty(HooksSettings.PROXY_SEND_DELAY));
-                }
                 service.send(player, MessageKey.SESSION_RECONNECTION);
                 // Run commands
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
@@ -163,11 +152,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
                 // As described at https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/
                 // "Keep in mind that you can't send plugin messages directly after a player joins."
                 bukkitService.scheduleSyncDelayedTask(() ->
-                    bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
+                    bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L);
-            }
-            if (velocitySender.isEnabled()) {
-                bukkitService.scheduleSyncDelayedTask(() ->
-                    velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
             }
             return;
         }
@@ -204,9 +189,7 @@ 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(bukkitService.createBlindnessEffect(blindTimeOut)));
             }
             commandManager.runCommandsOnJoin(player);
         });

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

@@ -26,8 +26,6 @@ import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.SessionService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
-import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.HooksSettings;
@@ -83,12 +81,9 @@ public class AsynchronousLogin implements AsynchronousProcess {
 
     @Inject
     private SessionService sessionService;
-    @Inject
+
-    private Settings settings;
     @Inject
     private BungeeSender bungeeSender;
-    @Inject
-    private VelocitySender velocitySender;
 
     AsynchronousLogin() {
     }
@@ -117,7 +112,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
      *
      * @param player the player to log in
      */
-    public synchronized void forceLogin(Player player) {
+    public void forceLogin(Player player) {
         PlayerAuth auth = getPlayerAuth(player);
         if (auth != null) {
             performLogin(player, auth);
@@ -311,7 +306,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
                 // As described at https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/
                 // "Keep in mind that you can't send plugin messages directly after a player joins."
                 bukkitService.scheduleSyncDelayedTask(() ->
-                    bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
+                    bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L);
             }
 
             // As the scheduling executes the Task most likely after the current

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

@@ -14,10 +14,7 @@ import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.JoinMessageService;
 import fr.xephi.authme.service.TeleportationService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
-import fr.xephi.authme.service.velocity.VMessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
-import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffectType;
@@ -33,9 +30,6 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
     @Inject
     private BungeeSender bungeeSender;
 
-    @Inject
-    private VelocitySender velocitySender;
-
     @Inject
     private LimboService limboService;
 
@@ -92,13 +86,6 @@ 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)
@@ -108,13 +95,6 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
             player.removePotionEffect(PotionEffectType.BLINDNESS);
         }
 
-        // AuthMeVelocity start - send on player login
-        if (velocitySender.isEnabled()) {
-            bukkitService.scheduleSyncDelayedTask(() ->
-                velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), commonService.getProperty(HooksSettings.PROXY_SEND_DELAY));
-        }
-        // AuthMeVelocity end
-
         // The Login event now fires (as intended) after everything is processed
         bukkitService.callEvent(new LoginEvent(player));
 

src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java

@@ -11,8 +11,7 @@ import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.SessionService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
-import fr.xephi.authme.service.velocity.VMessageType;
+import fr.xephi.authme.settings.properties.RestrictionSettings;
-import fr.xephi.authme.service.velocity.VelocitySender;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -43,8 +42,6 @@ public class AsynchronousLogout implements AsynchronousProcess {
 
     @Inject
     private BungeeSender bungeeSender;
-    @Inject
-    private VelocitySender velocitySender;
 
     AsynchronousLogout() {
     }
@@ -64,18 +61,17 @@ public class AsynchronousLogout implements AsynchronousProcess {
         PlayerAuth auth = playerCache.getAuth(name);
         database.updateSession(auth);
         // TODO: send an update when a messaging service will be implemented (SESSION)
-        //if (service.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
+        if (service.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
-        auth.setQuitLocation(player.getLocation());
+            auth.setQuitLocation(player.getLocation());
-        database.updateQuitLoc(auth);
+            database.updateQuitLoc(auth);
             // TODO: send an update when a messaging service will be implemented (QUITLOC)
-        //} AuthMeReReloaded - Always save quit location
+        }
 
         playerCache.removePlayer(name);
         codeManager.unverify(name);
         database.setUnlogged(name);
         sessionService.revokeSession(name);
         bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGOUT);
-        velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGOUT);
         syncProcessManager.processSyncPlayerLogout(player);
     }
 }

src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java

@@ -14,6 +14,8 @@ import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 
 import javax.inject.Inject;
 
@@ -73,7 +75,7 @@ public class ProcessSyncPlayerLogout implements SynchronousProcess {
         // Apply Blindness effect
         if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
             int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
-            player.addPotionEffect(bukkitService.createBlindnessEffect(timeout));
+            player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));
         }
 
         // Set player's data to unauthenticated

src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java

@@ -12,6 +12,7 @@ import fr.xephi.authme.service.SessionService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.PluginSettings;
+import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -67,16 +68,13 @@ public class AsynchronousQuit implements AsynchronousProcess {
         boolean wasLoggedIn = playerCache.isAuthenticated(name);
 
         if (wasLoggedIn) {
-            //if (service.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
+            if (service.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
-            // AuthMeReReloaded - Always save quit location on quit
+                Location loc = spawnLoader.getPlayerLocationOrSpawn(player);
-            Location loc = spawnLoader.getPlayerLocationOrSpawn(player);
+                PlayerAuth auth = PlayerAuth.builder()
-            PlayerAuth authLoc = PlayerAuth.builder()
+                    .name(name).location(loc)
-                .name(name).location(loc)
+                    .realName(player.getName()).build();
-                .realName(player.getName()).build();
+                database.updateQuitLoc(auth);
-            database.updateQuitLoc(authLoc);
+            }
-            // AuthMeReReloaded - Fix AuthMe#2769 -1
-            //}
-
 
             String ip = PlayerUtils.getPlayerIp(player);
             PlayerAuth auth = PlayerAuth.builder()

src/main/java/fr/xephi/authme/process/quit/ProcessSyncPlayerQuit.java

@@ -1,6 +1,5 @@
 package fr.xephi.authme.process.quit;
 
-import com.github.Anon8281.universalScheduler.UniversalScheduler;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
@@ -28,9 +27,7 @@ public class ProcessSyncPlayerQuit implements SynchronousProcess {
             commandManager.runCommandsOnLogout(player);
         } else {
             limboService.restoreData(player);
-            if (!UniversalScheduler.isFolia) { // AuthMeReReloaded - Fix #146 (Very stupid solution, but works)
+            player.saveData(); // #1238: Speed is sometimes not restored properly
-                // player.saveData(); // #1238: Speed is sometimes not restored properly
-            }
         }
         player.leaveVehicle();
     }

src/main/java/fr/xephi/authme/process/register/AsyncRegister.java

@@ -50,7 +50,7 @@ public class AsyncRegister implements AsynchronousProcess {
      * @param parameters the parameters
      * @param <P>        parameters type
      */
-    public synchronized <P extends RegistrationParameters> void register(RegistrationMethod<P> variant, P parameters) {
+    public <P extends RegistrationParameters> void register(RegistrationMethod<P> variant, P parameters) {
         if (preRegisterCheck(variant, parameters.getPlayer())) {
             RegistrationExecutor<P> executor = registrationExecutorFactory.getSingleton(variant.getExecutorClass());
             if (executor.isRegistrationAdmitted(parameters)) {

src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java

@@ -8,8 +8,6 @@ import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
-import fr.xephi.authme.service.velocity.VMessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.entity.Player;
 
@@ -30,8 +28,6 @@ public class ProcessSyncEmailRegister implements SynchronousProcess {
 
     @Inject
     private LimboService limboService;
-    @Inject
-    private VelocitySender velocitySender;
 
     ProcessSyncEmailRegister() {
     }
@@ -44,7 +40,7 @@ public class ProcessSyncEmailRegister implements SynchronousProcess {
     public void processEmailRegister(Player player) {
         service.send(player, MessageKey.ACCOUNT_NOT_ACTIVATED);
         limboService.replaceTasksAfterRegistration(player);
-        velocitySender.sendAuthMeVelocityMessage(player, VMessageType.REGISTER);
+
         bukkitService.callEvent(new RegisterEvent(player));
         logger.fine(player.getName() + " registered " + PlayerUtils.getPlayerIp(player));
     }

src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java

@@ -9,8 +9,6 @@ import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
-import fr.xephi.authme.service.velocity.VMessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
@@ -29,9 +27,6 @@ public class ProcessSyncPasswordRegister implements SynchronousProcess {
     @Inject
     private BungeeSender bungeeSender;
 
-    @Inject
-    private VelocitySender velocitySender;
-
     @Inject
     private CommonService service;
 
@@ -71,7 +66,7 @@ public class ProcessSyncPasswordRegister implements SynchronousProcess {
         if (!service.getProperty(EmailSettings.MAIL_ACCOUNT).isEmpty()) {
             service.send(player, MessageKey.ADD_EMAIL_MESSAGE);
         }
-        velocitySender.sendAuthMeVelocityMessage(player, VMessageType.REGISTER);
+
         bukkitService.callEvent(new RegisterEvent(player));
         logger.fine(player.getName() + " registered " + PlayerUtils.getPlayerIp(player));
 

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

@@ -10,7 +10,7 @@ import static fr.xephi.authme.process.register.executors.PlayerAuthBuilderHelper
 class PasswordRegisterExecutor extends AbstractPasswordRegisterExecutor<PasswordRegisterParams> {
 
     @Override
-    public synchronized PlayerAuth createPlayerAuthObject(PasswordRegisterParams params) {
+    public PlayerAuth createPlayerAuthObject(PasswordRegisterParams params) {
         return createPlayerAuth(params.getPlayer(), params.getHashedPassword(), params.getEmail());
     }
 

src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java

@@ -16,13 +16,13 @@ import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.TeleportationService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
-import fr.xephi.authme.service.velocity.VMessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 
 import javax.inject.Inject;
 
@@ -56,9 +56,6 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     @Inject
     private CommandManager commandManager;
 
-    @Inject
-    private VelocitySender velocitySender;
-
     @Inject
     private BungeeSender bungeeSender;
 
@@ -79,7 +76,6 @@ public class AsynchronousUnregister implements AsynchronousProcess {
             if (dataSource.removeAuth(name)) {
                 performPostUnregisterActions(name, player);
                 logger.info(name + " unregistered himself");
-                velocitySender.sendAuthMeVelocityMessage(player, VMessageType.UNREGISTER);
                 bukkitService.createAndCallEvent(isAsync -> new UnregisterByPlayerEvent(player, isAsync));
             } else {
                 service.send(player, MessageKey.ERROR);
@@ -101,8 +97,8 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     public void adminUnregister(CommandSender initiator, String name, Player player) {
         if (dataSource.removeAuth(name)) {
             performPostUnregisterActions(name, player);
-            if (player != null) velocitySender.sendAuthMeVelocityMessage(player, VMessageType.FORCE_UNREGISTER);
             bukkitService.createAndCallEvent(isAsync -> new UnregisterByAdminEvent(player, name, isAsync, initiator));
+
             if (initiator == null) {
                 logger.info(name + " was unregistered");
             } else {
@@ -148,7 +144,7 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     private void applyBlindEffect(Player player) {
         if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
             int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
-            bukkitService.runTaskIfFolia(player, () -> player.addPotionEffect(bukkitService.createBlindnessEffect(timeout)));
+            player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));
         }
     }
 

src/main/java/fr/xephi/authme/security/HashAlgorithm.java

@@ -32,7 +32,6 @@ public enum HashAlgorithm {
     WORDPRESS(fr.xephi.authme.security.crypts.Wordpress.class),
     XAUTH(fr.xephi.authme.security.crypts.XAuth.class),
     XFBCRYPT(fr.xephi.authme.security.crypts.XfBCrypt.class),
-    NOCRYPT(fr.xephi.authme.security.crypts.NoCrypt.class),
     CUSTOM(null),
 
     @Deprecated DOUBLEMD5(fr.xephi.authme.security.crypts.DoubleMd5.class),

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

@@ -1,15 +0,0 @@
-package fr.xephi.authme.security.crypts;
-
-import fr.xephi.authme.security.crypts.description.Recommendation;
-import fr.xephi.authme.security.crypts.description.Usage;
-
-@Deprecated
-@Recommendation(Usage.DEPRECATED)
-public class NoCrypt extends UnsaltedMethod {
-
-    @Override
-    public String computeHash(String password) {
-        return password;
-    }
-
-}

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

@@ -1,6 +1,5 @@
 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;
@@ -9,6 +8,7 @@ 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 MyScheduledTask disableTask;
+    private BukkitTask 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, (long) delay * TICKS_PER_SECOND);
+            bukkitService.scheduleSyncDelayedTask(enableTask, 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, (long) duration * TICKS_PER_MINUTE);
+        disableTask = bukkitService.runTaskLater(this::stopProtection, duration * TICKS_PER_MINUTE);
         antiBotStatus = AntiBotStatus.ACTIVE;
         bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
             // Inform admins

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

@@ -94,9 +94,6 @@ 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,8 +1,5 @@
 package fr.xephi.authme.service;
 
-import com.github.Anon8281.universalScheduler.UniversalRunnable;
-import com.github.Anon8281.universalScheduler.UniversalScheduler;
-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;
@@ -10,16 +7,14 @@ import fr.xephi.authme.settings.properties.PluginSettings;
 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.potion.PotionEffect;
+import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
 import java.util.Collection;
@@ -28,8 +23,6 @@ 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.
  */
@@ -39,8 +32,7 @@ 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 isFolia = UniversalScheduler.isFolia;
     private final AuthMe authMe;
     private boolean useAsyncTasks;
 
@@ -56,9 +48,10 @@ 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 void scheduleSyncDelayedTask(Runnable task) {
+    public int scheduleSyncDelayedTask(Runnable task) {
-        runTask(task);
+        return Bukkit.getScheduler().scheduleSyncDelayedTask(authMe, task);
     }
 
     /**
@@ -66,15 +59,12 @@ public class BukkitService implements SettingsDependent {
      * <p>
      * This task will be executed by the main server thread.
      *
-     * @param task  Task to be executed
+     * @param task Task to be executed
      * @param delay Delay in server ticks before executing task
+     * @return Task id number (-1 if scheduling failed)
      */
-    public void scheduleSyncDelayedTask(Runnable task, long delay) {
+    public int scheduleSyncDelayedTask(Runnable task, long delay) {
-        if (isFolia) {
+        return Bukkit.getScheduler().scheduleSyncDelayedTask(authMe, task, delay);
-            runTaskLater(task, delay);
-        } else {
-            Bukkit.getScheduler().runTaskLater(authMe, task, delay); // We must do this to keep compatibility
-        }
     }
 
     /**
@@ -86,7 +76,7 @@ public class BukkitService implements SettingsDependent {
      */
     public void scheduleSyncTaskFromOptionallyAsyncTask(Runnable task) {
         if (Bukkit.isPrimaryThread()) {
-            runTask(task);
+            task.run();
         } else {
             scheduleSyncDelayedTask(task);
         }
@@ -96,81 +86,26 @@ 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 void runTask(Runnable task) {
+    public BukkitTask runTask(Runnable task) {
-        if (isFolia) {
+        return Bukkit.getScheduler().runTask(authMe, task);
-            getScheduler().runTask(task);
-        } else {
-            Bukkit.getScheduler().runTask(authMe, task);
-        }
-    }
-
-    public void runTask(Entity entity, Runnable task) {
-        if (isFolia) {
-            getScheduler().runTask(entity, task);
-        } else {
-            Bukkit.getScheduler().runTask(authMe, 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 (isFolia) {
-            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 (isFolia) {
-            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 (isFolia) {
-            runTask(location, task);
-        } else {
-            task.run();
-        }
     }
 
     /**
      * Returns a task that will run after the specified number of server
      * ticks.
      *
-     * @param task  the task to be run
+     * @param task the task to be run
      * @param delay the ticks to wait before running the task
      * @return a BukkitTask that contains the id number
      * @throws IllegalArgumentException if plugin is null
      * @throws IllegalArgumentException if task is null
      */
-    public MyScheduledTask runTaskLater(Runnable task, long delay) {
+    public BukkitTask runTaskLater(Runnable task, long delay) {
-        return getScheduler().runTaskLater(task, delay);
+        return Bukkit.getScheduler().runTaskLater(authMe, task, delay);
-    }
-
-    public MyScheduledTask runTaskLater(Entity entity, Runnable task, long delay) {
-        return getScheduler().runTaskLater(entity, task, delay);
     }
 
     /**
@@ -183,7 +118,7 @@ public class BukkitService implements SettingsDependent {
         if (useAsyncTasks) {
             runTaskAsynchronously(task);
         } else {
-            runTask(task);
+            task.run();
         }
     }
 
@@ -194,15 +129,12 @@ 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 void runTaskAsynchronously(Runnable task) {
+    public BukkitTask runTaskAsynchronously(Runnable task) {
-        if (isFolia) {
+        return Bukkit.getScheduler().runTaskAsynchronously(authMe, task);
-            getScheduler().runTaskAsynchronously(task);
-        } else {
-            Bukkit.getScheduler().runTaskAsynchronously(authMe, task);
-        }
     }
 
     /**
@@ -220,7 +152,7 @@ public class BukkitService implements SettingsDependent {
      * @throws IllegalArgumentException if task is null
      * @throws IllegalStateException if this was already scheduled
      */
-    public MyScheduledTask runTaskTimerAsynchronously(UniversalRunnable task, long delay, long period) {
+    public BukkitTask runTaskTimerAsynchronously(BukkitRunnable task, long delay, long period) {
         return task.runTaskTimerAsynchronously(authMe, delay, period);
     }
 
@@ -228,14 +160,14 @@ public class BukkitService implements SettingsDependent {
      * Schedules the given task to repeatedly run until cancelled, starting after the
      * specified number of server ticks.
      *
-     * @param task   the task to schedule
+     * @param task the task to schedule
-     * @param delay  the ticks to wait before running the task
+     * @param delay the ticks to wait before running the task
      * @param period the ticks to wait between runs
      * @return a BukkitTask that contains the id number
      * @throws IllegalArgumentException if plugin is null
-     * @throws IllegalStateException    if this was already scheduled
+     * @throws IllegalStateException if this was already scheduled
      */
-    public MyScheduledTask runTaskTimer(UniversalRunnable task, long delay, long period) {
+    public BukkitTask runTaskTimer(BukkitRunnable task, long delay, long period) {
         return task.runTaskTimer(authMe, delay, period);
     }
 
@@ -329,16 +261,6 @@ public class BukkitService implements SettingsDependent {
         return event;
     }
 
-    /**
-     * Creates a PotionEffect with blindness for the given duration in ticks.
-     *
-     * @param timeoutInTicks duration of the effect in ticks
-     * @return blindness potion effect
-     */
-    public PotionEffect createBlindnessEffect(int timeoutInTicks) {
-        return new PotionEffect(PotionEffectType.BLINDNESS, timeoutInTicks, 2);
-    }
-
     /**
      * Gets the world with the given name.
      *
@@ -385,21 +307,6 @@ public class BukkitService implements SettingsDependent {
         player.sendPluginMessage(authMe, "BungeeCord", bytes);
     }
 
-    /**
-     * Send the specified bytes to bungeecord using the specified player connection.
-     *
-     * @param player the player
-     * @param bytes the message
-     */
-    public void sendVelocityMessage(Player player, byte[] bytes) {
-        if (player != null) {
-            player.sendPluginMessage(authMe, "authmevelocity:main", bytes);
-        } else {
-            Bukkit.getServer().sendPluginMessage(authMe, "authmevelocity:main", bytes);
-        }
-    }
-
-
     /**
      * Adds a ban to the list. If a previous ban exists, this will
      * update the previous entry.

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

@@ -1,6 +1,9 @@
 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;
@@ -10,16 +13,32 @@ 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 {
 
@@ -37,7 +56,7 @@ public class GeoIpService {
     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

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

@@ -6,8 +6,6 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
-import fr.xephi.authme.service.hook.papi.AuthMeExpansion;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -28,8 +26,6 @@ public class PluginHookService {
     private Essentials essentials;
     private Plugin cmi;
     private MultiverseCore multiverse;
-    private PlaceholderAPIPlugin placeholderApi;
-    private AuthMeExpansion authMeExpansion;
 
     /**
      * Constructor.
@@ -42,7 +38,6 @@ public class PluginHookService {
         tryHookToEssentials();
         tryHookToCmi();
         tryHookToMultiverse();
-        tryHookToPlaceholderApi();
     }
 
     /**
@@ -138,20 +133,6 @@ public class PluginHookService {
         }
     }
 
-    /**
-     * Attempts to create a hook into PlaceholderAPI.
-     */
-    public void tryHookToPlaceholderApi() {
-        try {
-            placeholderApi = getPlugin(pluginManager, "PlaceholderAPI", PlaceholderAPIPlugin.class);
-            authMeExpansion = new AuthMeExpansion();
-            authMeExpansion.register();
-        } catch (Exception | NoClassDefFoundError ignored) {
-            placeholderApi = null;
-            authMeExpansion = null;
-        }
-    }
-
     /**
      * Attempts to create a hook into CMI.
      */
@@ -199,16 +180,6 @@ public class PluginHookService {
         multiverse = null;
     }
 
-    /**
-     * Unhooks from PlaceholderAPI.
-     */
-    public void unhookPlaceholderApi() {
-        if (placeholderApi != null) {
-            authMeExpansion.unregister();
-            placeholderApi = null;
-        }
-    }
-
     // ------
     // Helpers
     // ------

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

@@ -14,7 +14,6 @@ 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.util.TeleportUtils;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -141,11 +140,8 @@ 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)) {
+            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) {
                 Location location = buildLocationFromAuth(player, auth);
-                Location playerLoc = player.getLocation();
-                if (location.getX() == playerLoc.getX() && location.getY() == playerLoc.getY() && location.getZ() == playerLoc.getZ()
-                && location.getWorld() == playerLoc.getWorld()) return;
                 logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
                 teleportBackFromSpawn(player, location);
             } else if (limbo != null && limbo.getLocation() != null) {
@@ -189,7 +185,7 @@ public class TeleportationService implements Reloadable {
         bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
             bukkitService.callEvent(event);
             if (player.isOnline() && isEventValid(event)) {
-                TeleportUtils.teleport(player, event.getTo());
+                player.teleport(event.getTo());
             }
         });
     }

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

@@ -22,16 +22,19 @@ import fr.xephi.authme.util.Utils;
 import org.bukkit.command.CommandSender;
 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.ProtocolException;
 import java.net.URL;
+import java.util.Arrays;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 
 import static fr.xephi.authme.util.StringUtils.isInsideString;
@@ -272,9 +275,10 @@ public class ValidationService implements Reloadable {
             }
             return new HaveIBeenPwnedResults(false, 0);
         } catch (java.io.IOException e) {
-            logger.warning("Error occurred while checking password online, check your connection.\nWhen this error shows, the player's password won't be check");
+            logger.warning("验证密码时出现错误,这可能是由于网络问题,如果无法解决,请关闭HaveIBeenPwned检查");
-            return null;
         }
+
+        return null;
     }
 
 

src/main/java/fr/xephi/authme/service/hook/papi/AuthMeExpansion.java

@@ -1,72 +0,0 @@
-package fr.xephi.authme.service.hook.papi;
-
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.HooksSettings;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * AuthMe PlaceholderAPI expansion class.
- * @author Kobe 8
- */
-public class AuthMeExpansion extends PlaceholderExpansion {
-    private final Settings settings = AuthMe.settings;
-    @Override
-    public @NotNull String getIdentifier() {
-        return "authme";
-    }
-
-    @Override
-    public @NotNull String getAuthor() {
-        return "HaHaWTH";
-    }
-
-    @Override
-    public @NotNull String getVersion() {
-        return AuthMe.getPluginVersion();
-    }
-
-    @Override
-    public boolean persist() {
-        return true;
-    }
-
-    @Override
-    public String onRequest(OfflinePlayer player, @NotNull String params) {
-        if (!settings.getProperty(HooksSettings.PLACEHOLDER_API)) return null;
-        AuthMeApi authMeApi = AuthMeApi.getInstance();
-        if (authMeApi == null) return null;
-        if (params.equalsIgnoreCase("version")) {
-            return getVersion();
-        }
-        if (params.equalsIgnoreCase("is_registered")) {
-            if (player != null) {
-                Player onlinePlayer = player.getPlayer();
-                if (onlinePlayer != null) {
-                    return String.valueOf(authMeApi.isRegistered(onlinePlayer.getName()));
-                }
-            }
-        }
-        if (params.equalsIgnoreCase("is_authenticated")) {
-            if (player != null) {
-                Player onlinePlayer = player.getPlayer();
-                if (onlinePlayer != null) {
-                    return String.valueOf(authMeApi.isAuthenticated(onlinePlayer));
-                }
-            }
-        }
-        if (params.equalsIgnoreCase("last_login_time")) {
-            if (player != null) {
-                Player onlinePlayer = player.getPlayer();
-                if (onlinePlayer != null) {
-                    return authMeApi.getLastLoginTime(onlinePlayer.getName()).toString();
-                }
-            }
-        }
-        return null;
-    }
-}

src/main/java/fr/xephi/authme/service/velocity/VMessageType.java

@@ -1,5 +0,0 @@
-package fr.xephi.authme.service.velocity;
-
-public enum VMessageType {
-    LOGIN, REGISTER, LOGOUT, FORCE_UNREGISTER, UNREGISTER
-}

src/main/java/fr/xephi/authme/service/velocity/VelocityReceiver.java

@@ -1,89 +0,0 @@
-package fr.xephi.authme.service.velocity;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.data.ProxySessionManager;
-import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
-import fr.xephi.authme.process.Management;
-import fr.xephi.authme.service.BukkitService;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.HooksSettings;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.Messenger;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-
-import javax.inject.Inject;
-
-public class VelocityReceiver implements PluginMessageListener, SettingsDependent {
-
-    private final ConsoleLogger logger = ConsoleLoggerFactory.get(VelocityReceiver.class);
-
-    private final AuthMe plugin;
-    private final BukkitService bukkitService;
-    private final ProxySessionManager proxySessionManager;
-    private final Management management;
-
-    private boolean isEnabled;
-
-    @Inject
-    VelocityReceiver(AuthMe plugin, BukkitService bukkitService, ProxySessionManager proxySessionManager,
-                   Management management, Settings settings) {
-        this.plugin = plugin;
-        this.bukkitService = bukkitService;
-        this.proxySessionManager = proxySessionManager;
-        this.management = management;
-        reload(settings);
-    }
-
-    @Override
-    public void reload(Settings settings) {
-        this.isEnabled = settings.getProperty(HooksSettings.VELOCITY);
-        if (this.isEnabled) {
-            final Messenger messenger = plugin.getServer().getMessenger();
-            if (!messenger.isIncomingChannelRegistered(plugin, "authmevelocity:main")) {
-                messenger.registerIncomingPluginChannel(plugin, "authmevelocity:main", this);
-            }
-        }
-    }
-
-
-    @Override
-    public void onPluginMessageReceived(String channel, Player player, byte[] bytes) {
-        if (!isEnabled) {
-            return;
-        }
-
-        if (channel.equals("authmevelocity:main")) {
-            final ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
-
-            final String data = in.readUTF();
-            final String username = in.readUTF();
-            processData(username, data);
-            logger.debug("PluginMessage | AuthMeVelocity identifier processed");
-        }
-    }
-
-    private void processData(String username, String data) {
-        if (VMessageType.LOGIN.toString().equals(data)) {
-            performLogin(username);
-        }
-    }
-
-    private void performLogin(String name) {
-        Player player = bukkitService.getPlayerExact(name);
-        if (player != null && player.isOnline()) {
-            management.forceLogin(player, true);
-            logger.info("The user " + player.getName() + " has been automatically logged in, "
-                + "as requested via plugin messaging.");
-        } else {
-            proxySessionManager.processProxySessionMessage(name);
-            logger.info("The user " + name + " should be automatically logged in, "
-                + "as requested via plugin messaging but has not been detected, nickname has been"
-                + " added to autologin queue.");
-        }
-    }
-
-}

src/main/java/fr/xephi/authme/service/velocity/VelocitySender.java

@@ -1,76 +0,0 @@
-package fr.xephi.authme.service.velocity;
-
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
-import fr.xephi.authme.service.BukkitService;
-import fr.xephi.authme.service.bungeecord.MessageType;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.HooksSettings;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.Messenger;
-
-import javax.inject.Inject;
-
-public class VelocitySender implements SettingsDependent {
-
-    private final ConsoleLogger logger = ConsoleLoggerFactory.get(VelocitySender.class);
-    private final AuthMe plugin;
-    private final BukkitService bukkitService;
-
-    private boolean isEnabled;
-
-    /*
-     * Constructor.
-     */
-    @Inject
-    VelocitySender(AuthMe plugin, BukkitService bukkitService, Settings settings) {
-        this.plugin = plugin;
-        this.bukkitService = bukkitService;
-        reload(settings);
-    }
-
-    @Override
-    public void reload(Settings settings) {
-        this.isEnabled = settings.getProperty(HooksSettings.VELOCITY);
-
-        if (this.isEnabled) {
-            Messenger messenger = plugin.getServer().getMessenger();
-            if (!messenger.isOutgoingChannelRegistered(plugin, "authmevelocity:main")) {
-                messenger.registerOutgoingPluginChannel(plugin, "authmevelocity:main");
-            }
-        }
-    }
-
-    public boolean isEnabled() {
-        return isEnabled;
-    }
-
-    private void sendForwardedVelocityMessage(Player player, VMessageType type, String playerName) {
-        ByteArrayDataOutput out = ByteStreams.newDataOutput();
-        out.writeUTF(type.toString());
-        out.writeUTF(playerName);
-        bukkitService.sendVelocityMessage(player, out.toByteArray());
-    }
-
-    /**
-     * Sends a message to the AuthMe plugin messaging channel, if enabled.
-     *
-     * @param player     The player related to the message
-     * @param type       The message type, See {@link MessageType}
-     */
-    public void sendAuthMeVelocityMessage(Player player, VMessageType type) {
-        if (!isEnabled) {
-            return;
-        }
-        if (!plugin.isEnabled()) {
-            logger.debug("Tried to send a " + type + " velocity message but the plugin was disabled!");
-            return;
-        }
-        sendForwardedVelocityMessage(player, type, player.getName());
-    }
-
-}

src/main/java/fr/xephi/authme/settings/SettingsWarner.java

@@ -61,7 +61,7 @@ public class SettingsWarner {
 
         // Warn if spigot.yml has settings.bungeecord set to true but config.yml has Hooks.bungeecord set to false
         if (isTrue(bukkitService.isBungeeCordConfiguredForSpigot())
-            && !settings.getProperty(HooksSettings.BUNGEECORD) && !settings.getProperty(HooksSettings.VELOCITY)) {
+            && !settings.getProperty(HooksSettings.BUNGEECORD)) {
             logger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in"
                 + " bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the"
                 + " AuthMeBungee add-on to work properly you have to enable this option!");

src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java

@@ -129,9 +129,9 @@ public class CommandManager implements Reloadable {
             if (predicate.test(cmd)) {
                 long delay = cmd.getDelay();
                 if (delay > 0) {
-                    bukkitService.runTaskLater(player, () -> dispatchCommand(player, cmd), delay);
+                    bukkitService.scheduleSyncDelayedTask(() -> dispatchCommand(player, cmd), delay);
                 } else {
-                    bukkitService.runTaskIfFolia(player, () -> dispatchCommand(player, cmd));
+                    dispatchCommand(player, cmd);
                 }
             }
         }

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

@@ -8,6 +8,19 @@ import ch.jalu.configme.properties.Property;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
 public final class ConverterSettings implements SettingsHolder {
+
+    @Comment("Rakamak file name")
+    public static final Property<String> RAKAMAK_FILE_NAME =
+        newProperty("Converter.Rakamak.fileName", "users.rak");
+
+    @Comment("Rakamak use IP?")
+    public static final Property<Boolean> RAKAMAK_USE_IP =
+        newProperty("Converter.Rakamak.useIP", false);
+
+    @Comment("Rakamak IP file name")
+    public static final Property<String> RAKAMAK_IP_FILE_NAME =
+        newProperty("Converter.Rakamak.ipFileName", "UsersIp.rak");
+
     @Comment("CrazyLogin database file name")
     public static final Property<String> CRAZYLOGIN_FILE_NAME =
         newProperty("Converter.CrazyLogin.fileName", "accounts.db");

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: H2, SQLITE, MARIADB, MYSQL, POSTGRESQL"})
+        "Valid values: SQLITE, MARIADB, MYSQL, POSTGRESQL"})
     public static final Property<DataSourceType> BACKEND =
         newProperty(DataSourceType.class, "DataSource.backend", DataSourceType.SQLITE);
 
@@ -19,10 +19,6 @@ public final class DatabaseSettings implements SettingsHolder {
     public static final Property<Boolean> USE_CACHING =
         newProperty("DataSource.caching", true);
 
-    @Comment("Should we try to use VirtualThreads(Java 21+) for database cache loader?")
-    public static final Property<Boolean> USE_VIRTUAL_THREADS =
-        newProperty("DataSource.useVirtualThreadsCache", false);
-
     @Comment("Database host address")
     public static final Property<String> MYSQL_HOST =
         newProperty("DataSource.mySQLHost", "127.0.0.1");
@@ -31,17 +27,7 @@ public final class DatabaseSettings implements SettingsHolder {
     public static final Property<String> MYSQL_PORT =
         newProperty("DataSource.mySQLPort", "3306");
 
-    @Comment({"Replacement of Mysql's useSsl (for MariaDB only).",
+    @Comment("Connect to MySQL database over SSL")
-        "- disable: No SSL",
-        "- trust: Trust blindly (no validation)",
-        "- verify_ca:  Encryption, certificates validation, BUT no hostname verification",
-        "- verify_full: Encryption, certificate validation and hostname validation",
-        "Read more: https://bit.ly/mariadb-sslmode"})
-    public static final Property<String> MARIADB_SSL_MODE =
-        newProperty("DataSource.MariaDbSslMode", "disabled");
-
-    @Comment({"Connect to MySQL database over SSL",
-        "If you're using MariaDB, use sslMode instead"})
     public static final Property<Boolean> MYSQL_USE_SSL =
         newProperty("DataSource.mySQLUseSSL", true);
 
@@ -49,13 +35,12 @@ public final class DatabaseSettings implements SettingsHolder {
         "We would not recommend to set this option to false.",
         "Set this option to false at your own risk if and only if you know what you're doing"})
     public static final Property<Boolean> MYSQL_CHECK_SERVER_CERTIFICATE =
-        newProperty( "DataSource.mySQLCheckServerCertificate", true);
+        newProperty( "DataSource.mySQLCheckServerCertificate", true );
 
     @Comment({"Authorize client to retrieve RSA server public key.",
-        "Advanced option, ignore if you don't know what it means.",
+        "Advanced option, ignore if you don't know what it means."})
-        "If you are using MariaDB, use MariaDbSslMode instead."})
     public static final Property<Boolean> MYSQL_ALLOW_PUBLIC_KEY_RETRIEVAL =
-        newProperty( "DataSource.mySQLAllowPublicKeyRetrieval", true);
+        newProperty( "DataSource.mySQLAllowPublicKeyRetrieval", true );
 
     @Comment("Username to connect to the MySQL database")
     public static final Property<String> MYSQL_USERNAME =

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

@@ -15,33 +15,14 @@ public final class HooksSettings implements SettingsHolder {
     public static final Property<Boolean> MULTIVERSE =
         newProperty("Hooks.multiverse", true);
 
-    @Comment("Do we need to hook with PlaceholderAPI for AuthMe placeholders?")
-    public static final Property<Boolean> PLACEHOLDER_API =
-        newProperty("Hooks.placeholderapi", false);
-
     @Comment("Do we need to hook with BungeeCord?")
     public static final Property<Boolean> BUNGEECORD =
         newProperty("Hooks.bungeecord", false);
-    @Comment("Do we need to hook with Velocity?")
-    public static final Property<Boolean> VELOCITY =
-        newProperty("Hooks.velocity", false);
 
-    @Comment({"How many ticks should we wait before sending login info to proxy?",
+    @Comment("Allow FloodGatePlayer Join Without checkIsValidName()")
-        "Change this to higher if your player has high ping.",
-        "See: https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/"})
-    public static final Property<Long> PROXY_SEND_DELAY =
-        newProperty("Hooks.proxySendDelay", 10L);
-
-    @Comment({"Hook into floodgate.",
-        "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("Allow bedrock players join without check isValidName?")
-    public static final Property<Boolean> IGNORE_BEDROCK_NAME_CHECK =
-        newProperty("Hooks.ignoreBedrockNameCheck", true);
-
 
     @Comment("Send player to this BungeeCord server after register/login")
     public static final Property<String> BUNGEECORD_SERVER =