Add priority system

Author: CustomEntity

src/main/java/fr/customentity/advancedbungeequeue/data/QueuedPlayer.java

@@ -1,6 +1,5 @@
 package fr.customentity.advancedbungeequeue.data;
 
-import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
@@ -12,14 +11,12 @@ public class QueuedPlayer {
 
     private ProxiedPlayer proxiedPlayer;
     private ServerInfo targetServer;
+    private int priority;
 
-    public QueuedPlayer(ProxiedPlayer proxiedPlayer) {
-       this(proxiedPlayer, null);
-    }
-
-    public QueuedPlayer(ProxiedPlayer proxiedPlayer, ServerInfo targetServer) {
+    public QueuedPlayer(ProxiedPlayer proxiedPlayer, ServerInfo targetServer, int priority) {
         this.proxiedPlayer = proxiedPlayer;
         this.targetServer = targetServer;
+        this.priority = priority;
 
         queuedPlayerSet.add(this);
     }
@@ -41,14 +38,19 @@ public boolean isWaiting() {
         return this.targetServer != null;
     }
 
+    public int getPriority() {
+        return priority;
+    }
+
     public static QueuedPlayer get(ProxiedPlayer proxiedPlayer) {
         for(QueuedPlayer queuedPlayer : queuedPlayerSet) {
             if(queuedPlayer.getProxiedPlayer().equals(proxiedPlayer)) {
                 return queuedPlayer;
             }
         }
-        return new QueuedPlayer(proxiedPlayer);
+        return null;
     }
+
     public static Set<QueuedPlayer> getQueuedPlayerSet() {
         return queuedPlayerSet;
     }

src/main/java/fr/customentity/advancedbungeequeue/manager/QueueManager.java

@@ -7,14 +7,17 @@
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.*;
 
 public class QueueManager {
 
     private AdvancedBungeeQueue plugin;
 
-    private ConcurrentHashMap<ServerInfo, Queue<QueuedPlayer>> queue;
+    private ConcurrentHashMap<ServerInfo, List<QueuedPlayer>> queue;
     private ScheduledExecutorService scheduledExecutorService;
     private boolean queueRunning = true;
 
@@ -24,7 +27,7 @@ public QueueManager(AdvancedBungeeQueue plugin) {
         this.scheduledExecutorService = new ScheduledThreadPoolExecutor(plugin.getConfigFile().getInt("thread-pool-size"));
 
         this.loadServersQueue();
-        for(ServerInfo serverInfo : queue.keySet()) {
+        for (ServerInfo serverInfo : queue.keySet()) {
             this.scheduledExecutorService.scheduleAtFixedRate(new ConnectRunnable(plugin, serverInfo), this.plugin.getConfigFile().getLong("queue-speed"), this.plugin.getConfigFile().getLong("queue-speed"), TimeUnit.MILLISECONDS);
         }
     }
@@ -34,32 +37,53 @@ public boolean isQueueRunning() {
     }
 
     public void addPlayerInQueue(ProxiedPlayer proxiedPlayer, ServerInfo serverInfo) {
-        if(plugin.getConfigFile().getStringList("default-servers").stream().noneMatch(s -> proxiedPlayer.getServer().getInfo().getName().contains(s))) {
+        if (plugin.getConfigFile().getStringList("default-servers").stream().noneMatch(s -> proxiedPlayer.getServer().getInfo().getName().contains(s))) {
             return;
         }
-        if(proxiedPlayer.hasPermission(plugin.getConfigFile().getString("permissions.bypass"))) {
+        if (proxiedPlayer.hasPermission(plugin.getConfigFile().getString("permissions.bypass"))) {
             proxiedPlayer.connect(serverInfo);
             return;
         }
-        Queue<QueuedPlayer> queuedPlayers = queue.get(serverInfo);
-        QueuedPlayer queuedPlayer = QueuedPlayer.get(proxiedPlayer);
-        if(queuedPlayer.isWaiting())return;
+        List<QueuedPlayer> queuedPlayers = queue.get(serverInfo);
+        if (this.plugin.getConfigFile().getBoolean("use-same-queue")) queuedPlayers = queue.values().stream().findFirst().get();
+        if(queuedPlayers == null)return;
+        
+        QueuedPlayer queuedPlayer = new QueuedPlayer(proxiedPlayer, serverInfo, getPriority(proxiedPlayer));
+        if (queuedPlayer.isWaiting()) return;
         queuedPlayer.setTargetServer(serverInfo);
-        queuedPlayers.add(queuedPlayer);
-        queue.put(serverInfo, queuedPlayers);
+
+        for(QueuedPlayer player : queuedPlayers) {
+            if(player.getPriority() <= queuedPlayer.getPriority()) {
+                queuedPlayers.add(queuedPlayers.indexOf(player), queuedPlayer);
+            }
+        }
+    }
+
+    public int getPriority(ProxiedPlayer proxiedPlayer) {
+        for(String str : plugin.getConfigFile().getSection("priorities").getKeys()) {
+            if(proxiedPlayer.hasPermission("advancedbungeequeue.priority." + str)) return plugin.getConfigFile().getInt("priorities." + str);
+        }
+        return plugin.getConfigFile().getInt("priorities.default", 0);
+    }
+
+    public int getPlayerPosition(ProxiedPlayer proxiedPlayer) {
+        QueuedPlayer queuedPlayer = QueuedPlayer.get(proxiedPlayer);
+        if (queue.get(queuedPlayer.getTargetServer()) != null)
+            return queue.get(queuedPlayer.getTargetServer()).indexOf(queuedPlayer) + 1;
+        return -1;
     }
 
     public void setQueueRunning(boolean queueRunning) {
         this.queueRunning = queueRunning;
     }
 
     public void connectNextPlayers(ServerInfo serverInfo) {
-        for(int i = 0; i < plugin.getConfigFile().getInt("player-amount"); i++) {
-            Queue<QueuedPlayer> queuedPlayers = queue.get(serverInfo);
-            QueuedPlayer queuedPlayer = queuedPlayers.peek();
-            if(queuedPlayer == null)continue;
+        for (int i = 0; i < plugin.getConfigFile().getInt("player-amount"); i++) {
+            List<QueuedPlayer> queuedPlayers = queue.get(serverInfo);
+            QueuedPlayer queuedPlayer = queuedPlayers.get(0);
+            if (queuedPlayer == null) continue;
             queuedPlayer.getProxiedPlayer().connect(serverInfo, (result, error) -> {
-                if(result) {
+                if (result) {
                     queuedPlayers.remove(queuedPlayer);
                 } else {
 
@@ -72,13 +96,13 @@ public void loadServersQueue() {
         for (String servers : this.plugin.getConfigFile().getStringList("queued-servers")) {
             ServerInfo serverInfo = this.plugin.getProxy().getServerInfo(servers);
             if (serverInfo != null) {
-                queue.putIfAbsent(serverInfo, new ConcurrentLinkedQueue<>());
+                queue.putIfAbsent(serverInfo, Collections.synchronizedList(new ArrayList<>()));
                 if (!this.plugin.getConfigFile().getBoolean("use-same-queue")) break;
             }
         }
     }
 
-    public ConcurrentHashMap<ServerInfo, Queue<QueuedPlayer>> getQueues() {
+    public ConcurrentHashMap<ServerInfo, List<QueuedPlayer>> getQueues() {
         return queue;
     }
 }