[Bug Fix/Feature] Fix small bug when compiling unofficially. Fix MessageUtil not logging colours correctly. Fix ConfigYml reloading not working. Fix Metrics using while loop instead of for loop./Enable Metrics.

Author: MiracleM4n

pom.xml

@@ -4,14 +4,14 @@
     <!-- Project information -->
     <groupId>ca.q0r</groupId>
     <artifactId>MChat</artifactId>
-    <version>1.6.4-R0.7</version>
+    <version>1.6.4-R0.8</version>
     <name>MChat</name>
     <url>http://mdev.in/</url>
     <description>Chat Formatting for Bukkit</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <build.number>Unknown</build.number>
+        <build.number>b0jnks</build.number>
     </properties>
 
     <!-- Source code -->

src/main/java/ca/q0r/mchat/MChat.java

@@ -8,6 +8,7 @@
 import ca.q0r.mchat.events.ChatListener;
 import ca.q0r.mchat.events.CommandListener;
 import ca.q0r.mchat.events.PlayerListener;
+import ca.q0r.mchat.metrics.Metrics;
 import ca.q0r.mchat.types.InfoType;
 import ca.q0r.mchat.updater.Updater;
 import ca.q0r.mchat.util.MessageUtil;
@@ -44,16 +45,16 @@ public void onEnable() {
         killEss();
 
         // Initialize Metrics
-        /*getServer().getScheduler().runTaskLater(this, new BukkitRunnable(){
+        getServer().getScheduler().runTaskLater(this, new BukkitRunnable(){
 				@Override
 				public void run() {
 					try {
 						Metrics metrics = new Metrics(Bukkit.getPluginManager().getPlugin("MChat"));
 			            metrics.findCustomData();
 			            metrics.start();
-			        } catch (IOException ignored) {}	
+			        } catch (Exception ignored) {}
 				}
-			}, 200);*/
+			}, 200);
 
         // Load Yml
         YmlManager.initialize();

src/main/java/ca/q0r/mchat/commands/MChatCommand.java

@@ -46,6 +46,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                         return true;
                     }
 
