diff --git a/Changelog.txt b/Changelog.txt index a16d74d2ea..90ce3056e7 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,7 @@ +Version 2.1.222 + A lot of mcMMO logging was moved from INFO to DEBUG, this should reduce the amount of noise in your logs and console + + NOTES: If you want to see all logging messages, modify config.yml and set General.Verbose_Logging to true Version 2.1.221 PAPI Support is now built into mcMMO and loads when mcMMO loads (as long as you have PAPI running) Fixed blast mining bonus drops not working (Thanks warriiorrrr) diff --git a/pom.xml b/pom.xml index 2dd8d8d30c..ece608bf57 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.221 + 2.1.222-SNAPSHOT mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/api/TreeFellerBlockBreakEvent.java b/src/main/java/com/gmail/nossr50/api/TreeFellerBlockBreakEvent.java index 7f7db7bcfa..de084578be 100644 --- a/src/main/java/com/gmail/nossr50/api/TreeFellerBlockBreakEvent.java +++ b/src/main/java/com/gmail/nossr50/api/TreeFellerBlockBreakEvent.java @@ -1,10 +1,8 @@ package com.gmail.nossr50.api; import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; -import com.gmail.nossr50.events.fake.FakeEvent; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockBreakEvent; import org.jetbrains.annotations.NotNull; public class TreeFellerBlockBreakEvent extends FakeBlockBreakEvent { diff --git a/src/main/java/com/gmail/nossr50/config/AutoUpdateLegacyConfigLoader.java b/src/main/java/com/gmail/nossr50/config/AutoUpdateLegacyConfigLoader.java index b021a7bacf..600e7f9843 100644 --- a/src/main/java/com/gmail/nossr50/config/AutoUpdateLegacyConfigLoader.java +++ b/src/main/java/com/gmail/nossr50/config/AutoUpdateLegacyConfigLoader.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.config; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; @@ -31,7 +32,7 @@ public AutoUpdateLegacyConfigLoader(String fileName) { protected void saveConfig() { try { - mcMMO.p.getLogger().info("Saving changes to config file - " + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "Saving changes to config file - " + fileName); config.options().indent(2); config.save(configFile); } catch (IOException e) { @@ -58,9 +59,9 @@ protected void loadFile() { oldKeys.removeAll(internalConfigKeys); if (!oldKeys.isEmpty()) { - mcMMO.p.debug("old key(s) in \"" + fileName + "\""); + LogUtils.debug(mcMMO.p.getLogger(), "old key(s) in \"" + fileName + "\""); for (String key : oldKeys) { - mcMMO.p.debug(" old-key:" + key); + LogUtils.debug(mcMMO.p.getLogger(), " old-key:" + key); } } @@ -73,7 +74,7 @@ protected void loadFile() { } for (String key : newKeys) { - mcMMO.p.debug("Adding new key: " + key + " = " + internalConfig.get(key)); + LogUtils.debug(mcMMO.p.getLogger(), "Adding new key: " + key + " = " + internalConfig.get(key)); config.set(key, internalConfig.get(key)); } diff --git a/src/main/java/com/gmail/nossr50/config/BukkitConfig.java b/src/main/java/com/gmail/nossr50/config/BukkitConfig.java index 35c598e36d..23d50b6b2b 100644 --- a/src/main/java/com/gmail/nossr50/config/BukkitConfig.java +++ b/src/main/java/com/gmail/nossr50/config/BukkitConfig.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.config; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; @@ -22,7 +23,7 @@ public abstract class BukkitConfig { private boolean savedDefaults = false; public BukkitConfig(@NotNull String fileName, @NotNull File dataFolder, boolean copyDefaults) { - mcMMO.p.getLogger().info("[config] Initializing config: " + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "Initializing config: " + fileName); this.copyDefaults = copyDefaults; this.fileName = fileName; this.dataFolder = dataFolder; @@ -30,7 +31,7 @@ public BukkitConfig(@NotNull String fileName, @NotNull File dataFolder, boolean this.defaultYamlConfig = saveDefaultConfigToDisk(); this.config = initConfig(); updateFile(); - mcMMO.p.getLogger().info("[config] Config initialized: " + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "Config initialized: " + fileName); } public BukkitConfig(@NotNull String fileName, @NotNull File dataFolder) { @@ -81,10 +82,10 @@ private void copyMissingDefaultsFromResource() { * Copies the config from the JAR to defaults/ */ YamlConfiguration saveDefaultConfigToDisk() { - mcMMO.p.getLogger().info("[config] Copying default config to disk: " + fileName + " to defaults/" + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "Copying default config to disk: " + fileName + " to defaults/" + fileName); try(InputStream inputStream = mcMMO.p.getResource(fileName)) { if(inputStream == null) { - mcMMO.p.getLogger().severe("[config] Unable to copy default config: " + fileName); + mcMMO.p.getLogger().severe("Unable to copy default config: " + fileName); return null; } @@ -109,11 +110,11 @@ YamlConfiguration saveDefaultConfigToDisk() { YamlConfiguration initConfig() { if (!configFile.exists()) { - mcMMO.p.getLogger().info("[config] User config file not found, copying a default config to disk: " + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "User config file not found, copying a default config to disk: " + fileName); mcMMO.p.saveResource(fileName, false); } - mcMMO.p.getLogger().info("[config] Loading config from disk: " + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "Loading config from disk: " + fileName); YamlConfiguration config = new YamlConfiguration(); config.options().indent(4); @@ -151,7 +152,7 @@ protected boolean noErrorsInConfig(List issues) { protected void validate() { if (validateKeys()) { - mcMMO.p.debug("No errors found in " + fileName + "!"); + LogUtils.debug(mcMMO.p.getLogger(), "No errors found in " + fileName + "!"); } else { mcMMO.p.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!"); mcMMO.p.getServer().getPluginManager().disablePlugin(mcMMO.p); @@ -160,8 +161,8 @@ protected void validate() { } public void backup() { - mcMMO.p.getLogger().info("You are using an old version of the " + fileName + " file."); - mcMMO.p.getLogger().info("Your old file has been renamed to " + fileName + ".old and has been replaced by an updated version."); + LogUtils.debug(mcMMO.p.getLogger(), "You are using an old version of the " + fileName + " file."); + LogUtils.debug(mcMMO.p.getLogger(), "Your old file has been renamed to " + fileName + ".old and has been replaced by an updated version."); configFile.renameTo(new File(configFile.getPath() + ".old")); diff --git a/src/main/java/com/gmail/nossr50/config/GeneralConfig.java b/src/main/java/com/gmail/nossr50/config/GeneralConfig.java index fb86a42f41..7a6f766c06 100644 --- a/src/main/java/com/gmail/nossr50/config/GeneralConfig.java +++ b/src/main/java/com/gmail/nossr50/config/GeneralConfig.java @@ -1005,4 +1005,8 @@ public int getPowerLevelUpBroadcastInterval() { public boolean isGreenThumbReplantableCrop(@NotNull Material material) { return config.getBoolean("Green_Thumb_Replanting_Crops." + StringUtils.getCapitalized(material.toString()), true); } + + public boolean useVerboseLogging() { + return config.getBoolean("General.Verbose_Logging", false); + } } diff --git a/src/main/java/com/gmail/nossr50/config/LegacyConfigLoader.java b/src/main/java/com/gmail/nossr50/config/LegacyConfigLoader.java index ebd82c2375..6a917b3fdb 100644 --- a/src/main/java/com/gmail/nossr50/config/LegacyConfigLoader.java +++ b/src/main/java/com/gmail/nossr50/config/LegacyConfigLoader.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.config; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; @@ -46,7 +47,7 @@ public LegacyConfigLoader(String fileName) { protected void loadFile() { if (!configFile.exists()) { - mcMMO.p.getLogger().info("Creating mcMMO " + fileName + " File..."); + LogUtils.debug(mcMMO.p.getLogger(), "Creating mcMMO " + fileName + " File..."); try { mcMMO.p.saveResource(fileName, false); // Normal files @@ -54,7 +55,7 @@ protected void loadFile() { mcMMO.p.saveResource(configFile.getParentFile().getName() + File.separator + fileName, false); // Mod files } } else { - mcMMO.p.getLogger().info("Loading mcMMO " + fileName + " File..."); + LogUtils.debug(mcMMO.p.getLogger(), "Loading mcMMO " + fileName + " File..."); } config = YamlConfiguration.loadConfiguration(configFile); @@ -76,7 +77,7 @@ protected boolean noErrorsInConfig(List issues) { protected void validate() { if (validateKeys()) { - mcMMO.p.debug("No errors found in " + fileName + "!"); + LogUtils.debug(mcMMO.p.getLogger(), "No errors found in " + fileName + "!"); } else { mcMMO.p.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!"); mcMMO.p.getServer().getPluginManager().disablePlugin(mcMMO.p); diff --git a/src/main/java/com/gmail/nossr50/config/RankConfig.java b/src/main/java/com/gmail/nossr50/config/RankConfig.java index 01f291b7b6..d892ecda43 100644 --- a/src/main/java/com/gmail/nossr50/config/RankConfig.java +++ b/src/main/java/com/gmail/nossr50/config/RankConfig.java @@ -3,6 +3,7 @@ import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -130,7 +131,7 @@ private void resetRankValue(@NotNull SubSkillType subSkillType, int rank, boolea String key = getRankAddressKey(subSkillType, rank, retroMode); int defaultValue = defaultYamlConfig.getInt(key); config.set(key, defaultValue); - mcMMO.p.getLogger().info(key + " SET -> " + defaultValue); + LogUtils.debug(mcMMO.p.getLogger(), key + " SET -> " + defaultValue); } /** @@ -147,10 +148,10 @@ private void checkKeys(@NotNull List reasons) { if (badSkillSetup.isEmpty()) return; - mcMMO.p.getLogger().info("(FIXING CONFIG) mcMMO is correcting a few mistakes found in your skill rank config setup"); + LogUtils.debug(mcMMO.p.getLogger(), "(FIXING CONFIG) mcMMO is correcting a few mistakes found in your skill rank config setup"); for (SubSkillType subSkillType : badSkillSetup) { - mcMMO.p.getLogger().info("(FIXING CONFIG) Resetting rank config settings for skill named - " + subSkillType.toString()); + LogUtils.debug(mcMMO.p.getLogger(), "(FIXING CONFIG) Resetting rank config settings for skill named - " + subSkillType.toString()); fixBadEntries(subSkillType); } } @@ -178,7 +179,7 @@ private void checkConfig(@NotNull List reasons, @NotNull HashSet curRank) { //We're going to allow this but we're going to warn them - mcMMO.p.getLogger().info("(CONFIG ISSUE) You have the ranks for the subskill " + subSkillType + " set up poorly, sequential ranks should have ascending requirements"); + LogUtils.debug(mcMMO.p.getLogger(), "(CONFIG ISSUE) You have the ranks for the subskill " + subSkillType + " set up poorly, sequential ranks should have ascending requirements"); badSkillSetup.add(subSkillType); } } diff --git a/src/main/java/com/gmail/nossr50/config/SoundConfig.java b/src/main/java/com/gmail/nossr50/config/SoundConfig.java index e19ad7f447..407b8ef1a5 100644 --- a/src/main/java/com/gmail/nossr50/config/SoundConfig.java +++ b/src/main/java/com/gmail/nossr50/config/SoundConfig.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.config; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.sounds.SoundType; public class SoundConfig extends BukkitConfig { @@ -28,14 +29,14 @@ protected void loadKeys() { protected boolean validateKeys() { for (SoundType soundType : SoundType.values()) { if (config.getDouble("Sounds." + soundType.toString() + ".Volume") < 0) { - mcMMO.p.getLogger().info("[mcMMO] Sound volume cannot be below 0 for " + soundType); + LogUtils.debug(mcMMO.p.getLogger(), "[mcMMO] Sound volume cannot be below 0 for " + soundType); return false; } //Sounds with custom pitching don't use pitch values if (!soundType.usesCustomPitch()) { if (config.getDouble("Sounds." + soundType + ".Pitch") < 0) { - mcMMO.p.getLogger().info("[mcMMO] Sound pitch cannot be below 0 for " + soundType); + LogUtils.debug(mcMMO.p.getLogger(), "[mcMMO] Sound pitch cannot be below 0 for " + soundType); return false; } } diff --git a/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java b/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java index 44ec42530c..7b93ebd891 100644 --- a/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java +++ b/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java @@ -73,7 +73,8 @@ private void loadBlacklist(File blackListFile) { closeRead(fileReader); } - plugin.getLogger().info(blacklist.size() + " entries in mcMMO World Blacklist"); + if(blacklist.size() > 0) + plugin.getLogger().info(blacklist.size() + " entries in mcMMO World Blacklist"); } private void closeRead(Reader reader) { diff --git a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java index e8dd1a41ce..3b21589c64 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java @@ -3,6 +3,7 @@ import com.gmail.nossr50.config.LegacyConfigLoader; import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.ChatColor; import org.bukkit.Color; import org.bukkit.Material; @@ -100,7 +101,7 @@ private void loadPotionMap() { } } - mcMMO.p.debug("Loaded " + pass + " Alchemy potions, skipped " + fail + "."); + LogUtils.debug(mcMMO.p.getLogger(), "Loaded " + pass + " Alchemy potions, skipped " + fail + "."); } /** diff --git a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java index 85e8c94319..1df5de82c2 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java @@ -7,6 +7,7 @@ import com.gmail.nossr50.skills.repair.repairables.Repairable; import com.gmail.nossr50.skills.repair.repairables.RepairableFactory; import com.gmail.nossr50.util.ItemUtils; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; @@ -48,7 +49,7 @@ protected void loadKeys() { Material itemMaterial = Material.matchMaterial(key); if (itemMaterial == null) { - //mcMMO.p.getLogger().info("No support for repair item "+key+ " in this version of Minecraft, skipping."); + //LogUtils.debug(mcMMO.p.getLogger(), "No support for repair item "+key+ " in this version of Minecraft, skipping."); notSupported.add(key); //Collect names of unsupported items continue; } @@ -160,8 +161,8 @@ protected void loadKeys() { } } - mcMMO.p.getLogger().info(stringBuilder.toString()); - mcMMO.p.getLogger().info("Items using materials that are not supported will simply be skipped."); + LogUtils.debug(mcMMO.p.getLogger(), stringBuilder.toString()); + LogUtils.debug(mcMMO.p.getLogger(), "Items using materials that are not supported will simply be skipped."); } } diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java index 0900cebcc7..fdcdee3f78 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java @@ -8,6 +8,7 @@ import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory; import com.gmail.nossr50.util.ItemUtils; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.skills.SkillUtils; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; @@ -15,6 +16,7 @@ import java.io.IOException; import java.util.*; +import java.util.logging.Level; public class SalvageConfig extends BukkitConfig { private final HashSet notSupported; @@ -41,7 +43,7 @@ protected void loadKeys() { //Original version of 1.16 support had maximum quantities that were bad, this fixes it if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES)) { - mcMMO.p.getLogger().info("Fixing incorrect Salvage quantities on Netherite gear, this will only run once..."); + mcMMO.p.getLogger().log(Level.INFO, "Fixing incorrect Salvage quantities on Netherite gear, this will only run once..."); for (String namespacedkey : mcMMO.getMaterialMapStore().getNetheriteArmor()) { config.set("Salvageables." + namespacedkey.toUpperCase() + ".MaximumQuantity", 4); //TODO: Doesn't make sense to default to 4 for everything } @@ -49,9 +51,9 @@ protected void loadKeys() { try { config.save(getFile()); mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES); - mcMMO.p.getLogger().info("Fixed incorrect Salvage quantities for Netherite gear!"); + LogUtils.debug(mcMMO.p.getLogger(), "Fixed incorrect Salvage quantities for Netherite gear!"); } catch (IOException e) { - mcMMO.p.getLogger().info("Unable to fix Salvage config, please delete the salvage yml file to generate a new one."); + LogUtils.debug(mcMMO.p.getLogger(), "Unable to fix Salvage config, please delete the salvage yml file to generate a new one."); e.printStackTrace(); } } @@ -178,8 +180,8 @@ protected void loadKeys() { } } - mcMMO.p.getLogger().info(stringBuilder.toString()); - mcMMO.p.getLogger().info("Items using materials that are not supported will simply be skipped."); + LogUtils.debug(mcMMO.p.getLogger(), stringBuilder.toString()); + LogUtils.debug(mcMMO.p.getLogger(), "Items using materials that are not supported will simply be skipped."); } } diff --git a/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java index 4239d88032..a02e0bd3ff 100755 --- a/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java +++ b/src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java @@ -4,6 +4,7 @@ import com.gmail.nossr50.datatypes.treasure.*; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.EnchantmentUtils; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; @@ -332,7 +333,7 @@ private void matchAndFillSet(@NotNull List enchantListStr, @NotNull Set< } if (!foundMatch) { - mcMMO.p.getLogger().info("[Fishing Treasure Init] Could not find any enchantments which matched the user defined enchantment named: " + str); + LogUtils.debug(mcMMO.p.getLogger(), "[Fishing Treasure Init] Could not find any enchantments which matched the user defined enchantment named: " + str); } } } diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java index 7ebf53ae77..456ab45312 100755 --- a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java +++ b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java @@ -4,6 +4,7 @@ import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure; import com.gmail.nossr50.datatypes.treasure.HylianTreasure; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.text.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -272,14 +273,14 @@ private boolean processAutomaticKeyConversion(String type, boolean shouldWeUpdat case LEGACY: int legacyDropLevel = getWrongKeyValue(type, treasureName, conversionType); //Legacy only had one value, Retro Mode didn't have a setting //Config needs to be updated to be more specific - mcMMO.p.getLogger().info("(" + treasureName + ") [Fixing bad address: Legacy] Converting Drop_Level to Level_Requirement in treasures.yml for treasure to match new expected format"); + LogUtils.debug(mcMMO.p.getLogger(), "(" + treasureName + ") [Fixing bad address: Legacy] Converting Drop_Level to Level_Requirement in treasures.yml for treasure to match new expected format"); config.set(type + "." + treasureName + LEGACY_DROP_LEVEL, null); //Remove legacy entry config.set(type + "." + treasureName + LEVEL_REQUIREMENT_RETRO_MODE, legacyDropLevel * 10); //Multiply by 10 for Retro config.set(type + "." + treasureName + LEVEL_REQUIREMENT_STANDARD_MODE, legacyDropLevel); shouldWeUpdateTheFile = true; break; case WRONG_KEY_STANDARD: - mcMMO.p.getLogger().info("(" + treasureName + ") [Fixing bad address: STANDARD] Converting Drop_Level to Level_Requirement in treasures.yml for treasure to match new expected format"); + LogUtils.debug(mcMMO.p.getLogger(), "(" + treasureName + ") [Fixing bad address: STANDARD] Converting Drop_Level to Level_Requirement in treasures.yml for treasure to match new expected format"); int wrongKeyValueStandard = getWrongKeyValue(type, treasureName, conversionType); config.set(type + "." + treasureName + WRONG_KEY_ROOT, null); //We also kill the Retro key here as we have enough information for setting in values if needed @@ -291,7 +292,7 @@ private boolean processAutomaticKeyConversion(String type, boolean shouldWeUpdat shouldWeUpdateTheFile = true; break; case WRONG_KEY_RETRO: - mcMMO.p.getLogger().info("(" + treasureName + ") [Fixing bad address: RETRO] Converting Drop_Level to Level_Requirement in treasures.yml for treasure to match new expected format"); + LogUtils.debug(mcMMO.p.getLogger(), "(" + treasureName + ") [Fixing bad address: RETRO] Converting Drop_Level to Level_Requirement in treasures.yml for treasure to match new expected format"); int wrongKeyValueRetro = getWrongKeyValue(type, treasureName, conversionType); config.set(type + "." + treasureName + WRONG_KEY_ROOT, null); //We also kill the Retro key here as we have enough information for setting in values if needed diff --git a/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java b/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java index 1e30c68193..cb5025f6f1 100644 --- a/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java +++ b/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java @@ -2,6 +2,7 @@ import com.gmail.nossr50.datatypes.database.DatabaseType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -16,14 +17,14 @@ public static DatabaseManager getDatabaseManager(@NotNull String userFilePath, @ return createDefaultCustomDatabaseManager(); } catch (Exception e) { - mcMMO.p.debug("Could not create custom database manager"); + LogUtils.debug(mcMMO.p.getLogger(), "Could not create custom database manager"); e.printStackTrace(); } catch (Throwable e) { - mcMMO.p.debug("Failed to create custom database manager"); + LogUtils.debug(mcMMO.p.getLogger(), "Failed to create custom database manager"); e.printStackTrace(); } - mcMMO.p.debug("Falling back on " + (mcMMO.p.getGeneralConfig().getUseMySQL() ? "SQL" : "Flatfile") + " database"); + LogUtils.debug(mcMMO.p.getLogger(), "Falling back on " + (mcMMO.p.getGeneralConfig().getUseMySQL() ? "SQL" : "Flatfile") + " database"); } return mcMMO.p.getGeneralConfig().getUseMySQL() ? new SQLDatabaseManager() : new FlatFileDatabaseManager(userFilePath, logger, purgeTime, startingLevel); @@ -62,16 +63,16 @@ public static Class getCustomDatabaseManagerClass() { public static @Nullable DatabaseManager createDatabaseManager(@NotNull DatabaseType type, @NotNull String userFilePath, @NotNull Logger logger, long purgeTime, int startingLevel) { switch (type) { case FLATFILE: - mcMMO.p.getLogger().info("Using FlatFile Database"); + LogUtils.debug(mcMMO.p.getLogger(), "Using FlatFile Database"); return new FlatFileDatabaseManager(userFilePath, logger, purgeTime, startingLevel); case SQL: - mcMMO.p.getLogger().info("Using SQL Database"); + LogUtils.debug(mcMMO.p.getLogger(), "Using SQL Database"); return new SQLDatabaseManager(); case CUSTOM: try { - mcMMO.p.getLogger().info("Attempting to use Custom Database"); + LogUtils.debug(mcMMO.p.getLogger(), "Attempting to use Custom Database"); return createDefaultCustomDatabaseManager(); } catch (Throwable e) { diff --git a/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java index 839eecbe9f..52fa9a330d 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java @@ -9,6 +9,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.skills.SkillTools; import org.bukkit.OfflinePlayer; @@ -115,7 +116,7 @@ protected FlatFileDatabaseManager(@NotNull String usersFilePath, @NotNull Logger public int purgePowerlessUsers() { int purgedUsers = 0; - logger.info("Purging powerless users..."); + LogUtils.debug(logger, "Purging powerless users..."); BufferedReader in = null; FileWriter out = null; @@ -183,7 +184,7 @@ public void purgeOldUsers() { int removedPlayers = 0; long currentTime = System.currentTimeMillis(); - logger.info("Purging old users..."); + LogUtils.debug(logger, "Purging old users..."); BufferedReader in = null; FileWriter out = null; @@ -715,7 +716,7 @@ public void writeUserToLine(@NotNull PlayerProfile profile, @NotNull Appendable boolean matchingName = dbPlayerName.equalsIgnoreCase(playerName); if (!matchingName) { - logger.info("When loading user: "+playerName +" with UUID of (" + uuid.toString() + logger.warning("When loading user: "+playerName +" with UUID of (" + uuid.toString() +") we found a mismatched name, the name in the DB will be replaced (DB name: "+dbPlayerName+")"); //logger.info("Name updated for player: " + rawSplitData[USERNAME_INDEX] + " => " + playerName); rawSplitData[USERNAME_INDEX] = playerName; @@ -840,7 +841,7 @@ public boolean saveUserUUID(String userName, UUID uuid) { logger.severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e); } finally { - logger.info(i + " entries written while saving UUID for " + userName); + LogUtils.debug(logger, i + " entries written while saving UUID for " + userName); if (in != null) { try { in.close(); @@ -898,7 +899,7 @@ public boolean saveUserUUIDs(Map fetchedUUIDs) { logger.severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e); } finally { - logger.info(i + " entries written while saving UUID batch"); + LogUtils.debug(logger, i + " entries written while saving UUID batch"); if (in != null) { try { in.close(); @@ -1092,7 +1093,7 @@ private void initEmptyDB() { public @Nullable List checkFileHealthAndStructure() { ArrayList flagsFound = null; - logger.info("(" + usersFile.getPath() + ") Validating database file.."); + LogUtils.debug(logger, "(" + usersFile.getPath() + ") Validating database file.."); FlatFileDataProcessor dataProcessor = null; if (usersFile.exists()) { @@ -1127,7 +1128,7 @@ private void initEmptyDB() { //Only update the file if needed if(dataProcessor.getFlatFileDataFlags().size() > 0) { flagsFound = new ArrayList<>(dataProcessor.getFlatFileDataFlags()); - logger.info("Saving the updated and or repaired FlatFile Database..."); + logger.info("Updating FlatFile Database..."); fileWriter = new FileWriter(usersFilePath); //Write data to file if(dbCommentDate != null) diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index 9d32407d83..111b5d7f5d 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -11,6 +11,7 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.skills.SkillTools; import org.apache.tomcat.jdbc.pool.DataSource; @@ -1013,7 +1014,7 @@ private Connection getConnection(PoolIdentifier identifier) throws SQLException */ private void checkDatabaseStructure(Connection connection, UpgradeType upgrade) { if (!mcMMO.getUpgradeManager().shouldUpgrade(upgrade)) { - mcMMO.p.debug("Skipping " + upgrade.name() + " upgrade (unneeded)"); + LogUtils.debug(mcMMO.p.getLogger(), "Skipping " + upgrade.name() + " upgrade (unneeded)"); return; } @@ -1577,7 +1578,7 @@ private void tryClose(AutoCloseable closeable) { @Override public void onDisable() { - mcMMO.p.debug("Releasing connection pool resource..."); + LogUtils.debug(mcMMO.p.getLogger(), "Releasing connection pool resource..."); miscPool.close(); loadPool.close(); savePool.close(); diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java b/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java index 8f89f7484f..69feb7b9b3 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java +++ b/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasureBook.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.datatypes.treasure; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -26,7 +27,7 @@ public FishingTreasureBook(@NotNull ItemStack enchantedBook, int xp, @Nullable S } private void initLegalEnchantments() { - mcMMO.p.getLogger().info("Registering enchantments for Fishing Book..."); + LogUtils.debug(mcMMO.p.getLogger(), "Registering enchantments for Fishing Book..."); for(Enchantment enchantment : Enchantment.values()) { if(isEnchantAllowed(enchantment)) { diff --git a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java b/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java index 48a8faff2c..348ba2af01 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java +++ b/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java @@ -5,6 +5,7 @@ import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.Interaction; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.event.Event; import java.util.ArrayList; @@ -52,7 +53,7 @@ public static void registerSubSkill(AbstractSubSkill abstractSubSkill) //Register in name map subSkillNameMap.putIfAbsent(lowerCaseName, abstractSubSkill); - mcMMO.p.getLogger().info("Registered subskill: "+ abstractSubSkill.getConfigKeyName()); + LogUtils.debug(mcMMO.p.getLogger(), "Registered subskill: "+ abstractSubSkill.getConfigKeyName()); } /** diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 8246ffd4f9..116fbf85f1 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -958,8 +958,8 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(player); if (mcMMOPlayer == null) { - mcMMO.p.debug(player.getName() + "is chatting, but is currently not logged in to the server."); - mcMMO.p.debug("Party & Admin chat will not work properly for this player."); + LogUtils.debug(mcMMO.p.getLogger(), player.getName() + "is chatting, but is currently not logged in to the server."); + LogUtils.debug(mcMMO.p.getLogger(), "Party & Admin chat will not work properly for this player."); return; } diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java index 38944f720b..20b5e2631b 100644 --- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java +++ b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.locale; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.text.TextUtils; import net.kyori.adventure.text.TextComponent; import org.bukkit.ChatColor; @@ -192,7 +193,7 @@ private static void initialize() { //Use the new locale file if (Files.exists(overridePath) && Files.isRegularFile(overridePath)) { try (Reader localeReader = Files.newBufferedReader(overridePath)) { - mcMMO.p.getLogger().log(Level.INFO, "Loading locale from {0}", overridePath); + LogUtils.debug(mcMMO.p.getLogger(), "Loading locale from " + overridePath.toString()); filesystemBundle = new PropertyResourceBundle(localeReader); } catch (IOException e) { mcMMO.p.getLogger().log(Level.WARNING, "Failed to load locale from " + overridePath, e); diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index d674ba6247..ebf4b6e732 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -164,6 +164,9 @@ protected mcMMO(JavaPluginLoader loader, PluginDescriptionFile description, File @Override public void onEnable() { try { + //Filter out any debug messages (if debug/verbose logging is not enabled) + getLogger().setFilter(new LogFilter(this)); + setupFilePaths(); generalConfig = new GeneralConfig(getDataFolder()); //Load before skillTools skillTools = new SkillTools(this); //Load after general config @@ -180,9 +183,6 @@ public void onEnable() { //metadata service metadataService = new MetadataService(this); - //Filter out any debug messages (if debug/verbose logging is not enabled) - getLogger().setFilter(new LogFilter(this)); - MetadataConstants.MCMMO_METADATA_VALUE = new FixedMetadataValue(this, true); PluginManager pluginManager = getServer().getPluginManager(); @@ -191,7 +191,6 @@ public void onEnable() { upgradeManager = new UpgradeManager(); - modManager = new ModManager(); //Init Material Maps @@ -256,7 +255,7 @@ public void onEnable() { new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading } - debug("Version " + getDescription().getVersion() + " is enabled!"); + LogUtils.debug(mcMMO.p.getLogger(), "Version " + getDescription().getVersion() + " is enabled!"); scheduleTasks(); CommandRegistrationManager.registerCommands(); @@ -391,13 +390,13 @@ public void onDisable() { } } - debug("Canceling all tasks..."); + LogUtils.debug(mcMMO.p.getLogger(), "Canceling all tasks..."); getServer().getScheduler().cancelTasks(this); // This removes our tasks - debug("Unregister all events..."); + LogUtils.debug(mcMMO.p.getLogger(), "Unregister all events..."); HandlerList.unregisterAll(this); // Cancel event registrations databaseManager.onDisable(); - debug("Was disabled."); // How informative! + LogUtils.debug(mcMMO.p.getLogger(), "Was disabled."); // How informative! } public static String getMainDirectory() { @@ -432,10 +431,6 @@ public void toggleXpEventEnabled() { xpEventEnabled = !xpEventEnabled; } - public void debug(String message) { - getLogger().info("[Debug] " + message); - } - public static FormulaManager getFormulaManager() { return formulaManager; } @@ -616,7 +611,7 @@ private void registerCoreSkills() { if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS)) { - getLogger().info("Enabling Acrobatics Skills"); + LogUtils.debug(mcMMO.p.getLogger(), "Enabling Acrobatics Skills"); //TODO: Should do this differently Roll roll = new Roll(); diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java index c723dbd508..7bc3afe9b5 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -12,6 +12,7 @@ import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.player.NotificationManager; @@ -644,7 +645,7 @@ public static void loadParties() { } } - mcMMO.p.debug("Loaded (" + parties.size() + ") Parties..."); + LogUtils.debug(mcMMO.p.getLogger(), "Loaded (" + parties.size() + ") Parties..."); for (Party party : hasAlly) { party.setAlly(PartyManager.getParty(partiesFile.getString(party.getName() + ".Ally"))); @@ -660,7 +661,7 @@ public static void loadParties() { * Save party file. */ public static void saveParties() { - mcMMO.p.debug("[Party Data] Saving..."); + LogUtils.debug(mcMMO.p.getLogger(), "[Party Data] Saving..."); if (partyFile.exists()) { if (!partyFile.delete()) { @@ -768,7 +769,7 @@ public static void saveParties() { // parties.add(party); // } // -// mcMMO.p.debug("Loaded (" + parties.size() + ") Parties..."); +// LogUtils.debug(mcMMO.p.getLogger(), "Loaded (" + parties.size() + ") Parties..."); // // for (Party party : hasAlly) { // party.setAlly(PartyManager.getParty(partiesFile.getString(party.getName() + ".Ally"))); diff --git a/src/main/java/com/gmail/nossr50/placeholders/PapiExpansion.java b/src/main/java/com/gmail/nossr50/placeholders/PapiExpansion.java index bb53e49c91..ff7a90ceac 100644 --- a/src/main/java/com/gmail/nossr50/placeholders/PapiExpansion.java +++ b/src/main/java/com/gmail/nossr50/placeholders/PapiExpansion.java @@ -9,17 +9,15 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.text.StringUtils; - import me.clip.placeholderapi.PlaceholderAPIPlugin; +import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.Map; import java.util.TreeMap; -import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - public class PapiExpansion extends PlaceholderExpansion { private final Map placeholders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); diff --git a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java index 2eba9ec1f3..d42eb6b2f8 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java @@ -4,13 +4,14 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.player.UserManager; import org.bukkit.scheduler.BukkitRunnable; public class SaveTimerTask extends BukkitRunnable { @Override public void run() { - mcMMO.p.debug("[User Data] Saving..."); + LogUtils.debug(mcMMO.p.getLogger(), "[User Data] Saving..."); // All player data will be saved periodically through this int count = 1; diff --git a/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java b/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java index 1a81628431..e907059965 100644 --- a/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.runnables.backups; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.scheduler.BukkitRunnable; import java.io.File; @@ -37,7 +38,7 @@ public void run() { Date date = getDate(fileName.split("[.]")[0]); if (!fileName.contains(".zip") || date == null) { - mcMMO.p.debug("Could not determine date for file: " + fileName); + LogUtils.debug(mcMMO.p.getLogger(), "Could not determine date for file: " + fileName); continue; } @@ -74,11 +75,11 @@ else if (isLastWeek(date) && !savedDays.contains(dayOfWeek) && mcMMO.p.getGenera return; } - mcMMO.p.getLogger().info("Cleaned backup files. Deleted " + amountDeleted + " of " + amountTotal + " files."); + LogUtils.debug(mcMMO.p.getLogger(), "Cleaned backup files. Deleted " + amountDeleted + " of " + amountTotal + " files."); for (File file : toDelete) { if (file.delete()) { - mcMMO.p.debug("Deleted: " + file.getName()); + LogUtils.debug(mcMMO.p.getLogger(), "Deleted: " + file.getName()); } } } diff --git a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java index dd061d8b69..331c90f921 100644 --- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java @@ -8,6 +8,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.SkillTools; @@ -36,7 +37,7 @@ public void run() { profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName); if (!profile.isLoaded()) { - mcMMO.p.debug("Profile not loaded."); + LogUtils.debug(mcMMO.p.getLogger(), "Profile not loaded."); continue; } @@ -57,8 +58,8 @@ public void run() { } private void editValues(PlayerProfile profile) { - mcMMO.p.debug("========================================================================"); - mcMMO.p.debug("Conversion report for " + profile.getPlayerName() + ":"); + LogUtils.debug(mcMMO.p.getLogger(), "========================================================================"); + LogUtils.debug(mcMMO.p.getLogger(), "Conversion report for " + profile.getPlayerName() + ":"); for (PrimarySkillType primarySkillType : SkillTools.NON_CHILD_SKILLS) { int oldLevel = profile.getSkillLevel(primarySkillType); int oldXPLevel = profile.getSkillXpLevel(primarySkillType); @@ -72,17 +73,17 @@ private void editValues(PlayerProfile profile) { int newLevel = newExperienceValues[0]; int newXPlevel = newExperienceValues[1]; - mcMMO.p.debug(" Skill: " + primarySkillType.toString()); + LogUtils.debug(mcMMO.p.getLogger(), " Skill: " + primarySkillType.toString()); - mcMMO.p.debug(" OLD:"); - mcMMO.p.debug(" Level: " + oldLevel); - mcMMO.p.debug(" XP " + oldXPLevel); - mcMMO.p.debug(" Total XP " + totalOldXP); + LogUtils.debug(mcMMO.p.getLogger(), " OLD:"); + LogUtils.debug(mcMMO.p.getLogger(), " Level: " + oldLevel); + LogUtils.debug(mcMMO.p.getLogger(), " XP " + oldXPLevel); + LogUtils.debug(mcMMO.p.getLogger(), " Total XP " + totalOldXP); - mcMMO.p.debug(" NEW:"); - mcMMO.p.debug(" Level " + newLevel); - mcMMO.p.debug(" XP " + newXPlevel); - mcMMO.p.debug("------------------------------------------------------------------------"); + LogUtils.debug(mcMMO.p.getLogger(), " NEW:"); + LogUtils.debug(mcMMO.p.getLogger(), " Level " + newLevel); + LogUtils.debug(mcMMO.p.getLogger(), " XP " + newXPlevel); + LogUtils.debug(mcMMO.p.getLogger(), "------------------------------------------------------------------------"); profile.modifySkill(primarySkillType, newLevel); profile.setSkillXpLevel(primarySkillType, newXPlevel); diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java index 572f36e0f2..986882bb85 100644 --- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java @@ -6,6 +6,7 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.commands.McScoreboardKeepTask; import com.gmail.nossr50.util.EventUtils; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.scoreboards.ScoreboardManager; @@ -37,14 +38,14 @@ public void run() { // Quit if they logged out if (!player.isOnline()) { - mcMMO.p.getLogger().info("Aborting profile loading recovery for " + player.getName() + " - player logged out"); + LogUtils.debug(mcMMO.p.getLogger(), "Aborting profile loading recovery for " + player.getName() + " - player logged out"); return; } PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(player); if(!profile.isLoaded()) { - mcMMO.p.getLogger().info("Creating new data for player: "+player.getName()); + LogUtils.debug(mcMMO.p.getLogger(), "Creating new data for player: "+player.getName()); //Profile isn't loaded so add as new user profile = mcMMO.getDatabaseManager().newUser(player); } diff --git a/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java b/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java index 387a35550d..c6c5470a3b 100644 --- a/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java +++ b/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java @@ -2,6 +2,7 @@ import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.runnables.skills.AlchemyBrewTask; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.Location; import java.util.ArrayList; @@ -58,7 +59,7 @@ private Alchemy() {} * Finish all active brews. Used upon Disable to prevent vanilla potions from being brewed upon next Enable. */ public static void finishAllBrews() { - mcMMO.p.debug("Completing " + brewingStandMap.size() + " unfinished Alchemy brews."); + LogUtils.debug(mcMMO.p.getLogger(), "Completing " + brewingStandMap.size() + " unfinished Alchemy brews."); List toFinish = new ArrayList<>(brewingStandMap.values()); diff --git a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java index ae4360de79..0e200bafaf 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java +++ b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java @@ -3,6 +3,7 @@ import com.gmail.nossr50.config.BukkitConfig; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.text.StringUtils; import org.bukkit.configuration.file.YamlConfiguration; @@ -22,7 +23,7 @@ protected void loadKeys() { FamilyTree.clearRegistrations(); // when reloading, need to clear statics for (PrimarySkillType skill : mcMMO.p.getSkillTools().CHILD_SKILLS) { - mcMMO.p.debug("Finding parents of " + skill.name()); + LogUtils.debug(mcMMO.p.getLogger(), "Finding parents of " + skill.name()); EnumSet parentSkills = EnumSet.noneOf(PrimarySkillType.class); boolean useDefaults = false; // If we had an error we back out and use defaults @@ -53,7 +54,7 @@ protected void loadKeys() { // Register them for (PrimarySkillType parentSkill : parentSkills) { - mcMMO.p.debug("Registering " + parentSkill.name() + " as parent of " + skill.name()); + LogUtils.debug(mcMMO.p.getLogger(), "Registering " + parentSkill.name() + " as parent of " + skill.name()); FamilyTree.registerParent(skill, parentSkill); } } diff --git a/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java b/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java index 3db284a9f7..a9e6b4bea1 100644 --- a/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java +++ b/src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java @@ -8,7 +8,7 @@ public class FixSpellingNetheriteUtil { public static void processFileCheck(mcMMO pluginRef, String fileName, UpgradeType upgradeType) { - pluginRef.getLogger().info("Checking " + fileName + " config material names..."); + LogUtils.debug(mcMMO.p.getLogger(), "Checking " + fileName + " config material names..."); File configFile = new File(pluginRef.getDataFolder(), fileName); if(configFile.exists()) { diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/src/main/java/com/gmail/nossr50/util/HolidayManager.java index f89937844e..6ea18317b8 100644 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ b/src/main/java/com/gmail/nossr50/util/HolidayManager.java @@ -186,14 +186,14 @@ // // for (File file : toDelete) { // if (file.delete()) { -// mcMMO.p.debug("Deleted: " + file.getName()); +// LogUtils.debug(mcMMO.p.getLogger(), "Deleted: " + file.getName()); // } // } // } // // // This gets called onDisable // public void saveAnniversaryFiles() { -// mcMMO.p.debug("Saving anniversary files..."); +// LogUtils.debug(mcMMO.p.getLogger(), "Saving anniversary files..."); // String anniversaryFilePath = mcMMO.getFlatFileDirectory() + "anniversary." + currentYear + ".yml"; // // try { diff --git a/src/main/java/com/gmail/nossr50/util/LogFilter.java b/src/main/java/com/gmail/nossr50/util/LogFilter.java index 355c070e7f..4a1ee3898c 100644 --- a/src/main/java/com/gmail/nossr50/util/LogFilter.java +++ b/src/main/java/com/gmail/nossr50/util/LogFilter.java @@ -5,6 +5,8 @@ import java.util.logging.Filter; import java.util.logging.LogRecord; +import static com.gmail.nossr50.util.LogUtils.DEBUG_STR; + public class LogFilter implements Filter { private final boolean debug; @@ -15,6 +17,6 @@ public LogFilter(mcMMO plugin) { @Override public boolean isLoggable(LogRecord record) { - return !(record.getMessage().contains("[Debug]") && !debug); + return !(record.getMessage().contains(DEBUG_STR) && !debug); } } diff --git a/src/main/java/com/gmail/nossr50/util/LogUtils.java b/src/main/java/com/gmail/nossr50/util/LogUtils.java new file mode 100644 index 0000000000..b0c114d00d --- /dev/null +++ b/src/main/java/com/gmail/nossr50/util/LogUtils.java @@ -0,0 +1,14 @@ +package com.gmail.nossr50.util; + +import org.jetbrains.annotations.NotNull; + +import java.util.logging.Logger; + +public class LogUtils { + + public static final String DEBUG_STR = "[D] "; + + public static void debug(@NotNull Logger logger, @NotNull String message) { + logger.info(DEBUG_STR + message); + } +} diff --git a/src/main/java/com/gmail/nossr50/util/ModManager.java b/src/main/java/com/gmail/nossr50/util/ModManager.java index 4ec27d1926..19e1202edc 100644 --- a/src/main/java/com/gmail/nossr50/util/ModManager.java +++ b/src/main/java/com/gmail/nossr50/util/ModManager.java @@ -268,7 +268,7 @@ public void addCustomEntity(Entity entity) { try { entitiesFile.save(entityFile); - mcMMO.p.debug(entity.getType().toString() + " was added to the custom entities file!"); + LogUtils.debug(mcMMO.p.getLogger(), entity.getType().toString() + " was added to the custom entities file!"); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java b/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java index 063c858c50..11d4a6d682 100644 --- a/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java +++ b/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java @@ -2,6 +2,7 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.compat.layers.bungee.AbstractBungeeSerializerCompatibilityLayer; import com.gmail.nossr50.util.compat.layers.bungee.BungeeLegacySerializerCompatibilityLayer; import com.gmail.nossr50.util.compat.layers.bungee.BungeeModernSerializerCompatibilityLayer; @@ -34,11 +35,11 @@ public class CompatibilityManager { private AbstractMasterAnglerCompatibility masterAnglerCompatibility; public CompatibilityManager(@NotNull MinecraftGameVersion minecraftGameVersion) { - mcMMO.p.getLogger().info("Loading compatibility layers..."); + LogUtils.debug(mcMMO.p.getLogger(), "Loading compatibility layers..."); this.minecraftGameVersion = minecraftGameVersion; this.nmsVersion = determineNMSVersion(); init(); - mcMMO.p.getLogger().info("Finished loading compatibility layers."); + LogUtils.debug(mcMMO.p.getLogger(), "Finished loading compatibility layers."); } private void init() { diff --git a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java index f7478e24c1..6685e816b1 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java @@ -4,6 +4,7 @@ import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; @@ -224,7 +225,7 @@ public void loadFormula() { * Save formula file. */ public void saveFormula() { - mcMMO.p.debug("Saving previous XP formula type..."); + LogUtils.debug(mcMMO.p.getLogger(), "Saving previous XP formula type..."); YamlConfiguration formulasFile = new YamlConfiguration(); formulasFile.set("Previous_Formula", previousFormula.toString()); diff --git a/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java b/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java index 989eb3da6c..e68ff19122 100644 --- a/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java +++ b/src/main/java/com/gmail/nossr50/util/platform/PlatformManager.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.util.platform; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.compat.CompatibilityManager; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; @@ -47,7 +48,7 @@ public Platform getPlatform() { private @NotNull MinecraftGameVersion determineGameVersion(String platformVersionString) { int major = 0, minor = 0, patch = 0; - mcMMO.p.getLogger().info("Platform String: " + platformVersionString); + LogUtils.debug(mcMMO.p.getLogger(), "Platform String: " + platformVersionString); // Gets two numbers separated by . and optional third number after next dot. Must end with - or _ Matcher versionMatch = Pattern.compile("(\\d+)\\.(\\d+)(?:\\.(\\d+))?[-_].*").matcher(platformVersionString); @@ -61,7 +62,7 @@ public Platform getPlatform() { } } - mcMMO.p.getLogger().info("Minecraft version determined to be - " + LogUtils.debug(mcMMO.p.getLogger(), "Minecraft version determined to be - " + major + "." + minor + "." + patch); diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java index ef0b63e43a..a7f4a840bf 100644 --- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java @@ -2,6 +2,7 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.MetadataConstants; import com.google.common.collect.ImmutableList; import org.bukkit.OfflinePlayer; @@ -85,7 +86,7 @@ public static void saveAll() { for (McMMOPlayer playerData : trackedSyncData) { try { - mcMMO.p.getLogger().info("Saving data for player: "+playerData.getPlayerName()); + LogUtils.debug(mcMMO.p.getLogger(), "Saving data for player: "+playerData.getPlayerName()); playerData.getProfile().save(true); } catch (Exception e) diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java index 1851f5479f..331d3f5b3f 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java @@ -9,6 +9,7 @@ import com.gmail.nossr50.events.scoreboard.ScoreboardEventReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.player.UserManager; import com.google.common.collect.ImmutableList; @@ -204,7 +205,7 @@ public static void teardownPlayer(Player player) { // Called in onDisable() public static void teardownAll() { ImmutableList onlinePlayers = ImmutableList.copyOf(mcMMO.p.getServer().getOnlinePlayers()); - mcMMO.p.debug("Tearing down scoreboards... (" + onlinePlayers.size() + ")"); + LogUtils.debug(mcMMO.p.getLogger(), "Tearing down scoreboards... (" + onlinePlayers.size() + ")"); for (Player player : onlinePlayers) { teardownPlayer(player); } @@ -524,7 +525,7 @@ public static boolean powerLevelHeartbeat() { if (objective != null) { objective.unregister(); - mcMMO.p.debug("Removed leftover targetBoard objects from Power Level Tags."); + LogUtils.debug(mcMMO.p.getLogger(), "Removed leftover targetBoard objects from Power Level Tags."); } return null; diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java index 24634bad2e..e0d3374132 100644 --- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java @@ -12,6 +12,7 @@ import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.skills.child.FamilyTree; +import com.gmail.nossr50.util.LogUtils; import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.player.NotificationManager; import com.gmail.nossr50.util.player.UserManager; @@ -260,7 +261,7 @@ public void tryRevertBoard() { oldBoard = null; } else { - mcMMO.p.debug("Not reverting targetBoard for " + playerName + " - targetBoard was changed by another plugin (Consider disabling the mcMMO scoreboards if you don't want them!)"); + LogUtils.debug(mcMMO.p.getLogger(), "Not reverting targetBoard for " + playerName + " - targetBoard was changed by another plugin (Consider disabling the mcMMO scoreboards if you don't want them!)"); } } @@ -419,7 +420,7 @@ protected void loadObjective(String displayName) { } catch (IllegalStateException e) { McMMOPlayer mmoPlayer = UserManager.getPlayer(player); - mcMMO.p.debug("Recovering scoreboard for player: " + player.getName()); + LogUtils.debug(mcMMO.p.getLogger(), "Recovering scoreboard for player: " + player.getName()); if(mmoPlayer.isDebugMode()) NotificationManager.sendPlayerInformationChatOnlyPrefixed(player, "Scoreboard.Recovery"); diff --git a/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java b/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java index 2325b28007..4bb13f6eba 100644 --- a/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java +++ b/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java @@ -3,6 +3,7 @@ import com.gmail.nossr50.config.BukkitConfig; import com.gmail.nossr50.datatypes.database.UpgradeType; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import java.util.Arrays; import java.util.EnumSet; @@ -41,7 +42,7 @@ public void setUpgradeCompleted(final UpgradeType type) { return; } - mcMMO.p.debug("Saving upgrade status for type " + type.toString() + "..."); + LogUtils.debug(mcMMO.p.getLogger(), "Saving upgrade status for type " + type.toString() + "..."); config.set("Upgrades_Finished." + type.toString(), true); @@ -61,6 +62,6 @@ protected void loadKeys() { } } - mcMMO.p.debug("Needed upgrades: " + Arrays.toString(setNeededUpgrades.toArray(new UpgradeType[setNeededUpgrades.size()]))); + LogUtils.debug(mcMMO.p.getLogger(), "Needed upgrades: " + Arrays.toString(setNeededUpgrades.toArray(new UpgradeType[setNeededUpgrades.size()]))); } } diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java index 3e4ea33869..29b4e89c2f 100644 --- a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java +++ b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.worldguard; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitPlayer; import com.sk89q.worldguard.WorldGuard; @@ -94,7 +95,7 @@ public void registerFlags() registry.register(WorldGuardFlags.MCMMO_ENABLE_WG_FLAG); registry.register(WorldGuardFlags.MCMMO_XP_WG_FLAG); registry.register(WorldGuardFlags.MCMMO_HARDCORE_WG_FLAG); - mcMMO.p.getLogger().info("Registered WG flags successfully!"); + LogUtils.debug(mcMMO.p.getLogger(), "Registered WG flags successfully!"); } catch (FlagConflictException e) { e.printStackTrace(); mcMMO.p.getLogger().warning("Failed to register WG flags!"); diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java index 479b9dbfed..d37f0a50c8 100644 --- a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java +++ b/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java @@ -1,6 +1,7 @@ package com.gmail.nossr50.worldguard; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.protection.flags.registry.SimpleFlagRegistry; @@ -67,7 +68,7 @@ private static WorldGuardPlugin getWorldGuard() if(plugin == null) { //WG is not present detectedIncompatibleWG = true; - mcMMO.p.getLogger().info("WorldGuard was not detected."); + LogUtils.debug(mcMMO.p.getLogger(), "WorldGuard was not detected."); } else { //Check that its actually of class WorldGuardPlugin if(plugin instanceof WorldGuardPlugin) diff --git a/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java b/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java index f6f0d829c7..4ce8fee088 100644 --- a/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java +++ b/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java @@ -1,6 +1,7 @@ package net.shatteredlands.shatt.backup; import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.LogUtils; import java.io.File; import java.io.FileInputStream; @@ -27,13 +28,13 @@ public class ZipLibrary { public static void mcMMOBackup() throws IOException { if (mcMMO.p.getGeneralConfig().getUseMySQL()) { - mcMMO.p.debug("This server is running in SQL Mode."); - mcMMO.p.debug("Only config files will be backed up."); + LogUtils.debug(mcMMO.p.getLogger(), "This server is running in SQL Mode."); + LogUtils.debug(mcMMO.p.getLogger(), "Only config files will be backed up."); } try { if (BACKUP_DIR.mkdir()) { - mcMMO.p.debug("Created Backup Directory."); + LogUtils.debug(mcMMO.p.getLogger(), "Created Backup Directory."); } } catch (Exception e) { @@ -60,7 +61,7 @@ public static void mcMMOBackup() throws IOException { } // Actually do something - mcMMO.p.debug("Backing up your mcMMO Configuration... "); + LogUtils.debug(mcMMO.p.getLogger(), "Backing up your mcMMO Configuration... "); packZip(fileZip, sources); } @@ -80,7 +81,7 @@ private static void packZip(File output, List sources) throws IOException zipOut.flush(); zipOut.close(); - mcMMO.p.debug("Backup Completed."); + LogUtils.debug(mcMMO.p.getLogger(), "Backup Completed."); } private static String buildPath(String path, String file) {