✨ Added action classes

Author: CustomEntity

build.gradle

@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: 'java'
 
 group = 'fr.customentity'
-version = '0.1'
+version = '0.2'
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'

src/main/java/fr/customentity/advancedbungeequeue/bungee/AdvancedBungeeQueue.java

@@ -134,9 +134,7 @@ private void saveDefaultConfig() {
     public void onDisable() {
         try {
             this.getSocketManager().getSocket().close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        } catch (IOException ignored) {}
     }
 
     public Configuration getConfigFile() {

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

@@ -83,7 +83,6 @@ public void addPlayerInQueue(ProxiedPlayer proxiedPlayer, ServerInfo serverInfo)
         QueuedPlayer queuedPlayer = new QueuedPlayer(proxiedPlayer, serverInfo, getPriority(proxiedPlayer));
         QueuedPlayer.getQueuedPlayerSet().add(queuedPlayer);
 
-
         boolean added = false;
         for (QueuedPlayer player : queuedPlayers) {
             if (player.getPriority().getPriority() < queuedPlayer.getPriority().getPriority()) {

src/main/java/fr/customentity/advancedbungeequeue/bungee/socket/ServerThread.java

@@ -3,14 +3,10 @@
 import fr.customentity.advancedbungeequeue.bungee.AdvancedBungeeQueue;
 import fr.customentity.advancedbungeequeue.bungee.data.QueuedPlayer;
 import fr.customentity.advancedbungeequeue.common.QueueResult;
-import fr.customentity.advancedbungeequeue.spigot.AdvancedSpigotQueue;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.scheduler.TaskScheduler;
-import org.bukkit.Bukkit;
-
-import java.io.*;
-import java.net.InetAddress;
-import java.net.Proxy;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
 import java.net.Socket;
 import java.util.Optional;
 import java.util.UUID;
@@ -35,7 +31,6 @@ public void run() {
             if(plugin.getConfigFile().getString("socket-password").equals(passwd)) {
                 UUID uuid = UUID.fromString(reader.readUTF());
                 QueueResult result = QueueResult.valueOf(reader.readUTF());
-
                 Optional<QueuedPlayer> queuedPlayer = QueuedPlayer.get(uuid);
                 if (result == QueueResult.ALLOWED) {
                     queuedPlayer.ifPresent(queuedPlayer1 -> plugin.getQueueManager().removePlayerFromQueue(queuedPlayer1));

src/main/java/fr/customentity/advancedbungeequeue/bungee/socket/SocketManager.java

@@ -1,16 +1,10 @@
 package fr.customentity.advancedbungeequeue.bungee.socket;
 
 import fr.customentity.advancedbungeequeue.bungee.AdvancedBungeeQueue;
-import fr.customentity.advancedbungeequeue.spigot.AdvancedSpigotQueue;
-import net.md_5.bungee.api.ProxyServer;
 
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.UUID;
 import java.util.logging.Level;
 
 public class SocketManager {

src/main/java/fr/customentity/advancedbungeequeue/common/actions/Action.java

@@ -0,0 +1,7 @@
+package fr.customentity.advancedbungeequeue.common.actions;
+
+public abstract class Action<T> {
+
+    public abstract Class<T> getEntryType();
+
+}

src/main/java/fr/customentity/advancedbungeequeue/common/actions/PlayerAction.java

@@ -0,0 +1,21 @@
+package fr.customentity.advancedbungeequeue.common.actions;
+
+import java.util.UUID;
+
+public abstract class PlayerAction extends Action<UUID> {
+
+    private UUID uuid;
+
+    public PlayerAction(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public UUID getUniqueId() {
+        return uuid;
+    }
+
+    @Override
+    public Class<UUID> getEntryType() {
+        return UUID.class;
+    }
+}

src/main/java/fr/customentity/advancedbungeequeue/common/actions/all/ExecuteCommandAction.java

@@ -0,0 +1,19 @@
+package fr.customentity.advancedbungeequeue.common.actions.all;
+
+import fr.customentity.advancedbungeequeue.common.actions.PlayerAction;
+
+import java.util.UUID;
+
+public class ExecuteCommandAction extends PlayerAction {
+
+    private String command;
+
+    public ExecuteCommandAction(UUID uuid, String command) {
+        super(uuid);
+        this.command = command;
+    }
+
+    public String getCommand() {
+        return command;
+    }
+}

src/main/java/fr/customentity/advancedbungeequeue/common/actions/all/JoinQueueAction.java

@@ -0,0 +1,19 @@
+package fr.customentity.advancedbungeequeue.common.actions.all;
+
+import fr.customentity.advancedbungeequeue.common.actions.PlayerAction;
+
+import java.util.UUID;
+
+public class JoinQueueAction extends PlayerAction {
+
+    private String destinationServer;
+
+    public JoinQueueAction(UUID uuid, String destinationServer) {
+        super(uuid);
+        this.destinationServer = destinationServer;
+    }
+
+    public String getDestinationServer() {
+        return destinationServer;
+    }
+}