Version b43

Patch

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

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"/>
@@ -27,13 +27,14 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
  15. Automatically login for Bedrock players(configurable)
  16. Fix shulker box crash bug on legacy versions(MC 1.13-)
  17. **H2 database support**
- 18. More......
+ 18. **100% compatibility with original authme and extensions**
+ 19. 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)
 
-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

@@ -164,7 +164,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>
@@ -217,7 +217,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 +294,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>
@@ -484,7 +484,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 +519,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 +656,7 @@
             <version>2.2.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
         <!-- Jalu Injector -->
         <dependency>
             <groupId>ch.jalu</groupId>
@@ -754,7 +751,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 +1068,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.6.0</version>
+            <version>42.7.2</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -1122,7 +1119,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.45.0.0</version>
+            <version>3.45.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -75,7 +75,7 @@ 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 = "41";
+    private static String pluginBuildNumber = "43";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
@@ -426,9 +426,7 @@ public class AuthMe extends JavaPlugin {
                 } else {
                     getLogger().log(Level.INFO, "You are running the latest version.");
                 }
-            } catch (IOException e) {
-                String formattedException = ExceptionUtils.formatException(e);
-                getLogger().log(Level.WARNING, "Error occurred while checking updates from GitHub. Reason: " + formattedException);
+            } catch (IOException ignored) {
             }
         });
     }

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/datasource/H2.java

@@ -71,7 +71,7 @@ public class H2 extends AbstractSqlDataSource {
         this.tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
         this.col = new Columns(settings);
         this.con = connection;
-        this.columnsHandler = AuthMeColumnsHandler.createForSqlite(con, settings);
+        this.columnsHandler = AuthMeColumnsHandler.createForH2(con, settings);
     }
 
     /**
@@ -167,7 +167,7 @@ public class H2 extends AbstractSqlDataSource {
 
             if (isColumnMissing(md, col.EMAIL)) {
                 st.executeUpdate("ALTER TABLE " + tableName
-                    + " ADD COLUMN IF NOT EXISTS " + col.EMAIL + " VARCHAR(255);");
+                    + " ADD COLUMN IF NOT EXISTS " + col.EMAIL + " VARCHAR_IGNORECASE(255);");
             }
 
             if (isColumnMissing(md, col.IS_LOGGED)) {

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

@@ -51,6 +51,26 @@ public final class AuthMeColumnsHandler {
         return new AuthMeColumnsHandler(sqlColHandler);
     }
 
+    /**
+     * Creates a column handler for H2.
+     *
+     * @param connection the connection to the database
+     * @param settings plugin settings
+     * @return created column handler
+     */
+    public static AuthMeColumnsHandler createForH2(Connection connection, Settings settings) {
+        ColumnContext columnContext = new ColumnContext(settings, false);
+        String tableName = settings.getProperty(DatabaseSettings.MYSQL_TABLE);
+        String nameColumn = settings.getProperty(DatabaseSettings.MYSQL_COL_NAME);
+
+        SqlColumnsHandler<ColumnContext, String> sqlColHandler = new SqlColumnsHandler<>(
+            forSingleConnection(connection, tableName, nameColumn, columnContext)
+                .setPredicateSqlGenerator(new PredicateSqlGenerator<>(columnContext, false))
+        );
+        return new AuthMeColumnsHandler(sqlColHandler);
+    }
+
+
     /**
      * Creates a column handler for MySQL.
      *

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

@@ -76,6 +76,7 @@ public class GuiCaptchaHandler implements Listener {
     String randomString = "";
     Random randomItemSet = new Random();
     Random howManyRandom = new Random();
+    private Material captchaMaterial = getRandomMaterial();
 
 
     private boolean isPacketListenersActive = false;
@@ -108,11 +109,11 @@ public class GuiCaptchaHandler implements Listener {
         if (event.getWhoClicked() instanceof Player) {
             Player player = (Player) event.getWhoClicked();
             ItemStack currentItem = event.getCurrentItem();
-            if (!authmeApi.isRegistered(player.getName()) && !closeReasonMap.containsKey(player)) {
+            if (!authmeApi.isRegistered(player.getName())) {
                 if (isBedrockPlayer(player.getUniqueId())) {
                     return;
                 }
-                if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)) {
+                if (currentItem != null && currentItem.getType().equals(captchaMaterial)) {
                     event.setCancelled(true);
                     if (!closeReasonMap.containsKey(player)) {
                         closeReasonMap.put(player, "verified");
@@ -169,7 +170,7 @@ public class GuiCaptchaHandler implements Listener {
                 Random random_blockpos = new Random();
                 AtomicInteger random_num = new AtomicInteger(random_blockpos.nextInt(26));
                 Inventory menu = Bukkit.createInventory(playerunreg, 27, messages.retrieveSingle(playerunreg, MessageKey.GUI_CAPTCHA_WINDOW_NAME, randomString));
-                ItemStack item = new ItemStack(Material.REDSTONE_BLOCK);
+                ItemStack item = new ItemStack(captchaMaterial);
                 ItemMeta meta = item.getItemMeta();
                 try {
                     if (meta != null) {
@@ -314,6 +315,12 @@ public class GuiCaptchaHandler implements Listener {
             closeReasonMap.remove(player);
         }
     }
+
+    private Material getRandomMaterial() {
+        Material[] allMaterials = Material.values();
+        Random random = new Random();
+        return allMaterials[random.nextInt(allMaterials.length)];
+    }
 }
 
 

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ 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-b41
+version: 5.6.0-FORK-b43
 api-version: 1.13
 softdepend:
     - Vault