.github/workflows/maven.yml

@@ -41,7 +41,7 @@ jobs:
             javaVersion: '17'
           - mcVersion: '1.20.4'
             javaVersion: '21'
-          - mcVersion: '1.21.1'
+          - mcVersion: '1.21'
             javaVersion: '21'
     steps:        
       - uses: HaHaWTH/minecraft-plugin-runtime-test@paper

README.md

@@ -27,19 +27,22 @@
  10. Player login logic improvement to reduce lag
  11. Automatically purge bot data
  12. **Folia support (in active testing)**
- 13. **Velocity support (See [Velocity Support](./vc-support.md))**
+ 13. Offhand Menu compatibility(Thats amazing)
- 14. Support Virtual Threads caching
+ 14. **Velocity support (See [Velocity Support](./vc-support.md))**
- 15. Automatically fix portal stuck issue
+ 15. Support Virtual Threads caching
- 16. Automatically login for Bedrock players(configurable)
+ 16. Automatically fix portal stuck issue
- 17. Fix shulker box crash bug on legacy versions(MC 1.13-)
+ 17. Automatically login for Bedrock players(configurable)
- 18. **H2 database support**
+ 18. Fix shulker box crash bug on legacy versions(MC 1.13-)
- 19. **100% compatibility with original authme and extensions**
+ 19. **H2 database support**
- 20. More......
+ 20. **100% compatibility with original authme and extensions**
+ 21. More......
 
 **Download links:**
 [Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
 [Actions(Dev builds, use at your own risk!)](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
 
+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!**
 
 ## License

pom.xml

@@ -67,7 +67,7 @@
         <maven.minimumVersion>3.6.3</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
@@ -111,7 +111,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.11.1</version>
+                    <version>3.7.0</version>
                     <configuration>
                         <failOnError>false</failOnError>
                         <failOnWarnings>false</failOnWarnings>
@@ -497,19 +497,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>3.1.3</version>
+                <version>3.1.2</version>
             </plugin>
             <!-- Deploy the jars as artifacts into the remote repository -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.3</version>
+                <version>3.1.2</version>
             </plugin>
             <!-- Handle documentation generation, required by other plugins -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.21.0</version>
+                <version>3.12.1</version>
             </plugin>
             <!-- Publish coveralls test coverage reports, not included in the build cycle by default -->
             <plugin>
@@ -631,9 +631,8 @@
 
         <!-- Multiverse Repo -->
         <repository>
-            <id>multiverse-multiverse-releases</id>
+            <id>onarandombox-repo-releases</id>
-            <name>Multiverse Repository</name>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse/</url>
-            <url>https://repo.onarandombox.com/multiverse-releases</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -641,6 +640,22 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>onarandombox-repo-snapshots</id>
+            <url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+
+        <!-- FoliaLib -->
+        <repository>
+            <id>devmart-other</id>
+            <url>https://nexuslite.gcnt.net/repos/other/</url>
+        </repository>
 
         <repository>
             <id>opencollab-snapshot</id>
@@ -886,7 +901,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.4</version>
+            <version>4.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
@@ -969,8 +984,8 @@
         <!-- Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/ -->
         <dependency>
             <groupId>com.onarandombox.multiversecore</groupId>
-            <artifactId>multiverse-core</artifactId>
+            <artifactId>Multiverse-Core</artifactId>
-            <version>4.3.14</version>
+            <version>4.3.1</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>
@@ -1127,7 +1142,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.48.0</version>
+            <version>3.45.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -1143,7 +1158,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.47.1.0</version>
+            <version>3.46.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -76,7 +76,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.7.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "53";
+    private static String pluginBuildNumber = "52";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;

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

@@ -15,6 +15,8 @@ import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
 
 import javax.inject.Inject;
 import java.time.Instant;
@@ -24,6 +26,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
+import static fr.xephi.authme.listener.PlayerListener.PENDING_INVENTORIES;
+
 /**
  * The current API of AuthMe.
  *
@@ -257,6 +261,18 @@ public class AuthMeApi {
         return dataSource.saveAuth(auth);
     }
 
+    /**
+     * Open an inventory for the given player at any time.
+     *
+     * @param player The player to open the inventory for
+     * @param inventory The inventory to open
+     * @return The inventory view
+     */
+    public InventoryView openInventory(Player player, Inventory inventory) {
+        PENDING_INVENTORIES.add(inventory);
+        return player.openInventory(inventory);
+    }
+
     /**
      * Force a player to login, i.e. the player is logged in without needing his password.
      *

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

@@ -8,7 +8,6 @@ import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.service.ValidationService.ValidationResult;
-import fr.xephi.authme.settings.properties.SecuritySettings;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -43,15 +42,12 @@ public class ChangePasswordCommand extends PlayerCommand {
             commonService.send(player, MessageKey.NOT_LOGGED_IN);
             return;
         }
-
-        if (commonService.getProperty(SecuritySettings.CHANGE_PASSWORD_EMAIL_VERIFICATION_REQUIRED)) {
         // 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);

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

@@ -52,9 +52,12 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -95,6 +98,8 @@ public class PlayerListener implements Listener {
     @Inject
     private QuickCommandsProtectionManager quickCommandsProtectionManager;
 
+    public static List<Inventory> PENDING_INVENTORIES = new ArrayList<>();
+
     // Lowest priority to apply fast protection checks
     @EventHandler(priority = EventPriority.LOWEST)
     public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) {
@@ -495,6 +500,17 @@ public class PlayerListener implements Listener {
         }
     }
 
+    private boolean isInventoryOpenedByApi(Inventory inventory) {
+        if (inventory == null) {
+            return false;
+        }
+        if (PENDING_INVENTORIES.contains(inventory)) {
+            PENDING_INVENTORIES.remove(inventory);
+            return true;
+        } else {
+            return false;
+        }
+    }
     @SuppressWarnings("all")
     private boolean isInventoryWhitelisted(InventoryView inventory) {
         if (inventory == null) {
@@ -521,7 +537,8 @@ public class PlayerListener implements Listener {
     public void onPlayerInventoryOpen(InventoryOpenEvent event) {
         final HumanEntity player = event.getPlayer();
         if (listenerService.shouldCancelEvent(player)
-            && !isInventoryWhitelisted(event.getView())) {
+            && !isInventoryWhitelisted(event.getView())
+            && !isInventoryOpenedByApi(event.getInventory())) {
             event.setCancelled(true);
 
             /*
@@ -539,4 +556,12 @@ public class PlayerListener implements Listener {
             event.setCancelled(true);
         }
     }
+//    @EventHandler(priority = EventPriority.LOWEST)
+//    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+//        Player player = event.getPlayer();
+//        if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
+//            return;
+//        event.setCancelled(true);
+//        Bukkit.dispatchCommand(event.getPlayer(), "help");
+//    }
 }

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

@@ -1,10 +1,14 @@
 package fr.xephi.authme.listener;
 
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.PluginSettings;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
 import javax.inject.Inject;
 
@@ -22,4 +26,12 @@ public class PlayerListenerHigherThan18 implements Listener {
         }
     }
 
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onSwitchHand(PlayerSwapHandItemsEvent event) {
+        Player player = event.getPlayer();
+        if (player.isSneaking() && player.hasPermission("keybindings.use") && settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
+            event.setCancelled(true);
+            Bukkit.dispatchCommand(event.getPlayer(), "help");
+        }
+    }
 }

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

@@ -29,7 +29,7 @@ public class ProcessSyncPlayerQuit implements SynchronousProcess {
         } else {
             limboService.restoreData(player);
             if (!UniversalScheduler.isFolia) { // AuthMeReReloaded - Fix #146 (Very stupid solution, but works)
-                // player.saveData(); // #1238: Speed is sometimes not restored properly
+                player.saveData(); // #1238: Speed is sometimes not restored properly
             }
         }
         player.leaveVehicle();

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

@@ -15,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class AuthMeExpansion extends PlaceholderExpansion {
     private final Settings settings = AuthMe.settings;
+    private final AuthMeApi authMeApi = AuthMeApi.getInstance();
     @Override
     public @NotNull String getIdentifier() {
         return "authme";
@@ -38,8 +39,6 @@ public class AuthMeExpansion extends PlaceholderExpansion {
     @Override
     public String onRequest(OfflinePlayer player, @NotNull String params) {
         if (!settings.getProperty(HooksSettings.PLACEHOLDER_API)) return null;
-        AuthMeApi authMeApi = AuthMeApi.getInstance();
-        if (authMeApi == null) return null;
         if (params.equalsIgnoreCase("version")) {
             return getVersion();
         }

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

@@ -17,7 +17,7 @@ public final class HooksSettings implements SettingsHolder {
 
     @Comment("Do we need to hook with PlaceholderAPI for AuthMe placeholders?")
     public static final Property<Boolean> PLACEHOLDER_API =
-        newProperty("Hooks.placeholderapi", false);
+        newProperty("Hooks.placeholderapi", true);
 
     @Comment("Do we need to hook with BungeeCord?")
     public static final Property<Boolean> BUNGEECORD =

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

@@ -11,6 +11,13 @@ import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseString
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
 public final class PluginSettings implements SettingsHolder {
+    @Comment({
+        "Should we execute /help command when unregistered players press Shift+F?",
+        "This keeps compatibility with some menu plugins",
+        "If you are using TrMenu, don't enable this because TrMenu already implemented this."
+    })
+    public static final Property<Boolean> MENU_UNREGISTER_COMPATIBILITY =
+        newProperty("3rdPartyFeature.compatibility.menuPlugins", false);
 
     @Comment({
         "Send i18n messages to player based on their client settings, this option will override `settings.messagesLanguage`",

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

@@ -173,7 +173,7 @@ public final class RestrictionSettings implements SettingsHolder {
 
     @Comment("Regex syntax for allowed chars in email.")
     public static final Property<String> ALLOWED_EMAIL_REGEX =
-        newProperty("settings.restrictions.allowedEmailCharacters", "^([a-zA-Z0-9_.+-]+)@([a-zA-Z0-9-]+)\\.([a-zA-Z]{2,})$");
+        newProperty("settings.restrictions.allowedEmailCharacters", "^[A-Za-z0-9_.]{3,20}@(qq|outlook|163|gmail|icloud)\\.com$");
 
 
     @Comment("Force survival gamemode when player joins?")

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

@@ -62,11 +62,6 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Integer> HAVE_I_BEEN_PWNED_LIMIT =
         newProperty("Security.account.haveIBeenPwned.limit", 0);
 
-    @Comment({"Require email verification when changing password if email feature enabled.",
-        "Original behavior is true"})
-    public static final Property<Boolean> CHANGE_PASSWORD_EMAIL_VERIFICATION_REQUIRED =
-        newProperty("Security.account.emailVerification.required", true);
-
     @Comment("Enable captcha when a player uses wrong password too many times")
     public static final Property<Boolean> ENABLE_LOGIN_FAILURE_CAPTCHA =
         newProperty("Security.captcha.useCaptcha", false);

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

@@ -1,13 +1,10 @@
 package fr.xephi.authme.task;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
+import java.util.Scanner;
 
 public class Updater {
     private final String currentVersion;
@@ -35,16 +32,14 @@ public class Updater {
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setConnectTimeout(10000);
             conn.setReadTimeout(10000);
-            conn.setRequestMethod("GET");
+            Scanner scanner = new Scanner(conn.getInputStream());
-            conn.setRequestProperty("Accept", "application/vnd.github+json");
+            String response = scanner.useDelimiter("\\Z").next();
-            try (InputStreamReader reader = new InputStreamReader(conn.getInputStream())) {
+            scanner.close();
-                JsonObject jsonObject = new JsonParser().parse(reader).getAsJsonObject();
+            String latestVersion = response.substring(response.indexOf("tag_name") + 11);
-                String latest = jsonObject.get("tag_name").getAsString();
+            latestVersion = latestVersion.substring(0, latestVersion.indexOf("\""));
-                latestVersion = latest;
+            this.latestVersion = latestVersion;
-                isUpdateAvailable = !currentVersion.equals(latest);
+            isUpdateAvailable = !currentVersion.equals(latestVersion);
-                reader.close();
             return isUpdateAvailable;
-            }
         } catch (IOException ignored) {
             this.latestVersion = null;
             isUpdateAvailable = false;

src/main/resources/email.html

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

src/main/resources/new_email.html

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

src/main/resources/plugin.yml

@@ -7,7 +7,7 @@ description: A fork of AuthMeReloaded that contains bug fixes
 # noinspection YAMLSchemaValidation
 main: ${pluginDescription.main}
 folia-supported: true
-version: 5.7.0-FORK-b53
+version: 5.7.0-FORK-b52
 api-version: 1.13
 softdepend:
     - Vault

src/main/resources/recovery_code_email.html

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

src/main/resources/shutdown.html

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

src/main/resources/verification_code_email.html

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