Add API events system

.github/workflows/javadocs.yml

@@ -0,0 +1,46 @@
+name: JavaDocs Generation
+
+on:
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+        with:
+          arguments: :api:javadoc
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: 'api/build/docs/javadoc'
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

api/src/main/java/us/ajg0702/queue/api/AjQueueAPI.java

@@ -1,5 +1,6 @@
 package us.ajg0702.queue.api;
 
+import us.ajg0702.queue.api.events.utils.EventReceiver;
 import us.ajg0702.queue.api.premium.Logic;
 import us.ajg0702.queue.api.premium.LogicGetter;
 import us.ajg0702.queue.api.spigot.AjQueueSpigotAPI;
@@ -114,5 +115,7 @@ public abstract class AjQueueAPI {
      */
     public abstract void shutdown();
 
+    public abstract <E> void listen(Class<E> event, EventReceiver<E> handler);
+
     public abstract ExecutorService getServersUpdateExecutor();
 }

api/src/main/java/us/ajg0702/queue/api/events/Cancellable.java

@@ -0,0 +1,15 @@
+package us.ajg0702.queue.api.events;
+
+public interface Cancellable {
+    /**
+     * Whether this event is canceled.
+     * @return True if canceled. False if not.
+     */
+    boolean isCancelled();
+
+    /**
+     * Allows you to cancel or un-cancel this event
+     * @param cancelled True to cancel the event, false to un-cancel
+     */
+    void setCancelled(boolean cancelled);
+}

api/src/main/java/us/ajg0702/queue/api/events/Event.java

@@ -0,0 +1,4 @@
+package us.ajg0702.queue.api.events;
+
+public interface Event {
+}

api/src/main/java/us/ajg0702/queue/api/events/PositionChangeEvent.java

@@ -0,0 +1,51 @@
+package us.ajg0702.queue.api.events;
+
+import org.jetbrains.annotations.Nullable;
+import us.ajg0702.queue.api.players.AdaptedPlayer;
+import us.ajg0702.queue.api.players.QueuePlayer;
+import us.ajg0702.queue.api.queues.QueueServer;
+
+/**
+ * Called when someone is added or removed from a queue that the player is in, causing the player's position to change
+ */
+public class PositionChangeEvent implements Event {
+    private final QueuePlayer player;
+    private final int position;
+
+    public PositionChangeEvent(QueuePlayer player) {
+        this.player = player;
+        position = player.getPosition();
+    }
+
+    /**
+     * Gets the QueuePlayer object that represents this player
+     * @return the QueuePlayer object
+     */
+    public QueuePlayer getQueuePlayer() {
+        return player;
+    }
+
+    /**
+     * Gets the AdaptedPlayer that this event is about. May return null!
+     * @return The AdaptedPlayer that this event is about. Returns null if the player is offline.
+     */
+    public @Nullable AdaptedPlayer getPlayer() {
+        return player.getPlayer();
+    }
+
+    /**
+     * Gets the player's new position in the queue
+     * @return The player's new position. 1 being 1st, 2 being 2nd, etc
+     */
+    public int getPosition() {
+        return position;
+    }
+
+    /**
+     * Gets the queue that this event is from
+     * @return The QueueServer that the player is in that their position changed
+     */
+    public QueueServer getQueue() {
+        return player.getQueueServer();
+    }
+}

api/src/main/java/us/ajg0702/queue/api/events/PreQueueEvent.java

