Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
ajgeiss0702
2021-09-21 21:59:17 -07:00
6 changed files with 6 additions and 14 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ repositories {
} }
allprojects { allprojects {
version = "2.0.7" version = "2.0.8"
group = "us.ajg0702" group = "us.ajg0702"
plugins.apply("java") plugins.apply("java")
@@ -8,7 +8,6 @@ import us.ajg0702.queue.api.commands.ISubCommand;
import us.ajg0702.utils.common.Messages; import us.ajg0702.utils.common.Messages;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -1,9 +1,6 @@
package us.ajg0702.queue.commands.commands.manage; package us.ajg0702.queue.commands.commands.manage;
import com.google.common.collect.ImmutableList; 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.api.commands.ICommandSender;
import us.ajg0702.queue.commands.SubCommand; import us.ajg0702.queue.commands.SubCommand;
import us.ajg0702.queue.common.QueueMain; import us.ajg0702.queue.common.QueueMain;
@@ -1,7 +1,6 @@
package us.ajg0702.queue.commands.commands.manage.debug; package us.ajg0702.queue.commands.commands.manage.debug;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import net.kyori.adventure.text.Component;
import us.ajg0702.queue.api.commands.ICommandSender; import us.ajg0702.queue.api.commands.ICommandSender;
import us.ajg0702.queue.api.queues.QueueServer; import us.ajg0702.queue.api.queues.QueueServer;
import us.ajg0702.queue.commands.SubCommand; import us.ajg0702.queue.commands.SubCommand;
@@ -26,11 +26,14 @@ public class LogConverter extends Logger {
logger.warn(message); logger.warn(message);
break; break;
case "INFO": case "INFO":
logger.info(message);
break;
default: default:
logger.info(message); logger.info(message);
break; break;
} }
} }
@SuppressWarnings({"unused", "SameReturnValue"})
public String logName() {
return "%%__USER__%%";
}
} }
@@ -2,16 +2,11 @@ package us.ajg0702.queue.platforms.bungeecord;
import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
import net.kyori.adventure.text.Component; 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.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.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.*; import net.md_5.bungee.api.event.*;
import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.chat.BaseComponentSerializer;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;
import org.bstats.bungeecord.Metrics; import org.bstats.bungeecord.Metrics;
import org.bstats.charts.SimplePie; 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 us.ajg0702.queue.platforms.bungeecord.server.BungeeServer;
import java.io.File; import java.io.File;
import java.time.Duration;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;