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/dependabot.yml

@@ -9,6 +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"
-  - dependency-name: "org.mockito:mockito-core" # Mockito 5 requires Java 11
     versions: ">= 5"
+  - dependency-name: ch.jalu:configme

.github/workflows/maven.yml

@@ -10,7 +10,7 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        jdkversion: [11]
+        jdkversion: [17, 21]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

.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/"

README.md

@@ -5,7 +5,6 @@
 
 | Type              | Badges                                                                                                                                                                                                                                                                                                                                                                                |
 |-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **General:**      | ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=code) ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=files)                                                                                                                                                                                                                                              |
 | **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)                                                                                                                                                                                                                                                             |
@@ -104,7 +103,7 @@ You can also create your own translation file and, if you want, you can share it
         <dependency>
             <groupId>fr.xephi</groupId>
             <artifactId>authme</artifactId>
-            <version>5.6.0-SNAPSHOT</version>
+            <version>5.6.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -116,19 +115,17 @@ You can also create your own translation file and, if you want, you can share it
 ## Requirements
 
 ##### Compiling requirements:
->- JDK 11 (JDK 17 is recommended)
+>- JDK 17+
->- Maven
+>- Maven (3.8.8+)
->- Git/Github (Optional)
+>- Git/GitHub (Optional)
 
 ##### How to compile the project:
 >- Clone the project with Git/GitHub
 >- Execute command "mvn clean package"
 
 ##### Running requirements:
->- Java 8 (Java 17 is recommended)
+>- Java 17+
->- Paper or Spigot (1.8.X and up)<br>
+>- Paper or Spigot (1.16.5 and up)
-   (In case you use Thermos, Cauldron or similar, you have to update the SpecialSource library to support Java 8 plugins.
-   HowTo: https://github.com/games647/FastLogin/issues/111#issuecomment-272331347)
 >- ProtocolLib (optional, required by some features)
 
 ## Credits

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>fr.xephi</groupId>
     <artifactId>authme</artifactId>
-    <version>5.6.0-SNAPSHOT</version>
+    <version>5.7.0-SNAPSHOT</version>
 
     <name>AuthMeReloaded</name>
     <description>The first authentication plugin for the Bukkit API!</description>
@@ -60,14 +60,11 @@
         <!-- 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.source>17</java.source>
-        <java.target>1.8</java.target>
+        <java.target>17</java.target>
-        <java.apiVersion>8</java.apiVersion>
+        <java.apiVersion>17</java.apiVersion>
-        <java.compiler.minimumVersion>11</java.compiler.minimumVersion>
+        <java.compiler.minimumVersion>17</java.compiler.minimumVersion>
-        <maven.minimumVersion>3.6.3</maven.minimumVersion>
+        <maven.minimumVersion>3.8.8</maven.minimumVersion>
-
-        <!-- Dependencies versions -->
-        <spigot.version>1.19.2-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
@@ -80,6 +77,29 @@
         <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 -->
@@ -127,8 +147,10 @@
 
     <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>
@@ -154,7 +176,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.7.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -164,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>
@@ -177,7 +199,7 @@
                                     <version>${maven.minimumVersion}</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>[11,)</version>
+                                    <version>[${java.compiler.minimumVersion},)</version>
                                 </requireJavaVersion>
                             </rules>
                             <fail>true</fail>
@@ -189,19 +211,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.2.0</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.0</version>
+                <version>3.3.1</version>
             </plugin>
             <!-- Compile and include classes -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.source}</source>
                     <target>${java.target}</target>
@@ -212,7 +234,13 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <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>
@@ -232,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>
@@ -248,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>
@@ -257,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>
@@ -272,7 +301,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.1</version>
                 <configuration>
                     <finalName>${project.finalNameBase}</finalName>
                 </configuration>
@@ -289,61 +318,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</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>
-                            <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>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>shaded-jar-legacy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${project.finalNameBase}-legacy</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>
-                            </relocations>
-                        </configuration>
                     </execution>
+                    -->
                 </executions>
                 <configuration>
                     <!-- Don't create the reduced pom file, as we don't deploy the shaded jar -->
@@ -353,89 +338,14 @@
                     <!-- Use the base jar name, to help server owners download the right jar -->
                     <finalName>${project.finalNameBase}</finalName>
 
