Promote Message and CommandAPI to CitizensAPI, deprecate Citizens2 command API

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

@@ -9,6 +9,10 @@ import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.CitizensPlugin;
 import net.citizensnpcs.api.ai.speech.SpeechFactory;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.CommandManager;
+import net.citizensnpcs.api.command.Injector;
+import net.citizensnpcs.api.command.CommandManager.CommandInfo;
 import net.citizensnpcs.api.event.CitizensDisableEvent;
 import net.citizensnpcs.api.event.CitizensEnableEvent;
 import net.citizensnpcs.api.event.CitizensReloadEvent;
@@ -20,16 +24,13 @@ import net.citizensnpcs.api.scripting.ObjectProvider;
 import net.citizensnpcs.api.scripting.ScriptCompiler;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitFactory;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.api.util.Translator;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.CommandManager;
-import net.citizensnpcs.command.CommandManager.CommandInfo;
-import net.citizensnpcs.command.Injector;
-import net.citizensnpcs.command.RequirementsProcessor;
 import net.citizensnpcs.command.command.AdminCommands;
 import net.citizensnpcs.command.command.EditorCommands;
 import net.citizensnpcs.command.command.HelpCommands;
 import net.citizensnpcs.command.command.NPCCommands;
+import net.citizensnpcs.command.command.RequirementsProcessor;
 import net.citizensnpcs.command.command.ScriptCommands;
 import net.citizensnpcs.command.command.TemplateCommands;
 import net.citizensnpcs.command.command.TraitCommands;
@@ -41,7 +42,6 @@ import net.citizensnpcs.npc.NPCSelector;
 import net.citizensnpcs.npc.ai.speech.Chat;
 import net.citizensnpcs.npc.ai.speech.CitizensSpeechFactory;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.StringHelper;
 import net.citizensnpcs.util.Util;

src/main/java/net/citizensnpcs/EventListen.java

@@ -19,11 +19,11 @@ import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.trait.Owner;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.CurrentLocation;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 

src/main/java/net/citizensnpcs/NPCDataStore.java

@@ -10,13 +10,13 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.api.util.DatabaseStorage;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.api.util.NBTStorage;
 import net.citizensnpcs.api.util.Storage;
 import net.citizensnpcs.api.util.YamlStorage;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.CitizensNPCRegistry;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.Util;
 
 import org.bukkit.entity.EntityType;

src/main/java/net/citizensnpcs/PaymentListener.java

@@ -2,8 +2,8 @@ package net.citizensnpcs;
 
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 

src/main/java/net/citizensnpcs/Settings.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.api.util.Storage;
 import net.citizensnpcs.api.util.YamlStorage;
 
@@ -25,15 +26,22 @@ public class Settings {
             } else
                 setting.loadFromKey(root);
         }
+        updateMessagingSettings();
 
         save();
     }
 
+    private void updateMessagingSettings() {
+        Messaging.configure(Setting.DEBUG_MODE.asBoolean(), Setting.MESSAGE_COLOUR.asString(),
+                Setting.HIGHLIGHT_COLOUR.asString());
+    }
+
     public void reload() {
         config.load();
         for (Setting setting : Setting.values())
             if (root.keyExists(setting.path))
                 setting.loadFromKey(root);
+        updateMessagingSettings();
 
         save();
     }

src/main/java/net/citizensnpcs/command/Command.java

