Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code style

Browse Source
This commit is contained in:
Dreeam 2024-05-29 22:55:19 +08:00
parent 7301a22d44
commit 0c10cb0ead
No known key found for this signature in database
GPG Key ID: 0998F8AFD8F667AB
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/fr/xephi/authme/message/Messages.java
View File

@ -121,7 +121,9 @@ public class Messages {
* @return The message from the file * @return The message from the file
*/ */
private String retrieveMessage(MessageKey key, CommandSender sender) { private String retrieveMessage(MessageKey key, CommandSender sender) {
String locale = I18NUtils.getLocale(sender); String locale = sender instanceof Player
? I18NUtils.getLocale((Player) sender)
: null;
String message = messagesFileHandler.getMessageByLocale(key.getKey(), locale); String message = messagesFileHandler.getMessageByLocale(key.getKey(), locale);
String displayName = sender.getName(); String displayName = sender.getName();
if (sender instanceof Player) { if (sender instanceof Player) {

29
src/main/java/fr/xephi/authme/util/message/I18NUtils.java
View File

@ -3,7 +3,6 @@ package fr.xephi.authme.util.message;
import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.util.Utils; import fr.xephi.authme.util.Utils;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -29,27 +28,21 @@ public class I18NUtils {
/** /**
* Returns the locale that player uses. * Returns the locale that player uses.
* *
* @param sender The player * @param player The player
*/ */
public static String getLocale(CommandSender sender) { public static String getLocale(Player player) {
String locale = null; if (Utils.majorVersion >= 12) {
return player.getLocale().toLowerCase();
} else {
try {
Object spigot = spigotMethod.invoke(player);
Method spigotGetLocaleMethod = spigot.getClass().getMethod("getLocale");
if (sender instanceof Player) { return ((String) spigotGetLocaleMethod.invoke(spigot)).toLowerCase();
Player player = (Player) sender; } catch (Exception ignored) {
if (Utils.majorVersion >= 12) { return null;
locale = player.getLocale().toLowerCase();
} else {
try {
Object spigot = spigotMethod.invoke(player);
Method spigotGetLocaleMethod = spigot.getClass().getMethod("getLocale");
locale = ((String) spigotGetLocaleMethod.invoke(spigot)).toLowerCase();
} catch (Exception ignored) {
}
} }
} }
return locale;
} }
/** /**