Browse Source

Merge pull request #4173 from Draycia/master

Use logger instead of sysout
Robert Alan Chapton 5 years ago
parent
commit
e884b2b7f1

+ 1 - 1
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java

@@ -796,7 +796,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
         }
 
 
         //Invalid Color
         //Invalid Color
-        System.out.println("[mcMMO] " + configColor + " is an invalid color value");
+        mcMMO.p.getLogger().warning(configColor + " is an invalid color value");
         return ChatColor.WHITE;
         return ChatColor.WHITE;
     }
     }
 
 

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/InteractionManager.java

@@ -54,7 +54,7 @@ public class InteractionManager {
         if(subSkillNameMap.get(lowerCaseName) == null)
         if(subSkillNameMap.get(lowerCaseName) == null)
             subSkillNameMap.put(lowerCaseName, abstractSubSkill);
             subSkillNameMap.put(lowerCaseName, abstractSubSkill);
 
 
-        System.out.println("[mcMMO] registered subskill: "+ abstractSubSkill.getConfigKeyName());
+        mcMMO.p.getLogger().info("Registered subskill: "+ abstractSubSkill.getConfigKeyName());
     }
     }
 
 
     /**
     /**

+ 1 - 1
src/main/java/com/gmail/nossr50/mcMMO.java

@@ -560,7 +560,7 @@ public class mcMMO extends JavaPlugin {
 
 
         if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS))
         if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS))
         {
         {
-            System.out.println("[mcMMO]" + " enabling Acrobatics Skills");
+            getLogger().info("Enabling Acrobatics Skills");
 
 
             //TODO: Should do this differently
             //TODO: Should do this differently
             Roll roll = new Roll();
             Roll roll = new Roll();

+ 3 - 2
src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.worldguard;
 package com.gmail.nossr50.worldguard;
 
 
+import com.gmail.nossr50.mcMMO;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.WorldGuard;
@@ -93,10 +94,10 @@ public class WorldGuardManager {
                 registry.register(WorldGuardFlags.MCMMO_ENABLE_WG_FLAG);
                 registry.register(WorldGuardFlags.MCMMO_ENABLE_WG_FLAG);
                 registry.register(WorldGuardFlags.MCMMO_XP_WG_FLAG);
                 registry.register(WorldGuardFlags.MCMMO_XP_WG_FLAG);
                 registry.register(WorldGuardFlags.MCMMO_HARDCORE_WG_FLAG);
                 registry.register(WorldGuardFlags.MCMMO_HARDCORE_WG_FLAG);
-                System.out.println("mcMMO has registered WG flags successfully!");
+                mcMMO.p.getLogger().info("Registered WG flags successfully!");
             } catch (FlagConflictException e) {
             } catch (FlagConflictException e) {
                 e.printStackTrace();
                 e.printStackTrace();
-                System.out.println("mcMMO has failed to register WG flags!");
+                mcMMO.p.getLogger().warning("Failed to register WG flags!");
                 // some other plugin registered a flag by the same name already.
                 // some other plugin registered a flag by the same name already.
                 // you may want to re-register with a different name, but this
                 // you may want to re-register with a different name, but this
                 // could cause issues with saved flags in region files. it's better
                 // could cause issues with saved flags in region files. it's better