Fixed NoteBlockSongPlayer in 1.12 and lower

Author: koca2000

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.xxmicloxx</groupId>
 	<artifactId>NoteBlockAPI</artifactId>
-	<version>1.6.1.1-SNAPSHOT</version>
+	<version>1.6.2-SNAPSHOT</version>
 	<name>NoteBlockAPI</name>
 
 	<properties>

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

@@ -1,12 +1,10 @@
 package com.xxmicloxx.NoteBlockAPI;
 
+import com.xxmicloxx.NoteBlockAPI.utils.InstrumentUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-import com.xxmicloxx.NoteBlockAPI.utils.InstrumentUtils;
-
 /**
  * @deprecated {@link com.xxmicloxx.NoteBlockAPI.songplayer.NoteBlockSongPlayer}
  */
@@ -62,7 +60,7 @@ public void setNoteBlock(Block noteBlock) {
 
 	@Override
 	public void playTick(Player player, int tick) {
-		if (noteBlock.getType() != Material.NOTE_BLOCK) {
+		if (noteBlock.getType() != com.xxmicloxx.NoteBlockAPI.utils.CompatibilityUtils.getNoteBlockMaterial()) {
 			return;
 		}
 		if (!player.getWorld().getName().equals(noteBlock.getWorld().getName())) {

src/main/java/com/xxmicloxx/NoteBlockAPI/songplayer/NoteBlockSongPlayer.java

@@ -1,21 +1,15 @@
 package com.xxmicloxx.NoteBlockAPI.songplayer;
 
-import com.xxmicloxx.NoteBlockAPI.utils.NoteUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-
 import com.xxmicloxx.NoteBlockAPI.NoteBlockAPI;
 import com.xxmicloxx.NoteBlockAPI.SongPlayer;
 import com.xxmicloxx.NoteBlockAPI.event.PlayerRangeStateChangeEvent;
-import com.xxmicloxx.NoteBlockAPI.model.Layer;
-import com.xxmicloxx.NoteBlockAPI.model.Note;
-import com.xxmicloxx.NoteBlockAPI.model.Playlist;
-import com.xxmicloxx.NoteBlockAPI.model.Song;
-import com.xxmicloxx.NoteBlockAPI.model.SoundCategory;
+import com.xxmicloxx.NoteBlockAPI.model.*;
+import com.xxmicloxx.NoteBlockAPI.utils.CompatibilityUtils;
 import com.xxmicloxx.NoteBlockAPI.utils.InstrumentUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
 
 /**
  * SongPlayer created at a specified NoteBlock
@@ -78,7 +72,7 @@ public void setNoteBlock(Block noteBlock) {
 
 	@Override
 	public void playTick(Player player, int tick) {
-		if (noteBlock.getType() != Material.NOTE_BLOCK) {
+		if (noteBlock.getType() != CompatibilityUtils.getNoteBlockMaterial()) {
 			return;
 		}
 		if (!player.getWorld().getName().equals(noteBlock.getWorld().getName())) {
@@ -94,12 +88,16 @@ public void playTick(Player player, int tick) {
 			if (note == null) {
 				continue;
 			}
+			int key = note.getKey() - 33;
+
+			while (key < 0) key += 12;
+			while (key > 24) key -= 12;
+
 			player.playNote(loc, InstrumentUtils.getBukkitInstrument(note.getInstrument()),
-					new org.bukkit.Note(note.getKey() - 33));
+					new org.bukkit.Note(key));
 
 			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume * note.getVelocity()) / 100_00_00_00F)
 					* ((1F / 16F) * getDistance());
-			float pitch = NoteUtils.getPitch(note);
 
             channelMode.play(player, loc, song, layer, note, soundCategory, volume, !enable10Octave);
 

src/main/java/com/xxmicloxx/NoteBlockAPI/utils/CompatibilityUtils.java

@@ -7,6 +7,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 
@@ -290,4 +291,8 @@ public static float getServerVersion(){
 		return serverVersion;
 	}
 
+	public static Material getNoteBlockMaterial(){
+		return Material.valueOf("NOTE_BLOCK");
+	}
+
 }