Add files via upload

2023-05-14 15:22:30 +08:00 · 2023-05-13 21:49:36 +08:00 · 2023-05-13 16:31:45 +08:00 · 2023-05-13 12:22:38 +08:00 · 2023-05-06 20:32:21 +08:00 · 2023-04-24 22:00:52 +08:00
417 changed files with 2370 additions and 35771 deletions
@@ -9,6 +9,4 @@ updates:
  - dependency-name: com.google.code.gson:gson
  - dependency-name: com.google.guava:guava
  - dependency-name: org.apache.logging.log4j:log4j-core
-  - dependency-name: "org.mockito:mockito-core"
-    versions: ">= 5"
-  - dependency-name: ch.jalu:configme
+  - dependency-name: com.zaxxer:HikariCP
@@ -0,0 +1,34 @@
+# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
+
+name: Maven Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+        settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Publish to GitHub Packages Apache Maven
+      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
@@ -7,11 +7,11 @@ on:
      - master

 jobs:
-  build_and_test:
+  Build:
    strategy:
      matrix:
-        jdkversion: [17, 21]
-    runs-on: ubuntu-latest
+        jdkversion: [11]
+    runs-on: windows-latest
    steps:
    - uses: actions/checkout@v3
    - uses: actions/setup-java@v3
@@ -19,5 +19,6 @@ jobs:
        distribution: 'temurin'
        java-version: ${{ matrix.jdkversion }}
        cache: 'maven'
-    - name: Build with Maven
+    - name: 使用Maven构建
      run: mvn -V -B clean package --file pom.xml
+      
@@ -24,7 +24,7 @@ hs_err_pid*

 # Include the project's code style settings file
 !.idea/codeStyleSettings.xml
-
+/target/class/
 # File-based project format:
 *.ipr
 *.iws
