From 36654416db643922895d7e5383d81c7c8f0af6f9 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 22:11:25 +0800
Subject: [PATCH] Done.

---
 .../main/java/fr/xephi/authme/settings/Settings.java  | 11 +++++------
 project/module-logger/build.gradle.kts                |  2 +-
 .../src/main/resources/{email-formats => }/email.html |  0
 .../main/resources/{email-formats => }/new_email.html |  0
 .../{email-formats => }/recovery_code_email.html      |  0
 .../resources/{email-formats => }/shutdown_email.html |  0
 .../{email-formats => }/verification_code_email.html  |  0
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename project/module-mail/src/main/resources/{email-formats => }/email.html (100%)
 rename project/module-mail/src/main/resources/{email-formats => }/new_email.html (100%)
 rename project/module-mail/src/main/resources/{email-formats => }/recovery_code_email.html (100%)
 rename project/module-mail/src/main/resources/{email-formats => }/shutdown_email.html (100%)
 rename project/module-mail/src/main/resources/{email-formats => }/verification_code_email.html (100%)

diff --git a/project/module-common/src/main/java/fr/xephi/authme/settings/Settings.java b/project/module-common/src/main/java/fr/xephi/authme/settings/Settings.java
index 799aefd1..bff6d35d 100644
--- a/project/module-common/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/project/module-common/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -78,12 +78,11 @@ public class Settings extends SettingsManagerImpl {
     }
 
     private void loadSettingsFromFiles() {
-        File emailFolder = new File(pluginFolder, "email-formats");
-        newPasswordEmailMessage = readFile(emailFolder, "new_email.html");
-        passwordEmailMessage = readFile(emailFolder, "email.html");
-        verificationEmailMessage = readFile(emailFolder, "verification_code_email.html");
-        recoveryCodeEmailMessage = readFile(emailFolder, "recovery_code_email.html");
-        shutdownEmailMessage = readFile(emailFolder, "shutdown_email.html");
+        newPasswordEmailMessage = readFile("new_email.html");
+        passwordEmailMessage = readFile("email.html");
+        verificationEmailMessage = readFile("verification_code_email.html");
+        recoveryCodeEmailMessage = readFile("recovery_code_email.html");
+        shutdownEmailMessage = readFile("shutdown_email.html");
         String country = readFile("GeoLite2-Country.mmdb");
     }
 
diff --git a/project/module-logger/build.gradle.kts b/project/module-logger/build.gradle.kts
index f6fd805d..89103a9d 100644
--- a/project/module-logger/build.gradle.kts
+++ b/project/module-logger/build.gradle.kts
@@ -2,5 +2,5 @@ dependencies {
     compileOnly(project(":project:module-util"))
     compileOnly(libs.guava)
     // Log4J Logger (required by the console filter)
-    compileOnly(rootProject.libs.apache.logging.log4j.core) // Log4J version bundled in 1.12.2
+    compileOnly(libs.apache.logging.log4j.core) // Log4J version bundled in 1.12.2
 }
\ No newline at end of file
diff --git a/project/module-mail/src/main/resources/email-formats/email.html b/project/module-mail/src/main/resources/email.html
similarity index 100%
rename from project/module-mail/src/main/resources/email-formats/email.html
rename to project/module-mail/src/main/resources/email.html
diff --git a/project/module-mail/src/main/resources/email-formats/new_email.html b/project/module-mail/src/main/resources/new_email.html
similarity index 100%
rename from project/module-mail/src/main/resources/email-formats/new_email.html
rename to project/module-mail/src/main/resources/new_email.html
diff --git a/project/module-mail/src/main/resources/email-formats/recovery_code_email.html b/project/module-mail/src/main/resources/recovery_code_email.html
similarity index 100%
rename from project/module-mail/src/main/resources/email-formats/recovery_code_email.html
rename to project/module-mail/src/main/resources/recovery_code_email.html
diff --git a/project/module-mail/src/main/resources/email-formats/shutdown_email.html b/project/module-mail/src/main/resources/shutdown_email.html
similarity index 100%
rename from project/module-mail/src/main/resources/email-formats/shutdown_email.html
rename to project/module-mail/src/main/resources/shutdown_email.html
diff --git a/project/module-mail/src/main/resources/email-formats/verification_code_email.html b/project/module-mail/src/main/resources/verification_code_email.html
similarity index 100%
rename from project/module-mail/src/main/resources/email-formats/verification_code_email.html
rename to project/module-mail/src/main/resources/verification_code_email.html