From 670d999bfe231da329868933e20e206f5a1bd63f Mon Sep 17 00:00:00 2001
From: Ian Macali <ianmacalinao@gmail.com>
Date: Sun, 26 Feb 2012 01:20:11 -0600
Subject: [PATCH] Fixed Maven.

---
 pom.xml                                       | 198 +++++++++---------
 .../java}/net/citizensnpcs/Citizens.java      |   0
 .../java}/net/citizensnpcs/EventListen.java   |   0
 .../java}/net/citizensnpcs/NPCUpdater.java    |   0
 .../java}/net/citizensnpcs/Settings.java      |   0
 .../net/citizensnpcs/command/Command.java     |   0
 .../citizensnpcs/command/CommandContext.java  |   0
 .../citizensnpcs/command/CommandManager.java  |   0
 .../net/citizensnpcs/command/Injector.java    |   0
 .../citizensnpcs/command/Requirements.java    |   0
 .../citizensnpcs/command/ServerCommand.java   |   0
 .../command/command/AdminCommands.java        |   0
 .../command/command/EditorCommands.java       |   0
 .../command/command/HelpCommands.java         |   0
 .../command/command/NPCCommands.java          |   0
 .../command/exception/CommandException.java   |   0
 .../exception/CommandUsageException.java      |   0
 .../exception/NoPermissionsException.java     |   0
 .../RequirementMissingException.java          |   0
 .../exception/ServerCommandException.java     |   0
 .../exception/UnhandledCommandException.java  |   0
 .../exception/WrappedCommandException.java    |   0
 .../java}/net/citizensnpcs/editor/Editor.java |   0
 .../citizensnpcs/editor/EquipmentEditor.java  |   0
 .../net/citizensnpcs/editor/PathEditor.java   |   0
 .../net/citizensnpcs/editor/TextEditor.java   |   0
 .../net/citizensnpcs/npc/CitizensMobNPC.java  |   0
 .../net/citizensnpcs/npc/CitizensNPC.java     |   0
 .../citizensnpcs/npc/CitizensNPCManager.java  |   0
 .../net/citizensnpcs/npc/NPCInventory.java    |   0
 .../net/citizensnpcs/npc/ai/CitizensAI.java   |   0
 .../net/citizensnpcs/npc/ai/MoveStrategy.java |   0
 .../net/citizensnpcs/npc/ai/PathStrategy.java |   0
 .../citizensnpcs/npc/ai/TargetStrategy.java   |   0
 .../npc/entity/CitizensBlazeNPC.java          |   0
 .../npc/entity/CitizensCaveSpiderNPC.java     |   0
 .../npc/entity/CitizensChickenNPC.java        |   0
 .../npc/entity/CitizensCowNPC.java            |   0
 .../npc/entity/CitizensCreeperNPC.java        |   0
 .../npc/entity/CitizensEnderDragonNPC.java    |   0
 .../npc/entity/CitizensEndermanNPC.java       |   0
 .../npc/entity/CitizensGhastNPC.java          |   0
 .../npc/entity/CitizensGiantNPC.java          |   0
 .../npc/entity/CitizensHumanNPC.java          |   0
 .../npc/entity/CitizensMagmaCubeNPC.java      |   0
 .../npc/entity/CitizensMushroomCowNPC.java    |   0
 .../npc/entity/CitizensPigNPC.java            |   0
 .../npc/entity/CitizensPigZombieNPC.java      |   0
 .../npc/entity/CitizensSheepNPC.java          |   0
 .../npc/entity/CitizensSilverfishNPC.java     |   0
 .../npc/entity/CitizensSkeletonNPC.java       |   0
 .../npc/entity/CitizensSlimeNPC.java          |   0
 .../npc/entity/CitizensSnowmanNPC.java        |   0
 .../npc/entity/CitizensSpiderNPC.java         |   0
 .../npc/entity/CitizensSquidNPC.java          |   0
 .../npc/entity/CitizensVillagerNPC.java       |   0
 .../npc/entity/CitizensWolfNPC.java           |   0
 .../npc/entity/CitizensZombieNPC.java         |   0
 .../resource/lib/EntityHumanNPC.java          |   0
 .../resource/lib/NPCNetHandler.java           |   0
 .../resource/lib/NPCNetworkManager.java       |   0
 .../citizensnpcs/resource/lib/NPCSocket.java  |   0
 .../net/citizensnpcs/trait/LookClose.java     |   0
 .../citizensnpcs/trait/waypoint/Waypoint.java |   0
 .../trait/waypoint/WaypointProvider.java      |   0
 .../trait/waypoint/Waypoints.java             |   0
 .../net/citizensnpcs/util/ByIdArray.java      |   0
 .../net/citizensnpcs/util/Messaging.java      |   0
 .../java}/net/citizensnpcs/util/Metrics.java  |   0
 .../net/citizensnpcs/util/NPCBuilder.java     |   0
 .../net/citizensnpcs/util/StringHelper.java   |   0
 plugin.yml => src/main/resources/plugin.yml   |   0
 72 files changed, 99 insertions(+), 99 deletions(-)
 rename src/{ => main/java}/net/citizensnpcs/Citizens.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/EventListen.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/NPCUpdater.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/Settings.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/Command.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/CommandContext.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/CommandManager.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/Injector.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/Requirements.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/ServerCommand.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/command/AdminCommands.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/command/EditorCommands.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/command/HelpCommands.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/command/NPCCommands.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/CommandException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/CommandUsageException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/NoPermissionsException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/RequirementMissingException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/ServerCommandException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/UnhandledCommandException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/command/exception/WrappedCommandException.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/editor/Editor.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/editor/EquipmentEditor.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/editor/PathEditor.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/editor/TextEditor.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/CitizensMobNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/CitizensNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/CitizensNPCManager.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/NPCInventory.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/ai/CitizensAI.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/ai/MoveStrategy.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/ai/PathStrategy.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/ai/TargetStrategy.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensChickenNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensCowNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensGhastNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensGiantNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensHumanNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensPigNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSheepNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensSquidNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensWolfNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/npc/entity/CitizensZombieNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/resource/lib/EntityHumanNPC.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/resource/lib/NPCNetHandler.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/resource/lib/NPCNetworkManager.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/resource/lib/NPCSocket.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/trait/LookClose.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/trait/waypoint/Waypoint.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/trait/waypoint/WaypointProvider.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/trait/waypoint/Waypoints.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/util/ByIdArray.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/util/Messaging.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/util/Metrics.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/util/NPCBuilder.java (100%)
 rename src/{ => main/java}/net/citizensnpcs/util/StringHelper.java (100%)
 rename plugin.yml => src/main/resources/plugin.yml (100%)

