Added random play mode #21

Author: koca2000

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.xxmicloxx</groupId>
 	<artifactId>NoteBlockAPI</artifactId>
-	<version>1.2.4.1</version>
+	<version>1.2.5</version>
 	<name>NoteBlockAPI</name>
 
 	<properties>

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

@@ -85,7 +85,21 @@ public boolean hasNext(int songNumber){
 	public boolean exist(int songNumber){
 		return songs.size() > songNumber;
 	}
-	
+
+	/**
+	 * Returns index of song.
+	 * @param song
+	 * @return Index of song. -1 if song is not in playelist
+	 */
+	public int getIndex(Song song){	return songs.indexOf(song);	}
+
+	/**
+	 * Check whether playlist contains song.
+	 * @param song
+	 * @return
+	 */
+	public boolean contains(Song song) { return songs.contains(song); }
+
 	/**
 	 * Returns list of Songs in Playlist
 	 * @return

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

@@ -3,13 +3,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -48,14 +42,16 @@ public abstract class SongPlayer {
 	protected boolean autoDestroy = false;
 	protected boolean destroyed = false;
 
-	protected Thread playerThread;
-
 	protected byte volume = 100;
 	protected Fade fadeIn;
 	protected Fade fadeOut;
 	protected boolean loop = false;
+	protected boolean random = false;
+
+	protected Map<Song, Boolean> songQueue = Collections.synchronizedMap(new HashMap<Song, Boolean>()); //True if already played
 
 	private final Lock lock = new ReentrantLock();
+	private Random rng = new Random();
 
 	protected NoteBlockAPI plugin;
 
@@ -68,17 +64,24 @@ public SongPlayer(Song song) {
 	}
 
 	public SongPlayer(Song song, SoundCategory soundCategory) {
-		//this.song = song;
 		this(new Playlist(song), soundCategory);
 	}
+
+	public SongPlayer(Song song, SoundCategory soundCategory, boolean random) {
+		this(new Playlist(song), soundCategory, random);
+	}
 
 	public SongPlayer(Playlist playlist){
 		this(playlist, SoundCategory.MASTER);
 	}
-	
+
 	public SongPlayer(Playlist playlist, SoundCategory soundCategory){
+		this(playlist, soundCategory, false);
+	}
+
+	public SongPlayer(Playlist playlist, SoundCategory soundCategory, boolean random){
 		this.playlist = playlist;
-		this.song = playlist.get(actualSong);
+		this.random = random;
 		this.soundCategory = soundCategory;
 		plugin = NoteBlockAPI.getAPI();
 
@@ -89,10 +92,20 @@ public SongPlayer(Playlist playlist, SoundCategory soundCategory){
 		fadeOut = new Fade(FadeType.NONE, 60);
 		fadeOut.setFadeStart(volume);
 		fadeOut.setFadeTarget((byte) 0);
-		
+
+		if (random){
+			checkPlaylistQueue();
+			actualSong = rng.nextInt(playlist.getCount());
+		}
+		this.song = playlist.get(actualSong);
+
 		start();
 	}
-	
+
+	/**
+	 * @deprecated
+	 * @param songPlayer
+	 */
 	SongPlayer(com.xxmicloxx.NoteBlockAPI.SongPlayer songPlayer){
 		oldSongPlayer = songPlayer;
 		com.xxmicloxx.NoteBlockAPI.Song s = songPlayer.getSong();
@@ -306,23 +319,60 @@ private void start() {
 							fadeIn.setFadeDone(0);
 							CallUpdate("fadeDone", fadeIn.getFadeDone());
 							fadeOut.setFadeDone(0);
-							if (playlist.hasNext(actualSong)){
-								actualSong++;
-								song = playlist.get(actualSong);
-								CallUpdate("song", song);
-								SongNextEvent event = new SongNextEvent(this);
-								plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
-								continue;
-							} else{
-								actualSong = 0;
-								song = playlist.get(actualSong);
-								CallUpdate("song", song);
-								if (loop){
-									SongLoopEvent event = new SongLoopEvent(this);
+							if (random){
+								songQueue.put(song, true);
+								checkPlaylistQueue();
+								ArrayList<Song> left = new ArrayList<>();
+								for (Song s : songQueue.keySet()){
+									if (!songQueue.get(s)){
+										left.add(s);
+									}
+								}
+
+								if (left.size() == 0){
+									left.addAll(songQueue.keySet());
+									for (Song s : songQueue.keySet()) {
+										songQueue.put(s, false);
+									}
+									song = left.get(rng.nextInt(left.size()));
+									actualSong = playlist.getIndex(song);
+									CallUpdate("song", song);
+									if (loop) {
+										SongLoopEvent event = new SongLoopEvent(this);
+										plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
+
+										if (!event.isCancelled()) {
+											continue;
+										}
+									}
+								} else {
+									song = left.get(rng.nextInt(left.size()));
+									actualSong = playlist.getIndex(song);
+
+									CallUpdate("song", song);
+									SongNextEvent event = new SongNextEvent(this);
+									plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
+									continue;
+								}
+							} else {
+								if (playlist.hasNext(actualSong)) {
+									actualSong++;
+									song = playlist.get(actualSong);
+									CallUpdate("song", song);
+									SongNextEvent event = new SongNextEvent(this);
 									plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
-									
-									if (!event.isCancelled()){
-										continue;
+									continue;
+								} else {
+									actualSong = 0;
+									song = playlist.get(actualSong);
+									CallUpdate("song", song);
+									if (loop) {
+										SongLoopEvent event = new SongLoopEvent(this);
+										plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
+
+										if (!event.isCancelled()) {
+											continue;
+										}
 									}
 								}
 							}
@@ -369,6 +419,20 @@ private void start() {
 			}
 		});
 	}
+
+	private void checkPlaylistQueue(){
+		for (Song s : songQueue.keySet()){
+			if (!playlist.contains(s)){
+				songQueue.remove(s);
+			}
+		}
+
+		for (Song s : playlist.getSongList()){
+			if (!songQueue.containsKey(s)){
+				songQueue.put(s, false);
+			}
+		}
+	}
 
 	/**
 	 * Returns {@link Fade} for Fade in effect
@@ -688,6 +752,22 @@ public boolean isLoop(){
 		return loop;
 	}
 
+	/**
+	 * Sets whether the SongPlayer will choose next song from player randomly
+	 * @param random
+	 */
+	public void setRandom(boolean random){
+		this.random = random;
+	}
+
+	/**
+	 * Gets whether the SongPlayer will choose next song from player randomly
+	 * @return is random
+	 */
+	public boolean isRandom(){
+		return random;
+	}
+
 	void CallUpdate(String key, Object value){
 		try {
 			Method m = com.xxmicloxx.NoteBlockAPI.SongPlayer.class.getDeclaredMethod("update", String.class, Object.class);