From 599bbcf174ef5c0c1f21c5b75da029583ef529b5 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Thu, 9 Sep 2021 10:01:16 -0700 Subject: [PATCH 1/5] make sure minimessage is loaded --- common/src/main/java/us/ajg0702/queue/common/QueueMain.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueMain.java b/common/src/main/java/us/ajg0702/queue/common/QueueMain.java index 3df14c6..2e94c11 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueMain.java +++ b/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); From 1de3ae9412a17580bd2799c3c1f0961132f07b70 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 12 Sep 2021 17:12:25 -0700 Subject: [PATCH 2/5] fix kick reason not being plain --- .../queue/platforms/velocity/players/VelocityPlayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java index d4c64ba..c48634e 100644 --- a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java +++ b/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) ) ); } From b072e927bdb86bf09a543f0c1467bd2a27285f56 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 12 Sep 2021 17:12:36 -0700 Subject: [PATCH 3/5] fix log converter logging multiple times --- .../main/java/us/ajg0702/queue/common/utils/LogConverter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java b/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java index 3e9449d..52f9b02 100644 --- a/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java +++ b/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java @@ -21,12 +21,16 @@ public class LogConverter extends Logger { break; case "SEVERE": logger.error(message); + break; case "WARNING": logger.warn(message); + break; case "INFO": logger.info(message); + break; default: logger.info(message); + break; } } } From 645f33a1626f70de6a213dbb3da048c4f53f63bf Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 14 Sep 2021 12:33:02 -0700 Subject: [PATCH 4/5] clean some stuff up --- .../main/java/us/ajg0702/queue/commands/BaseCommand.java | 1 - .../us/ajg0702/queue/commands/commands/manage/Update.java | 3 --- .../queue/commands/commands/manage/debug/Whitelist.java | 1 - .../java/us/ajg0702/queue/common/utils/LogConverter.java | 7 +++++-- .../us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java | 6 ------ 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java b/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java index 9529eeb..6125c07 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java +++ b/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; diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Update.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Update.java index 3dfed05..7a556d8 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Update.java +++ b/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; diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/Whitelist.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/Whitelist.java index 0dc6ec7..3481b3c 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/debug/Whitelist.java +++ b/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; diff --git a/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java b/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java index 52f9b02..f46639b 100644 --- a/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java +++ b/common/src/main/java/us/ajg0702/queue/common/utils/LogConverter.java @@ -26,11 +26,14 @@ public class LogConverter extends Logger { logger.warn(message); break; case "INFO": - logger.info(message); - break; default: logger.info(message); break; } } + + @SuppressWarnings({"unused", "SameReturnValue"}) + public String logName() { + return "%%__USER__%%"; + } } diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java index 2aeae29..7675a92 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java +++ b/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; From f1860217db3291f30c69431eab61617f365f65ec Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 15 Sep 2021 12:30:40 -0700 Subject: [PATCH 5/5] 2.0.8 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e5a4e12..7536864 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } allprojects { - version = "2.0.7" + version = "2.0.8" group = "us.ajg0702" plugins.apply("java")