Skip to content

Use own ticker, prevents blocking bukkit threads #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Elecast2 wants to merge 1 commit into from
Closed

Use own ticker, prevents blocking bukkit threads #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/main/java/com/xxmicloxx/NoteBlockAPI/NoteBlockAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.xxmicloxx.NoteBlockAPI;

import com.xxmicloxx.NoteBlockAPI.songplayer.SongPlayer;
import com.xxmicloxx.NoteBlockAPI.songplayer.SongTicker;
import com.xxmicloxx.NoteBlockAPI.utils.MathUtils;
import com.xxmicloxx.NoteBlockAPI.utils.Updater;
import org.bstats.bukkit.Metrics;
Expand Down Expand Up @@ -135,7 +136,7 @@ public static void setSongPlayersByPlayer(UUID player, ArrayList<SongPlayer> son
@Override
public void onEnable() {
plugin = this;

for (Plugin pl : getServer().getPluginManager().getPlugins()){
if (pl.getDescription().getDepend().contains("NoteBlockAPI") || pl.getDescription().getSoftDepend().contains("NoteBlockAPI")){
dependentPlugins.put(pl, false);
Expand Down Expand Up @@ -212,16 +213,13 @@ public void onDisable() {
worker.getThread().interrupt();
}
NoteBlockPlayerMain.plugin.onDisable();
SongTicker.shutdown();
}

public void doSync(Runnable runnable) {
getServer().getScheduler().runTask(this, runnable);
}

public void doAsync(Runnable runnable) {
getServer().getScheduler().runTaskAsynchronously(this, runnable);
}

public boolean isDisabling() {
return disabling;
}
Expand Down
293 changes: 145 additions & 148 deletions src/main/java/com/xxmicloxx/NoteBlockAPI/songplayer/SongPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,172 +309,168 @@ public void setEnable10Octave(boolean enable10Octave) {
* Starts this SongPlayer
*/
private void start() {
plugin.doAsync(() -> {
while (!destroyed) {
long startTime = System.currentTimeMillis();
lock.lock();
try {
if (destroyed || NoteBlockAPI.getAPI().isDisabling()){
break;
SongTicker.register(this);
}

private long lastTickTime = System.currentTimeMillis();

public void updateTick() {
lock.lock();
try {
if (destroyed || NoteBlockAPI.getAPI().isDisabling()){
return;
}

long delayMillis = (long) (song.getDelay() * 50);

long currentTime = System.currentTimeMillis();
if (currentTime - lastTickTime < delayMillis) {
return;
}

lastTickTime = currentTime;

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();
return;
}
}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;
}
CallUpdate("fadeDone", fadeIn.getFadeDone());
} else if (tick >= song.getLength() - fadeOut.getFadeDuration()){
int fade = fadeOut.calculateFade();
if (fade != -1){
volume = (byte) fade;
}
}

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;
tick++;
if (tick > song.getLength()) {
tick = -1;
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));

if (!event.isCancelled()) {
return;
}
} else {
if (random) {
songQueue.put(song, true);
checkPlaylistQueue();
ArrayList<Song> left = new ArrayList<>();
for (Song s : songQueue.keySet()) {
if (!songQueue.get(s)) {
left.add(s);
}
}
} else if (tick < fadeIn.getFadeDuration()){
int fade = fadeIn.calculateFade();
if (fade != -1){
volume = (byte) fade;
}
CallUpdate("fadeDone", fadeIn.getFadeDone());
} else if (tick >= song.getLength() - fadeOut.getFadeDuration()){
int fade = fadeOut.calculateFade();
if (fade != -1){
volume = (byte) fade;
}
}

tick++;
if (tick > song.getLength()) {
tick = -1;
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));

if (!event.isCancelled()) {
continue;
if (left.size() == 0) {
left.addAll(songQueue.keySet());
for (Song s : songQueue.keySet()) {
songQueue.put(s, false);
}
} else {
if (random) {
songQueue.put(song, true);
checkPlaylistQueue();
ArrayList<Song> left = new ArrayList<>();
for (Song s : songQueue.keySet()) {
if (!songQueue.get(s)) {
left.add(s);
}
}
song = left.get(rng.nextInt(left.size()));
actualSong = playlist.getIndex(song);
CallUpdate("song", song);
if (repeat == RepeatMode.ALL) {
SongLoopEvent event = new SongLoopEvent(this);
plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));

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 (repeat == RepeatMode.ALL) {
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));
continue;
} else {
actualSong = 0;
song = playlist.get(actualSong);
CallUpdate("song", song);
if (repeat == RepeatMode.ALL) {
SongLoopEvent event = new SongLoopEvent(this);
plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));

if (!event.isCancelled()) {
continue;
}
}
if (!event.isCancelled()) {
return;
}
}
} 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));
return;
}
playing = false;
SongEndEvent event = new SongEndEvent(this);
plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
if (autoDestroy) {
destroy();
}
continue;
}
CallUpdate("tick", tick);

