Added fade option to setPlaying method #44

Author: koca2000

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.xxmicloxx</groupId>
 	<artifactId>NoteBlockAPI</artifactId>
-	<version>1.5.1-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 	<name>NoteBlockAPI</name>
 
 	<properties>
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.15.2-R0.1-SNAPSHOT</version>
+			<version>1.16.1-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

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

@@ -92,5 +92,8 @@ protected byte getFadeTarget() {
 	protected void setFadeDone(int fadeDone){
 		this.fadeDone = fadeDone;
 	}
-	
+
+	public boolean isDone(){
+	    return fadeDone >= fadeDuration;
+    }
 }

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

@@ -28,6 +28,7 @@ public abstract class SongPlayer {
 	protected int actualSong = 0;
 
 	protected boolean playing = false;
+	protected boolean fading = false;
 	protected short tick = -1;
 	protected Map<UUID, Boolean> playerList = new ConcurrentHashMap<UUID, Boolean>();
 
@@ -37,6 +38,7 @@ public abstract class SongPlayer {
 	protected byte volume = 100;
 	protected Fade fadeIn;
 	protected Fade fadeOut;
+	protected Fade fadeTemp = null;
 	protected RepeatMode repeat = RepeatMode.NO;
 	protected boolean random = false;
 
@@ -316,8 +318,24 @@ private void start() {
 						break;
 					}
 
-					if (playing) {
-						if (tick < fadeIn.getFadeDuration()){
+					if (playing || fading) {
+						if (fadeTemp != null){
+							if (fadeTemp.isDone()) {
+								fadeTemp = null;
+								fading = false;
+								if (!playing) {
+									SongStoppedEvent event = new SongStoppedEvent(this);
+									plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
+									volume = fadeIn.getFadeTarget();
+									continue;
+								}
+							}else {
+								int fade = fadeTemp.calculateFade();
+								if (fade != -1){
+									volume = (byte) fade;
+								}
+							}
+						} else if (tick < fadeIn.getFadeDuration()){
 							int fade = fadeIn.calculateFade();
 							if (fade != -1){
 								volume = (byte) fade;
@@ -336,6 +354,7 @@ private void start() {
 							fadeIn.setFadeDone(0);
 							CallUpdate("fadeDone", fadeIn.getFadeDone());
 							fadeOut.setFadeDone(0);
+							volume = fadeIn.getFadeTarget();
 							if (repeat == RepeatMode.ONE){
 								SongLoopEvent event = new SongLoopEvent(this);
 								plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
@@ -596,11 +615,32 @@ public boolean isPlaying() {
 	 * @param playing
 	 */
 	public void setPlaying(boolean playing) {
+		setPlaying(playing, null);
+	}
+
+	/**
+	 * Sets whether the SongPlayer is playing and whether it should fade if previous value was different
+	 * @param playing
+	 * @param fade
+	 */
+	public void setPlaying(boolean playing, boolean fade) {
+		setPlaying(playing, fade ? (playing ? fadeIn : fadeOut) : null);
+	}
+
+	public void setPlaying(boolean playing, Fade fade) {
+		if (this.playing == playing) return;
+
 		this.playing = playing;
-		if (!playing) {
-			SongStoppedEvent event = new SongStoppedEvent(this);
-			plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
+		if (fade != null && fade.getType() != FadeType.NONE) {
+			fadeTemp = new Fade(fade.getType(), fade.getFadeDuration());
+			fadeTemp.setFadeStart(playing ? 0 : volume);
+			fadeTemp.setFadeTarget(playing ? volume : 0);
+			fading = true;
+		} else {
+			fading = false;
+			volume = fadeIn.getFadeTarget();
 		}
+
 		CallUpdate("playing", playing);
 	}
 
@@ -686,6 +726,10 @@ public void setVolume(byte volume) {
 
 		fadeIn.setFadeTarget(volume);
 		fadeOut.setFadeStart(volume);
+		if (fadeTemp != null) {
+			if (playing) fadeTemp.setFadeTarget(volume);
+			else fadeTemp.setFadeStart(volume);
+		}
 
 		CallUpdate("volume", volume);
 	}