Update for file moves

src/net/citizensnpcs/Citizens.java

@@ -10,14 +10,14 @@ import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.exception.NPCException;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.Character;
+import net.citizensnpcs.api.trait.Character;
-import net.citizensnpcs.api.npc.trait.DefaultInstanceFactory;
+import net.citizensnpcs.api.trait.DefaultInstanceFactory;
-import net.citizensnpcs.api.npc.trait.InstanceFactory;
+import net.citizensnpcs.api.trait.InstanceFactory;
-import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.api.trait.Trait;
-import net.citizensnpcs.api.npc.trait.trait.Inventory;
+import net.citizensnpcs.api.trait.builtin.Inventory;
-import net.citizensnpcs.api.npc.trait.trait.Owner;
+import net.citizensnpcs.api.trait.builtin.Owner;
-import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
+import net.citizensnpcs.api.trait.builtin.SpawnLocation;
-import net.citizensnpcs.api.npc.trait.trait.Spawned;
+import net.citizensnpcs.api.trait.builtin.Spawned;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.api.util.DatabaseStorage;
 import net.citizensnpcs.api.util.Storage;

src/net/citizensnpcs/EventListen.java

@@ -7,8 +7,8 @@ import java.util.Map;
 
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.trait.Owner;
+import net.citizensnpcs.api.trait.builtin.Owner;
-import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
+import net.citizensnpcs.api.trait.builtin.SpawnLocation;
 import net.citizensnpcs.npc.CitizensNPCManager;
 import net.citizensnpcs.util.Messaging;
 

src/net/citizensnpcs/command/Command.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.citizensnpcs.command.annotation;
+package net.citizensnpcs.command;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/net/citizensnpcs/command/CommandManager.java

@@ -33,10 +33,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.trait.Owner;
+import net.citizensnpcs.api.trait.builtin.Owner;
-import net.citizensnpcs.command.annotation.Command;
-import net.citizensnpcs.command.annotation.Requirements;
-import net.citizensnpcs.command.annotation.ServerCommand;
 import net.citizensnpcs.command.exception.CommandException;
 import net.citizensnpcs.command.exception.CommandUsageException;
 import net.citizensnpcs.command.exception.NoPermissionsException;

src/net/citizensnpcs/command/Requirements.java

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

src/net/citizensnpcs/command/ServerCommand.java

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

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

@@ -4,9 +4,9 @@ import org.bukkit.entity.Player;
 
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.command.Command;
 import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.annotation.Command;
+import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.annotation.Requirements;
 import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.StringHelper;
 

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

