Added new 1.12 sounds (v1.1.6)

Author: koca2000

pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.11-R0.1-SNAPSHOT</version>
+            <version>1.12-pre2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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

@@ -2,11 +2,28 @@
 
 import org.bukkit.Sound;
 
+import com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain.NoteBlockCompatibility;
+
 public class Instrument {
 
     public static Sound getInstrument(byte instrument) {
-    	if (!NoteBlockPlayerMain.isPre1_9()){
-	    	switch (instrument) {
+    	if (NoteBlockPlayerMain.getCompatibility() == NoteBlockCompatibility.pre1_9){
+			switch (instrument) {
+        		case 0:
+                    return Sound.valueOf("NOTE_PIANO");
+                case 1:
+                    return Sound.valueOf("NOTE_BASS_GUITAR");
+                case 2:
+                    return Sound.valueOf("NOTE_BASS_DRUM");
+                case 3:
+                    return Sound.valueOf("NOTE_SNARE_DRUM");
+                case 4:
+                    return Sound.valueOf("NOTE_STICKS");
+                default:
+                    return Sound.valueOf("NOTE_PIANO");
+    		}
+    	} else {
+			switch (instrument) {
 	            case 0:
 	                return Sound.valueOf("BLOCK_NOTE_HARP");
 	            case 1:
@@ -17,25 +34,25 @@ public static Sound getInstrument(byte instrument) {
 	                return Sound.valueOf("BLOCK_NOTE_SNARE");
 	            case 4:
 	                return Sound.valueOf("BLOCK_NOTE_HAT");
-	            default:
-	                return Sound.valueOf("BLOCK_NOTE_HARP");
-	                
-	        }
-    	} else {
-    		switch (instrument) {
-    		case 0:
-                return Sound.valueOf("NOTE_PIANO");
-            case 1:
-                return Sound.valueOf("NOTE_BASS_GUITAR");
-            case 2:
-                return Sound.valueOf("NOTE_BASS_DRUM");
-            case 3:
-                return Sound.valueOf("NOTE_SNARE_DRUM");
-            case 4:
-                return Sound.valueOf("NOTE_STICKS");
-            default:
-                return Sound.valueOf("NOTE_PIANO");
-    		}
+			}
+			
+			if (NoteBlockPlayerMain.getCompatibility() == NoteBlockCompatibility.post1_12){
+				switch (instrument) {
+		            case 5:
+		                return Sound.valueOf("BLOCK_NOTE_FLUTE");
+		            case 6:
+		                return Sound.valueOf("BLOCK_NOTE_BELL");
+		            case 7:
+		                return Sound.valueOf("BLOCK_NOTE_GUITAR");
+		            case 8:
+		                return Sound.valueOf("BLOCK_NOTE_CHIME");
+		            case 9:
+		                return Sound.valueOf("BLOCK_NOTE_XYLOPHONE");
+				}
+			}
+			
+			return Sound.valueOf("BLOCK_NOTE_HARP");
+			
     	}
     }
 

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

@@ -55,8 +55,14 @@ public void onDisable() {
         Bukkit.getScheduler().cancelTasks(this);
     }
 
-    public static boolean isPre1_9(){
-    	return Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7");
+    protected static int getCompatibility(){
+    	if (Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7")){
+    		return NoteBlockCompatibility.pre1_9;
+    	} else if (Bukkit.getVersion().contains("1.9") || Bukkit.getVersion().contains("1.10") || Bukkit.getVersion().contains("1.11")){
+    		return NoteBlockCompatibility.pre1_12;
+    	} else {
+    		return NoteBlockCompatibility.post1_12;
+    	}
     }
 
     public void doSync(Runnable r) {
@@ -70,4 +76,10 @@ public void doAsync(Runnable r) {
     protected boolean isDisabling(){
     	return disabling;
     }
+    
+    public class NoteBlockCompatibility{
+    	public static final int pre1_9 = 0;
+    	public static final int pre1_12 = 1;
+    	public static final int post1_12 = 2;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.xxmicloxx.NoteBlockAPI;
 
+import com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain.NoteBlockCompatibility;
+
 public enum NotePitch {
 
 	NOTE_0(0, 0.5F, 0.50000F),
@@ -41,7 +43,7 @@ private NotePitch(int note, float pitchPre1_9, float pitchPost1_9) {
     public static float getPitch(int note) {
         for (NotePitch notePitch : values()) {
             if (notePitch.note == note) {
-                return NoteBlockPlayerMain.isPre1_9() ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;
+                return NoteBlockPlayerMain.getCompatibility() == NoteBlockCompatibility.pre1_9 ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;
             }
         }