v1.1.4

Added support for Spigot 1.8

Author: koca2000

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.xxmicloxx</groupId>
     <artifactId>NoteBlockAPI</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <repositories>
         <repository>
             <id>spigot-repo</id>

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

@@ -5,21 +5,38 @@
 public class Instrument {
 
     public static Sound getInstrument(byte instrument) {
-        switch (instrument) {
-            case 0:
-                return Sound.BLOCK_NOTE_HARP;
+    	if (!NoteBlockPlayerMain.plugin.isPre1_9()){
+	    	switch (instrument) {
+	            case 0:
+	                return Sound.valueOf("BLOCK_NOTE_HARP");
+	            case 1:
+	                return Sound.valueOf("BLOCK_NOTE_BASS");
+	            case 2:
+	                return Sound.valueOf("BLOCK_NOTE_BASEDRUM");
+	            case 3:
+	                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.BLOCK_NOTE_BASS;
+                return Sound.valueOf("NOTE_BASS_GUITAR");
             case 2:
-                return Sound.BLOCK_NOTE_BASEDRUM;
+                return Sound.valueOf("NOTE_BASS_DRUM");
             case 3:
-                return Sound.BLOCK_NOTE_SNARE;
+                return Sound.valueOf("NOTE_SNARE_DRUM");
             case 4:
-                return Sound.BLOCK_NOTE_HAT;
+                return Sound.valueOf("NOTE_STICKS");
             default:
-                return Sound.BLOCK_NOTE_HARP;
-                
-        }
+                return Sound.valueOf("NOTE_PIANO");
+    		}
+    	}
     }
 
     public static org.bukkit.Instrument getBukkitInstrument(byte instrument) {

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

@@ -51,4 +51,16 @@ public void onDisable() {
     	disabling = true;
         Bukkit.getScheduler().cancelTasks(this);
     }
+    
+    public boolean isPre1_9(){
+    	if (Bukkit.getVersion().contains("1.8")) {
+    		   return true;
+    	}
+    	
+    	if (Bukkit.getVersion().contains("1.7")) {
+ 		   return true;
+    	}
+    	
+		return false;
+    }
 }

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

@@ -2,44 +2,46 @@
 
 public enum NotePitch {
 
-	NOTE_0(0, 0.50000F),
-    NOTE_1(1, 0.52973F),
-    NOTE_2(2, 0.56123F),
-    NOTE_3(3, 0.59461F),
-    NOTE_4(4, 0.62995F),
-    NOTE_5(5, 0.66741F),
-    NOTE_6(6, 0.70711F),
-    NOTE_7(7, 0.74916F),
-    NOTE_8(8, 0.79370F),
-    NOTE_9(9, 0.84089F),
-    NOTE_10(10, 0.89091F),
-    NOTE_11(11, 0.94386F),
-    NOTE_12(12, 1.00000F),
-    NOTE_13(13, 1.05945F),
-    NOTE_14(14, 1.12245F),
-    NOTE_15(15, 1.18920F),
-    NOTE_16(16, 1.25993F),
-    NOTE_17(17, 1.33484F),
-    NOTE_18(18, 1.41420F),
-    NOTE_19(19, 1.49832F),
-    NOTE_20(20, 1.58741F),
-    NOTE_21(21, 1.68180F),
-    NOTE_22(22, 1.78180F),
-    NOTE_23(23, 1.88775F),
-    NOTE_24(24, 2.00000F);
+	NOTE_0(0, 0.5F, 0.50000F),
+    NOTE_1(1, 0.53F, 0.52973F),
+    NOTE_2(2, 0.56F, 0.56123F),
+    NOTE_3(3, 0.6F, 0.59461F),
+    NOTE_4(4, 0.63F, 0.62995F),
+    NOTE_5(5, 0.67F, 0.66741F),
+    NOTE_6(6, 0.7F, 0.70711F),
+    NOTE_7(7, 0.76F, 0.74916F),
+    NOTE_8(8, 0.8F, 0.79370F),
+    NOTE_9(9, 0.84F, 0.84089F),
+    NOTE_10(10, 0.9F, 0.89091F),
+    NOTE_11(11, 0.94F, 0.94386F),
+    NOTE_12(12, 1.0F, 1.00000F),
+    NOTE_13(13, 1.06F, 1.05945F),
+    NOTE_14(14, 1.12F, 1.12245F),
+    NOTE_15(15, 1.18F, 1.18920F),
+    NOTE_16(16, 1.26F, 1.25993F),
+    NOTE_17(17, 1.34F, 1.33484F),
+    NOTE_18(18, 1.42F, 1.41420F),
+    NOTE_19(19, 1.5F, 1.49832F),
+    NOTE_20(20, 1.6F, 1.58741F),
+    NOTE_21(21, 1.68F, 1.68180F),
+    NOTE_22(22, 1.78F, 1.78180F),
+    NOTE_23(23, 1.88F, 1.88775F),
+    NOTE_24(24, 2.0F, 2.00000F);
 
     public int note;
-    public float pitch;
+    public float pitchPre1_9;
+    public float pitchPost1_9;
 
-    private NotePitch(int note, float pitch) {
+    private NotePitch(int note, float pitchPre1_9, float pitchPost1_9) {
         this.note = note;
-        this.pitch = pitch;
+        this.pitchPre1_9 = pitchPre1_9;
+        this.pitchPost1_9 = pitchPost1_9;
     }
 
     public static float getPitch(int note) {
         for (NotePitch notePitch : values()) {
             if (notePitch.note == note) {
-                return notePitch.pitch;
+                return NoteBlockPlayerMain.plugin.isPre1_9() ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;
             }
         }
 

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: NoteBlockAPI
 
 main: com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain
-version: 1.1.3
+version: 1.1.4
 
 description: a developer interface to play nbs-files ingame
 authors: [xxmicloxx, michidk, koca2000]