-                    <!--
+                    <!-- Disable, no relocations atm
-                    Relocate all lib we use in order to fix class loading errors if we use different versions
+                    <relocations>
-                    than already loaded libs
-                    -->
-                    <relocations combine.children="append">
                         <relocation>
-                            <pattern>ch.jalu</pattern>
+                            <pattern></pattern>
-                            <shadedPattern>fr.xephi.authme.libs.ch.jalu</shadedPattern>
+                            <shadedPattern>fr.xephi.authme.libs.</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.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>
                     </relocations>
+                    -->
 
                     <filters>
                         <!-- Ignore manifest signatures for shading the project into an uber-jar to fix -->
@@ -467,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>
@@ -602,54 +512,39 @@
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>injector</artifactId>
-            <version>1.0</version>
+            <version>${dependencies.injector.version}</version>
-            <optional>true</optional>
+            <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>
+            <version>${dependencies.string-similarity.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency -->
+        <!-- MaxMind GEO IP -->
-        <!-- GSON is already included and therefore it reduces the file size in comparison to the original version -->
         <dependency>
-            <groupId>com.maxmind.db</groupId>
+            <groupId>com.maxmind.geoip2</groupId>
-            <artifactId>maxmind-db-gson</artifactId>
+            <artifactId>geoip2</artifactId>
-            <version>2.0.3</version>
+            <version>${dependencies.geoip2.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.gson</groupId>
-                    <artifactId>gson</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Library for tar archives -->
         <dependency>
             <groupId>javatar</groupId>
             <artifactId>javatar</artifactId>
-            <version>2.5</version>
+            <version>${dependencies.javatar.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Java Email Library -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>${dependencies.commons-email.version}</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.8.1</version> <!-- Log4J version bundled in 1.12.2 -->
             <scope>provided</scope>
         </dependency>
 
@@ -657,88 +552,62 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version> <!-- Latest java 8 release -->
+            <version>${dependencies.hikaricp.version}</version>
-            <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.2.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>3.3.0</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>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>junit</artifactId>
+                    <groupId>org.slf4j</groupId>
-                    <groupId>junit</groupId>
+                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>bungeecord-chat</artifactId>
-                    <groupId>net.md-5</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.googlecode.json-simple</groupId>
-                    <artifactId>json-simple</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--  Keep in sync with spigot 1.19  -->
         <dependency>
-            <groupId>com.google.guava</groupId>
+            <groupId>org.slf4j</groupId>
-            <artifactId>guava</artifactId>
+            <artifactId>slf4j-simple</artifactId>
-            <version>31.0.1-jre</version>
+            <version>${dependencies.slf4j.version}</version>
-            <optional>true</optional>
+            <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>
@@ -746,22 +615,45 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--  Keep in sync with spigot 1.19  -->
+
+        <!-- PBKDF2 implementation -->
         <dependency>
-            <groupId>com.google.code.gson</groupId>
+            <groupId>de.rtner</groupId>
-            <artifactId>gson</artifactId>
+            <artifactId>PBKDF2</artifactId>
-            <version>2.8.9</version>
+            <version>${dependencies.pbkdf2.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Bukkit Libraries  -->
+        <!-- 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.0</version>
+            <version>${dependencies.configme.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>
@@ -770,19 +662,47 @@
             </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.0</version>
+            <version>${dependencies.bstats.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- Plugin Hooks -->
+
         <!-- ProtocolLib -->
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
+            <version>5.1.0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -971,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>
@@ -987,60 +899,42 @@
             <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.2</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>4.8.1</version>
+            <version>4.11.0</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>hamcrest-core</artifactId>
-                    <groupId>org.hamcrest</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Required to mock the LuckPerms API-->
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.40.0</version>
+            <version>3.44.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -1048,13 +942,19 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.44.0.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.220</version>
+            <version>2.2.224</version>
             <scope>test</scope>
         </dependency>
 

samples/NewConfig.yml

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

samples/NewPlugin.yml

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

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

@@ -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,6 +53,8 @@ public class OnStartupTasks {
      * @param settings the settings
      */
     public static void sendMetrics(AuthMe plugin, Settings settings) {
+        // 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",
@@ -109,6 +111,6 @@ public class OnStartupTasks {
                     }
                 });
             }
-        }, 1, TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
+        }, 1, (long) TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
     }
 }

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

@@ -34,14 +34,13 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
 
 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;
@@ -116,8 +115,8 @@ class InventoryPacketAdapter extends PacketAdapter {
 
         try {
             protocolManager.sendServerPacket(player, inventoryPacket, false);
-        } catch (InvocationTargetException invocationExc) {
+        } catch (Exception exception) {
-            logger.logException("Error during sending blank inventory", invocationExc);
+            logger.logException("Error during sending blank inventory", exception);
         }
     }
 }

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

