Remove validation test since y coordinate is always set

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,10 +47,8 @@ body:
       description: Which server implementation are you using?
       multiple: false
       options:
-        - Standalone(Spigot)
-        - Standalone(Folia)
+        - Standalone server (no proxy)
         - 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

@@ -9,8 +9,6 @@ updates:
   - dependency-name: com.google.code.gson:gson
   - 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
+  - dependency-name: "org.mockito:mockito-core"
     versions: ">= 5"
-  - dependency-name: "org.slf4j:slf4j-simple"
-    versions: ">= 1.7.36"
+  - dependency-name: ch.jalu:configme

.github/workflows/maven.yml

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

.gitignore

@@ -21,10 +21,9 @@ hs_err_pid*
 
 # Ignore IDEA directory
 .idea/*
-.idea/
-
 
 # Include the project's code style settings file
+!.idea/codeStyleSettings.xml
 
 # File-based project format:
 *.ipr
@@ -114,4 +113,3 @@ nb-configuration.xml
 ### Git ###
 # Don't exclude the .gitignore itself
 !.gitignore
-/samples/

.idea/.gitignore

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

.travis.yml

@@ -4,12 +4,8 @@ language: java
 
 matrix:
   include:
-  - env:
-    - JDK_VERSION=8
   - env:
     - JDK_VERSION=11
-  - env:
-    - JDK_VERSION=17
 
 before_install:
   - "[[ -d $HOME/.sdkman/ ]] && [[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"

LICENSE

@@ -1,21 +1,23 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       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
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
   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
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+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.
-
-  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.
+  13. Use with the GNU Affero General Public License.
 
   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
-3 of the GNU General Public License.
+but the special requirements of the GNU Affero 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
-will be similar in spirit to the present version, but may differ in detail to
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU 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.>
-    Copyright (C) <year>  <name of author>
+    {one line to give the program's name and a brief idea of what it does.}
+    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
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU 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
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    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
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    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
-<https://www.gnu.org/licenses/>.
+For more information on this, and how to apply and follow the GNU GPL, see
+<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,56 +1,141 @@
-# AuthMeReReloaded
-**"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
+# AuthMeReloaded
+**"The best authentication plugin for the Bukkit modding API!"**
 
-[English](https://github.com/HaHaWTH/AuthMeReReloaded) | [简体中文](https://github.com/HaHaWTH/AuthMeReReloaded/blob/master/README-zh.md)
+<img src="wallpaper.png?raw=true" alt="AuthMeLogo"/>
 
-![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>
+| Type              | Badges                                                                                                                                                                                                                                                                                                                                                                                |
+|-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Code quality:** | [![Code Climate](https://codeclimate.com/github/AuthMe/AuthMeReloaded/badges/gpa.svg)](https://codeclimate.com/github/AuthMe/AuthMeReloaded) [![Coverage status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master)                                                 |
+| **Jenkins CI:**   | [![Jenkins Status](https://img.shields.io/website-up-down-green-red/http/shields.io.svg?label=ci.codemc.org)](https://ci.codemc.org/) [![Build Status](https://ci.codemc.org/buildStatus/icon?job=AuthMe/AuthMeReloaded)](https://ci.codemc.org/job/AuthMe/job/AuthMeReloaded) ![Build Tests](https://img.shields.io/jenkins/t/https/ci.codemc.org/job/AuthMe/job/AuthMeReloaded.svg) |
+| **Other CIs:**    | [![Build Status](https://www.travis-ci.com/AuthMe/AuthMeReloaded.svg?branch=master)](https://www.travis-ci.com/AuthMe/AuthMeReloaded)                                                                                                                                                                                                                                                             |
 
-**Detailed Changes:**
- 1. Improved mail sending logic & support more emails
- 2. Shutdown mail sending(When server is closed, email you)
- 3. Legacy bug fixes
- 4. Anti Ghost Player(Doubled login bug)
- 5. Use the best performance method by server brand
- 6. Bedrock Compatibility(Floodgate needed)(based on UUID)
- 7. Update checker
- 8. Integrated GUI Captcha feature(Bedrock compatibility & ProtocolLib needed)(70% Asynchronous)
- 9. Improved listeners
- 10. Player login logic improvement to reduce lag
- 11. Automatically purge bot data
- 12. **Folia support (in active testing)**
- 13. Offhand Menu compatibility(Thats amazing)
- 14. **Velocity support (See [Velocity Support](./vc-support.md))**
- 15. Support Virtual Threads caching
- 16. Automatically fix portal stuck issue
- 17. Automatically login for Bedrock players(configurable)
- 18. Fix shulker box crash bug on legacy versions(MC 1.13-)
- 19. **H2 database support**
- 20. **100% compatibility with original authme and extensions**
- 21. More......
+## Description
 
-**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)
+Prevent username stealing on your server!<br>
+Use it to secure your Offline mode server or to increase your Online mode server's protection!
 
-If you are using FRP(内网穿透) for your server, this plugin may help [HAProxy-Detector](https://github.com/HaHaWTH/HAProxy-Detector)
+AuthMeReloaded disallows players who aren't authenticated to do actions like placing blocks, moving,<br>
+typing commands or using the inventory. It can also kick players with uncommonly long or short player names or kick players from banned countries.
 
-**Pull Requests and suggestions are welcome!**
+With the Session Login feature you don't have to execute the authentication command every time you connect to the server! 
+Each command and every feature can be enabled or disabled from our well structured configuration file.
 
-<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>
+You can also create your own translation file and, if you want, you can share it with us! :)
+
+#### Features:
+<ul>
+  <li><strong>E-Mail Recovery System!</strong></li>
+  <li>Username spoofing protection.</li>
+  <li>Countries Whitelist/Blacklist! <a href="https://dev.maxmind.com/geoip/legacy/codes/iso3166/">(country codes)</a></li>
+  <li><strong>Built-in AntiBot System!</strong></li>
+  <li><strong>ForceLogin Feature: Admins can login with all account via console command!</strong></li>
+  <li><strong>Avoid the "Logged in from another location" message!</strong></li>
+  <li>Two-factor (2FA) support!</li>
+  <li>Session Login!</li>
+  <li>Editable translations and messages!</li>
+  <li><strong>MySQL and SQLite Backend support!</strong></li>
+  <li>Supported password encryption algorithms: SHA256, ARGON2, BCRYPT, PBKDF2, <a href="https://github.com/CypherX/xAuth/wiki/Password-Hashing">xAuth</a></li>
+  <li>Supported alternative registration methods:<br>
+  <ul>
+    <li>PHPBB, VBulletin: PHPBB - MD5VB</li>
+    <li>Xenforo: XFBCRYPT</li>
+    <li>MyBB: MYBB</li>
+    <li>IPB3: IPB3</li>
+    <li>IPB4: IPB4</li>
+    <li>PhpFusion: PHPFUSION</li>
+    <li>Joomla: JOOMLA</li>
+    <li>WBB3: WBB3*</li>
+    <li>SHA512: SALTEDSHA512</li>
+    <li>DoubleSaltedMD5: SALTED2MD5</li>
+    <li>WordPress: WORDPRESS</li>
+    <li><a href="https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/hash_algorithms.md">List of all supported hashes</a></li>
+  </ul></li>
+  <li>Custom MySQL tables/columns names (useful with forum databases)</li>
+  <li><strong>Cached database queries!</strong></li>
+  <li><strong>Fully compatible with Citizens2, CombatTag, CombatTagPlus!</strong></li>
+  <li>Compatible with Minecraft mods like <strong>BuildCraft or RedstoneCraft</strong></li>
+  <li>Restricted users (associate a username with an IP)</li>
+  <li>Protect player's inventory until correct authentication (requires ProtocolLib)</li>
+  <li>Saves the quit location of the player</li>
+  <li>Automatic database backup</li>
+  <li>Available languages: <a href="https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/translations.md">translations</a></li>
+  <li>Built-in Deprecated FlatFile (auths.db) to SQL (authme.sql) converter!</li>
+  <li><strong>Import your old database from other plugins like Rakamak, xAuth, CrazyLogin, RoyalAuth and vAuth!</strong></li>
+</ul>
+
+#### Configuration
+[How to configure AuthMe](https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/config.md)
+#### Commands
+[Command list and usage](https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/commands.md)
+#### Permissions
+- authme.player.* - for all user commands
+- authme.admin.* - for all admin commands
+- [List of all permission nodes](http://github.com/AuthMe/AuthMeReloaded/blob/master/docs/permission_nodes.md)
+
+#### How To
+- [How to use the converter](https://github.com/AuthMe/AuthMeReloaded/wiki/Converters)
+- [How to import database from xAuth](https://dev.bukkit.org/projects/authme-reloaded/pages/how-to-import-database-from-xauth)
+- [Website integration](https://github.com/AuthMe/AuthMeReloaded/tree/master/samples/website_integration)
+- [How to convert from Rakamak](https://dev.bukkit.org/projects/authme-reloaded/pages/how-to-import-database-from-rakamak)
+- Convert between database types (e.g. SQLite to MySQL): /authme converter
+
+
+## Links and Contacts
+
+ - **Support:**
+   - [GitHub issue tracker](https://github.com/AuthMe/AuthMeReloaded/issues)
+   - [Discord](https://discord.gg/Vn9eCyE)
+   - [BukkitDev page](https://dev.bukkit.org/projects/authme-reloaded)
+   - [Spigot page](https://www.spigotmc.org/resources/authmereloaded.6269/)
+
+- **Dev resources:**
+  - <a href="https://ci.codemc.org/job/AuthMe/job/AuthMeReloaded/javadoc/">JavaDocs</a>
+  - <a href="http://repo.codemc.org/repository/maven-public/">Maven Repository</a>
+  ```xml
+    <repositories>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>fr.xephi</groupId>
+            <artifactId>authme</artifactId>
+            <version>5.6.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+  ```
+
+- **Statistics:**
+    ![Graph](https://bstats.org/signatures/bukkit/AuthMe.svg)
+
+## Requirements
+
+##### Compiling requirements:
+>- JDK 17+
+>- Maven (3.8.8+)
+>- Git/GitHub (Optional)
+
+##### How to compile the project:
+>- Clone the project with Git/GitHub
+>- Execute command "mvn clean package"
+
+##### Running requirements:
+>- Java 17+
+>- Paper or Spigot (1.16.5 and up)
+>- ProtocolLib (optional, required by some features)
+
+## Credits
+
+##### Contributors:
+Team members: <a href="https://github.com/AuthMe/AuthMeReloaded/wiki/Development-team">developers</a>, <a href="https://github.com/AuthMe/AuthMeReloaded/wiki/Translators">translators</a>
+
+Credits for the old version of the plugin: d4rkwarriors, fabe1337, Whoami2 and pomo4ka
+
+Thanks also to: AS1LV3RN1NJA, Hoeze and eprimex
+
+##### GeoIP License:
+This product uses data from the GeoLite API created by MaxMind, available at https://www.maxmind.com

docs/config.md

@@ -9,7 +9,7 @@ the generated config.yml file.
 ```yml
 DataSource:
     # What type of database do you want to use?
-    # Valid values: H2, SQLITE, MARIADB, MYSQL, POSTGRESQL
+    # Valid values: SQLITE, MARIADB, MYSQL, POSTGRESQL
     backend: SQLITE
     # Enable the database caching system, should be disabled on bungeecord environments
     # or when a website integration is being used.
@@ -304,6 +304,13 @@ settings:
         forceKickAfterRegister: false
         # Does AuthMe need to enforce a /login after a successful registration?
         forceLoginAfterRegister: false
+    # Enable to display the welcome message (welcome.txt) after a login
+    # You can use colors in this welcome.txt + some replaced strings:
+    # {PLAYER}: player name, {ONLINE}: display number of online players,
+    # {MAXPLAYERS}: display server slots, {IP}: player ip, {LOGINS}: number of players logged,
+    # {WORLD}: player current world, {SERVER}: server name
+    # {VERSION}: get current bukkit version, {COUNTRY}: player country
+    useWelcomeMessage: true
     # Broadcast the welcome message to the server or only to the player?
     # set true for server or false for player
     broadcastWelcomeMessage: false

pom.xml

@@ -6,10 +6,10 @@
 
     <groupId>fr.xephi</groupId>
     <artifactId>authme</artifactId>
-    <version>5.6.0-FORK</version>
+    <version>5.7.0-SNAPSHOT</version>
 
-    <name>AuthMeReReloaded</name>
-    <description>Fork of the first authentication plugin for the Bukkit API!</description>
+    <name>AuthMeReloaded</name>
+    <description>The first authentication plugin for the Bukkit API!</description>
     <inceptionYear>2013</inceptionYear>
     <url>https://github.com/AuthMe/AuthMeReloaded</url>
 
@@ -47,7 +47,7 @@
 
     <licenses>
         <license>
-            <name>The GNU Public Licence version 3 (GPLv3)</name>
+            <name>The GNU General Public Licence version 3 (GPLv3)</name>
             <url>https://www.gnu.org/licenses/gpl-3.0.html</url>
             <distribution>repo</distribution>
         </license>
@@ -60,18 +60,15 @@
         <!-- Environment properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.source>1.8</java.source>
-        <java.target>1.8</java.target>
-        <java.apiVersion>8</java.apiVersion>
-        <java.compiler.minimumVersion>11</java.compiler.minimumVersion>
-        <maven.minimumVersion>3.6.3</maven.minimumVersion>
-
-        <!-- Dependencies versions -->
-        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
+        <java.source>17</java.source>
+        <java.target>17</java.target>
+        <java.apiVersion>17</java.apiVersion>
+        <java.compiler.minimumVersion>17</java.compiler.minimumVersion>
+        <maven.minimumVersion>3.8.8</maven.minimumVersion>
 
         <!-- 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>
 
@@ -80,13 +77,81 @@
         <pluginDescription.version>${project.versionCode}</pluginDescription.version>
         <pluginDescription.main>${project.groupId}.${project.artifactId}.${pluginDescription.name}</pluginDescription.main>
         <pluginDescription.authors>sgdc3, games647, Hex3l, krusic22</pluginDescription.authors>
+
+        <!-- Java libraries -->
+        <dependencies.injector.version>1.0</dependencies.injector.version>
+        <dependencies.string-similarity.version>1.0.0</dependencies.string-similarity.version>
+        <dependencies.geoip2.version>4.2.0</dependencies.geoip2.version>
+        <dependencies.javatar.version>2.5</dependencies.javatar.version>
+        <dependencies.commons-email.version>1.6.0</dependencies.commons-email.version>
+        <dependencies.hikaricp.version>5.1.0</dependencies.hikaricp.version>
+        <dependencies.slf4j.version>2.0.13</dependencies.slf4j.version>
+        <dependencies.datasourcecolumns.version>0.1.2</dependencies.datasourcecolumns.version>
+        <dependencies.mysql-connector-j.version>8.4.0</dependencies.mysql-connector-j.version>
+        <dependencies.mariadb-java-client.version>3.4.0</dependencies.mariadb-java-client.version>
+        <dependencies.postgresql.version>42.7.3</dependencies.postgresql.version>
+        <dependencies.pbkdf2.version>1.1.4</dependencies.pbkdf2.version>
+        <dependencies.argon2-jvm-nolibs.version>2.11</dependencies.argon2-jvm-nolibs.version>
+        <dependencies.bcrypt.version>0.10.2</dependencies.bcrypt.version>
+        <dependencies.googleauth.version>1.5.0</dependencies.googleauth.version>
+        <dependencies.configme.version>1.3.1</dependencies.configme.version>
+        <!-- Spigot -->
+        <dependencies.spigot.version>1.16.5-R0.1-SNAPSHOT</dependencies.spigot.version>
+        <dependencies.log4j-core.version>2.8.1</dependencies.log4j-core.version> <!-- version bundled 1.16.5 -->
+        <!-- Spigot libraries -->
+        <dependencies.bstats.version>3.0.2</dependencies.bstats.version>
     </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 -->
+        <!-- Little hack to make the shade plugin output a file with the right name
+        Disable, we aren't using shading atm
         <finalName>${project.finalNameBase}-noshade</finalName>
+        -->
+
         <resources>
             <resource>
                 <directory>.</directory>
@@ -111,12 +176,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
-                    <configuration>
-                        <failOnError>false</failOnError>
-                        <failOnWarnings>false</failOnWarnings>
-                        <skip>true</skip>
-                    </configuration>
+                    <version>3.7.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -126,7 +186,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>enforce-environment</id>
@@ -139,7 +199,7 @@
                                     <version>${maven.minimumVersion}</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>[17,)</version>
+                                    <version>[${java.compiler.minimumVersion},)</version>
                                 </requireJavaVersion>
                             </rules>
                             <fail>true</fail>
@@ -151,18 +211,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
             </plugin>
             <!-- Include resource files -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.3.1</version>
-                <configuration>
-                    <nonFilteredFileExtensions>
-                        <nonFilteredFileExtension>mmdb</nonFilteredFileExtension>
-                    </nonFilteredFileExtensions>
-                </configuration>
             </plugin>
             <!-- Compile and include classes -->
             <plugin>
@@ -180,6 +235,12 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.12</version>
+                <configuration>
+                    <includes>
+                        <include>fr/xephi/authme/*</include>
+                        <include>fr/xephi/authme/**/*</include>
+                    </includes>
+                </configuration>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -199,11 +260,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.3.0</version>
                 <configuration>