+                    YmlManager.reloadYml(YmlType.CONFIG_YML);
                     MessageUtil.sendMessage(sender, "Config Reloaded.");
                     return true;
                 } else if (args[1].equalsIgnoreCase("info")

src/main/java/ca/q0r/mchat/metrics/Metrics.java

@@ -471,11 +471,7 @@ private void postPlugin(final boolean isPing) throws IOException {
 
                 boolean firstGraph = true;
 
-                final Iterator<Graph> iter = graphs.iterator();
-
-                while (iter.hasNext()) {
-                    Graph graph = iter.next();
-
+                for (Graph graph : graphs) {
                     StringBuilder graphJson = new StringBuilder();
                     graphJson.append('{');
 
@@ -560,11 +556,7 @@ private void postPlugin(final boolean isPing) throws IOException {
             // Is this the first update this hour?
             if (response.equals("1") || response.contains("This is your first update this hour")) {
                 synchronized (graphs) {
-                    final Iterator<Graph> iter = graphs.iterator();
-
-                    while (iter.hasNext()) {
-                        final Graph graph = iter.next();
-
+                    for (Graph graph : graphs) {
                         for (Plotter plotter : graph.getPlotters()) {
                             plotter.reset();
                         }
@@ -681,7 +673,7 @@ private static String escapeJSON(String text) {
                 default:
                     if (chr < ' ') {
                         String t = "000" + Integer.toHexString(chr);
-                        builder.append("\\u" + t.substring(t.length() - 4));
+                        builder.append("\\u").append(t.substring(t.length() - 4));
                     } else {
                         builder.append(chr);
                     }

src/main/java/ca/q0r/mchat/util/MessageUtil.java

@@ -1,5 +1,6 @@
 package ca.q0r.mchat.util;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
 import java.util.logging.Level;
@@ -41,24 +42,15 @@ public static void sendMessage(CommandSender sender, String message) {
      * @param message Object being Logged.
      */
     public static void log(Object message) {
-        System.out.println(message);
-    }
-
-    /**
-     * Logger.
-     * @param level Level to be logged at.
-     * @param message Object being Logged.
-     */
-    public static void log(Level level, Object message) {
-        Logger.getLogger("Minecraft").log(level, message.toString());
+        Bukkit.getConsoleSender().sendMessage(message.toString());
     }
 
     /**
      * Logger.
      * @param message Object being Logged.
      */
     public static void logFormatted(Object message) {
-        System.out.println(format(message.toString()));
+        log(format(message.toString()));
     }
     /**
      * Colour Formatting.

src/main/java/ca/q0r/mchat/util/Timer.java

@@ -1,7 +1,5 @@
 package ca.q0r.mchat.util;
 
-import java.util.Date;
-
 /**
  * Class used when a Timer is needed.
  */
@@ -13,7 +11,7 @@ public class Timer {
      * Class Initializer, also starts timer.
      */
     public Timer() {
-        start = new Date().getTime();
+        start = System.nanoTime();
     }
 
     /**
@@ -28,21 +26,53 @@ public void reset() {
      * Starts timer.
      */
     public void start() {
-        start = new Date().getTime();
+        start = System.nanoTime();
     }
 
     /**
      * Stops timer.
      */
     public void stop() {
-        end = new Date().getTime();
+        end = System.nanoTime();
     }
 
     /**
      * Calculates Difference.
-     * @return Difference between start and end values.
+     * @return Difference between start and end values in milliseconds.
      */
     public long difference() {
+        return differenceInMillis();
+    }
+
+    /**
+     * Calculates Difference.
+     * @return Difference between start and end values in seconds.
+     */
+    public long differenceInSeconds() {
+        return differenceInMillis() / 1000;
+    }
+
+    /**
+     * Calculates Difference.
+     * @return Difference between start and end values in milliseconds.
+     */
+    public long differenceInMillis() {
+        return differenceInMicros() / 1000;
+    }
+
+    /**
+     * Calculates Difference.
+     * @return Difference between start and end values in microseconds.
+     */
+    public long differenceInMicros() {
+        return differenceInNanos() / 1000;
+    }
+
+    /**
+     * Calculates Difference.
+     * @return Difference between start and end values in nanoseconds.
+     */
+    public long differenceInNanos() {
         return end - start;
     }
 }

src/main/java/ca/q0r/mchat/yml/YmlManager.java

@@ -37,14 +37,15 @@ public static void initialize() {
      * @return YML Config.
      */
     public static Yml getYml(YmlType type) {
-        if (type == YmlType.CENSOR_YML) {
-            return censorYml;
-        } else if (type == YmlType.CONFIG_YML) {
-            return configYml;
-        } else if (type == YmlType.INFO_YML) {
-            return infoYml;
-        } else if (type == YmlType.LOCALE_YML) {
-            return localeYml;
+        switch(type) {
+            case CENSOR_YML:
+                return censorYml;
+            case CONFIG_YML:
+                return configYml;
+            case INFO_YML:
+                return infoYml;
+            case LOCALE_YML:
+                return localeYml;
         }
 
         return null;
@@ -55,18 +56,23 @@ public static Yml getYml(YmlType type) {
      * @param type Type of Config to reload.
      */
     public static void reloadYml(YmlType type) {
-        if (type == YmlType.CENSOR_YML) {
-            censorYml = new CensorYml();
-            censorYml.loadDefaults();
-        } else if (type == YmlType.CONFIG_YML) {
-            configYml = new ConfigYml();
-            configYml.loadDefaults();
-        } else if (type == YmlType.INFO_YML) {
-            infoYml = new InfoYml();
-            infoYml.loadDefaults();
-        } else if (type == YmlType.LOCALE_YML) {
-            localeYml = new LocaleYml();
-            localeYml.loadDefaults();
+        switch(type) {
+            case CENSOR_YML:
+                censorYml = new CensorYml();
+                censorYml.loadDefaults();
+                break;
+            case CONFIG_YML:
+                configYml = new ConfigYml();
+                configYml.loadDefaults();
+                break;
+            case INFO_YML:
+                infoYml = new InfoYml();
+                infoYml.loadDefaults();
+                break;
+            case LOCALE_YML:
+                localeYml = new LocaleYml();
+                localeYml.loadDefaults();
+                break;
         }
     }