From 53a66fc228e6d089ad9d916a99cf1d8bdecc8b02 Mon Sep 17 00:00:00 2001
From: Joe <49585339+Shimeo98@users.noreply.github.com>
Date: Mon, 22 Jan 2024 17:50:35 +0000
Subject: [PATCH] Fixed logger error on start up
---
pom.xml | 33 ++++++++-----------
.../uk/co/angrybee/joe/DiscordClient.java | 20 -----------
src/main/resources/logback.xml | 28 +++++++++-------
3 files changed, 31 insertions(+), 50 deletions(-)
diff --git a/pom.xml b/pom.xml
index c54908d..090c91e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,11 @@
-
- ch.qos.logback
- logback-classic
- 1.4.14
-
+
+
+
+
+
ch.qos.logback
@@ -79,11 +79,11 @@
1.4.14
-
- org.slf4j
- slf4j-api
- 2.0.10
-
+
+
+
+
+
org.yaml
@@ -222,21 +222,16 @@
uk.co.angrybee.joe.shaded.javax.annotation
-
- org.slf4j
- uk.co.angrybee.joe.shaded.org.slf4j
-
+
+
+
+
org.yaml.snakeyaml
uk.co.angrybee.joe.shaded.org.yaml.snakeyaml
-
-
-
-
-
org.jetbrains.annotations
uk.co.angrybee.joe.shaded.org.jetbrains.annotations
diff --git a/src/main/java/uk/co/angrybee/joe/DiscordClient.java b/src/main/java/uk/co/angrybee/joe/DiscordClient.java
index 8fd68b0..7e229ce 100644
--- a/src/main/java/uk/co/angrybee/joe/DiscordClient.java
+++ b/src/main/java/uk/co/angrybee/joe/DiscordClient.java
@@ -114,26 +114,6 @@ public class DiscordClient extends ListenerAdapter {
CommandListUpdateAction commands = javaDiscordAPI.updateCommands();
-// commands.addCommands(
-// new CommandData("whitelist", "Edit the whitelist.")
-// .addSubcommands(
-// new SubcommandData("add", "Add a user to the whitelist")
-// .addOption(STRING, "minecraft_username", "Minecraft username to add", true)
-// .addOption(USER, "discord_user", "Discord user to bind to", false),
-// new SubcommandData("remove", "Remove user from the whitelist")
-// .addOption(STRING, "minecraft_username", "Minecraft username to remove", true),
-// new SubcommandData("clear", "Clear whitelists assigned to your account"),
-// new SubcommandData("whois", "Find the Discord name linked to a Minecraft name")
-// .addOption(STRING, "minecraft_username", "Minecraft name to search", false)
-// .addOption(USER, "discord_user", "Minecraft name to search", false)),
-//
-// new CommandData("clearname", "Clear name from all lists")
-// .addOption(STRING, "minecraft_username", "Minecraft username to clear", true),
-// new CommandData("clearban", "Clear ban from user")
-// .addOption(STRING, "minecraft_username", "Minecraft username to unban", true),
-// new CommandData("help", "Show bot info"))
-// .queue();
-
commands.addCommands(
Commands.slash("whitelist", "Edit the whitelist.")
.addSubcommands(
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 853ced7..ee348ff 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,12 +1,18 @@
-
-
-
-
- [DiscordWhitelister] %boldCyan(%-34.-34thread) %red(%10.10X{jda.shard}) %boldGreen(%-15.-15logger{0}) %highlight(%-6level) %msg%n
-
-
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+ [DiscordWhitelister] %msg%n
+
+
+
+
-
-
-
-
\ No newline at end of file