Added support for per note volume #38

Author: koca2000

pom.xml

@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.14-R0.1-SNAPSHOT</version>
+			<version>1.15.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

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

@@ -9,7 +9,7 @@ public class Note {
 
 	private byte instrument;
 	private byte key;
-
+	private byte velocity;
 	private short pitch;
 
 	public Note(byte instrument, byte key) {
@@ -19,6 +19,7 @@ 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.velocity = velocity;
 		this.pitch = pitch;
 	}
 
@@ -36,19 +37,58 @@ public void setInstrument(byte instrument) {
 		this.instrument = instrument;
 	}
 
+	/**
+	 * Returns note key number (Minecraft key 0 corresponds to key 33)
+	 * @return
+	 */
 	public byte getKey() {
 		return key;
 	}
 
+	/**
+	 * Sets note key number (Minecraft key 0 corresponds to key 33)
+	 * @param key
+	 */
 	public void setKey(byte key) {
 		this.key = key;
 	}
 
+	/**
+	 * Returns note pitch.
+	 * 100 = 1 key
+	 * 1200 = 1 octave
+ 	 * @return
+	 */
 	public short getPitch() {
 		return pitch;
 	}
 
+	/**
+	 * Sets note pitch.
+	 * 100 = 1 key
+	 * 1200 = 1 octave
+	 * @param pitch note pitch
+	 */
 	public void setPitch(short pitch) {
 		this.pitch = pitch;
 	}
+
+	/**
+	 * Returns note velocity (volume)
+	 * @return
+	 */
+	public byte getVelocity() {
+		return velocity;
+	}
+
+	/**
+	 * Sets note velocity (volume)
+	 * @param velocity number from 0 - 100
+	 */
+	public void setVelocity(byte velocity) {
+		if (velocity < 0) velocity = 0;
+		if (velocity > 100) velocity = 100;
+
+		this.velocity = velocity;
+	}
 }

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

@@ -75,7 +75,7 @@ public void playTick(Player player, int tick) {
             Note note = layer.getNote(tick);
             if (note == null) continue;
 
-            float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F)
+            float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume * note.getVelocity()) / 100_00_00_00F)
                     * ((1F / 16F) * getDistance());
             float pitch = NoteUtils.getPitch(note);
 

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

@@ -100,7 +100,7 @@ public void playTick(Player player, int tick) {
 			player.playNote(loc, InstrumentUtils.getBukkitInstrument(note.getInstrument()),
 					new org.bukkit.Note(note.getKey() - 33));
 
-			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F) 
+			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume * note.getVelocity()) / 100_00_00_00F)
 					* ((1F / 16F) * getDistance());
 			float pitch = NoteUtils.getPitch(note);
 

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

@@ -89,7 +89,7 @@ public void playTick(Player player, int tick) {
 			Note note = layer.getNote(tick);
 			if (note == null) continue;
 
-			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F) 
+			float volume = ((layer.getVolume() * (int) this.volume * (int) playerVolume * note.getVelocity()) / 100_00_00_00F)
 					* ((1F / 16F) * getDistance());
 			float pitch = NoteUtils.getPitch(note);
 

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

@@ -56,7 +56,7 @@ public void playTick(Player player, int tick) {
 				continue;
 			}
 
-			float volume = (layer.getVolume() * (int) this.volume * (int) playerVolume) / 1000000F;
+			float volume = (layer.getVolume() * (int) this.volume * (int) playerVolume * note.getVelocity()) / 100_00_00_00F;
 			float pitch = NoteUtils.getPitch(note);
 
 			if (InstrumentUtils.isCustomInstrument(note.getInstrument())) {