maven-ize plugin.yml, fix sound stuff

Author: drewdorris

pom.xml

@@ -7,10 +7,12 @@
 	<groupId>com.xxmicloxx</groupId>
 	<artifactId>NoteBlockAPI</artifactId>
 	<version>1.2.0</version>
+	<name>NoteBlockAPI</name>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+		<mainClass>com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain</mainClass>
 	</properties>
 
 	<repositories>
@@ -80,6 +82,25 @@
 				</executions>
 			</plugin>
 		</plugins>
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<defaultGoal>package</defaultGoal>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>plugin.yml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<excludes>
+					<exclude>**/*.java</exclude>
+					<exclude>plugin.yml</exclude>
+				</excludes>
+			</resource>
+		</resources>
 	</build>
 
 </project>

src/main/java/com/xxmicloxx/NoteBlockAPI/Sound.java

@@ -3,7 +3,7 @@
 /**
  * Version independent Spigot sounds.
  *
- * Enum mapping to sound names for different
+ * Enum mapping to note names for different
  * Minecraft versions.
  * 
  * @see https://gist.github.com/NiklasEi/7bd0ffd136f8459df0940e4501d47a8a
@@ -30,10 +30,16 @@ public enum Sound {
 		this.versionDependentNames = versionDependentNames;
 	}
 
+	/**
+	 * Attempts to retrieve the org.bukkit.Sound equivalent of a version dependent enum name
+	 * @param bukkitSoundName
+	 * @return org.bukkit.Sound enum
+	 */
 	public static org.bukkit.Sound getFromBukkitName(String bukkitSoundName) {
 		for (Sound sound : values()) {
-			org.bukkit.Sound bukkitSound = sound.getSound();
-			if (bukkitSound != null) return bukkitSound;
+			for (String soundName : sound.versionDependentNames) {
+				if (soundName.equalsIgnoreCase(bukkitSoundName)) return sound.getSound();
+			}
 		}
 		return org.bukkit.Sound.valueOf(bukkitSoundName);
 	}