@@ -4,8 +4,12 @@ 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/"
@@ -1,11 +1,12 @@
-# AuthMeReloaded
-**"The best authentication plugin for the Bukkit modding API!"**
-
+# AuthMeReReloaded
+**"A Fork of Authme that contains many bug fixes!"**
+**请前往Releases下载最新版本**
 <img src="wallpaper.png?raw=true" alt="AuthMeLogo"/>

 | Type              | Badges                                                                                                                                                                                                                                                                                                                                                                                |
 |-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Code quality:** | [![Code Climate](https://codeclimate.com/github/AuthMe/AuthMeReloaded/badges/gpa.svg)](https://codeclimate.com/github/AuthMe/AuthMeReloaded) [![Coverage status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master)                                                 |
+| **General:**      | ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=code) ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=files)                                                                                                                                                                                                                                              |
+| **代码质量:** | [![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)                                                                                                                                                                                                                                                             |

@@ -103,7 +104,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.1-SNAPSHOT</version>
+            <version>5.6.0-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -115,17 +116,19 @@ You can also create your own translation file and, if you want, you can share it
 ## Requirements

 ##### Compiling requirements:
->- JDK 17+
->- Maven (3.8.8+)
->- Git/GitHub (Optional)
+>- JDK 11 (JDK 17 is recommended)
+>- Maven
+>- Git/Github (Optional)

 ##### How to compile the project:
 >- Clone the project with Git/GitHub
 >- Execute command "mvn clean package"

 ##### Running requirements:
->- Java 17+
->- Paper or Spigot (1.16.5 and up)
+>- Java 8 (Java 17 is recommended)
+>- Paper or Spigot (1.8.X and up)<br>
+   (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
@@ -0,0 +1 @@
+d91307767d8526ac84a3055ac0e773e91f88d452b4b0031f7ecfed721ac6b641
@@ -0,0 +1 @@
+d0aab9856defbd8ef31a9cd7257c5b5761e61a7e39807708c81decf82f599323
@@ -0,0 +1 @@
+176a6c6ea03ad8cc37d1d11c3e3608d8b59c09f9f923eae287e8192731642ec8
@@ -0,0 +1 @@
+61b1a691490d78af1028a442143f649d432618b92c5a9a7031eb4f94817d768b
@@ -0,0 +1 @@
+222eb5ecb4c58f279b8e2f75d38a45495ceb875f249ae3217e3f2a36e50b7d39
@@ -0,0 +1 @@
+423084f2a50c27f62d1b5c85a95e78b9bc3df49d5bd9cefd6fe1aa9227b856c1
@@ -0,0 +1 @@
+410df26b12703b82987b9d739c19211346418f1c954d214827805c13b5f82c98
@@ -0,0 +1 @@
+20569ebc44a9847da0946de5a3bf2cd2b7855dffb03abc9d29204afcaa64b8bb
@@ -0,0 +1 @@
+51a067778ad9b0938d57fd4e2975e0f8dce4914ee060efd0fd6755a8810da4f3
@@ -304,13 +304,6 @@ settings:
        forceKickAfterRegister: false
        # Does AuthMe need to enforce a /login after a successful registration?
        forceLoginAfterRegister: false
-    # Enable to display the welcome message (welcome.txt) after a login
-    # You can use colors in this welcome.txt + some replaced strings:
-    # {PLAYER}: player name, {ONLINE}: display number of online players,
-    # {MAXPLAYERS}: display server slots, {IP}: player ip, {LOGINS}: number of players logged,
-    # {WORLD}: player current world, {SERVER}: server name
-    # {VERSION}: get current bukkit version, {COUNTRY}: player country
-    useWelcomeMessage: true
    # Broadcast the welcome message to the server or only to the player?
    # set true for server or false for player
    broadcastWelcomeMessage: false
@@ -403,8 +396,6 @@ Protection:
    # Apply the protection also to registered usernames
    enableProtectionRegistered: true
    geoIpDatabase:
-        # Enable GeoIp database
-        enabled: true
        # The MaxMind clientId used to download the GeoIp database,
        # get one at https://www.maxmind.com/en/accounts/current/license-key
        # The EssentialsX project has a very useful tutorial on how to generate
@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Wed Jun 21 12:14:29 CEST 2023. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Sun Apr 04 21:31:44 CEST 2021. See docs/translations/translations.tpl.md -->

 # AuthMe Translations
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
@@ -22,11 +22,10 @@ Code | Language | Translated | &nbsp;
 [hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 93% | <img src="https://via.placeholder.com/93x7/77dd44?text=%20" alt="93" />
 [it](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_it.yml) | Italian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[ja](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ja.yml) | Japanese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
-[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 36% | <img src="https://via.placeholder.com/36x7/aa4400?text=%20" alt="36" />
 [nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
@@ -35,13 +34,13 @@ Code | Language | Translated | &nbsp;
 [sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml) | Serbian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 77% | <img src="https://via.placeholder.com/77x7/bb9900?text=%20" alt="77" />
 [zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
 [zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 64% | <img src="https://via.placeholder.com/64x7/bb7700?text=%20" alt="64" />
-[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 86% | <img src="https://via.placeholder.com/86x7/99bb22?text=%20" alt="86" />


 ---

-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Wed Jun 21 12:14:29 CEST 2023
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 04 21:31:44 CEST 2021
@@ -6,7 +6,7 @@

    <groupId>fr.xephi</groupId>
    <artifactId>authme</artifactId>
-    <version>5.7.0-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>

    <name>AuthMeReloaded</name>
    <description>The first authentication plugin for the Bukkit API!</description>
@@ -47,7 +47,7 @@

    <licenses>
        <license>
-            <name>The GNU General Public Licence version 3 (GPLv3)</name>
+            <name>The GNU Public Licence version 3 (GPLv3)</name>
            <url>https://www.gnu.org/licenses/gpl-3.0.html</url>
            <distribution>repo</distribution>
        </license>
@@ -60,11 +60,14 @@
        <!-- Environment properties -->
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.source>17</java.source>
-        <java.target>17</java.target>
-        <java.apiVersion>17</java.apiVersion>
-        <java.compiler.minimumVersion>17</java.compiler.minimumVersion>
-        <maven.minimumVersion>3.8.8</maven.minimumVersion>
+        <java.source>1.8</java.source>
+        <java.target>1.8</java.target>
+        <java.apiVersion>8</java.apiVersion>
+        <java.compiler.minimumVersion>11</java.compiler.minimumVersion>
+        <maven.minimumVersion>3.6.3</maven.minimumVersion>
+
+        <!-- Dependencies versions -->
+        <spigot.version>1.19.2-R0.1-SNAPSHOT</spigot.version>

        <!-- Versioning properties -->
        <project.outputName>AuthMe</project.outputName>
@@ -76,30 +79,7 @@
        <pluginDescription.name>${project.outputName}</pluginDescription.name>
        <pluginDescription.version>${project.versionCode}</pluginDescription.version>
        <pluginDescription.main>${project.groupId}.${project.artifactId}.${pluginDescription.name}</pluginDescription.main>
-        <pluginDescription.authors>sgdc3, 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>
+        <pluginDescription.authors>sgdc3, ljacqu, games647, Hex3l, krusic22</pluginDescription.authors>
    </properties>

    <!-- Jenkins profile -->
@@ -147,10 +127,8 @@

    <build>
        <defaultGoal>clean package</defaultGoal>
-        <!-- Little hack to make the shade plugin output a file with the right name
-        Disable, we aren't using shading atm
+        <!-- Little hack to make the shade plugin output a file with the right name -->
        <finalName>${project.finalNameBase}-noshade</finalName>
-        -->

        <resources>
            <resource>
@@ -176,7 +154,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.7.0</version>
+                    <version>3.4.1</version>
                </plugin>
            </plugins>
        </pluginManagement>
@@ -186,7 +164,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.1.0</version>
                <executions>
                    <execution>
                        <id>enforce-environment</id>
@@ -199,7 +177,7 @@
                                    <version>${maven.minimumVersion}</version>
                                </requireMavenVersion>
                                <requireJavaVersion>
-                                    <version>[${java.compiler.minimumVersion},)</version>
+                                    <version>[11,)</version>
                                </requireJavaVersion>
                            </rules>
                            <fail>true</fail>
@@ -211,19 +189,24 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.2.0</version>
            </plugin>
            <!-- Include resource files -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.3.0</version>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>mmdb</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
            </plugin>
            <!-- Compile and include classes -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.10.1</version>
                <configuration>
                    <source>${java.source}</source>
                    <target>${java.target}</target>
@@ -234,13 +217,7 @@
            <plugin>
                <groupId>org.jacoco</groupId>
                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
-                <configuration>
-                    <includes>
-                        <include>fr/xephi/authme/*</include>
-                        <include>fr/xephi/authme/**/*</include>
-                    </includes>
-                </configuration>
+                <version>0.8.8</version>
                <executions>
                    <execution>
                        <id>pre-unit-test</id>
@@ -260,12 +237,11 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>2.22.2</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>--add-opens=java.base/java.lang=ALL-UNNAMED -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=en @{argLine}</argLine>
+                    <argLine>-Dfile.encoding=${project.build.sourceEncoding} -Duser.language=en @{argLine}</argLine>
                    <systemPropertyVariables>
                        <project.skipExtendedHashTests>${project.skipExtendedHashTests}</project.skipExtendedHashTests>
                    </systemPropertyVariables>
@@ -277,7 +253,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.3.0</version>
            </plugin>
            <!-- Generate a jar containing the source javadoc -->
            <plugin>
@@ -286,7 +262,7 @@
                <configuration>
                    <finalName>${project.finalNameBase}</finalName>
                    <!-- In sync with the source/target properties of the maven-compiler-plugin -->
-                    <source>${java.source}</source>
+                    <source>8</source>
                </configuration>
                <executions>
                    <execution>
@@ -301,7 +277,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.1</version>
                <configuration>
                    <finalName>${project.finalNameBase}</finalName>
                </configuration>
@@ -318,17 +294,61 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.4.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 -->
@@ -338,14 +358,89 @@
                    <!-- Use the base jar name, to help server owners download the right jar -->
                    <finalName>${project.finalNameBase}</finalName>

-                    <!-- Disable, no relocations atm
-                    <relocations>
+                    <!--
+                    Relocate all lib we use in order to fix class loading errors if we use different versions
+                    than already loaded libs
+                    -->
+                    <relocations combine.children="append">
                        <relocation>
-                            <pattern></pattern>
-                            <shadedPattern>fr.xephi.authme.libs.</shadedPattern>
+                            <pattern>ch.jalu</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.ch.jalu</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.zaxxer.hikari</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.com.zaxxer.hikari</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.slf4j</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.maxmind.db</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.com.maxmind.db</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.ice.tar</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.com.icetar.tar</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>net.ricecode.similarity</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.ricecode.net.ricecode.similarity</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>de.rtner</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.de.rtner</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.picketbox</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.picketbox</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.jboss.crypto</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.jboss.crypto</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.jboss.security</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.jboss.security</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>de.mkammerer</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.de.mkammerer</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.warrenstrange</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.com.warrenstrange</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>javax.inject</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.javax.inject</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>at.favre.lib</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.at.favre.lib</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.postgresql</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.postgresql</shadedPattern>
+                        </relocation>
+                        <!-- bStats metrics class -->
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.bstats</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.mariadb.jdbc</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.mariadb.jdbc</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.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 -->
@@ -377,13 +472,13 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-install-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.0.1</version>
            </plugin>
            <!-- Deploy the jars as artifacts into the remote repository -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.0.0</version>
            </plugin>
            <!-- Handle documentation generation, required by other plugins -->
            <plugin>
@@ -503,48 +598,78 @@
                <enabled>true</enabled>
            </snapshots>
        </repository>
+        <repository>
+            <id>opencollab-snapshot</id>
+            <url>https://repo.opencollab.dev/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
    </repositories>

    <dependencies>
        <!-- Java Libraries -->
-
+        <dependency>
+            <groupId>org.geysermc.floodgate</groupId>
+            <artifactId>api</artifactId>
+            <version>2.2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
        <!-- Jalu Injector -->
        <dependency>
            <groupId>ch.jalu</groupId>
            <artifactId>injector</artifactId>
-            <version>${dependencies.injector.version}</version>
-            <scope>provided</scope>
+            <version>1.0</version>
+            <optional>true</optional>
        </dependency>

        <!-- String comparison library. Used for dynamic help system. -->
        <dependency>
            <groupId>net.ricecode</groupId>
            <artifactId>string-similarity</artifactId>
-            <version>${dependencies.string-similarity.version}</version>
-            <scope>provided</scope>
+            <version>1.0.0</version>
+            <optional>true</optional>
        </dependency>

-        <!-- MaxMind GEO IP -->
+        <!-- MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency -->
+        <!-- GSON is already included and therefore it reduces the file size in comparison to the original version -->
        <dependency>
-            <groupId>com.maxmind.geoip2</groupId>
-            <artifactId>geoip2</artifactId>
-            <version>${dependencies.geoip2.version}</version>
-            <scope>provided</scope>
+            <groupId>com.maxmind.db</groupId>
+            <artifactId>maxmind-db-gson</artifactId>
+            <version>2.0.3</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>

        <!-- Library for tar archives -->
        <dependency>
            <groupId>javatar</groupId>
            <artifactId>javatar</artifactId>
-            <version>${dependencies.javatar.version}</version>
-            <scope>provided</scope>
+            <version>2.5</version>
+            <optional>true</optional>
        </dependency>

        <!-- Java Email Library -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-email</artifactId>
-            <version>${dependencies.commons-email.version}</version>
+            <version>1.6-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Log4J Logger (required by the console filter) -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.20.0</version> <!-- Log4J version bundled in 1.12.2 -->
            <scope>provided</scope>
        </dependency>

@@ -552,108 +677,111 @@
        <dependency>
            <groupId>com.zaxxer</groupId>
            <artifactId>HikariCP</artifactId>
-            <version>${dependencies.hikaricp.version}</version>
-            <scope>provided</scope>
+            <version>5.0.1</version> <!-- Latest java 8 release -->
+            <optional>true</optional>
            <exclusions>
                <exclusion>
-                    <groupId>org.slf4j</groupId>
                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
+        <!-- HikariCP Logger -->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-simple</artifactId>
-            <version>${dependencies.slf4j.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Data source columns -->
-        <dependency>
-            <groupId>ch.jalu</groupId>
-            <artifactId>datasourcecolumns</artifactId>
-            <version>${dependencies.datasourcecolumns.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- MySQL connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>${dependencies.mysql-connector-j.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- MariaDB connector -->
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>${dependencies.mariadb-java-client.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.errorprone</groupId>
-                    <artifactId>error_prone_annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- PostgreSQL -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${dependencies.postgresql.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.0.5</version> <!-- We can't update to 2.x as long as we use HikariCP for java 8 -->
+            <optional>true</optional>
        </dependency>

        <!-- PBKDF2 implementation -->
        <dependency>
            <groupId>de.rtner</groupId>
            <artifactId>PBKDF2</artifactId>
-            <version>${dependencies.pbkdf2.version}</version>
-            <scope>provided</scope>
+            <version>1.1.4</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- MySQL connector, shaded into the legacy jar -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.32</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>3.1.2</version>
+            <optional>true</optional>
        </dependency>

        <!-- Argon2 implementation -->
        <dependency>
            <groupId>de.mkammerer</groupId>
            <artifactId>argon2-jvm-nolibs</artifactId>
-            <version>${dependencies.argon2-jvm-nolibs.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- BCrypt implementation -->
-        <dependency>
-            <groupId>at.favre.lib</groupId>
-            <artifactId>bcrypt</artifactId>
-            <version>${dependencies.bcrypt.version}</version>
-            <scope>provided</scope>
+            <version>2.11</version>
+            <optional>true</optional>
        </dependency>

        <!-- TOTP client -->
        <dependency>
            <groupId>com.warrenstrange</groupId>
            <artifactId>googleauth</artifactId>
-            <version>${dependencies.googleauth.version}</version>
-            <scope>provided</scope>
+            <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>junit</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bungeecord-chat</artifactId>
+                    <groupId>net.md-5</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.googlecode.json-simple</groupId>
+                    <artifactId>json-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--  Keep in sync with spigot 1.19  -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.0.1-jre</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--  Keep in sync with spigot 1.19  -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.9</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Bukkit Libraries  -->
+
        <!-- ConfigMe -->
        <dependency>
            <groupId>ch.jalu</groupId>
            <artifactId>configme</artifactId>
-            <version>${dependencies.configme.version}</version>
-            <scope>provided</scope>
+            <version>1.3.0</version>
+            <optional>true</optional>
            <exclusions>
                <exclusion>
                    <groupId>org.yaml</groupId>
@@ -662,47 +790,19 @@
            </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>${dependencies.bstats.version}</version>
-            <scope>provided</scope>
+            <version>3.0.0</version>
+            <optional>true</optional>
        </dependency>

-        <!-- Plugin Hooks -->
-
        <!-- ProtocolLib -->
        <dependency>
            <groupId>com.comphenix.protocol</groupId>
            <artifactId>ProtocolLib</artifactId>
-            <version>5.1.0</version>
+            <version>4.8.0</version>
            <scope>provided</scope>
            <exclusions>
                <exclusion>
@@ -845,7 +945,7 @@
        <dependency>
            <groupId>net.essentialsx</groupId>
            <artifactId>EssentialsX</artifactId>
-            <version>2.20.1</version>
+            <version>2.19.7</version>
            <scope>provided</scope>
            <exclusions>
                <exclusion>
@@ -891,6 +991,14 @@
            </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>
@@ -899,42 +1007,60 @@
            <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.5.4</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>hamcrest</artifactId>
+            <artifactId>java-hamcrest</artifactId>
            <scope>test</scope>
-            <version>2.2</version>
+            <version>2.0.0.0</version>
        </dependency>

-        <!-- TODO: update to mockito 5 -->
        <dependency>
            <groupId>org.mockito</groupId>
            <artifactId>mockito-core</artifactId>
            <scope>test</scope>
-            <version>4.11.0</version>
+            <version>5.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hamcrest-core</artifactId>
+                    <groupId>org.hamcrest</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>

        <!-- Required to mock the LuckPerms API-->
        <dependency>
            <groupId>org.checkerframework</groupId>
            <artifactId>checker-qual</artifactId>
-            <version>3.44.0</version>
+            <version>3.32.0</version>
            <scope>test</scope>
        </dependency>

@@ -942,19 +1068,13 @@
        <dependency>
            <groupId>org.xerial</groupId>
            <artifactId>sqlite-jdbc</artifactId>
-            <version>3.46.0.0</version>
+            <version>3.39.3.0</version>
            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
-            <version>2.2.224</version>
+            <version>2.1.214</version>
            <scope>test</scope>
        </dependency>

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

 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
-import com.google.common.annotations.VisibleForTesting;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.datasource.DataSource;
@@ -19,6 +18,7 @@ import fr.xephi.authme.listener.PlayerListener111;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.PlayerListener19Spigot;
 import fr.xephi.authme.listener.ServerListener;
+import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.crypts.Sha256;
 import fr.xephi.authme.service.BackupService;
@@ -28,6 +28,7 @@ import fr.xephi.authme.service.bungeecord.BungeeReceiver;
 import fr.xephi.authme.service.yaml.YamlParseException;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsWarner;
+import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.task.CleanupTask;
 import fr.xephi.authme.task.purge.PurgeService;
@@ -35,13 +36,15 @@ import fr.xephi.authme.util.ExceptionUtils;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.jetbrains.annotations.NotNull;

 import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
 import java.util.function.Consumer;

 import static fr.xephi.authme.service.BukkitService.TICKS_PER_MINUTE;
@@ -58,10 +61,11 @@ public class AuthMe extends JavaPlugin {
    private static final int CLEANUP_INTERVAL = 5 * TICKS_PER_MINUTE;

    // Version and build number values
-    private static String pluginVersion = "N/D";
-    private static String pluginBuildNumber = "Unknown";
+    private static String pluginVersion = "5.6.0";
+    private static String pluginBuildNumber = "Custom";

    // Private instances
+    private EmailService emailService;
    private CommandHandler commandHandler;
    private Settings settings;
    private DataSource database;
@@ -76,14 +80,6 @@ public class AuthMe extends JavaPlugin {
    public AuthMe() {
    }

-    /*
-     * Constructor for unit testing.
-     */
-    @VisibleForTesting
-    AuthMe(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
-        super(loader, description, dataFolder, file);
-    }
-
    /**
     * Get the plugin's name.
     *
@@ -150,7 +146,7 @@ public class AuthMe extends JavaPlugin {
                th.printStackTrace();
            } else {
                logger.logException("File '" + yamlParseException.getFile() + "' contains invalid YAML. "
-                    + "Please run its contents through http://yamllint.com", yamlParseException);
+                    + "Please run its contents through https://yamllint.com", yamlParseException);
            }
            stopOrUnload();
            return;
@@ -170,7 +166,7 @@ public class AuthMe extends JavaPlugin {
        OnStartupTasks.sendMetrics(this, settings);

        // Successful message
-        logger.info("AuthMe " + getPluginVersion() + " build n." + getPluginBuildNumber() + " successfully enabled!");
+        logger.info("AuthMeReloaded successfully enabled!");

        // Purge on start if enabled
        PurgeService purgeService = injector.getSingleton(PurgeService.class);
@@ -245,6 +241,7 @@ public class AuthMe extends JavaPlugin {
        database = injector.getSingleton(DataSource.class);
        bukkitService = injector.getSingleton(BukkitService.class);
        commandHandler = injector.getSingleton(CommandHandler.class);
+        emailService = injector.getSingleton(EmailService.class);
        backupService = injector.getSingleton(BackupService.class);

        // Trigger instantiation (class not used elsewhere)
@@ -307,6 +304,11 @@ public class AuthMe extends JavaPlugin {
        if (onShutdownPlayerSaver != null) {
            onShutdownPlayerSaver.saveAllPlayers();
        }
+        if (settings.getProperty(EmailSettings.SHUTDOWN_MAIL)){
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
+            Date date = new Date(System.currentTimeMillis());
+            emailService.sendShutDown(settings.getProperty(EmailSettings.SHUTDOWN_MAIL_ADDRESS),dateFormat.format(date));
+        }

        // Do backup on stop if enabled
        if (backupService != null) {
@@ -332,8 +334,8 @@ public class AuthMe extends JavaPlugin {
     * @return True if the command was executed, false otherwise.
     */
    @Override
-    public boolean onCommand(CommandSender sender, Command cmd,
-                             String commandLabel, String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd,
+                             @NotNull String commandLabel, String[] args) {
        // Make sure the command handler has been initialized
        if (commandHandler == null) {
            getLogger().severe("AuthMe command handler is not available");
@@ -14,8 +14,8 @@ import fr.xephi.authme.datasource.converter.RoyalAuthConverter;
 import fr.xephi.authme.datasource.converter.SqliteToSql;
 import fr.xephi.authme.datasource.converter.VAuthConverter;
 import fr.xephi.authme.datasource.converter.XAuthConverter;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.command.CommandSender;
@@ -4,8 +4,8 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.BukkitService;
@@ -7,8 +7,8 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsWarner;
@@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.authme.debug;
 import ch.jalu.datasourcecolumns.data.DataSourceValue;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.SendMailSsl;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.util.StringUtils;
@@ -43,13 +43,6 @@ public class ChangePasswordCommand extends PlayerCommand {
            return;
        }

-        // Check if the user has been verified or not
-        if (codeManager.isVerificationRequired(player)) {
-            codeManager.codeExistOrGenerateNew(name);
-            commonService.send(player, MessageKey.VERIFICATION_CODE_REQUIRED);
-            return;
-        }
-
        String oldPassword = arguments.get(0);
        String newPassword = arguments.get(1);

@@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.email;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.CommonService;
@@ -5,9 +5,9 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.PasswordRecoveryService;
@@ -3,9 +3,10 @@ package fr.xephi.authme.command.executable.register;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.captcha.RegistrationCaptchaManager;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.register.RegisterSecondaryArgument;
 import fr.xephi.authme.process.register.RegistrationType;
@@ -23,6 +24,8 @@ import org.bukkit.entity.Player;

 import javax.inject.Inject;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;

 import static fr.xephi.authme.process.register.RegisterSecondaryArgument.CONFIRMATION;
 import static fr.xephi.authme.process.register.RegisterSecondaryArgument.EMAIL_MANDATORY;
@@ -43,6 +46,9 @@ public class RegisterCommand extends PlayerCommand {
    @Inject
    private CommonService commonService;

+    @Inject
+    private DataSource dataSource;
+
    @Inject
    private EmailService emailService;

@@ -169,6 +175,20 @@ public class RegisterCommand extends PlayerCommand {
        } else if (isSecondArgValidForEmailRegistration(player, arguments)) {
            management.performRegister(RegistrationMethod.EMAIL_REGISTRATION,
                EmailRegisterParams.of(player, email));
+            Timer timer = new Timer();
+            timer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    if (dataSource.getAuth(player.getName()) != null) {
+                        if (dataSource.getAuth(player.getName()).getLastLogin() == null) {
+                            management.performUnregisterByAdmin(null, player.getName(), player);
+                            timer.cancel();
+                        }
+                    } else {
+                        timer.cancel();
+                    }
+                }
+            }, 600000);
        }
    }

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

@@ -8,9 +8,9 @@ import fr.xephi.authme.data.limbo.LimboPlayer;
 import fr.xephi.authme.data.limbo.LimboPlayerState;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.login.AsynchronousLogin;
 import fr.xephi.authme.security.totp.TotpAuthenticator;
 import org.bukkit.entity.Player;
@@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.verification;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.VerificationCodeManager;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.entity.Player;

@@ -15,6 +15,8 @@ import fr.xephi.authme.util.expiring.ExpiringMap;
 import org.bukkit.entity.Player;

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

-import java.util.UUID;
-
 import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.ColumnOptions.DEFAULT_FOR_NULL;
 import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.ColumnOptions.OPTIONAL;
 import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.createDouble;
@@ -3,10 +3,10 @@ package fr.xephi.authme.initialization;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
 import fr.xephi.authme.output.ConsoleFilter;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.output.Log4JFilter;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
@@ -32,7 +32,7 @@ import static fr.xephi.authme.settings.properties.EmailSettings.RECALL_PLAYERS;
 */
 public class OnStartupTasks {

-    private static final ConsoleLogger consoleLogger = ConsoleLoggerFactory.get(OnStartupTasks.class);
+    private static ConsoleLogger consoleLogger = ConsoleLoggerFactory.get(OnStartupTasks.class);

    @Inject
    private DataSource dataSource;
@@ -53,8 +53,6 @@ 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",
@@ -111,6 +109,6 @@ public class OnStartupTasks {
                    }
                });
            }
-        }, 1, (long) TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
+        }, 1, TICKS_PER_MINUTE * settings.getProperty(EmailSettings.DELAY_RECALL));
    }
 }
@@ -4,9 +4,9 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.service.AntiBotService;
@@ -18,6 +18,7 @@ import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.HumanEntity;
@@ -27,6 +28,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -45,10 +47,10 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 import org.bukkit.inventory.InventoryView;

 import javax.inject.Inject;
@@ -91,7 +93,6 @@ public class PlayerListener implements Listener {
    private PermissionsManager permissionsManager;
    @Inject
    private QuickCommandsProtectionManager quickCommandsProtectionManager;
-
    // Lowest priority to apply fast protection checks
    @EventHandler(priority = EventPriority.LOWEST)
    public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) {
@@ -111,6 +112,9 @@ public class PlayerListener implements Listener {
            return;
        }
        
+        if (settings.getProperty(RestrictionSettings.HOOK_FLOODGATE_PLAYER) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())){
+            return;
+        }
        // Non-blocking checks
        try {
            onJoinVerifier.checkIsValidName(name);
@@ -118,6 +122,7 @@ public class PlayerListener implements Listener {
            event.setKickMessage(messages.retrieveSingle(name, e.getReason(), e.getArgs()));
            event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
        }
+
    }

    /*
@@ -451,7 +456,7 @@ public class PlayerListener implements Listener {
     */

    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
-    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+    public void onPlayerPickupItem(EntityPickupItemEvent event) {
        if (listenerService.shouldCancelEvent(event)) {
            event.setCancelled(true);
        }
@@ -509,4 +514,12 @@ public class PlayerListener implements Listener {
            event.setCancelled(true);
        }
    }
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+        Player player = event.getPlayer();
+        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
+            return;
+        event.setCancelled(true);
+        Bukkit.dispatchCommand(event.getPlayer(), "help");
+    }
 }
@@ -1,8 +1,8 @@
 package fr.xephi.authme.listener;

 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.listener.protocollib.ProtocolLibService;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.service.PluginHookService;
 import fr.xephi.authme.settings.SpawnLoader;
@@ -34,13 +34,14 @@ 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;
@@ -115,8 +116,8 @@ class InventoryPacketAdapter extends PacketAdapter {

        try {
            protocolManager.sendServerPacket(player, inventoryPacket, false);
-        } catch (Exception exception) {
-            logger.logException("Error during sending blank inventory", exception);
+        } catch (InvocationTargetException invocationExc) {
+            logger.logException("Error during sending blank inventory", invocationExc);
        }
    }
 }
@@ -40,21 +40,7 @@ public class EmailService {
        return sendMailSsl.hasAllInformation();
    }

-
-    /**
-     * Sends an email to the user with his new password.
-     *
-     * @param name the name of the player
-     * @param mailAddress the player's email
-     * @param newPass the new password
-     * @return true if email could be sent, false otherwise
-     */
-    public boolean sendPasswordMail(String name, String mailAddress, String newPass) {
-        if (!hasAllInformation()) {
-            logger.warning("Cannot perform email registration: not all email settings are complete");
-            return false;
-        }
-
+    public boolean sendNewPasswordMail(String name, String mailAddress, String newPass,String ip,String time) {
        HtmlEmail email;
        try {
            email = sendMailSsl.initializeMail(mailAddress);
@@ -63,8 +49,7 @@ public class EmailService {
            return false;
        }

-        String mailText = replaceTagsForPasswordMail(settings.getPasswordEmailMessage(), name, newPass);
-        // Generate an image?
+        String mailText = replaceTagsForPasswordMail(settings.getNewPasswordEmailMessage(), name, newPass,ip,time);
        File file = null;
        if (settings.getProperty(EmailSettings.PASSWORD_AS_IMAGE)) {
            try {
@@ -82,16 +67,16 @@ public class EmailService {
    }

    /**
-     * Sends an email to the user with the temporary verification code.
+     * Sends an email to the user with his new password.
     *
     * @param name the name of the player
     * @param mailAddress the player's email
-     * @param code the verification code
+     * @param newPass the new password
     * @return true if email could be sent, false otherwise
     */
-    public boolean sendVerificationMail(String name, String mailAddress, String code) {
+    public boolean sendPasswordMail(String name, String mailAddress, String newPass, String time) {
        if (!hasAllInformation()) {
-            logger.warning("Cannot send verification email: not all email settings are complete");
+            logger.warning("Cannot perform email registration: not all email settings are complete");
            return false;
        }

@@ -99,13 +84,51 @@ public class EmailService {
        try {
            email = sendMailSsl.initializeMail(mailAddress);
        } catch (EmailException e) {
-            logger.logException("Failed to create verification email with the given settings:", e);
+            logger.logException("Failed to create email with the given settings:", e);
            return false;
        }

+        String mailText = replaceTagsForPasswordMail(settings.getPasswordEmailMessage(), name, newPass,time);
+        // Generate an image?
+        File file = null;
+        if (settings.getProperty(EmailSettings.PASSWORD_AS_IMAGE)) {
+            try {
+                file = generatePasswordImage(name, newPass);
+                mailText = embedImageIntoEmailContent(file, email, mailText);
+            } catch (IOException | EmailException e) {
+                logger.logException(
+                    "Unable to send new password as image for email " + mailAddress + ":", e);
+            }
+        }
+
+        boolean couldSendEmail = sendMailSsl.sendEmail(mailText, email);
+        FileUtils.delete(file);
+        return couldSendEmail;
+    }
+    /**
+     * Sends an email to the user with the temporary verification code.
+     *
+     * @param name        the name of the player
+     * @param mailAddress the player's email
+     * @param code        the verification code
+     */
+    public void sendVerificationMail(String name, String mailAddress, String code, String time) {
+        if (!hasAllInformation()) {
+            logger.warning("Cannot send verification email: not all email settings are complete");
+            return;
+        }
+
+        HtmlEmail email;
+        try {
+            email = sendMailSsl.initializeMail(mailAddress);
+        } catch (EmailException e) {
+            logger.logException("Failed to create verification email with the given settings:", e);
+            return;
+        }
+
        String mailText = replaceTagsForVerificationEmail(settings.getVerificationEmailMessage(), name, code,
-            settings.getProperty(SecuritySettings.VERIFICATION_CODE_EXPIRATION_MINUTES));
-        return sendMailSsl.sendEmail(mailText, email);
+            settings.getProperty(SecuritySettings.VERIFICATION_CODE_EXPIRATION_MINUTES),time);
+        sendMailSsl.sendEmail(mailText, email);
    }

    /**
@@ -116,7 +139,7 @@ public class EmailService {
     * @param code the recovery code
     * @return true if email could be sent, false otherwise
     */
-    public boolean sendRecoveryCode(String name, String email, String code) {
+    public boolean sendRecoveryCode(String name, String email, String code, String time) {
        HtmlEmail htmlEmail;
        try {
            htmlEmail = sendMailSsl.initializeMail(email);
@@ -126,10 +149,23 @@ public class EmailService {
        }

        String message = replaceTagsForRecoveryCodeMail(settings.getRecoveryCodeEmailMessage(),
-            name, code, settings.getProperty(SecuritySettings.RECOVERY_CODE_HOURS_VALID));
+            name, code, settings.getProperty(SecuritySettings.RECOVERY_CODE_HOURS_VALID),time);
        return sendMailSsl.sendEmail(message, htmlEmail);
    }

+    public void sendShutDown(String email, String time) {
+        HtmlEmail htmlEmail;
+        try {
+            htmlEmail = sendMailSsl.initializeMail(email);
+        } catch (EmailException e) {
+            logger.logException("Failed to create email for recovery code:", e);
+            return;
+        }
+
+        String message = replaceTagsForShutDownMail(settings.getShutdownEmailMessage(), time);
+        sendMailSsl.sendEmail(message, htmlEmail);
+    }
+
    private File generatePasswordImage(String name, String newPass) throws IOException {
        ImageGenerator gen = new ImageGenerator(newPass);
        File file = new File(dataFolder, name + "_new_pass.jpg");
@@ -144,26 +180,44 @@ public class EmailService {
        return content.replace("<image />", "<img src=\"cid:" + tag + "\">");
    }

-    private String replaceTagsForPasswordMail(String mailText, String name, String newPass) {
+    private String replaceTagsForPasswordMail(String mailText, String name, String newPass,String ip,String time) {
        return mailText
            .replace("<playername />", name)
            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
-            .replace("<generatedpass />", newPass);
+            .replace("<generatedpass />", newPass)
+            .replace("<playerip />", ip)
+            .replace("<time />", time);
    }

-    private String replaceTagsForVerificationEmail(String mailText, String name, String code, int minutesValid) {
+    private String replaceTagsForPasswordMail(String mailText, String name, String newPass, String time) {
+        return mailText
+            .replace("<playername />", name)
+            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
+            .replace("<generatedpass />", newPass)
+            .replace("<time />", time);
+    }
+
+    private String replaceTagsForVerificationEmail(String mailText, String name, String code, int minutesValid, String time) {
        return mailText
            .replace("<playername />", name)
            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
            .replace("<generatedcode />", code)
-            .replace("<minutesvalid />", String.valueOf(minutesValid));
+            .replace("<minutesvalid />", String.valueOf(minutesValid))
+            .replace("<time />", time);
    }

-    private String replaceTagsForRecoveryCodeMail(String mailText, String name, String code, int hoursValid) {
+    private String replaceTagsForRecoveryCodeMail(String mailText, String name, String code, int hoursValid, String time) {
        return mailText
            .replace("<playername />", name)
            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
            .replace("<recoverycode />", code)
-            .replace("<hoursvalid />", String.valueOf(hoursValid));
+            .replace("<hoursvalid />", String.valueOf(hoursValid))
+            .replace("<time />", time);
    }
+    private String replaceTagsForShutDownMail(String mailText, String time) {
+        return mailText
+            .replace("<servername />", settings.getProperty(PluginSettings.SERVER_NAME))
+            .replace("<time />", time);
+    }
+
 }
@@ -1,9 +1,6 @@
 package fr.xephi.authme.mail;

-import java.awt.Color;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.awt.image.BufferedImage;

 /**
@@ -2,8 +2,8 @@ package fr.xephi.authme.message;

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

 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.updater.MessageUpdater;
+import fr.xephi.authme.output.ConsoleLoggerFactory;

 import javax.inject.Inject;

@@ -10,8 +10,8 @@ import ch.jalu.configme.resource.PropertyResource;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.util.FileUtils;

 import java.io.File;
@@ -36,12 +36,4 @@ public class MigraterYamlFileResource extends YamlFileResource {
        }
        return singleQuoteYaml;
    }
-
-    // Because we set the YAML object to put strings in single quotes, this method by default uses that YAML object
-    // and also puts all paths as single quotes. Override to just always return the same string since we know those
-    // are only message names (so never any conflicting strings like "true" or "0").
-    @Override
-    protected String escapePathElementIfNeeded(String path) {
-        return path;
-    }
 }
@@ -4,8 +4,8 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.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.security.crypts.HashedPassword;
@@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.EmailChangedEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
@@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.EmailChangedEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
@@ -17,7 +17,6 @@ import fr.xephi.authme.service.SessionService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
-import fr.xephi.authme.settings.WelcomeMessageConfiguration;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
@@ -27,6 +26,8 @@ import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;

 import javax.inject.Inject;
 import java.util.Locale;
@@ -68,9 +69,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
    @Inject
    private ValidationService validationService;

-    @Inject
-    private WelcomeMessageConfiguration welcomeMessageConfiguration;
-
    @Inject
    private SessionService sessionService;

@@ -147,9 +145,6 @@ public class AsynchronousJoin implements AsynchronousProcess {
                return;
            }
        } else if (!service.getProperty(RegistrationSettings.FORCE)) {
-            bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> {
-                welcomeMessageConfiguration.sendWelcomeMessage(player);
-            });

            // Skip if registration is optional

@@ -194,7 +189,7 @@ public class AsynchronousJoin implements AsynchronousProcess {
            if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
                // Allow infinite blindness effect
                int blindTimeOut = (registrationTimeout <= 0) ? 99999 : registrationTimeout;
-                player.addPotionEffect(bukkitService.createBlindnessEffect(blindTimeOut));
+                player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2));
            }
            commandManager.runCommandsOnJoin(player);
        });
@@ -12,9 +12,9 @@ import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent;
 import fr.xephi.authme.events.FailedLoginEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.AdminPermission;
 import fr.xephi.authme.permission.PlayerPermission;
 import fr.xephi.authme.permission.PlayerStatePermission;
@@ -14,7 +14,6 @@ import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.JoinMessageService;
 import fr.xephi.authme.service.TeleportationService;
 import fr.xephi.authme.service.bungeecord.BungeeSender;
-import fr.xephi.authme.settings.WelcomeMessageConfiguration;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import org.bukkit.entity.Player;
@@ -49,9 +48,6 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
    @Inject
    private CommonService commonService;

-    @Inject
-    private WelcomeMessageConfiguration welcomeMessageConfiguration;
-
    @Inject
    private JoinMessageService joinMessageService;

@@ -90,11 +86,6 @@ 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)
@@ -107,9 +98,6 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
        // The Login event now fires (as intended) after everything is processed
        bukkitService.callEvent(new LoginEvent(player));

-        // Login is done, display welcome message
-        welcomeMessageConfiguration.sendWelcomeMessage(player);
-
        // Login is now finished; we can force all commands
        if (isFirstLogin) {
            commandManager.runCommandsOnFirstLogin(player, authsWithSameIp);
@@ -14,6 +14,8 @@ import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;

 import javax.inject.Inject;

@@ -73,7 +75,7 @@ public class ProcessSyncPlayerLogout implements SynchronousProcess {
        // Apply Blindness effect
        if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
            int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
-            player.addPotionEffect(bukkitService.createBlindnessEffect(timeout));
+            player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));
        }

        // Set player's data to unauthenticated
@@ -27,6 +27,7 @@ public class ProcessSyncPlayerQuit implements SynchronousProcess {
            commandManager.runCommandsOnLogout(player);
        } else {
            limboService.restoreData(player);
+            player.saveData(); // #1238: Speed is sometimes not restored properly
        }
        player.leaveVehicle();
    }
@@ -3,8 +3,8 @@ package fr.xephi.authme.process.register;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.RegisterEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 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;
@@ -3,8 +3,8 @@ package fr.xephi.authme.process.register;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.RegisterEvent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 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;
@@ -9,10 +9,13 @@ import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.settings.properties.EmailSettings;
+import fr.xephi.authme.util.PlayerUtils;
 import fr.xephi.authme.util.RandomStringUtils;
 import org.bukkit.entity.Player;

 import javax.inject.Inject;
+import java.text.SimpleDateFormat;
+import java.util.Date;

 import static fr.xephi.authme.permission.PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS;
 import static fr.xephi.authme.process.register.executors.PlayerAuthBuilderHelper.createPlayerAuth;
@@ -64,8 +67,10 @@ class EmailRegisterExecutor implements RegistrationExecutor<EmailRegisterParams>
    @Override
    public void executePostPersistAction(EmailRegisterParams params) {
        Player player = params.getPlayer();
-        boolean couldSendMail = emailService.sendPasswordMail(
-            player.getName(), params.getEmail(), params.getPassword());
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
+        Date date = new Date(System.currentTimeMillis());
+        boolean couldSendMail = emailService.sendNewPasswordMail(
+            player.getName(), params.getEmail(), params.getPassword(), PlayerUtils.getPlayerIp(player), dateFormat.format(date));
        if (couldSendMail) {
            syncProcessManager.processSyncEmailRegister(player);
        } else {
@@ -21,6 +21,8 @@ import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;

 import javax.inject.Inject;

@@ -142,7 +144,7 @@ public class AsynchronousUnregister implements AsynchronousProcess {
    private void applyBlindEffect(Player player) {
        if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
            int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
-            player.addPotionEffect(bukkitService.createBlindnessEffect(timeout));
+            player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2));
        }
    }

@@ -14,7 +14,6 @@ import fr.xephi.authme.settings.properties.PluginSettings;
 import org.bukkit.entity.Player;

 import javax.inject.Inject;
-
 import java.util.Locale;

 import static fr.xephi.authme.util.Utils.MILLIS_PER_MINUTE;
@@ -3,8 +3,8 @@ package fr.xephi.authme.service;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSourceType;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.BackupSettings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
@@ -13,8 +13,6 @@ 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;

@@ -340,16 +338,6 @@ 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
     */
@@ -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.CHMCache;
+import com.maxmind.db.GeoIp2Provider;
+import com.maxmind.db.Reader;
 import com.maxmind.db.Reader.FileMode;
-import com.maxmind.geoip2.DatabaseReader;
-import com.maxmind.geoip2.exception.GeoIp2Exception;
-import com.maxmind.geoip2.model.AbstractCountryResponse;
-import com.maxmind.geoip2.record.Country;
+import com.maxmind.db.cache.CHMCache;
+import com.maxmind.db.model.Country;
+import com.maxmind.db.model.CountryResponse;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
@@ -47,37 +47,21 @@ public class GeoIpService {

    private static final String DATABASE_NAME = "GeoLite2-Country";
    private static final String DATABASE_FILE = DATABASE_NAME + ".mmdb";
-    private static final String DATABASE_TMP_FILE = DATABASE_NAME + ".mmdb.tmp";
-
-    private static final String ARCHIVE_FILE = DATABASE_NAME + ".mmdb.gz";
-
-    private static final String ARCHIVE_URL =
-        "https://updates.maxmind.com/geoip/databases/" + DATABASE_NAME + "/update";
-
-    private static final int UPDATE_INTERVAL_DAYS = 30;
-
    private final ConsoleLogger logger = ConsoleLoggerFactory.get(GeoIpService.class);
    private final Path dataFile;
-    private final BukkitService bukkitService;
-    private final Settings settings;
-
-    private DatabaseReader databaseReader;
+    private GeoIp2Provider databaseReader;
    private volatile boolean downloading;

    @Inject
-    public GeoIpService(@DataFolder File dataFolder, BukkitService bukkitService, Settings settings) {
-        this.bukkitService = bukkitService;
+    GeoIpService(@DataFolder File dataFolder) {
        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, DatabaseReader reader) {
-        this.bukkitService = bukkitService;
-        this.settings = settings;
+    GeoIpService(@DataFolder File dataFolder, GeoIp2Provider reader) {
        this.dataFile = dataFolder.toPath().resolve(DATABASE_FILE);

        this.databaseReader = reader;
@@ -89,12 +73,6 @@ public class GeoIpService {
     * @return True if the data is available, false otherwise.
     */
    private synchronized boolean isDataAvailable() {
-
-        // If this feature is disabled, just stop
-        if (!settings.getProperty(ProtectionSettings.ENABLE_GEOIP)) {
-            return false;
-        }
-
        if (downloading) {
            // we are currently downloading the database
            return false;
@@ -107,181 +85,28 @@ public class GeoIpService {

        if (Files.exists(dataFile)) {
            try {
-                FileTime lastModifiedTime = Files.getLastModifiedTime(dataFile);
-                if (Duration.between(lastModifiedTime.toInstant(), Instant.now()).toDays() <= UPDATE_INTERVAL_DAYS) {
                startReading();
-
-                    // don't fire the update task - we are up-to-date
+                // don't fire the update task - we are up to date
                return true;
-                } else {
-                    logger.debug("GEO IP database is older than " + UPDATE_INTERVAL_DAYS + " Days");
-                }
            } catch (IOException ioEx) {
                logger.logException("Failed to load GeoLiteAPI database", ioEx);
                return false;
            }
        }
-
-        //set the downloading flag in order to fix race conditions outside
-        downloading = true;
-
        // File is outdated or doesn't exist - let's try to download the data file!
        // use bukkit's cached threads
-        bukkitService.runTaskAsynchronously(this::updateDatabase);
        return false;
    }

-    /**
-     * Tries to update the database by downloading a new version from the website.
-     */
-    private void updateDatabase() {
-        logger.info("Downloading GEO IP database, because the old database is older than "
-                + UPDATE_INTERVAL_DAYS + " days or doesn't exist");
-
-        Path downloadFile = null;
-        Path tempFile = null;
-        try {
-            // download database to temporarily location
-            downloadFile = Files.createTempFile(ARCHIVE_FILE, null);
-            tempFile = Files.createTempFile(DATABASE_TMP_FILE, null);
-            String expectedChecksum = downloadDatabaseArchive(downloadFile);
-            if (expectedChecksum == null) {
-                logger.info("There is no newer GEO IP database uploaded to MaxMind. Using the old one for now.");
-                startReading();
-                return;
-            }
-
-            // tar extract database and copy to target destination
-            extractDatabase(downloadFile, tempFile);
-
-            // MD5 checksum verification
-            //noinspection deprecation
-            verifyChecksum(Hashing.md5(), tempFile, expectedChecksum);
-
-            Files.copy(tempFile, dataFile, StandardCopyOption.REPLACE_EXISTING);
-
-            //only set this value to false on success otherwise errors could lead to endless download triggers
-            logger.info("Successfully downloaded new GEO IP database to " + dataFile);
-            startReading();
-        } catch (IOException ioEx) {
-            logger.logException("Could not download GeoLiteAPI database", ioEx);
-        } finally {
-            // clean up
-            if (downloadFile != null) {
-                FileUtils.delete(downloadFile.toFile());
-            }
-            if (tempFile != null) {
-                FileUtils.delete(tempFile.toFile());
-            }
-        }
-    }

    private void startReading() throws IOException {
-        databaseReader = new DatabaseReader.Builder(dataFile.toFile())
-            .withCache(new CHMCache())
-            .fileMode(FileMode.MEMORY)
-            .build();
+        databaseReader = new Reader(dataFile.toFile(), FileMode.MEMORY, new CHMCache());
        logger.info(LICENSE);

        // clear downloading flag, because we now have working reader instance
        downloading = false;
    }

-    /**
-     * Downloads the archive to the destination file if it's newer than the local version.
-     *
-     * @param lastModified modification timestamp of the already present file
-     * @param destination save file
-     * @return null if no updates were found, the MD5 hash of the downloaded archive if successful
-     * @throws IOException if failed during downloading and writing to destination file
-     */
-    private String downloadDatabaseArchive(Instant lastModified, Path destination) throws IOException {
-        String clientId = settings.getProperty(ProtectionSettings.MAXMIND_API_CLIENT_ID);
-        String licenseKey = settings.getProperty(ProtectionSettings.MAXMIND_API_LICENSE_KEY);
-        if (clientId.isEmpty() || licenseKey.isEmpty()) {
-            logger.warning("No MaxMind credentials found in the configuration file!"
-                + " GeoIp protections will be disabled.");
-            return null;
-        }
-
-        HttpURLConnection connection = (HttpURLConnection) new URL(ARCHIVE_URL).openConnection();
-        String basicAuth = "Basic " + new String(Base64.getEncoder().encode((clientId + ":" + licenseKey).getBytes()));
-        connection.setRequestProperty("Authorization", basicAuth);
-
-        if (lastModified != null) {
-            // Only download if we actually need a newer version - this field is specified in GMT zone
-            ZonedDateTime zonedTime = lastModified.atZone(ZoneId.of("GMT"));
-            String timeFormat = DateTimeFormatter.RFC_1123_DATE_TIME.format(zonedTime);
-            connection.addRequestProperty("If-Modified-Since", timeFormat);
-        }
-
-        if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
-            //we already have the newest version
-            connection.getInputStream().close();
-            return null;
-        }
-
-        String hash = connection.getHeaderField("X-Database-MD5");
-        String rawModifiedDate = connection.getHeaderField("Last-Modified");
-        Instant modifiedDate = Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(rawModifiedDate));
-        Files.copy(connection.getInputStream(), destination, StandardCopyOption.REPLACE_EXISTING);
-        Files.setLastModifiedTime(destination, FileTime.from(modifiedDate));
-        return hash;
-    }
-
-    /**
-     * Downloads the archive to the destination file if it's newer than the local version.
-     *
-     * @param destination save file
-     * @return null if no updates were found, the MD5 hash of the downloaded archive if successful
-     * @throws IOException if failed during downloading and writing to destination file
-     */
-    private String downloadDatabaseArchive(Path destination) throws IOException {
-        Instant lastModified = null;
-        if (Files.exists(dataFile)) {
-            lastModified = Files.getLastModifiedTime(dataFile).toInstant();
-        }
-
-        return downloadDatabaseArchive(lastModified, destination);
-    }
-
-    /**
-     * Verify if the expected checksum is equal to the checksum of the given file.
-     *
-     * @param function the checksum function like MD5, SHA256 used to generate the checksum from the file
-     * @param file the file we want to calculate the checksum from
-     * @param expectedChecksum the expected checksum
-     * @throws IOException on I/O error reading the file or the checksum verification failed
-     */
-    private void verifyChecksum(HashFunction function, Path file, String expectedChecksum) throws IOException {
-        HashCode actualHash = function.hashBytes(Files.readAllBytes(file));
-        HashCode expectedHash = HashCode.fromString(expectedChecksum);
-        if (!Objects.equals(actualHash, expectedHash)) {
-            throw new IOException("GEO IP Checksum verification failed. "
-                + "Expected: " + expectedChecksum + "Actual:" + actualHash);
-        }
-    }
-
-    /**
-     * Extract the database from gzipped data. Existing outputFile will be replaced if it already exists.
-     *
-     * @param inputFile gzipped database input file
-     * @param outputFile destination file for the database
-     * @throws IOException on I/O error reading the archive, or writing the output
-     */
-    private void extractDatabase(Path inputFile, Path outputFile) throws IOException {
-        // .gz -> gzipped file
-        try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(inputFile));
-             GZIPInputStream gzipIn = new GZIPInputStream(in)) {
-
-            // found the database file and copy file
-            Files.copy(gzipIn, outputFile, StandardCopyOption.REPLACE_EXISTING);
-
-            // update the last modification date to be same as in the archive
-            Files.setLastModifiedTime(outputFile, Files.getLastModifiedTime(inputFile));
-        }
-    }
-
    /**
     * Get the country code of the given IP address.
     *
@@ -330,11 +155,11 @@ public class GeoIpService {
            InetAddress address = InetAddress.getByName(ip);

            // Reader.getCountry() can be null for unknown addresses
-            return Optional.ofNullable(databaseReader.country(address)).map(AbstractCountryResponse::getCountry);
+            return Optional.ofNullable(databaseReader.getCountry(address)).map(CountryResponse::getCountry);
        } catch (UnknownHostException e) {
            // Ignore invalid ip addresses
-            // Legacy GEO IP Database returned an unknown country object with Country-Code: '--' and Country-Name: 'N/A'
-        } catch (GeoIp2Exception | IOException ioEx) {
+            // Legacy GEO IP Database returned a unknown country object with Country-Code: '--' and Country-Name: 'N/A'
+        } catch (IOException ioEx) {
            logger.logException("Cannot lookup country for " + ip + " at GEO IP database", ioEx);
        }

@@ -4,10 +4,10 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.HasCleanup;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -20,6 +20,8 @@ import org.bukkit.entity.Player;

 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;

@@ -72,9 +74,10 @@ public class PasswordRecoveryService implements Reloadable, HasCleanup {
        if (!checkEmailCooldown(player)) {
            return;
        }
-
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
+        Date date = new Date(System.currentTimeMillis());
        String recoveryCode = recoveryCodeService.generateCode(player.getName());
-        boolean couldSendMail = emailService.sendRecoveryCode(player.getName(), email, recoveryCode);
+        boolean couldSendMail = emailService.sendRecoveryCode(player.getName(), email, recoveryCode, dateFormat.format(date));
        if (couldSendMail) {
            commonService.send(player, MessageKey.RECOVERY_CODE_SENT);
            emailCooldown.add(player.getName().toLowerCase(Locale.ROOT));
@@ -94,6 +97,8 @@ public class PasswordRecoveryService implements Reloadable, HasCleanup {
        if (!checkEmailCooldown(player)) {
            return;
        }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'年'MM'月'dd'日' HH:mm:ss");
+        Date date = new Date(System.currentTimeMillis());

        String name = player.getName();
        String thePass = RandomStringUtils.generate(commonService.getProperty(RECOVERY_PASSWORD_LENGTH));
@@ -102,7 +107,7 @@ public class PasswordRecoveryService implements Reloadable, HasCleanup {
        logger.info("Generating new password for '" + name + "'");

        dataSource.updatePassword(name, hashNew);
-        boolean couldSendMail = emailService.sendPasswordMail(name, email, thePass);
+        boolean couldSendMail = emailService.sendPasswordMail(name, email, thePass, dateFormat.format(date));
        if (couldSendMail) {
            commonService.send(player, MessageKey.RECOVERY_EMAIL_SENT_MESSAGE);
            emailCooldown.add(player.getName().toLowerCase(Locale.ROOT));
@@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.RestoreSessionEvent;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.entity.Player;
@@ -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)) {
+            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) {
                Location location = buildLocationFromAuth(player, auth);
                logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
                teleportBackFromSpawn(player, location);
@@ -7,8 +7,8 @@ import com.google.common.collect.Multimap;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.output.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.settings.Settings;
@@ -17,7 +17,6 @@ import fr.xephi.authme.settings.properties.ProtectionSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.PlayerUtils;
-import fr.xephi.authme.util.StringUtils;
 import fr.xephi.authme.util.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -50,6 +49,7 @@ public class ValidationService implements Reloadable {
    private GeoIpService geoIpService;

    private Pattern passwordRegex;
+    private Pattern emailRegex;
    private Multimap<String, String> restrictedNames;

    ValidationService() {
@@ -62,6 +62,8 @@ public class ValidationService implements Reloadable {
        restrictedNames = settings.getProperty(RestrictionSettings.ENABLE_RESTRICTED_USERS)
            ? loadNameRestrictions(settings.getProperty(RestrictionSettings.RESTRICTED_USERS))
            : HashMultimap.create();
+
+        emailRegex = Utils.safePatternCompile(settings.getProperty(RestrictionSettings.ALLOWED_EMAIL_REGEX));
    }

    /**
@@ -93,12 +95,7 @@ public class ValidationService implements Reloadable {
     * @return true if the email is valid, false otherwise
     */
    public boolean validateEmail(String email) {
-        if (Utils.isEmailEmpty(email) || !StringUtils.isInsideString('@', email)) {
-            return false;
-        }
-        final String emailDomain = email.split("@")[1];
-        return validateWhitelistAndBlacklist(
-            emailDomain, EmailSettings.DOMAIN_WHITELIST, EmailSettings.DOMAIN_BLACKLIST);
+        return emailRegex.matcher(email).matches();
    }

    /**
@@ -24,6 +24,9 @@ public class Settings extends SettingsManagerImpl {
    private String passwordEmailMessage;
    private String verificationEmailMessage;
    private String recoveryCodeEmailMessage;
+    private String shutdownEmailMessage;
+    private String newPasswordEmailMessage;
+

    /**
     * Constructor.
@@ -67,10 +70,19 @@ public class Settings extends SettingsManagerImpl {
        return recoveryCodeEmailMessage;
    }

+    public String getShutdownEmailMessage() {return shutdownEmailMessage;}
+
+    public String getNewPasswordEmailMessage() {
+        return newPasswordEmailMessage;
+    }
+
    private void loadSettingsFromFiles() {
+        newPasswordEmailMessage = readFile("new_email.html");
        passwordEmailMessage = readFile("email.html");
        verificationEmailMessage = readFile("verification_code_email.html");
        recoveryCodeEmailMessage = readFile("recovery_code_email.html");
+        shutdownEmailMessage = readFile("shutdown.html");
+        String country = readFile("GeoLite2-Country.mmdb");
    }

    @Override
@@ -1,138 +0,0 @@
-package fr.xephi.authme.settings;
-
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.data.auth.PlayerCache;
-import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
-import fr.xephi.authme.service.BukkitService;
-import fr.xephi.authme.service.CommonService;
-import fr.xephi.authme.service.GeoIpService;
-import fr.xephi.authme.settings.properties.PluginSettings;
-import fr.xephi.authme.settings.properties.RegistrationSettings;
-import fr.xephi.authme.util.PlayerUtils;
-import fr.xephi.authme.util.lazytags.Tag;
-import fr.xephi.authme.util.lazytags.TagReplacer;
-import org.bukkit.ChatColor;
-import org.bukkit.Server;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static fr.xephi.authme.util.FileUtils.copyFileFromResource;
-import static fr.xephi.authme.util.lazytags.TagBuilder.createTag;
-
-/**
- * Configuration for the welcome message (welcome.txt).
- */
-public class WelcomeMessageConfiguration implements Reloadable {
-    
-    private final ConsoleLogger logger = ConsoleLoggerFactory.get(WelcomeMessageConfiguration.class);
-
-    @DataFolder
-    @Inject
-    private File pluginFolder;
-
-    @Inject
-    private Server server;
-
-    @Inject
-    private GeoIpService geoIpService;
-
-    @Inject
-    private BukkitService bukkitService;
-
-    @Inject
-    private PlayerCache playerCache;
-
-    @Inject
-    private CommonService service;
-
-    /** List of all supported tags for the welcome message. */
-    private final List<Tag<Player>> availableTags = Arrays.asList(
-        createTag("&",             () -> String.valueOf(ChatColor.COLOR_CHAR)),
-        createTag("{PLAYER}",      HumanEntity::getName),
-        createTag("{DISPLAYNAME}", Player::getDisplayName),
-        createTag("{DISPLAYNAMENOCOLOR}", Player::getDisplayName),
-        createTag("{ONLINE}",      () -> Integer.toString(bukkitService.getOnlinePlayers().size())),
-        createTag("{MAXPLAYERS}",  () -> Integer.toString(server.getMaxPlayers())),
-        createTag("{IP}",          PlayerUtils::getPlayerIp),
-        createTag("{LOGINS}",      () -> Integer.toString(playerCache.getLogged())),
-        createTag("{WORLD}",       pl -> pl.getWorld().getName()),
-        createTag("{SERVER}",      () -> service.getProperty(PluginSettings.SERVER_NAME)),
-        createTag("{VERSION}",     () -> server.getBukkitVersion()),
-        createTag("{COUNTRY}",     pl -> geoIpService.getCountryName(PlayerUtils.getPlayerIp(pl))));
-
-    private TagReplacer<Player> messageSupplier;
-
-    @PostConstruct
-    @Override
-    public void reload() {
-        if (!(service.getProperty(RegistrationSettings.USE_WELCOME_MESSAGE))) {
-            return;
-        }
-
-        List<String> welcomeMessage = new ArrayList<>();
-        for (String line : readWelcomeFile()) {
-            welcomeMessage.add(ChatColor.translateAlternateColorCodes('&', line));
-        }
-        messageSupplier = TagReplacer.newReplacer(availableTags, welcomeMessage);
-    }
-
-    /**
-     * Returns the welcome message for the given player.
-     *
-     * @param player the player for whom the welcome message should be prepared
-     * @return the welcome message
-     */
-    public List<String> getWelcomeMessage(Player player) {
-        return messageSupplier.getAdaptedMessages(player);
-    }
-
-    /**
-     * Sends the welcome message accordingly to the configuration
-     *
-     * @param player the player for whom the welcome message should be prepared
-     */
-    public void sendWelcomeMessage(Player player) {
-        if (service.getProperty(RegistrationSettings.USE_WELCOME_MESSAGE)) {
-            List<String> welcomeMessage = getWelcomeMessage(player);
-            if (service.getProperty(RegistrationSettings.BROADCAST_WELCOME_MESSAGE)) {
-                welcomeMessage.forEach(bukkitService::broadcastMessage);
-            } else {
-                welcomeMessage.forEach(player::sendMessage);
-            }
-        }
-    }
-
-    /**
-     * @return the lines of the welcome message file
-     */
-    private List<String> readWelcomeFile() {
-        if (!(service.getProperty(RegistrationSettings.USE_WELCOME_MESSAGE))) {
-            return Collections.emptyList();
-        }
-
-        File welcomeFile = new File(pluginFolder, "welcome.txt");
-        if (copyFileFromResource(welcomeFile, "welcome.txt")) {
-            try {
-                return Files.readAllLines(welcomeFile.toPath(), StandardCharsets.UTF_8);
-            } catch (IOException e) {
-                logger.logException("Failed to read welcome.txt file:", e);
-            }
-        } else {
-            logger.warning("Failed to copy welcome.txt from JAR");
-        }
-        return Collections.emptyList();
-    }
-}
@@ -4,16 +4,13 @@ import ch.jalu.configme.Comment;
 import ch.jalu.configme.SettingsHolder;
 import ch.jalu.configme.properties.Property;

-import java.util.List;
-
-import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;

 public final class EmailSettings implements SettingsHolder {

    @Comment("Email SMTP server host")
    public static final Property<String> SMTP_HOST =
-        newProperty("Email.mailSMTP", "smtp.gmail.com");
+        newProperty("Email.mailSMTP", "smtp.163.com");

    @Comment("Email SMTP server port")
    public static final Property<Integer> SMTP_PORT =
@@ -41,7 +38,7 @@ public final class EmailSettings implements SettingsHolder {

    @Comment("Recovery password length")
    public static final Property<Integer> RECOVERY_PASSWORD_LENGTH =
-        newProperty("Email.RecoveryPasswordLength", 8);
+        newProperty("Email.RecoveryPasswordLength", 12);

    @Comment("Mail Subject")
    public static final Property<String> RECOVERY_MAIL_SUBJECT =
@@ -59,14 +56,6 @@ public final class EmailSettings implements SettingsHolder {
    public static final Property<Integer> DELAY_RECALL =
        newProperty("Email.delayRecall", 5);

-    @Comment("Blacklist these domains for emails")
-    public static final Property<List<String>> DOMAIN_BLACKLIST =
-        newListProperty("Email.emailBlacklisted", "10minutemail.com");
-
-    @Comment("Whitelist ONLY these domains for emails")
-    public static final Property<List<String>> DOMAIN_WHITELIST =
-        newListProperty("Email.emailWhitelisted");
-
    @Comment("Send the new password drawn in an image?")
    public static final Property<Boolean> PASSWORD_AS_IMAGE =
        newProperty("Email.generateImage", false);
@@ -74,6 +63,12 @@ public final class EmailSettings implements SettingsHolder {
    @Comment("The OAuth2 token")
    public static final Property<String> OAUTH2_TOKEN =
        newProperty("Email.emailOauth2Token", "");
+    @Comment("Email notifications when the server shuts down")
+    public static final Property<Boolean> SHUTDOWN_MAIL =
+        newProperty("Email.shutDownEmail", false);
+    @Comment("Email notification address when the server is shut down")
+    public static final Property<String> SHUTDOWN_MAIL_ADDRESS =
+        newProperty("Email.shutDownEmailAddress", "your@mail.com");

    private EmailSettings() {
    }
@@ -18,21 +18,21 @@ public final class PluginSettings implements SettingsHolder {
        "expired, he will not need to authenticate."
    })
    public static final Property<Boolean> SESSIONS_ENABLED =
-        newProperty("settings.sessions.enabled", false);
+        newProperty("settings.sessions.enabled", true);

    @Comment({
        "After how many minutes should a session expire?",
        "A player's session ends after the timeout or if his IP has changed"
    })
    public static final Property<Integer> SESSIONS_TIMEOUT =
-        newProperty("settings.sessions.timeout", 10);
+        newProperty("settings.sessions.timeout", 43200);

    @Comment({
        "Message language, available languages:",
        "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/translations.md"
    })
    public static final Property<String> MESSAGES_LANGUAGE =
-        newProperty("settings.messagesLanguage", "en");
+        newProperty("settings.messagesLanguage", "zhcn");

    @Comment({
        "Enables switching a player to defined permission groups before they log in.",
@@ -14,34 +14,19 @@ public final class ProtectionSettings implements SettingsHolder {

    @Comment("Enable some servers protection (country based login, antibot)")
    public static final Property<Boolean> ENABLE_PROTECTION =
-        newProperty("Protection.enableProtection", false);
+        newProperty("Protection.enableProtection", true);

    @Comment("Apply the protection also to registered usernames")
    public static final Property<Boolean> ENABLE_PROTECTION_REGISTERED =
        newProperty("Protection.enableProtectionRegistered", true);

-    @Comment("Enable GeoIp database")
-    public static final Property<Boolean> ENABLE_GEOIP =
-        newProperty("Protection.geoIpDatabase.enabled", true);
-
-    @Comment({"The MaxMind clientId used to download the GeoIp database,",
-        "get one at https://www.maxmind.com/en/accounts/current/license-key",
-        "The EssentialsX project has a very useful tutorial on how to generate",
-        "the license key: https://github.com/EssentialsX/Wiki/blob/master/GeoIP.md"})
-    public static final Property<String> MAXMIND_API_CLIENT_ID =
-        newProperty("Protection.geoIpDatabase.clientId", "");
-
-    @Comment("The MaxMind licenseKey used to download the GeoIp database.")
-    public static final Property<String> MAXMIND_API_LICENSE_KEY =
-        newProperty("Protection.geoIpDatabase.licenseKey", "");
-
    @Comment({
        "Countries allowed to join the server and register. For country codes, see",
        "https://dev.maxmind.com/geoip/legacy/codes/iso3166/",
        "Use \"LOCALHOST\" for local addresses.",
        "PLEASE USE QUOTES!"})
    public static final Property<List<String>> COUNTRIES_WHITELIST =
-        newListProperty("Protection.countries", "US", "GB", "LOCALHOST");
+        newListProperty("Protection.countries", "CN", "LOCALHOST");

    @Comment({
        "Countries not allowed to join the server and register",
@@ -73,7 +58,7 @@ public final class ProtectionSettings implements SettingsHolder {

    @Comment("Kicks the player that issued a command before the defined time after the join process")
    public static final Property<Integer> QUICK_COMMANDS_DENIED_BEFORE_MILLISECONDS =
-        newProperty("Protection.quickCommands.denyCommandsBeforeMilliseconds", 1000);
+        newProperty("Protection.quickCommands.denyCommandsBeforeMilliseconds", 3000);

    private ProtectionSettings() {
    }
@@ -18,7 +18,7 @@ public final class RegistrationSettings implements SettingsHolder {
        "Send every X seconds a message to a player to",
        "remind him that he has to login/register"})
    public static final Property<Integer> MESSAGE_INTERVAL =
-        newProperty("settings.registration.messageInterval", 5);
+        newProperty("settings.registration.messageInterval", 600);

    @Comment({
        "Only registered and logged in players can play.",
@@ -33,17 +33,18 @@ public final class RegistrationSettings implements SettingsHolder {
        "More info at https://github.com/AuthMe/AuthMeReloaded/wiki/Registration"
    })
    public static final Property<RegistrationType> REGISTRATION_TYPE =
-        newProperty(RegistrationType.class, "settings.registration.type", RegistrationType.PASSWORD);
+        newProperty(RegistrationType.class, "settings.registration.type", RegistrationType.EMAIL);

    @Comment({
-        "Second argument the /register command should take: NONE = no 2nd argument",
+        "Second argument the /register command should take: ",
+        "NONE = no 2nd argument",
        "CONFIRMATION = must repeat first argument (pass or email)",
        "EMAIL_OPTIONAL = for password register: 2nd argument can be empty or have email address",
        "EMAIL_MANDATORY = for password register: 2nd argument MUST be an email address"
    })
    public static final Property<RegisterSecondaryArgument> REGISTER_SECOND_ARGUMENT =
        newProperty(RegisterSecondaryArgument.class, "settings.registration.secondArg",
-            RegisterSecondaryArgument.CONFIRMATION);
+            RegisterSecondaryArgument.NONE);

    @Comment({
        "Do we force kick a player after a successful registration?",
@@ -54,26 +55,9 @@ public final class RegistrationSettings implements SettingsHolder {
    @Comment("Does AuthMe need to enforce a /login after a successful registration?")
    public static final Property<Boolean> FORCE_LOGIN_AFTER_REGISTER =
        newProperty("settings.registration.forceLoginAfterRegister", false);
-
-    @Comment({
-        "Enable to display the welcome message (welcome.txt) after a login",
-        "You can use colors in this welcome.txt + some replaced strings:",
-        "{PLAYER}: player name, {ONLINE}: display number of online players,",
-        "{MAXPLAYERS}: display server slots, {IP}: player ip, {LOGINS}: number of players logged,",
-        "{WORLD}: player current world, {SERVER}: server name",
-        "{VERSION}: get current bukkit version, {COUNTRY}: player country"})
-    public static final Property<Boolean> USE_WELCOME_MESSAGE =
-        newProperty("settings.useWelcomeMessage", true);
-
-    @Comment({
-        "Broadcast the welcome message to the server or only to the player?",
-        "set true for server or false for player"})
-    public static final Property<Boolean> BROADCAST_WELCOME_MESSAGE =
-        newProperty("settings.broadcastWelcomeMessage", false);
-
    @Comment("Should we delay the join message and display it once the player has logged in?")
    public static final Property<Boolean> DELAY_JOIN_MESSAGE =
-        newProperty("settings.delayJoinMessage", false);
+        newProperty("settings.delayJoinMessage", true);

    @Comment({
        "The custom join message that will be sent after a successful login,",
@@ -87,15 +71,15 @@ public final class RegistrationSettings implements SettingsHolder {

    @Comment("Should we remove the leave messages of unlogged users?")
    public static final Property<Boolean> REMOVE_UNLOGGED_LEAVE_MESSAGE =
-        newProperty("settings.removeUnloggedLeaveMessage", false);
+        newProperty("settings.removeUnloggedLeaveMessage", true);

    @Comment("Should we remove join messages altogether?")
    public static final Property<Boolean> REMOVE_JOIN_MESSAGE =
-        newProperty("settings.removeJoinMessage", false);
+        newProperty("settings.removeJoinMessage", true);

    @Comment("Should we remove leave messages altogether?")
    public static final Property<Boolean> REMOVE_LEAVE_MESSAGE =
-        newProperty("settings.removeLeaveMessage", false);
+        newProperty("settings.removeLeaveMessage", true);

    @Comment("Do we need to add potion effect Blinding before login/register?")
    public static final Property<Boolean> APPLY_BLIND_EFFECT =
@@ -33,7 +33,7 @@ public final class RestrictionSettings implements SettingsHolder {
        "Max number of allowed registrations per IP",
        "The value 0 means an unlimited number of registrations!"})
    public static final Property<Integer> MAX_REGISTRATION_PER_IP =
-        newProperty("settings.restrictions.maxRegPerIp", 1);
+        newProperty("settings.restrictions.maxRegPerIp", 3);

    @Comment("Minimum allowed username length")
    public static final Property<Integer> MIN_NICKNAME_LENGTH =
@@ -74,7 +74,7 @@ public final class RestrictionSettings implements SettingsHolder {
        "To activate the restricted user feature you need",
        "to enable this option and configure the AllowedRestrictedUser field."})
    public static final Property<Boolean> ENABLE_RESTRICTED_USERS =
-        newProperty("settings.restrictions.AllowRestrictedUser", false);
+        newProperty("settings.restrictions.AllowRestrictedUser", true);

    @Comment({
        "The restricted user feature will kick players listed below",
@@ -85,7 +85,12 @@ public final class RestrictionSettings implements SettingsHolder {
        "    - playername;127.0.0.1",
        "    - playername;regex:127\\.0\\.0\\..*"})
    public static final Property<Set<String>> RESTRICTED_USERS =
-        newLowercaseStringSetProperty("settings.restrictions.AllowedRestrictedUser");
+        newLowercaseStringSetProperty("settings.restrictions.AllowedRestrictedUser",
+            "server_land;127.0.0.1","server;127.0.0.1","bukkit;127.0.0.1","purpur;127.0.0.1",
+            "system;127.0.0.1","admin;127.0.0.1","md_5;127.0.0.1","administrator;127.0.0.1","notch;127.0.0.1",
+            "spigot;127.0.0.1","bukkit;127.0.0.1","bukkitcraft;127.0.0.1","paperclip;127.0.0.1","papermc;127.0.0.1",
+            "spigotmc;127.0.0.1","root;127.0.0.1","console;127.0.0.1","purpur;127.0.0.1","authme;127.0.0.1",
+            "owner;127.0.0.1");

    @Comment("Ban unknown IPs trying to log in with a restricted username?")
    public static final Property<Boolean> BAN_UNKNOWN_IP =
@@ -97,7 +102,7 @@ public final class RestrictionSettings implements SettingsHolder {

    @Comment("Should players be kicked on wrong password?")
    public static final Property<Boolean> KICK_ON_WRONG_PASSWORD =
-        newProperty("settings.restrictions.kickOnWrongPassword", true);
+        newProperty("settings.restrictions.kickOnWrongPassword", false);

    @Comment({
        "Should not logged in players be teleported to the spawn?",
@@ -108,28 +113,31 @@ public final class RestrictionSettings implements SettingsHolder {

    @Comment("Can unregistered players walk around?")
    public static final Property<Boolean> ALLOW_UNAUTHED_MOVEMENT =
-        newProperty("settings.restrictions.allowMovement", false);
+        newProperty("settings.restrictions.allowMovement", true);

    @Comment({
        "After how many seconds should players who fail to login or register",
        "be kicked? Set to 0 to disable."})
    public static final Property<Integer> TIMEOUT =
-        newProperty("settings.restrictions.timeout", 30);
+        newProperty("settings.restrictions.timeout", 0);

    @Comment("Regex pattern of allowed characters in the player name.")
    public static final Property<String> ALLOWED_NICKNAME_CHARACTERS =
        newProperty("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_]*");

+    @Comment("Allow FloodGatePlayer Join Without checkIsValidName()")
+    public static final Property<Boolean> HOOK_FLOODGATE_PLAYER =
+        newProperty("settings.restrictions.hookFloodGatePlayer", false);
    @Comment({
        "How far can unregistered players walk?",
        "Set to 0 for unlimited radius"
    })
    public static final Property<Integer> ALLOWED_MOVEMENT_RADIUS =
-        newProperty("settings.restrictions.allowedMovementRadius", 100);
+        newProperty("settings.restrictions.allowedMovementRadius", 0);

    @Comment("Should we protect the player inventory before logging in? Requires ProtocolLib.")
    public static final Property<Boolean> PROTECT_INVENTORY_BEFORE_LOGIN =
-        newProperty("settings.restrictions.ProtectInventoryBeforeLogIn", true);
+        newProperty("settings.restrictions.ProtectInventoryBeforeLogIn", false);

    @Comment("Should we deny the tabcomplete feature before logging in? Requires ProtocolLib.")
    public static final Property<Boolean> DENY_TABCOMPLETE_BEFORE_LOGIN =
@@ -139,7 +147,7 @@ public final class RestrictionSettings implements SettingsHolder {
        "Should we display all other accounts from a player when he joins?",
        "permission: /authme.admin.accounts"})
    public static final Property<Boolean> DISPLAY_OTHER_ACCOUNTS =
-        newProperty("settings.restrictions.displayOtherAccounts", true);
+        newProperty("settings.restrictions.displayOtherAccounts", false);

    @Comment("Spawn priority; values: authme, essentials, cmi, multiverse, default")
    public static final Property<String> SPAWN_PRIORITY =
@@ -147,15 +155,15 @@ public final class RestrictionSettings implements SettingsHolder {

    @Comment("Maximum Login authorized by IP")
    public static final Property<Integer> MAX_LOGIN_PER_IP =
-        newProperty("settings.restrictions.maxLoginPerIp", 0);
+        newProperty("settings.restrictions.maxLoginPerIp", 3);

    @Comment("Maximum Join authorized by IP")
    public static final Property<Integer> MAX_JOIN_PER_IP =
-        newProperty("settings.restrictions.maxJoinPerIp", 0);
+        newProperty("settings.restrictions.maxJoinPerIp", 3);

    @Comment("AuthMe will NEVER teleport players if set to true!")
    public static final Property<Boolean> NO_TELEPORT =
-        newProperty("settings.restrictions.noTeleport", false);
+        newProperty("settings.restrictions.noTeleport", true);

    @Comment({
        "Regex syntax for allowed chars in passwords. The default [!-~] allows all visible ASCII",
@@ -165,6 +173,11 @@ public final class RestrictionSettings implements SettingsHolder {
    public static final Property<String> ALLOWED_PASSWORD_REGEX =
        newProperty("settings.restrictions.allowedPasswordCharacters", "[!-~]*");

+    @Comment("Regex syntax for allowed chars in email.")
+    public static final Property<String> ALLOWED_EMAIL_REGEX =
+        newProperty("settings.restrictions.allowedEmailCharacters", "^[A-Za-z0-9]{4,15}@(outlook|163|gmail|icloud).com$");
+
+
    @Comment("Force survival gamemode when player joins?")
    public static final Property<Boolean> FORCE_SURVIVAL_MODE =
        newProperty("settings.GameMode.ForceSurvivalMode", false);
@@ -29,15 +29,15 @@ public final class SecuritySettings implements SettingsHolder {

    @Comment("Max allowed tries before a captcha is required")
    public static final Property<Integer> MAX_LOGIN_TRIES_BEFORE_CAPTCHA =
-        newProperty("Security.captcha.maxLoginTry", 5);
+        newProperty("Security.captcha.maxLoginTry", 8);

    @Comment("Captcha length")
    public static final Property<Integer> CAPTCHA_LENGTH =
-        newProperty("Security.captcha.captchaLength", 5);
+        newProperty("Security.captcha.captchaLength", 6);

    @Comment("Minutes after which login attempts count is reset for a player")
    public static final Property<Integer> CAPTCHA_COUNT_MINUTES_BEFORE_RESET =
-        newProperty("Security.captcha.captchaCountReset", 60);
+        newProperty("Security.captcha.captchaCountReset", 120);

    @Comment("Require captcha before a player may register?")
    public static final Property<Boolean> ENABLE_CAPTCHA_FOR_REGISTRATION =
@@ -45,11 +45,11 @@ public final class SecuritySettings implements SettingsHolder {

    @Comment("Minimum length of password")
    public static final Property<Integer> MIN_PASSWORD_LENGTH =
-        newProperty("settings.security.minPasswordLength", 5);
+        newProperty("settings.security.minPasswordLength", 8);

    @Comment("Maximum length of password")
    public static final Property<Integer> MAX_PASSWORD_LENGTH =
-        newProperty("settings.security.passwordMaxLength", 30);
+        newProperty("settings.security.passwordMaxLength", 26);

    @Comment({
        "Possible values: SHA256, BCRYPT, BCRYPT2Y, PBKDF2, SALTEDSHA512,",
@@ -87,7 +87,7 @@ public final class SecuritySettings implements SettingsHolder {
        "- 'help'"})
    public static final Property<Set<String>> UNSAFE_PASSWORDS =
        newLowercaseStringSetProperty("settings.security.unsafePasswords",
-            "123456", "password", "qwerty", "12345", "54321", "123456789", "help");
+            "12345678", "password", "qwertyui", "123456789", "87654321", "1234567890", "asdfghjkl","zxcvbnm,","asdfghjk","12312312","123123123","32132132","321321321");

    @Comment("Tempban a user's IP address if they enter the wrong password too many times")
    public static final Property<Boolean> TEMPBAN_ON_MAX_LOGINS =
@@ -95,7 +95,7 @@ public final class SecuritySettings implements SettingsHolder {

    @Comment("How many times a user can attempt to login before their IP being tempbanned")
    public static final Property<Integer> MAX_LOGIN_TEMPBAN =
-        newProperty("Security.tempban.maxLoginTries", 10);
+        newProperty("Security.tempban.maxLoginTries", 8);

    @Comment({"The length of time a IP address will be tempbanned in minutes",
        "Default: 480 minutes, or 8 hours"})
@@ -118,17 +118,17 @@ public final class SecuritySettings implements SettingsHolder {

    @Comment("How many hours is a recovery code valid for?")
    public static final Property<Integer> RECOVERY_CODE_HOURS_VALID =
-        newProperty("Security.recoveryCode.validForHours", 4);
+        newProperty("Security.recoveryCode.validForHours", 6);

    @Comment("Max number of tries to enter recovery code")
    public static final Property<Integer> RECOVERY_CODE_MAX_TRIES =
-        newProperty("Security.recoveryCode.maxTries", 3);
+        newProperty("Security.recoveryCode.maxTries", 4);

    @Comment({"How long a player has after password recovery to change their password",
        "without logging in. This is in minutes.",
        "Default: 2 minutes"})
    public static final Property<Integer> PASSWORD_CHANGE_TIMEOUT =
-        newProperty("Security.recoveryCode.passwordChangeTimeout", 2);
+        newProperty("Security.recoveryCode.passwordChangeTimeout", 5);

    @Comment({
        "Seconds a user has to wait for before a password recovery mail may be sent again",
@@ -41,7 +41,10 @@
 #     executor: CONSOLE
 #     ifNumberOfAccountsAtLeast: 5
 # Commands to run for players logging in whose 'last login date' was empty
-onFirstLogin: {}
+onFirstLogin:
+  broadcast:
+    command: 'cmi broadcast &b欢迎 &r%p &7( %ip ) &b光临服务器,请大家多多关照!'
+    executor: CONSOLE
 onJoin: {}
 onLogin: {}
 # These commands are called whenever a logged in player uses /logout or quits.
@@ -1,18 +1,120 @@
-<h1>
-Dear <playername />,
-</h1>
-
-<p>
-This is your new AuthMe password for the server <servername />:
-</p>
-<p>
-<generatedpass />
-</p>
-<image />
-<p>
-Do not forget to change password after login!<br />
-/changepassword <generatedpass /> newPassword'
-</p>
-<p>
-See you on <servername />!
-</p>
+<div class="mail">
+    <style>
+        .mail td{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            font-size: 16px;
+            color: #718096;
+        }
+        .mail th, div, p, a, h1, h2, h3, h4, h5, h6{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            color: #3d4852;
+        }
+        .mail .mail-content {
+            max-width: 100vw;
+            padding: 32px;
+            box-shadow: 0 15px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.25);
+        }
+        .mail div{
+            background-color: #ffffff;color: #718096;height: 100%;line-height: 1.4;width: 100%;
+        }
+        .mail .x_wrapper{
+            background-color: #edf2f7; 
+            width:100%;
+        }
+        .mail .x_content{
+            width: 100%;
+        }
+        .mail .x_inner-body{
+            background-color: #ffffff;border-color: #e8e5ef;border-radius: 2px;border-width: 1px;margin: 0 auto;padding:0;width: 570px;
+        }
+        .mail .x_content-cell{
+            margin: 0 auto;padding: 0;width: 570px;line-height: 1.5em;
+            color: #b0adc5;font-size: 12px;
+        }
+        .mail .x_content-cell td{
+            max-width: 100vw;padding: 32px;
+        }
+    </style>
+    <div>
+        <table class="x_wrapper">
+            <tbody>
+            <tr>
+                <td>
+                    <table class="x_content">
+                        <tbody>
+                        <tr>
+                            <td style="padding: 25px 0;">
+                                <h1 style="font-size: 20px;">密码重置邮件</h1>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_inner-body">
+                                    <tbody>
+                                    <tr>
+                                        <td class="mail-content">
+                                       <h1 style="font-size: 18px;margin-bottom: 25px;">Minecraft · <servername /><br/><playername /></h1>
+                                            <hr>
+                                            <table style="width: 100%;">
+                                                <tbody>
+                                                <tr>
+                                                    <td>
+                                                        您正在申请的新密码为
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="font-weight: bold;">
+                                                        <br/><generatedpass /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <br/>请妥善保存,在新地址上进行登录时,需提供该密码.
+                                                        <br/>若非必要,请勿更换密码,否则将对您的账户安全构成威胁.
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:right;">
+                                                        <br/>
+                                                        <br/>祝您游玩愉快~!
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <small>
+                                                            <br/><time />
+                                                            <br/>请勿回复
+                                                        </small>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_content-cell">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <p style="color:#b0adc5;">© 2023 IrisCraft. All rights reserved.</p>
+                                            <a href="https://www.mcbbs.net/thread-1263385-1-1.html" target="_blank" style="text-decoration: none; font-size: 16px">iriscraft.work</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
@@ -1,45 +0,0 @@
-# Translation config for the AuthMe help, e.g. when /authme help or /authme help register is called
-
-# -------------------------------------------------------
-# List of texts used in the help section
-common:
-    header: '==========[ AuthMeReloaded ヘルプ ]=========='
-    optional: 'オプション'
-    hasPermission: '権限を持っています'
-    noPermission: '権限がありません'
-    default: 'デフォルト'
-    result: '結果'
-    defaultPermissions:
-        notAllowed: '権限がありません'
-        opOnly: 'OPのみ'
-        allowed: '全員に許可'
-
-# -------------------------------------------------------
-# Titles of the individual help sections
-# Set the translation text to empty text to disable the section, e.g. to hide alternatives:
-#   alternatives: ''
-section:
-    command: 'コマンド'
-    description: '簡単な説明'
-    detailedDescription: '詳細な説明'
-    arguments: '引数'
-    permissions: '権限'
-    alternatives: '代替'
-    children: 'コマンド'
-
-# -------------------------------------------------------
-# You can translate the data for all commands using the below pattern.
-# For example to translate /authme reload, create a section "authme.reload", or "login" for /login
-# If the command has arguments, you can use arg1 as below to translate the first argument, and so forth
-# Translations don't need to be complete; any missing section will be taken from the default silently
-# Important: Put main commands like "authme" before their children (e.g. "authme.reload")
-commands:
-    authme.register:
-        description: 'プレイヤーを登録します'
-        detailedDescription: '指定されたプレイヤーを指定されたパスワードで登録します。'
-        arg1:
-            label: 'プレイヤー名'
-            description: 'プレイヤー名'
-        arg2:
-            label: 'パスワード'
-            description: 'パスワード'
@@ -1,45 +0,0 @@
-# Translation config for the AuthMe help, e.g. when /authme help or /authme help register is called
-
-# -------------------------------------------------------
-# List of texts used in the help section
-common:
-    header: '==========[ AuthMeReloaded PAGALBA ]=========='
-    optional: 'Neprivaloma'
-    hasPermission: 'Jūs turite leidimą'
-    noPermission: 'Jūs neturite leidimo'
-    default: 'Numatytas'
-    result: 'Rezultatas'
-    defaultPermissions:
-        notAllowed: 'Nėra leidimo'
-        opOnly: 'Tik OP'
-        allowed: 'Visiems leistina'
-
-# -------------------------------------------------------
-# Titles of the individual help sections
-# Set the translation text to empty text to disable the section, e.g. to hide alternatives:
-#   alternatives: ''
-section:
-    command: 'Komanda'
-    description: 'Trumpas aprašas'
-    detailedDescription: 'Detalus aprašas'
-    arguments: 'Argumentai'
-    permissions: 'Leidimai'
-    alternatives: 'Alternatyvos'
-    children: 'Komandos'
-
-# -------------------------------------------------------
-# You can translate the data for all commands using the below pattern.
-# For example to translate /authme reload, create a section "authme.reload", or "login" for /login
-# If the command has arguments, you can use arg1 as below to translate the first argument, and so forth
-# Translations don't need to be complete; any missing section will be taken from the default silently
-# Important: Put main commands like "authme" before their children (e.g. "authme.reload")
-commands:
-    authme.register:
-        description: 'Užregistruoti žaidėją'
-        detailedDescription: 'Užregistruokite nurodytą žaidėją su nurodytu slaptažodžiu.'
-        arg1:
-            label: 'žaidėjas'
-            description: 'Žaidėjo vardas'
-        arg2:
-            label: 'slaptažodis'
-            description: 'Slaptažodis'
@@ -1,8 +1,5 @@
-# AuthmeReloaded帮助文件汉化
-# Translated By CH1
-# -------------------------------------------------------
 common:
-    header: '==========[ AuthMeReloaded ]=========='
+    header: '======================================'
    optional: '可选'
    hasPermission: '您拥有权限去使用这个指令'
    noPermission: '您没有权限使用这个指令'
@@ -1,156 +0,0 @@
-# List of global tags:
-# %nl% - Goes to new line.
-# %username% - Replaces the username of the player receiving the message.
-# %displayname% - Replaces the nickname (and colors) of the player receiving the message.
-
-# Registration
-registration:
-  register_request: '&3サーバーに登録するには、次のコマンドを使用してください: /register <パスワード> <パスワードの確認>'
-  command_usage: '&c使用方法: /register <パスワード> <パスワードの確認>'
-  reg_only: '&4登録済みのユーザーのみサーバーに参加できます！ 自分自身を登録するには、http://example.com にアクセスしてください！'
-  kicked_admin_registered: '管理者があなたを登録しました。再度ログインしてください。'
-  success: '&2登録が完了しました！'
-  disabled: '&cゲーム内での登録は無効になっています！'
-  name_taken: '&cこのユーザー名はすでに登録されています！'
-
-# Password errors on registration
-password:
-  match_error: '&cパスワードが一致しません。もう一度確認してください！'
-  name_in_password: '&cパスワードには自分の名前を使用することはできません。別のパスワードを選択してください...'
-  unsafe_password: '&c選択したパスワードは安全ではありません。別のパスワードを選択してください...'
-  forbidden_characters: '&4パスワードに不正な文字が含まれています。許可されている文字: %valid_chars'
-  wrong_length: '&cパスワードが短すぎるか長すぎます！別のパスワードを試してください！'
-
-# Login
-login:
-  command_usage: '&c使用方法: /login <パスワード>'
-  wrong_password: '&cパスワードが間違っています！'
-  success: '&2ログインが成功しました！'
-  login_request: '&c次のコマンドを使用してログインしてください: /login <パスワード>'
-  timeout_error: '&4ログインのタイムアウトが発生しました。サーバーからキックされました。もう一度試してください！'
-
-# Errors
-error:
-  unregistered_user: '&cこのユーザーは登録されていません！'
-  denied_command: '&cこのコマンドを使用するには認証が必要です！'
-  denied_chat: '&cチャットするには認証が必要です！'
-  not_logged_in: '&cログインしていません！'
-  tempban_max_logins: '&cログインに失敗した回数が多すぎるため、一時的にアクセスが制限されています。'
-  max_registration: '&c接続ごとの登録数が最大値を超えています（%reg_count/%max_acc %reg_names）！'
-  no_permission: '&4この操作を実行する権限がありません！'
-  unexpected_error: '&4予期しないエラーが発生しました。管理者に連絡してください！'
-  kick_for_vip: '&3VIPプレイヤーがサーバーが満員の状態で参加しました！'
-  logged_in: '&cすでにログイン済みです！'
-  kick_unresolved_hostname: '&cエラーが発生しました：解決できないプレイヤーのホスト名！'
-
-# AntiBot
-antibot:
-  kick_antibot: 'AntiBot保護モードが有効です！サーバーに参加するまでにしばらくお待ちください。'
-  auto_enabled: '&4[AntiBotService] 接続数が非常に多いため、AntiBotが有効になりました！'
-  auto_disabled: '&2[AntiBotService] %m 分後にAntiBotが無効になりました！'
-
-unregister:
-  success: '&c登録が正常に解除されました！'
-  command_usage: '&c使用方法: /unregister <パスワード>'
-
-# Other messages
-misc:
-  accounts_owned_self: '所持しているアカウント数：%count 個'
-  accounts_owned_other: 'プレイヤー %name のアカウント数：%count 個'
-  account_not_activated: '&cアカウントはまだ有効化されていません。メールを確認してください！'
-  password_changed: '&2パスワードが正常に変更されました！'
-  logout: '&2正常にログアウトしました！'
-  reload: '&2設定とデータベースが正常に再読み込みされました！'
-  usage_change_password: '&c使用方法: /changepassword <旧パスワード> <新パスワード>'
-
-# Session messages
-session:
-  invalid_session: '&cIPアドレスが変更され、セッションのデータが期限切れです！'
-  valid_session: '&2セッションの再接続によるログインです。'
-
-# Error messages when joining
-on_join_validation:
-  name_length: '&4ユーザー名が短すぎるか長すぎます！'
-  characters_in_name: '&4ユーザー名に無効な文字が含まれています。許可される文字：%valid_chars'
-  country_banned: '&4このサーバーへのアクセスは、お使いの国から制限されています！'
-  not_owner_error: 'このアカウントの所有者ではありません。別の名前を選択してください！'
-  kick_full_server: '&4サーバーが満員です。後でもう一度お試しください！'
-  same_nick_online: '&4同じユーザー名のプレイヤーが既にサーバーでプレイしています！'
-  invalid_name_case: '正しいユーザー名は %valid です。%invalid ではなく、このユーザー名で参加してください。'
-  same_ip_online: '同じIPアドレスを持つプレイヤーが既にゲーム内にいます！'
-  quick_command: 'コマンドを速すぎる速度で使用しました！もう一度サーバーに参加してから、コマンドを使用する前にしばらくお待ちください。'
-
-# Email
-email:
-  usage_email_add: '&c使用方法：/email add <メールアドレス> <メールアドレスの確認>'
-  usage_email_change: '&c使用方法：/email change <古いメールアドレス> <新しいメールアドレス>'
-  new_email_invalid: '&c無効な新しいメールアドレスです。もう一度やり直してください！'
-  old_email_invalid: '&c無効な古いメールアドレスです。もう一度やり直してください！'
-  invalid: '&c無効なメールアドレスです。もう一度やり直してください！'
-  added: '&2メールアドレスがアカウントに正常に追加されました！'
-  request_confirmation: '&cメールアドレスを確認してください！'
-  changed: '&2メールアドレスが正しく変更されました！'
-  email_show: '&2現在のメールアドレスは：%email'
-  incomplete_settings: 'エラー：メールの送信に必要なすべての設定が設定されていません。管理者に連絡してください。'
-  already_used: '&4そのメールアドレスは既に使用されています'
-  send_failure: 'メールを送信できませんでした。管理者に連絡してください。'
-  no_email_for_account: '&2現在、このアカウントに関連付けられたメールアドレスはありません。'
-  add_email_request: '&3コマンド「/email add <あなたのメールアドレス> <確認用メールアドレス>」を使用して、アカウントにメールアドレスを追加してください。'
-  change_password_expired: 'このコマンドを使用してパスワードを変更することはできません。'
-  email_cooldown_error: '&c最近すでにメールが送信されています。新しいメールを送信する前に、%time 待つ必要があります。'
-  add_not_allowed: '&cメールアドレスの追加は許可されていません。'
-  change_not_allowed: '&cメールアドレスの変更は許可されていません。'
-
-# Password recovery by email
-recovery:
-  forgot_password_hint: '&3パスワードを忘れましたか？次のコマンドを使用してください：/email recovery <あなたのメールアドレス>'
-  command_usage: '&c使用方法：/email recovery <メールアドレス>'
-  email_sent: '&2パスワードの回復メールが正常に送信されました！メールの受信トレイを確認してください！'
-  code:
-    code_sent: 'パスワードをリセットするための回復コードがメールで送信されました。'
-    incorrect: '回復コードが正しくありません！残りの試行回数：%count'
-    tries_exceeded: '回復コードの入力試行回数が上限を超えました。新しいコードを生成するには、"/email recovery [メールアドレス]" を実行してください。'
-    correct: '回復コードが正しく入力されました！'
-    change_password: '即座にパスワードを変更するには、コマンド「/email setpassword <新しいパスワード>」を使用してください。'
-
-# Captcha
-captcha:
-  usage_captcha: '&3ログインするには、Captchaコードを解決する必要があります。次のコマンドを使用してください：/captcha %captcha_code'
-  wrong_captcha: '&cCaptchaコードが間違っています。チャットに「/captcha %captcha_code」と入力してください！'
-  valid_captcha: '&2Captchaコードが正しく解決されました！'
-  captcha_for_registration: '登録するには、まずCaptchaを解決する必要があります。次のコマンドを使用してください：/captcha %captcha_code'
-  register_captcha_valid: '&2有効なCaptchaです！/register を使用して登録できます'
-
-# Verification code
-verification:
-  code_required: '&3このコマンドはセンシティブな操作であり、メールの認証が必要です！受信トレイを確認し、メールの指示に従ってください。'
-  command_usage: '&c使用方法：/verification <コード>'
-  incorrect_code: '&cコードが正しくありません。メールで受け取ったコードを使用して、「/verification <コード>」とチャットに入力してください。'
-  success: '&2身元が確認されました！現在のセッション内ですべてのコマンドを実行できます！'
-  already_verified: '&2現在のセッションでは、既にすべてのセンシティブなコマンドを実行できます！'
-  code_expired: '&3コードの有効期限が切れています！新しいコードを取得するには、別のセンシティブなコマンドを実行してください！'
-  email_needed: '&3アカウントにはメールアドレスのリンクが必要です。身元を確認するためにはメールアドレスを関連付けてください！'
-
-# Two-factor authentication
-two_factor:
-  code_created: '&2秘密コードは %code です。こちらからスキャンできます：%url'
-  confirmation_required: 'コードを確認するには、/2fa confirm <コード> を使用してください'
-  code_required: '二要素認証コードを提出するには、/2fa code <コード> を使用してください'
-  already_enabled: 'アカウントで既に二要素認証が有効になっています！'
-  enable_error_no_code: '2要素認証キーが生成されていないか、期限が切れています。/2fa add を実行してください'
-  enable_success: 'アカウントでの二要素認証が正常に有効になりました'
-  enable_error_wrong_code: 'コードが間違っているか、期限が切れています。/2fa add を実行してください'
-  not_enabled_error: 'アカウントでは二要素認証が有効になっていません。/2fa add を実行してください'
-  removed_success: 'アカウントから二要素認証が正常に削除されました'
-  invalid_code: '無効なコードです！'
-
-# Time units
-time:
-  second: '秒'
-  seconds: '秒'
-  minute: '分'
-  minutes: '分'
-  hour: '時間'
-  hours: '時間'
-  day: '日'
-  days: '日'
@@ -5,153 +5,153 @@

 # Registration
 registration:
-    disabled: '&6Registracija yra išjungta'
-    name_taken: '&cVartotojo vardas jau užregistruotas'
-    register_request: '&ePrašome prisiregistruoti: /register slaptažodis pakartotiSlaptažodį'
-    command_usage: '&eNaudojimas: /register slaptažodis pakartotiSlaptažodį'
-    reg_only: '&cTik prisiregistravusiems žaidėjams: apsilankykite: http://example.com tam, kad užsiregistruoti.'
-    success: '&aSėkmingai prisiregistravote.'
-    kicked_admin_registered: 'Administatorius Jus užregistravo. Prisijunkite iš naujo'
+    disabled: '&6Registracija yra isjungta'
+    name_taken: '&cVartotojo vardas jau uzregistruotas'
+    register_request: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi'
+    command_usage: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi'
+    reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.'
+    success: '&aSekmingai prisiregistravote.'
+    kicked_admin_registered: 'Administatorius jus uzregistravo. Prisijunkite isnaujo'

 # Password errors on registration
 password:
-    match_error: '&cSlaptažodžiai nesutampa'
-    name_in_password: '&cJūs negalite naudoti savo vardo slaptažodyje'
-    unsafe_password: '&cŠį Slaptažodį lengva nulaužti, pasirinkite kitą slaptažodį'
-    forbidden_characters: '&4Jūsų slaptažodis turi netinkamų simbolių. Leidžiami simboliai: %valid_chars'
-    wrong_length: '&cJūsų pasirinktas slaptažodis per ilgas arba per trumpas.'
+    match_error: '&cSlaptazodziai nesutampa'
+    name_in_password: '&cJus negalite naudoti savo varda slaptazodyje'
+    unsafe_password: '&cSi slaptazodi lengva nulausti, pasirinkite kita slaptazodi'
+    forbidden_characters: '&4Jusus slaptazodis turi netinkamu simboliu. Leidziami simboliai: %valid_chars'
+    wrong_length: '&cJusu slaptazodis buvo per ilgas arba per trumpas.'

 # Login
 login:
-    command_usage: '&eKomandos panaudojimas: /login slaptažodis'
-    wrong_password: '&cNeteisingas Slaptažosdis'
-    success: '&aSėkmingai prisijungėte'
-    login_request: '&ePrašome prisijungti: /login slaptažodis'
-    timeout_error: '&cNespėjote prisijungti'
+    command_usage: '&eKomandos panaudojimas: /login slaptazodis'
+    wrong_password: '&cNeteisingas slaptazosdis'
+    success: '&aSekmingai prisijungete'
+    login_request: '&ePrasome prisijungti: /login slaptazodis'
+    timeout_error: '&cNespejote prisijungti'

 # Errors
 error:
-    denied_command: '&cKad galetumėte naudoti šią komandą turite būti prisijungę!'
-    denied_chat: '&cKad galetumėte kalbėti Jūs turite būti prisijungę!'
-    unregistered_user: '&cVartotojas neprisiregistravęs'
-    not_logged_in: '&cJūs neprisijungę!'
-    no_permission: '&cNėra leidimo'
-    unexpected_error: '&cAtsirado klaida, praneškite adminstratoriui.'
-    max_registration: '&cJūs pasiekėte maksimalų registracijų skaičių.'
-    logged_in: '&cTu jau prisijungęs!'
-    kick_for_vip: '&cRėmėjas prisijungė į pilną serverį!'
-    kick_unresolved_hostname: '&cĮvyko klaida su žaidejo adresu!'
-    tempban_max_logins: '&cJūs laikinai užblokuotas, nes kelis kartus neteisingai suvedėte slaptažodį.'
+    denied_command: '&cKad galetumete naudoti sia komanda turite buti prisijunge!'
+    denied_chat: '&cKad galetumete kalbeti jus turite buti prisijunge!'
+    unregistered_user: '&cVartotojas neprisiregistraves'
+    not_logged_in: '&cTu neprisijunges!'
+    no_permission: '&cNera leidimo'
+    unexpected_error: '&cAtsirado klaida, praneskite adminstratoriui.'
+    max_registration: '&cJus pasiekete maksimalu registraciju skaiciu.'
+    logged_in: '&cTu jau prisijunges!'
+    kick_for_vip: '&cA VIP prisijunge i pilna serveri!'
+    kick_unresolved_hostname: '&cIvyko klaida: Ivyko klaida su zaidejo adresu!'
+    tempban_max_logins: '&cJus laikinai uzblokuotas nes kelis kartus neteisingai suvedete salptazodi.'

 # AntiBot
 antibot:
-    kick_antibot: 'AntiBot prevencija įjungta! Palaukite prieš prisijungiant.'
-    auto_enabled: '&4[AntiBotService] AntiBot prevencija pajungta dėl didelio kiekio prisijungimų!'
-    auto_disabled: '&2[AntiBotService] AntiBot bus išjungtas po %m minučių!'
+    kick_antibot: 'AntiBot prevencija ijungta! Palaukite pries prisijungiant.'
+    auto_enabled: '&4[AntiBotService] AntiBot prevencija pajungta del didelio kiekio prisijungimu!'
+    auto_disabled: '&2[AntiBotService] AntiBot isjungtas po: %m minutes!'

 # Unregister
 unregister:
-    success: '&aSėkmingai išsiregistravote!'
-    command_usage: '&ePanaikinti registraciją: "/unregister slaptažodis"'
+    success: '&aSekmingai issiregistravote!'
+    command_usage: '&ePanaikinti registracija: "/unregister slaptazodis"'

 # Other messages
 misc:
-    account_not_activated: '&aJūsų vartotojas nėra patvirtintas, pasitikrinkite el.paštą.'
-    password_changed: '&aSlaptažodis pakeistas'
-    logout: '&aSėkmingai atsijungėte'
-    reload: '&aNustatymai ir duomenų bazė buvo perkrauta.'
-    usage_change_password: '&ePanaudojimas: /changepassword senasSlaptažodis naujasSlaptažodis'
-    accounts_owned_self: 'Jūs turite %count paskyrą(-s):'
-    accounts_owned_other: 'Žaidejas %name turi %count paskyrą(-s):'
+    account_not_activated: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.'
+    password_changed: '&aSlaptazodis pakeistas'
+    logout: '&aSekmingai atsijungete'
+    reload: '&aNustatymai ir duomenu baze buvo perkrauta.'
+    usage_change_password: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis'
+    accounts_owned_self: 'Jus turite %count paskyra(-s):'
+    accounts_owned_other: 'Zaidejas %name turi %count paskyra(-s):'

 # Session messages
 session:
-    valid_session: '&aAutomatinis sesijos prisijungimas'
-    invalid_session: '&cSesijos laikai nesutampa. Prašome palaukti kol sesija baigsis.'
+    valid_session: '&aSesijos prisijungimas'
+    invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.'

 # Error messages when joining
 on_join_validation:
-    same_ip_online: 'Žaidejas su tuo pačiu IP adresu jau yra žaidime!'
-    same_nick_online: '&cKažkas šituo vardu jau žaidžia.'
-    name_length: '&cJūsų vardas yra per ilgas arba per trumpas.'
-    characters_in_name: '&cJūsų varde yra neledziamų simbolių. Leidžiami: %valid_chars'
-    kick_full_server: '&cServeris yra pilnas, atsiprašome.'
-    country_banned: '&4Jūsų šalis yra užblokuota šiame serveryje!'
-    not_owner_error: 'J0s nesate šios paskyros savininkas, pasirinkite kitą vardą!'
-    invalid_name_case: 'Turėtumėte prisijungti su vardu %valid, o ne su: %invalid.'
-    quick_command: 'Jūs panaudojote komandą per greitai! Prisijunkite iš naujo ir šiek tiek palaukite prieš naudojant komandas.'
+    same_ip_online: 'Zaidejas su tuo paciu ip jau yra zaidime!'
+    same_nick_online: '&cKazkas situo vardu jau zaidzia.'
+    name_length: '&cJusu varsdas yra per ilgas arba per trumpas.'
+    characters_in_name: '&cJusu varde yra neledziamu simboliu, leidziami: %valid_chars'
+    kick_full_server: '&cServeris yra pilnas, Atsiprasome.'
+    country_banned: '&4Jusu salis yra uzblokuota siame serveryje!'
+    not_owner_error: 'Tu neesi sios paskyros savininkas, pasirinkite kita varda!'
+    invalid_name_case: 'Turetumete prisijungti su vardu: %valid, o ne su: %invalid.'
+    quick_command: 'Tu panaudojai komanda per greitai! Prisijunkite isnaujo ir siek tiek palaukite pries naudojant komandas.'

 # Email
 email:
-    add_email_request: '&ePrašome jūsų pridėti savo el.paštą : /email add <el.paštas> <el.paštas>'
-    usage_email_add: '&cNaudojimas: /email add <el.paštas> <el.paštas>'
+    add_email_request: '&ePrasau pridekite savo el.pasta : /email add <el.pastas> <el.pastas>'
+    usage_email_add: '&cNaudojimas: /email add <el.pastas> <el.pastas>'
    usage_email_change: '&cNaudojimas: /email change <senas el.pastas> <naujas el.pastas>'
-    new_email_invalid: '&cNeteisingas el.paštas, bandykite iš naujo!'
-    old_email_invalid: '&cNeteisingas senas el.paštas, bandykite iš naujo!'
-    invalid: '&cNeteisingas el.paštas, bandykite iš naujo!'
-    added: '&2El.paštas sėkmingai pridėtas!'
-    add_not_allowed: '&cNaujo el.pašto pridejimas nėra galimas'
-    request_confirmation: '&cPatvirtinkite savo el.paštą!'
-    changed: '&2El.paštą pakeistas sėkmingai!'
-    change_not_allowed: '&cEl.pašto keitimas nėra galimas'
-    email_show: '&2Jūsų dabartinis el.pašto adresas: &f%email'
-    no_email_for_account: '&2Šiuo metu Jūs neturite pridėję jokio el.pašto adreso.'
-    already_used: '&4Jis el.pašto adresas jau yra naudojamas'
-    incomplete_settings: 'Klaida: Ne visi nustatymai yra nustatyti laiško siuntimui. Susikietite su administratoriumi.'
-    send_failure: 'El.pašto laiškas nebuvo išsiųstas. Susikietite su administratoriumi.'
-    change_password_expired: 'Jūs nebegalite pakeisti savo slaptažodzio naudojant šią komandą.'
-    email_cooldown_error: '&cEl.pašto laiškas jau buvo išsiųstas. Palaukite %time prieš šiunčiant naują.'
+    new_email_invalid: '&cNeteisingas el.pastas, bandykite isnaujo!'
+    old_email_invalid: '&cNeteisingas senas el.pastas, bandykite isnaujo!'
+    invalid: '&cNeteisingas el.pastas, bandykite isnaujo!'
+    added: '&2El.pastas sekmingai pridetas!'
+    add_not_allowed: '&cNaujo el.pasto pridejimas nera galimas'
+    request_confirmation: '&cPatvirtinkite savo el.pasta!'
+    changed: '&2El.pasta pakeistas sekmingai!'
+    change_not_allowed: '&cEl.pasto keitimas nera galimas'
+    email_show: '&2Jusu dabartinis el.pasto adresas: &f%email'
+    no_email_for_account: '&2Siuo metu jus neturite prideja jokio el.pasto adreso.'
+    already_used: '&4Jis el.pasto adresas jau yra naudojamas'
+    incomplete_settings: 'Klaidas: Nevisi nustatymai yra nustatyti laisko siuntimui. Susikietite su administratorium.'
+    send_failure: 'El.pasto laiskas nebuvo issiustas. Susikietite su administratorium.'
+    change_password_expired: 'Jus nebegalite pakeisti savo slaptazodzio naudojant sia komanda.'
+    email_cooldown_error: '&cEl.pasto laiskas jau buvo issiustas. Palaukite %time pries siunciant nauja.'

 # Password recovery by email
 recovery:
-    forgot_password_hint: '&cPamiršote savo slaptažodį? Rašykite: /email recovery el.paštas'
-    command_usage: '&cNaudojimas: /email recovery el.paštas'
-    email_sent: '&2Laiškas į Jūsų el.pašto adresą buvo išsiųstas!'
+    forgot_password_hint: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas'
+    command_usage: '&cNaudojimas: /email recovery el.pastas'
+    email_sent: '&2Laiskas i jusu pasto adresa buvo issiustas!'
    code:
-        code_sent: 'Kodas slaptažodžio atstatymui buvo išsiųstas į Jūsų el.paštą.'
-        incorrect: 'Kodas neteisingas! Jums liko %count bandymai(-as).'
-        tries_exceeded: 'Jūs išnaudojote visus bandymus. Naudokite "/email recovery el.paštas", kad gauti naują kodą.'
-        correct: 'Kodas įvestas sėkmingai!'
-        change_password: 'Naudokite /email setpassword <Naujas_slaptažodis>, kad pasikeistumėte slaptažodį.'
+        code_sent: 'Kodas slaptazodzio atstatymui buvo issiustas i jusu pasta.'
+        incorrect: 'Kodas neteisingas! jums liko %count bandymai(-as).'
+        tries_exceeded: 'Jus isnaudojote visus bandymus. Naudokite "/email recovery el.pastas" kad gauti nauja koda.'
+        correct: 'Kodas ivestas sekmingai!'
+        change_password: 'Naudokite /email setpassword <Naujas_Slaptazodis> kad pasikeistumete slaptazodi.'

 # Captcha
 captcha:
    usage_captcha: '&cPanaudojimas: /captcha %captcha_code'
-    wrong_captcha: '&cNeteisinga captcha, naudokite : /captcha %captcha_code'
-    valid_captcha: '&cJūsų captcha teisinga!'
-    captcha_for_registration: 'Kad prisiregistruotumėte turite įvygdyti captchą. Rašykite: /captcha %captcha_code'
-    register_captcha_valid: '&2Captcha teisinga! Galite naudoti /register'
+    wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha %captcha_code'
+    valid_captcha: '&cJusu captcha Teisinga!'
+    captcha_for_registration: 'Kad prisiregistruotumete turite ivygdyti captcha, rasykite: /captcha %captcha_code'
+    register_captcha_valid: '&2Captcha Teisinga! Galite naudoti /register'

 # Verification code
 verification:
-    code_required: '&3Kad galėtumėte naudoti šią komandą turite patvirtinti savo el.pašto adresą! Sekite instrukcijas savo el.pašte.'
+    code_required: '&3Kad naudotumete sia komanda turi patvirtinti savo pasto adresa! Sekite instrukcijas savo el.paste.'
    command_usage: '&cNaudojimas: /verification <kodas>'
-    incorrect_code: '&cNeteisingas kodas, naudokite "/verification <kodas>" įvesdami kodą gautą savo el.pašte'
-    success: '&2Jūsų paskyra patvirtinta! Jūs galite naudoti visas komandas!'
-    already_verified: '&2Jūs jau esate patvirtinę savo paskyrą ir galite naudoti visas komandas!'
-    code_expired: '&3Jūsų kodo galiojimas baigėsi! Panaudokite komandą iš naujo, kad gautumėte naują kodą!'
-    email_needed: '&3Kad patvirtinti savo paskyra turite pridėti el.pašto adresą!'
+    incorrect_code: '&cNeteisingas kodas, naudokite "/verification <kodas>" ivesdami koda gauta savo el.paste'
+    success: '&2Jusu paskyra patvirtinta! Jus galite naudoti visas komandas!'
+    already_verified: '&2Jus jau esate patvirtintas ir galite naudoti visas komandas!'
+    code_expired: '&3Jusu kodo galiojimas baigesi! Panaudokite komanda isnaujo kad gauti nauja koda!'
+    email_needed: '&3Kad patvirtinti savo paskyra turite prideti el.pasto adresa!'

 # Time units
 time:
-    second: 'sekundę'
+    second: 'sekunde'
    seconds: 'sekundes'
-    minute: 'minutę'
+    minute: 'minute'
    minutes: 'minutes'
-    hour: 'valandą'
+    hour: 'valanda'
    hours: 'valandas'
-    day: 'dieną'
+    day: 'diena'
    days: 'dienas'

 # Two-factor authentication
 two_factor:
-    code_created: '&2Jūsų slaptas kodas yra %code. Jį galite nuskenuoti čia: %url'
-    confirmation_required: 'Patvirtinkite savo kodą su: /2fa confirm <kodas>'
-    code_required: 'Patvirkinkite savo kodą su: /2fa code <kodas>'
-    already_enabled: 'Jūs jau turite dviejų faktorių autentifikaciją!'
-    enable_error_no_code: 'Jūs neturite dviejų faktorių autentifikacijos arba ji pasibaigė. Rašykite /2fa add'
-    enable_success: 'Dviejų faktorių autentifikacija sėkmingai įjungta'
-    enable_error_wrong_code: 'Neteisingas arba pasibaigęs kodas. Rašykite /2fa add'
-    not_enabled_error: 'Dviejų faktorių autentifikavimas nėra įjungtas ant jūsų paskyros. Rašykite /2fa add'
-    removed_success: 'Dviejų faktorių autentifikavimas sėkmingai pašalintas iš jūsų paskyros.'
+    code_created: '&2Tavo slaptas kodas yra %code. Ji gali nuskenuoti cia: %url'
+    confirmation_required: 'Patvirtinkite savo koda su: /2fa confirm <kodas>'
+    code_required: 'Patvirkinkite savo koda su: /2fa code <kodas>'
+    already_enabled: 'Jus jau turite dvieju faktoriu autentifikacija!'
+    enable_error_no_code: 'Jus neturite dvieju faktoriu autentifikacijos arba ji pasibaige. Rasykite /2fa add'
+    enable_success: 'Dvieju faktoriu autentifikacija sekmingai ijungta'
+    enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    removed_success: 'Successfully removed two-factor auth from your account'
    invalid_code: 'Neteisingas kodas!'
@@ -5,13 +5,13 @@

 # Registration
 registration:
-    disabled: '&cRegistracija v igri je onemogočena!'
-    name_taken: '&cTo uporabniško ime ste ze registrirali!'
    register_request: '&3Registrirajte se z ukazom "/register <geslo> <PotrdiGeslo>"'
    command_usage: '&cUporaba: /register <geslo> <PotrdiGeslo>'
    reg_only: '&4Samo registrirani uporabniki se lahko povezejo! Obiscite http://example.com , da se registrirate!'
-    success: '&2Uspešno registriran!'
    kicked_admin_registered: 'Administrator vas je registriral; prosimo, da se prijavite.'
+    success: '&2Uspešno registriran!'
+    disabled: '&cRegistracija v igri je onemogočena!'
+    name_taken: '&cTo uporabniško ime ste ze registrirali!'

 # Password errors on registration
 password:
@@ -40,7 +40,6 @@ error:
    max_registration: '&cPresegli ste največjo stevilo registracij (%reg_count/%max_acc %reg_names) za vašo povezavo!'
    logged_in: '&cSte že povezani!'
    kick_for_vip: '&3VIP igralec se je pridruzil serverju, ko je bil poln!'
-    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
    tempban_max_logins: '&cBil si začasno izločen zaradi preveč neuspešnih prijav.'

 # AntiBot
@@ -132,17 +131,6 @@ verification:
    code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
    email_needed: '&3To verify your identity you need to link an email address with your account!'

-# Time units
-time:
-    second: 'sekunda'
-    seconds: 'sekund'
-    minute: 'minuta'
-    minutes: 'minut'
-    hour: 'ur'
-    hours: 'ure'
-    day: 'dan'
-    days: 'dni'
-
 # Two-factor authentication
 two_factor:
    code_created: '&2Vasa skrivna koda je %code. Lahko je skenirate tu %url!'
@@ -155,3 +143,15 @@ two_factor:
    not_enabled_error: 'Dvo stopična prijava ni vključena za vaš račun. Uporabite /2fa add'
    removed_success: 'Usprešno ste odstranili dvo stopično prijavo za vaš račun.'
    invalid_code: 'Nepravilna koda!'
+
+# Time units
+time:
+    second: 'sekunda'
+    seconds: 'sekund'
+    minute: 'minuta'
+    minutes: 'minut'
+    hour: 'ur'
+    hours: 'ure'
+    day: 'dan'
+    days: 'dni'
+    
@@ -5,132 +5,140 @@

 # Registration
 registration:
-    disabled: '&8[&6玩家系统&8] &c目前服务器暂时禁止注册，请到服务器论坛以得到更多资讯'
-    name_taken: '&8[&6玩家系统&8] &c此用户已经在此服务器注册过'
-    register_request: '&8[&6玩家系统&8] &c请输入“/register <密码> <再输入一次以确定密码>”以注册'
-    command_usage: '&8[&6玩家系统&8] &c正确用法：“/register <密码> <再输入一次以确定密码>”'
-    reg_only: '&8[&6玩家系统&8] &f只允许注册过的玩家进服！请到 https://example.cn 注册'
-    success: '&8[&6玩家系统&8] &c已成功注册！'
-    kicked_admin_registered: '有一位管理员刚刚为您完成了注册，请重新登录'
+    disabled: '&c注册已被禁止'
+    name_taken: '&c此用户已经在此服务器注册过'
+    register_request: '&7请输入“/register <邮箱>”以注册'
+    command_usage: '&c正确用法:“/register <邮箱>”'
+    reg_only: '&c只允许注册过的玩家进服!'
+    success: '&a*** 已成功注册 ***'

 # Password errors on registration
 password:
-    match_error: '&8[&6玩家系统&8] &f密码不相同'
-    name_in_password: '&8[&6玩家系统&8] &f你不能使用你的名字作为密码。 '
-    unsafe_password: '&8[&6玩家系统&8] &f你不能使用安全性过低的密码。 '
-    forbidden_characters: '&4您的密码包含了非法字符。可使用的字符: %valid_chars'
-    wrong_length: '&8[&6玩家系统&8] &c你的密码不符合要求'
+    match_error: '&c密码不相同'
+    name_in_password: '&c您不能使用您的名字作为密码。 '
+    unsafe_password: '&c您不能使用安全性过低的密码。 '
+    forbidden_characters: '&4您的密码包含了非法字符.可使用的字符: %valid_chars'
+    wrong_length: '&4您的密码没有达到要求!'

 # Login
 login:
-    command_usage: '&8[&6玩家系统&8] &c正确用法：“/login <密码>”'
-    wrong_password: '&8[&6玩家系统&8] &c错误的密码'
-    success: '&8[&6玩家系统&8] &c已成功登录！'
-    login_request: '&8[&6玩家系统&8] &c请输入“/login <密码>”以登录'
-    timeout_error: '&8[&6玩家系统&8] &f登录超时'
+    command_usage: '&c正确用法:“/login <密码>”'
+    wrong_password: '&c*** 密码错误 ***'
+    success: '&a*** 已成功登录 ***'
+    login_request: '&c请输入“/login <密码>”以登录'
+    timeout_error: '给您登录的时间已经过了'

 # Errors
 error:
-    denied_command: '&c您需要先通过验证才能使用该命令！'
-    denied_chat: '&c您需要先通过验证才能聊天！'
-    unregistered_user: '&8[&6玩家系统&8] &c此用户名还未注册过'
-    not_logged_in: '&8[&6玩家系统&8] &c你还未登录！'
-    no_permission: '&8[&6玩家系统&8] &c没有权限'
-    unexpected_error: '&8[&6玩家系统&8] &f发现错误，请联系管理员'
-    max_registration: '&8[&6玩家系统&8] &f你不允许再为你的IP在服务器注册更多用户了！'
-    logged_in: '&8[&6玩家系统&8] &c你已经登陆过了！'
-    kick_for_vip: '&8[&6玩家系统&8] &cA VIP玩家加入了已满的服务器!'
-    kick_unresolved_hostname: '&8[&6玩家系统&8] &c发生了一个错误: 无法解析玩家的Hostname'
-    tempban_max_logins: '&c由于您登录失败次数过多，已被暂时禁止登录。'
+    denied_command: '&7您需要先通过验证才能使用该命令!'
+    denied_chat: '&7您需要先通过验证才能聊天!'
+    unregistered_user: '&c此用户名还未注册过'
+    not_logged_in: '&c您还未登录!'
+    no_permission: '&c没有权限'
+    unexpected_error: '&4发现错误,请联系管理员'
+    max_registration: '&c该地址已无法注册,请联系管理员进行注册.'
+    logged_in: '&c您已经登陆过了!'
+    kick_for_vip: '&c一个VIP玩家加入了已满的服务器!'
+    kick_unresolved_hostname: '&c发生了一个错误: 无法解析玩家的主机名'
+    tempban_max_logins: '&c由于您登录失败次数过多,已被暂时禁止登录。'

 # AntiBot
 antibot:
-    kick_antibot: '&8[&6玩家系统&8] &f验证程序已启用 !请稍等几分钟后再次进入服务器'
-    auto_enabled: '&8[&6玩家系统&8] &f验证程序由于大量异常连接而启用'
-    auto_disabled: '&8[&6玩家系统&8] &f验证程序由于异常连接减少而在 %m 分钟后停止'
+    kick_antibot: '连接异常,请稍后加入'
+    auto_enabled: '&c由于发生大量异常连接,本服将禁止连接.'
+    auto_disabled: '&a异常连接减少,本服将在 &a%m &a分钟后自动开放连接.'

 # Unregister
 unregister:
-    success: '&8[&6玩家系统&8] &c成功删除此用户！'
-    command_usage: '&8[&6玩家系统&8] &c正确用法：“/unregister <密码>”'
+    success: '&a*** 已成功注销 ***'
+    command_usage: '&c正确用法:“/unregister <密码>”'

 # Other messages
 misc:
-    account_not_activated: '&8[&6玩家系统&8] &f你的帐号还未激活，请查看你的邮箱！'
-    password_changed: '&8[&6玩家系统&8] &c密码已成功修改！'
-    logout: '&8[&6玩家系统&8] &c已成功登出！'
-    reload: '&8[&6玩家系统&8] &f配置以及数据已经重新加载完毕'
-    usage_change_password: '&8[&6玩家系统&8] &f正确用法：“/changepassword 旧密码 新密码”'
-    accounts_owned_self: '您拥有 %count 个账户：'
-    accounts_owned_other: '玩家 %name 拥有 %count 个账户：'
+    account_not_activated: |-
+      &a一封包含密码的邮件已发送至您的收件箱.
+      &a请在十分钟内完成登录,否则将注销此账户.
+    not_activated: '&c账户未激活,请注册激活后再次尝试.'
+    password_changed: '&a*** 密码已修改 ***'
+    logout: '&a*** 已成功登出 ***'
+    reload: '&a配置以及数据已经重新加载完毕'
+    usage_change_password: '&a正确用法:“/changepassword 旧密码 新密码”'
+    accounts_owned_self: '您拥有 %count 个账户:'
+    accounts_owned_other: '玩家 %name 拥有 %count 个账户:'

 # Session messages
 session:
-    valid_session: '&8[&6玩家系统&8] &c欢迎回来，已帮你自动登录到此服务器'
-    invalid_session: '&8[&6玩家系统&8] &f登录数据异常，请等待登录结束'
+    valid_session: ''
+    invalid_session: '&c*** 请重新登录 ***'

 # Error messages when joining
 on_join_validation:
-    same_ip_online: '已有一个同IP玩家在游戏中了！'
-    same_nick_online: '&8[&6玩家系统&8] &f同样的用户名现在在线且已经登录了！'
-    name_length: '&8[&6玩家系统&8] &c你的用户名太短或者太长了'
-    characters_in_name: '&8[&6玩家系统&8] &c你的用户名包含非法字母，用户名里允许的字母: %valid_chars'
-    kick_full_server: '&8[&6玩家系统&8] &c抱歉，服务器已满!'
-    country_banned: '这个服务器禁止该国家登陆'
-    not_owner_error: '&8[&6玩家系统&8] &4警告！ &c你并不是此帐户的拥有者，请立即登出！ '
-    invalid_name_case: '&8[&6玩家系统&8] &c你应该使用「%valid」而并非「%invalid」登入游戏。 '
-    quick_command: '&8[&6玩家系统&8] &c您发送命令的速度太快了，请重新加入服务器再等待一会后再使用命令'
+    same_ip_online: '已有一个同IP玩家在游戏中了!'
+    same_nick_online: '&a同样的用户名现在在线且已经登录了!'
+    name_length: '&c您的用户名太短或者太长了'
+    characters_in_name: '&c您的用户名不符合标准.'
+    kick_full_server: '&c抱歉,服务器已满!'
+    country_banned: |-
+      &6[&b&lAccount Security System&6]
+      &c为保证您的游玩体验,请使用中国境内网络连接.
+      &cTo ensure your play experience,please use the Internet connection within China.
+    not_owner_error: |-
+      &6[&b&lAccount Security System&6]
+      &c请勿尝试登陆系统账户,系统账户受安全系统保护.
+      &c如果您并不知情,请更换您的用户名重新加入该服务器.
+    invalid_name_case: '&c您应该使用 %valid 登录服务器,当前名字: %invalid .'
+    quick_command: '&c您发送命令的速度太快了,请重新加入服务器等待一会后再使用命令'

 # Email
 email:
-    add_email_request: '&8[&6玩家系统&8] &c请输入“/email add <你的邮箱> <再输入一次以确认>”以添加您的邮箱到此帐号'
-    usage_email_add: '&8[&6玩家系统&8] &f用法: /email add <邮箱> <确认邮箱地址> '
-    usage_email_change: '&8[&6玩家系统&8] &f用法: /email change <旧邮箱> <新邮箱> '
-    new_email_invalid: '&8[&6玩家系统&8] &f新邮箱无效!'
-    old_email_invalid: '&8[&6玩家系统&8] &f旧邮箱无效!'
-    invalid: '&8[&6玩家系统&8] &f无效的邮箱'
-    added: '&8[&6玩家系统&8] &f邮箱已添加 !'
-    add_not_allowed: '&8[&6玩家系统&8] &c服务器不允许添加邮箱地址'
-    request_confirmation: '&8[&6玩家系统&8] &f确认你的邮箱 !'
-    changed: '&8[&6玩家系统&8] &f邮箱已修改 !'
-    change_not_allowed: '&8[&6玩家系统&8] &c服务器不允许修改邮箱地址'
-    email_show: '&8[&6玩家系统&8] &2您当前的电子邮件地址为： &f%email'
-    no_email_for_account: '&8[&6玩家系统&8] &2您当前并没有任何邮箱与该账号绑定'
-    already_used: '&8[&6玩家系统&8] &4邮箱已被使用'
-    incomplete_settings: '&8[&6玩家系统&8] 错误：必要设置未设定完成，请联系管理员'
-    send_failure: '&8[&6玩家系统&8] 邮件发送失败，请联系管理员'
-    change_password_expired: '&8[&6玩家系统&8] 您不能使用此命令更改密码'
-    email_cooldown_error: '&8[&6玩家系统&8] &c邮件已在几分钟前发送，您需要等待 %time 后才能再次请求发送'
+    add_email_request: ''
+    usage_email_add: '&a用法: /email add <邮箱> <确认邮箱> '
+    usage_email_change: '&a用法: /email change <旧邮箱> <新邮箱> '
+    new_email_invalid: '&c新邮箱无效!'
+    old_email_invalid: '&c旧邮箱无效!'
+    invalid: '&c无效的邮箱'
+    added: '&a*** 邮箱已添加 ***'
+    add_not_allowed: '&c服务器不允许添加电子邮箱'
+    request_confirmation: '&c确认您的邮箱'
+    changed: '&a*** 邮箱已修改 ***'
+    change_not_allowed: '&c服务器不允许修改邮箱地址'
+    email_show: '&a该账户使用的电子邮箱为: &a%email'
+    no_email_for_account: '&c当前并没有任何邮箱与该账号绑定'
+    already_used: '&c邮箱已被使用'
+    incomplete_settings: '&c错误: 必要设置未设定完成,请联系管理员'
+    send_failure: '&c邮件已被作废,请检查您的邮箱是否正常工作.'
+    change_password_expired: '&c您不能使用此命令更改密码'
+    email_cooldown_error: '&c您需要等待 %time 后才能再次请求发送'

 # Password recovery by email
 recovery:
-    forgot_password_hint: '&8[&6玩家系统&8] &c忘了你的密码？请输入：“/email recovery <你的邮箱>”'
-    command_usage: '&8[&6玩家系统&8] &f用法: /email recovery <邮箱>'
-    email_sent: '&8[&6玩家系统&8] &f找回密码邮件已发送 !'
+    forgot_password_hint: '&c忘了您的密码？请输入:“/email recovery <您的邮箱>”'
+    command_usage: '&a用法: /email recovery <邮箱>'
+    email_sent: '&a找回密码邮件已发送!'
    code:
-        code_sent: '一个用于重置您的密码的验证码已发到您的邮箱'
-        incorrect: '验证码不正确！ 使用 /email recovery [邮箱] 以生成新的验证码'
-        tries_exceeded: '您已经达到输入验证码次数的最大允许次数。请使用 "/email recovery [邮箱]" 来生成一个新的'
-        correct: '验证码正确！'
-        change_password: '请使用 /email setpassword <新密码> 立即设置新的密码'
+        code_sent: '&a*** 已发送验证邮件 ***'
+        incorrect: '&a验证码不正确! 使用 /email recovery [邮箱] 以生成新的验证码'
+        tries_exceeded: '&a您已经达到输入验证码次数的最大允许次数.'
+        correct: '&a*** 验证通过 ***'
+        change_password: '&c请使用 /email setpassword <新密码> 立即设置新的密码'

 # Captcha
 captcha:
-    usage_captcha: '&8[&6玩家系统&8] &c正确用法：/captcha %captcha_code'
-    wrong_captcha: '&8[&6玩家系统&8] &c错误的验证码，请输入：“/captcha %captcha_code”'
-    valid_captcha: '&8[&6玩家系统&8] &c你的验证码是有效的！'
-    captcha_for_registration: '注册前您需要先提供验证码，请使用指令：/captcha %captcha_code'
-    register_captcha_valid: '&2有效的验证码！您现在可以使用 /register 注册啦！'
+    usage_captcha: '&7请输入 /captcha %captcha_code 来验证操作.'
+    wrong_captcha: '&c错误的验证码.'
+    valid_captcha: '&a*** 验证通过 ***'
+    captcha_for_registration: '&7请输入 /captcha %captcha_code 来验证操作.'
+    register_captcha_valid: '&a验证通过, 现在可以使用 /register 注册啦!'

 # Verification code
 verification:
-    code_required: '&3这个命令非常敏感，需要电子邮件验证！请检查您的收件箱，并遵循邮件的指导。'
-    command_usage: '&c使用方法： /verification <验证码>'
-    incorrect_code: '&c验证码错误， 请在聊天框输入 "/verification <验证码>"，使用您在电子邮件中收到的验证码。'
-    success: '&2您的身份已经得到验证！您现在可以在当前会话中执行所有命令！'
-    already_verified: '&2您已经可以在当前会话中执行任何敏感命令！'
-    code_expired: '&3您的验证码已失效！执行另一个敏感命令以获得新的验证码！'
-    email_needed: '&3为了验证您的身份，您需要将一个电子邮件地址与您的帐户绑定！！'
+    code_required: '&a*** 已发送验证邮件 ***'
+    command_usage: '&c使用方法:/verification <验证码>'
+    incorrect_code: '&c错误的验证码.'
+    success: '&a*** 验证通过 ***'
+    already_verified: '&a您已经通过验证'
+    code_expired: '&c验证码已失效'
+    email_needed: '&c邮箱未绑定'

 # Time units
 time:
@@ -138,20 +146,20 @@ time:
    seconds: '秒'
    minute: '分'
    minutes: '分'
-    hour: '小时'
-    hours: '小时'
+    hour: '时'
+    hours: '时'
    day: '天'
    days: '天'

 # Two-factor authentication
 two_factor:
-    code_created: '&8[&6玩家系统&8] &a你的代码是 %code，你可以使用 %url 来进行扫描'
-    confirmation_required: '&8[&6玩家系统&8] &3请输入 &a/2fa confirm <验证码> &3来确认双重认证'
-    code_required: '&8[&6玩家系统&8] &c请输入 &a/2fa code <验证码> &c来提交双重认证验证码'
-    already_enabled: '&8[&6玩家系统&8] &a双重认证已在您的账号上启用'
-    enable_error_no_code: '&8[&6玩家系统&8] &c双重认证密钥不存在或已过期，请输入 &a/2fa add &c来添加'
-    enable_success: '&8[&6玩家系统&8] &a已成功启用双重认证'
-    enable_error_wrong_code: '&8[&6玩家系统&8] &c双重认证代码错误或者已经过期，请重新执行 &a/2fa add'
-    not_enabled_error: '&8[&6玩家系统&8] &c双重认证码未在您的账号上启用，请使用 &a/2fa add &c来启用'
-    removed_success: '&8[&6玩家系统&8] &c双重认证码已从您的账号上删除'
-    invalid_code: '&8[&6玩家系统&8] &c无效的验证码'
+    code_created: '&7您正在激活双重验证, 请打开 &a%url &7扫描二维码'
+    confirmation_required: '&7请输入“/totp confirm <验证码>”来确认激活双重验证'
+    code_required: '&c请输入“/totp code <验证码>”来提交验证码'
+    already_enabled: '&a双重验证已启用'
+    enable_error_no_code: '&c验证码丢失'
+    enable_success: '&a已成功启用双重验证'
+    enable_error_wrong_code: '&c验证码错误或者已经过期,请重新执行“/totp add”'
+    not_enabled_error: '&c双重验证未在您的账号上启用,请使用“/totp add”来启用'
+    removed_success: '&c双重验证已从您的账号上禁用'
+    invalid_code: '&c无效的验证码'
@@ -7,132 +7,132 @@

 # Registration
 registration:
-    disabled: '&b【AuthMe】&6已關閉註冊功能。'
-    name_taken: '&b【AuthMe】&6這個帳號已經被註冊過了！'
+    disabled: '&b【AuthMe】&6已關閉註冊功能'
+    name_taken: '&b【AuthMe】&6這個帳號已經被註冊過了!'
    register_request: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。'
    command_usage: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"'
-    reg_only: '&b【AuthMe】&6請到下列網站：「 https://example.tw 」進行註冊。'
-    success: '&b【AuthMe】&6您已成功註冊！'
-    kicked_admin_registered: '&b【AuthMe】&6管理員已協助您註冊，請重新登入。'
+    reg_only: '&b【AuthMe】&6請到下列網站 :「 https://example.tw 」 進行註冊'
+    success: '&b【AuthMe】&6您已成功註冊'
+    kicked_admin_registered: '&b【AuthMe】&6管理員已協助您註冊，請重新登入'

 # Password errors on registration
 password:
-    match_error: '&b【AuthMe】&6兩次輸入的密碼不一致！'
-    name_in_password: '&b【AuthMe】&6您不可以用您的 ID (遊戲名稱) 來當作密碼！'
-    unsafe_password: '&b【AuthMe】&6您不可以使用這個不安全的密碼！'
-    forbidden_characters: '&b【AuthMe】&c密碼包含非法字符，可使用：%valid_chars'
+    match_error: '&b【AuthMe】&6兩次輸入的密碼不一致!'
+    name_in_password: '&b【AuthMe】&6您不可以用您的 ID (遊戲名稱) 來當作密碼 !'
+    unsafe_password: '&b【AuthMe】&6您不可以使用這個不安全的密碼'
+    forbidden_characters: '&b【AuthMe】&c密碼包含非法字符. 可使用: %valid_chars'
    wrong_length: '&b【AuthMe】&6您的密碼 超過最大字數 / 小於最小字數'

 # Login
 login:
    command_usage: '&b【AuthMe】&6用法: &c"/login <密碼>"'
-    wrong_password: '&b【AuthMe】&6密碼錯誤！'
-    success: '&b【AuthMe】&6密碼正確，您已成功登入！'
+    wrong_password: '&b【AuthMe】&6密碼錯誤!'
+    success: '&b【AuthMe】&6密碼正確，您已成功登入!'
    login_request: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。'
-    timeout_error: '&b【AuthMe】&6超過登入時間，請稍後再試一次。'
+    timeout_error: '&b【AuthMe】&6超過登入時間，請稍後再試一次'

 # Errors
 error:
-    denied_command: '&b【AuthMe】&c使用指令之前必須通過驗證！'
-    denied_chat: '&b【AuthMe】&c說話之前必須通過驗證！'
-    unregistered_user: '&b【AuthMe】&6這個帳號還沒有註冊過。'
-    not_logged_in: '&b【AuthMe】&6您還沒有登入！'
+    denied_command: '&b【AuthMe】&c使用指令之前必須通過驗證!'
+    denied_chat: '&b【AuthMe】&c說話之前必須通過驗證!'
+    unregistered_user: '&b【AuthMe】&6這個帳號還沒有註冊過'
+    not_logged_in: '&b【AuthMe】&6您還沒有登入!'
    no_permission: '&b【AuthMe】&6您沒有使用該指令的權限。'
    unexpected_error: '&b【AuthMe】&6發生錯誤，請聯繫管理員'
-    max_registration: '&b【AuthMe】&6您的 IP 位置所註冊的帳號數量已經達到最大限制。'
-    logged_in: '&b【AuthMe】&6您已經登入了！'
-    kick_for_vip: '&b【AuthMe】&6您已經被請出。&c原因：有 VIP 玩家登入伺服器'
-    kick_unresolved_hostname: '&b【AuthMe】&6無法解析玩家主機名稱。'
-    tempban_max_logins: '&b【AuthMe】&c您已被暫時封鎖IP位置，因為您登入失敗太多次。'
+    max_registration: '&b【AuthMe】&6您的 IP 位置所註冊的帳號數量已經達到最大。'
+    logged_in: '&b【AuthMe】&6您已經登入了!'
+    kick_for_vip: '&b【AuthMe】&6您已經被請出。&c原因 : 有 VIP 玩家登入伺服器'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
+    tempban_max_logins: '&b【AuthMe】&c您已被暫時封鎖IP位置，因為您登入失敗太多次.'

 # AntiBot
 antibot:
    kick_antibot: '&b【AuthMe】&cAntiBotMod 正在啟用中，請稍後再嘗試登入吧！'
-    auto_enabled: '&b【AuthMe】&6AntiBotMod 已自動啟用！'
-    auto_disabled: '&b【AuthMe】&6AntiBotMod 將於 &c%m &6分鐘後自動關閉'
+    auto_enabled: '&b【AuthMe】&6AntiBotMod 已自動啟用!'
+    auto_disabled: '&b【AuthMe】&6AntiBotMod 將會於 &c%m &6分鐘後自動關閉'

 # Unregister
 unregister:
    success: '&b【AuthMe】&6您已經成功註銷。'
-    command_usage: '&b【AuthMe】&6用法：&c"/unregister <密碼>"'
+    command_usage: '&b【AuthMe】&6用法: &c"/unregister <密碼>"'

 # Other messages
 misc:
-    account_not_activated: '&b【AuthMe】&6您的帳號還沒有經過驗證！檢查看看您的電子郵件 (Email) 吧！'
-    password_changed: '&b【AuthMe】&6密碼變更成功！'
-    logout: '&b【AuthMe】&6您已成功登出。'
-    reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫。'
-    usage_change_password: '&b【AuthMe】&6用法：&c"/changepassword <舊密碼> <新密碼>"'
-    accounts_owned_self: '&b【AuthMe】&6您擁有 %count 個帳號：'
-    accounts_owned_other: '&b【AuthMe】&6玩家 %name 擁有 %count 個帳號：'
+    account_not_activated: '&b【AuthMe】&6您的帳號還沒有經過驗證! 檢查看看您的電子信箱 (Email) 吧!'
+    password_changed: '&b【AuthMe】&6密碼變更成功!'
+    logout: '&b【AuthMe】&6您已成功登出'
+    reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫'
+    usage_change_password: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"'
+    accounts_owned_self: '&b【AuthMe】&6您擁有 %count 個帳號:'
+    accounts_owned_other: '&b【AuthMe】&6玩家 %name 擁有 %count 個帳號:'

 # Session messages
 session:
-    valid_session: '&b【AuthMe】&6您已經成功登入！'
-    invalid_session: '&b【AuthMe】&6Session驗證不相符！'
+    valid_session: '&b【AuthMe】&6您已經成功登入!'
+    invalid_session: '&b【AuthMe】&6Session驗證不相符!'

 # Error messages when joining
 on_join_validation:
-    same_ip_online: '&b【AuthMe】&6相同IP玩家在線上！'
-    same_nick_online: '&b【AuthMe】&6有同樣帳號的玩家在線上！'
-    name_length: '&b【AuthMe】&6您的暱稱 太長 / 太短 了！'
+    same_ip_online: '&b【AuthMe】&6同樣IP玩家在線上!'
+    same_nick_online: '&b【AuthMe】&6有同樣帳號的玩家在線上!'
+    name_length: '&b【AuthMe】&6您的暱稱 太長 / 太短 了!'
    characters_in_name: '&b【AuthMe】&6暱稱裡能使用的字符為： %valid_chars'
-    kick_full_server: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次。'
-    country_banned: '&b【AuthMe】&6您所在的地區無法進入此伺服器。'
+    kick_full_server: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次'
+    country_banned: '&b【AuthMe】&6您所在的地區無法進入此伺服器'
    not_owner_error: '&b【AuthMe】&4警告！&c您並不是此帳戶持有人，請立即登出。'
    invalid_name_case: '&b【AuthMe】&4警告！&c您應該使用「%valid」而並非「%invalid」登入遊戲。'
-    quick_command: '&b【AuthMe】&4指令使用過快，請加入伺服器後稍等一下再使用指令。'
+    # TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.'

 # Email
 email:
-    add_email_request: '&b【AuthMe】&6請使用 &c"/email add <電子郵件> <再次輸入電子郵件>" &6來新增電子郵件'
-    usage_email_add: '&b【AuthMe】&6用法: &c"/email add <電子郵件> <再次輸入電子郵件>"'
-    usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的電子郵件> <新的電子郵件>"'
-    new_email_invalid: '&b【AuthMe】&6新的電子郵件無效！'
-    old_email_invalid: '&b【AuthMe】&6舊的電子郵件無效！'
-    invalid: '&b【AuthMe】&6無效的電子郵件！'
-    added: '&b【AuthMe】&6已新增電子郵件！'
-    add_not_allowed: '&b【AuthMe】&c不允許新增電子郵件'
-    request_confirmation: '&b【AuthMe】&6請驗證您的電子郵件！'
-    changed: '&b【AuthMe】&6電子郵件已變更！'
-    change_not_allowed: '&b【AuthMe】&c不允許變更電子郵件'
-    email_show: '&b【AuthMe】&2目前的電子郵件：&f%email'
-    no_email_for_account: '&b【AuthMe】&2您目前沒有設定電子郵件。'
-    already_used: '&b【AuthMe】&4這個電子郵件已被使用。'
-    incomplete_settings: '&b【AuthMe】&4因為電子郵件設定不完整導致無法傳送，請聯絡管理員。'
-    send_failure: '&b【AuthMe】&4無法傳送電子郵件，請聯絡管理員。'
-    change_password_expired: '&b【AuthMe】&6您現在不能使用這個指令變更密碼了。'
-    email_cooldown_error: '&b【AuthMe】&c電子郵件已經寄出了，您只能在 %time 後才能傳送。'
+    add_email_request: '&b【AuthMe】&6請使用 &c"/email add <您的Email> <再次輸入您的Email>" &6來添加 Email'
+    usage_email_add: '&b【AuthMe】&6用法: &c"/email add <您的Email> <重複Email>"'
+    usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的Email> <新的Email>"'
+    new_email_invalid: '&b【AuthMe】&6新的Email無效!'
+    old_email_invalid: '&b【AuthMe】&6舊的Email無效!'
+    invalid: '&b【AuthMe】&6無效的Email!'
+    added: '&b【AuthMe】&6已添加Email!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    request_confirmation: '&b【AuthMe】&6請驗證您的Email!'
+    changed: '&b【AuthMe】&6Email已變更!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
+    email_show: '&b【AuthMe】&2目前的電子郵件: &f%email'
+    no_email_for_account: '&b【AuthMe】&2您目前沒有設置電子郵件.'
+    already_used: '&b【AuthMe】&4這個電郵地址已被使用。'
+    incomplete_settings: '&b【AuthMe】&4因為電子郵件設定無完整導致無法傳送，請聯絡管理員.'
+    send_failure: '&b【AuthMe】&4無法傳送電子郵件，請聯絡管理員.'
+    change_password_expired: '&b【AuthMe】&6您現在不能使用這個指令變更密碼了.'
+    email_cooldown_error: '&b【AuthMe】&c電子郵件已經寄出了. 您只能在 %time 後才能傳送.'

 # Password recovery by email
 recovery:
-    forgot_password_hint: '&b【AuthMe】&6忘記密碼了嗎？使用 &c"/email recovery <電子郵件>"'
-    command_usage: '&b【AuthMe】&6用法: &c"/email recovery <電子郵件>"'
-    email_sent: '&b【AuthMe】&6已經送出重設密碼要求至您的電子郵件，請查收。'
+    forgot_password_hint: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <您的Email>"'
+    command_usage: '&b【AuthMe】&6用法: &c"/email recovery <您的Email>"'
+    email_sent: '&b【AuthMe】&6已經送出重設密碼要求至您的Email , 請查收。'
    code:
-        code_sent: '&b【AuthMe】&6忘記密碼的恢復密碼電子郵件已傳送至您的信箱中。'
-        incorrect: '&b【AuthMe】&6恢復密碼錯誤！您剩餘 %count 次嘗試機會。'
-        tries_exceeded: '&b【AuthMe】&6恢復密碼過多次數錯誤。使用 "/email recovery [電子郵件]" 取得新的恢復密碼。'
-        correct: '&b【AuthMe】&6恢復密碼正確！'
-        change_password: '&b【AuthMe】&6請使用 "/email setpassword <新密碼>" 變更您的密碼。'
+        code_sent: '&b【AuthMe】&6忘記密碼的恢復密碼電子郵件已傳送至您的信箱中.'
+        incorrect: '&b【AuthMe】&6恢復密碼錯誤! 您剩餘 %count 次嘗試機會.'
+        tries_exceeded: '&b【AuthMe】&6恢復密碼過多次數錯誤. 使用 "/email recovery [email]" 取得新的恢復密碼.'
+        correct: '&b【AuthMe】&6恢復密碼正確!'
+        change_password: '&b【AuthMe】&6請使用 "/email setpassword <新密碼>" 變更您的密碼.'

 # Captcha
 captcha:
-    usage_captcha: '&b【AuthMe】&6請用 &c"/captcha %captcha_code" &6來輸入您的驗證碼。'
-    wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 "/captcha %captcha_code" 再試一次。'
-    valid_captcha: '&b【AuthMe】&6驗證碼無效。'
-    captcha_for_registration: '&b【AuthMe】&6註冊前必須先提供驗證碼，使用 /captcha %captcha_code 來驗證。'
-    register_captcha_valid: '&b【AuthMe】&2驗證已通過，現在可以使用 /register 來進行註冊了。'
+    usage_captcha: '&b【AuthMe】&6請用 &c"/captcha %captcha_code" &6來輸入您的驗證碼.'
+    wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 "/captcha %captcha_code" 再試一次.'
+    valid_captcha: '&b【AuthMe】&6驗證碼無效!'
+    # TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha %captcha_code'
+    # TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'

 # Verification code
 verification:
-    code_required: '&b【AuthMe】&3敏感指令，需要電子郵件驗證後才能執行，請檢查電子郵件。'
-    command_usage: '&b【AuthMe】&c用法：/verification <驗證碼>'
+    code_required: '&b【AuthMe】&3敏感指令，需要電子郵件驗證後才能執行，請檢查電子郵件.'
+    command_usage: '&b【AuthMe】&c用法: /verification <驗證碼>'
    incorrect_code: '&b【AuthMe】&c驗證碼錯誤，請在聊天室使用 "/verification <驗證碼>" 電子郵件收到的驗證碼'
-    success: '&b【AuthMe】&2身分已驗證，您現在可以使用所有指令！'
-    already_verified: '&b【AuthMe】&2您已經可以使用所有指令！'
-    code_expired: '&b【AuthMe】&3驗證碼已過期，請使用其他敏感指令來取得新的驗證碼！'
-    email_needed: '&b【AuthMe】&3若需要身分驗證，請先新增電子郵件！'
+    success: '&b【AuthMe】&2身分已驗證，您現在可以使用所有指令!'
+    already_verified: '&b【AuthMe】&2您已經可以使用所有指令!'
+    code_expired: '&b【AuthMe】&3驗證碼已過期，請使用其他敏感指令來取得新的驗證碼!'
+    email_needed: '&b【AuthMe】&3若需要身分驗證，請先添加電子郵件!!'

 # Time units
 time:
@@ -147,13 +147,13 @@ time:

 # Two-factor authentication
 two_factor:
-    code_created: '&b【AuthMe】&b您的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
-    confirmation_required: '&b【AuthMe】&6請使用 /2fa confirm <驗證碼> 來確認雙重驗證。'
-    code_required: '&b【AuthMe】&c請使用 /2fa code <驗證碼> 來完成驗證。'
-    already_enabled: '&b【AuthMe】&c雙重驗證已經開啟。'
-    enable_error_no_code: '&b【AuthMe】&6雙重驗證代碼不存在或失效，使用 /2fa add 來新增。'
-    enable_success: '&b【AuthMe】&6雙重驗證已開啟！'
-    enable_error_wrong_code: '&b【AuthMe】&6雙重驗證代碼錯誤或失效，使用 /2fa add 來新增。'
-    not_enabled_error: '&b【AuthMe】&6雙重驗證尚未開啟，使用 /2fa add 來開啟。'
-    removed_success: '&b【AuthMe】&6雙重驗證已成功移除！'
-    invalid_code: '&b【AuthMe】&c驗證碼錯誤。'
+    code_created: '&b【AuthMe - 兩步驗證碼】&b您的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'
@@ -0,0 +1,126 @@
+<div class="mail">
+    <style>
+        .mail td{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            font-size: 16px;
+            color: #718096;
+        }
+        .mail th, div, p, a, h1, h2, h3, h4, h5, h6{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            color: #3d4852;
+        }
+        .mail .mail-content {
+            max-width: 100vw;
+            padding: 32px;
+            box-shadow: 0 15px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.25);
+        }
+        .mail div{
+            background-color: #ffffff;color: #718096;height: 100%;line-height: 1.4;width: 100%;
+        }
+        .mail .x_wrapper{
+            background-color: #edf2f7; 
+            width:100%;
+        }
+        .mail .x_content{
+            width: 100%;
+        }
+        .mail .x_inner-body{
+            background-color: #ffffff;border-color: #e8e5ef;border-radius: 2px;border-width: 1px;margin: 0 auto;padding:0;width: 570px;
+        }
+        .mail .x_content-cell{
+            margin: 0 auto;padding: 0;width: 570px;line-height: 1.5em;
+            color: #b0adc5;font-size: 12px;
+        }
+        .mail .x_content-cell td{
+            max-width: 100vw;padding: 32px;
+        }
+    </style>
+    <div>
+        <table class="x_wrapper">
+            <tbody>
+            <tr>
+                <td>
+                    <table class="x_content">
+                        <tbody>
+                        <tr>
+                            <td style="padding: 25px 0;">
+                                <h1 style="font-size: 20px;">账户激活邮件</h1>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_inner-body">
+                                    <tbody>
+                                    <tr>
+                                        <td class="mail-content">
+                                            <h1 style="font-size: 18px;margin-bottom: 25px;">Minecraft · <servername /><br/><playername /></h1>
+                                            <hr>
+                                            <table style="width: 100%;">
+                                                <tbody>
+                                                <tr>
+                                                    <td>
+                                                        您的账户初始密码为
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="font-weight: bold;">
+                                                        <br/><generatedpass /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <br/>已将地址(<playerip />)进行记录.
+                                                        <br/>
+                                                        <br/>请妥善保存,在新地址上进行登录时,需提供该密码.
+                                                        <br/>若非必要,请勿更换密码,否则将对您的账户安全构成威胁.
+                                                        <br/>账户所绑定的邮箱地址已被永久存储,需要更换请联系管理员.
+                                                        <br/>
+                                                        <br/>更换密码: /changepassword <generatedpass /> [新密码]
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:right;">
+                                                        <br/>
+                                                        <br/>账户将在激活后生效
+                                                        <br/>欢迎您的加入~!
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <small>
+                                                            <br/><time />
+                                                            <br/>请勿回复
+                                                        </small>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_content-cell">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <p style="color:#b0adc5;">© 2023 IrisCraft. All rights reserved.</p>
+                                            <a href="https://www.mcbbs.net/thread-1263385-1-1.html" target="_blank" style="text-decoration: none; font-size: 16px">iriscraft.work</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
@@ -1,13 +1,10 @@
-# 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.16
+api-version: 1.13
 softdepend:
    - Vault
    - LuckPerms
@@ -18,24 +15,7 @@ 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}
+    - floodgate
 commands:
  authme:
    description: AuthMe op commands
@@ -267,7 +247,6 @@ permissions:
      authme.player.captcha: true
      authme.player.changepassword: true
      authme.player.email.add: true
-      authme.player.email.change: true
      authme.player.email.recover: true
      authme.player.email.see: true
      authme.player.login: true
@@ -275,10 +254,8 @@ permissions:
      authme.player.protection.quickcommandsprotection: true
      authme.player.register: true
      authme.player.security.verificationcode: true
-      authme.player.seeownaccounts: true
      authme.player.totpadd: true
      authme.player.totpremove: true
-      authme.player.unregister: true
  authme.player.canbeforced:
    description: Permission for users a login can be forced to.
    default: true
@@ -292,7 +269,6 @@ permissions:
    description: Gives access to all email commands
    children:
      authme.player.email.add: true
-      authme.player.email.change: true
      authme.player.email.recover: true
      authme.player.email.see: true
  authme.player.email.add:
@@ -300,7 +276,7 @@ permissions:
    default: true
  authme.player.email.change:
    description: Command permission to change the email address.
-    default: true
+    default: op
  authme.player.email.recover:
    description: Command permission to recover an account using its email address.
    default: true
@@ -333,7 +309,7 @@ permissions:
    default: true
  authme.player.unregister:
    description: Command permission to unregister.
-    default: true
+    default: op
  authme.vip:
    description: When the server is full and someone with this permission joins the
      server, someone will be kicked.
@@ -1,9 +1,119 @@
-<h1>Dear <playername />,</h1>
-
-<p>
-    You have requested to reset your password on <servername />. To reset it,
-    please use the recovery code <recoverycode />: /email code <recoverycode />.
-</p>
-<p>
-    The code expires in <hoursvalid /> hours.
-</p>
+<div class="mail">
+    <style>
+        .mail td{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            font-size: 16px;
+            color: #718096;
+        }
+        .mail th, div, p, a, h1, h2, h3, h4, h5, h6{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            color: #3d4852;
+        }
+        .mail .mail-content {
+            max-width: 100vw;
+            padding: 32px;
+            box-shadow: 0 15px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.25);
+        }
+        .mail div{
+            background-color: #ffffff;color: #718096;height: 100%;line-height: 1.4;width: 100%;
+        }
+        .mail .x_wrapper{
+            background-color: #edf2f7; 
+            width:100%;
+        }
+        .mail .x_content{
+            width: 100%;
+        }
+        .mail .x_inner-body{
+            background-color: #ffffff;border-color: #e8e5ef;border-radius: 2px;border-width: 1px;margin: 0 auto;padding:0;width: 570px;
+        }
+        .mail .x_content-cell{
+            margin: 0 auto;padding: 0;width: 570px;line-height: 1.5em;
+            color: #b0adc5;font-size: 12px;
+        }
+        .mail .x_content-cell td{
+            max-width: 100vw;padding: 32px;
+        }
+    </style>
+    <div>
+        <table class="x_wrapper">
+            <tbody>
+            <tr>
+                <td>
+                    <table class="x_content">
+                        <tbody>
+                        <tr>
+                            <td style="padding: 25px 0;">
+                                <h1 style="font-size: 20px;">代码验证邮件</h1>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_inner-body">
+                                    <tbody>
+                                    <tr>
+                                        <td class="mail-content">
+                                            <h1 style="font-size: 18px;margin-bottom: 25px;">Minecraft · <servername /><br/><playername /></h1>
+                                            <hr>
+                                            <table style="width: 100%;">
+                                                <tbody>
+                                                <tr>
+                                                    <td>
+                                                        您正在申请的验证码为
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="font-weight: bold;">
+                                                        <br/><recoverycode /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <br/>使用指令: /email code <recoverycode /> 来完成验证过程.
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:right;">
+                                                        <br/>
+                                                        <br/>验证码将在<hoursvalid />小时后失效
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <small>
+                                                            <br/><time />
+                                                            <br/>请勿回复
+                                                        </small>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_content-cell">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <p style="color:#b0adc5;">© 2023 IrisCraft. All rights reserved.</p>
+                                            <a href="https://www.mcbbs.net/thread-1263385-1-1.html" target="_blank" style="text-decoration: none; font-size: 16px">iriscraft.work</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
@@ -0,0 +1,117 @@
+<div class="mail">
+    <style>
+        .mail td{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            font-size: 16px;
+            color: #718096;
+        }
+        .mail th, div, p, a, h1, h2, h3, h4, h5, h6{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            color: #3d4852;
+        }
+        .mail .mail-content {
+            max-width: 100vw;
+            padding: 32px;
+            box-shadow: 0 15px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.25);
+        }
+        .mail div{
+            background-color: #ffffff;color: #718096;height: 100%;line-height: 1.4;width: 100%;
+        }
+        .mail .x_wrapper{
+            background-color: #edf2f7; 
+            width:100%;
+        }
+        .mail .x_content{
+            width: 100%;
+        }
+        .mail .x_inner-body{
+            background-color: #ffffff;border-color: #e8e5ef;border-radius: 2px;border-width: 1px;margin: 0 auto;padding:0;width: 570px;
+        }
+        .mail .x_content-cell{
+            margin: 0 auto;padding: 0;width: 570px;line-height: 1.5em;
+            color: #b0adc5;font-size: 12px;
+        }
+        .mail .x_content-cell td{
+            max-width: 100vw;padding: 32px;
+        }
+    </style>
+    <div>
+        <table class="x_wrapper">
+            <tbody>
+            <tr>
+                <td>
+                    <table class="x_content">
+                        <tbody>
+                        <tr>
+                            <td style="padding: 25px 0;">
+                                <h1 style="font-size: 20px;">服务器关闭通知</h1>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_inner-body">
+                                    <tbody>
+                                    <tr>
+                                        <td class="mail-content">
+                                            <h1 style="font-size: 18px;margin-bottom: 25px;">Minecraft · <servername /></h1>
+                                            <hr>
+                                            <table style="width: 100%;">
+                                                <tbody>
+                                                <tr>
+                                                    <td style="font-weight: bold;color: #da1515;">
+                                                        <br/>紧急通知</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <br/>服务器当前已被关闭
+                                                        <br/>
+                                                        <br/>请及时检查服务器运行状态.
+                                                        <br/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:right;">
+                                                        <br/>
+                                                        <br/>IrisCraft Team
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <small>
+                                                            <br/><time />
+                                                            <br/>请勿回复
+                                                        </small>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_content-cell">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <p style="color:#b0adc5;">© 2023 IrisCraft. All rights reserved.</p>
+                                            <a href="https://www.mcbbs.net/thread-1263385-1-1.html" target="_blank" style="text-decoration: none; font-size: 16px">iriscraft.work</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
@@ -1,20 +1,119 @@
-<h1>
-    Dear <playername />,
-</h1>
-
-<p>
-    This is your temporary verification code for the server <servername />:
-</p>
-<p>
-    <generatedcode />
-</p>
-
-<p>
-    This code will be valid for the next <minutesvalid /> mins!<br />
-    Use the command
-    /verification <generatedcode />
-    to complete the verification process.
-</p>
-<p>
-    See you on <servername />!
-</p>
+<div class="mail">
+    <style>
+        .mail td{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            font-size: 16px;
+            color: #718096;
+        }
+        .mail th, div, p, a, h1, h2, h3, h4, h5, h6{
+            font-family: "Segoe UI", sans-serif;
+            text-align: center;
+            color: #3d4852;
+        }
+        .mail .mail-content {
+            max-width: 100vw;
+            padding: 32px;
+            box-shadow: 0 15px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.25);
+        }
+        .mail div{
+            background-color: #ffffff;color: #718096;height: 100%;line-height: 1.4;width: 100%;
+        }
+        .mail .x_wrapper{
+            background-color: #edf2f7; 
+            width:100%;
+        }
+        .mail .x_content{
+            width: 100%;
+        }
+        .mail .x_inner-body{
+            background-color: #ffffff;border-color: #e8e5ef;border-radius: 2px;border-width: 1px;margin: 0 auto;padding:0;width: 570px;
+        }
+        .mail .x_content-cell{
+            margin: 0 auto;padding: 0;width: 570px;line-height: 1.5em;
+            color: #b0adc5;font-size: 12px;
+        }
+        .mail .x_content-cell td{
+            max-width: 100vw;padding: 32px;
+        }
+    </style>
+    <div>
+        <table class="x_wrapper">
+            <tbody>
+            <tr>
+                <td>
+                    <table class="x_content">
+                        <tbody>
+                        <tr>
+                            <td style="padding: 25px 0;">
+                                <h1 style="font-size: 20px;">代码验证邮件</h1>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_inner-body">
+                                    <tbody>
+                                    <tr>
+                                        <td class="mail-content">
+                                            <h1 style="font-size: 18px;margin-bottom: 25px;">Minecraft · <servername /><br/><playername /></h1>
+                                            <hr>
+                                            <table style="width: 100%;">
+                                                <tbody>
+                                                <tr>
+                                                    <td>
+                                                        您正在申请的验证码为
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="font-weight: bold;">
+                                                        <br/><generatedcode /></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <br/>使用指令: /verification <generatedcode /> 来完成验证过程.
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:right;">
+                                                        <br/>
+                                                        <br/>验证码将在30分钟后失效
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <small>
+                                                            <br/><time />
+                                                            <br/>请勿回复
+                                                        </small>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <table class="x_content-cell">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <p style="color:#b0adc5;">© 2023 IrisCraft. All rights reserved.</p>
+                                            <a href="https://www.mcbbs.net/thread-1263385-1-1.html" target="_blank" style="text-decoration: none; font-size: 16px">iriscraft.work</a>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
@@ -1,3 +0,0 @@
-Welcome {PLAYER} on {SERVER} server
-
-This server uses AuthMeReloaded protection!
@@ -1,145 +0,0 @@
-package fr.xephi.authme;
-
-import ch.jalu.configme.resource.PropertyReader;
-import ch.jalu.configme.resource.PropertyResource;
-import ch.jalu.injector.Injector;
-import ch.jalu.injector.InjectorBuilder;
-import com.google.common.io.Files;
-import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.command.CommandHandler;
-import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.listener.BlockListener;
-import fr.xephi.authme.permission.PermissionsManager;
-import fr.xephi.authme.process.Management;
-import fr.xephi.authme.process.login.ProcessSyncPlayerLogin;
-import fr.xephi.authme.security.PasswordSecurity;
-import fr.xephi.authme.service.BukkitService;
-import fr.xephi.authme.service.bungeecord.BungeeReceiver;
-import fr.xephi.authme.service.bungeecord.BungeeSender;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.task.purge.PurgeService;
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPluginLoader;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-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.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Integration test verifying that all services can be initialized in {@link AuthMe}
- * with the {@link Injector}.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class AuthMeInitializationTest {
-
-    @Mock
-    private Server server;
-
-    @Mock
-    private PluginManager pluginManager;
-
-    private AuthMe authMe;
-    private File dataFolder;
-
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    @Before
-    public void initAuthMe() throws IOException {
-        dataFolder = temporaryFolder.newFolder();
-        File settingsFile = new File(dataFolder, "config.yml");
-        given(server.getLogger()).willReturn(Logger.getAnonymousLogger());
-        JavaPluginLoader pluginLoader = new JavaPluginLoader(server);
-        Files.copy(TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "config.test.yml"), settingsFile);
-
-        // Mock / wire various Bukkit components
-        ReflectionTestUtils.setField(Bukkit.class, null, "server", server);
-        given(server.getPluginManager()).willReturn(pluginManager);
-
-        // PluginDescriptionFile is final: need to create a sample one
-        PluginDescriptionFile descriptionFile = new PluginDescriptionFile(
-            "AuthMe", "N/A", AuthMe.class.getCanonicalName());
-
-        // Initialize AuthMe
-        authMe = new AuthMe(pluginLoader, descriptionFile, dataFolder, null);
-    }
-
-    @Test
-    public void shouldInitializeAllServices() {
-        // given
-        PropertyReader reader = mock(PropertyReader.class);
-        PropertyResource resource = mock(PropertyResource.class);
-        given(resource.createReader()).willReturn(reader);
-        Settings settings = new Settings(dataFolder, resource, null, buildConfigurationData());
-
-        TestHelper.setupLogger();
-
-        Injector injector = new InjectorBuilder()
-            .addDefaultHandlers("fr.xephi.authme")
-            .create();
-        injector.provide(DataFolder.class, dataFolder);
-        injector.register(Server.class, server);
-        injector.register(PluginManager.class, pluginManager);
-
-        injector.register(AuthMe.class, authMe);
-        injector.register(Settings.class, settings);
-        injector.register(DataSource.class, mock(DataSource.class));
-        injector.register(BukkitService.class, mock(BukkitService.class));
-
-        // when
-        authMe.instantiateServices(injector);
-        authMe.registerEventListeners(injector);
-
-        // then
-        // Take a few samples and ensure that they are not null
-        assertThat(injector.getIfAvailable(AuthMeApi.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(BlockListener.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(BungeeReceiver.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(BungeeSender.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(CommandHandler.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(Management.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(PasswordSecurity.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(PermissionsManager.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(ProcessSyncPlayerLogin.class), not(nullValue()));
-        assertThat(injector.getIfAvailable(PurgeService.class), not(nullValue()));
-    }
-
-    @Test
-    public void shouldHandlePrematureShutdownGracefully() {
-        // given
-        BukkitScheduler scheduler = mock(BukkitScheduler.class);
-        given(server.getScheduler()).willReturn(scheduler);
-
-        // Make sure ConsoleLogger has no logger reference since that may happen on unexpected stops
-        ReflectionTestUtils.setField(ConsoleLogger.class, null, "logger", null);
-
-        // when
-        authMe.onDisable();
-
-        // then - no exceptions
-        verify(scheduler).getActiveWorkers(); // via TaskCloser
-    }
-}
@@ -1,136 +0,0 @@
-package fr.xephi.authme;
-
-import fr.xephi.authme.data.auth.PlayerAuth;
-import fr.xephi.authme.security.crypts.HashedPassword;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-import java.util.Objects;
-
-/**
- * Custom matchers for AuthMe entities.
- */
-// Justification: Javadoc would be huge because of the many parameters
-@SuppressWarnings("checkstyle:MissingJavadocMethod")
-public final class AuthMeMatchers {
-
-    private AuthMeMatchers() {
-    }
-
-    public static Matcher<? super HashedPassword> equalToHash(String hash) {
-        return equalToHash(new HashedPassword(hash));
-    }
-
-    public static Matcher<? super HashedPassword> equalToHash(String hash, String salt) {
-        return equalToHash(new HashedPassword(hash, salt));
-    }
-
-    public static Matcher<? super HashedPassword> equalToHash(HashedPassword hash) {
-        return new TypeSafeMatcher<HashedPassword>() {
-            @Override
-            public boolean matchesSafely(HashedPassword item) {
-                return Objects.equals(hash.getHash(), item.getHash())
-                    && Objects.equals(hash.getSalt(), item.getSalt());
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                String representation = "'" + hash.getHash() + "'";
-                if (hash.getSalt() != null) {
-                    representation += ", '" + hash.getSalt() + "'";
-                }
-                description.appendValue("HashedPassword(" + representation + ")");
-            }
-        };
-    }
-
-    public static Matcher<PlayerAuth> hasAuthBasicData(String name, String realName,
-                                                       String email, String lastIp) {
-        return new TypeSafeMatcher<PlayerAuth>() {
-            @Override
-            public boolean matchesSafely(PlayerAuth item) {
-                return Objects.equals(name, item.getNickname())
-                    && Objects.equals(realName, item.getRealName())
-                    && Objects.equals(email, item.getEmail())
-                    && Objects.equals(lastIp, item.getLastIp());
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendValue(String.format("PlayerAuth with name %s, realname %s, email %s, lastIp %s",
-                    name, realName, email, lastIp));
-            }
-
-            @Override
-            public void describeMismatchSafely(PlayerAuth item, Description description) {
-                description.appendValue(String.format("PlayerAuth with name %s, realname %s, email %s, lastIp %s",
-                    item.getNickname(), item.getRealName(), item.getEmail(), item.getLastIp()));
-            }
-        };
-    }
-
-    public static Matcher<? super PlayerAuth> hasRegistrationInfo(String registrationIp, long registrationDate) {
-        return new TypeSafeMatcher<PlayerAuth>() {
-            @Override
-            public boolean matchesSafely(PlayerAuth item) {
-                return Objects.equals(registrationIp, item.getRegistrationIp())
-                    && Objects.equals(registrationDate, item.getRegistrationDate());
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendValue(String.format("PlayerAuth with reg. IP %s and reg date %d",
-                    registrationIp, registrationDate));
-            }
-
-            @Override
-            public void describeMismatchSafely(PlayerAuth item, Description description) {
-                description.appendValue(String.format("PlayerAuth with reg. IP %s and reg date %d",
-                    item.getRegistrationIp(), item.getRegistrationDate()));
-            }
-        };
-    }
-
-    public static Matcher<? super PlayerAuth> hasAuthLocation(PlayerAuth auth) {
-        return hasAuthLocation(auth.getQuitLocX(), auth.getQuitLocY(), auth.getQuitLocZ(), auth.getWorld(),
-            auth.getYaw(), auth.getPitch());
-    }
-
-    public static Matcher<? super PlayerAuth> hasAuthLocation(double x, double y, double z,
-                                                              String world, float yaw, float pitch) {
-        return new TypeSafeMatcher<PlayerAuth>() {
-            @Override
-            public boolean matchesSafely(PlayerAuth item) {
-                return Objects.equals(x, item.getQuitLocX())
-                    && Objects.equals(y, item.getQuitLocY())
-                    && Objects.equals(z, item.getQuitLocZ())
-                    && Objects.equals(world, item.getWorld())
-                    && Objects.equals(yaw, item.getYaw())
-                    && Objects.equals(pitch, item.getPitch());
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendValue(
-                    String.format("PlayerAuth with quit location (x: %f, y: %f, z: %f, world: %s, yaw: %f, pitch: %f)",
-                        x, y, z, world, yaw, pitch));
-            }
-        };
-    }
-
-    public static Matcher<String> stringWithLength(int length) {
-        return new TypeSafeMatcher<String>() {
-            @Override
-            protected boolean matchesSafely(String item) {
-                return item != null && item.length() == length;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("String with length " + length);
-            }
-        };
-    }
-
-}
@@ -1,165 +0,0 @@
-package fr.xephi.authme;
-
-import java.io.File;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-/**
- * Collects available classes by walking through a source directory.
- * <p>
- * This is a naive, zero dependency collector that walks through a file directory
- * and loads classes from the class loader based on the .java files it encounters.
- * This is a very slow approach and should be avoided for production code.
- * <p>
- * For more performant approaches, see e.g. <a href="https://github.com/ronmamo/reflections">org.reflections</a>.
- */
-public class ClassCollector {
-
-    private final String root;
-    private final String nonCodePath;
-
-    /**
-     * Constructor. The arguments make up the path from which the collector will start scanning.
-     *
-     * @param nonCodePath beginning of the starting path that are not Java packages, e.g. {@code src/main/java/}
-     * @param packagePath folders following {@code nonCodePath} that are packages, e.g. {@code com/project/app}
-     */
-    public ClassCollector(String nonCodePath, String packagePath) {
-        if (!nonCodePath.endsWith("/") && !nonCodePath.endsWith("\\")) {
-            nonCodePath = nonCodePath.concat(File.separator);
-        }
-        this.root = nonCodePath + packagePath;
-        this.nonCodePath = nonCodePath;
-    }
-
-    /**
-     * Collects all classes from the parent folder and below.
-     *
-     * @return all classes
-     */
-    public List<Class<?>> collectClasses() {
-        return collectClasses(x -> true);
-    }
-
-    /**
-     * Collects all classes from the parent folder and below which are of type {@link T}.
-     *
-     * @param parent the parent which classes need to extend (or be equal to) in order to be collected
-     * @param <T> the parent type
-     * @return list of matching classes
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> List<Class<? extends T>> collectClasses(Class<T> parent) {
-        List<Class<?>> classes = collectClasses(parent::isAssignableFrom);
-        return new ArrayList<>((List) classes);
-    }
-
-    /**
-     * Collects all classes from the parent folder and below which match the given predicate.
-     *
-     * @param filter the predicate classes need to satisfy in order to be collected
-     * @return list of matching classes
-     */
-    public List<Class<?>> collectClasses(Predicate<Class<?>> filter) {
-        File rootFolder = new File(root);
-        List<Class<?>> collection = new ArrayList<>();
-        gatherClassesFromFile(rootFolder, filter, collection);
-        return collection;
-    }
-
-    /**
-     * Constructs an instance of all classes which are of the provided type {@code clazz}.
-     * This method assumes that every class has an accessible no-args constructor for creation.
-     *
-     * @param parent the parent which classes need to extend (or be equal to) in order to be instantiated
-     * @param <T> the parent type
-     * @return collection of created objects
-     */
-    public <T> List<T> getInstancesOfType(Class<T> parent) {
-        return getInstancesOfType(parent, (clz) -> {
-           try {
-               return canInstantiate(clz) ? clz.newInstance() : null;
-           } catch (InstantiationException | IllegalAccessException e) {
-               throw new IllegalStateException(e);
-           }
-        });
-    }
-
-    /**
-     * Constructs an instance of all classes which are of the provided type {@code clazz}
-     * with the provided {@code instantiator}.
-     *
-     * @param parent the parent which classes need to extend (or be equal to) in order to be instantiated
-     * @param instantiator function which returns an object of the given class, or null to skip the class
-     * @param <T> the parent type
-     * @return collection of created objects
-     */
-    public <T> List<T> getInstancesOfType(Class<T> parent, Function<Class<? extends T>, T> instantiator) {
-        return collectClasses(parent)
-            .stream()
-            .map(instantiator)
-            .filter(o -> o != null)
-            .collect(Collectors.toList());
-    }
-
-    /**
-     * Returns whether the given class can be instantiated, i.e. if it is not abstract, an interface, etc.
-     *
-     * @param clazz the class to process
-     * @return true if the class can be instantiated, false otherwise
-     */
-    public static boolean canInstantiate(Class<?> clazz) {
-        return clazz != null && !clazz.isEnum() && !clazz.isInterface()
-            && !clazz.isArray() && !Modifier.isAbstract(clazz.getModifiers());
-    }
-
-    /**
-     * Recursively collects the classes based on the files in the directory and in its child directories.
-     *
-     * @param folder the folder to scan
-     * @param filter the class predicate
-     * @param collection collection to add classes to
-     */
-    private void gatherClassesFromFile(File folder, Predicate<Class<?>> filter, List<Class<?>> collection) {
-        File[] files = folder.listFiles();
-        if (files == null) {
-            throw new IllegalStateException("Could not read files from '" + folder + "'");
-        }
-        for (File file : files) {
-            if (file.isDirectory()) {
-                gatherClassesFromFile(file, filter, collection);
-            } else if (file.isFile()) {
-                Class<?> clazz = loadTaskClassFromFile(file);
-                if (clazz != null && filter.test(clazz)) {
-                    collection.add(clazz);
-                }
-            }
-        }
-    }
-
-    /**
-     * Loads a class from the class loader based on the given file.
-     *
-     * @param file the file whose corresponding Java class should be retrieved
-     * @return the corresponding class, or null if not applicable
-     */
-    private Class<?> loadTaskClassFromFile(File file) {
-        if (!file.getName().endsWith(".java")) {
-            return null;
-        }
-
-        String filePath = file.getPath();
-        String className = filePath
-            .substring(nonCodePath.length(), filePath.length() - 5)
-            .replace(File.separator, ".");
-        try {
-            return Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-}
@@ -1,173 +0,0 @@
-package fr.xephi.authme;
-
-import ch.jalu.configme.properties.Property;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import fr.xephi.authme.data.captcha.CaptchaCodeStorage;
-import fr.xephi.authme.datasource.AbstractSqlDataSource;
-import fr.xephi.authme.datasource.Columns;
-import fr.xephi.authme.datasource.columnshandler.DataSourceColumn;
-import fr.xephi.authme.datasource.columnshandler.PlayerAuthColumn;
-import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
-import fr.xephi.authme.initialization.HasCleanup;
-import fr.xephi.authme.process.register.executors.RegistrationMethod;
-import fr.xephi.authme.security.crypts.Whirlpool;
-import fr.xephi.authme.util.expiring.ExpiringMap;
-import fr.xephi.authme.util.expiring.ExpiringSet;
-import fr.xephi.authme.util.expiring.TimedCounter;
-import org.junit.Test;
-
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
-
-/**
- * Contains consistency tests across all AuthMe classes.
- */
-public class ClassesConsistencyTest {
-
-    /** Contains all production classes. */
-    private static final List<Class<?>> ALL_CLASSES =
-        new ClassCollector(TestHelper.SOURCES_FOLDER, TestHelper.PROJECT_ROOT).collectClasses();
-
-    /** Expiring structure types. */
-    private static final Set<Class<?>> EXPIRING_STRUCTURES = ImmutableSet.of(
-        ExpiringSet.class, ExpiringMap.class, TimedCounter.class, CaptchaCodeStorage.class);
-
-    /** Immutable types, which are allowed to be used in non-private constants. */
-    private static final Set<Class<?>> IMMUTABLE_TYPES = ImmutableSet.of(
-        /* JDK */
-        int.class, long.class, float.class, String.class, File.class, Enum.class, collectionsUnmodifiableList(),
-        Charset.class,
-        /* AuthMe */
-        Property.class, RegistrationMethod.class, DataSourceColumn.class, PlayerAuthColumn.class,
-        /* Guava */
-        ImmutableMap.class, ImmutableList.class);
-
-    /** Classes excluded from the field visibility test. */
-    private static final Set<Class<?>> CLASSES_EXCLUDED_FROM_VISIBILITY_TEST = ImmutableSet.of(
-        Whirlpool.class, // not our implementation, so we don't touch it
-        MySqlExtension.class, // has immutable protected fields used by all children
-        AbstractSqlDataSource.class, // protected members for inheritance
-        Columns.class // uses non-static String constants, which is safe
-    );
-
-    /**
-     * Checks that there aren't two classes with the same name; this is confusing and should be avoided.
-     */
-    @Test
-    public void shouldNotHaveSameName() {
-        // given
-        Set<String> names = new HashSet<>();
-
-        // when / then
-        for (Class<?> clazz : ALL_CLASSES) {
-            if (!names.add(clazz.getSimpleName())) {
-                fail("Class with name '" + clazz.getSimpleName() + "' already encountered!");
-            }
-        }
-    }
-
-    /**
-     * Checks that fields of classes are either private or static final fields of an immutable type.
-     */
-    @Test
-    public void shouldHaveNonPrivateConstantsOnly() {
-        // given / when
-        Set<String> invalidFields = ALL_CLASSES.stream()
-            .filter(clz -> !CLASSES_EXCLUDED_FROM_VISIBILITY_TEST.contains(clz))
-            .map(Class::getDeclaredFields)
-            .flatMap(Arrays::stream)
-            .filter(f -> !f.getName().contains("$"))
-            .filter(f -> hasIllegalFieldVisibility(f))
-            .map(f -> formatField(f))
-            .collect(Collectors.toSet());
-
-        // then
-        if (!invalidFields.isEmpty()) {
-            fail("Found " + invalidFields.size() + " fields with non-private, mutable fields:\n- "
-                + String.join("\n- ", invalidFields));
-        }
-    }
-
-    private static boolean hasIllegalFieldVisibility(Field field) {
-        final int modifiers = field.getModifiers();
-        if (Modifier.isPrivate(modifiers)) {
-            return false;
-        } else if (!Modifier.isStatic(modifiers) || !Modifier.isFinal(modifiers)) {
-            return true;
-        }
-
-        // Field is non-private, static and final
-        Class<?> valueType;
-        if (Collection.class.isAssignableFrom(field.getType()) || Map.class.isAssignableFrom(field.getType())) {
-            // For collections/maps, need to check the actual type to ensure it's an unmodifiable implementation
-            Object value = ReflectionTestUtils.getFieldValue(field, null);
-            valueType = value.getClass();
-        } else {
-             valueType = field.getType();
-        }
-
-        // Field is static, final, and not private -> check that it is immutable type
-        return IMMUTABLE_TYPES.stream()
-            .noneMatch(immutableType -> immutableType.isAssignableFrom(valueType));
-    }
-
-    /**
-     * Prints out the field with its modifiers.
-     *
-     * @param field the field to format
-     * @return description of the field
-     */
-    private static String formatField(Field field) {
-        String modifiersText = Modifier.toString(field.getModifiers());
-        return String.format("[%s] %s %s %s", field.getDeclaringClass().getSimpleName(), modifiersText.trim(),
-            field.getType().getSimpleName(), field.getName());
-    }
-
-    /**
-     * Checks that classes with expiring collections (such as {@link ExpiringMap}) implement the {@link HasCleanup}
-     * interface to regularly clean up expired data.
-     */
-    @Test
-    public void shouldImplementHasCleanup() {
-        // given / when / then
-        for (Class<?> clazz : ALL_CLASSES) {
-            if (hasExpiringCollectionAsField(clazz) && !EXPIRING_STRUCTURES.contains(clazz)) {
-                assertThat("Class '" + clazz.getSimpleName() + "' has expiring collections, should implement HasCleanup",
-                    HasCleanup.class.isAssignableFrom(clazz), equalTo(true));
-            }
-        }
-    }
-
-    private static boolean hasExpiringCollectionAsField(Class<?> clazz) {
-        for (Field field : clazz.getDeclaredFields()) {
-            if (EXPIRING_STRUCTURES.stream().anyMatch(t -> t.isAssignableFrom(field.getType()))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return the concrete class of the unmodifiable list as returned by {@link Collections#unmodifiableList(List)}.
-     */
-    private static Class<?> collectionsUnmodifiableList() {
-        return Collections.unmodifiableList(new ArrayList<>()).getClass();
-    }
-}
@@ -1,44 +0,0 @@
-package fr.xephi.authme;
-
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.junit.Test;
-
-import java.io.File;
-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.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
-
-/**
- * Consistency test for the CodeClimate configuration file.
- */
-public class CodeClimateConfigTest {
-
-    private static final String CONFIG_FILE = ".codeclimate.yml";
-
-    @Test
-    public void shouldHaveExistingClassesInExclusions() {
-        // given / when
-        FileConfiguration configuration = YamlConfiguration.loadConfiguration(new File(CONFIG_FILE));
-        List<String> excludePaths = configuration.getStringList("exclude_patterns");
-
-        // then
-        assertThat(excludePaths, not(empty()));
-        removeTestsExclusionOrThrow(excludePaths);
-        for (String path : excludePaths) {
-            if (!new File(path).exists()) {
-                fail("Path '" + path + "' does not exist!");
-            }
-        }
-    }
-
-    private static void removeTestsExclusionOrThrow(List<String> excludePaths) {
-        boolean wasRemoved = excludePaths.removeIf("src/test/java/**/*Test.java"::equals);
-        assertThat("Expected an exclusion for test classes",
-            wasRemoved, equalTo(true));
-    }
-}
@@ -1,227 +0,0 @@
-package fr.xephi.authme;
-
-import fr.xephi.authme.output.LogLevel;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.PluginSettings;
-import fr.xephi.authme.settings.properties.SecuritySettings;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.logging.Logger;
-
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsString;
-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.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-/**
- * Test for {@link ConsoleLogger}.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class ConsoleLoggerTest {
-
-    private ConsoleLogger consoleLogger;
-
-    @Mock
-    private Logger logger;
-
-    @Rule
-    public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    private File logFile;
-
-    @Before
-    public void setMockLogger() throws IOException {
-        File folder = temporaryFolder.newFolder();
-        File logFile = new File(folder, "authme.log");
-        if (!logFile.createNewFile()) {
-            throw new IOException("Could not create file '" + logFile.getPath() + "'");
-        }
-        ConsoleLogger.initialize(logger, logFile);
-        this.logFile = logFile;
-        this.consoleLogger = new ConsoleLogger("test");
-    }
-
-    @After
-    public void closeFileHandlers() {
-        ConsoleLogger.closeFileWriter();
-    }
-
-    /**
-     * Resets the ConsoleLogger back to its defaults after running all tests. Especially important
-     * is that we no longer enable logging to a file as the log file we've supplied will no longer
-     * be around after this test class has finished.
-     */
-    @AfterClass
-    public static void resetConsoleToDefault() {
-        ConsoleLogger.initializeSharedSettings(newSettings(false, LogLevel.INFO));
-    }
-
-    @Test
-    public void shouldLogToFile() throws IOException {
-        // given
-        Settings settings = newSettings(true, LogLevel.FINE);
-        ConsoleLogger.initializeSharedSettings(settings);
-        consoleLogger.initializeSettings(settings);
-
-        // when
-        consoleLogger.fine("Logging a FINE message");
-        consoleLogger.debug("Logging a DEBUG message");
-        consoleLogger.info("This is an INFO message");
-
-        // then
-        verify(logger, times(2)).info(anyString());
-        verifyNoMoreInteractions(logger);
-        List<String> loggedLines = Files.readAllLines(logFile.toPath(), StandardCharsets.UTF_8);
-        assertThat(loggedLines, hasSize(2));
-        assertThat(loggedLines.get(0), containsString("[FINE] Logging a FINE message"));
-        assertThat(loggedLines.get(1), containsString("[INFO] This is an INFO message"));
-    }
-
-    @Test
-    public void shouldNotLogToFile() {
-        // given
-        Settings settings = newSettings(false, LogLevel.DEBUG);
-        ConsoleLogger.initializeSharedSettings(settings);
-        consoleLogger.initializeSettings(settings);
-
-        // when
-        consoleLogger.debug("Created test");
-        consoleLogger.warning("Encountered a warning");
-
-        // then
-        verify(logger).info("[DEBUG] Created test");
-        verify(logger).warning("Encountered a warning");
-        verifyNoMoreInteractions(logger);
-        assertThat(logFile.length(), equalTo(0L));
-    }
-
-    @Test
-    public void shouldLogStackTraceToFile() throws IOException {
-        // given
-        Settings settings = newSettings(true, LogLevel.INFO);
-        ConsoleLogger.initializeSharedSettings(settings);
-        Exception e = new IllegalStateException("Test exception message");
-
-        // when
-        consoleLogger.info("Info text");
-        consoleLogger.debug("Debug message");
-        consoleLogger.fine("Fine-level message");
-        consoleLogger.logException("Exception occurred:", e);
-
-        // then
-        verify(logger).info("Info text");
-        verify(logger).warning("Exception occurred: [IllegalStateException]: Test exception message");
-        verifyNoMoreInteractions(logger);
-        List<String> loggedLines = Files.readAllLines(logFile.toPath(), StandardCharsets.UTF_8);
-        assertThat(loggedLines.size(), greaterThan(3));
-        assertThat(loggedLines.get(0), containsString("[INFO] Info text"));
-        assertThat(loggedLines.get(1),
-            containsString("[WARN] Exception occurred: [IllegalStateException]: Test exception message"));
-        // Check that we have this class' full name somewhere in the file -> stacktrace of Exception e
-        assertThat(String.join("", loggedLines), containsString(getClass().getCanonicalName()));
-    }
-
-    @Test
-    public void shouldSupportVariousDebugMethods() throws IOException {
-        // given
-        Settings settings = newSettings(true, LogLevel.DEBUG);
-        ConsoleLogger.initializeSharedSettings(settings);
-        consoleLogger.initializeSettings(settings);
-
-        // when
-        consoleLogger.debug("Got {0} entries", 17);
-        consoleLogger.debug("Player `{0}` is in world `{1}`", "Bobby", new WorldDummy("world"));
-        consoleLogger.debug("{0} quick {1} jump over {2} lazy {3} (reason: {4})", 5, "foxes", 3, "dogs", null);
-        consoleLogger.debug(() -> "Too little too late");
-
-        // then
-        verify(logger).info("[DEBUG] Got 17 entries");
-        verify(logger).info("[DEBUG] Player `Bobby` is in world `w[world]`");
-        verify(logger).info("[DEBUG] 5 quick foxes jump over 3 lazy dogs (reason: null)");
-        verify(logger).info("[DEBUG] Too little too late");
-        verifyNoMoreInteractions(logger);
-
-        List<String> loggedLines = Files.readAllLines(logFile.toPath(), StandardCharsets.UTF_8);
-        assertThat(loggedLines, contains(
-            containsString("[DEBUG] Got 17 entries"),
-            containsString("[DEBUG] Player `Bobby` is in world `w[world]`"),
-            containsString("[DEBUG] 5 quick foxes jump over 3 lazy dogs (reason: null)"),
-            containsString("[DEBUG] Too little too late")));
-    }
-
-    @Test
-    public void shouldCloseFileWriterDespiteExceptionOnFlush() throws IOException {
-        // given
-        FileWriter fileWriter = mock(FileWriter.class);
-        doThrow(new IOException("Error during flush")).when(fileWriter).flush();
-        ReflectionTestUtils.setField(ConsoleLogger.class, null, "fileWriter", fileWriter);
-
-        // when
-        ConsoleLogger.closeFileWriter();
-
-        // then
-        verify(fileWriter).flush();
-        verify(fileWriter).close();
-        assertThat(ReflectionTestUtils.getFieldValue(ConsoleLogger.class, null, "fileWriter"), nullValue());
-    }
-
-    @Test
-    public void shouldHandleExceptionOnFileWriterClose() throws IOException {
-        // given
-        FileWriter fileWriter = mock(FileWriter.class);
-        doThrow(new IOException("Cannot close")).when(fileWriter).close();
-        ReflectionTestUtils.setField(ConsoleLogger.class, null, "fileWriter", fileWriter);
-
-        // when
-        ConsoleLogger.closeFileWriter();
-
-        // then
-        verify(fileWriter).flush();
-        verify(fileWriter).close();
-        assertThat(ReflectionTestUtils.getFieldValue(ConsoleLogger.class, null, "fileWriter"), nullValue());
-    }
-
-    private static Settings newSettings(boolean logToFile, LogLevel logLevel) {
-        Settings settings = mock(Settings.class);
-        given(settings.getProperty(SecuritySettings.USE_LOGGING)).willReturn(logToFile);
-        given(settings.getProperty(PluginSettings.LOG_LEVEL)).willReturn(logLevel);
-        return settings;
-    }
-
-    private static final class WorldDummy {
-        private final String name;
-
-        WorldDummy(String name) {
-            this.name = name;
-        }
-
-        @Override
-        public String toString() {
-            return "w[" + name + "]";
-        }
-    }
-}
@@ -1,91 +0,0 @@
-package fr.xephi.authme;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static org.junit.Assert.fail;
-
-/**
- * Matcher which checks with reflection that all fields have the same value.
- * This matcher considers all non-static fields until the Object parent.
- */
-public final class IsEqualByReflectionMatcher<T> extends TypeSafeMatcher<T> {
-
-    private final T expected;
-
-    private IsEqualByReflectionMatcher(T expected) {
-        this.expected = expected;
-    }
-
-    /**
-     * Creates a matcher that checks if all fields are the same as on the {@code expected} object.
-     *
-     * @param expected the object to match
-     * @param <T> the object's type
-     * @return the matcher for the expected object
-     */
-    public static <T> Matcher<T> hasEqualValuesOnAllFields(T expected) {
-        return new IsEqualByReflectionMatcher<>(expected);
-    }
-
-    @Override
-    protected boolean matchesSafely(T item) {
-        return assertAreFieldsEqual(item);
-    }
-
-    @Override
-    public void describeTo(Description description) {
-        description.appendText("parameters " + expected);
-    }
-
-    /**
-     * Checks that all fields of the given {@code item} are equal to the {@link #expected} object. Both objects must
-     * be exactly of the same type.
-     *
-     * @param item the object to check
-     * @return true if all fields are equal, false otherwise
-     */
-    private boolean assertAreFieldsEqual(T item) {
-        if (expected.getClass() != item.getClass()) {
-            fail("Classes don't match, got " + expected.getClass().getSimpleName()
-                + " and " + item.getClass().getSimpleName());
-            return false;
-        }
-
-        List<Field> fieldsToCheck = getAllFields(expected);
-        for (Field field : fieldsToCheck) {
-            Object lhsValue = ReflectionTestUtils.getFieldValue(field, expected);
-            Object rhsValue = ReflectionTestUtils.getFieldValue(field, item);
-            if (!Objects.equals(lhsValue, rhsValue)) {
-                fail("Field '" + field.getName() + "' does not have same value: '"
-                    + lhsValue + "' vs. '" + rhsValue + "'");
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static List<Field> getAllFields(Object object) {
-        List<Field> fields = new ArrayList<>();
-        Class<?> currentClass = object.getClass();
-        while (currentClass != null) {
-            for (Field f : currentClass.getDeclaredFields()) {
-                if (!Modifier.isStatic(f.getModifiers()) && !f.isSynthetic()) {
-                    fields.add(f);
-                }
-            }
-            if (currentClass == Object.class) {
-                break;
-            }
-            currentClass = currentClass.getSuperclass();
-        }
-        return fields;
-    }
-}
@@ -1,153 +0,0 @@
-package fr.xephi.authme;
-
-import ch.jalu.injector.handlers.postconstruct.PostConstructMethodInvoker;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import static java.lang.String.format;
-
-/**
- * Offers reflection functionality to set up tests. Use only when absolutely necessary.
- */
-public final class ReflectionTestUtils {
-
-    private ReflectionTestUtils() {
-        // Util class
-    }
-
-    /**
-     * Sets the field of a given object to a new value with reflection.
-     *
-     * @param clazz the class declaring the field
-     * @param instance the instance to modify (pass null for static fields)
-     * @param fieldName the field name
-     * @param value the value to set the field to
-     * @param <T> the instance type
-     */
-    public static <T> void setField(Class<? super T> clazz, T instance, String fieldName, Object value) {
-        try {
-            Field field = getField(clazz, fieldName);
-            field.set(instance, value);
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException(
-                format("Could not set value to field '%s' for instance '%s' of class '%s'",
-                    fieldName, instance, clazz.getName()), e);
-        }
-    }
-
-    /**
-     * Sets the field on the given instance to the new value.
-     *
-     * @param instance the instance to modify
-     * @param fieldName the field name
-     * @param value the value to set the field to
-     */
-    @SuppressWarnings("unchecked")
-    public static void setField(Object instance, String fieldName, Object value) {
-        setField((Class) instance.getClass(), instance, fieldName, value);
-    }
-
-    private static <T> Field getField(Class<T> clazz, String fieldName) {
-        try {
-            Field field = clazz.getDeclaredField(fieldName);
-            field.setAccessible(true);
-            return field;
-        } catch (NoSuchFieldException e) {
-            throw new IllegalStateException(format("Could not get field '%s' from class '%s'",
-                fieldName, clazz.getName()), e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T, V> V getFieldValue(Class<T> clazz, T instance, String fieldName) {
-        Field field = getField(clazz, fieldName);
-        return getFieldValue(field, instance);
-    }
-
-    /**
-     * Returns the value of the field on the given instance. Wraps exceptions into a runtime exception.
-     *
-     * @param field the field to read
-     * @param instance the instance to get the value from, null if field is static
-     * @param <V> type of the field
-     * @return value of the field
-     */
-    @SuppressWarnings("unchecked")
-    public static <V> V getFieldValue(Field field, Object instance) {
-        field.setAccessible(true);
-        try {
-            return (V) field.get(instance);
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException("Could not get value of field '" + field.getName() + "'", e);
-        }
-    }
-
-    /**
-     * Returns the method on the given class with the supplied parameter types.
-     *
-     * @param clazz the class to retrieve a method from
-     * @param methodName the name of the method
-     * @param parameterTypes the parameter types the method to retrieve has
-     * @return the method of the class, set to be accessible
-     */
-    public static Method getMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
-        try {
-            Method method = clazz.getDeclaredMethod(methodName, parameterTypes);
-            method.setAccessible(true);
-            return method;
-        } catch (NoSuchMethodException e) {
-            throw new IllegalStateException("Could not retrieve method '" + methodName + "' from class '"
-                + clazz.getName() + "'");
-        }
-    }
-
-    /**
-     * Invokes the given method on the provided instance with the given parameters.
-     *
-     * @param method the method to invoke
-     * @param instance the instance to invoke the method on (null for static methods)
-     * @param parameters the parameters to pass to the method
-     * @param <V> return value of the method
-     * @return method return value
-     */
-    @SuppressWarnings("unchecked")
-    public static <V> V invokeMethod(Method method, Object instance, Object... parameters) {
-        method.setAccessible(true);
-        try {
-            return (V) method.invoke(instance, parameters);
-        } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new IllegalStateException("Could not invoke method '" + method + "'", e);
-        }
-    }
-
-    /**
-     * Runs all methods annotated with {@link javax.annotation.PostConstruct} on the given instance
-     * (including such methods on superclasses).
-     *
-     * @param instance the instance to process
-     */
-    public static void invokePostConstructMethods(Object instance) {
-        // Use the implementation of the injector to invoke all @PostConstruct methods the same way
-        new PostConstructMethodInvoker().postProcess(instance, null, null);
-    }
-
-    /**
-     * Creates a new instance of the given class, using a no-args constructor (which may be hidden).
-     *
-     * @param clazz the class to instantiate
-     * @param <T> the class' type
-     * @return the created instance
-     */
-    public static <T> T newInstance(Class<T> clazz) {
-        try {
-            Constructor<T> constructor = clazz.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            return constructor.newInstance();
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalStateException("Could not invoke no-args constructor of class " + clazz, e);
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cai Xukun	0205f585df	Add files via upload	2023-05-14 15:22:30 +08:00
Cai Xukun	d44792baa5	Add files via upload	2023-05-13 21:49:36 +08:00
Cai Xukun	68ac58686d	Add files via upload	2023-05-13 16:31:45 +08:00
Cai Xukun	25caa602fd	Add files via upload	2023-05-13 12:22:38 +08:00
Cai Xukun	b36590c827	Add b11 hash	2023-05-06 20:32:21 +08:00
Cai Xukun	af22c47017	Add files via upload	2023-04-24 22:00:52 +08:00
Cai Xukun	bf5928e841	Add files via upload	2023-04-24 02:48:15 +08:00
Cai Xukun	ebf8d55d60	Add b9 hash	2023-04-24 02:33:13 +08:00
Cai Xukun	9bb99ed355	Update maven.yml	2023-04-23 21:54:56 +08:00
Cai Xukun	eaa30cc5eb	upload b8 sha	2023-04-23 19:48:19 +08:00
Cai Xukun	4046105e87	upload b7 hash	2023-04-23 00:47:29 +08:00
Cai Xukun	e782cccf72	Add files via upload	2023-04-22 21:31:47 +08:00
Cai Xukun	eaa0fba587	Add files via upload	2023-04-22 21:29:16 +08:00
Cai Xukun	cc248c3459	Add files via upload	2023-04-22 21:15:26 +08:00
Cai Xukun	ab24793861	Add files via upload	2023-04-22 21:13:12 +08:00
Cai Xukun	25ebbf6f20	Add files via upload	2023-04-22 20:49:30 +08:00
Cai Xukun	d3e463165d	Update B6 sha file	2023-04-22 19:20:25 +08:00
Cai Xukun	a459e6bad8	Add files via upload	2023-04-22 19:16:00 +08:00
Cai Xukun	6a91130aa8	Merge branch 'Stabrinai:master' into master	2023-04-20 20:38:12 +08:00
Sattera	d25949fc3b	更新	2023-04-19 16:13:38 +08:00
HaHaWTH	f63f00fade	Update maven.yml	2023-04-06 21:43:55 +08:00
HaHaWTH	19c18987f6	Update maven.yml	2023-04-06 21:14:09 +08:00
HaHaWTH	db1650c27f	Update maven.yml	2023-04-06 20:59:28 +08:00
HaHaWTH	f45696f82f	Update maven.yml	2023-04-06 20:56:39 +08:00
HaHaWTH	1c1879ea01	Update maven.yml	2023-04-06 20:48:00 +08:00
HaHaWTH	812762db25	Merge branch 'Stabrinai:master' into master	2023-04-06 20:36:22 +08:00
Sattera	a4bf7adb60	添加对 floodgate 的支持	2023-04-06 09:42:12 +08:00
Sattera	11c5237950	Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/fr/xephi/authme/listener/PlayerListener.java	2023-04-06 09:38:13 +08:00
Sattera	bc43afe3d0	添加对 floodgate 的支持	2023-04-06 09:37:57 +08:00
HaHaWTH	ced3d17537	Update README.md	2023-04-06 02:19:03 +08:00
HaHaWTH	d9b3c59f30	Update maven.yml	2023-04-06 01:58:08 +08:00
HaHaWTH	8c286ceceb	Update maven.yml	2023-04-06 01:54:54 +08:00
HaHaWTH	2ce6b066cc	Update maven.yml	2023-04-06 01:52:50 +08:00
HaHaWTH	585b69ecd2	Update maven.yml	2023-04-06 01:50:33 +08:00
HaHaWTH	17187b05c1	Update maven.yml	2023-04-06 01:49:05 +08:00
HaHaWTH	6f193f05ce	Update maven.yml	2023-04-06 01:47:55 +08:00
HaHaWTH	a626265b09	Update maven.yml	2023-04-06 01:42:51 +08:00
HaHaWTH	bda8613f93	Update .gitignore	2023-04-06 01:19:09 +08:00
HaHaWTH	44136bb91f	Update maven.yml	2023-04-06 01:08:45 +08:00
HaHaWTH	69514738f7	Update maven.yml	2023-04-06 01:01:54 +08:00
HaHaWTH	220b31bb99	Update maven.yml	2023-04-06 00:59:20 +08:00
HaHaWTH	3b58a0acc9	Update maven.yml	2023-04-06 00:57:06 +08:00
HaHaWTH	5efa360cb2	Update README.md	2023-04-06 00:25:56 +08:00
HaHaWTH	2269c93dee	Update maven.yml	2023-04-06 00:22:41 +08:00
HaHaWTH	bf6233c024	Update maven.yml	2023-04-05 23:32:01 +08:00
HaHaWTH	3cc6f535a8	Update maven.yml	2023-04-05 22:01:32 +08:00
HaHaWTH	95d9edddeb	Merge branch 'Stabrinai:master' into master	2023-04-05 21:05:10 +08:00
Sattera	4a559a7ccf	Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/fr/xephi/authme/listener/PlayerListener.java	2023-04-05 20:25:10 +08:00
Sattera	baaabb22d4	添加对 floodgate 的支持	2023-04-05 20:24:55 +08:00
HaHaWTH	9e39f4a186	Create maven-publish.yml	2023-04-05 18:56:36 +08:00
Sattera	c2b7a693b2	添加对 floodgate 的支持	2023-04-04 09:08:07 +08:00
Sattera	0e1e65c7f7	取消 /cp 指令的邮箱验证	2023-03-28 08:59:03 +08:00
Sattera	d33f838f3a	添加 keybindings.use 节点控制下蹲 + 切副手打开菜单 //自用内容	2023-03-22 10:02:29 +08:00
Sabrita	393449e08e	默认删除qq邮箱支持	2023-03-01 22:20:03 +08:00
Sabrita	bdf7816306	更改十分钟内注册逻辑	2023-02-28 13:22:15 +08:00
Sabrita	e109094472	删测测试项默认开启用户名限制并增加默认限制用户	2023-02-28 13:13:17 +08:00
Sabrita	ea1af80ea4	修复构建	2023-02-28 12:51:55 +08:00
Sabrita	674d72c113	优化 import 。更改默认配置	2023-02-28 12:36:56 +08:00
Sabrita	912646c041	增加服务器被关闭时的邮箱通知	2023-02-27 19:57:00 +08:00
Sabrita	4ca879b08a	删除 wecome 提醒	2023-02-27 19:10:04 +08:00
Sabrita	2d4b2381ff	默认使用邮箱注册	2023-02-27 18:45:28 +08:00
Sabrita	bbfce5bcfd	删除测试库删除 wecome 增加新代码	2023-02-27 18:34:29 +08:00
Sabrita	cfca8ccd85	删除测试库删除 wecome 增加新代码	2023-02-27 18:34:06 +08:00
				`@@ -0,0 +1 @@`
				`d91307767d8526ac84a3055ac0e773e91f88d452b4b0031f7ecfed721ac6b641`
				`@@ -0,0 +1 @@`
				`d0aab9856defbd8ef31a9cd7257c5b5761e61a7e39807708c81decf82f599323`
				`@@ -0,0 +1 @@`
				`176a6c6ea03ad8cc37d1d11c3e3608d8b59c09f9f923eae287e8192731642ec8`
				`@@ -0,0 +1 @@`
				`61b1a691490d78af1028a442143f649d432618b92c5a9a7031eb4f94817d768b`
				`@@ -0,0 +1 @@`
				`222eb5ecb4c58f279b8e2f75d38a45495ceb875f249ae3217e3f2a36e50b7d39`
				`@@ -0,0 +1 @@`
				`423084f2a50c27f62d1b5c85a95e78b9bc3df49d5bd9cefd6fe1aa9227b856c1`
				`@@ -0,0 +1 @@`
				`410df26b12703b82987b9d739c19211346418f1c954d214827805c13b5f82c98`
				`@@ -0,0 +1 @@`
				`20569ebc44a9847da0946de5a3bf2cd2b7855dffb03abc9d29204afcaa64b8bb`
				`@@ -0,0 +1 @@`
				`51a067778ad9b0938d57fd4e2975e0f8dce4914ee060efd0fd6755a8810da4f3`