@@ -5,8 +5,8 @@ import fr.xephi.authme.data.ProxySessionManager;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.ProtectInventoryEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.process.login.AsynchronousLogin;
@@ -27,11 +27,8 @@ import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
 import javax.inject.Inject;
-
 import java.util.Locale;
 
 import static fr.xephi.authme.service.BukkitService.TICKS_PER_SECOND;
@@ -197,7 +194,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
             if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
                 // Allow infinite blindness effect
                 int blindTimeOut = (registrationTimeout <= 0) ? 99999 : registrationTimeout;
-                player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2));
+                player.addPotionEffect(bukkitService.createBlindnessEffect(blindTimeOut));
             }
             commandManager.runCommandsOnJoin(player);
         });

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

@@ -90,6 +90,11 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
         }
 
         final PlayerAuth auth = playerCache.getAuth(name);
+
+        if (isFirstLogin) { // Save quit location before login teleport
+            auth.setQuitLocation(player.getLocation());
+        }
+
         teleportationService.teleportOnLogin(player, auth, limbo);
 
         // We can now display the join message (if delayed)

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

@@ -3,9 +3,9 @@ package fr.xephi.authme.process.logout;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.LogoutEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.listener.protocollib.ProtocolLibService;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
@@ -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/unregister/AsynchronousUnregister.java

@@ -7,22 +7,20 @@ import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.UnregisterByAdminEvent;
 import fr.xephi.authme.events.UnregisterByPlayerEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.service.BukkitService;
 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.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
-import fr.xephi.authme.service.bungeecord.BungeeSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
 import javax.inject.Inject;
 
@@ -144,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/service/BukkitService.java

@@ -13,6 +13,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 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;
 
@@ -338,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

@@ -4,12 +4,12 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import com.maxmind.db.GeoIp2Provider;
+import com.maxmind.db.CHMCache;
-import com.maxmind.db.Reader;
 import com.maxmind.db.Reader.FileMode;
