From 20f0bb198431647d03775bbdb4002b46c9cd44a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MC=7E=E8=9B=9F=E9=BE=99?= <1610105206@qq.com> Date: Thu, 11 Jul 2024 21:41:17 +0800 Subject: [PATCH] create ExternalSettings then move BCRYPT_LOG2_ROUND to it (fix build work 4) --- .../settings/properties/HooksSettings.java | 4 ---- .../settings/properties/ExternalSettings.java | 21 +++++++++++++++++++ .../xephi/authme/security/crypts/BCrypt.java | 4 ++-- .../xephi/authme/util/expiring/Duration.java | 0 .../authme/util/expiring/ExpiringMap.java | 0 .../authme/util/expiring/ExpiringSet.java | 0 .../authme/util/expiring/TimedCounter.java | 0 7 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 project/module-common/src/main/java/fr/xephi/authme/settings/properties/ExternalSettings.java rename {plugin/platform-bukkit => project/module-util}/src/main/java/fr/xephi/authme/util/expiring/Duration.java (100%) rename {plugin/platform-bukkit => project/module-util}/src/main/java/fr/xephi/authme/util/expiring/ExpiringMap.java (100%) rename {plugin/platform-bukkit => project/module-util}/src/main/java/fr/xephi/authme/util/expiring/ExpiringSet.java (100%) rename {plugin/platform-bukkit => project/module-util}/src/main/java/fr/xephi/authme/util/expiring/TimedCounter.java (100%) diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java b/plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java index b464c274..e61d710a 100644 --- a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java +++ b/plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java @@ -62,10 +62,6 @@ public final class HooksSettings implements SettingsHolder { public static final Property> MYSQL_OTHER_USERNAME_COLS = newListProperty("ExternalBoardOptions.mySQLOtherUsernameColumns"); - @Comment("How much log2 rounds needed in BCrypt (do not change if you do not know what it does)") - public static final Property BCRYPT_LOG2_ROUND = - newProperty("ExternalBoardOptions.bCryptLog2Round", 12); - @Comment("phpBB table prefix defined during the phpBB installation process") public static final Property PHPBB_TABLE_PREFIX = newProperty("ExternalBoardOptions.phpbbTablePrefix", "phpbb_"); diff --git a/project/module-common/src/main/java/fr/xephi/authme/settings/properties/ExternalSettings.java b/project/module-common/src/main/java/fr/xephi/authme/settings/properties/ExternalSettings.java new file mode 100644 index 00000000..ff7bf37d --- /dev/null +++ b/project/module-common/src/main/java/fr/xephi/authme/settings/properties/ExternalSettings.java @@ -0,0 +1,21 @@ +package fr.xephi.authme.settings.properties; + +import ch.jalu.configme.Comment; +import ch.jalu.configme.SettingsHolder; +import ch.jalu.configme.properties.Property; + +import static ch.jalu.configme.properties.PropertyInitializer.newProperty; + +/** + * ExternalSettings + * + * @author TheFloodDragon + * @since 2024/7/11 21:39 + */ +public final class ExternalSettings implements SettingsHolder { + + @Comment("How much log2 rounds needed in BCrypt (do not change if you do not know what it does)") + public static final Property BCRYPT_LOG2_ROUND = + newProperty("ExternalBoardOptions.bCryptLog2Round", 12); + +} diff --git a/project/module-security/src/main/java/fr/xephi/authme/security/crypts/BCrypt.java b/project/module-security/src/main/java/fr/xephi/authme/security/crypts/BCrypt.java index 5b75c89a..e795482d 100644 --- a/project/module-security/src/main/java/fr/xephi/authme/security/crypts/BCrypt.java +++ b/project/module-security/src/main/java/fr/xephi/authme/security/crypts/BCrypt.java @@ -2,7 +2,7 @@ package fr.xephi.authme.security.crypts; import at.favre.lib.crypto.bcrypt.BCrypt.Version; import fr.xephi.authme.settings.Settings; -import fr.xephi.authme.settings.properties.HooksSettings; +import fr.xephi.authme.settings.properties.ExternalSettings; import javax.inject.Inject; @@ -17,7 +17,7 @@ public class BCrypt extends BCryptBasedHash { } private static BCryptHasher createHasher(Settings settings) { - int bCryptLog2Rounds = settings.getProperty(HooksSettings.BCRYPT_LOG2_ROUND); + int bCryptLog2Rounds = settings.getProperty(ExternalSettings.BCRYPT_LOG2_ROUND); return new BCryptHasher(Version.VERSION_2A, bCryptLog2Rounds); } } diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/Duration.java b/project/module-util/src/main/java/fr/xephi/authme/util/expiring/Duration.java similarity index 100% rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/Duration.java rename to project/module-util/src/main/java/fr/xephi/authme/util/expiring/Duration.java diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/ExpiringMap.java b/project/module-util/src/main/java/fr/xephi/authme/util/expiring/ExpiringMap.java similarity index 100% rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/ExpiringMap.java rename to project/module-util/src/main/java/fr/xephi/authme/util/expiring/ExpiringMap.java diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/ExpiringSet.java b/project/module-util/src/main/java/fr/xephi/authme/util/expiring/ExpiringSet.java similarity index 100% rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/ExpiringSet.java rename to project/module-util/src/main/java/fr/xephi/authme/util/expiring/ExpiringSet.java diff --git a/plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/TimedCounter.java b/project/module-util/src/main/java/fr/xephi/authme/util/expiring/TimedCounter.java similarity index 100% rename from plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/expiring/TimedCounter.java rename to project/module-util/src/main/java/fr/xephi/authme/util/expiring/TimedCounter.java