@@ -0,0 +1,45 @@
+package us.ajg0702.queue.api.events;
+
+import us.ajg0702.queue.api.players.AdaptedPlayer;
+import us.ajg0702.queue.api.queues.QueueServer;
+
+/**
+ * Called after all checks are made, right before a player is actually added to the queue.
+ * If canceled, the player will not be added to the queue.
+ * If you cancel this event, it is up to you to send a message telling the player why they were not added to the queue.
+ */
+public class PreQueueEvent implements Event, Cancellable {
+    private final AdaptedPlayer player;
+    private final QueueServer target;
+
+    private boolean cancelled = false;
+
+    public PreQueueEvent(AdaptedPlayer player, QueueServer target) {
+        this.player = player;
+        this.target = target;
+    }
+
+    /**
+     * Gets the player that is joining the queue
+     * @return
+     */
+    public AdaptedPlayer getPlayer() {
+        return player;
+    }
+
+    /**
+     * Gets the target QueueServer that the player is trying to queue for
+     * @return The QueueServer that the player is trying to queue for
+     */
+    public QueueServer getTarget() {
+        return target;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+}

api/src/main/java/us/ajg0702/queue/api/events/SuccessfulSendEvent.java

@@ -0,0 +1,34 @@
+package us.ajg0702.queue.api.events;
+
+import us.ajg0702.queue.api.players.AdaptedPlayer;
+import us.ajg0702.queue.api.players.QueuePlayer;
+import us.ajg0702.queue.api.server.AdaptedServer;
+
+/**
+ * Called after a player is successfully sent to a server.
+ */
+public class SuccessfulSendEvent implements Event {
+    private final QueuePlayer player;
+    private final AdaptedServer server;
+
+    public SuccessfulSendEvent(QueuePlayer player, AdaptedServer server) {
+        this.player = player;
+        this.server = server;
+    }
+
+    /**
+     * Gets the player that was sent
+     * @return the player that was sent
+     */
+    public AdaptedPlayer getPlayer() {
+        return player.getPlayer();
+    }
+
+    /**
+     * Gets the server that the player was sent to
+     * @return The server that the player was sent to
+     */
+    public AdaptedServer getServer() {
+        return server;
+    }
+}

api/src/main/java/us/ajg0702/queue/api/events/utils/EventReceiver.java

@@ -0,0 +1,6 @@
+package us.ajg0702.queue.api.events.utils;
+
+@FunctionalInterface
+public interface EventReceiver<E> {
+    void execute(E event);
+}

api/src/main/java/us/ajg0702/queue/api/players/AdaptedPlayer.java

@@ -55,6 +55,12 @@ public interface AdaptedPlayer extends Handle, Audience {
      */
     String getServerName();
 
+    /**
+     * Gets the server that the player is currently connected to
+     * @return The server that the player is currently connected to.
+     */
+    AdaptedServer getCurrentServer();
+
     /**
      * Gets the player's unique id (UUID)
      * @return The player's uuid

common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java

@@ -5,6 +5,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 import us.ajg0702.queue.api.EventHandler;
+import us.ajg0702.queue.api.events.SuccessfulSendEvent;
 import us.ajg0702.queue.api.players.AdaptedPlayer;
 import us.ajg0702.queue.api.players.QueuePlayer;
 import us.ajg0702.queue.api.queues.QueueServer;
@@ -87,6 +88,9 @@ public class EventHandlerImpl implements EventHandler {
                 server.removePlayer(player);
                 server.setLastSentTime(System.currentTimeMillis());
                 main.getQueueManager().getSendingAttempts().remove(queuePlayer);
+                main.getTaskManager().runNow(() -> {
+                    main.call(new SuccessfulSendEvent(queuePlayer, player.getCurrentServer()));
+                });
             }
         }
 

common/src/main/java/us/ajg0702/queue/common/QueueMain.java

@@ -2,6 +2,8 @@ package us.ajg0702.queue.common;
 
 import org.spongepowered.configurate.ConfigurateException;
 import us.ajg0702.queue.api.*;
+import us.ajg0702.queue.api.events.Event;
+import us.ajg0702.queue.api.events.utils.EventReceiver;
 import us.ajg0702.queue.api.premium.Logic;
 import us.ajg0702.queue.api.premium.LogicGetter;
 import us.ajg0702.queue.api.util.QueueLogger;
@@ -12,7 +14,8 @@ import us.ajg0702.utils.common.Messages;
 import us.ajg0702.utils.common.Updater;
 
 import java.io.File;
-import java.util.LinkedHashMap;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.regex.Pattern;
 
@@ -124,6 +127,31 @@ public class QueueMain extends AjQueueAPI {
         updater.shutdown();
     }
 
+
+    private final Map<Class<?>, ArrayList<EventReceiver<Event>>> listeners = new ConcurrentHashMap<>();
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <E> void listen(Class<E> event, EventReceiver<E> handler) {
+        if(!Arrays.asList(event.getInterfaces()).contains(Event.class)) {
+            throw new IllegalArgumentException("You can only listen to ajQueue events!");
+        }
+        List<EventReceiver<Event>> existingList = listeners.computeIfAbsent(event, (k) -> new ArrayList<>());
+        existingList.add((e) -> handler.execute((E) e));
+    }
+
+    public void call(Event event) {
+        List<EventReceiver<Event>> list = listeners.computeIfAbsent(event.getClass(), (k) -> new ArrayList<>());
+        list.forEach(eventReceiver -> {
+            try {
+                eventReceiver.execute(event);
+            } catch(Exception e) {
+                logger.severe("An external plugin threw an error while handling an event (this is probably not the fault of ajQueue!)", e);
+            }
+        });
+
+    }
+
     @Override
     public ExecutorService getServersUpdateExecutor() {
         return taskManager.getServersUpdateExecutor();

common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java

@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.title.Title;
 import us.ajg0702.queue.api.QueueManager;
+import us.ajg0702.queue.api.events.PreQueueEvent;
 import us.ajg0702.queue.api.players.AdaptedPlayer;
 import us.ajg0702.queue.api.players.QueuePlayer;
 import us.ajg0702.queue.api.premium.Logic;
@@ -208,6 +209,14 @@ public class QueueManagerImpl implements QueueManager {
             }
         }
 
+
+        PreQueueEvent preQueueEvent = new PreQueueEvent(player, server);
+        main.call(preQueueEvent);
+        if(preQueueEvent.isCancelled()) return false;
+
+
+        // Player should be added!
+
         ImmutableList<QueuePlayer> list = server.getQueue();
         QueuePlayer queuePlayer;
         AdaptedServer ideal = server.getIdealServer(player);

common/src/main/java/us/ajg0702/queue/common/TaskManager.java

@@ -1,5 +1,7 @@
 package us.ajg0702.queue.common;
 
+import us.ajg0702.queue.common.utils.QueueThreadFactory;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.*;
@@ -7,10 +9,9 @@ import java.util.concurrent.*;
 public class TaskManager {
 
 
-    final ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+    final ScheduledExecutorService executor = Executors.newScheduledThreadPool(1, new QueueThreadFactory("GENERIC"));
-    final ScheduledExecutorService updateExecutor = Executors.newScheduledThreadPool(1);
+    final ScheduledExecutorService updateExecutor = Executors.newScheduledThreadPool(1, new QueueThreadFactory("UPDATE-EXECUTOR"));
-
+    final ExecutorService serversUpdateExecutor = Executors.newCachedThreadPool(new QueueThreadFactory("SERVER-UPDATE"));
-    final ExecutorService serversUpdateExecutor = Executors.newCachedThreadPool();
 
     final QueueMain main;
     public TaskManager(QueueMain main) {
@@ -128,6 +129,10 @@ public class TaskManager {
         return executor.schedule(runnable, delay, unit);
     }
 
+    public Future<?> runNow(Runnable runnable) {
+        return executor.submit(runnable);
+    }
+
 
     private ScheduledFuture<?> scheduleAtFixedRate(ScheduledExecutorService executor, Runnable command, long initialDelay, long period, TimeUnit unit) {
         return executor.scheduleAtFixedRate(() -> {

common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java

@@ -1,6 +1,7 @@
 package us.ajg0702.queue.common.queues;
 
 import com.google.common.collect.ImmutableList;
+import us.ajg0702.queue.api.events.PositionChangeEvent;
 import us.ajg0702.queue.api.players.AdaptedPlayer;
 import us.ajg0702.queue.api.players.QueuePlayer;
 import us.ajg0702.queue.api.queues.Balancer;
@@ -203,6 +204,7 @@ public class QueueServerImpl implements QueueServer {
     public synchronized void removePlayer(QueuePlayer player) {
         main.getQueueManager().getSendingAttempts().remove(player);
         queue.remove(player);
+        positionChange();
     }
 
     @Override
@@ -226,6 +228,7 @@ public class QueueServerImpl implements QueueServer {
         } else {
             queue.add(player);
         }
+        positionChange();
     }
 
     @Override
@@ -316,4 +319,10 @@ public class QueueServerImpl implements QueueServer {
         return balancer;
     }
 
+    private void positionChange() {
+        main.getTaskManager().runNow(
+                () -> queue.forEach(queuePlayer -> main.call(new PositionChangeEvent(queuePlayer)))
+        );
+    }
+
 }

common/src/main/java/us/ajg0702/queue/common/utils/QueueThreadFactory.java

@@ -0,0 +1,21 @@
+package us.ajg0702.queue.common.utils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class QueueThreadFactory implements ThreadFactory {
+    private final String name;
+    private final AtomicInteger i = new AtomicInteger(0);
+
+    public QueueThreadFactory(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public Thread newThread(@NotNull Runnable runnable) {
+        return new Thread(runnable, "AJQUEUE-" + name + "-" + i.incrementAndGet());
+
+    }
+}

platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java

@@ -122,6 +122,12 @@ public class BungeePlayer implements AdaptedPlayer, Audience {
         return handle.getServer().getInfo().getName();
     }
 
+    @Override
+    public AdaptedServer getCurrentServer() {
+        if(handle.getServer() == null) return null;
+        return new BungeeServer(handle.getServer().getInfo());
+    }
+
     @Override
     public UUID getUniqueId() {
         return handle.getUniqueId();

platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java

@@ -17,6 +17,7 @@ import us.ajg0702.queue.api.players.AdaptedPlayer;
 import us.ajg0702.queue.api.server.AdaptedServer;
 import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.queue.common.utils.Debug;
+import us.ajg0702.queue.platforms.velocity.server.VelocityServer;
 
 import java.util.List;
 import java.util.Objects;
@@ -111,10 +112,17 @@ public class VelocityPlayer implements AdaptedPlayer, Audience {
 
     @Override
     public String getServerName() {
+        AdaptedServer currentServer = getCurrentServer();
+        if(currentServer == null) return null;
+        return currentServer.getName();
+    }
+
+    @Override
+    public AdaptedServer getCurrentServer() {
         Optional<ServerConnection> serverConnection = handle.getCurrentServer();
         if(!serverConnection.isPresent()) return null;
         ServerConnection connection = serverConnection.get();
-        return connection.getServerInfo().getName();
+        return new VelocityServer(connection.getServer());
     }
 
     @Override