From 801ec976aa4338a3c55212d10738d58d79fd7626 Mon Sep 17 00:00:00 2001
From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com>
Date: Wed, 18 Jun 2025 09:33:35 +0200
Subject: [PATCH] feat: initial work on 1.21.6

---
 .../soulfiremc/launcher/SoulFireAbstractLauncher.java |  4 ++--
 mod/build.gradle.kts                                  |  2 +-
 .../com/soulfiremc/server/protocol/BotConnection.java | 11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/launcher/src/main/java/com/soulfiremc/launcher/SoulFireAbstractLauncher.java b/launcher/src/main/java/com/soulfiremc/launcher/SoulFireAbstractLauncher.java
index b5ee956c0..f680b232a 100644
--- a/launcher/src/main/java/com/soulfiremc/launcher/SoulFireAbstractLauncher.java
+++ b/launcher/src/main/java/com/soulfiremc/launcher/SoulFireAbstractLauncher.java
@@ -35,8 +35,8 @@
 import java.util.jar.JarFile;
 
 public abstract class SoulFireAbstractLauncher {
-  private static final String JAR_NAME = "minecraft-client-1.21.5.jar";
-  private static final String JAR_URL = "https://piston-data.mojang.com/v1/objects/b88808bbb3da8d9f453694b5d8f74a3396f1a533/client.jar";
+  private static final String JAR_NAME = "minecraft-client-1.21.6.jar";
+  private static final String JAR_URL = "https://piston-data.mojang.com/v1/objects/740a125b83dd3447feaa3c5e891ead7fbb21ae28/client.jar";
 
   @SneakyThrows
   private static void loadAndInjectMinecraftJar() {
diff --git a/mod/build.gradle.kts b/mod/build.gradle.kts
index 5829e6984..e380aad7b 100644
--- a/mod/build.gradle.kts
+++ b/mod/build.gradle.kts
@@ -44,7 +44,7 @@ tasks {
 }
 
 unimined.minecraft {
-  version("1.21.5")
+  version("1.21.6")
 
   mappings {
     intermediary()
diff --git a/mod/src/main/java/com/soulfiremc/server/protocol/BotConnection.java b/mod/src/main/java/com/soulfiremc/server/protocol/BotConnection.java
index 5b0310370..803632ab0 100644
--- a/mod/src/main/java/com/soulfiremc/server/protocol/BotConnection.java
+++ b/mod/src/main/java/com/soulfiremc/server/protocol/BotConnection.java
@@ -50,6 +50,7 @@
 import net.minecraft.client.gui.screens.ConnectScreen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.multiplayer.resolver.ServerAddress;
 import net.minecraft.util.thread.BlockableEventLoop;
@@ -126,7 +127,7 @@ private Minecraft createMinecraftCopy() {
 
     Fields.set(newInstance, Minecraft.class.getDeclaredField("progressTasks"), Queues.newConcurrentLinkedQueue());
     Fields.set(newInstance, BlockableEventLoop.class.getDeclaredField("pendingRunnables"), Queues.newConcurrentLinkedQueue());
-    Fields.set(newInstance, Minecraft.class.getDeclaredField("toastManager"), new ToastManager(newInstance));
+    Fields.set(newInstance, Minecraft.class.getDeclaredField("toastManager"), new ToastManager(newInstance, newInstance.options));
     Fields.set(newInstance, Minecraft.class.getDeclaredField("gui"), new Gui(newInstance));
     Fields.set(newInstance, Minecraft.class.getDeclaredField("running"), true);
     Fields.set(newInstance, Minecraft.class.getDeclaredField("user"), new User(
@@ -188,10 +189,10 @@ public void gracefulDisconnect() {
 
       minecraft.executeBlocking(() -> {
         if (minecraft.level != null) {
-          minecraft.level.disconnect();
+          minecraft.level.disconnect(ClientLevel.DEFAULT_QUIT_MESSAGE);
         }
 
-        minecraft.disconnect();
+        minecraft.disconnectWithProgressScreen();
       });
 
       minecraft.stop();
@@ -214,10 +215,10 @@ public void wasDisconnected() {
 
       minecraft.executeBlocking(() -> {
         if (minecraft.level != null) {
-          minecraft.level.disconnect();
+          minecraft.level.disconnect(ClientLevel.DEFAULT_QUIT_MESSAGE);
         }
 
-        minecraft.disconnect();
+        minecraft.disconnectWithProgressScreen();
       });
 
       minecraft.stop();