+                    <!-- Fix java.base opens for new JDK versions -->
                     <!-- 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>
+                    <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=en @{argLine}</argLine>
                     <systemPropertyVariables>
                         <project.skipExtendedHashTests>${project.skipExtendedHashTests}</project.skipExtendedHashTests>
                     </systemPropertyVariables>
@@ -215,7 +277,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.2</version>
             </plugin>
             <!-- Generate a jar containing the source javadoc -->
             <plugin>
@@ -224,7 +286,7 @@
                 <configuration>
                     <finalName>${project.finalNameBase}</finalName>
                     <!-- In sync with the source/target properties of the maven-compiler-plugin -->
-                    <source>8</source>
+                    <source>${java.source}</source>
                 </configuration>
                 <executions>
                     <execution>
@@ -256,162 +318,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.6.0</version>
                 <executions>
+                    <!-- Disable, we aren't using shading atm
                     <execution>
                         <id>shaded-jar</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
-                        <configuration>
-                            <finalName>${project.finalNameBase}-Lite</finalName>
-                            <artifactSet>
-                                <excludes>
-                                    <!-- Guava -->
-                                    <exclude>com.google.guava:guava</exclude>
-                                    <exclude>com.google.guava:failureaccess</exclude>
-                                    <exclude>com.google.guava:listenablefuture</exclude>
-                                    <exclude>com.google.errorprone:error_prone_annotations</exclude>
-                                    <exclude>com.google.j2objc:j2objc-annotations</exclude>
-                                    <!-- Gson -->
-                                    <exclude>com.google.code.gson:gson</exclude>
-                               </excludes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.h2</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.org.h2</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.http</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.org.apache.http</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.org.apache.commons</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.activation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.annotation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.annotation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.mail</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>waffle</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.waffle</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun.mail</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.sun.mail</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun.jna</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.sun.jna</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun.activation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.sun.activation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.github.benmanes.caffeine</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <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>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${project.finalNameBase}-Universal</finalName>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.google.common</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.thirdparty</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.google.thirdparty</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.j2objc</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.google.j2objc</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.errorprone</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.google.errorprone</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.gson</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.google.gson</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.h2</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.org.h2</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.http</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.org.apache.http</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.org.apache.commons</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.activation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.annotation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.annotation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>javax.mail</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>waffle</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.waffle</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun.mail</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.sun.mail</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun.jna</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.sun.jna</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.sun.activation</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.sun.activation</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.github.benmanes.caffeine</pattern>
-                                    <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
                     </execution>
+                    -->
                 </executions>
                 <configuration>
                     <!-- Don't create the reduced pom file, as we don't deploy the shaded jar -->
@@ -421,101 +338,14 @@
                     <!-- Use the base jar name, to help server owners download the right jar -->
                     <finalName>${project.finalNameBase}</finalName>
 
-                    <!--
-                    Relocate all lib we use in order to fix class loading errors if we use different versions
-                    than already loaded libs
-                    -->
-                    <relocations combine.children="append">
+                    <!-- Disable, no relocations atm
+                    <relocations>
                         <relocation>
-                            <pattern>ch.jalu</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.ch.jalu</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.zaxxer.hikari</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.com.zaxxer.hikari</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.slf4j</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.org.slf4j</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.maxmind.db</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.com.maxmind.db</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.ice.tar</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.com.icetar.tar</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.ricecode.similarity</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.ricecode.net.ricecode.similarity</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>de.rtner</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.de.rtner</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.picketbox</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.org.picketbox</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.jboss.crypto</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.org.jboss.crypto</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.jboss.security</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.org.jboss.security</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>de.mkammerer</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.de.mkammerer</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.warrenstrange</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.com.warrenstrange</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>javax.inject</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.javax.inject</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>at.favre.lib</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.at.favre.lib</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.postgresql</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.org.postgresql</shadedPattern>
-                        </relocation>
-                        <!-- bStats metrics class -->
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>fr.xephi.authme.libs.org.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <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>
-                        </relocation>
-                        <relocation>
-                            <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>
+                            <pattern></pattern>
+                            <shadedPattern>fr.xephi.authme.libs.</shadedPattern>
                         </relocation>
                     </relocations>
+                    -->
 
                     <filters>
                         <!-- Ignore manifest signatures for shading the project into an uber-jar to fix -->
@@ -547,13 +377,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.2</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.0.0</version>
+                <version>3.1.2</version>
             </plugin>
             <!-- Handle documentation generation, required by other plugins -->
             <plugin>
@@ -582,15 +412,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>
-
         <!-- Apache snapshots repo -->
         <repository>
             <id>apache-snapshots</id>
@@ -682,96 +503,48 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-
-        <!-- FoliaLib -->
-        <repository>
-            <id>devmart-other</id>
-            <url>https://nexuslite.gcnt.net/repos/other/</url>
-        </repository>
-
-        <repository>
-            <id>opencollab-snapshot</id>
-            <url>https://repo.opencollab.dev/maven-snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>jitpack</id>
-            <url>https://jitpack.io/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
     <dependencies>
         <!-- Java Libraries -->
