From bf6968f279a559639bbe9af093a119d6a1a86c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=BA=E5=BD=B1=E7=A7=91=E6=8A=80=20NoxShadow=20Tech?= <115096818+HackerYijia@users.noreply.github.com> Date: Sat, 21 Sep 2024 22:02:45 -0400 Subject: [PATCH] Optimized SpigotLogger for improved performance and reduced resource usage while maintaining functionality and player message filtering. Hopefully this PR (If you accept it) will help the plugin to use less resources. This PR in my opinion takes advantage of Bukkit's built in logger, static initialization and have a slightly faster speed and better intergretation. --- .../utilities/logging/SpigotLogger.java | 73 +++++++++++-------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/src/main/java/net/jitse/phantom/spigot/utilities/logging/SpigotLogger.java b/src/main/java/net/jitse/phantom/spigot/utilities/logging/SpigotLogger.java index 4a08361..4830d63 100644 --- a/src/main/java/net/jitse/phantom/spigot/utilities/logging/SpigotLogger.java +++ b/src/main/java/net/jitse/phantom/spigot/utilities/logging/SpigotLogger.java @@ -4,55 +4,64 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; +import java.util.EnumMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + public class SpigotLogger { - private final String name; - private final ChatColor nameColor, messageColor; - private final LogLevel max; + private static final Logger LOGGER = Bukkit.getLogger(); + private static final Map LOG_LEVEL_PREFIXES = new EnumMap<>(LogLevel.class); + + static { + LOG_LEVEL_PREFIXES.put(LogLevel.DEBUG, ChatColor.YELLOW + "[Debug] "); + LOG_LEVEL_PREFIXES.put(LogLevel.ERROR, ChatColor.RED + "[Error] "); + LOG_LEVEL_PREFIXES.put(LogLevel.FATAL, ChatColor.RED + "[Fatal] "); + LOG_LEVEL_PREFIXES.put(LogLevel.INFO, ChatColor.WHITE + "[Info] "); + LOG_LEVEL_PREFIXES.put(LogLevel.WARN, ChatColor.GOLD + "[Warn] "); + LOG_LEVEL_PREFIXES.put(LogLevel.SUCCESS, ChatColor.GREEN + "[Success] "); + } + + private final String prefix; + private final ChatColor messageColor; + private final LogLevel maxLevel; - public SpigotLogger(String name, ChatColor nameColor, ChatColor messageColor, LogLevel max) { - this.name = name; - this.nameColor = nameColor; + public SpigotLogger(String name, ChatColor nameColor, ChatColor messageColor, LogLevel maxLevel) { + this.prefix = nameColor + "[" + name + "] "; this.messageColor = messageColor; - this.max = max; + this.maxLevel = maxLevel; } public void log(LogLevel level, String message) { - if (level.ordinal() < max.ordinal()) { + if (level.ordinal() < maxLevel.ordinal()) { return; } - String text = nameColor + "[" + name + "] "; + String levelPrefix = LOG_LEVEL_PREFIXES.getOrDefault(level, ""); + String fullMessage = prefix + levelPrefix + messageColor + message; + + LOGGER.log(getJavaLogLevel(level), ChatColor.stripColor(fullMessage)); + + String permission = "phantom.logging." + level.toString().toLowerCase(); + Bukkit.getOnlinePlayers().stream() + .filter(player -> player.hasPermission(permission)) + .forEach(player -> player.sendMessage(fullMessage)); + } + + private Level getJavaLogLevel(LogLevel level) { switch (level) { case DEBUG: - text += ChatColor.YELLOW + "[Debug] "; - break; + return Level.FINE; case ERROR: - text += ChatColor.RED + "[Error] "; - break; case FATAL: - text += ChatColor.RED + "[Fatal] "; - break; - case INFO: - text += ChatColor.WHITE + "[Info] "; - break; + return Level.SEVERE; case WARN: - text += ChatColor.GOLD + "[Warn] "; - break; + return Level.WARNING; case SUCCESS: - text += ChatColor.GREEN + "[Success] "; - break; + case INFO: default: - text += ""; - break; - } - - Bukkit.getConsoleSender().sendMessage(text + messageColor + message); - - for (Player player : Bukkit.getOnlinePlayers()) { - if (player.hasPermission("phantom.logging." + level.toString().toLowerCase())) { - player.sendMessage(text + messageColor + message); - } + return Level.INFO; } } }