diff --git a/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java b/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java index e711f839..d06f2b61 100644 --- a/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java +++ b/src/main/java/fr/xephi/authme/listener/BedrockAutoLoginListener.java @@ -3,6 +3,8 @@ package fr.xephi.authme.listener; import fr.xephi.authme.AuthMe; import fr.xephi.authme.api.v3.AuthMeApi; +import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.message.Messages; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.settings.properties.HooksSettings; import fr.xephi.authme.settings.properties.SecuritySettings; @@ -23,6 +25,8 @@ public class BedrockAutoLoginListener implements Listener { private BukkitService bukkitService; @Inject private AuthMe plugin; + @Inject + private Messages messages; public BedrockAutoLoginListener() { @@ -39,7 +43,7 @@ public class BedrockAutoLoginListener implements Listener { UUID uuid = event.getPlayer().getUniqueId(); if (isBedrockPlayer(uuid) && !authmeApi.isAuthenticated(player) && authmeApi.isRegistered(name)) { authmeApi.forceLogin(player); - player.sendMessage("§a基岩版自动登录完成!"); + messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN); } } diff --git a/src/main/java/fr/xephi/authme/listener/DoubleLoginFixListener.java b/src/main/java/fr/xephi/authme/listener/DoubleLoginFixListener.java index 6749bfc7..f10b6af6 100644 --- a/src/main/java/fr/xephi/authme/listener/DoubleLoginFixListener.java +++ b/src/main/java/fr/xephi/authme/listener/DoubleLoginFixListener.java @@ -14,7 +14,6 @@ public class DoubleLoginFixListener implements Listener { public DoubleLoginFixListener() { } - @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { Collection PlayerList = Bukkit.getServer().getOnlinePlayers(); diff --git a/src/main/java/fr/xephi/authme/message/MessageKey.java b/src/main/java/fr/xephi/authme/message/MessageKey.java index 0c5c6fb0..052a8d9d 100644 --- a/src/main/java/fr/xephi/authme/message/MessageKey.java +++ b/src/main/java/fr/xephi/authme/message/MessageKey.java @@ -4,6 +4,11 @@ package fr.xephi.authme.message; * Keys for translatable messages managed by {@link Messages}. */ public enum MessageKey { + /** + * Bedrock auto login success! + */ + BEDROCK_AUTO_LOGGED_IN("bedrock_auto_login.success"), + /** * %random Verification */ diff --git a/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java b/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java index bd81e6ed..0e267665 100644 --- a/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java +++ b/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java @@ -150,6 +150,7 @@ public class MessageUpdater { .put("time", "Time units") .put("two_factor", "Two-factor authentication") .put("gui_captcha", "3rd party features: GUI Captcha") + .put("bedrock_auto_login", "3rd party features: Bedrock Auto Login") .build(); Set addedKeys = new HashSet<>(); diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 26a12cf1..8a74d646 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -166,3 +166,7 @@ gui_captcha: denied_message_sending: '&cPlease be verified before chatting!' kick_on_failed: '&cPlease complete the verification!' kick_on_timeout: '&cVerification timed out!' + +# 3rd party features: Bedrock Auto Login +bedrock_auto_login: + success: '&aBedrock auto login success!' diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml index 91845f62..aa8c394c 100644 --- a/src/main/resources/messages/messages_zhcn.yml +++ b/src/main/resources/messages/messages_zhcn.yml @@ -175,3 +175,7 @@ gui_captcha: denied_message_sending: '&c请先完成验证再聊天!' kick_on_failed: '&c请先完成验证!' kick_on_timeout: '&c验证超时' + +# 3rd party features: Bedrock Auto Login +bedrock_auto_login: + success: "&a基岩版自动登录完成"