-        <dependency>
-            <groupId>org.geysermc.floodgate</groupId>
-            <artifactId>api</artifactId>
-            <version>2.2.2-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Jalu Injector -->
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>injector</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
+            <version>${dependencies.injector.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- String comparison library. Used for dynamic help system. -->
         <dependency>
             <groupId>net.ricecode</groupId>
             <artifactId>string-similarity</artifactId>
-            <version>1.0.0</version>
-            <optional>true</optional>
+            <version>${dependencies.string-similarity.version}</version>
+            <scope>provided</scope>
         </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 -->
+        <!-- MaxMind GEO IP -->
         <dependency>
-            <groupId>com.maxmind.db</groupId>
-            <artifactId>maxmind-db-gson</artifactId>
-            <version>2.0.3</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.gson</groupId>
-                    <artifactId>gson</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.maxmind.geoip2</groupId>
+            <artifactId>geoip2</artifactId>
+            <version>${dependencies.geoip2.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Library for tar archives -->
         <dependency>
             <groupId>javatar</groupId>
             <artifactId>javatar</artifactId>
-            <version>2.5</version>
-            <optional>true</optional>
+            <version>${dependencies.javatar.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Java Email Library -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.6.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Log4J Logger (required by the console filter) -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version> <!-- Log4J version bundled in 1.12.2 -->
+            <version>${dependencies.commons-email.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -779,88 +552,62 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version> <!-- Latest java 8 release -->
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- HikariCP Logger -->
-        <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 -->
-            <optional>true</optional>
-        </dependency>
-
-        <!-- PBKDF2 implementation -->
-        <dependency>
-            <groupId>de.rtner</groupId>
-            <artifactId>PBKDF2</artifactId>
-            <version>1.1.4</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- MySQL connector, shaded into the legacy jar -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.33</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>3.3.3</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Argon2 implementation -->
-        <dependency>
-            <groupId>de.mkammerer</groupId>
-            <artifactId>argon2-jvm-nolibs</artifactId>
-            <version>2.11</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- TOTP client -->
-        <dependency>
-            <groupId>com.warrenstrange</groupId>
-            <artifactId>googleauth</artifactId>
-            <version>1.5.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Spigot API, https://www.spigotmc.org/ -->
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>${spigot.version}</version>
+            <version>${dependencies.hikaricp.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
-                    <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>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--  Keep in sync with spigot 1.19  -->
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
-            <optional>true</optional>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${dependencies.slf4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Data source columns -->
+        <dependency>
+            <groupId>ch.jalu</groupId>
+            <artifactId>datasourcecolumns</artifactId>
+            <version>${dependencies.datasourcecolumns.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- MySQL connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${dependencies.mysql-connector-j.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- MariaDB connector -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${dependencies.mariadb-java-client.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- PostgreSQL -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependencies.postgresql.version}</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.checkerframework</groupId>
@@ -868,20 +615,45 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--  Keep in sync with spigot 1.19  -->
+
+        <!-- PBKDF2 implementation -->
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
-            <optional>true</optional>
+            <groupId>de.rtner</groupId>
+            <artifactId>PBKDF2</artifactId>
+            <version>${dependencies.pbkdf2.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Argon2 implementation -->
+        <dependency>
+            <groupId>de.mkammerer</groupId>
+            <artifactId>argon2-jvm-nolibs</artifactId>
+            <version>${dependencies.argon2-jvm-nolibs.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- BCrypt implementation -->
+        <dependency>
+            <groupId>at.favre.lib</groupId>
+            <artifactId>bcrypt</artifactId>
+            <version>${dependencies.bcrypt.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- TOTP client -->
+        <dependency>
+            <groupId>com.warrenstrange</groupId>
+            <artifactId>googleauth</artifactId>
+            <version>${dependencies.googleauth.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- ConfigMe -->
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>configme</artifactId>
-            <version>1.3.1</version>
-            <optional>true</optional>
+            <version>${dependencies.configme.version}</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>
@@ -890,14 +662,42 @@
             </exclusions>
         </dependency>
 
+        <!-- Spigot API, https://www.spigotmc.org/ -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>${dependencies.spigot.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.joml</groupId>
+                    <artifactId>joml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.md-5</groupId>
+                    <artifactId>bungeecord-chat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${dependencies.log4j-core.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Bukkit Libraries  -->
+
         <!-- bStats metrics -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
+            <version>${dependencies.bstats.version}</version>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- Plugin Hooks -->
+
         <!-- ProtocolLib -->
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
@@ -946,20 +746,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>
@@ -1105,14 +891,6 @@
             </exclusions>
         </dependency>
 
-        <!-- BCrypt implementation -->
-        <dependency>
-            <groupId>at.favre.lib</groupId>
-            <artifactId>bcrypt</artifactId>
-            <version>0.10.2</version>
-            <optional>true</optional>
-        </dependency>
-
         <!-- XAuth, another authentication plugin, required by the database converter -->
         <dependency>
             <groupId>de.luricos.bukkit</groupId>
@@ -1121,83 +899,63 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>ch.jalu</groupId>
-            <artifactId>datasourcecolumns</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.7.3</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Unit Testing Libraries -->
 
+        <!-- TODO: update to junit 5 -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
             <version>4.13.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
-            <version>2.0.0.0</version>
+            <version>2.2</version>
         </dependency>
 
+        <!-- TODO: update to mockito 5 -->
         <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>
+            <version>4.11.0</version>
         </dependency>
 
         <!-- Required to mock the LuckPerms API-->
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.40.0</version>
+            <version>3.44.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.45.2.0</version>
+            <version>3.46.0.0</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <version>2.2.224</version>
-            <scope>compile</scope>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

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,11 +2,9 @@ package fr.xephi.authme;
 
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
-import com.github.Anon8281.universalScheduler.UniversalScheduler;
-import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
+import com.google.common.annotations.VisibleForTesting;
 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;
@@ -14,33 +12,22 @@ import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
 import fr.xephi.authme.initialization.OnStartupTasks;
 import fr.xephi.authme.initialization.SettingsProvider;
 import fr.xephi.authme.initialization.TaskCloser;
-import fr.xephi.authme.listener.AdvancedShulkerFixListener;
-import fr.xephi.authme.listener.BedrockAutoLoginListener;
 import fr.xephi.authme.listener.BlockListener;
-import fr.xephi.authme.listener.DoubleLoginFixListener;
 import fr.xephi.authme.listener.EntityListener;
-import fr.xephi.authme.listener.GuiCaptchaHandler;
-import fr.xephi.authme.listener.LoginLocationFixListener;
 import fr.xephi.authme.listener.PlayerListener;
 import fr.xephi.authme.listener.PlayerListener111;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.PlayerListener19Spigot;
-import fr.xephi.authme.listener.PlayerListenerHigherThan18;
-import fr.xephi.authme.listener.PurgeListener;
 import fr.xephi.authme.listener.ServerListener;
-import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.crypts.Sha256;
 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.purge.PurgeService;
@@ -48,21 +35,14 @@ import fr.xephi.authme.util.ExceptionUtils;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.bukkit.scheduler.BukkitScheduler;
 
-import javax.inject.Inject;
 import java.io.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Scanner;
 import java.util.function.Consumer;
-import java.util.logging.Level;
 
 import static fr.xephi.authme.service.BukkitService.TICKS_PER_MINUTE;
 import static fr.xephi.authme.util.Utils.isClassLoaded;
@@ -78,20 +58,17 @@ public class AuthMe extends JavaPlugin {
     private static final int CLEANUP_INTERVAL = 5 * TICKS_PER_MINUTE;
 
     // Version and build number values
-    private static String pluginVersion = "5.6.0-Fork";
-    private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "47";
+    private static String pluginVersion = "N/D";
+    private static String pluginBuildNumber = "Unknown";
+
     // Private instances
-    private EmailService emailService;
     private CommandHandler commandHandler;
-    private static TaskScheduler scheduler;
-    @Inject
-    public static Settings settings;
+    private Settings settings;
     private DataSource database;
     private BukkitService bukkitService;
     private Injector injector;
     private BackupService backupService;
-    public static ConsoleLogger logger;
+    private ConsoleLogger logger;
 
     /**
      * Constructor.
@@ -99,16 +76,14 @@ public class AuthMe extends JavaPlugin {
     public AuthMe() {
     }
 
-    /**
-     * Get the plugin's build
-     *
-     * @return The plugin's build
+    /*
+     * Constructor for unit testing.
      */
-    public static String getPluginBuild() {
-        return pluginBuild;
+    @VisibleForTesting
+    AuthMe(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
+        super(loader, description, dataFolder, file);
     }
 
-
     /**
      * Get the plugin's name.
      *
@@ -136,13 +111,6 @@ public class AuthMe extends JavaPlugin {
         return pluginBuildNumber;
     }
 
-    /**
-     * Get the scheduler
-     */
-    public static TaskScheduler getScheduler() {
-        return scheduler;
-    }
-
     /**
      * Method called when the server enables the plugin.
      */
@@ -150,13 +118,10 @@ public class AuthMe extends JavaPlugin {
     public void onEnable() {
         // Load the plugin version data from the plugin description file
         loadPluginInfo(getDescription().getVersion());
-        scheduler = UniversalScheduler.getScheduler(this);
 
         // Set the Logger instance and log file path
         ConsoleLogger.initialize(getLogger(), new File(getDataFolder(), LOG_FILENAME));
         logger = ConsoleLoggerFactory.get(AuthMe.class);
-        logger.info("You are running an unofficial fork version of AuthMe!");
-
 
         // Check server version
         if (!isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")
@@ -197,43 +162,26 @@ public class AuthMe extends JavaPlugin {
         // Schedule clean up task
         CleanupTask cleanupTask = injector.getSingleton(CleanupTask.class);
         cleanupTask.runTaskTimerAsynchronously(this, CLEANUP_INTERVAL, CLEANUP_INTERVAL);
+
         // Do a backup on start
         backupService.doBackup(BackupService.BackupCause.START);
+
         // Set up Metrics
         OnStartupTasks.sendMetrics(this, settings);
-        if (settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
-            logger.info("\n" + "    ___         __  __    __  ___   \n" +
-                "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
-                "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
-                " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
-                "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
-                "                                    ");
-        }
-        //detect server brand with classloader
-        checkServerType();
-        Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler());
-        Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler());
-        logger.info("AuthMeReReloaded is enabled successfully!");
+
+        // Successful message
+        logger.info("AuthMe " + getPluginVersion() + " build n." + getPluginBuildNumber() + " successfully enabled!");
+
         // Purge on start if enabled
         PurgeService purgeService = injector.getSingleton(PurgeService.class);
         purgeService.runAutoPurge();
-        // 注册玩家加入事件监听
-//        register3rdPartyListeners();
-        logger.info("GitHub: https://github.com/HaHaWTH/AuthMeReReloaded/");
-        if (settings.getProperty(SecuritySettings.CHECK_FOR_UPDATES)) {
-            checkForUpdates();
     }
-    }
-
-
-    //Migrated
 
     /**
      * Load the version and build number of the plugin from the description file.
      *
      * @param versionRaw the version as given by the plugin description file
      */
-
     private static void loadPluginInfo(String versionRaw) {
         int index = versionRaw.lastIndexOf("-");
         if (index != -1) {
@@ -259,6 +207,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);
@@ -296,12 +245,10 @@ public class AuthMe extends JavaPlugin {
         database = injector.getSingleton(DataSource.class);
         bukkitService = injector.getSingleton(BukkitService.class);
         commandHandler = injector.getSingleton(CommandHandler.class);
-        emailService = injector.getSingleton(EmailService.class);
         backupService = injector.getSingleton(BackupService.class);
 
         // 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);
@@ -322,17 +269,10 @@ 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")) {
-            pluginManager.registerEvents(injector.getSingleton(PlayerListenerHigherThan18.class), this);
-        } else if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
+        // Try to register 1.9 player listeners
+        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
             pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
         }
-// Try to register 1.9 player listeners(Moved to else-if)
-//        if (isClassLoaded("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
-//            pluginManager.registerEvents(injector.getSingleton(PlayerListener19.class), this);
-//        }
 
         // Try to register 1.9 spigot player listeners
         if (isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")) {
@@ -343,34 +283,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.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
-            pluginManager.registerEvents(injector.getSingleton(GuiCaptchaHandler.class), this);
-            logger.info("(Beta)GUICaptcha is enabled successfully!");
-            logger.info("These features are still in early development, if you encountered any problem, please report.");
-        } else if (settings.getProperty(SecuritySettings.GUI_CAPTCHA) && getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
-            logger.warning("ProtocolLib is not loaded, can't enable GUI Captcha.");
-        }
-        if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && getServer().getPluginManager().getPlugin("floodgate") != null) {
-            pluginManager.registerEvents(injector.getSingleton(BedrockAutoLoginListener.class), this);
-        } else if (settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && (!settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) || getServer().getPluginManager().getPlugin("floodgate") == null)) {
-            logger.warning("Failed to enable BedrockAutoLogin, ensure hookFloodgate: true and floodgate is loaded.");
-        }
-        if (settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND) || settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) {
-            pluginManager.registerEvents(injector.getSingleton(LoginLocationFixListener.class), this);
-        }
-        if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
-            pluginManager.registerEvents(injector.getSingleton(DoubleLoginFixListener.class), this);
-        }
-        if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && !isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
-            pluginManager.registerEvents(injector.getSingleton(AdvancedShulkerFixListener.class), this);
-        } else if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
-            logger.warning("You are running an 1.13+ minecraft server, advancedShulkerFix won't enable.");
-        }
-        if (settings.getProperty(SecuritySettings.PURGE_DATA_ON_QUIT)) {
-            pluginManager.registerEvents(injector.getSingleton(PurgeListener.class), this);
-        }
     }
 
     /**
@@ -395,11 +307,6 @@ public class AuthMe extends JavaPlugin {
         if (onShutdownPlayerSaver != null) {
             onShutdownPlayerSaver.saveAllPlayers();
         }
-        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));
-        }
 
         // Do backup on stop if enabled
         if (backupService != null) {
@@ -407,82 +314,14 @@ 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;
-        infoLogMethod.accept("AuthMe " + this.getDescription().getVersion() + " is unloaded successfully!");
+        infoLogMethod.accept("AuthMe " + this.getDescription().getVersion() + " disabled!");
         ConsoleLogger.closeFileWriter();
     }
 
-    private static final String owner = "HaHaWTH";
-//    private static final String owner_gitee = "Shixuehan114514";
-    private static final String repo = "AuthMeReReloaded";
-
-    private void checkForUpdates() {
-        logger.info("Checking for updates...");
-        bukkitService.runTaskAsynchronously(() -> {
-            try {
-                // 从南通集线器获取最新版本号
-                URL url = new URL("https://api.github.com/repos/" + owner + "/" + repo + "/releases/latest");
-                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                conn.setConnectTimeout(10000); // 设置连接超时为10秒
-                conn.setReadTimeout(10000); // 设置读取超时为10秒
-                Scanner scanner = new Scanner(conn.getInputStream());
-                String response = scanner.useDelimiter("\\Z").next();
-                scanner.close();
-
-                // 处理JSON响应
-                String latestVersion = response.substring(response.indexOf("tag_name") + 11);
-                latestVersion = latestVersion.substring(0, latestVersion.indexOf("\""));
-                if (isUpdateAvailable(latestVersion)) {
-                    String message = "New version available! Latest:" + latestVersion + " Current:" + pluginBuild + pluginBuildNumber;
-                    getLogger().log(Level.WARNING, message);
-                    getLogger().log(Level.WARNING, "Download from here: https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
-                } else {
-                    getLogger().log(Level.INFO, "You are running the latest version.");
-                }
-            } catch (IOException ignored) {
-            }
-        });
-    }
-    private boolean isUpdateAvailable(String latestVersion) {
-        // Extract the first character and the remaining digits from the version string
-        char latestChar = latestVersion.charAt(0);
-        int latestNumber = Integer.parseInt(latestVersion.substring(1));
-
-        char currentChar = pluginBuild.charAt(0);
-        int currentNumber = Integer.parseInt(pluginBuildNumber);
-
-        // Compare the characters first
-        if (latestChar > currentChar) {
-            return true;
-        } else if (latestChar < currentChar) {
-            return false;
-        } else {
-            // If the characters are the same, compare the numbers
-            return latestNumber > currentNumber;
-        }
-    }
-
-
-    private void checkServerType() {
-        if (isClassLoaded("io.papermc.paper.threadedregions.RegionizedServer")) {
-            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")) {
-            logger.info("AuthMeReReloaded is running on CatServer");
-        } else if (isClassLoaded("org.spigotmc.SpigotConfig")) {
-            logger.info("AuthMeReReloaded is running on Spigot");
-        } else if (isClassLoaded("org.bukkit.craftbukkit.CraftServer")) {
-            logger.info("AuthMeReReloaded is running on Bukkit");
-        } else {
-            logger.info("AuthMeReReloaded is running on Unknown*");
-        }
-    }
-
-
     /**
      * Handle Bukkit commands.
      *
@@ -493,8 +332,8 @@ public class AuthMe extends JavaPlugin {
      * @return True if the command was executed, false otherwise.
      */
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd,
-                             @NotNull String commandLabel, String[] args) {
+    public boolean onCommand(CommandSender sender, Command cmd,
+                             String commandLabel, String[] args) {
         // Make sure the command handler has been initialized
         if (commandHandler == null) {
             getLogger().severe("AuthMe command handler is not available");

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

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

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

@@ -84,14 +84,14 @@ public final class CommandUtils {
      * @return formatted command syntax incl. arguments
      */
     public static String buildSyntax(CommandDescription command, List<String> correctLabels) {
-        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,15 +7,15 @@ 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;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.command.CommandSender;
@@ -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,10 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
-import fr.xephi.authme.settings.properties.SecuritySettings;
-import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -14,22 +11,16 @@ import java.util.List;
  * Teleports the player to the first spawn.
  */
 public class FirstSpawnCommand extends PlayerCommand {
-    @Inject
-    private Settings settings;
+
     @Inject
     private SpawnLoader spawnLoader;
+
     @Override
     public void runCommand(Player player, List<String> arguments) {
         if (spawnLoader.getFirstSpawn() == null) {
             player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
-        } else {
-            //String name= player.getName();
-            if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
-                TeleportUtils.teleport(player, spawnLoader.getFirstSpawn());
         } else {
             player.teleport(spawnLoader.getFirstSpawn());
         }
-            //player.teleport(spawnLoader.getFirstSpawn());
-        }
     }
 }

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

@@ -4,8 +4,8 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.BukkitService;
@@ -78,8 +78,7 @@ public class RegisterAdminCommand implements ExecutableCommand {
             final Player player = bukkitService.getPlayerExact(playerName);
             if (player != null) {
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() ->
-                    // AuthMeReReloaded - Folia compatibility
-                    bukkitService.runTaskIfFolia(player, () -> player.kickPlayer(commonService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER))));
+                    player.kickPlayer(commonService.retrieveSingleMessage(player, MessageKey.KICK_FOR_ADMIN_REGISTER)));
             }
         });
     }

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

@@ -7,8 +7,8 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsWarner;

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

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

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

@@ -3,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/authme/debug/TestEmailSender.java

@@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.authme.debug;
 import ch.jalu.datasourcecolumns.data.DataSourceValue;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.mail.SendMailSsl;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.mail.SendMailSsl;
 import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.util.StringUtils;

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

@@ -42,6 +42,7 @@ public class ChangePasswordCommand extends PlayerCommand {
             commonService.send(player, MessageKey.NOT_LOGGED_IN);
             return;
         }
+
         // Check if the user has been verified or not
         if (codeManager.isVerificationRequired(player)) {
             codeManager.codeExistOrGenerateNew(name);

src/main/java/fr/xephi/authme/command/executable/email/EmailSetPasswordCommand.java

@@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.email;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.CommonService;

src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -5,9 +5,9 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.PasswordRecoveryService;

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

@@ -3,10 +3,9 @@ package fr.xephi.authme.command.executable.register;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.captcha.RegistrationCaptchaManager;
-import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.register.RegisterSecondaryArgument;
 import fr.xephi.authme.process.register.RegistrationType;
@@ -15,7 +14,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;
@@ -45,12 +43,6 @@ public class RegisterCommand extends PlayerCommand {
     @Inject
     private CommonService commonService;
 
-    @Inject
-    private BukkitService bukkitService;
-
-    @Inject
-    private DataSource dataSource;
-
     @Inject
     private EmailService emailService;
 
@@ -177,15 +169,6 @@ 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) {
-                bukkitService.runTaskLater(player, () -> {
-                    if (dataSource.getAuth(player.getName()) != null) {
-                        if (dataSource.getAuth(player.getName()).getLastLogin() == null) {
-                            management.performUnregisterByAdmin(null, player.getName(), player);
-                        }
-                    }
-                }, 60 * 20 * commonService.getProperty(RegistrationSettings.UNREGISTER_AFTER_MINUTES));
-            }
         }
     }
 

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

@@ -5,9 +5,9 @@ import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.totp.GenerateTotpService;
 import fr.xephi.authme.security.totp.TotpAuthenticator.TotpGenerationResult;
 import org.bukkit.entity.Player;

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

@@ -5,9 +5,9 @@ import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.totp.TotpAuthenticator;
 import org.bukkit.entity.Player;
 

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

@@ -8,9 +8,9 @@ import fr.xephi.authme.data.limbo.LimboPlayer;
 import fr.xephi.authme.data.limbo.LimboPlayerState;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.login.AsynchronousLogin;
 import fr.xephi.authme.security.totp.TotpAuthenticator;
 import org.bukkit.entity.Player;

src/main/java/fr/xephi/authme/command/executable/verification/VerificationCommand.java

@@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.verification;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.VerificationCodeManager;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.entity.Player;
 

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

@@ -15,8 +15,6 @@ import fr.xephi.authme.util.expiring.ExpiringMap;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
@@ -134,14 +132,12 @@ public class VerificationCodeManager implements SettingsDependent, HasCleanup {
      */
     private void generateCode(String name) {
         DataSourceValue<String> emailResult = dataSource.getEmail(name);
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
-        Date date = new Date(System.currentTimeMillis());
         if (emailResult.rowExists()) {
             final String email = emailResult.getValue();
             if (!Utils.isEmailEmpty(email)) {
                 String code = RandomStringUtils.generateNum(6); // 6 digits code
                 verificationCodes.put(name.toLowerCase(Locale.ROOT), code);
-                emailService.sendVerificationMail(name, email, code, dateFormat.format(date));
+                emailService.sendVerificationMail(name, email, code);
             }
         }
     }

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 {
-                Method method = Executors.class.getMethod("newVirtualThreadPerTaskExecutor");
-                method.setAccessible(true);
-                ExecutorService ex = (ExecutorService) method.invoke(null);
-                executorService = MoreExecutors.listeningDecorator(ex);
-                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("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
+        }        // Disabling server certificate verification on need
         if (allowPublicKeyRetrieval) {
             ds.addDataSourceProperty("allowPublicKeyRetrieval", String.valueOf(true));
         }

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

@@ -3,6 +3,8 @@ package fr.xephi.authme.datasource.columnshandler;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 
+import java.util.UUID;
+
 import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.ColumnOptions.DEFAULT_FOR_NULL;
 import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.ColumnOptions.OPTIONAL;
 import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.createDouble;

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

@@ -5,7 +5,6 @@ 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;
@@ -77,10 +76,6 @@ public class DataSourceProvider implements Provider<DataSource> {
             case SQLITE:
                 dataSource = new SQLite(settings, dataFolder);
                 break;
-            case H2:
-                dataSource = new H2(settings, dataFolder);
-                logger.warning("You are using H2 database, which is still in development!\nMake sure to backup and report any issues you encounter on GitHub!");
-                break;
             default:
                 throw new UnsupportedOperationException("Unknown data source type '" + dataSourceType + "'");
         }

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

@@ -1,13 +1,12 @@
 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;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
 import fr.xephi.authme.output.ConsoleFilter;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.output.Log4JFilter;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
@@ -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;
@@ -32,7 +32,7 @@ import static fr.xephi.authme.settings.properties.EmailSettings.RECALL_PLAYERS;
  */
 public class OnStartupTasks {
 
-    private static ConsoleLogger consoleLogger = ConsoleLoggerFactory.get(OnStartupTasks.class);
+    private static final ConsoleLogger consoleLogger = ConsoleLoggerFactory.get(OnStartupTasks.class);
 
     @Inject
     private DataSource dataSource;
@@ -53,7 +53,9 @@ public class OnStartupTasks {
      * @param settings the settings
      */
     public static void sendMetrics(AuthMe plugin, Settings settings) {
-        final Metrics metrics = new Metrics(plugin, 18479);
+        // We do not relocate as the library is downloaded at runtime
+        System.setProperty("bstats.relocatecheck", "false");
+        final Metrics metrics = new Metrics(plugin, 164);
 
         metrics.addCustomChart(new SimplePie("messages_language",
             () -> settings.getProperty(PluginSettings.MESSAGES_LANGUAGE)));
@@ -96,7 +98,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();

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) {
-        this.scheduler = AuthMe.getScheduler();
+    public TaskCloser(AuthMe plugin, DataSource dataSource) {
+        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);
-                messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN);
-            }
-        },20L);
-    }
-}

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

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

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

@@ -1,263 +0,0 @@
-package fr.xephi.authme.listener;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketEvent;
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.events.LoginEvent;
-import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.service.BukkitService;
-import fr.xephi.authme.service.CommonService;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.HooksSettings;
-import fr.xephi.authme.settings.properties.RestrictionSettings;
-import fr.xephi.authme.settings.properties.SecuritySettings;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-import javax.inject.Inject;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-
-import static fr.xephi.authme.util.PlayerUtils.getPlayerIp;
-import static fr.xephi.authme.util.PlayerUtils.isNpc;
-import static org.bukkit.Bukkit.getLogger;
-import static org.bukkit.Bukkit.getServer;
-
-/**
- * This class handles ALL the GUI captcha features in the plugin.
- */
-public class GuiCaptchaHandler implements Listener {
-    //define AuthMeApi
-    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-    @Inject
-    private BukkitService bukkitService;
-    @Inject
-    private AuthMe plugin;
-    @Inject
-    private Messages messages;
-    @Inject
-    private CommonService service;
-
-    @Inject
-    private Settings settings;
-
-
-    private PacketAdapter chatPacketListener;
-    private PacketAdapter windowPacketListener;
-
-    //define timesLeft
-    private int timesLeft = 3;
-    //Use ConcurrentHashMap to store player and their close reason
-    /* We used many async tasks so there is concurrent**/
-    public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
-    //define randomStringSet
-    String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
-    String randomString = "";
-    Random randomItemSet = new Random();
-    Random howManyRandom = new Random();
-    private Material captchaMaterial = getRandomMaterial();
-
-
-    private boolean isPacketListenersActive = false;
-
-    public GuiCaptchaHandler() {
-    }
-
-    private StringBuilder sb;
-    private final List<String> whiteList = AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_COUNTRY_WHITELIST);
-
-    private boolean isBedrockPlayer(UUID uuid) {
-        if (getServer().getPluginManager().getPlugin("floodgate") != null) {
-            return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid);
-        }
-        return false;
-    }
-
-
-    private void initializePacketListeners() {
-        if (!isPacketListenersActive) {
-            ProtocolLibrary.getProtocolManager().addPacketListener(windowPacketListener);
-            ProtocolLibrary.getProtocolManager().addPacketListener(chatPacketListener);
-            isPacketListenersActive = true;
-        }
-    }
-
-
-    @EventHandler
-    public void onInventoryClick(InventoryClickEvent event) {
-        if (event.getWhoClicked() instanceof Player) {
-            Player player = (Player) event.getWhoClicked();
-            ItemStack currentItem = event.getCurrentItem();
-            if (!authmeApi.isRegistered(player.getName())) {
-                if (isBedrockPlayer(player.getUniqueId())) {
-                    return;
-                }
-                if (currentItem != null && currentItem.getType().equals(captchaMaterial)) {
-                    event.setCancelled(true);
-                    if (!closeReasonMap.containsKey(player)) {
-                        closeReasonMap.put(player, "verified");
-                    }
-                    player.closeInventory();
-                    messages.send(player, MessageKey.GUI_CAPTCHA_VERIFIED);
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        Player player = event.getPlayer();
-        bukkitService.runTaskAsynchronously(() -> {
-            sb = new StringBuilder();
-            int howLongIsRandomString = (howManyRandom.nextInt(3) + 1);
-            for (int i = 0; i < howLongIsRandomString; i++) {
-                //生成随机索引号
-                int index = randomItemSet.nextInt(randomSet.length());
-
-                // 从字符串中获取由索引 index 指定的字符
-                char randomChar = randomSet.charAt(index);
-
-                // 将字符追加到字符串生成器
-                sb.append(randomChar);
-            }
-            if (!whiteList.isEmpty()) {
-                String ip = getPlayerIp(player);
-                if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) {
-                    if (!closeReasonMap.containsKey(player)) {
-                        closeReasonMap.put(player, "verified:whitelist");
-                    }
-                }
-            }
-        });
-    }
-
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        randomString = "";
-        Player playerunreg = event.getPlayer();
-        String name = playerunreg.getName();
-        if (!authmeApi.isRegistered(name) && !isNpc(playerunreg) && !closeReasonMap.containsKey(playerunreg)) {
-            if (isBedrockPlayer(playerunreg.getUniqueId())) {
-                if (!closeReasonMap.containsKey(playerunreg)) {
-                    closeReasonMap.put(playerunreg, "verified:bedrock");
-                }
-                messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
-                return;
-            }
-            randomString = sb.toString();
-            Random random_blockpos = new Random();
-            AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(27));
-            Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
-            ItemStack item = new ItemStack(captchaMaterial);
-            ItemMeta meta = item.getItemMeta();
-            try {
-                if (meta != null) {
-                    meta.setDisplayName(messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_CLICKABLE_NAME, randomString));
-                    item.setItemMeta(meta);
-                }
-            } catch (NullPointerException e) {
-                getLogger().log(Level.WARNING, "Unexpected error occurred while setting item meta.");
-            }
-            windowPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CLOSE_WINDOW) {
-                @Override
-                public void onPacketReceiving(PacketEvent event) {
-                    Player packetPlayer = event.getPlayer();
-                    if (!closeReasonMap.containsKey(packetPlayer) && !authmeApi.isRegistered(packetPlayer.getName())) {
-                        if (timesLeft <= 0) {
-                            bukkitService.runTask(() -> {
-                                packetPlayer.kickPlayer(service.retrieveSingleMessage(packetPlayer, MessageKey.GUI_CAPTCHA_KICK_FAILED));
-                            });
-                            timesLeft = 3;
-                        } else {
-                            --timesLeft;
-                            if (timesLeft <= 0) {
-                                bukkitService.runTask(() -> {
-                                    packetPlayer.kickPlayer(service.retrieveSingleMessage(packetPlayer, MessageKey.GUI_CAPTCHA_KICK_FAILED));
-                                });
-                                timesLeft = 3;
-                                return;
-                            }
-                            messages.send(packetPlayer, MessageKey.GUI_CAPTCHA_RETRY_MESSAGE, String.valueOf(timesLeft));
-                            event.setCancelled(true);
-                            random_num.set(random_blockpos.nextInt(26));
-                            bukkitService.runTask(() -> {
-                                menu.clear();
-                                menu.setItem(random_num.get(), item);
-                                packetPlayer.openInventory(menu);
-                            });
-                        }
-                    }
-                }
-            };
-            chatPacketListener = new PacketAdapter(this.plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
-                @Override
-                public void onPacketReceiving(PacketEvent event) {
-                    Player packetPlayer = event.getPlayer();
-                    if (!closeReasonMap.containsKey(packetPlayer) && !authmeApi.isRegistered(packetPlayer.getName())) {
-                        messages.send(packetPlayer, MessageKey.GUI_CAPTCHA_DENIED_MESSAGE);
-                        event.setCancelled(true);
-                    }
-                }
-            };
-            initializePacketListeners();
-            //Open captcha inventory
-            menu.setItem(random_num.get(), item);
-            playerunreg.openInventory(menu);
-            if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > 0) {
-                long timeOut = settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT);
-                if (settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) > settings.getProperty(RestrictionSettings.TIMEOUT)) {
-                    bukkitService.runTask(() -> {
-                        getLogger().warning("AuthMe detected that your GUI captcha timeout seconds(" + settings.getProperty(SecuritySettings.GUI_CAPTCHA_TIMEOUT) + ") is bigger than the Login timeout seconds(" +
-                            settings.getProperty(RestrictionSettings.TIMEOUT) + "). To prevent issues, we will let the GUI captcha follow the Login timeout seconds, please check and modify your config.");
-                    });
-                    timeOut = settings.getProperty(RestrictionSettings.TIMEOUT);
-                }
-                long finalTimeOut = timeOut;
-                bukkitService.runTaskLater(() -> {
-                    if (!closeReasonMap.containsKey(playerunreg) && !authmeApi.isRegistered(playerunreg.getName())) {
-                        playerunreg.kickPlayer(service.retrieveSingleMessage(playerunreg, MessageKey.GUI_CAPTCHA_KICK_TIMEOUT));
-                        timesLeft = 3; // Reset the attempt counter
-                    }
-                }, finalTimeOut * 20L);
-            }
-        }
-    }
-
-    //This prevents players from unregistering by Admins
-    @EventHandler
-    public void onPlayerAuthMeLogin(LoginEvent event) {
-        Player player = event.getPlayer();
-        if (!closeReasonMap.containsKey(player)) {
-            closeReasonMap.put(player, "verified:login");
-        }
-    }
-
-    private Material getRandomMaterial() {
-        Material[] allMaterials = Material.values();
-        Random random = new Random();
-        return allMaterials[random.nextInt(allMaterials.length)];
-    }
-}
-
-
-
-

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