-import com.maxmind.db.cache.CHMCache;
+import com.maxmind.geoip2.DatabaseReader;
-import com.maxmind.db.model.Country;
+import com.maxmind.geoip2.exception.GeoIp2Exception;
-import com.maxmind.db.model.CountryResponse;
+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;
@@ -61,21 +61,21 @@ public class GeoIpService {
     private final BukkitService bukkitService;
     private final Settings settings;
 
-    private GeoIp2Provider databaseReader;
+    private DatabaseReader databaseReader;
     private volatile boolean downloading;
 
     @Inject
-    GeoIpService(@DataFolder File dataFolder, BukkitService bukkitService, Settings settings) {
+    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, BukkitService bukkitService, Settings settings, 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);
@@ -111,7 +111,7 @@ public class GeoIpService {
                 if (Duration.between(lastModifiedTime.toInstant(), Instant.now()).toDays() <= UPDATE_INTERVAL_DAYS) {
                     startReading();
 
-                    // don't fire the update task - we are up to date
+                    // 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");
@@ -155,6 +155,7 @@ public class GeoIpService {
             extractDatabase(downloadFile, tempFile);
 
             // MD5 checksum verification
+            //noinspection deprecation
             verifyChecksum(Hashing.md5(), tempFile, expectedChecksum);
 
             Files.copy(tempFile, dataFile, StandardCopyOption.REPLACE_EXISTING);
@@ -176,7 +177,10 @@ public class GeoIpService {
     }
 
     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
@@ -184,7 +188,7 @@ public class GeoIpService {
     }
 
     /**
-     * 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
@@ -226,7 +230,7 @@ public class GeoIpService {
     }
 
     /**
-     * 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
@@ -326,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'
+            // Legacy GEO IP Database returned an unknown country object with Country-Code: '--' and Country-Name: 'N/A'
-        } catch (IOException ioEx) {
+        } catch (GeoIp2Exception | IOException ioEx) {
             logger.logException("Cannot lookup country for " + ip + " at GEO IP database", ioEx);
         }
 

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

@@ -140,7 +140,7 @@ public class TeleportationService implements Reloadable {
             logger.debug("Teleporting `{0}` to spawn because of 'force-spawn after login'", player.getName());
             teleportToSpawn(player, true);
         } else if (settings.getProperty(TELEPORT_UNAUTHED_TO_SPAWN)) {
-            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) {
+            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
                 Location location = buildLocationFromAuth(player, auth);
                 logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
                 teleportBackFromSpawn(player, location);

src/main/resources/plugin.yml

@@ -1,10 +1,13 @@
+# noinspection YAMLSchemaValidation
 name: ${pluginDescription.name}
+# noinspection YAMLSchemaValidation
 authors: [${pluginDescription.authors}]
 website: ${project.url}
 description: ${project.description}
+# noinspection YAMLSchemaValidation
 main: ${pluginDescription.main}
 version: ${pluginDescription.version}
-api-version: 1.13
+api-version: 1.16
 softdepend:
     - Vault
     - LuckPerms
@@ -15,6 +18,24 @@ softdepend:
     - Essentials
     - EssentialsSpawn
     - ProtocolLib
+libraries:
+  - ch.jalu:injector:${dependencies.injector.version}
+  - net.ricecode:string-similarity:${dependencies.string-similarity.version}
+  - com.maxmind.geoip2:geoip2:${dependencies.geoip2.version}
+  - javatar:javatar:${dependencies.javatar.version}
+  - org.apache.commons:commons-email:${dependencies.commons-email.version}
+  - com.zaxxer:HikariCP:${dependencies.hikaricp.version}
+  - org.slf4j:slf4j-simple:${dependencies.slf4j.version}
+  - ch.jalu:datasourcecolumns:${dependencies.datasourcecolumns.version}
+  - com.mysql:mysql-connector-j:${dependencies.mysql-connector-j.version}
+  - org.mariadb.jdbc:mariadb-java-client:${dependencies.mariadb-java-client.version}
+  - org.postgresql:postgresql:${dependencies.postgresql.version}
+  - de.rtner:PBKDF2:${dependencies.pbkdf2.version}
+  - de.mkammerer:argon2-jvm-nolibs:${dependencies.argon2-jvm-nolibs.version}
+  - at.favre.lib:bcrypt:${dependencies.bcrypt.version}
+  - com.warrenstrange:googleauth:${dependencies.googleauth.version}
+  - ch.jalu:configme:${dependencies.configme.version}
+  - org.bstats:bstats-bukkit:${dependencies.bstats.version}
 commands:
   authme:
     description: AuthMe op commands

src/test/java/fr/xephi/authme/AuthMeInitializationTest.java

@@ -41,7 +41,7 @@ import java.util.logging.Logger;
 import static fr.xephi.authme.settings.properties.AuthMeSettingsRetriever.buildConfigurationData;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;

src/test/java/fr/xephi/authme/ClassesConsistencyTest.java

@@ -33,7 +33,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/CodeClimateConfigTest.java

@@ -10,7 +10,7 @@ import java.util.List;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/ConsoleLoggerTest.java

@@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doThrow;

src/test/java/fr/xephi/authme/command/CommandConsistencyTest.java

@@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Checks that the commands declared in plugin.yml correspond

src/test/java/fr/xephi/authme/command/CommandHandlerTest.java

@@ -31,7 +31,7 @@ import static fr.xephi.authme.command.FoundResultStatus.SUCCESS;
 import static fr.xephi.authme.command.FoundResultStatus.UNKNOWN_LABEL;
 import static java.util.Arrays.asList;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;

src/test/java/fr/xephi/authme/command/CommandInitializerTest.java

@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/command/CommandMapperTest.java

@@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;

src/test/java/fr/xephi/authme/command/CommandUtilsTest.java

@@ -10,7 +10,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link CommandUtils}.

src/test/java/fr/xephi/authme/command/executable/HelpCommandTest.java

@@ -27,7 +27,7 @@ import static fr.xephi.authme.command.help.HelpProvider.SHOW_DESCRIPTION;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToRunTaskAsynchronously;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/authme/AuthMeCommandTest.java

@@ -8,7 +8,7 @@ import org.mockito.ArgumentCaptor;
 import java.util.Collections;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/command/executable/authme/ConverterCommandTest.java

@@ -24,7 +24,7 @@ import java.util.Set;
 import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToRunTaskAsynchronously;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doThrow;

src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java

@@ -17,7 +17,7 @@ import java.util.Date;
 
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

src/test/java/fr/xephi/authme/command/executable/authme/PurgeCommandTest.java

@@ -15,7 +15,7 @@ import java.util.Collections;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java

@@ -26,7 +26,7 @@ import java.util.Locale;
 import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToRunTaskOptionallyAsync;
 import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToScheduleSyncTaskFromOptionallyAsyncTask;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/authme/debug/DataStatisticsTest.java

@@ -31,7 +31,7 @@ import java.util.Optional;
 
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugCommandTest.java

@@ -23,7 +23,7 @@ import static java.util.Collections.emptyList;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;

src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionConsistencyTest.java

@@ -13,7 +13,7 @@ import java.util.Set;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionUtilsTest.java

@@ -18,7 +18,7 @@ import java.util.function.Function;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**

src/test/java/fr/xephi/authme/command/executable/authme/debug/HasPermissionCheckerTest.java

@@ -23,7 +23,7 @@ import static java.util.Collections.emptyList;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerColumnsTest.java

@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerTest.java

@@ -21,7 +21,7 @@ import java.sql.SQLException;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/command/executable/authme/debug/PlayerAuthViewerTest.java

@@ -14,7 +14,7 @@ import java.util.Collections;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommandTest.java

@@ -21,7 +21,7 @@ import java.util.Collections;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;

src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java

@@ -16,7 +16,7 @@ import java.util.Arrays;
 import java.util.Collections;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;

src/test/java/fr/xephi/authme/command/executable/email/ChangeEmailCommandTest.java

@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.Collections;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/command/executable/email/RecoverEmailCommandTest.java

@@ -26,7 +26,7 @@ import java.util.Locale;
 
 import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToRunTaskAsynchronously;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/command/executable/login/LoginCommandTest.java

@@ -15,7 +15,7 @@ import java.util.Collections;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;

src/test/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommandTest.java

@@ -19,7 +19,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.Collections;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;

src/test/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommandTest.java

@@ -17,7 +17,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import static java.util.Collections.singletonList;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.only;

src/test/java/fr/xephi/authme/command/executable/unregister/UnregisterCommandTest.java

@@ -17,7 +17,7 @@ import java.util.Collections;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/command/executable/verification/VerificationCommandTest.java

@@ -15,7 +15,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.Collections;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/command/help/HelpMessageAndHelpSectionConsistencyTest.java

@@ -7,7 +7,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/command/help/HelpMessagesConsistencyTest.java

@@ -18,7 +18,7 @@ import java.util.List;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests that /messages/help_en.yml contains texts that correspond

src/test/java/fr/xephi/authme/command/help/HelpMessagesServiceTest.java

@@ -24,7 +24,7 @@ import static fr.xephi.authme.command.TestCommandsUtil.getCommandWithLabel;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/command/help/HelpProviderTest.java

@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;

src/test/java/fr/xephi/authme/data/QuickCommandsProtectionManagerTest.java

@@ -11,7 +11,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/data/TempbanManagerTest.java

@@ -24,7 +24,7 @@ import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceTo
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.lessThan;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/data/VerificationCodeManagerTest.java

@@ -15,7 +15,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.only;

src/test/java/fr/xephi/authme/data/captcha/LoginCaptchaManagerTest.java

@@ -12,7 +12,7 @@ import java.util.Locale;
 import static fr.xephi.authme.AuthMeMatchers.stringWithLength;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/data/captcha/RegistrationCaptchaManagerTest.java

@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import static fr.xephi.authme.AuthMeMatchers.stringWithLength;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManagerTest.java

@@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;

src/test/java/fr/xephi/authme/data/limbo/LimboServiceHelperTest.java

@@ -13,7 +13,7 @@ import java.util.Collections;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verifyNoInteractions;
 

src/test/java/fr/xephi/authme/data/limbo/LimboServiceTest.java

@@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;

src/test/java/fr/xephi/authme/data/limbo/persistence/IndividualFilesPersistenceHandlerTest.java

@@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/data/limbo/persistence/LimboPersistenceTest.java

@@ -18,6 +18,7 @@ import org.mockito.Mock;
 
 import java.util.logging.Logger;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.both;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -25,7 +26,6 @@ import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -40,6 +40,7 @@ import static org.mockito.hamcrest.MockitoHamcrest.argThat;
 @RunWith(DelayedInjectionRunner.class)
 public class LimboPersistenceTest {
 
+    @SuppressWarnings("unused")
     @InjectDelayed
     private LimboPersistence limboPersistence;
 
@@ -59,7 +60,7 @@ public class LimboPersistenceTest {
     public void setUpMocks() {
         given(settings.getProperty(LimboSettings.LIMBO_PERSISTENCE_TYPE)).willReturn(LimboPersistenceType.DISABLED);
         given(handlerFactory.newInstance(any(Class.class)))
-            .willAnswer(invocation -> mock(invocation.getArgument(0)));
+            .willAnswer(invocation -> mock((Class<?>) invocation.getArgument(0)));
     }
 
     @Test

src/test/java/fr/xephi/authme/data/limbo/persistence/LimboPersistenceTypeTest.java

@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentNameBuilderTest.java

@@ -14,7 +14,7 @@ import static fr.xephi.authme.data.limbo.persistence.SegmentSize.THIRTY_TWO;
 import static fr.xephi.authme.data.limbo.persistence.SegmentSize.TWO_FIFTY;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link SegmentNameBuilder}.

src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java

@@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assume.assumeThat;
 
 /**

src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java

@@ -19,7 +19,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 
 import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

src/test/java/fr/xephi/authme/datasource/SqLiteMigraterIntegrationTest.java

@@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**

src/test/java/fr/xephi/authme/datasource/SqlDataSourceUtilsTest.java

@@ -12,7 +12,7 @@ import java.util.logging.Logger;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/datasource/converter/CrazyLoginConverterTest.java

@@ -21,7 +21,7 @@ import java.util.List;
 import static fr.xephi.authme.AuthMeMatchers.equalToHash;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

src/test/java/fr/xephi/authme/datasource/converter/LoginSecurityConverterTest.java

@@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

src/test/java/fr/xephi/authme/events/EventsConsistencyTest.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Checks the consistency of the AuthMe event classes.

src/test/java/fr/xephi/authme/initialization/TaskCloserTest.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static org.hamcrest.Matchers.contains;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doNothing;

src/test/java/fr/xephi/authme/listener/EntityListenerTest.java

@@ -20,7 +20,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import static fr.xephi.authme.listener.EventCancelVerifier.withServiceMock;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java

@@ -17,7 +17,7 @@ import java.util.Set;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java

@@ -18,7 +18,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java

@@ -34,7 +34,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java

@@ -55,6 +55,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -65,12 +66,12 @@ import java.util.UUID;
 import static com.google.common.collect.Sets.newHashSet;
 import static fr.xephi.authme.listener.EventCancelVerifier.withServiceMock;
 import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceToScheduleSyncDelayedTaskWithDelay;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -711,7 +712,7 @@ public class PlayerListenerTest {
         UUID uniqueId = UUID.fromString("753493c9-33ba-4a4a-bf61-1bce9d3c9a71");
         String ip = "12.34.56.78";
 
-        AsyncPlayerPreLoginEvent preLoginEvent = spy(new AsyncPlayerPreLoginEvent(name, mockAddrWithIp(ip), uniqueId));
+        AsyncPlayerPreLoginEvent preLoginEvent = spy(new AsyncPlayerPreLoginEvent(name, createInetAddress(ip), uniqueId));
         given(validationService.isUnrestricted(name)).willReturn(false);
 
         // when
@@ -749,7 +750,7 @@ public class PlayerListenerTest {
         UUID uniqueId = UUID.fromString("753493c9-33ba-4a4a-bf61-1bce9d3c9a71");
         String ip = "12.34.56.78";
 
-        AsyncPlayerPreLoginEvent preLoginEvent = spy(new AsyncPlayerPreLoginEvent(name, mockAddrWithIp(ip), uniqueId));
+        AsyncPlayerPreLoginEvent preLoginEvent = spy(new AsyncPlayerPreLoginEvent(name, createInetAddress(ip), uniqueId));
         given(validationService.isUnrestricted(name)).willReturn(false);
         PlayerAuth auth = PlayerAuth.builder().name(name).build();
         given(dataSource.getAuth(name)).willReturn(auth);
@@ -773,7 +774,7 @@ public class PlayerListenerTest {
         Player player = mockPlayerWithName(name);
         String ip = "12.34.56.78";
 
-        PlayerLoginEvent loginEvent = spy(new PlayerLoginEvent(player, "", mockAddrWithIp(ip)));
+        PlayerLoginEvent loginEvent = spy(new PlayerLoginEvent(player, "", createInetAddress(ip)));
         given(validationService.isUnrestricted(name)).willReturn(false);
         given(onJoinVerifier.refusePlayerForFullServer(loginEvent)).willReturn(false);
 
@@ -792,7 +793,7 @@ public class PlayerListenerTest {
         // given
         String name = "inval!dName";
         UUID uniqueId = UUID.fromString("753493c9-33ba-4a4a-bf61-1bce9d3c9a71");
-        InetAddress ip = mockAddrWithIp("33.32.33.33");
+        InetAddress ip = createInetAddress("33.32.33.33");
         AsyncPlayerPreLoginEvent event = spy(new AsyncPlayerPreLoginEvent(name, ip, uniqueId));
         given(validationService.isUnrestricted(name)).willReturn(false);
         FailedVerificationException exception = new FailedVerificationException(
@@ -1107,9 +1108,11 @@ public class PlayerListenerTest {
         verifyNoMoreInteractions(event);
     }
 
-    private static InetAddress mockAddrWithIp(String ip) {
+    public static InetAddress createInetAddress(String ip) {
-        InetAddress addr = mock(InetAddress.class);
+        try {
-        given(addr.getHostAddress()).willReturn(ip);
+            return InetAddress.getByName(ip);
-        return addr;
+        } catch (UnknownHostException e) {
+            throw new IllegalArgumentException("Invalid IP address: " + ip, e);
+        }
     }
 }

src/test/java/fr/xephi/authme/mail/EmailServiceTest.java

@@ -23,7 +23,7 @@ import java.io.File;
 import java.io.IOException;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;

src/test/java/fr/xephi/authme/mail/SendMailSslTest.java

@@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 
 /**

src/test/java/fr/xephi/authme/message/HelpMessageConsistencyTest.java

@@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.both;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests that all help_xx.yml files contain all entries for

src/test/java/fr/xephi/authme/message/MessageKeyTest.java

@@ -8,7 +8,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static org.hamcrest.Matchers.matchesPattern;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

src/test/java/fr/xephi/authme/message/MessagePathHelperTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link MessagePathHelper}.

src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java

@@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.arrayWithSize;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/message/updater/MessageUpdaterTest.java

@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 import static fr.xephi.authme.message.MessagePathHelper.DEFAULT_MESSAGES_FILE;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link MessageUpdater}.

src/test/java/fr/xephi/authme/message/updater/MigraterYamlFileResourceTest.java

@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link MigraterYamlFileResource}.

src/test/java/fr/xephi/authme/output/ConsoleFilterTest.java

@@ -6,7 +6,7 @@ import org.mockito.Mockito;
 import java.util.logging.LogRecord;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/fr/xephi/authme/output/ConsoleLoggerFactoryTest.java

@@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/output/Log4JFilterTest.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.output;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.when;
 
 import org.apache.logging.log4j.Level;

src/test/java/fr/xephi/authme/output/LogFilterHelperTest.java

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link LogFilterHelper}.

src/test/java/fr/xephi/authme/output/LogLevelTest.java

@@ -4,7 +4,7 @@ import org.junit.Test;
 
 import static java.lang.String.format;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link LogLevel}.

src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java

@@ -39,7 +39,7 @@ import static fr.xephi.authme.permission.PermissionsSystemType.Z_PERMISSIONS;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.only;

src/test/java/fr/xephi/authme/permission/PermissionsManagerTest.java

@@ -11,7 +11,7 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

src/test/java/fr/xephi/authme/permission/PermissionsSystemTypeTest.java

@@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test for {@link PermissionsSystemType}.

src/test/java/fr/xephi/authme/permission/handlers/VaultHandlerTest.java

@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java

@@ -28,7 +28,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;

src/test/java/fr/xephi/authme/process/register/executors/EmailRegisterExecutorTest.java

@@ -23,7 +23,7 @@ import static fr.xephi.authme.AuthMeMatchers.stringWithLength;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

src/test/java/fr/xephi/authme/process/register/executors/PasswordRegisterExecutorTest.java

@@ -26,7 +26,7 @@ import static fr.xephi.authme.service.BukkitServiceTestHelper.setBukkitServiceTo
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;