From 13b905e76264c7fc7d9719fe1225d5ec3c337c12 Mon Sep 17 00:00:00 2001
From: Dan Mulloy <dmulloy2@live.com>
Date: Sat, 19 Mar 2016 16:41:02 -0400
Subject: [PATCH] Fix a few issues with loading

---
 .../ProtocolLib/src}/main/resources/config.yml    |  0
 .../ProtocolLib/src}/main/resources/plugin.yml    |  2 +-
 pom.xml                                           | 15 ++++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 rename {src => modules/ProtocolLib/src}/main/resources/config.yml (100%)
 rename {src => modules/ProtocolLib/src}/main/resources/plugin.yml (95%)

diff --git a/src/main/resources/config.yml b/modules/ProtocolLib/src/main/resources/config.yml
similarity index 100%
rename from src/main/resources/config.yml
rename to modules/ProtocolLib/src/main/resources/config.yml
diff --git a/src/main/resources/plugin.yml b/modules/ProtocolLib/src/main/resources/plugin.yml
similarity index 95%
rename from src/main/resources/plugin.yml
rename to modules/ProtocolLib/src/main/resources/plugin.yml
index 87c10a68..06da7ff4 100644
--- a/src/main/resources/plugin.yml
+++ b/modules/ProtocolLib/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ version: ${project.version}${project.build.number}
 description: Provides read/write access to the Minecraft protocol.
 authors: [dmulloy2, comphenix]
 
-main: com.comphenix.protocol.ProtocolLibrary
+main: com.comphenix.protocol.ProtocolLib
 load: startup
 database: false
 
diff --git a/pom.xml b/pom.xml
index 5a1567f1..b2a647fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,18 @@
     <defaultGoal>clean package install</defaultGoal>
     <finalName>${project.name}</finalName>
     <sourceDirectory>src/main/java</sourceDirectory>
+    <!--
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>src/main/resources/</directory>
+        <includes>
+          <include>*.yml</include>
+        </includes>
+      </resource>
+    </resources>
+    -->
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -65,7 +77,8 @@
           <encoding>ISO-8859-1</encoding>
           <doctitle>ProtocolLib JavaDocs</doctitle>
           <windowtitle>ProtocolLib JavaDocs</windowtitle>
-          <bottom>Copyright &#169; {inceptionYear}&#x2013;{currentYear} Comphenix and dmulloy2. Licensed under the GNU GPL v2.</bottom>
+          <bottom>Copyright &#169; {inceptionYear}&#x2013;{currentYear}
+            Comphenix and dmulloy2. Licensed under the GNU GPL v2.</bottom>
         </configuration>
         <executions>
           <execution>