diff --git a/pom.xml b/pom.xml
index 31137757d..3a934e8b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,115 +1,115 @@
 <!-- Citizens build file -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>net.citizensnpcs</groupId>
-	<artifactId>citizens</artifactId>
-	<version>2.0</version>
-	<name>Citizens</name>
+    <groupId>net.citizensnpcs</groupId>
+    <artifactId>citizens</artifactId>
+    <version>2.0</version>
+    <name>Citizens</name>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<bukkit.version>1.1-R5-SNAPSHOT</bukkit.version>
-		<craftbukkit.version>1.1-R5-SNAPSHOT</craftbukkit.version>
-		<citizensapi.version>2.0</citizensapi.version>
-		<build.number>Unknown</build.number>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <bukkit.version>1.1-R5-SNAPSHOT</bukkit.version>
+        <craftbukkit.version>1.1-R5-SNAPSHOT</craftbukkit.version>
+        <citizensapi.version>2.0</citizensapi.version>
+        <build.number>Unknown</build.number>
+    </properties>
 
-	<repositories>
-		<repository>
-			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/public/</url>
-		</repository>
+    <repositories>
+        <repository>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </repository>
 
-		<repository>
-			<id>everything</id>
-			<url>http://repo.citizensnpcs.net/</url>
-		</repository>
-	</repositories>
+        <repository>
+            <id>everything</id>
+            <url>http://repo.citizensnpcs.net/</url>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>craftbukkit</artifactId>
-			<version>${craftbukkit.version}</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>net.citizensnpcs</groupId>
-			<artifactId>citizensapi</artifactId>
-			<version>${citizensapi.version}</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>bukkit</artifactId>
-			<version>${bukkit.version}</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>${craftbukkit.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.citizensnpcs</groupId>
+            <artifactId>citizensapi</artifactId>
+            <version>${citizensapi.version}</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>${bukkit.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
-	<url>http://www.citizensnpcs.net</url>
-	<ciManagement>
-		<system>jenkins</system>
-		<url>http://ci.citizensnpcs.net</url>
-	</ciManagement>
-	<scm>
-		<connection>scm:git:git://github.com/CitizensDev/Citizens2.git</connection>
-		<developerConnection>scm:git:git:@github.com:CitizensDev/Citizens2.git</developerConnection>
-		<url>https://github.com/CitizensDev/Citizens2/tree/master/</url>
-	</scm>
-	<build>
-		<defaultGoal>clean package install</defaultGoal>
-		<sourceDirectory>${basedir}/src</sourceDirectory>
+    <url>http://www.citizensnpcs.net</url>
+    <ciManagement>
+        <system>jenkins</system>
+        <url>http://ci.citizensnpcs.net</url>
+    </ciManagement>
+    <scm>
+        <connection>scm:git:git://github.com/CitizensDev/Citizens2.git</connection>
+        <developerConnection>scm:git:git:@github.com:CitizensDev/Citizens2.git</developerConnection>
+        <url>https://github.com/CitizensDev/Citizens2/tree/master/</url>
+    </scm>
+    <build>
+        <defaultGoal>clean package install</defaultGoal>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
 
-		<resources>
-			<resource>
-				<targetPath>.</targetPath>
-				<filtering>true</filtering>
-				<directory>${basedir}</directory>
-				<includes>
-					<include>plugin.yml</include>
-				</includes>
-			</resource>
-		</resources>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>plugin.yml</include>
+                </includes>
+            </resource>
+        </resources>
 
-		<plugins>
+        <plugins>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.2</version>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.2</version>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file
diff --git a/src/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
similarity index 100%
rename from src/net/citizensnpcs/Citizens.java
rename to src/main/java/net/citizensnpcs/Citizens.java
diff --git a/src/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
similarity index 100%
rename from src/net/citizensnpcs/EventListen.java
rename to src/main/java/net/citizensnpcs/EventListen.java
diff --git a/src/net/citizensnpcs/NPCUpdater.java b/src/main/java/net/citizensnpcs/NPCUpdater.java
similarity index 100%
rename from src/net/citizensnpcs/NPCUpdater.java
rename to src/main/java/net/citizensnpcs/NPCUpdater.java
diff --git a/src/net/citizensnpcs/Settings.java b/src/main/java/net/citizensnpcs/Settings.java
similarity index 100%
rename from src/net/citizensnpcs/Settings.java
rename to src/main/java/net/citizensnpcs/Settings.java
diff --git a/src/net/citizensnpcs/command/Command.java b/src/main/java/net/citizensnpcs/command/Command.java
similarity index 100%
rename from src/net/citizensnpcs/command/Command.java
rename to src/main/java/net/citizensnpcs/command/Command.java
diff --git a/src/net/citizensnpcs/command/CommandContext.java b/src/main/java/net/citizensnpcs/command/CommandContext.java
similarity index 100%
rename from src/net/citizensnpcs/command/CommandContext.java
rename to src/main/java/net/citizensnpcs/command/CommandContext.java
diff --git a/src/net/citizensnpcs/command/CommandManager.java b/src/main/java/net/citizensnpcs/command/CommandManager.java
similarity index 100%
rename from src/net/citizensnpcs/command/CommandManager.java
rename to src/main/java/net/citizensnpcs/command/CommandManager.java
diff --git a/src/net/citizensnpcs/command/Injector.java b/src/main/java/net/citizensnpcs/command/Injector.java
similarity index 100%
rename from src/net/citizensnpcs/command/Injector.java
rename to src/main/java/net/citizensnpcs/command/Injector.java
diff --git a/src/net/citizensnpcs/command/Requirements.java b/src/main/java/net/citizensnpcs/command/Requirements.java
similarity index 100%
rename from src/net/citizensnpcs/command/Requirements.java
rename to src/main/java/net/citizensnpcs/command/Requirements.java
diff --git a/src/net/citizensnpcs/command/ServerCommand.java b/src/main/java/net/citizensnpcs/command/ServerCommand.java
similarity index 100%
rename from src/net/citizensnpcs/command/ServerCommand.java
rename to src/main/java/net/citizensnpcs/command/ServerCommand.java
diff --git a/src/net/citizensnpcs/command/command/AdminCommands.java b/src/main/java/net/citizensnpcs/command/command/AdminCommands.java
similarity index 100%
rename from src/net/citizensnpcs/command/command/AdminCommands.java
rename to src/main/java/net/citizensnpcs/command/command/AdminCommands.java
diff --git a/src/net/citizensnpcs/command/command/EditorCommands.java b/src/main/java/net/citizensnpcs/command/command/EditorCommands.java
similarity index 100%
rename from src/net/citizensnpcs/command/command/EditorCommands.java
rename to src/main/java/net/citizensnpcs/command/command/EditorCommands.java
diff --git a/src/net/citizensnpcs/command/command/HelpCommands.java b/src/main/java/net/citizensnpcs/command/command/HelpCommands.java
similarity index 100%
rename from src/net/citizensnpcs/command/command/HelpCommands.java
rename to src/main/java/net/citizensnpcs/command/command/HelpCommands.java
diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
similarity index 100%
rename from src/net/citizensnpcs/command/command/NPCCommands.java
rename to src/main/java/net/citizensnpcs/command/command/NPCCommands.java
diff --git a/src/net/citizensnpcs/command/exception/CommandException.java b/src/main/java/net/citizensnpcs/command/exception/CommandException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/CommandException.java
rename to src/main/java/net/citizensnpcs/command/exception/CommandException.java
diff --git a/src/net/citizensnpcs/command/exception/CommandUsageException.java b/src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/CommandUsageException.java
rename to src/main/java/net/citizensnpcs/command/exception/CommandUsageException.java
diff --git a/src/net/citizensnpcs/command/exception/NoPermissionsException.java b/src/main/java/net/citizensnpcs/command/exception/NoPermissionsException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/NoPermissionsException.java
rename to src/main/java/net/citizensnpcs/command/exception/NoPermissionsException.java
diff --git a/src/net/citizensnpcs/command/exception/RequirementMissingException.java b/src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/RequirementMissingException.java
rename to src/main/java/net/citizensnpcs/command/exception/RequirementMissingException.java
diff --git a/src/net/citizensnpcs/command/exception/ServerCommandException.java b/src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/ServerCommandException.java
rename to src/main/java/net/citizensnpcs/command/exception/ServerCommandException.java
diff --git a/src/net/citizensnpcs/command/exception/UnhandledCommandException.java b/src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/UnhandledCommandException.java
rename to src/main/java/net/citizensnpcs/command/exception/UnhandledCommandException.java
diff --git a/src/net/citizensnpcs/command/exception/WrappedCommandException.java b/src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java
similarity index 100%
rename from src/net/citizensnpcs/command/exception/WrappedCommandException.java
rename to src/main/java/net/citizensnpcs/command/exception/WrappedCommandException.java
diff --git a/src/net/citizensnpcs/editor/Editor.java b/src/main/java/net/citizensnpcs/editor/Editor.java
similarity index 100%
rename from src/net/citizensnpcs/editor/Editor.java
rename to src/main/java/net/citizensnpcs/editor/Editor.java
diff --git a/src/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
similarity index 100%
rename from src/net/citizensnpcs/editor/EquipmentEditor.java
rename to src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
diff --git a/src/net/citizensnpcs/editor/PathEditor.java b/src/main/java/net/citizensnpcs/editor/PathEditor.java
similarity index 100%
rename from src/net/citizensnpcs/editor/PathEditor.java
rename to src/main/java/net/citizensnpcs/editor/PathEditor.java
diff --git a/src/net/citizensnpcs/editor/TextEditor.java b/src/main/java/net/citizensnpcs/editor/TextEditor.java
similarity index 100%
rename from src/net/citizensnpcs/editor/TextEditor.java
rename to src/main/java/net/citizensnpcs/editor/TextEditor.java
diff --git a/src/net/citizensnpcs/npc/CitizensMobNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/CitizensMobNPC.java
rename to src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/CitizensNPC.java
rename to src/main/java/net/citizensnpcs/npc/CitizensNPC.java
diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/main/java/net/citizensnpcs/npc/CitizensNPCManager.java
similarity index 100%
rename from src/net/citizensnpcs/npc/CitizensNPCManager.java
rename to src/main/java/net/citizensnpcs/npc/CitizensNPCManager.java
diff --git a/src/net/citizensnpcs/npc/NPCInventory.java b/src/main/java/net/citizensnpcs/npc/NPCInventory.java
similarity index 100%
rename from src/net/citizensnpcs/npc/NPCInventory.java
rename to src/main/java/net/citizensnpcs/npc/NPCInventory.java
diff --git a/src/net/citizensnpcs/npc/ai/CitizensAI.java b/src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java
similarity index 100%
rename from src/net/citizensnpcs/npc/ai/CitizensAI.java
rename to src/main/java/net/citizensnpcs/npc/ai/CitizensAI.java
diff --git a/src/net/citizensnpcs/npc/ai/MoveStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MoveStrategy.java
similarity index 100%
rename from src/net/citizensnpcs/npc/ai/MoveStrategy.java
rename to src/main/java/net/citizensnpcs/npc/ai/MoveStrategy.java
diff --git a/src/net/citizensnpcs/npc/ai/PathStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/PathStrategy.java
similarity index 100%
rename from src/net/citizensnpcs/npc/ai/PathStrategy.java
rename to src/main/java/net/citizensnpcs/npc/ai/PathStrategy.java
diff --git a/src/net/citizensnpcs/npc/ai/TargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/TargetStrategy.java
similarity index 100%
rename from src/net/citizensnpcs/npc/ai/TargetStrategy.java
rename to src/main/java/net/citizensnpcs/npc/ai/TargetStrategy.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensChickenNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensCowNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensCowNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensGhastNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensGiantNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensPigNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensPigNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSheepNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensSquidNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensWolfNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
diff --git a/src/net/citizensnpcs/npc/entity/CitizensZombieNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
similarity index 100%
rename from src/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
rename to src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
diff --git a/src/net/citizensnpcs/resource/lib/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java
similarity index 100%
rename from src/net/citizensnpcs/resource/lib/EntityHumanNPC.java
rename to src/main/java/net/citizensnpcs/resource/lib/EntityHumanNPC.java
diff --git a/src/net/citizensnpcs/resource/lib/NPCNetHandler.java b/src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java
similarity index 100%
rename from src/net/citizensnpcs/resource/lib/NPCNetHandler.java
rename to src/main/java/net/citizensnpcs/resource/lib/NPCNetHandler.java
diff --git a/src/net/citizensnpcs/resource/lib/NPCNetworkManager.java b/src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java
similarity index 100%
rename from src/net/citizensnpcs/resource/lib/NPCNetworkManager.java
rename to src/main/java/net/citizensnpcs/resource/lib/NPCNetworkManager.java
diff --git a/src/net/citizensnpcs/resource/lib/NPCSocket.java b/src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java
similarity index 100%
rename from src/net/citizensnpcs/resource/lib/NPCSocket.java
rename to src/main/java/net/citizensnpcs/resource/lib/NPCSocket.java
diff --git a/src/net/citizensnpcs/trait/LookClose.java b/src/main/java/net/citizensnpcs/trait/LookClose.java
similarity index 100%
rename from src/net/citizensnpcs/trait/LookClose.java
rename to src/main/java/net/citizensnpcs/trait/LookClose.java
diff --git a/src/net/citizensnpcs/trait/waypoint/Waypoint.java b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
similarity index 100%
rename from src/net/citizensnpcs/trait/waypoint/Waypoint.java
rename to src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
diff --git a/src/net/citizensnpcs/trait/waypoint/WaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java
similarity index 100%
rename from src/net/citizensnpcs/trait/waypoint/WaypointProvider.java
rename to src/main/java/net/citizensnpcs/trait/waypoint/WaypointProvider.java
diff --git a/src/net/citizensnpcs/trait/waypoint/Waypoints.java b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
similarity index 100%
rename from src/net/citizensnpcs/trait/waypoint/Waypoints.java
rename to src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
diff --git a/src/net/citizensnpcs/util/ByIdArray.java b/src/main/java/net/citizensnpcs/util/ByIdArray.java
similarity index 100%
rename from src/net/citizensnpcs/util/ByIdArray.java
rename to src/main/java/net/citizensnpcs/util/ByIdArray.java
diff --git a/src/net/citizensnpcs/util/Messaging.java b/src/main/java/net/citizensnpcs/util/Messaging.java
similarity index 100%
rename from src/net/citizensnpcs/util/Messaging.java
rename to src/main/java/net/citizensnpcs/util/Messaging.java
diff --git a/src/net/citizensnpcs/util/Metrics.java b/src/main/java/net/citizensnpcs/util/Metrics.java
similarity index 100%
rename from src/net/citizensnpcs/util/Metrics.java
rename to src/main/java/net/citizensnpcs/util/Metrics.java
diff --git a/src/net/citizensnpcs/util/NPCBuilder.java b/src/main/java/net/citizensnpcs/util/NPCBuilder.java
similarity index 100%
rename from src/net/citizensnpcs/util/NPCBuilder.java
rename to src/main/java/net/citizensnpcs/util/NPCBuilder.java
diff --git a/src/net/citizensnpcs/util/StringHelper.java b/src/main/java/net/citizensnpcs/util/StringHelper.java
similarity index 100%
rename from src/net/citizensnpcs/util/StringHelper.java
rename to src/main/java/net/citizensnpcs/util/StringHelper.java
diff --git a/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from plugin.yml
rename to src/main/resources/plugin.yml