From 24b3ad6c9b9383daf5f1445f6a6ff71c5ee844e0 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 23 Feb 2012 18:22:48 +0800 Subject: [PATCH] Update for file moves --- src/net/citizensnpcs/Citizens.java | 16 ++++++++-------- src/net/citizensnpcs/EventListen.java | 4 ++-- .../command/{annotation => }/Command.java | 2 +- src/net/citizensnpcs/command/CommandManager.java | 5 +---- .../command/{annotation => }/Requirements.java | 2 +- .../command/{annotation => }/ServerCommand.java | 2 +- .../command/command/AdminCommands.java | 4 ++-- .../command/command/EditorCommands.java | 2 +- .../command/command/HelpCommands.java | 4 ++-- .../command/command/NPCCommands.java | 16 ++++++++-------- src/net/citizensnpcs/npc/CitizensNPC.java | 6 +++--- src/net/citizensnpcs/npc/CitizensNPCManager.java | 4 ++-- src/net/citizensnpcs/npc/NPCInventory.java | 2 +- src/net/citizensnpcs/npc/ai/CitizensAI.java | 8 ++++---- src/net/citizensnpcs/trait/LookClose.java | 4 ++-- .../trait/waypoint/WaypointProvider.java | 2 +- .../citizensnpcs/trait/waypoint/Waypoints.java | 8 ++++---- src/net/citizensnpcs/util/Messaging.java | 2 +- 18 files changed, 45 insertions(+), 48 deletions(-) rename src/net/citizensnpcs/command/{annotation => }/Command.java (96%) rename src/net/citizensnpcs/command/{annotation => }/Requirements.java (83%) rename src/net/citizensnpcs/command/{annotation => }/ServerCommand.java (77%) diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java index a755b1628..7b1bef531 100644 --- a/src/net/citizensnpcs/Citizens.java +++ b/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.npc.trait.DefaultInstanceFactory; -import net.citizensnpcs.api.npc.trait.InstanceFactory; -import net.citizensnpcs.api.npc.trait.Trait; -import net.citizensnpcs.api.npc.trait.trait.Inventory; -import net.citizensnpcs.api.npc.trait.trait.Owner; -import net.citizensnpcs.api.npc.trait.trait.SpawnLocation; -import net.citizensnpcs.api.npc.trait.trait.Spawned; +import net.citizensnpcs.api.trait.Character; +import net.citizensnpcs.api.trait.DefaultInstanceFactory; +import net.citizensnpcs.api.trait.InstanceFactory; +import net.citizensnpcs.api.trait.Trait; +import net.citizensnpcs.api.trait.builtin.Inventory; +import net.citizensnpcs.api.trait.builtin.Owner; +import net.citizensnpcs.api.trait.builtin.SpawnLocation; +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; diff --git a/src/net/citizensnpcs/EventListen.java b/src/net/citizensnpcs/EventListen.java index fd0e3742e..4298e9a26 100644 --- a/src/net/citizensnpcs/EventListen.java +++ b/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.npc.trait.trait.SpawnLocation; +import net.citizensnpcs.api.trait.builtin.Owner; +import net.citizensnpcs.api.trait.builtin.SpawnLocation; import net.citizensnpcs.npc.CitizensNPCManager; import net.citizensnpcs.util.Messaging; diff --git a/src/net/citizensnpcs/command/annotation/Command.java b/src/net/citizensnpcs/command/Command.java similarity index 96% rename from src/net/citizensnpcs/command/annotation/Command.java rename to src/net/citizensnpcs/command/Command.java index e44126a66..e54630c82 100644 --- a/src/net/citizensnpcs/command/annotation/Command.java +++ b/src/net/citizensnpcs/command/Command.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.citizensnpcs.command.annotation; +package net.citizensnpcs.command; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/net/citizensnpcs/command/CommandManager.java b/src/net/citizensnpcs/command/CommandManager.java index 1f5a0e36c..2fe8499bb 100644 --- a/src/net/citizensnpcs/command/CommandManager.java +++ b/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.command.annotation.Command; -import net.citizensnpcs.command.annotation.Requirements; -import net.citizensnpcs.command.annotation.ServerCommand; +import net.citizensnpcs.api.trait.builtin.Owner; import net.citizensnpcs.command.exception.CommandException; import net.citizensnpcs.command.exception.CommandUsageException; import net.citizensnpcs.command.exception.NoPermissionsException; diff --git a/src/net/citizensnpcs/command/annotation/Requirements.java b/src/net/citizensnpcs/command/Requirements.java similarity index 83% rename from src/net/citizensnpcs/command/annotation/Requirements.java rename to src/net/citizensnpcs/command/Requirements.java index 91687d6f8..255466b24 100644 --- a/src/net/citizensnpcs/command/annotation/Requirements.java +++ b/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; diff --git a/src/net/citizensnpcs/command/annotation/ServerCommand.java b/src/net/citizensnpcs/command/ServerCommand.java similarity index 77% rename from src/net/citizensnpcs/command/annotation/ServerCommand.java rename to src/net/citizensnpcs/command/ServerCommand.java index 8fa4b32e1..178baf6a6 100644 --- a/src/net/citizensnpcs/command/annotation/ServerCommand.java +++ b/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; diff --git a/src/net/citizensnpcs/command/command/AdminCommands.java b/src/net/citizensnpcs/command/command/AdminCommands.java index 81d0164c8..72a7f3540 100644 --- a/src/net/citizensnpcs/command/command/AdminCommands.java +++ b/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.annotation.Requirements; +import net.citizensnpcs.command.Requirements; import net.citizensnpcs.util.Messaging; import net.citizensnpcs.util.StringHelper; diff --git a/src/net/citizensnpcs/command/command/EditorCommands.java b/src/net/citizensnpcs/command/command/EditorCommands.java index 63e7b33ca..a4fe9799c 100644 --- a/src/net/citizensnpcs/command/command/EditorCommands.java +++ b/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 { diff --git a/src/net/citizensnpcs/command/command/HelpCommands.java b/src/net/citizensnpcs/command/command/HelpCommands.java index 877b238db..cb3e8b87e 100644 --- a/src/net/citizensnpcs/command/command/HelpCommands.java +++ b/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.annotation.Requirements; +import net.citizensnpcs.command.Requirements; import net.citizensnpcs.util.Messaging; import net.citizensnpcs.util.StringHelper; diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/net/citizensnpcs/command/command/NPCCommands.java index e39df9c4c..7974bfd9c 100644 --- a/src/net/citizensnpcs/command/command/NPCCommands.java +++ b/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.npc.trait.InstanceFactory; -import net.citizensnpcs.api.npc.trait.trait.MobType; -import net.citizensnpcs.api.npc.trait.trait.Owner; -import net.citizensnpcs.api.npc.trait.trait.SpawnLocation; -import net.citizensnpcs.api.npc.trait.trait.Spawned; +import net.citizensnpcs.api.trait.Character; +import net.citizensnpcs.api.trait.InstanceFactory; +import net.citizensnpcs.api.trait.builtin.MobType; +import net.citizensnpcs.api.trait.builtin.Owner; +import net.citizensnpcs.api.trait.builtin.SpawnLocation; +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.annotation.Requirements; +import net.citizensnpcs.command.Requirements; import net.citizensnpcs.npc.CitizensNPCManager; import net.citizensnpcs.trait.LookClose; import net.citizensnpcs.util.Messaging; diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java index 333e2bb38..c23fb7e8c 100644 --- a/src/net/citizensnpcs/npc/CitizensNPC.java +++ b/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.npc.trait.trait.SpawnLocation; -import net.citizensnpcs.api.npc.trait.trait.Spawned; +import net.citizensnpcs.api.trait.builtin.Inventory; +import net.citizensnpcs.api.trait.builtin.SpawnLocation; +import net.citizensnpcs.api.trait.builtin.Spawned; import net.citizensnpcs.npc.ai.CitizensAI; import net.citizensnpcs.util.Messaging; diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/net/citizensnpcs/npc/CitizensNPCManager.java index f736f211b..521e19b57 100644 --- a/src/net/citizensnpcs/npc/CitizensNPCManager.java +++ b/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.npc.trait.trait.SpawnLocation; +import net.citizensnpcs.api.trait.Character; +import net.citizensnpcs.api.trait.builtin.SpawnLocation; import net.citizensnpcs.api.util.Storage; import net.citizensnpcs.util.ByIdArray; import net.citizensnpcs.util.NPCBuilder; diff --git a/src/net/citizensnpcs/npc/NPCInventory.java b/src/net/citizensnpcs/npc/NPCInventory.java index bbfc12247..f4aa711df 100644 --- a/src/net/citizensnpcs/npc/NPCInventory.java +++ b/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 diff --git a/src/net/citizensnpcs/npc/ai/CitizensAI.java b/src/net/citizensnpcs/npc/ai/CitizensAI.java index 85d4f7a1c..aaa9ef658 100644 --- a/src/net/citizensnpcs/npc/ai/CitizensAI.java +++ b/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.npc.ai.Goal; -import net.citizensnpcs.api.npc.ai.NavigationCallback; -import net.citizensnpcs.api.npc.ai.NavigationCallback.PathCancelReason; +import net.citizensnpcs.api.ai.AI; +import net.citizensnpcs.api.ai.Goal; +import net.citizensnpcs.api.ai.NavigationCallback; +import net.citizensnpcs.api.ai.NavigationCallback.PathCancelReason; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.util.Messaging; diff --git a/src/net/citizensnpcs/trait/LookClose.java b/src/net/citizensnpcs/trait/LookClose.java index b44ba5108..a4059d508 100644 --- a/src/net/citizensnpcs/trait/LookClose.java +++ b/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.npc.trait.Trait; +import net.citizensnpcs.api.trait.SaveId; +import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.npc.CitizensNPC; import net.minecraft.server.EntityLiving; diff --git a/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java b/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java index b8a0dfae4..5553b36c5 100644 --- a/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java +++ b/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; diff --git a/src/net/citizensnpcs/trait/waypoint/Waypoints.java b/src/net/citizensnpcs/trait/waypoint/Waypoints.java index cdc7a9e7c..a34e8d15e 100644 --- a/src/net/citizensnpcs/trait/waypoint/Waypoints.java +++ b/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.npc.trait.InstanceFactory; -import net.citizensnpcs.api.npc.trait.SaveId; -import net.citizensnpcs.api.npc.trait.Trait; +import net.citizensnpcs.api.trait.DefaultInstanceFactory; +import net.citizensnpcs.api.trait.InstanceFactory; +import net.citizensnpcs.api.trait.SaveId; +import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.editor.Editor; diff --git a/src/net/citizensnpcs/util/Messaging.java b/src/net/citizensnpcs/util/Messaging.java index d298a5de0..c30f0bf88 100644 --- a/src/net/citizensnpcs/util/Messaging.java +++ b/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;