@@ -4,8 +4,8 @@ import org.bukkit.entity.Player;
 
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.command.Command;
 import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.annotation.Command;
 import net.citizensnpcs.util.Messaging;
 
 public class EditorCommands {

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

@@ -9,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.command.Command;
 import net.citizensnpcs.command.CommandContext;
 import net.citizensnpcs.command.CommandManager;
-import net.citizensnpcs.command.annotation.Command;
+import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.annotation.Requirements;
 import net.citizensnpcs.util.Messaging;
 import net.citizensnpcs.util.StringHelper;
 

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

@@ -3,15 +3,15 @@ package net.citizensnpcs.command.command;
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.Character;
+import net.citizensnpcs.api.trait.Character;
-import net.citizensnpcs.api.npc.trait.InstanceFactory;
+import net.citizensnpcs.api.trait.InstanceFactory;
-import net.citizensnpcs.api.npc.trait.trait.MobType;
+import net.citizensnpcs.api.trait.builtin.MobType;
-import net.citizensnpcs.api.npc.trait.trait.Owner;
+import net.citizensnpcs.api.trait.builtin.Owner;
-import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
+import net.citizensnpcs.api.trait.builtin.SpawnLocation;
-import net.citizensnpcs.api.npc.trait.trait.Spawned;
+import net.citizensnpcs.api.trait.builtin.Spawned;
+import net.citizensnpcs.command.Command;
 import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.command.annotation.Command;
+import net.citizensnpcs.command.Requirements;
-import net.citizensnpcs.command.annotation.Requirements;
 import net.citizensnpcs.npc.CitizensNPCManager;
 import net.citizensnpcs.trait.LookClose;
 import net.citizensnpcs.util.Messaging;

src/net/citizensnpcs/npc/CitizensNPC.java

@@ -5,9 +5,9 @@ import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.event.NPCDespawnEvent;
 import net.citizensnpcs.api.event.NPCSpawnEvent;
 import net.citizensnpcs.api.npc.AbstractNPC;
-import net.citizensnpcs.api.npc.trait.trait.Inventory;
+import net.citizensnpcs.api.trait.builtin.Inventory;
-import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
+import net.citizensnpcs.api.trait.builtin.SpawnLocation;
-import net.citizensnpcs.api.npc.trait.trait.Spawned;
+import net.citizensnpcs.api.trait.builtin.Spawned;
 import net.citizensnpcs.npc.ai.CitizensAI;
 import net.citizensnpcs.util.Messaging;
 

src/net/citizensnpcs/npc/CitizensNPCManager.java

@@ -8,8 +8,8 @@ import java.util.List;
 import net.citizensnpcs.api.event.NPCSelectEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCManager;
-import net.citizensnpcs.api.npc.trait.Character;
+import net.citizensnpcs.api.trait.Character;
-import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
+import net.citizensnpcs.api.trait.builtin.SpawnLocation;
 import net.citizensnpcs.api.util.Storage;
 import net.citizensnpcs.util.ByIdArray;
 import net.citizensnpcs.util.NPCBuilder;

src/net/citizensnpcs/npc/NPCInventory.java

@@ -88,7 +88,7 @@ public class NPCInventory implements IInventory {
             index++;
         }
 
-        npc.getTrait(net.citizensnpcs.api.npc.trait.trait.Inventory.class).setContents(bukkitItems);
+        npc.getTrait(net.citizensnpcs.api.trait.builtin.Inventory.class).setContents(bukkitItems);
     }
 
     @Override

src/net/citizensnpcs/npc/ai/CitizensAI.java

@@ -5,10 +5,10 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import net.citizensnpcs.api.npc.ai.AI;
+import net.citizensnpcs.api.ai.AI;
-import net.citizensnpcs.api.npc.ai.Goal;
+import net.citizensnpcs.api.ai.Goal;
-import net.citizensnpcs.api.npc.ai.NavigationCallback;
+import net.citizensnpcs.api.ai.NavigationCallback;
-import net.citizensnpcs.api.npc.ai.NavigationCallback.PathCancelReason;
+import net.citizensnpcs.api.ai.NavigationCallback.PathCancelReason;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.util.Messaging;
 

src/net/citizensnpcs/trait/LookClose.java

@@ -5,8 +5,8 @@ import org.bukkit.entity.Entity;
 
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.SaveId;
+import net.citizensnpcs.api.trait.SaveId;
-import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.minecraft.server.EntityLiving;

src/net/citizensnpcs/trait/waypoint/WaypointProvider.java

@@ -1,6 +1,6 @@
 package net.citizensnpcs.trait.waypoint;
 
-import net.citizensnpcs.api.npc.ai.NavigationCallback;
+import net.citizensnpcs.api.ai.NavigationCallback;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.editor.Editor;
 

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

@@ -2,10 +2,10 @@ package net.citizensnpcs.trait.waypoint;
 
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.DefaultInstanceFactory;
+import net.citizensnpcs.api.trait.DefaultInstanceFactory;
-import net.citizensnpcs.api.npc.trait.InstanceFactory;
+import net.citizensnpcs.api.trait.InstanceFactory;
-import net.citizensnpcs.api.npc.trait.SaveId;
+import net.citizensnpcs.api.trait.SaveId;
-import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.editor.Editor;
 

src/net/citizensnpcs/util/Messaging.java

@@ -4,7 +4,7 @@ import java.util.logging.Level;
 
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.npc.trait.trait.Owner;
+import net.citizensnpcs.api.trait.builtin.Owner;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;