B45 release

This reverts commit 01e46b566a.

.github/dependabot.yml

@@ -12,3 +12,5 @@ updates:
   - dependency-name: com.zaxxer:HikariCP
   - dependency-name: "org.mockito:mockito-core" # Mockito 5 requires Java 11
     versions: ">= 5"
+  - dependency-name: "org.slf4j:slf4j-simple"
+    versions: ">= 1.7.36"

.github/workflows/maven.yml

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

LICENSE

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

README.md

@@ -1,6 +1,6 @@
 # AuthMeReReloaded
 **"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
-MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471495)
+
 ![Graph](https://bstats.org/signatures/bukkit/AuthMeReloaded-Fork.svg)
 <p align="center">
   <img src="https://img.shields.io/github/languages/code-size/HaHaWTH/AuthMeReReloaded.svg" alt="Code size"/>
@@ -20,8 +20,7 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
  9. Improved listeners
  10. Player login logic improvement to reduce lag
  11. Automatically purge bot data
- 12. Folia
-     compatibility [Here](https://github.com/HaHaWTH/AuthMeReReloaded/releases/download/b20/AuthMe-5.6.0-FORK-Folia.jar)
+ 12. Folia compatibility (Still WIP)
  13. Offhand Menu compatibility(Thats amazing)
  14. Automatically fix portal stuck issue
  15. Automatically login for Bedrock players(configurable)
@@ -34,7 +33,7 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
 [Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
 [Actions(Dev builds, use at your own risk!)](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
 
-TODO: Implement HAProxy ip forward(Useful for Frp)
+If you are using FRP(内网穿透) for your server, this plugin may help [HAProxy-Detector](https://github.com/HaHaWTH/HAProxy-Detector)
 
 **Pull Requests and suggestions are welcome!**
 

pom.xml

@@ -67,7 +67,7 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.20.2-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
@@ -155,6 +155,11 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.4.1</version>
+                    <configuration>
+                        <failOnError>false</failOnError>
+                        <failOnWarnings>false</failOnWarnings>
+                        <skip>true</skip>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -164,7 +169,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>enforce-environment</id>
@@ -177,7 +182,7 @@
                                     <version>${maven.minimumVersion}</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>[11,)</version>
+                                    <version>[17,)</version>
                                 </requireJavaVersion>
                             </rules>
                             <fail>true</fail>
@@ -206,7 +211,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.source}</source>
                     <target>${java.target}</target>
@@ -217,7 +222,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -294,7 +299,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <executions>
                     <execution>
                         <id>shaded-jar</id>
@@ -436,6 +441,10 @@
                             <pattern>org.mariadb.jdbc</pattern>
                             <shadedPattern>fr.xephi.authme.libs.org.mariadb.jdbc</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.github.Anon8281.universalScheduler</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.com.github.Anon8281.universalScheduler</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>com.mysql</pattern>
                             <shadedPattern>fr.xephi.authme.libs.com.mysql</shadedPattern>
@@ -484,7 +493,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
             </plugin>
             <!-- Deploy the jars as artifacts into the remote repository -->
             <plugin>
@@ -519,10 +528,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>lss233-repo</id>
-            <url>https://crystal.app.lss233.com/repositories/minecraft/</url>
-        </repository>
         <repository>
             <id>opencollab-snapshot-main</id>
             <url>https://repo.opencollab.dev/main/</url>
@@ -660,6 +665,7 @@
             <version>2.2.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
         <!-- Jalu Injector -->
         <dependency>
             <groupId>ch.jalu</groupId>
@@ -754,7 +760,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.1.4</version>
+            <version>3.3.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -1071,7 +1077,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.6.0</version>
+            <version>42.7.3</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1118,11 +1124,19 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Universal Scheduler -->
+        <dependency>
+            <groupId>com.github.HomoMC</groupId>
+            <artifactId>UniversalScheduler</artifactId>
+            <version>0.1.7</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- JDBC drivers for datasource integration tests -->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.45.1.0</version>
+            <version>3.45.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -2,8 +2,11 @@ package fr.xephi.authme;
 
 import ch.jalu.injector.Injector;
 import ch.jalu.injector.InjectorBuilder;
+import com.github.Anon8281.universalScheduler.UniversalScheduler;
+import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.command.CommandHandler;
+import fr.xephi.authme.command.TabCompleteHandler;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.DataSourceProvider;
@@ -23,6 +26,7 @@ import fr.xephi.authme.listener.PlayerListener111;
 import fr.xephi.authme.listener.PlayerListener19;
 import fr.xephi.authme.listener.PlayerListener19Spigot;
 import fr.xephi.authme.listener.PlayerListenerHigherThan18;
+import fr.xephi.authme.listener.PurgeListener;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.output.ConsoleLoggerFactory;
@@ -45,7 +49,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitScheduler;
 import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
@@ -55,6 +58,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Scanner;
 import java.util.function.Consumer;
 import java.util.logging.Level;
@@ -75,10 +79,11 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "42";
+    private static String pluginBuildNumber = "45";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
+    private static TaskScheduler scheduler;
     @Inject
     public static Settings settings;
     private DataSource database;
@@ -130,7 +135,12 @@ public class AuthMe extends JavaPlugin {
         return pluginBuildNumber;
     }
 
-
+    /**
+     * Get the scheduler
+     */
+    public static TaskScheduler getScheduler() {
+        return scheduler;
+    }
 
     /**
      * Method called when the server enables the plugin.
@@ -139,6 +149,7 @@ public class AuthMe extends JavaPlugin {
     public void onEnable() {
         // Load the plugin version data from the plugin description file
         loadPluginInfo(getDescription().getVersion());
+        scheduler = UniversalScheduler.getScheduler(this);
 
         // Set the Logger instance and log file path
         ConsoleLogger.initialize(getLogger(), new File(getDataFolder(), LOG_FILENAME));
@@ -197,9 +208,10 @@ public class AuthMe extends JavaPlugin {
                 "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
                 "                                    ");
         }
-        // Successful message
         //detect server brand with classloader
         checkServerType();
+        Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler());
+        Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler());
         logger.info("AuthMeReReloaded is enabled successfully!");
         // Purge on start if enabled
         PurgeService purgeService = injector.getSingleton(PurgeService.class);
@@ -246,7 +258,6 @@ public class AuthMe extends JavaPlugin {
         injector.register(AuthMe.class, this);
         injector.register(Server.class, getServer());
         injector.register(PluginManager.class, getServer().getPluginManager());
-        injector.register(BukkitScheduler.class, getServer().getScheduler());
         injector.provide(DataFolder.class, getDataFolder());
         injector.registerProvider(Settings.class, SettingsProvider.class);
         injector.registerProvider(DataSource.class, DataSourceProvider.class);
@@ -355,6 +366,9 @@ public class AuthMe extends JavaPlugin {
         } else if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
             logger.warning("You are running an 1.13+ minecraft server, advancedShulkerFix won't enable.");
         }
+        if (settings.getProperty(SecuritySettings.PURGE_DATA_ON_QUIT)) {
+            pluginManager.registerEvents(injector.getSingleton(PurgeListener.class), this);
+        }
     }
 
     /**
@@ -391,7 +405,7 @@ public class AuthMe extends JavaPlugin {
         }
 
         // Wait for tasks and close data source
-        new TaskCloser(this, database).run();
+        new TaskCloser(database).run();
 
         // Disabled correctly
         Consumer<String> infoLogMethod = logger == null ? getLogger()::info : logger::info;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package fr.xephi.authme.initialization;
 
+import com.github.Anon8281.universalScheduler.UniversalRunnable;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
@@ -18,7 +19,6 @@ import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import javax.inject.Inject;
 import java.util.List;
@@ -96,7 +96,7 @@ public class OnStartupTasks {
         if (!settings.getProperty(RECALL_PLAYERS)) {
             return;
         }
-        bukkitService.runTaskTimerAsynchronously(new BukkitRunnable() {
+        bukkitService.runTaskTimerAsynchronously(new UniversalRunnable() {
             @Override
             public void run() {
                 List<String> loggedPlayersWithEmptyMail = dataSource.getLoggedPlayersWithEmptyMail();

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

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

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

@@ -3,7 +3,6 @@ package fr.xephi.authme.listener;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
-import fr.xephi.authme.events.RestoreSessionEvent;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
 import fr.xephi.authme.service.BukkitService;
@@ -40,7 +39,7 @@ public class BedrockAutoLoginListener implements Listener {
         return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
         String name = event.getPlayer().getName();
@@ -50,13 +49,4 @@ public class BedrockAutoLoginListener implements Listener {
             messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN);
         }
     }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onPlayerAuthMeSessionRestore(RestoreSessionEvent event) {
-        Player player = event.getPlayer();
-        UUID uuid = player.getUniqueId();
-        if (isBedrockPlayer(uuid)) {
-            event.setCancelled(true);
-        }
-    }
 }

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

@@ -25,13 +25,11 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import javax.inject.Inject;
-import java.io.File;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
@@ -165,10 +163,9 @@ public class GuiCaptchaHandler implements Listener {
                 messages.send(playerunreg, MessageKey.GUI_CAPTCHA_VERIFIED_AUTO_BEDROCK);
                 return;
             }
-            bukkitService.runTask(() -> {
             randomString = sb.toString();
             Random random_blockpos = new Random();
-                AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
+            AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(27));
             Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
             ItemStack item = new ItemStack(captchaMaterial);
             ItemMeta meta = item.getItemMeta();
@@ -242,7 +239,6 @@ public class GuiCaptchaHandler implements Listener {
                     }
                 }, finalTimeOut * 20L);
             }
-            });
         }
     }
 
@@ -255,67 +251,6 @@ public class GuiCaptchaHandler implements Listener {
         }
     }
 
-
-    private void deletePlayerData(UUID playerUUID) {
-        // 获取服务器的存储文件夹路径
-        File serverFolder = Bukkit.getServer().getWorldContainer();
-        String worldFolderName = settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
-        // 构建playerdata文件夹路径
-        File playerDataFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "playerdata");
-
-        // 构建玩家数据文件路径
-        File playerDataFile = new File(playerDataFolder, File.separator + playerUUID + ".dat");
-
-        // 删除玩家数据文件
-        if (playerDataFile.exists()) {
-            playerDataFile.delete();
-        }
-    }
-
-    private void deletePlayerStats(UUID playerUUID) {
-        // 获取服务器的存储文件夹路径
-        File serverFolder = Bukkit.getServer().getWorldContainer();
-        String worldFolderName = settings.getProperty(SecuritySettings.DELETE_PLAYER_DATA_WORLD);
-        // 构建stats文件夹路径
-        File statsFolder = new File(serverFolder, File.separator + worldFolderName + File.separator + "stats");
-        // 构建玩家统计数据文件路径
-        File statsFile = new File(statsFolder, File.separator + playerUUID + ".json");
-        // 删除玩家统计数据文件
-        if (statsFile.exists()) {
-            statsFile.delete();
-        }
-    }
-
-    private void deleteAuthMePlayerData(UUID playerUUID) {
-        File pluginFolder = plugin.getDataFolder();
-        File path = new File(pluginFolder, File.separator + "playerdata" + File.separator + playerUUID);
-        File dataFile = new File(path, File.separator + "data.json");
-        if (dataFile.exists()) {
-            dataFile.delete();
-            path.delete();
-        }
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        String name = player.getName();
-        UUID playerUUID = event.getPlayer().getUniqueId();
-        if (!authmeApi.isRegistered(name)) {
-            if (settings.getProperty(SecuritySettings.DELETE_UNVERIFIED_PLAYER_DATA) && !closeReasonMap.containsKey(player)) {
-                bukkitService.runTaskLater(() -> {
-                    if (!player.isOnline()) {
-                        deletePlayerData(playerUUID);
-                        deletePlayerStats(playerUUID);
-                        deleteAuthMePlayerData(playerUUID);
-                    }
-                }, 100L);
-                return;
-            }
-            closeReasonMap.remove(player);
-        }
-    }
-
     private Material getRandomMaterial() {
         Material[] allMaterials = Material.values();
         Random random = new Random();

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

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

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

@@ -320,7 +320,8 @@ public class PlayerListener implements Listener{
         final Player player = event.getPlayer();
         if (!quickCommandsProtectionManager.isAllowed(player.getName())) {
             event.setCancelled(true);
-            player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK));
+            bukkitService.runTaskIfFolia(player, () -> player.kickPlayer(messages.retrieveSingle(player, MessageKey.QUICK_COMMAND_PROTECTION_KICK)));
+            // AuthMeReReloaded - Folia compatibility
             return;
         }
         if (listenerService.shouldCancelEvent(player)) {

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

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

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

@@ -189,7 +189,9 @@ public class AsynchronousJoin implements AsynchronousProcess {
             if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
                 // Allow infinite blindness effect
                 int blindTimeOut = (registrationTimeout <= 0) ? 99999 : registrationTimeout;
-                player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2));
+
+                // AuthMeReReloaded - Fix potion apply on Folia
+                bukkitService.runTaskIfFolia(player,() -> player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2)));
             }
             commandManager.runCommandsOnJoin(player);
         });

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

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

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

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

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

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

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

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

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

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

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

@@ -27,10 +27,18 @@ public final class SecuritySettings implements SettingsHolder {
         newListProperty("3rdPartyFeature.features.captcha.whiteList");
 
     @Comment({"Should we let Bedrock players login automatically?",
-        "(Requires hookFloodgate to be true & floodgate loaded)"})
+        "(Requires hookFloodgate to be true & floodgate loaded)",
+        "(**THIS IS SAFE DO NOT WORRY**)"})
     public static final Property<Boolean> FORCE_LOGIN_BEDROCK =
         newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
 
+    @Comment("Should we purge data on non-registered players quit?")
+    public static final Property<Boolean> PURGE_DATA_ON_QUIT =
+        newProperty("3rdPartyFeature.features.purgeData.purgeOnQuit", false);
+
+    @Comment("Which world's player data should be deleted?(Enter the world *FOLDER* name where your players first logged in)")
+    public static final Property<String> DELETE_PLAYER_DATA_WORLD =
+        newProperty("3rdPartyFeature.features.purgeData.purgeWorldFolderName", "world");
     @Comment("Enable the new feature to prevent ghost players?")
     public static final Property<Boolean> ANTI_GHOST_PLAYERS =
         newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
@@ -43,7 +51,7 @@ public final class SecuritySettings implements SettingsHolder {
     @Comment({"Choose the best teleport method by server brand?",
         "(Enable this if you are using Paper)"})
     public static final Property<Boolean> SMART_ASYNC_TELEPORT =
-        newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport", false);
+        newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport", true);
 
     @Comment("Send a GUI captcha to unregistered players?(Requires ProtocolLib)")
     public static final Property<Boolean> GUI_CAPTCHA =
@@ -59,14 +67,6 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Boolean> GUI_CAPTCHA_BE_COMPATIBILITY =
         newProperty("3rdPartyFeature.features.captcha.ignoreBedrock", false);
 
-    @Comment("Should we delete player data and stats when they didn't finish the captcha?")
-    public static final Property<Boolean> DELETE_UNVERIFIED_PLAYER_DATA =
-        newProperty("3rdPartyFeature.features.captcha.purgePlayerData", false);
-
-    @Comment("Which world's player data should be deleted?(Enter the world *FOLDER* name where your players first logged in)")
-    public static final Property<String> DELETE_PLAYER_DATA_WORLD =
-        newProperty("3rdPartyFeature.features.captcha.purgeWorldFolderName", "world");
-
     @Comment("Should we fix the location when players logged in the portal?")
     public static final Property<Boolean> LOGIN_LOC_FIX_SUB_PORTAL =
         newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);

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

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

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

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

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

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

src/main/resources/email.html

@@ -102,9 +102,9 @@
                                     <tbody>
                                     <tr>
                                         <td>
-                                            <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
+                                            <p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
                                             <a href="1919810.com" target="_blank"
-                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
+                                               style="text-decoration: none; font-size: 16px">wdsj.in</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/new_email.html

@@ -108,9 +108,9 @@
                                     <tbody>
                                     <tr>
                                         <td>
-                                            <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
+                                            <p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
                                             <a href="1919810.com" target="_blank"
-                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
+                                               style="text-decoration: none; font-size: 16px">wdsj.in</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/plugin.yml

@@ -3,7 +3,8 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b42
+folia-supported: true
+version: 5.6.0-FORK-b45
 api-version: 1.13
 softdepend:
     - Vault

src/main/resources/recovery_code_email.html

@@ -101,9 +101,9 @@
                                     <tbody>
                                     <tr>
                                         <td>
-                                            <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
+                                            <p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
                                             <a href="1919810.com" target="_blank"
-                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
+                                               style="text-decoration: none; font-size: 16px">wdsj.in</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/shutdown.html

@@ -99,9 +99,9 @@
                                     <tbody>
                                     <tr>
                                         <td>
-                                            <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
+                                            <p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
                                             <a href="1919810.com" target="_blank"
-                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
+                                               style="text-decoration: none; font-size: 16px">wdsj.in</a>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/verification_code_email.html

@@ -101,9 +101,9 @@
                                     <tbody>
                                     <tr>
                                         <td>
-                                            <p style="color:#b0adc5;">© 2023 HomoCraft. All rights reserved.</p>
+                                            <p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
                                             <a href="1919810.com" target="_blank"
-                                               style="text-decoration: none; font-size: 16px">wdsj.io</a>
+                                               style="text-decoration: none; font-size: 16px">wdsj.in</a>
                                         </td>
                                     </tr>
                                     </tbody>