Merge pull request #8 from simplyianm/master

Maven fix
2025-02-05 23:11:34 +01:00 · 2012-02-25 23:30:56 -08:00 · 2012-02-25 23:30:56 -08:00 · 42fc929605
commit 42fc929605
parent c6e917d243 670d999bfe
72 changed files with 99 additions and 99 deletions
--- a/pom.xml
+++ b/pom.xml
@ -65,13 +65,13 @@
    </scm>
    <build>
        <defaultGoal>clean package install</defaultGoal>
-		<sourceDirectory>${basedir}/src</sourceDirectory>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>

        <resources>
            <resource>
                <targetPath>.</targetPath>
                <filtering>true</filtering>
-				<directory>${basedir}</directory>
+                <directory>${basedir}/src/main/resources</directory>
                <includes>
                    <include>plugin.yml</include>
                </includes>
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
--- a/src/main/java/net/citizensnpcs/NPCUpdater.java
+++ b/src/main/java/net/citizensnpcs/NPCUpdater.java
--- a/src/main/java/net/citizensnpcs/Settings.java
+++ b/src/main/java/net/citizensnpcs/Settings.java
--- a/src/main/java/net/citizensnpcs/command/Command.java
+++ b/src/main/java/net/citizensnpcs/command/Command.java
--- a/src/main/java/net/citizensnpcs/command/CommandContext.java
+++ b/src/main/java/net/citizensnpcs/command/CommandContext.java
--- a/src/main/java/net/citizensnpcs/command/CommandManager.java
+++ b/src/main/java/net/citizensnpcs/command/CommandManager.java
--- a/src/main/java/net/citizensnpcs/command/Injector.java
+++ b/src/main/java/net/citizensnpcs/command/Injector.java
--- a/src/main/java/net/citizensnpcs/command/Requirements.java
+++ b/src/main/java/net/citizensnpcs/command/Requirements.java
--- a/src/main/java/net/citizensnpcs/command/ServerCommand.java
+++ b/src/main/java/net/citizensnpcs/command/ServerCommand.java
--- a/src/main/java/net/citizensnpcs/command/command/AdminCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/AdminCommands.java
--- a/src/main/java/net/citizensnpcs/command/command/EditorCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/EditorCommands.java
--- a/src/main/java/net/citizensnpcs/command/command/HelpCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/HelpCommands.java
--- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
--- a/src/main/java/net/citizensnpcs/command/exception/CommandException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/CommandException.java
--- a/src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java
--- a/src/main/java/net/citizensnpcs/command/exception/NoPermissionsException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/NoPermissionsException.java
--- a/src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java
--- a/src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java
--- a/src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java
--- a/src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java
+++ b/src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java
--- a/src/main/java/net/citizensnpcs/editor/Editor.java
+++ b/src/main/java/net/citizensnpcs/editor/Editor.java
--- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
--- a/src/main/java/net/citizensnpcs/editor/PathEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/PathEditor.java
--- a/src/main/java/net/citizensnpcs/editor/TextEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/TextEditor.java
--- a/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPCManager.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPCManager.java
--- a/src/main/java/net/citizensnpcs/npc/NPCInventory.java
+++ b/src/main/java/net/citizensnpcs/npc/NPCInventory.java
--- a/src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java
--- a/src/main/java/net/citizensnpcs/npc/ai/MoveStrategy.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/MoveStrategy.java
--- a/src/main/java/net/citizensnpcs/npc/ai/PathStrategy.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/PathStrategy.java
--- a/src/main/java/net/citizensnpcs/npc/ai/TargetStrategy.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/TargetStrategy.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
--- a/src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java
--- a/src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java
+++ b/src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java
--- a/src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java
+++ b/src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java
--- a/src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java
+++ b/src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java
--- a/src/main/java/net/citizensnpcs/trait/LookClose.java
+++ b/src/main/java/net/citizensnpcs/trait/LookClose.java
--- a/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
--- a/src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java
--- a/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
--- a/src/main/java/net/citizensnpcs/util/ByIdArray.java
+++ b/src/main/java/net/citizensnpcs/util/ByIdArray.java
--- a/src/main/java/net/citizensnpcs/util/Messaging.java
+++ b/src/main/java/net/citizensnpcs/util/Messaging.java
--- a/src/main/java/net/citizensnpcs/util/Metrics.java
+++ b/src/main/java/net/citizensnpcs/util/Metrics.java
--- a/src/main/java/net/citizensnpcs/util/NPCBuilder.java
+++ b/src/main/java/net/citizensnpcs/util/NPCBuilder.java
--- a/src/main/java/net/citizensnpcs/util/StringHelper.java
+++ b/src/main/java/net/citizensnpcs/util/StringHelper.java
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml