Merge pull request #2 from Selim042/master

Play all music in the music sound category.

Author: koca2000

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

@@ -2,6 +2,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.SoundCategory;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
@@ -13,6 +14,10 @@ public NoteBlockSongPlayer(Song song) {
         super(song);
     }
 
+    public NoteBlockSongPlayer(Song song, SoundCategory soundCategory) {
+        super(song, soundCategory);
+    }
+
     public Block getNoteBlock() {
         return noteBlock;
     }
@@ -44,7 +49,7 @@ public void playTick(Player p, int tick) {
             	if (song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSound() != null){
             		p.playSound(noteBlock.getLocation(),
                             song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSound(),
-                            ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
+                            this.soundCategory,((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                             NotePitch.getPitch(note.getKey() - 33));
             	}else {
             		p.playSound(noteBlock.getLocation(),
@@ -56,7 +61,7 @@ public void playTick(Player p, int tick) {
             }else {
             	p.playSound(noteBlock.getLocation(),
                     Instrument.getInstrument(note.getInstrument()),
-                    ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
+                    this.soundCategory,((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                     NotePitch.getPitch(note.getKey() - 33));
             }
 

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

@@ -2,6 +2,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.SoundCategory;
 import org.bukkit.entity.Player;
 
 public class PositionSongPlayer extends SongPlayer {
@@ -13,6 +14,10 @@ public PositionSongPlayer(Song song) {
         super(song);
     }
 
+    public PositionSongPlayer(Song song, SoundCategory soundCategory) {
+        super(song, soundCategory);
+    }
+
     public Location getTargetLocation() {
         return targetLocation;
     }
@@ -39,19 +44,19 @@ public void playTick(Player p, int tick) {
             	if (song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSound() != null){
             		p.playSound(targetLocation,
                             song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSound(),
-                            ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
+                            this.soundCategory,((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                             NotePitch.getPitch(note.getKey() - 33));
             	}else {
             		p.playSound(targetLocation,
                             song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSoundfile(),
-                            ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
+                            this.soundCategory,((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                             NotePitch.getPitch(note.getKey() - 33));
             	}
 
             }else {
             	p.playSound(targetLocation,
                     Instrument.getInstrument(note.getInstrument()),
-                    ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
+                    this.soundCategory,((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                     NotePitch.getPitch(note.getKey() - 33));
             }
 

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

@@ -1,5 +1,6 @@
 package com.xxmicloxx.NoteBlockAPI;
 
+import org.bukkit.SoundCategory;
 import org.bukkit.entity.Player;
 
 public class RadioSongPlayer extends SongPlayer {
@@ -8,6 +9,10 @@ public RadioSongPlayer(Song song) {
         super(song);
     }
 
+    public RadioSongPlayer(Song song, SoundCategory soundCategory) {
+    	super(song, soundCategory);
+    }
+
     @Override
     public void playTick(Player p, int tick) {
         byte playerVolume = NoteBlockPlayerMain.getPlayerVolume(p);
@@ -21,19 +26,19 @@ public void playTick(Player p, int tick) {
             	if (song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSound() != null){
             		p.playSound(p.getEyeLocation(),
                             song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSound(),
-                            (l.getVolume() * (int) volume * (int) playerVolume) / 1000000f,
+                            this.soundCategory,(l.getVolume() * (int) volume * (int) playerVolume) / 1000000f,
                             NotePitch.getPitch(note.getKey() - 33));
             	}else {
             		p.playSound(p.getEyeLocation(),
                             song.getCustomInstruments()[note.getInstrument() - Instrument.getCustomInstrumentFirstIndex()].getSoundfile(),
-                            (l.getVolume() * (int) volume * (int) playerVolume) / 1000000f,
+                            this.soundCategory,(l.getVolume() * (int) volume * (int) playerVolume) / 1000000f,
                             NotePitch.getPitch(note.getKey() - 33));
             	}
 
             }else {
             	p.playSound(p.getEyeLocation(),
                     Instrument.getInstrument(note.getInstrument()),
-                    (l.getVolume() * (int) volume * (int) playerVolume) / 1000000f,
+                    this.soundCategory,(l.getVolume() * (int) volume * (int) playerVolume) / 1000000f,
                     NotePitch.getPitch(note.getKey() - 33));
             }
         }

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

@@ -9,6 +9,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.bukkit.Bukkit;
+import org.bukkit.SoundCategory;
 import org.bukkit.entity.Player;
 
 public abstract class SongPlayer {
@@ -28,9 +29,15 @@ public abstract class SongPlayer {
     protected FadeType fadeType = FadeType.FADE_LINEAR;
     private final Lock lock = new ReentrantLock();
     protected NoteBlockPlayerMain plugin;
+    protected SoundCategory soundCategory;
 
     public SongPlayer(Song song) {
+    	this(song, SoundCategory.MASTER);
+    }
+
+    public SongPlayer(Song song, SoundCategory soundCategory) {
         this.song = song;
+        this.soundCategory = soundCategory;
         plugin = NoteBlockPlayerMain.plugin;
         start();
     }
@@ -258,4 +265,12 @@ public void setVolume(byte volume) {
     public Song getSong() {
         return song;
     }
+
+    public SoundCategory getCategory() {
+    	return soundCategory;
+    }
+
+    public void setCategory(SoundCategory soundCategory) {
+    	this.soundCategory = soundCategory;
+    }
 }