Character Type Metrics

src/main/java/net/citizensnpcs/Citizens.java

@@ -19,6 +19,7 @@
 import net.citizensnpcs.api.util.NBTStorage;
 import net.citizensnpcs.api.util.Storage;
 import net.citizensnpcs.api.util.YamlStorage;
+import net.citizensnpcs.api.npc.character.Character;
 import net.citizensnpcs.command.CommandManager;
 import net.citizensnpcs.command.Injector;
 import net.citizensnpcs.command.command.AdminCommands;
@@ -167,35 +168,39 @@ public void onEnable() {
         if (getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
             @Override
             public void run() {
-                setupNPCs();
+                setupNPCs(); 
+                // Run metrics "last"
+                startMetrics();
             }
         }) == -1) {
             Messaging.log(Level.SEVERE, "Issue enabling plugin. Disabling.");
             getServer().getPluginManager().disablePlugin(this);
         }
-
-        // Run metrics last
-        startMetrics();
     }
 
     private void startMetrics() {
         new Thread() {
             @Override
             public void run() {
                 try {
-                    Metrics metrics = new Metrics();
-                    metrics.addCustomData(Citizens.this, new Metrics.Plotter() {
-                        @Override
-                        public String getColumnName() {
-                            return "Total NPCs";
-                        }
-
+                    Metrics metrics = new Metrics(Citizens.this);
+                    metrics.addCustomData(new Metrics.Plotter("Total NPCs") {
                         @Override
                         public int getValue() {
                             return Iterators.size(npcManager.iterator());
                         }
                     });
-                    metrics.beginMeasuringPlugin(Citizens.this);
+                    Metrics.Graph graph = metrics.createGraph("Character Type Usage");
+                    Messaging.log("Starting Metrics");
+                    for(Character character : characterManager.getRegistered()){                        
+                        graph.addPlotter(new Metrics.Plotter(StringHelper.capitalize(character.getName())) {
+                            @Override
+                            public int getValue() {
+                                return 1;
+                            }
+                        });
+                    }
+                    metrics.start();
                 } catch (IOException ex) {
                     Messaging.log("Unable to load metrics");
                 }

src/main/java/net/citizensnpcs/npc/CitizensCharacterManager.java

@@ -27,4 +27,7 @@ public void registerCharacter(CharacterFactory factory) {
             ex.printStackTrace();
         }
     }
+    public Iterable<Character> getRegistered(){
+        return registered.values();
+    }
 }