Merge branch '1.20.4' into 1.20.6

rfresh2 · May 21, 2024 · a1c0e1c · a1c0e1c
2 parents c68b06c + 7e1dc2e
commit a1c0e1c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -89,7 +89,7 @@ dependencies {
     shade("com.mojang:brigadier:1.2.9")
     shade("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1")
     shade("com.github.rfresh2:SimpleEventBus:1.1")
-    shade("com.github.rfresh2.Discord4j:discord4j-core:029aea3e1b") {
+    shade("com.github.rfresh2.Discord4j:discord4j-core:3f91d0f9a8") {
         exclude(group = "io.netty")
     }
     shade("com.github.rfresh2:MCProtocolLib:23a15fe48b") {

diff --git a/src/main/java/com/zenith/command/impl/ClientConnectionCommand.java b/src/main/java/com/zenith/command/impl/ClientConnectionCommand.java
@@ -40,6 +40,7 @@ public CommandUsage commandUsage() {
                 "proxy port <port>",
                 "proxy user <user>",
                 "proxy password <password>",
+                "proxy auth clear",
                 "bindAddress <address>",
                 "timeout on/off",
                 "timeout <seconds>",
@@ -94,6 +95,13 @@ public LiteralArgumentBuilder<CommandContext> register() {
                                         .title("Proxy Port Set");
                                     return 1;
                                 })))
+                      .then(literal("auth").then(literal("clear").executes(c -> {
+                          CONFIG.client.connectionProxy.user = "";
+                          CONFIG.client.connectionProxy.password = "";
+                          c.getSource().getEmbed()
+                              .title("Proxy User and Password Cleared");
+                          return 1;
+                      })))
                       .then(literal("user")
                                 .then(argument("user", wordWithChars()).executes(c -> {
                                     c.getSource().setSensitiveInput(true);

diff --git a/src/main/resources/META-INF/native-image/reflect-config.json b/src/main/resources/META-INF/native-image/reflect-config.json
@@ -333,6 +333,9 @@
   "name":"com.github.benmanes.caffeine.cache.StripedBuffer",
   "fields":[{"name":"tableBusy"}]
 },
+{
+  "name":"com.github.luben.zstd.Zstd"
+},
 {
   "name":"com.github.steveice10.mc.auth.data.GameProfile",
   "allDeclaredFields":true,