@@ -1,14 +1,11 @@
 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;
@@ -21,12 +18,12 @@ import javax.inject.Inject;
  * Service class for the AuthMe listeners to determine whether an event should be canceled.
  */
 class ListenerService implements SettingsDependent {
-    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
+
     private final DataSource dataSource;
     private final PlayerCache playerCache;
     private final ValidationService validationService;
-    private boolean isRegistrationForced;
 
+    private boolean isRegistrationForced;
 
     @Inject
     ListenerService(Settings settings, DataSource dataSource, PlayerCache playerCache,
@@ -79,18 +76,9 @@ 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) {
@@ -105,7 +93,7 @@ class ListenerService implements SettingsDependent {
      * @return true if the player may play, false otherwise
      */
     private boolean checkAuth(String name) {
-        if (validationService.isUnrestricted(name) || playerCache.isAuthenticated(name)){
+        if (validationService.isUnrestricted(name) || playerCache.isAuthenticated(name)) {
             return true;
         }
         if (!isRegistrationForced && !dataSource.isAuthAvailable(name)) {

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

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

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

@@ -4,9 +4,9 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.service.AntiBotService;
@@ -139,8 +139,7 @@ public class OnJoinVerifier implements Reloadable {
         }
         Player nonVipPlayer = generateKickPlayer(onlinePlayers);
         if (nonVipPlayer != null) {
-            // AuthMeReReloaded - Folia compatibility
-            bukkitService.runTaskIfFolia(nonVipPlayer, () -> nonVipPlayer.kickPlayer(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP)));
+            nonVipPlayer.kickPlayer(messages.retrieveSingle(player, MessageKey.KICK_FOR_VIP));
             event.allow();
             return false;
         } else {

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

@@ -1,6 +1,5 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.data.QuickCommandsProtectionManager;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
@@ -19,8 +18,6 @@ import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
-import fr.xephi.authme.settings.properties.SecuritySettings;
-import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.HumanEntity;
@@ -48,6 +45,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
@@ -59,16 +57,11 @@ 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{
-    private final AuthMeApi authmeApi = AuthMeApi.getInstance();
-
-
-
+public class PlayerListener implements Listener {
 
     @Inject
     private Settings settings;
@@ -99,11 +92,9 @@ 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) {
-
         if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
             return;
         }
@@ -119,18 +110,13 @@ 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 (getServer().getPluginManager().getPlugin("floodgate") != null) {
-                if (org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())) return;
-            }
-        }
+
         // Non-blocking checks
         try {
             onJoinVerifier.checkIsValidName(name);
         } catch (FailedVerificationException e) {
             event.setKickMessage(messages.retrieveSingle(name, e.getReason(), e.getArgs()));
             event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
-
         }
     }
 
@@ -193,7 +179,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);
         }
@@ -203,15 +189,12 @@ public class PlayerListener implements Listener{
         management.performJoin(player);
 
         teleportationService.teleportNewPlayerToFirstSpawn(player);
-
     }
 
-
     @EventHandler(priority = EventPriority.HIGH) // HIGH as EssentialsX listens at HIGHEST
     public void onJoinMessage(PlayerJoinEvent event) {
         final Player player = event.getPlayer();
 
-
         // Note: join message can be null, despite api documentation says not
         if (settings.getProperty(RegistrationSettings.REMOVE_JOIN_MESSAGE)) {
             event.setJoinMessage(null);
@@ -320,8 +303,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)));
-            // AuthMeReReloaded - Folia compatibility
+            player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK));
             return;
         }
         if (listenerService.shouldCancelEvent(player)) {
@@ -347,12 +329,12 @@ public class PlayerListener implements Listener{
         }
 
         /*
-         * Limit player X and Z movements
+         * Limit player X and Z movements to 1 block
          * Deny player Y+ movements (allows falling)
          */
 
-        if (from.getX() == to.getX()
-            && from.getZ() == to.getZ()
+        if (from.getBlockX() == to.getBlockX()
+            && from.getBlockZ() == to.getBlockZ()
             && from.getY() - to.getY() >= 0) {
             return;
         }
@@ -375,20 +357,12 @@ public class PlayerListener implements Listener{
         Location spawn = spawnLoader.getSpawnLocation(player);
         if (spawn != null && spawn.getWorld() != null) {
             if (!player.getWorld().equals(spawn.getWorld())) {
-                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
-                    TeleportUtils.teleport(player,spawn);
-                } else {
                 player.teleport(spawn);
-                }
             } else if (spawn.distance(player.getLocation()) > settings.getProperty(ALLOWED_MOVEMENT_RADIUS)) {
-                if(settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
-                    TeleportUtils.teleport(player,spawn);
-                } else {
                 player.teleport(spawn);
             }
         }
     }
-    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onPlayerRespawn(PlayerRespawnEvent event) {
@@ -476,12 +450,12 @@ public class PlayerListener implements Listener{
      * Inventory interactions
      */
 
-//    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
-//    public void onPlayerPickupItem(EntityPickupItemEvent event) {
-//        if (listenerService.shouldCancelEvent(event)) {
-//            event.setCancelled(true);
-//        }
-//    }
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+        if (listenerService.shouldCancelEvent(event)) {
+            event.setCancelled(true);
+        }
+    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
@@ -509,16 +483,15 @@ public class PlayerListener implements Listener{
             return false;
         }
         Set<String> whitelist = settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES);
-        //append a string for String whitelist
         return whitelist.contains(ChatColor.stripColor(inventory.getTitle()).toLowerCase(Locale.ROOT));
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerInventoryOpen(InventoryOpenEvent event) {
         final HumanEntity player = event.getPlayer();
-        Player ply = (Player) event.getPlayer();
+
         if (listenerService.shouldCancelEvent(player)
-            && !isInventoryWhitelisted(event.getView()) && listenerService.shouldCancelInvEvent(ply)) {
+            && !isInventoryWhitelisted(event.getView())) {
             event.setCancelled(true);
 
             /*
@@ -536,12 +509,4 @@ 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,37 +0,0 @@
-package fr.xephi.authme.listener;
-
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.PluginSettings;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityPickupItemEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
-
-import javax.inject.Inject;
-
-public class PlayerListenerHigherThan18 implements Listener {
-    @Inject
-    private ListenerService listenerService;
-
-    @Inject
-    private Settings settings;
-
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
-    public void onPlayerPickupItem(EntityPickupItemEvent event) {
-        if (listenerService.shouldCancelEvent(event)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
-        Player player = event.getPlayer();
-        if (player.isSneaking() && player.hasPermission("keybindings.use") && settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
-            event.setCancelled(true);
-            Bukkit.dispatchCommand(event.getPlayer(), "help");
-        }
-    }
-}

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

@@ -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

@@ -1,8 +1,8 @@
 package fr.xephi.authme.listener;
 
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.listener.protocollib.ProtocolLibService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.listener.protocollib.ProtocolLibService;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.service.PluginHookService;
 import fr.xephi.authme.settings.SpawnLoader;

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

@@ -40,7 +40,7 @@ import java.util.List;
 class InventoryPacketAdapter extends PacketAdapter {
 
     private static final int PLAYER_INVENTORY = 0;
-    // http://wiki.vg/Inventory#Inventory (0-4 crafting, 5-8 armor, 9-35 main inventory, 36-44 hotbar, 45 off hand)
+    // http://wiki.vg/Inventory#Inventory (0-4 crafting, 5-8 armor, 9-35 main inventory, 36-44 hotbar, 45 off-hand)
     // +1 because an index starts with 0
     private static final int CRAFTING_SIZE = 5;
     private static final int ARMOR_SIZE = 4;
@@ -113,6 +113,10 @@ class InventoryPacketAdapter extends PacketAdapter {
             itemListModifier.write(0, Arrays.asList(blankInventory));
         }
 
+        try {
             protocolManager.sendServerPacket(player, inventoryPacket, false);
+        } catch (Exception exception) {
+            logger.logException("Error during sending blank inventory", exception);
+        }
     }
 }

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

@@ -40,31 +40,6 @@ public class EmailService {
         return sendMailSsl.hasAllInformation();
     }
 
-    public boolean sendNewPasswordMail(String name, String mailAddress, String newPass,String ip,String time) {
-        HtmlEmail email;
-        try {
-            email = sendMailSsl.initializeMail(mailAddress);
-        } catch (EmailException e) {
-            logger.logException("Failed to create email with the given settings:", e);
-            return false;
-        }
-
-        String mailText = replaceTagsForPasswordMail(settings.getNewPasswordEmailMessage(), name, newPass,ip,time);
-        File file = null;
-        if (settings.getProperty(EmailSettings.PASSWORD_AS_IMAGE)) {
-            try {
-                file = generatePasswordImage(name, newPass);
-                mailText = embedImageIntoEmailContent(file, email, mailText);
-            } catch (IOException | EmailException e) {
-                logger.logException(
-                    "Unable to send new password as image for email " + mailAddress + ":", e);
-            }
-        }
-
-        boolean couldSendEmail = sendMailSsl.sendEmail(mailText, email);
-        FileUtils.delete(file);
-        return couldSendEmail;
-    }
 
     /**
      * Sends an email to the user with his new password.
@@ -74,7 +49,7 @@ public class EmailService {
      * @param newPass the new password
      * @return true if email could be sent, false otherwise
      */
-    public boolean sendPasswordMail(String name, String mailAddress, String newPass, String time) {
+    public boolean sendPasswordMail(String name, String mailAddress, String newPass) {
         if (!hasAllInformation()) {
             logger.warning("Cannot perform email registration: not all email settings are complete");
             return false;
@@ -88,7 +63,7 @@ public class EmailService {
             return false;
         }
 
-        String mailText = replaceTagsForPasswordMail(settings.getPasswordEmailMessage(), name, newPass,time);
+        String mailText = replaceTagsForPasswordMail(settings.getPasswordEmailMessage(), name, newPass);
         // Generate an image?
         File file = null;
         if (settings.getProperty(EmailSettings.PASSWORD_AS_IMAGE)) {
@@ -105,17 +80,19 @@ public class EmailService {
         FileUtils.delete(file);
         return couldSendEmail;
     }
+
     /**
      * Sends an email to the user with the temporary verification code.
      *
      * @param name the name of the player
      * @param mailAddress the player's email
      * @param code the verification code
+     * @return true if email could be sent, false otherwise
      */
-    public void sendVerificationMail(String name, String mailAddress, String code, String time) {
+    public boolean sendVerificationMail(String name, String mailAddress, String code) {
         if (!hasAllInformation()) {
             logger.warning("Cannot send verification email: not all email settings are complete");
-            return;
+            return false;
         }
 
         HtmlEmail email;
@@ -123,12 +100,12 @@ public class EmailService {
             email = sendMailSsl.initializeMail(mailAddress);
         } catch (EmailException e) {
             logger.logException("Failed to create verification email with the given settings:", e);
-            return;
+            return false;
         }
 
         String mailText = replaceTagsForVerificationEmail(settings.getVerificationEmailMessage(), name, code,
-            settings.getProperty(SecuritySettings.VERIFICATION_CODE_EXPIRATION_MINUTES),time);
-        sendMailSsl.sendEmail(mailText, email);
+            settings.getProperty(SecuritySettings.VERIFICATION_CODE_EXPIRATION_MINUTES));
+        return sendMailSsl.sendEmail(mailText, email);
     }
 
     /**
@@ -139,7 +116,7 @@ public class EmailService {
      * @param code the recovery code
      * @return true if email could be sent, false otherwise
      */
-    public boolean sendRecoveryCode(String name, String email, String code, String time) {
+    public boolean sendRecoveryCode(String name, String email, String code) {
         HtmlEmail htmlEmail;
         try {
             htmlEmail = sendMailSsl.initializeMail(email);
@@ -149,23 +126,10 @@ public class EmailService {
         }
 
         String message = replaceTagsForRecoveryCodeMail(settings.getRecoveryCodeEmailMessage(),
-            name, code, settings.getProperty(SecuritySettings.RECOVERY_CODE_HOURS_VALID),time);
+            name, code, settings.getProperty(SecuritySettings.RECOVERY_CODE_HOURS_VALID));
         return sendMailSsl.sendEmail(message, htmlEmail);
     }
 
-    public void sendShutDown(String email, String time) {
-        HtmlEmail htmlEmail;
-        try {
-            htmlEmail = sendMailSsl.initializeMail(email);
-        } catch (EmailException e) {
-            logger.logException("Failed to create email for recovery code:", e);
-            return;
-        }
-
-        String message = replaceTagsForShutDownMail(settings.getShutdownEmailMessage(), time);
-        sendMailSsl.sendEmail(message, htmlEmail);
-    }
-
     private File generatePasswordImage(String name, String newPass) throws IOException {
         ImageGenerator gen = new ImageGenerator(newPass);
         File file = new File(dataFolder, name + "_new_pass.jpg");
@@ -180,44 +144,26 @@ public class EmailService {
         return content.replace("<image />", "<img src=\"cid:" + tag + "\">");
     }
 
-    private String replaceTagsForPasswordMail(String mailText, String name, String newPass,String ip,String time) {
+    private String replaceTagsForPasswordMail(String mailText, String name, String newPass) {
         return mailText
             .replace("<playername />", name)
             .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
-            .replace("<generatedpass />", newPass)
-            .replace("<playerip />", ip)
-            .replace("<time />", time);
+            .replace("<generatedpass />", newPass);
     }
 
-    private String replaceTagsForPasswordMail(String mailText, String name, String newPass, String time) {
-        return mailText
-            .replace("<playername />", name)
-            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
-            .replace("<generatedpass />", newPass)
-            .replace("<time />", time);
-    }
-
-    private String replaceTagsForVerificationEmail(String mailText, String name, String code, int minutesValid, String time) {
+    private String replaceTagsForVerificationEmail(String mailText, String name, String code, int minutesValid) {
         return mailText
             .replace("<playername />", name)
             .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
             .replace("<generatedcode />", code)
-            .replace("<minutesvalid />", String.valueOf(minutesValid))
-            .replace("<time />", time);
+            .replace("<minutesvalid />", String.valueOf(minutesValid));
     }
 
-    private String replaceTagsForRecoveryCodeMail(String mailText, String name, String code, int hoursValid, String time) {
+    private String replaceTagsForRecoveryCodeMail(String mailText, String name, String code, int hoursValid) {
         return mailText
             .replace("<playername />", name)
             .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
             .replace("<recoverycode />", code)
-            .replace("<hoursvalid />", String.valueOf(hoursValid))
-            .replace("<time />", time);
+            .replace("<hoursvalid />", String.valueOf(hoursValid));
     }
-    private String replaceTagsForShutDownMail(String mailText, String time) {
-        return mailText
-            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
-            .replace("<time />", time);
-    }
-
 }

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

@@ -1,6 +1,9 @@
 package fr.xephi.authme.mail;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
 /**

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

@@ -4,84 +4,14 @@ package fr.xephi.authme.message;
  * Keys for translatable messages managed by {@link Messages}.
  */
 public enum MessageKey {
-    /**
-     * You have been disconnected due to doubled login.
-     */
-    DOUBLE_LOGIN_FIX("double_login_fix.fix_message"),
 
-    /**
-     * You are stuck in portal during Login.
-     */
-    LOCATION_FIX_PORTAL("login_location_fix.fix_portal"),
-
-    /**
-     * You are stuck underground during Login.
-     */
-    LOCATION_FIX_UNDERGROUND("login_location_fix.fix_underground"),
-
-    /**
-     * You are stuck underground during Login, but we cant fix it.
-     */
-    LOCATION_FIX_UNDERGROUND_CANT_FIX("login_location_fix.cannot_fix_underground"),
-
-    /**
-     * Bedrock auto login success!
-     */
-    BEDROCK_AUTO_LOGGED_IN("bedrock_auto_login.success"),
-
-    /**
-     * %random Verification
-     */
-    GUI_CAPTCHA_WINDOW_NAME("gui_captcha.captcha_window_name", "%random"),
-
-    /**
-     * %random I am human
-     */
-    GUI_CAPTCHA_CLICKABLE_NAME("gui_captcha.captcha_clickable_name", "%random"),
-
-    /**
-     * Verification failed, you have %times retries left
-     */
-    GUI_CAPTCHA_RETRY_MESSAGE("gui_captcha.message_on_retry", "%times"),
-
-    /**
-     * Bedrock verification success!
-     */
-    GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK("gui_captcha.bedrock_auto_verify_success"),
-
-    /**
-     * Please be verified before chatting!
-     */
-    GUI_CAPTCHA_DENIED_MESSAGE("gui_captcha.denied_message_sending"),
-
-    /**
-     * Verification timed out!
-     */
-    GUI_CAPTCHA_KICK_TIMEOUT("gui_captcha.kick_on_timeout"),
-
-    /**
-     * Please complete the verification!
-     */
-    GUI_CAPTCHA_KICK_FAILED("gui_captcha.kick_on_failed"),
-
-    /**
-     * Verification success!
-     */
-    GUI_CAPTCHA_VERIFIED("gui_captcha.success"),
-
-    /**
-     * In order to use this command you must be authenticated!
-     */
+    /** 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. */
@@ -150,9 +80,6 @@ public enum MessageKey {
     /** The chosen password isn't safe, please choose another one... */
     PASSWORD_UNSAFE_ERROR("password.unsafe_password"),
 
-    /** Your chosen password is not secure. It was used %pwned_count times already! Please use a stronger password... */
-    PASSWORD_PWNED_ERROR("password.pwned_password", "%pwned_count"),
-
     /** Your password contains illegal characters. Allowed chars: %valid_chars */
     PASSWORD_CHARACTERS_ERROR("password.forbidden_characters", "%valid_chars"),
 

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

@@ -2,8 +2,8 @@ package fr.xephi.authme.message;
 
 import com.google.common.collect.ImmutableMap;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.util.expiring.Duration;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

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

@@ -1,8 +1,8 @@
 package fr.xephi.authme.message;
 
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.message.updater.MessageUpdater;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.updater.MessageUpdater;
 
 import javax.inject.Inject;
 

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

@@ -10,8 +10,8 @@ import ch.jalu.configme.resource.PropertyResource;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.util.FileUtils;
 
 import java.io.File;
@@ -149,10 +149,6 @@ public class MessageUpdater {
             .put("verification", "Verification code")
             .put("time", "Time units")
             .put("two_factor", "Two-factor authentication")
-            .put("gui_captcha", "3rd party features: GUI Captcha")
-            .put("bedrock_auto_login", "3rd party features: Bedrock Auto Login")
-            .put("login_location_fix", "3rd party features: Login Location Fix")
-            .put("double_login_fix", "3rd party features: Double Login Fix")
             .build();
 
         Set<String> addedKeys = new HashSet<>();

src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java

@@ -4,8 +4,8 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;

src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java

@@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.EmailChangedEvent;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

@@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.EmailChangedEvent;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

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

@@ -17,9 +17,7 @@ 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.WelcomeMessageConfiguration;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
@@ -29,8 +27,6 @@ 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;
@@ -48,9 +44,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
     @Inject
     private Server server;
 
-    @Inject
-    private Settings settings;
-
     @Inject
     private DataSource database;
 
@@ -75,15 +68,15 @@ public class AsynchronousJoin implements AsynchronousProcess {
     @Inject
     private ValidationService validationService;
 
+    @Inject
+    private WelcomeMessageConfiguration welcomeMessageConfiguration;
+
     @Inject
     private SessionService sessionService;
 
     @Inject
     private BungeeSender bungeeSender;
 
-    @Inject
-    private VelocitySender velocitySender;
-
     @Inject
     private ProxySessionManager proxySessionManager;
 
@@ -154,6 +147,9 @@ public class AsynchronousJoin implements AsynchronousProcess {
                 return;
             }
         } else if (!service.getProperty(RegistrationSettings.FORCE)) {
+            bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
+                welcomeMessageConfiguration.sendWelcomeMessage(player);
+            });
 
             // Skip if registration is optional
 
@@ -161,11 +157,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));
-            }
-            if (velocitySender.isEnabled()) {
-                bukkitService.scheduleSyncDelayedTask(() ->
-                    velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
+                    bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L);
             }
             return;
         }
@@ -202,9 +194,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
             if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
                 // Allow infinite blindness effect
                 int blindTimeOut = (registrationTimeout <= 0) ? 99999 : registrationTimeout;
-
-                // AuthMeReReloaded - Fix potion apply on Folia
-                bukkitService.runTaskIfFolia(player,() -> player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2)));
+                player.addPotionEffect(bukkitService.createBlindnessEffect(blindTimeOut));
             }
             commandManager.runCommandsOnJoin(player);
         });

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

@@ -12,9 +12,9 @@ import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent;
 import fr.xephi.authme.events.FailedLoginEvent;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.AdminPermission;
 import fr.xephi.authme.permission.PlayerPermission;
 import fr.xephi.authme.permission.PlayerStatePermission;
@@ -26,9 +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.VMessageType;
-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;
@@ -84,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() {
     }
@@ -118,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);
@@ -312,11 +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));
-            }
-            if (velocitySender.isEnabled()) {
-                bukkitService.scheduleSyncDelayedTask(() ->
-                    velocitySender.sendAuthMeVelocityMessage(player, VMessageType.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,6 +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.settings.WelcomeMessageConfiguration;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import org.bukkit.entity.Player;
@@ -48,6 +49,9 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
     @Inject
     private CommonService commonService;
 
+    @Inject
+    private WelcomeMessageConfiguration welcomeMessageConfiguration;
+
     @Inject
     private JoinMessageService joinMessageService;
 
@@ -87,11 +91,9 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
 
         final PlayerAuth auth = playerCache.getAuth(name);
 
-        // AuthMeReReloaded start - Fix #57
-        if (isFirstLogin) {
+        if (isFirstLogin) { // Save quit location before login teleport
             auth.setQuitLocation(player.getLocation());
         }
-        // AuthMeReReloaded end - Fix #57
 
         teleportationService.teleportOnLogin(player, auth, limbo);
 
@@ -105,6 +107,9 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
         // The Login event now fires (as intended) after everything is processed
         bukkitService.callEvent(new LoginEvent(player));
 
+        // Login is done, display welcome message
+        welcomeMessageConfiguration.sendWelcomeMessage(player);
+
         // Login is now finished; we can force all commands
         if (isFirstLogin) {
             commandManager.runCommandsOnFirstLogin(player, authsWithSameIp);

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

@@ -11,8 +11,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.VMessageType;
-import fr.xephi.authme.service.velocity.VelocitySender;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.entity.Player;
 
@@ -44,8 +42,6 @@ public class AsynchronousLogout implements AsynchronousProcess {
 
     @Inject
     private BungeeSender bungeeSender;
-    @Inject
-    private VelocitySender velocitySender;
 
     AsynchronousLogout() {
     }
@@ -76,7 +72,6 @@ public class AsynchronousLogout implements AsynchronousProcess {
         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,8 +14,6 @@ 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;
 
@@ -75,7 +73,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(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));
+            player.addPotionEffect(bukkitService.createBlindnessEffect(timeout));
         }
 
         // Set player's data to unauthenticated

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

@@ -27,7 +27,6 @@ public class ProcessSyncPlayerQuit implements SynchronousProcess {
             commandManager.runCommandsOnLogout(player);
         } else {
             limboService.restoreData(player);
-            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

@@ -3,13 +3,11 @@ package fr.xephi.authme.process.register;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.RegisterEvent;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 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

@@ -3,14 +3,12 @@ package fr.xephi.authme.process.register;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.RegisterEvent;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 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/EmailRegisterExecutor.java

@@ -9,13 +9,10 @@ import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.settings.properties.EmailSettings;
-import fr.xephi.authme.util.PlayerUtils;
 import fr.xephi.authme.util.RandomStringUtils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import static fr.xephi.authme.permission.PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS;
 import static fr.xephi.authme.process.register.executors.PlayerAuthBuilderHelper.createPlayerAuth;
@@ -67,10 +64,8 @@ class EmailRegisterExecutor implements RegistrationExecutor<EmailRegisterParams>
     @Override
     public void executePostPersistAction(EmailRegisterParams params) {
         Player player = params.getPlayer();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
-        Date date = new Date(System.currentTimeMillis());
-        boolean couldSendMail = emailService.sendNewPasswordMail(
-            player.getName(), params.getEmail(), params.getPassword(), PlayerUtils.getPlayerIp(player), dateFormat.format(date));
+        boolean couldSendMail = emailService.sendPasswordMail(
+            player.getName(), params.getEmail(), params.getPassword());
         if (couldSendMail) {
             syncProcessManager.processSyncEmailRegister(player);
         } else {

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,15 +16,11 @@ 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;
 
@@ -58,9 +54,6 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     @Inject
     private CommandManager commandManager;
 
-    @Inject
-    private VelocitySender velocitySender;
-
     @Inject
     private BungeeSender bungeeSender;
 
@@ -81,7 +74,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);
@@ -103,8 +95,8 @@ public class AsynchronousUnregister implements AsynchronousProcess {
     public void adminUnregister(CommandSender initiator, String name, Player player) {
         if (dataSource.removeAuth(name)) {
             performPostUnregisterActions(name, player);
-            velocitySender.sendAuthMeVelocityMessage(player, VMessageType.FORCE_UNREGISTER);
             bukkitService.createAndCallEvent(isAsync -> new UnregisterByAdminEvent(player, name, isAsync, initiator));
+
             if (initiator == null) {
                 logger.info(name + " was unregistered");
             } else {
@@ -150,7 +142,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;
-            player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));
+            player.addPotionEffect(bukkitService.createBlindnessEffect(timeout));
         }
     }
 

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

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

src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java

@@ -14,6 +14,7 @@ import fr.xephi.authme.settings.properties.PluginSettings;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
+
 import java.util.Locale;
 
 import static fr.xephi.authme.util.Utils.MILLIS_PER_MINUTE;

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

@@ -3,8 +3,8 @@ package fr.xephi.authme.service;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSourceType;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.BackupSettings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
@@ -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,23 +1,22 @@
 package fr.xephi.authme.service;
 
-import com.github.Anon8281.universalScheduler.UniversalRunnable;
-import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.BanEntry;
 import org.bukkit.BanList;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 import javax.inject.Inject;
 import java.util.Collection;
@@ -26,8 +25,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.
  */
@@ -37,8 +34,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 IS_FOLIA = Utils.isClassLoaded("io.papermc.paper.threadedregions.RegionizedServer");
+
     private final AuthMe authMe;
     private boolean useAsyncTasks;
 
@@ -54,9 +50,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) {
-        runTask(task);
+    public int scheduleSyncDelayedTask(Runnable task) {
+        return Bukkit.getScheduler().scheduleSyncDelayedTask(authMe, task);
     }
 
     /**
@@ -66,13 +63,10 @@ public class BukkitService implements SettingsDependent {
      *
      * @param task Task to be executed
      * @param delay Delay in server ticks before executing task
+     * @return Task id number (-1 if scheduling failed)
      */
-    public void scheduleSyncDelayedTask(Runnable task, long delay) {
-        if (IS_FOLIA) {
-            runTaskLater(task, delay);
-        } else {
-            Bukkit.getScheduler().runTaskLater(authMe, task, delay); // We must do this to keep compatibility
-        }
+    public int scheduleSyncDelayedTask(Runnable task, long delay) {
+        return Bukkit.getScheduler().scheduleSyncDelayedTask(authMe, task, delay);
     }
 
     /**
@@ -84,7 +78,7 @@ public class BukkitService implements SettingsDependent {
      */
     public void scheduleSyncTaskFromOptionallyAsyncTask(Runnable task) {
         if (Bukkit.isPrimaryThread()) {
-            runTask(task);
+            task.run();
         } else {
             scheduleSyncDelayedTask(task);
         }
@@ -94,63 +88,12 @@ 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) {
-        if (IS_FOLIA) {
-            getScheduler().runTask(task);
-        } else {
-            Bukkit.getScheduler().runTask(authMe, task);
-        }
-    }
-
-    public void runTask(Entity entity, Runnable task) {
-        if (IS_FOLIA) {
-            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 (IS_FOLIA) {
-            runTask(task);
-        } else {
-            task.run();
-        }
-    }
-
-    /**
-     * Runs the task synchronously if we are running Folia, else do nothing but run it.
-     * @param task the task to be run
-     */
-    public void runTaskIfFolia(Entity entity, Runnable task) {
-        if (IS_FOLIA) {
-            runTask(entity, task);
-        } else {
-            task.run();
-        }
-    }
-
-    /**
-     * Runs the task synchronously if we are running Folia, else do nothing but run it.
-     * @param task the task to be run
-     */
-    public void runTaskIfFolia(Location location, Runnable task) {
-        if (IS_FOLIA) {
-            runTask(location, task);
-        } else {
-            task.run();
-        }
+    public BukkitTask runTask(Runnable task) {
+        return Bukkit.getScheduler().runTask(authMe, task);
     }
 
     /**
@@ -163,12 +106,8 @@ public class BukkitService implements SettingsDependent {
      * @throws IllegalArgumentException if plugin is null
      * @throws IllegalArgumentException if task is null
      */
-    public MyScheduledTask runTaskLater(Runnable task, long delay) {
-        return getScheduler().runTaskLater(task, delay);
-    }
-
-    public MyScheduledTask runTaskLater(Entity entity, Runnable task, long delay) {
-        return getScheduler().runTaskLater(entity, task, delay);
+    public BukkitTask runTaskLater(Runnable task, long delay) {
+        return Bukkit.getScheduler().runTaskLater(authMe, task, delay);
     }
 
     /**
@@ -181,7 +120,7 @@ public class BukkitService implements SettingsDependent {
         if (useAsyncTasks) {
             runTaskAsynchronously(task);
         } else {
-            runTask(task);
+            task.run();
         }
     }
 
@@ -192,15 +131,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) {
-        if (IS_FOLIA) {
-            getScheduler().runTaskAsynchronously(task);
-        } else {
-            Bukkit.getScheduler().runTaskAsynchronously(authMe, task);
-        }
+    public BukkitTask runTaskAsynchronously(Runnable task) {
+        return Bukkit.getScheduler().runTaskAsynchronously(authMe, task);
     }
 
     /**
@@ -218,7 +154,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);
     }
 
@@ -233,7 +169,7 @@ public class BukkitService implements SettingsDependent {
      * @throws IllegalArgumentException if plugin is null
      * @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);
     }
 
@@ -373,17 +309,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) {
-        player.sendPluginMessage(authMe, "authmevelocity:main", bytes);
-    }
-
-
     /**
      * Adds a ban to the list. If a previous ban exists, this will
      * update the previous entry.
@@ -415,6 +340,16 @@ public class BukkitService implements SettingsDependent {
         }
     }
 
+    /**
+     * 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);
+    }
+
     /**
      * @return the IP string that this server is bound to, otherwise empty string
      */

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

@@ -1,51 +1,83 @@
 package fr.xephi.authme.service;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.maxmind.db.GeoIp2Provider;
-import com.maxmind.db.Reader;
+import com.google.common.hash.HashCode;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import com.maxmind.db.CHMCache;
 import com.maxmind.db.Reader.FileMode;
-import com.maxmind.db.cache.CHMCache;
-import com.maxmind.db.model.Country;
-import com.maxmind.db.model.CountryResponse;
+import com.maxmind.geoip2.DatabaseReader;
+import com.maxmind.geoip2.exception.GeoIp2Exception;
+import com.maxmind.geoip2.model.AbstractCountryResponse;
+import com.maxmind.geoip2.record.Country;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.ProtectionSettings;
+import fr.xephi.authme.util.FileUtils;
 import fr.xephi.authme.util.InternetProtocolUtils;
 
 import javax.inject.Inject;
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.InetAddress;
+import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.FileTime;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.zip.GZIPInputStream;
 
 public class GeoIpService {
 
-    //private static final String LICENSE =
-            //"[LICENSE] This product includes GeoLite2 data created by MaxMind, available at https://www.maxmind.com";
+    private static final String LICENSE =
+            "[LICENSE] This product includes GeoLite2 data created by MaxMind, available at https://www.maxmind.com";
 
     private static final String DATABASE_NAME = "GeoLite2-Country";
     private static final String DATABASE_FILE = DATABASE_NAME + ".mmdb";
+    private static final String DATABASE_TMP_FILE = DATABASE_NAME + ".mmdb.tmp";
 
+    private static final String ARCHIVE_FILE = DATABASE_NAME + ".mmdb.gz";
+
+    private static final String ARCHIVE_URL =
+        "https://updates.maxmind.com/geoip/databases/" + DATABASE_NAME + "/update";
+
+    private static final int UPDATE_INTERVAL_DAYS = 30;
 
     private final ConsoleLogger logger = ConsoleLoggerFactory.get(GeoIpService.class);
     private final Path dataFile;
+    private final BukkitService bukkitService;
+    private final Settings settings;
 
-    private GeoIp2Provider databaseReader;
+    private DatabaseReader databaseReader;
     private volatile boolean downloading;
 
     @Inject
-     GeoIpService(@DataFolder File dataFolder){
+    public GeoIpService(@DataFolder File dataFolder, BukkitService bukkitService, Settings settings) {
+        this.bukkitService = bukkitService;
         this.dataFile = dataFolder.toPath().resolve(DATABASE_FILE);
+        this.settings = settings;
 
-        // Fires download of recent data or the initialization of the look up service
+        // Fires download of recent data or the initialization of the look-up service
         isDataAvailable();
     }
 
     @VisibleForTesting
-    GeoIpService(@DataFolder File dataFolder, GeoIp2Provider reader) {
+    GeoIpService(@DataFolder File dataFolder, BukkitService bukkitService, Settings settings, DatabaseReader reader) {
+        this.bukkitService = bukkitService;
+        this.settings = settings;
         this.dataFile = dataFolder.toPath().resolve(DATABASE_FILE);
 
         this.databaseReader = reader;
@@ -57,6 +89,12 @@ public class GeoIpService {
      * @return True if the data is available, false otherwise.
      */
     private synchronized boolean isDataAvailable() {
+
+        // If this feature is disabled, just stop
+        if (!settings.getProperty(ProtectionSettings.ENABLE_GEOIP)) {
+            return false;
+        }
+
         if (downloading) {
             // we are currently downloading the database
             return false;
@@ -69,46 +107,143 @@ public class GeoIpService {
 
         if (Files.exists(dataFile)) {
             try {
+                FileTime lastModifiedTime = Files.getLastModifiedTime(dataFile);
+                if (Duration.between(lastModifiedTime.toInstant(), Instant.now()).toDays() <= UPDATE_INTERVAL_DAYS) {
                     startReading();
+
+                    // don't fire the update task - we are up-to-date
                     return true;
+                } else {
+                    logger.debug("GEO IP database is older than " + UPDATE_INTERVAL_DAYS + " Days");
+                }
             } catch (IOException ioEx) {
                 logger.logException("Failed to load GeoLiteAPI database", ioEx);
                 return false;
             }
         }
 
+        //set the downloading flag in order to fix race conditions outside
+        downloading = true;
+
         // File is outdated or doesn't exist - let's try to download the data file!
         // use bukkit's cached threads
+        bukkitService.runTaskAsynchronously(this::updateDatabase);
         return false;
     }
 
     /**
-     *
+     * Tries to update the database by downloading a new version from the website.
      */
+    private void updateDatabase() {
+        logger.info("Downloading GEO IP database, because the old database is older than "
+                + UPDATE_INTERVAL_DAYS + " days or doesn't exist");
+
+        Path downloadFile = null;
+        Path tempFile = null;
+        try {
+            // download database to temporarily location
+            downloadFile = Files.createTempFile(ARCHIVE_FILE, null);
+            tempFile = Files.createTempFile(DATABASE_TMP_FILE, null);
+            String expectedChecksum = downloadDatabaseArchive(downloadFile);
+            if (expectedChecksum == null) {
+                logger.info("There is no newer GEO IP database uploaded to MaxMind. Using the old one for now.");
+                startReading();
+                return;
+            }
+
+            // tar extract database and copy to target destination
+            extractDatabase(downloadFile, tempFile);
+
+            // MD5 checksum verification
+            //noinspection deprecation
+            verifyChecksum(Hashing.md5(), tempFile, expectedChecksum);
+
+            Files.copy(tempFile, dataFile, StandardCopyOption.REPLACE_EXISTING);
+
+            //only set this value to false on success otherwise errors could lead to endless download triggers
+            logger.info("Successfully downloaded new GEO IP database to " + dataFile);
+            startReading();
+        } catch (IOException ioEx) {
+            logger.logException("Could not download GeoLiteAPI database", ioEx);
+        } finally {
+            // clean up
+            if (downloadFile != null) {
+                FileUtils.delete(downloadFile.toFile());
+            }
+            if (tempFile != null) {
+                FileUtils.delete(tempFile.toFile());
+            }
+        }
+    }
 
     private void startReading() throws IOException {
-        databaseReader = new Reader(dataFile.toFile(), FileMode.MEMORY, new CHMCache());
+        databaseReader = new DatabaseReader.Builder(dataFile.toFile())
+            .withCache(new CHMCache())
+            .fileMode(FileMode.MEMORY)
+            .build();
+        logger.info(LICENSE);
 
         // clear downloading flag, because we now have working reader instance
         downloading = false;
     }
 
     /**
-     * Downloads the archive to the destination file if it's newer than the locally version.
+     * Downloads the archive to the destination file if it's newer than the local version.
      *
      * @param lastModified modification timestamp of the already present file
      * @param destination save file
      * @return null if no updates were found, the MD5 hash of the downloaded archive if successful
      * @throws IOException if failed during downloading and writing to destination file
      */
+    private String downloadDatabaseArchive(Instant lastModified, Path destination) throws IOException {
+        String clientId = settings.getProperty(ProtectionSettings.MAXMIND_API_CLIENT_ID);
+        String licenseKey = settings.getProperty(ProtectionSettings.MAXMIND_API_LICENSE_KEY);
+        if (clientId.isEmpty() || licenseKey.isEmpty()) {
+            logger.warning("No MaxMind credentials found in the configuration file!"
+                + " GeoIp protections will be disabled.");
+            return null;
+        }
+
+        HttpURLConnection connection = (HttpURLConnection) new URL(ARCHIVE_URL).openConnection();
+        String basicAuth = "Basic " + new String(Base64.getEncoder().encode((clientId + ":" + licenseKey).getBytes()));
+        connection.setRequestProperty("Authorization", basicAuth);
+
+        if (lastModified != null) {
+            // Only download if we actually need a newer version - this field is specified in GMT zone
+            ZonedDateTime zonedTime = lastModified.atZone(ZoneId.of("GMT"));
+            String timeFormat = DateTimeFormatter.RFC_1123_DATE_TIME.format(zonedTime);
+            connection.addRequestProperty("If-Modified-Since", timeFormat);
+        }
+
+        if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
+            //we already have the newest version
+            connection.getInputStream().close();
+            return null;
+        }
+
+        String hash = connection.getHeaderField("X-Database-MD5");
+        String rawModifiedDate = connection.getHeaderField("Last-Modified");
+        Instant modifiedDate = Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(rawModifiedDate));
+        Files.copy(connection.getInputStream(), destination, StandardCopyOption.REPLACE_EXISTING);
+        Files.setLastModifiedTime(destination, FileTime.from(modifiedDate));
+        return hash;
+    }
 
     /**
-     * Downloads the archive to the destination file if it's newer than the locally version.
+     * Downloads the archive to the destination file if it's newer than the local version.
      *
      * @param destination save file
      * @return null if no updates were found, the MD5 hash of the downloaded archive if successful
      * @throws IOException if failed during downloading and writing to destination file
      */
+    private String downloadDatabaseArchive(Path destination) throws IOException {
+        Instant lastModified = null;
+        if (Files.exists(dataFile)) {
+            lastModified = Files.getLastModifiedTime(dataFile).toInstant();
+        }
+
+        return downloadDatabaseArchive(lastModified, destination);
+    }
 
     /**
      * Verify if the expected checksum is equal to the checksum of the given file.
@@ -118,6 +253,14 @@ public class GeoIpService {
      * @param expectedChecksum the expected checksum
      * @throws IOException on I/O error reading the file or the checksum verification failed
      */
+    private void verifyChecksum(HashFunction function, Path file, String expectedChecksum) throws IOException {
+        HashCode actualHash = function.hashBytes(Files.readAllBytes(file));
+        HashCode expectedHash = HashCode.fromString(expectedChecksum);
+        if (!Objects.equals(actualHash, expectedHash)) {
+            throw new IOException("GEO IP Checksum verification failed. "
+                + "Expected: " + expectedChecksum + "Actual:" + actualHash);
+        }
+    }
 
     /**
      * Extract the database from gzipped data. Existing outputFile will be replaced if it already exists.
@@ -126,6 +269,18 @@ public class GeoIpService {
      * @param outputFile destination file for the database
      * @throws IOException on I/O error reading the archive, or writing the output
      */
+    private void extractDatabase(Path inputFile, Path outputFile) throws IOException {
+        // .gz -> gzipped file
+        try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(inputFile));
+             GZIPInputStream gzipIn = new GZIPInputStream(in)) {
+
+            // found the database file and copy file
+            Files.copy(gzipIn, outputFile, StandardCopyOption.REPLACE_EXISTING);
+
+            // update the last modification date to be same as in the archive
+            Files.setLastModifiedTime(outputFile, Files.getLastModifiedTime(inputFile));
+        }
+    }
 
     /**
      * Get the country code of the given IP address.
@@ -175,11 +330,11 @@ public class GeoIpService {
             InetAddress address = InetAddress.getByName(ip);
 
             // Reader.getCountry() can be null for unknown addresses
-            return Optional.ofNullable(databaseReader.getCountry(address)).map(CountryResponse::getCountry);
+            return Optional.ofNullable(databaseReader.country(address)).map(AbstractCountryResponse::getCountry);
         } catch (UnknownHostException e) {
             // Ignore invalid ip addresses
-            // Legacy GEO IP Database returned a unknown country object with Country-Code: '--' and Country-Name: 'N/A'
-        } catch (IOException ioEx) {
+            // Legacy GEO IP Database returned an unknown country object with Country-Code: '--' and Country-Name: 'N/A'
+        } catch (GeoIp2Exception | IOException ioEx) {
             logger.logException("Cannot lookup country for " + ip + " at GEO IP database", ioEx);
         }
 

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

@@ -4,10 +4,10 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.HasCleanup;
 import fr.xephi.authme.initialization.Reloadable;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -20,8 +20,6 @@ import org.bukkit.entity.Player;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
@@ -74,10 +72,9 @@ public class PasswordRecoveryService implements Reloadable, HasCleanup {
         if (!checkEmailCooldown(player)) {
             return;
         }
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
-        Date date = new Date(System.currentTimeMillis());
+
         String recoveryCode = recoveryCodeService.generateCode(player.getName());
-        boolean couldSendMail = emailService.sendRecoveryCode(player.getName(), email, recoveryCode, dateFormat.format(date));
+        boolean couldSendMail = emailService.sendRecoveryCode(player.getName(), email, recoveryCode);
         if (couldSendMail) {
             commonService.send(player, MessageKey.RECOVERY_CODE_SENT);
             emailCooldown.add(player.getName().toLowerCase(Locale.ROOT));
@@ -97,8 +94,6 @@ public class PasswordRecoveryService implements Reloadable, HasCleanup {
         if (!checkEmailCooldown(player)) {
             return;
         }
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
-        Date date = new Date(System.currentTimeMillis());
 
         String name = player.getName();
         String thePass = RandomStringUtils.generate(commonService.getProperty(RECOVERY_PASSWORD_LENGTH));
@@ -107,7 +102,7 @@ public class PasswordRecoveryService implements Reloadable, HasCleanup {
         logger.info("Generating new password for '" + name + "'");
 
         dataSource.updatePassword(name, hashNew);
-        boolean couldSendMail = emailService.sendPasswordMail(name, email, thePass, dateFormat.format(date));
+        boolean couldSendMail = emailService.sendPasswordMail(name, email, thePass);
         if (couldSendMail) {
             commonService.send(player, MessageKey.RECOVERY_EMAIL_SENT_MESSAGE);
             emailCooldown.add(player.getName().toLowerCase(Locale.ROOT));

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

@@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.RestoreSessionEvent;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.entity.Player;

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

@@ -14,8 +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.settings.properties.SecuritySettings;
-import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -144,7 +142,6 @@ public class TeleportationService implements Reloadable {
         } else if (settings.getProperty(TELEPORT_UNAUTHED_TO_SPAWN)) {
             if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
                 Location location = buildLocationFromAuth(player, auth);
-                if (location.equals(player.getLocation())) return;
                 logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
                 teleportBackFromSpawn(player, location);
             } else if (limbo != null && limbo.getLocation() != null) {
@@ -187,9 +184,7 @@ public class TeleportationService implements Reloadable {
     private void performTeleportation(final Player player, final AbstractTeleportEvent event) {
         bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
             bukkitService.callEvent(event);
-            if (player.isOnline() && isEventValid(event) && settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT)) {
-                TeleportUtils.teleport(player, event.getTo());
-            } else if (player.isOnline() && isEventValid(event)) {
+            if (player.isOnline() && isEventValid(event)) {
                 player.teleport(event.getTo());
             }
         });

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

@@ -7,27 +7,24 @@ import com.google.common.collect.Multimap;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
-import fr.xephi.authme.security.HashUtils;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.ProtectionSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.PlayerUtils;
+import fr.xephi.authme.util.StringUtils;
 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.URL;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -53,7 +50,6 @@ public class ValidationService implements Reloadable {
     private GeoIpService geoIpService;
 
     private Pattern passwordRegex;
-    private Pattern emailRegex;
     private Multimap<String, String> restrictedNames;
 
     ValidationService() {
@@ -66,8 +62,6 @@ public class ValidationService implements Reloadable {
         restrictedNames = settings.getProperty(RestrictionSettings.ENABLE_RESTRICTED_USERS)
             ? loadNameRestrictions(settings.getProperty(RestrictionSettings.RESTRICTED_USERS))
             : HashMultimap.create();
-
-        emailRegex = Utils.safePatternCompile(settings.getProperty(RestrictionSettings.ALLOWED_EMAIL_REGEX));
     }
 
     /**
@@ -88,15 +82,7 @@ public class ValidationService implements Reloadable {
             return new ValidationResult(MessageKey.INVALID_PASSWORD_LENGTH);
         } else if (settings.getProperty(SecuritySettings.UNSAFE_PASSWORDS).contains(passLow)) {
             return new ValidationResult(MessageKey.PASSWORD_UNSAFE_ERROR);
-        } else if (settings.getProperty(SecuritySettings.HAVE_I_BEEN_PWNED_CHECK)) {
-            HaveIBeenPwnedResults results = validatePasswordHaveIBeenPwned(password);
-            if (results != null
-            && results.isPwned()
-            && results.getPwnCount() > settings.getProperty(SecuritySettings.HAVE_I_BEEN_PWNED_LIMIT)) {
-            return new ValidationResult(MessageKey.PASSWORD_PWNED_ERROR, String.valueOf(results.getPwnCount()));
         }
-    }
-
         return new ValidationResult();
     }
 
@@ -107,7 +93,12 @@ public class ValidationService implements Reloadable {
      * @return true if the email is valid, false otherwise
      */
     public boolean validateEmail(String email) {
-        return emailRegex.matcher(email).matches();
+        if (Utils.isEmailEmpty(email) || !StringUtils.isInsideString('@', email)) {
+            return false;
+        }
+        final String emailDomain = email.split("@")[1];
+        return validateWhitelistAndBlacklist(
+            emailDomain, EmailSettings.DOMAIN_WHITELIST, EmailSettings.DOMAIN_BLACKLIST);
     }
 
     /**
@@ -237,46 +228,6 @@ public class ValidationService implements Reloadable {
         }
         return restrictions;
     }
-    /**
-     * Check haveibeenpwned.com for the given password.
-     *
-     * @param password password to check for
-     * @return Results of the check
-     */
-    public HaveIBeenPwnedResults validatePasswordHaveIBeenPwned(String password) {
-        String hash = HashUtils.sha1(password);
-
-        String hashPrefix = hash.substring(0, 5);
-
-        try {
-            String url = String.format("https://api.pwnedpasswords.com/range/%s", hashPrefix);
-            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
-            connection.setRequestMethod("GET");
-            connection.setRequestProperty("User-Agent", "AuthMeReloaded");
-            connection.setConnectTimeout(5000);
-            connection.setReadTimeout(5000);
-            connection.setDoInput(true);
-            StringBuilder outStr = new StringBuilder();
-
-            try (DataInputStream input = new DataInputStream(connection.getInputStream())) {
-                for (int c = input.read(); c != -1; c = input.read())
-                    outStr.append((char) c);
-            }
-
-            String[] hashes = outStr.toString().split("\n");
-            for (String hashSuffix : hashes) {
-                String[] hashSuffixParts = hashSuffix.trim().split(":");
-                if (hashSuffixParts[0].equalsIgnoreCase(hash.substring(5))) {
-                    return new HaveIBeenPwnedResults(true, Integer.parseInt(hashSuffixParts[1]));
-                }
-            }
-            return new HaveIBeenPwnedResults(false, 0);
-        } catch (java.io.IOException e) {
-            logger.warning("Error occurred while checking password online, check your connection.\nWhen this error shows, the player's password won't be check");
-            return null;
-        }
-    }
-
 
     public static final class ValidationResult {
         private final MessageKey messageKey;
@@ -318,22 +269,4 @@ public class ValidationService implements Reloadable {
             return args;
         }
     }
-
-    public static final class HaveIBeenPwnedResults {
-        private final boolean isPwned;
-        private final int pwnCount;
-
-        public HaveIBeenPwnedResults(boolean isPwned, int pwnCount) {
-            this.isPwned = isPwned;
-            this.pwnCount = pwnCount;
-        }
-
-        public boolean isPwned() {
-            return isPwned;
-        }
-
-        public int getPwnCount() {
-            return pwnCount;
-        }
-    }
 }

src/main/java/fr/xephi/authme/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());
-    }
-
-}