progress

common/build.gradle.kts

@@ -13,7 +13,9 @@ repositories {
 dependencies {
     compileOnly("net.kyori:adventure-api:4.8.1")
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.5")
+    compileOnly("us.ajg0702:ajUtils:1.1.6")
+
+    compileOnly("org.spongepowered:configurate-yaml:4.0.0")
 
     implementation(project(":api"))
 }

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

@@ -1,9 +1,12 @@
 package us.ajg0702.queue.common;
 
+import org.spongepowered.configurate.ConfigurateException;
 import us.ajg0702.queue.api.*;
 import us.ajg0702.utils.common.Config;
 import us.ajg0702.utils.common.Messages;
 
+import java.io.File;
+import java.util.LinkedHashMap;
 import java.util.logging.Logger;
 
 public class QueueMain {
@@ -57,4 +60,91 @@ public class QueueMain {
     public QueueManager getQueueManager() {
         return queueManager;
     }
+
+
+    public QueueMain(Logger logger, ServerBuilder serverBuilder, PlatformMethods platformMethods, File dataFolder) {
+        this.logger = logger;
+        this.serverBuilder = serverBuilder;
+        this.platformMethods = platformMethods;
+
+        try {
+            config = new Config(dataFolder, logger);
+        } catch (ConfigurateException e) {
+            logger.warning("Unable to load config:");
+            e.printStackTrace();
+            return;
+        }
+
+        timeBetweenPlayers = config.getDouble("wait-time");
+
+        queueManager = new QueueManagerImpl(this);
+
+
+        LinkedHashMap<String, String> d = new LinkedHashMap<>();
+
+        d.put("status.offline.base", "&c{SERVER} is {STATUS}. &7You are in position &f{POS}&7 of &f{LEN}&7.");
+
+        d.put("status.offline.offline", "offline");
+        d.put("status.offline.restarting", "restarting");
+        d.put("status.offline.full", "full");
+        d.put("status.offline.restricted", "restricted");
+        d.put("status.offline.paused", "paused");
+
+        d.put("status.online.base", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
+        d.put("status.left-last-queue", "&aYou left the last queue you were in.");
+        d.put("status.now-in-queue", "&aYou are now queued for {SERVER}! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 or &f<click:run_command:/leavequeue {SERVERNAME}>click here</click>&7 to leave the queue!");
+        d.put("status.now-in-empty-queue", "");
+        d.put("status.sending-now", "&aSending you to &f{SERVER} &anow..");
+
+        d.put("errors.server-not-exist", "&cThe server {SERVER} does not exist!");
+        d.put("errors.already-queued", "&cYou are already queued for that server!");
+        d.put("errors.player-only", "&cThis command can only be executed as a player!");
+        d.put("errors.already-connected", "&cYou are already connected to this server!");
+        d.put("errors.cant-join-paused", "&cYou cannot join the queue for {SERVER} because it is paused.");
+        d.put("errors.deny-joining-from-server", "&cYou are not allowed to join queues from this server!");
+
+        d.put("commands.leave-queue", "&aYou left the queue for {SERVER}!");
+        d.put("commands.reload", "&aConfig and messages reloaded successfully!");
+        d.put("commands.joinqueue.usage", "&cUsage: /joinqueue <server>");
+
+        d.put("noperm", "&cYou do not have permission to do this!");
+
+        d.put("format.time.mins", "{m}m {s}s");
+        d.put("format.time.secs", "{s} seconds");
+
+        d.put("list.format", "&b{SERVER} &7({COUNT}): {LIST}");
+        d.put("list.playerlist", "&9{NAME}&7, ");
+        d.put("list.total", "&7Total players in queues: &f{TOTAL}");
+        d.put("list.none", "&7None");
+
+        d.put("spigot.actionbar.online", "&7You are queued for &f{SERVER}&7. You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
+        d.put("spigot.actionbar.offline", "&7You are queued for &f{SERVER}&7. &7You are in position &f{POS}&7 of &f{LEN}&7.");
+
+        d.put("send", "&aAdded &f{PLAYER}&a to the queue for &f{SERVER}");
+        d.put("remove", "&aRemoved &f{PLAYER} from all queues they were in.");
+
+        d.put("placeholders.queued.none", "None");
+        d.put("placeholders.position.none", "None");
+
+        d.put("commands.leave.more-args", "&cPlease specify which queue you want to leave! &7You are in these queues: {QUEUES}");
+        d.put("commands.leave.queues-list-format", "&f{NAME}&7, ");
+        d.put("commands.leave.not-queued", "&cYou are not queued for that server! &7You are in these queues: {QUEUES}");
+        d.put("commands.leave.no-queues", "&cYou are not queued!");
+
+        d.put("commands.pause.more-args", "&cUsage: /ajqueue pause <server> [on/off]");
+        d.put("commands.pause.no-server", "&cThat server does not exist!");
+        d.put("commands.pause.success", "&aThe queue for &f{SERVER} &ais now {PAUSED}");
+        d.put("commands.pause.paused.true", "&epaused");
+        d.put("commands.pause.paused.false", "&aun-paused");
+
+        d.put("commands.send.player-not-found", "&cThat player could not be found. Make sure they are online!");
+
+        d.put("commands.listqueues.header", "&9Queues:");
+        d.put("commands.listqueues.format", "<hover:show_text:'&7Status: {STATUS}'>{COLOR}{NAME}&7: {COUNT} queued</hover>");
+
+        d.put("max-tries-reached", "&cUnable to connect to {SERVER}. Max retries reached.");
+        d.put("auto-queued", "&aYou've been auto-queued for {SERVER} because you were kicked.");
+
+        messages = new Messages(dataFolder, logger, d);
+    }
 }

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

@@ -115,7 +115,7 @@ public class QueueManagerImpl implements QueueManager {
             ));
         }
 
-        main.getPlatformMethods().sendJoinQueueChannelMessages();
+        main.getPlatformMethods().sendJoinQueueChannelMessages(server, queuePlayer);
         return true;
     }
 

common/src/main/java/us/ajg0702/queue/logic/FreeAliasManager.java

@@ -0,0 +1,21 @@
+package us.ajg0702.queue.logic;
+
+import us.ajg0702.queue.api.AliasManager;
+import us.ajg0702.utils.common.Config;
+
+public class FreeAliasManager implements AliasManager {
+    Config config;
+    public FreeAliasManager(Config config) {
+        this.config = config;
+    }
+
+    @Override
+    public String getAlias(String server) {
+        return server;
+    }
+
+    @Override
+    public String getServer(String alias) {
+        return alias;
+    }
+}

common/src/main/java/us/ajg0702/queue/logic/FreeLogic.java

@@ -0,0 +1,18 @@
+package us.ajg0702.queue.logic;
+
+import us.ajg0702.queue.api.Logic;
+import us.ajg0702.queue.api.players.AdaptedPlayer;
+import us.ajg0702.queue.api.players.QueuePlayer;
+import us.ajg0702.queue.api.queues.QueueServer;
+
+public class FreeLogic implements Logic {
+    @Override
+    public boolean isPremium() {
+        return false;
+    }
+
+    @Override
+    public QueuePlayer priorityLogic(QueueServer server, AdaptedPlayer player) {
+        return null;
+    }
+}

common/src/main/java/us/ajg0702/queue/logic/LogicGetter.java

@@ -0,0 +1,18 @@
+package us.ajg0702.queue.logic;
+
+import us.ajg0702.queue.api.AliasManager;
+import us.ajg0702.queue.api.Logic;
+import us.ajg0702.utils.common.Config;
+
+public class LogicGetter implements us.ajg0702.queue.api.LogicGetter {
+
+    @Override
+    public Logic constructLogic() {
+        return new FreeLogic();
+    }
+
+    @Override
+    public AliasManager constructAliasManager(Config config) {
+        return new FreeAliasManager(config);
+    }
+}