From bf6de0e161e45083ce8b66a91ee45c0fa36e777c Mon Sep 17 00:00:00 2001 From: HaHaWTH Date: Fri, 29 Mar 2024 13:10:18 +0800 Subject: [PATCH 1/3] Multipaper support --- pom.xml | 18 ++++++++++++++++++ .../java/fr/xephi/authme/datasource/H2.java | 2 +- .../xephi/authme/listener/ListenerService.java | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2403084d..141bd2a9 100644 --- a/pom.xml +++ b/pom.xml @@ -395,6 +395,10 @@ com.github.benmanes.caffeine fr.xephi.authme.libs.com.github.benmanes.caffeine + + com.github.puregero.multilib + fr.xephi.authme.libs.com.github.puregero.multilib + @@ -625,6 +629,12 @@ + + + clojars + https://repo.clojars.org + + dmulloy2-repo-releases @@ -1172,6 +1182,14 @@ compile + + + com.github.puregero + multilib + 1.1.13 + compile + + org.xerial diff --git a/src/main/java/fr/xephi/authme/datasource/H2.java b/src/main/java/fr/xephi/authme/datasource/H2.java index 94b28f58..161fd1c2 100644 --- a/src/main/java/fr/xephi/authme/datasource/H2.java +++ b/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); diff --git a/src/main/java/fr/xephi/authme/listener/ListenerService.java b/src/main/java/fr/xephi/authme/listener/ListenerService.java index 073b3975..81615d98 100644 --- a/src/main/java/fr/xephi/authme/listener/ListenerService.java +++ b/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) { From a035ba0a4bca55b95d4ada4078c5941e539a53cd Mon Sep 17 00:00:00 2001 From: DGun Otto Date: Fri, 29 Mar 2024 13:12:29 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 49 +------------------------------------------------ 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/README.md b/README.md index 0e4b8af1..61ee6440 100644 --- a/README.md +++ b/README.md @@ -1,48 +1 @@ -# AuthMeReReloaded -**"A fork of the best authentication plugin for the Bukkit modding API!⭐"** - -![Graph](https://bstats.org/signatures/bukkit/AuthMeReloaded-Fork.svg) -

- Code size - GitHub repo size - CodeFactor -

- -**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 compatibility (Still WIP) - 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!** - - - - Star History Chart - +**This version adds multipaper support, requires Java17 or higher.** From b5a8df2c4ee26c26609f54c894f6534a653c2976 Mon Sep 17 00:00:00 2001 From: DGun Otto Date: Sat, 30 Mar 2024 16:13:55 +0800 Subject: [PATCH 3/3] [ci skip] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61ee6440..8b137891 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -**This version adds multipaper support, requires Java17 or higher.** +