@@ -3,6 +3,7 @@ package net.citizensnpcs.command;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+@Deprecated
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Command {
     /**

src/main/java/net/citizensnpcs/command/CommandAnnotationProcessor.java

@@ -6,6 +6,7 @@ import net.citizensnpcs.command.exception.CommandException;
 
 import org.bukkit.command.CommandSender;
 
+@Deprecated
 public interface CommandAnnotationProcessor {
     /**
      * @return The {@link Annotation} class that this processor will accept.

src/main/java/net/citizensnpcs/command/CommandConfigurable.java

@@ -1,5 +1,7 @@
 package net.citizensnpcs.command;
 
+
+@Deprecated
 public interface CommandConfigurable {
     void configure(CommandContext args);
 }

src/main/java/net/citizensnpcs/command/CommandContext.java

@@ -31,6 +31,7 @@ import org.bukkit.entity.Player;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+@Deprecated
 public class CommandContext {
     protected String[] args;
     protected final Set<Character> flags = new HashSet<Character>();

src/main/java/net/citizensnpcs/command/CommandManager.java

@@ -14,6 +14,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.command.exception.CommandException;
 import net.citizensnpcs.command.exception.CommandUsageException;
 import net.citizensnpcs.command.exception.NoPermissionsException;
@@ -21,7 +22,6 @@ import net.citizensnpcs.command.exception.ServerCommandException;
 import net.citizensnpcs.command.exception.UnhandledCommandException;
 import net.citizensnpcs.command.exception.WrappedCommandException;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.StringHelper;
 
 import org.bukkit.command.CommandSender;
@@ -34,6 +34,7 @@ import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+@Deprecated
 public class CommandManager {
     private final Map<Class<? extends Annotation>, CommandAnnotationProcessor> annotationProcessors = Maps.newHashMap();
 

src/main/java/net/citizensnpcs/command/Injector.java

@@ -4,8 +4,9 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 
-import net.citizensnpcs.util.Messaging;
+import net.citizensnpcs.api.util.Messaging;
 
+@Deprecated
 public class Injector {
     private final Class<?>[] argClasses;
     private final Object[] args;

src/main/java/net/citizensnpcs/command/command/AdminCommands.java

@@ -1,14 +1,13 @@
 package net.citizensnpcs.command.command;
 
 import net.citizensnpcs.Citizens;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.exception.CommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.StringHelper;
 
 import org.bukkit.command.CommandSender;

src/main/java/net/citizensnpcs/command/command/EditorCommands.java

@@ -1,9 +1,8 @@
 package net.citizensnpcs.command.command;
 
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.Requirements;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.editor.EquipmentEditor;
 import net.citizensnpcs.trait.text.Text;

src/main/java/net/citizensnpcs/command/command/HelpCommands.java

@@ -5,14 +5,13 @@ import java.util.List;
 import java.util.Set;
 
 import net.citizensnpcs.Citizens;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.CommandManager.CommandInfo;
+import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.CommandManager.CommandInfo;
-import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.exception.CommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.Paginator;
 import net.citizensnpcs.util.StringHelper;
 

src/main/java/net/citizensnpcs/command/command/NPCCommands.java

@@ -9,6 +9,11 @@ import net.citizensnpcs.Citizens;
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.ai.speech.SpeechContext;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
+import net.citizensnpcs.api.command.exception.NoPermissionsException;
+import net.citizensnpcs.api.command.exception.ServerCommandException;
 import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCRegistry;
@@ -20,12 +25,7 @@ import net.citizensnpcs.api.trait.trait.Speech;
 import net.citizensnpcs.api.util.Colorizer;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.api.util.MemoryDataKey;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.exception.CommandException;
-import net.citizensnpcs.command.exception.NoPermissionsException;
-import net.citizensnpcs.command.exception.ServerCommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.EntityControllers;
 import net.citizensnpcs.npc.NPCSelector;
@@ -45,7 +45,6 @@ import net.citizensnpcs.trait.VillagerProfession;
 import net.citizensnpcs.trait.ZombieModifier;
 import net.citizensnpcs.util.Anchor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Paginator;
 import net.citizensnpcs.util.StringHelper;

src/main/java/net/citizensnpcs/command/command/Requirements.java

@@ -1,4 +1,4 @@
-package net.citizensnpcs.command;
+package net.citizensnpcs.command.command;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/net/citizensnpcs/command/command/RequirementsProcessor.java

@@ -1,4 +1,4 @@
-package net.citizensnpcs.command;
+package net.citizensnpcs.command.command;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
@@ -6,14 +6,16 @@ import java.util.EnumSet;
 import java.util.Set;
 
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.command.CommandAnnotationProcessor;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
+import net.citizensnpcs.api.command.exception.RequirementMissingException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.trait.MobType;
 import net.citizensnpcs.api.trait.trait.Owner;
-import net.citizensnpcs.command.exception.CommandException;
-import net.citizensnpcs.command.exception.RequirementMissingException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.EntityType;

src/main/java/net/citizensnpcs/command/command/ScriptCommands.java

@@ -4,15 +4,15 @@ import java.io.File;
 
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.scripting.CompileCallback;
 import net.citizensnpcs.api.scripting.Script;
 import net.citizensnpcs.api.scripting.ScriptFactory;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.exception.CommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/net/citizensnpcs/command/command/SelectionPrompt.java

@@ -5,9 +5,9 @@ import java.util.List;
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.npc.NPCSelector;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.Conversation;

src/main/java/net/citizensnpcs/command/command/TemplateCommands.java

@@ -6,15 +6,14 @@ import javax.annotation.Nullable;
 
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.exception.CommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.npc.Template;
 import net.citizensnpcs.npc.Template.TemplateBuilder;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/net/citizensnpcs/command/command/TraitCommands.java

@@ -3,16 +3,15 @@ package net.citizensnpcs.command.command;
 import java.util.List;
 
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandConfigurable;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
+import net.citizensnpcs.api.command.exception.NoPermissionsException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.Trait;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandConfigurable;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.exception.CommandException;
-import net.citizensnpcs.command.exception.NoPermissionsException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.StringHelper;
 
 import org.bukkit.command.CommandSender;

src/main/java/net/citizensnpcs/command/command/WaypointCommands.java

@@ -1,14 +1,13 @@
 package net.citizensnpcs.command.command;
 
 import net.citizensnpcs.Citizens;
+import net.citizensnpcs.api.command.Command;
+import net.citizensnpcs.api.command.CommandContext;
+import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.command.Command;
-import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.exception.CommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.trait.waypoint.Waypoints;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/net/citizensnpcs/command/exception/CommandException.java

@@ -1,6 +1,6 @@
 package net.citizensnpcs.command.exception;
 
-import net.citizensnpcs.util.Messaging;
+import net.citizensnpcs.api.util.Messaging;
 
 public class CommandException extends Exception {
     public CommandException() {

src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.command.exception;
 
+
 public class CommandUsageException extends CommandException {
     protected String usage;
 

src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.command.exception;
 
+
 public class RequirementMissingException extends CommandException {
     public RequirementMissingException(String message) {
         super(message);

src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.command.exception;
 
+
 public class ServerCommandException extends CommandException {
     private static final long serialVersionUID = 9120268556899197316L;
 }

src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.command.exception;
 
+
 public class UnhandledCommandException extends CommandException {
     private static final long serialVersionUID = 3370887306593968091L;
 }

src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java

@@ -1,5 +1,6 @@
 package net.citizensnpcs.command.exception;
 
+
 public class WrappedCommandException extends CommandException {
     public WrappedCommandException(Throwable t) {
         super(t);

src/main/java/net/citizensnpcs/editor/Editor.java

@@ -4,8 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

src/main/java/net/citizensnpcs/editor/EndermanEquipper.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.editor;
 
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Equipment;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Enderman;

src/main/java/net/citizensnpcs/editor/EquipmentEditor.java

@@ -4,8 +4,8 @@ import java.util.Map;
 
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

src/main/java/net/citizensnpcs/editor/GenericEquipper.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.editor;
 
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Equipment;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/java/net/citizensnpcs/editor/PigEquipper.java

@@ -1,9 +1,9 @@
 package net.citizensnpcs.editor;
 
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.trait.Saddle;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Pig;

src/main/java/net/citizensnpcs/editor/SheepEquipper.java

@@ -1,10 +1,10 @@
 package net.citizensnpcs.editor;
 
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.trait.Sheared;
 import net.citizensnpcs.trait.WoolColor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.DyeColor;
 import org.bukkit.Material;

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

@@ -16,10 +16,10 @@ import net.citizensnpcs.api.persistence.PersistenceLoader;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.trait.Spawned;
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.npc.ai.CitizensNavigator;
 import net.citizensnpcs.trait.CurrentLocation;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
 import net.minecraft.server.v1_4_R1.EntityLiving;

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

@@ -9,8 +9,8 @@ import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.citizensnpcs.api.event.NPCSelectEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Owner;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.editor.Editor;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.Util;
 
 import org.bukkit.Bukkit;

src/main/java/net/citizensnpcs/npc/ai/speech/Chat.java

@@ -4,16 +4,16 @@ import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
-import net.citizensnpcs.api.ai.speech.Talkable;
 import net.citizensnpcs.api.ai.speech.SpeechContext;
+import net.citizensnpcs.api.ai.speech.Talkable;
 import net.citizensnpcs.api.ai.speech.VocalChord;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.util.Messaging;
+import net.citizensnpcs.api.util.Messaging;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
 
 public class Chat implements VocalChord {
 

src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java

@@ -4,14 +4,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.bukkit.entity.LivingEntity;
-
-import com.google.common.base.Preconditions;
-
 import net.citizensnpcs.api.ai.speech.SpeechFactory;
 import net.citizensnpcs.api.ai.speech.Talkable;
 import net.citizensnpcs.api.ai.speech.VocalChord;
 
+import org.bukkit.entity.LivingEntity;
+
+import com.google.common.base.Preconditions;
+
 public class CitizensSpeechFactory implements SpeechFactory {
 
     Map<String, Class<? extends VocalChord>> registered = new HashMap<String, Class<? extends VocalChord>>();

src/main/java/net/citizensnpcs/npc/ai/speech/TalkableEntity.java

@@ -7,7 +7,7 @@ import net.citizensnpcs.api.ai.speech.VocalChord;
 import net.citizensnpcs.api.ai.speech.event.SpeechBystanderEvent;
 import net.citizensnpcs.api.ai.speech.event.SpeechTargetedEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.util.Messaging;
+import net.citizensnpcs.api.util.Messaging;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.LivingEntity;

src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java

@@ -2,7 +2,6 @@ package net.citizensnpcs.npc.network;
 
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.MinecraftServer;
-import net.minecraft.server.v1_4_R1.PlayerConnection;
 import net.minecraft.server.v1_4_R1.NetworkManager;
 import net.minecraft.server.v1_4_R1.Packet;
 import net.minecraft.server.v1_4_R1.Packet102WindowClick;
@@ -16,6 +15,7 @@ import net.minecraft.server.v1_4_R1.Packet255KickDisconnect;
 import net.minecraft.server.v1_4_R1.Packet28EntityVelocity;
 import net.minecraft.server.v1_4_R1.Packet3Chat;
 import net.minecraft.server.v1_4_R1.Packet51MapChunk;
+import net.minecraft.server.v1_4_R1.PlayerConnection;
 
 public class EmptyNetHandler extends PlayerConnection {
     public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) {

src/main/java/net/citizensnpcs/trait/Age.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.trait;
 
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Ageable;

src/main/java/net/citizensnpcs/trait/Anchors.java

@@ -6,9 +6,9 @@ import java.util.List;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Anchor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/net/citizensnpcs/trait/Controllable.java

@@ -3,14 +3,14 @@ package net.citizensnpcs.trait;
 import java.lang.reflect.Constructor;
 import java.util.Map;
 
+import net.citizensnpcs.api.command.CommandConfigurable;
+import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.trait.Owner;
 import net.citizensnpcs.api.util.DataKey;
-import net.citizensnpcs.command.CommandConfigurable;
-import net.citizensnpcs.command.CommandContext;
 import net.citizensnpcs.util.Util;
 import net.minecraft.server.v1_4_R1.EntityLiving;
 import net.minecraft.server.v1_4_R1.EntityPlayer;

src/main/java/net/citizensnpcs/trait/LookClose.java

@@ -6,11 +6,11 @@ import java.util.List;
 
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.command.CommandConfigurable;
+import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
-import net.citizensnpcs.command.CommandConfigurable;
-import net.citizensnpcs.command.CommandContext;
 import net.citizensnpcs.util.Util;
 
 import org.bukkit.Location;

src/main/java/net/citizensnpcs/trait/Poses.java

@@ -2,12 +2,12 @@ package net.citizensnpcs.trait;
 
 import java.util.Map;
 
+import net.citizensnpcs.api.command.exception.CommandException;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
-import net.citizensnpcs.command.exception.CommandException;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.Paginator;
 import net.citizensnpcs.util.Pose;
 import net.citizensnpcs.util.Util;

src/main/java/net/citizensnpcs/trait/SlimeSize.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.trait;
 
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Slime;

src/main/java/net/citizensnpcs/trait/text/PageChangePrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.text;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.ChatColor;
 import org.bukkit.conversations.ConversationContext;

src/main/java/net/citizensnpcs/trait/text/Text.java

@@ -15,10 +15,10 @@ import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.trait.Toggleable;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.Paginator;
 import net.citizensnpcs.util.Util;
 

src/main/java/net/citizensnpcs/trait/text/TextAddPrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.text;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.ChatColor;
 import org.bukkit.conversations.ConversationContext;

src/main/java/net/citizensnpcs/trait/text/TextEditPrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.text;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

src/main/java/net/citizensnpcs/trait/text/TextEditStartPrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.text;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.conversations.ConversationContext;
 import org.bukkit.conversations.Prompt;

src/main/java/net/citizensnpcs/trait/text/TextRemovePrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.text;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.conversations.ConversationContext;
 import org.bukkit.conversations.Prompt;

src/main/java/net/citizensnpcs/trait/text/TextStartPrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.text;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java

@@ -14,10 +14,10 @@ import net.citizensnpcs.api.event.NPCRemoveEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.persistence.PersistenceLoader;
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.trait.waypoint.triggers.TriggerEditPrompt;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.NMS;
 
 import org.bukkit.Bukkit;

src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java

@@ -6,9 +6,9 @@ import java.util.Map.Entry;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.StringHelper;
 
 import org.bukkit.command.CommandSender;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTriggerPrompt.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.trait.waypoint.triggers;
 
 import java.util.List;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.PlayerAnimation;
 import net.citizensnpcs.util.Util;
 

src/main/java/net/citizensnpcs/trait/waypoint/triggers/ChatTrigger.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.persistence.Persist;
-import net.citizensnpcs.util.Messaging;
+import net.citizensnpcs.api.util.Messaging;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/ChatTriggerPrompt.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.trait.waypoint.triggers;
 
 import java.util.List;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.ConversationContext;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTriggerPrompt.java

@@ -1,7 +1,7 @@
 package net.citizensnpcs.trait.waypoint.triggers;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.conversations.ConversationContext;
 import org.bukkit.conversations.NumericPrompt;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/TeleportTriggerPrompt.java

@@ -2,8 +2,8 @@ package net.citizensnpcs.trait.waypoint.triggers;
 
 import java.util.regex.Pattern;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerAddPrompt.java

@@ -1,8 +1,8 @@
 package net.citizensnpcs.trait.waypoint.triggers;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.trait.waypoint.WaypointEditor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.ConversationContext;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java

@@ -1,10 +1,10 @@
 package net.citizensnpcs.trait.waypoint.triggers;
 
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.trait.waypoint.Waypoint;
 import net.citizensnpcs.trait.waypoint.WaypointEditor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.Conversation;

src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerRemovePrompt.java

@@ -2,9 +2,9 @@ package net.citizensnpcs.trait.waypoint.triggers;
 
 import java.util.List;
 
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.trait.waypoint.WaypointEditor;
 import net.citizensnpcs.util.Messages;
-import net.citizensnpcs.util.Messaging;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.conversations.ConversationContext;

src/main/java/net/citizensnpcs/util/Messaging.java

@@ -1,122 +0,0 @@
-package net.citizensnpcs.util;
-
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import net.citizensnpcs.Settings.Setting;
-import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.trait.trait.Owner;
-import net.citizensnpcs.api.util.Colorizer;
-import net.citizensnpcs.api.util.Translator;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-
-public class Messaging {
-    private static final Pattern CHAT_NEWLINE = Pattern.compile("<br>|<n>|\\n", Pattern.MULTILINE);
-    private static final Splitter CHAT_NEWLINE_SPLITTER = Splitter.on(CHAT_NEWLINE);
-    private static final Joiner SPACE = Joiner.on(" ").useForNull("null");
-
-    public static void debug(Object... msg) {
-        if (Setting.DEBUG_MODE.asBoolean())
-            log(msg);
-    }
-
-    public static void log(Level level, Object... msg) {
-        Bukkit.getLogger().log(level, "[Citizens] " + SPACE.join(msg));
-    }
-
-    public static void log(Object... msg) {
-        log(Level.INFO, msg);
-    }
-
-    public static void logTr(String key, Object... msg) {
-        log(Level.INFO, Translator.translate(key, msg));
-    }
-
-    private static String prettify(String message) {
-        String trimmed = message.trim();
-        String messageColour = Colorizer.parseColors(Setting.MESSAGE_COLOUR.asString());
-        if (!trimmed.isEmpty()) {
-            if (trimmed.charAt(0) == ChatColor.COLOR_CHAR) {
-                ChatColor test = ChatColor.getByChar(trimmed.substring(1, 2));
-                if (test == null) {
-                    message = messageColour + message;
-                } else
-                    messageColour = test.toString();
-            } else
-                message = messageColour + message;
-        }
-        message = message.replace("[[", Colorizer.parseColors(Setting.HIGHLIGHT_COLOUR.asString()));
-        message = message.replace("]]", messageColour);
-        return message;
-    }
-
-    public static void send(CommandSender sender, Object... msg) {
-        sendMessageTo(sender, SPACE.join(msg));
-    }
-
-    public static void sendError(CommandSender sender, Object... msg) {
-        send(sender, ChatColor.RED.toString() + SPACE.join(msg));
-    }
-
-    public static void sendErrorTr(CommandSender sender, String key, Object... msg) {
-        sendMessageTo(sender, ChatColor.RED + Translator.translate(key, msg));
-    }
-
-    private static void sendMessageTo(CommandSender sender, String rawMessage) {
-        rawMessage = Colorizer.parseColors(rawMessage);
-        for (String message : CHAT_NEWLINE_SPLITTER.split(rawMessage)) {
-            sender.sendMessage(prettify(message));
-        }
-    }
-
-    public static void sendTr(CommandSender sender, String key, Object... msg) {
-        sendMessageTo(sender, Translator.translate(key, msg));
-    }
-
-    public static void sendWithNPC(CommandSender sender, Object msg, NPC npc) {
-        String send = msg.toString();
-
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-            send = send.replace("<player>", player.getName());
-            send = send.replace("<world>", player.getWorld().getName());
-        }
-        send = send.replace("<owner>", npc.getTrait(Owner.class).getOwner());
-        send = send.replace("<npc>", npc.getName());
-        send = send.replace("<id>", Integer.toString(npc.getId()));
-
-        send(sender, send);
-    }
-
-    public static void severe(Object... messages) {
-        log(Level.SEVERE, messages);
-    }
-
-    public static void severeTr(String key, Object... messages) {
-        log(Level.SEVERE, Translator.translate(key, messages));
-    }
-
-    public static String tr(String key, Object... messages) {
-        return prettify(Translator.translate(key, messages));
-    }
-
-    public static String tryTranslate(Object possible) {
-        if (possible == null)
-            return "";
-        String message = possible.toString();
-        int count = 0;
-        for (int i = 0; i < message.length(); i++) {
-            char c = message.charAt(i);
-            if (c == '.')
-                count++;
-        }
-        return count >= 2 ? tr(message) : message;
-    }
-}

src/main/java/net/citizensnpcs/util/NMS.java

@@ -9,6 +9,7 @@ import java.util.Set;
 import java.util.WeakHashMap;
 
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.util.Messaging;
 import net.minecraft.server.v1_4_R1.ControllerJump;
 import net.minecraft.server.v1_4_R1.ControllerLook;
 import net.minecraft.server.v1_4_R1.DamageSource;

src/main/java/net/citizensnpcs/util/Paginator.java

@@ -3,6 +3,8 @@ package net.citizensnpcs.util;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.citizensnpcs.api.util.Messaging;
+
 import org.bukkit.command.CommandSender;
 
 public class Paginator {