From 58fcd4c14503dcefaf20c748447ee4a845cdabab Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 30 Jun 2020 00:43:56 +0200 Subject: [PATCH] Add per-component logging --- .../core/component/members/MemberComponent.java | 6 +++--- .../core/component/randomtp/RandomTP.java | 7 +++---- .../core/component/towny/TownyComponent.java | 11 ++++++----- .../core/component/votifier/VotifierComponent.java | 2 +- .../lib/architecture/CommentedConfiguration.java | 2 +- .../buttondevteam/lib/architecture/Component.java | 8 ++++++++ 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java index 8151d2e..803372e 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java @@ -71,14 +71,14 @@ public class MemberComponent extends Component implements Listener { try { if (permission.playerAddGroup(null, player, memberGroup().get())) { player.sendMessage("§bYou are a member now!"); - MainPlugin.Instance.getLogger().info("Added " + player.getName() + " as a member."); + log("Added " + player.getName() + " as a member."); return true; } else { - MainPlugin.Instance.getLogger().warning("Failed to assign the member role! Please make sure the member group exists or disable the component if it's unused."); + logWarn("Failed to assign the member role! Please make sure the member group exists or disable the component if it's unused."); return false; } } catch (UnsupportedOperationException e) { - MainPlugin.Instance.getLogger().warning("Failed to assign the member role! Groups are not supported by the permissions implementation."); + logWarn("Failed to assign the member role! Groups are not supported by the permissions implementation."); return null; } } diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java b/Chroma-Core/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java index e841d76..842e482 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java @@ -59,11 +59,10 @@ public class RandomTP extends ICommand2MC { world = Bukkit.getWorld("World"); border = world.getWorldBorder(); - Logger logger = component.getPlugin().getLogger(); - logger.info("Getting new location"); + component.log("Getting new location"); if(border.getSize() > 100000) - logger.warning("World border is wide, it may take a minute..."); - logger.info("Success: "+newLocation()); + component.logWarn("World border is wide, it may take a minute..."); + component.log("Success: "+newLocation()); } /*================================================================================================*/ diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java index d5571d4..fd34aef 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/towny/TownyComponent.java @@ -30,21 +30,22 @@ public class TownyComponent extends Component { * @param newName The player's new name */ public static void renameInTowny(String oldName, String newName) { - if (!ComponentManager.isEnabled(TownyComponent.class)) + var component = ComponentManager.getIfEnabled(TownyComponent.class); + if (component == null) return; - Bukkit.getLogger().info("Renaming " + oldName + " in Towny to " + newName); + component.log("Renaming " + oldName + " in Towny to " + newName); TownyUniverse tu = TownyUniverse.getInstance(); try { Resident resident = tu.getDataSource().getResident(oldName); if (resident == null) { - Bukkit.getLogger().warning("Resident not found - couldn't rename in Towny."); + component.logWarn("Resident not found - couldn't rename in Towny."); TBMCCoreAPI.sendDebugMessage("Resident not found - couldn't rename in Towny."); } else if (tu.getDataSource().hasResident(newName)) { - Bukkit.getLogger().warning("Target resident name is already in use."); + component.logWarn("Target resident name is already in use."); TBMCCoreAPI.sendDebugMessage("Target resident name is already in use. (" + oldName + " -> " + newName + ")"); } else { tu.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2 - Bukkit.getLogger().info("Renaming done."); + component.log("Renaming done."); } } catch (AlreadyRegisteredException e) { TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e); diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java index 6329e03..04dbb95 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java @@ -38,7 +38,7 @@ public class VotifierComponent extends Component { @SuppressWarnings("deprecation") public void onVotifierEvent(VotifierEvent event) { Vote vote = event.getVote(); - getPlugin().getLogger().info("Vote: " + vote); + log("Vote: " + vote); org.bukkit.OfflinePlayer op = Bukkit.getOfflinePlayer(vote.getUsername()); Player p = Bukkit.getPlayer(vote.getUsername()); /*if (op != null) { diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/CommentedConfiguration.java b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/CommentedConfiguration.java index 62cafb2..fb6be2e 100644 --- a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/CommentedConfiguration.java +++ b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/CommentedConfiguration.java @@ -19,7 +19,7 @@ import java.util.HashMap; * * @author dumptruckman & Articdive */ -public class CommentedConfiguration extends YamlConfiguration { //TODO: Remove FileMgmt dependency +public class CommentedConfiguration extends YamlConfiguration { private HashMap comments; private File file; diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java index 545a174..757e9fd 100644 --- a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java +++ b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/Component.java @@ -175,6 +175,14 @@ public abstract class Component { return Collections.unmodifiableMap(components); } + public void log(String message) { + plugin.getLogger().info("[" + getClassName() + "] " + message); + } + + public void logWarn(String message) { + plugin.getLogger().warning("[" + getClassName() + "] " + message); + } + /** * Registers the module, when called by the JavaPlugin class. * This gets fired when the plugin is enabled. Use {@link #enable()} to register commands and such.