Cleaned up event status messages.

Bukkit · May 12, 2011 · a291676 · a291676
1 parent 02c0e27
commit a291676
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/main/java/com/cogito/bukkit/dev/DevBukkit.java b/src/main/java/com/cogito/bukkit/dev/DevBukkit.java
@@ -311,12 +311,9 @@ private void infoMessage(CommandSender sender, String message) {
 
     private void printHelp(CommandSender sender) {
         printHelpHeader(sender);
-        Class<?> topLevelClass = BlockEvent.class;
-        sender.sendMessage((debug(topLevelClass)?ChatColor.GREEN:ChatColor.RED) + "block -> " + topLevelClass.getSimpleName());
-        topLevelClass = EntityEvent.class;
-        sender.sendMessage((debug(topLevelClass)?ChatColor.GREEN:ChatColor.RED) + "entity -> " + topLevelClass.getSimpleName());
-        topLevelClass = PlayerEvent.class;
-        sender.sendMessage((debug(topLevelClass)?ChatColor.GREEN:ChatColor.RED) + "player -> " + topLevelClass.getSimpleName());
+        sender.sendMessage(eventStatus("block"));
+        sender.sendMessage(eventStatus("entity"));
+        sender.sendMessage(eventStatus("player"));
         sender.sendMessage("Use help <name> to get help on a specific event. ");
 
     }
@@ -325,9 +322,7 @@ private void printHelp(CommandSender sender, Class<?> eventClass) {
         printHelpHeader(sender);
         for(Entry<String, Class<?>> entry : eventAliases.entrySet()){
             if(eventClass.isAssignableFrom(entry.getValue())){
-                sender.sendMessage((debug(entry.getValue())?ChatColor.GREEN:ChatColor.RED)+"D "
-                                  +(cancel(entry.getValue())?ChatColor.GREEN:ChatColor.RED)+"C | "
-                                  +ChatColor.WHITE+entry.getKey() + " -> " + entry.getValue().getSimpleName());
+                sender.sendMessage(eventStatus(entry.getKey()));
             }
         }
     }
@@ -336,10 +331,10 @@ private void printHelpHeader(CommandSender sender) {
         sender.sendMessage(ChatColor.GOLD + "== Dev Help ==");
         if(sender instanceof Player){
             Player player = (Player)sender;
-            player.sendMessage((isGod(player)?ChatColor.GREEN:ChatColor.RED) + "GOD MODE "+(isGod(player)?"ON":"OFF"));
+            player.sendMessage((isGod(player)?ChatColor.GREEN:ChatColor.RED) + "GOD MODE IS "+(isGod(player)?"ON":"OFF"));
         }
-        sender.sendMessage((debugGlobal?ChatColor.GREEN:ChatColor.RED) + "DEBUG MODE "+(debugGlobal?"ON":"OFF"));
-        sender.sendMessage((cancelGlobal?ChatColor.GREEN:ChatColor.RED) + "CANCEL MODE "+(cancelGlobal?"ON":"OFF"));
+        sender.sendMessage((debugGlobal?ChatColor.GREEN:ChatColor.RED) + "DEBUG MODE IS "+(debugGlobal?"ON":"OFF"));
+        sender.sendMessage((cancelGlobal?ChatColor.GREEN:ChatColor.RED) + "CANCEL MODE IS "+(cancelGlobal?"ON":"OFF"));
     }
 
     public void debugMessage(String string) {
@@ -419,6 +414,11 @@ public void godMode(Event event) {
         }
     }
 
+    private String eventStatus(String eventAlias) {
+        Class<?> eventClass = eventAliases.get(eventAlias);
+        return (debug(eventClass)?ChatColor.GREEN:ChatColor.RED)+"D "+(cancel(eventClass)?ChatColor.GREEN:ChatColor.RED)+"C | "+ChatColor.WHITE+eventAlias + " -> " + eventClass.getSimpleName();
+    }
+
     private String debugString(Event event) {
         Event e = event;
         String message = e.getClass().getSimpleName()+" ["+e.getType()+"]";