Merge branch 'multipaper' into mp-pr

README.md

@@ -1,49 +1 @@
-# AuthMeReReloaded
-**"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
-
-![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"/>
-  <img src="https://img.shields.io/github/repo-size/HaHaWTH/AuthMeReReloaded.svg" alt="GitHub repo size"/>
-  <img src="https://www.codefactor.io/repository/github/hahawth/authmerereloaded/badge" alt="CodeFactor" />
-  <img src="https://img.shields.io/github/downloads/HaHaWTH/AuthMeReReloaded/total" alt="Downloads" />
-</p>
-
-**Detailed Changes:**
- 1. Improved mail sending logic & support more emails
- 2. Shutdown mail sending(When server is closed, email you)
- 3. Legacy bug fixes
- 4. Anti Ghost Player(Doubled login bug)
- 5. Use the best performance method by server brand
- 6. Bedrock Compatibility(Floodgate needed)(based on UUID)
- 7. Update checker
- 8. Integrated GUI Captcha feature(Bedrock compatibility & ProtocolLib needed)(70% Asynchronous)
- 9. Improved listeners
- 10. Player login logic improvement to reduce lag
- 11. Automatically purge bot data
- 12. **Folia support (in active testing)**
- 13. Offhand Menu compatibility(Thats amazing)
- 14. Automatically fix portal stuck issue
- 15. Automatically login for Bedrock players(configurable)
- 16. Fix shulker box crash bug on legacy versions(MC 1.13-)
- 17. **H2 database support**
- 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)
-
-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!**
-
-<picture>
-  <source
-    media="(prefers-color-scheme: dark)"
-    srcset="
-      https://api.star-history.com/svg?repos=HaHaWTH/AuthMeReReloaded&type=Date&theme=dark
-    "
-  />
-  <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=HaHaWTH/AuthMeReReloaded&type=Date" />
-</picture>
+**This branch adds MultiPaper support, requires Java 17 or higher**

pom.xml

@@ -441,6 +441,10 @@
                                     <pattern>com.github.benmanes.caffeine</pattern>
                                     <shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.github.puregero.multilib</pattern>
+                                    <shadedPattern>fr.xephi.authme.libs.com.github.puregero.multilib</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
@@ -671,6 +675,12 @@
             </snapshots>
         </repository>
 
+        <!-- MultiLib -->
+        <repository>
+            <id>clojars</id>
+            <url>https://repo.clojars.org</url>
+        </repository>
+
         <!-- ProtocolLib Repo -->
         <repository>
             <id>dmulloy2-repo-releases</id>
@@ -1218,6 +1228,14 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- MultiLib -->
+        <dependency>
+            <groupId>com.github.puregero</groupId>
+            <artifactId>multilib</artifactId>
+            <version>1.1.13</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- JDBC drivers for datasource integration tests -->
         <dependency>
             <groupId>org.xerial</groupId>

src/main/java/fr/xephi/authme/datasource/H2.java

@@ -29,7 +29,7 @@ import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
 /**
  * H2 data source.
  */
-@SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore
+@SuppressWarnings({"all"}) // Justification: Class name cannot be changed anymore
 public class H2 extends AbstractSqlDataSource {
 
     private final ConsoleLogger logger = ConsoleLoggerFactory.get(H2.class);

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

@@ -1,5 +1,6 @@
 package fr.xephi.authme.listener;
 
+import com.github.puregero.multilib.MultiLib;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.data.auth.PlayerCache;
@@ -81,7 +82,11 @@ class ListenerService implements SettingsDependent {
      */
 
     public boolean shouldCancelEvent(Player player) {
-
+        if (MultiLib.isMultiPaper()) {
+            if (MultiLib.isExternalPlayer(player)) {
+                return false;
+            }
+        }
         return player != null && !checkAuth(player.getName()) && !PlayerUtils.isNpc(player);
     }
     public boolean shouldCancelInvEvent(Player player) {