From 37949d07f6c674cfe1890ef8592c8cb5af753764 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 17 Feb 2024 16:19:46 -0800 Subject: [PATCH] logging changes --- .../commands/levelup/LevelUpCommandManager.java | 5 +++-- .../nossr50/commands/levelup/PowerLevelUpCommand.java | 10 ++++------ .../nossr50/commands/levelup/SkillLevelUpCommand.java | 9 +++------ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/levelup/LevelUpCommandManager.java b/src/main/java/com/gmail/nossr50/commands/levelup/LevelUpCommandManager.java index c1ae12a90..d5b714abb 100644 --- a/src/main/java/com/gmail/nossr50/commands/levelup/LevelUpCommandManager.java +++ b/src/main/java/com/gmail/nossr50/commands/levelup/LevelUpCommandManager.java @@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.levelup; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.jetbrains.annotations.NotNull; import java.util.HashSet; @@ -28,13 +29,13 @@ public class LevelUpCommandManager { public void registerCommand(@NotNull SkillLevelUpCommand skillLevelUpCommand) { requireNonNull(skillLevelUpCommand, "skillLevelUpCommand cannot be null"); skillLevelCommands.add(skillLevelUpCommand); - mcMMO.p.getLogger().info("Registered level up command - SkillLevelUpCommand: " + skillLevelUpCommand); + LogUtils.debug(mcMMO.p.getLogger(), "Registered level up command - SkillLevelUpCommand: " + skillLevelUpCommand); } public void registerCommand(@NotNull PowerLevelUpCommand powerLevelUpCommand) { requireNonNull(powerLevelUpCommand, "powerLevelUpCommand cannot be null"); powerLevelUpCommands.add(powerLevelUpCommand); - mcMMO.p.getLogger().info("Registered level up command - PowerLevelUpCommand: " + powerLevelUpCommand); + LogUtils.debug(mcMMO.p.getLogger(), "Registered level up command - PowerLevelUpCommand: " + powerLevelUpCommand); } /** diff --git a/src/main/java/com/gmail/nossr50/commands/levelup/PowerLevelUpCommand.java b/src/main/java/com/gmail/nossr50/commands/levelup/PowerLevelUpCommand.java index 754eff0f2..5d97a5d3c 100644 --- a/src/main/java/com/gmail/nossr50/commands/levelup/PowerLevelUpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/levelup/PowerLevelUpCommand.java @@ -44,15 +44,12 @@ public class PowerLevelUpCommand implements CommandsOnLevel { } public void executeCommand(McMMOPlayer player, int level) { - // TODO: Change this to debug later - mcMMO.p.getLogger().info("Executing commands for level up: " + commands); + LogUtils.debug(mcMMO.p.getLogger(), "Executing commands for level up: " + commands); for (String command : commands) { - // TODO: Change this to debug later - mcMMO.p.getLogger().info("Executing command: " + command); + LogUtils.debug(mcMMO.p.getLogger(), "Executing command: " + command); String injectedCommand = injectedCommand(command, player, level); - // TODO: Remove verbose logging later if (!injectedCommand.equalsIgnoreCase(command)) { - mcMMO.p.getLogger().info(("Command has been injected with new values: " + injectedCommand)); + LogUtils.debug(mcMMO.p.getLogger(), ("Command has been injected with new values: " + injectedCommand)); } Bukkit.dispatchCommand(Bukkit.getConsoleSender(), injectedCommand); } @@ -61,6 +58,7 @@ public class PowerLevelUpCommand implements CommandsOnLevel { private String injectedCommand(String command, McMMOPlayer player, int level) { // replace %player% with player name, %skill% with skill name, and %level% with level command = safeReplace(command, "%player%", player.getPlayer().getName()); + command = safeReplace(command, "%power_level%", "power level"); command = safeReplace(command, "%skill%", "power level"); command = safeReplace(command, "%level%", String.valueOf(level)); return command; diff --git a/src/main/java/com/gmail/nossr50/commands/levelup/SkillLevelUpCommand.java b/src/main/java/com/gmail/nossr50/commands/levelup/SkillLevelUpCommand.java index 798abbe67..246bb0d21 100644 --- a/src/main/java/com/gmail/nossr50/commands/levelup/SkillLevelUpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/levelup/SkillLevelUpCommand.java @@ -45,15 +45,12 @@ public class SkillLevelUpCommand implements CommandsOnLevel { } public void executeCommand(McMMOPlayer player, PrimarySkillType primarySkillType, int level) { - // TODO: Change this to debug later - mcMMO.p.getLogger().info("Executing commands for level up: " + commands); + LogUtils.debug(mcMMO.p.getLogger(), "Executing commands for level up: " + commands); for (String command : commands) { - // TODO: Change this to debug later - mcMMO.p.getLogger().info("Executing command: " + command); + LogUtils.debug(mcMMO.p.getLogger(), "Executing command: " + command); String injectedCommand = injectedCommand(command, player, primarySkillType, level); - // TODO: Remove verbose logging later if (!injectedCommand.equalsIgnoreCase(command)) { - mcMMO.p.getLogger().info(("Command has been injected with new values: " + injectedCommand)); + LogUtils.debug(mcMMO.p.getLogger(), ("Command has been injected with new values: " + injectedCommand)); } Bukkit.dispatchCommand(Bukkit.getConsoleSender(), injectedCommand); }