New ONBS note pitch support #38

Author: koca2000

src/main/java/com/xxmicloxx/NoteBlockAPI/model/Note.java

@@ -9,10 +9,13 @@ public class Note {
 
 	private byte instrument;
 	private byte key;
+
+	private short pitch;
 
-	public Note(byte instrument, byte key) {
+	public Note(byte instrument, byte key, byte velocity, byte panning, short pitch) {
 		this.instrument = instrument;
 		this.key = key;
+		this.pitch = pitch;
 	}
 
 	/**
@@ -36,4 +39,12 @@ public byte getKey() {
 	public void setKey(byte key) {
 		this.key = key;
 	}
+
+	public short getPitch() {
+		return pitch;
+	}
+
+	public void setPitch(short pitch) {
+		this.pitch = pitch;
+	}
 }

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

@@ -5,8 +5,9 @@
 
 /**
  * Represents pitches of every noteblock note pre- & post-1.9
- *
+ * @deprecated Use NoteUtils
  */
+@Deprecated()
 public enum NotePitch {
 
 	NOTE_0(0, 0.5F, 0.50000F),
@@ -52,6 +53,7 @@ public static float getPitch(int note) {
 				return pre1_9 ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;
 			}
 		}
+
 		return 0.0F;
 	}
 

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

@@ -5,6 +5,7 @@
 import com.xxmicloxx.NoteBlockAPI.model.*;
 import com.xxmicloxx.NoteBlockAPI.utils.CompatibilityUtils;
 import com.xxmicloxx.NoteBlockAPI.utils.InstrumentUtils;
+import com.xxmicloxx.NoteBlockAPI.utils.NoteUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -76,7 +77,7 @@ public void playTick(Player player, int tick) {
 
             float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F)
                     * ((1F / 16F) * getDistance());
-            float pitch = NotePitch.getPitch(note.getKey() - 33);
+            float pitch = NoteUtils.getPitch(note);
 
             if (InstrumentUtils.isCustomInstrument(note.getInstrument())) {
                 CustomInstrument instrument = song.getCustomInstruments()

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

@@ -1,5 +1,6 @@
 package com.xxmicloxx.NoteBlockAPI.songplayer;
 
+import com.xxmicloxx.NoteBlockAPI.utils.NoteUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -101,7 +102,7 @@ public void playTick(Player player, int tick) {
 
 			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F) 
 					* ((1F / 16F) * getDistance());
-			float pitch = NotePitch.getPitch(note.getKey() - 33);
+			float pitch = NoteUtils.getPitch(note);
 
 			if (InstrumentUtils.isCustomInstrument(note.getInstrument())) {
 				CustomInstrument instrument = song.getCustomInstruments()

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

@@ -1,5 +1,6 @@
 package com.xxmicloxx.NoteBlockAPI.songplayer;
 
+import com.xxmicloxx.NoteBlockAPI.utils.NoteUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -90,7 +91,7 @@ public void playTick(Player player, int tick) {
 
 			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F) 
 					* ((1F / 16F) * getDistance());
-			float pitch = NotePitch.getPitch(note.getKey() - 33);
+			float pitch = NoteUtils.getPitch(note);
 
 			if (InstrumentUtils.isCustomInstrument(note.getInstrument())) {
 				CustomInstrument instrument = song.getCustomInstruments()

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

@@ -1,5 +1,6 @@
 package com.xxmicloxx.NoteBlockAPI.songplayer;
 
+import com.xxmicloxx.NoteBlockAPI.utils.NoteUtils;
 import org.bukkit.entity.Player;
 
 import com.xxmicloxx.NoteBlockAPI.NoteBlockAPI;
@@ -56,7 +57,7 @@ public void playTick(Player player, int tick) {
 			}
 
 			float volume = (layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F;
-			float pitch = NotePitch.getPitch(note.getKey() - 33);
+			float pitch = NoteUtils.getPitch(note);
 
 			if (InstrumentUtils.isCustomInstrument(note.getInstrument())) {
 				CustomInstrument instrument = song.getCustomInstruments()

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

@@ -118,15 +118,18 @@ private static Song parse(InputStream inputStream, File songFile) {
 					}
 
 					byte key = dataInputStream.readByte();
-
+					byte velocity = 100;
+					byte panning = 100;
+					short pitch = 0;
 					if (nbsversion >= 4) {
-						dataInputStream.readByte(); // note block velocity
-						dataInputStream.readByte(); // note block panning
-						readShort(dataInputStream); // note block pitch
+						velocity = dataInputStream.readByte(); // note block velocity
+						panning = dataInputStream.readByte(); // note block panning
+						pitch = readShort(dataInputStream); // note block pitch
 					}
 
-					setNote(layer, tick, instrument /* instrument */, 
-							 key/* note */, layerHashMap);
+					setNote(layer, tick,
+							new Note(instrument /* instrument */, key/* note */, velocity, panning, pitch),
+							layerHashMap);
 				}
 			}
 
@@ -190,18 +193,16 @@ private static Song parse(InputStream inputStream, File songFile) {
 	 * Sets a note at a tick in a song
 	 * @param layerIndex
 	 * @param ticks
-	 * @param instrument
-	 * @param key
+	 * @param note
 	 * @param layerHashMap
 	 */
-	private static void setNote(int layerIndex, int ticks, byte instrument, 
-			byte key, HashMap<Integer, Layer> layerHashMap) {
+	private static void setNote(int layerIndex, int ticks, Note note, HashMap<Integer, Layer> layerHashMap) {
 		Layer layer = layerHashMap.get(layerIndex);
 		if (layer == null) {
 			layer = new Layer();
 			layerHashMap.put(layerIndex, layer);
 		}
-		layer.setNote(ticks, new Note(instrument, key));
+		layer.setNote(ticks, note);
 	}
 
 	private static short readShort(DataInputStream dataInputStream) throws IOException {

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

@@ -0,0 +1,32 @@
+package com.xxmicloxx.NoteBlockAPI.utils;
+
+import com.xxmicloxx.NoteBlockAPI.model.Note;
+
+public class NoteUtils {
+
+    private static float[] pitches = null;
+
+    public static void generatePitchValues(){
+        pitches = new float[2400];
+
+        for (int i = 0; i < 2400; i++){
+            pitches[i] = (float) Math.pow(2, (i - 1200d) / 1200d);
+        }
+    }
+
+    public static float getPitch(Note note){
+        return getPitch(note.getKey(), note.getPitch());
+    }
+
+    public static float getPitch(byte key, short pitch){
+        pitch += (key - 33) * 100;
+        if (pitch < 0) pitch = 0;
+
+        if (pitch > 2400) pitch = 2400;
+
+        if (pitches == null) generatePitchValues();
+
+        return pitches[pitch];
+    }
+
+}