plugin.doSync(() -> {
try {
for (UUID uuid : playerList.keySet()) {
Player player = Bukkit.getPlayer(uuid);
if (player == null) {
// offline...
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));
return;
} else {
actualSong = 0;
song = playlist.get(actualSong);
CallUpdate("song", song);
if (repeat == RepeatMode.ALL) {
SongLoopEvent event = new SongLoopEvent(this);
plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));

if (!event.isCancelled()) {
return;
}
playTick(player, tick);
}
} catch (Exception e){
Bukkit.getLogger().severe("An error occurred during the playback of song "
+ (song != null ?
song.getPath() + " (" + song.getAuthor() + " - " + song.getTitle() + ")"
: "null"));
e.printStackTrace();
}
});
}
}
} catch (Exception e) {
Bukkit.getLogger().severe("An error occurred during the playback of song "
+ (song != null ?
song.getPath() + " (" + song.getAuthor() + " - " + song.getTitle() + ")"
: "null"));
e.printStackTrace();
} finally {
lock.unlock();
}

if (destroyed) {
break;
playing = false;
SongEndEvent event = new SongEndEvent(this);
plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
if (autoDestroy) {
destroy();
}
return;
}
CallUpdate("tick", tick);

long duration = System.currentTimeMillis() - startTime;
float delayMillis = song.getDelay() * 50;
if (duration < delayMillis) {
plugin.doSync(() -> {
try {
Thread.sleep((long) (delayMillis - duration));
} catch (InterruptedException e) {
// do nothing
for (UUID uuid : playerList.keySet()) {
Player player = Bukkit.getPlayer(uuid);
if (player == null) {
// offline...
continue;
}
playTick(player, tick);
}
} catch (Exception e){
Bukkit.getLogger().severe("An error occurred during the playback of song "
+ (song != null ?
song.getPath() + " (" + song.getAuthor() + " - " + song.getTitle() + ")"
: "null"));
e.printStackTrace();
}
}
});
}
});
} catch (Exception e) {
Bukkit.getLogger().severe("An error occurred during the playback of song "
+ (song != null ?
song.getPath() + " (" + song.getAuthor() + " - " + song.getTitle() + ")"
: "null"));
e.printStackTrace();
} finally {
lock.unlock();
}
}

private void checkPlaylistQueue(){
Expand Down Expand Up @@ -600,20 +596,21 @@ public void destroy() {
try {
SongDestroyingEvent event = new SongDestroyingEvent(this);
plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
//Bukkit.getScheduler().cancelTask(threadId);
if (event.isCancelled()) {
return;
}
destroyed = true;
playing = false;
setTick((short) -1);
SongTicker.unregister(this);
CallUpdate("destroyed", destroyed);
CallUpdate("playing", playing);
} finally {
lock.unlock();
}
}


/**
* Returns whether the SongPlayer is actively playing
* @return is playing
Expand Down
Loading