Merge branch 'dev' into 'master'

2.0.8

See merge request ajg0702/ajqueue!28

build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 }
 
 allprojects {
-    version = "2.0.7"
+    version = "2.0.8"
     group = "us.ajg0702"
 
     plugins.apply("java")

common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java

@@ -8,7 +8,6 @@ import us.ajg0702.queue.api.commands.ISubCommand;
 import us.ajg0702.utils.common.Messages;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 

common/src/main/java/us/ajg0702/queue/commands/commands/manage/Update.java

@@ -1,9 +1,6 @@
 package us.ajg0702.queue.commands.commands.manage;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.spongepowered.configurate.ConfigurateException;
 import us.ajg0702.queue.api.commands.ICommandSender;
 import us.ajg0702.queue.commands.SubCommand;
 import us.ajg0702.queue.common.QueueMain;

common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/Whitelist.java

@@ -1,7 +1,6 @@
 package us.ajg0702.queue.commands.commands.manage.debug;
 
 import com.google.common.collect.ImmutableList;
-import net.kyori.adventure.text.Component;
 import us.ajg0702.queue.api.commands.ICommandSender;
 import us.ajg0702.queue.api.queues.QueueServer;
 import us.ajg0702.queue.commands.SubCommand;

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

@@ -13,6 +13,7 @@ import us.ajg0702.utils.common.Updater;
 
 import java.io.File;
 import java.util.LinkedHashMap;
+import java.util.regex.Pattern;
 
 public class QueueMain extends AjQueueAPI {
 
@@ -146,6 +147,10 @@ public class QueueMain extends AjQueueAPI {
             return;
         }
 
+
+        //noinspection ResultOfMethodCallIgnored
+        messages.getComponent("one").replaceText(b -> b.match(Pattern.compile("\\e")).replacement("a"));
+
         setTimeBetweenPlayers();
 
         queueManager = new QueueManagerImpl(this);

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

@@ -21,12 +21,19 @@ public class LogConverter extends Logger {
                 break;
             case "SEVERE":
                 logger.error(message);
+                break;
             case "WARNING":
                 logger.warn(message);
+                break;
             case "INFO":
-                logger.info(message);
             default:
                 logger.info(message);
+                break;
         }
     }
+
+    @SuppressWarnings({"unused", "SameReturnValue"})
+    public String logName() {
+        return "%%__USER__%%";
+    }
 }

platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java

@@ -2,16 +2,11 @@ package us.ajg0702.queue.platforms.bungeecord;
 
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
-import net.kyori.adventure.title.Title;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.*;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.chat.BaseComponentSerializer;
 import net.md_5.bungee.event.EventHandler;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
@@ -29,7 +24,6 @@ import us.ajg0702.queue.platforms.bungeecord.players.BungeePlayer;
 import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer;
 
 import java.io.File;
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 

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

@@ -147,7 +147,7 @@ public class VelocityPlayer implements AdaptedPlayer, Audience {
                                     main.getMessages().getComponent(
                                             "velocity-kick-message",
                                             "SERVER:"+server.getName(),
-                                            "REASON:"+reason
+                                            "REASON:"+PlainTextComponentSerializer.plainText().serialize(reason)
                                     )
                             );
                         }