Upstream
/
DiscordWhitelisterSpigot
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed logger error on start up

This commit is contained in:
Joe 2024-01-22 17:50:35 +00:00
parent d88513ee49
commit 53a66fc228
3 changed files with 31 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pom.xml
View File

@ -67,11 +67,11 @@
<!-- <version>1.1.1</version>--> <!-- <version>1.1.1</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>ch.qos.logback</groupId> <!-- <groupId>ch.qos.logback</groupId>-->
<artifactId>logback-classic</artifactId> <!-- <artifactId>logback-classic</artifactId>-->
<version>1.4.14</version> <!-- <version>1.4.14</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
@ -79,11 +79,11 @@
<version>1.4.14</version> <version>1.4.14</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.slf4j</groupId> <!-- <groupId>org.slf4j</groupId>-->
<artifactId>slf4j-api</artifactId> <!-- <artifactId>slf4j-api</artifactId>-->
<version>2.0.10</version> <!-- <version>2.0.10</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
@ -222,21 +222,16 @@
<shadedPattern>uk.co.angrybee.joe.shaded.javax.annotation</shadedPattern> <shadedPattern>uk.co.angrybee.joe.shaded.javax.annotation</shadedPattern>
</relocation> </relocation>
<relocation> <!-- <relocation>-->
<pattern>org.slf4j</pattern> <!-- <pattern>org.slf4j</pattern>-->
<shadedPattern>uk.co.angrybee.joe.shaded.org.slf4j</shadedPattern> <!-- <shadedPattern>uk.co.angrybee.joe.shaded.org.slf4j</shadedPattern>-->
</relocation> <!-- </relocation>-->
<relocation> <relocation>
<pattern>org.yaml.snakeyaml</pattern> <pattern>org.yaml.snakeyaml</pattern>
<shadedPattern>uk.co.angrybee.joe.shaded.org.yaml.snakeyaml</shadedPattern> <shadedPattern>uk.co.angrybee.joe.shaded.org.yaml.snakeyaml</shadedPattern>
</relocation> </relocation>
<!-- <relocation>-->
<!-- <pattern>org.json.simple</pattern>-->
<!-- <shadedPattern>uk.co.angrybee.joe.shaded.org.json.simple</shadedPattern>-->
<!-- </relocation>-->
<relocation> <relocation>
<pattern>org.jetbrains.annotations</pattern> <pattern>org.jetbrains.annotations</pattern>
<shadedPattern>uk.co.angrybee.joe.shaded.org.jetbrains.annotations</shadedPattern> <shadedPattern>uk.co.angrybee.joe.shaded.org.jetbrains.annotations</shadedPattern>

20
src/main/java/uk/co/angrybee/joe/DiscordClient.java
View File

@ -114,26 +114,6 @@ public class DiscordClient extends ListenerAdapter {
CommandListUpdateAction commands = javaDiscordAPI.updateCommands(); 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.addCommands(
Commands.slash("whitelist", "Edit the whitelist.") Commands.slash("whitelist", "Edit the whitelist.")
.addSubcommands( .addSubcommands(

28
src/main/resources/logback.xml
View File

@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" ?>
<configuration> <!DOCTYPE configuration>
<appender name="STDOUT" class="uk.co.angrybee.joe.shaded.ch.qos.logback.core.ConsoleAppender">
<encoder> <configuration>
<pattern>[DiscordWhitelister] %boldCyan(%-34.-34thread) %red(%10.10X{jda.shard}) %boldGreen(%-15.-15logger{0}) %highlight(%-6level) %msg%n</pattern> <import class="uk.co.angrybee.joe.shaded.ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
</encoder> <import class="uk.co.angrybee.joe.shaded.ch.qos.logback.core.ConsoleAppender"/>
</appender>
<appender name="STDOUT" class="uk.co.angrybee.joe.shaded.ch.qos.logback.core.ConsoleAppender">
<append>true</append>
<immediateFlush>true</immediateFlush>
<encoder class="PatternLayoutEncoder">
<!-- <pattern>[DiscordWhitelister] %boldCyan(%-34.-34thread) %red(%10.10X{jda.shard}) %boldGreen(%-15.-15logger{0}) %highlight(%-6level) %msg%n</pattern>-->
<pattern>[DiscordWhitelister] %msg%n</pattern>
</encoder>
</appender>
</configuration>
<root level="info">
<appender-ref ref="STDOUT" />
</root>
</configuration>