Event-Alerts · srnyx · Sep 19, 2025 · Aug 20, 2025 · Aug 20, 2025 · Aug 20, 2025
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,11 +10,11 @@ stonecutter {
     centralScript = "build.gradle.kts"
     shared {
         versions( // Make sure to update .github/workflows/publish.yml when changing versions!
+            "1.21.6",
+            "1.21.5",
             "1.21.4",
-            "1.21.3",
             "1.21.1",
             "1.21",
-            "1.20.6",
             "1.20.4")
     }
     create(rootProject)

diff --git a/src/main/java/cc/aabss/eventutils/KeybindManager.java b/src/main/java/cc/aabss/eventutils/KeybindManager.java
@@ -52,14 +52,16 @@ public KeybindManager(@NotNull EventUtils mod) {
             if (windowHandle == null) windowHandle = client.getWindow().getHandle();
 
             // Event info key
-            if (GLFW.glfwGetKey(windowHandle, ((KeyBindingMixin) eventInfoKey).getBoundKey().getCode()) == GLFW.GLFW_PRESS) {
-                if (canNotPress(eventInfoKey)) return;
-                EventUtils.LOGGER.info("Event info key pressed");
-                if (SocketEndpoint.LAST_EVENT != null) {
-                    client.setScreen(new EventInfoScreen(SocketEndpoint.LAST_EVENT));
-                    return;
+            if (!eventInfoKey.isUnbound()) {
+                if (GLFW.glfwGetKey(windowHandle, ((KeyBindingMixin) eventInfoKey).getBoundKey().getCode()) == GLFW.GLFW_PRESS) {
+                    if (canNotPress(eventInfoKey)) return;
+                    EventUtils.LOGGER.info("Event info key pressed");
+                    if (SocketEndpoint.LAST_EVENT != null) {
+                        client.setScreen(new EventInfoScreen(SocketEndpoint.LAST_EVENT));
+                        return;
+                    }
+                    if (client.player != null) client.player.sendMessage(Text.literal("No event has happened recently!").formatted(Formatting.RED), true);
                 }
-                if (client.player != null) client.player.sendMessage(Text.literal("No event has happened recently!").formatted(Formatting.RED), true);
             }
 
             // DEV: Uncomment to force test event

diff --git a/src/main/java/cc/aabss/eventutils/NotificationToast.java b/src/main/java/cc/aabss/eventutils/NotificationToast.java
@@ -5,13 +5,15 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+//? if >=1.21.6
+/*import net.minecraft.client.gl.RenderPipelines;*/
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -80,15 +82,17 @@ public int getHeight() {
 
     @Override
     //? if <1.21.2 {
-    /*public Toast.Visibility draw(DrawContext drawContext, ToastManager manager, long startTime) {*/
-    //?} else {
+    /*public Toast.Visibility draw(DrawContext drawContext, ToastManager manager, long startTime) {
+    *///?} else {
     public void draw(DrawContext drawContext, TextRenderer textRenderer, long startTime) {
     //?}
         if (width == 160 && lines.size() <= 1) {
             //? if <1.21.2 {
-            /*drawContext.drawGuiTexture(TEXTURE, 0, 0, width, height);*/
-            //?} else {
-            drawContext.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURE, 0, 0, width, height);
+            /*drawContext.drawGuiTexture(TEXTURE, 0, 0, width, height);
+            *///?} else if >=1.21.6 {
+            /*drawContext.drawGuiTexture(RenderPipelines.GUI_TEXTURED, TEXTURE, 0, 0, width, height); // work on 1.21.4 and 1.21.5
+            *///?} else {
+            drawContext.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURE, 0, 0, width, height); // work on 1.21.4 and 1.21.5
             //?}
         } else {
             int minHeight = Math.min(4, height - 28);
@@ -118,6 +122,10 @@ private void drawPart(@NotNull DrawContext context, int j, int k, int l) {
         /*context.drawGuiTexture(TEXTURE, 160, 32, 0, j, 0, k, m, l);
         for (int o = m; o < widthN; o += 64) context.drawGuiTexture(TEXTURE, 160, 32, 32, j, o, k, Math.min(64, widthN - o), l);
         context.drawGuiTexture(TEXTURE, 160, 32, 160 - n, j, widthN, k, n, l);
+        *///?} else if >=1.21.6 {
+        /*context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, TEXTURE, 160, 32, 0, j, 0, k, m, l);
+        for (int o = m; o < widthN; o += 64) context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, TEXTURE, 160, 32, 32, j, o, k, Math.min(64, widthN - o), l);
+        context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, TEXTURE, 160, 32, 160 - n, j, widthN, k, n, l);
         *///?} else {
         context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURE, 160, 32, 0, j, 0, k, m, l);
         for (int o = m; o < widthN; o += 64) context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURE, 160, 32, 32, j, o, k, Math.min(64, widthN - o), l);

diff --git a/src/main/java/cc/aabss/eventutils/UpdateChecker.java b/src/main/java/cc/aabss/eventutils/UpdateChecker.java
@@ -30,13 +30,23 @@ private void notifyUpdate(@NotNull String latestVersion) {
         final MinecraftClient client = MinecraftClient.getInstance();
         client.send(() -> {
             if (client.player == null) return;
+            //? if >=1.21.5 {
+            /*client.player.sendMessage(Text.literal("§6[EVENTUTILS]§r §e" + EventUtils.translate("eventutils.updatechecker.new")+"§r §7(v" + Versions.EU_VERSION + " -> v" + latestVersion.replace(Versions.MC_VERSION + "-", "") + ")" + "\n")
+                            .setStyle(Style.EMPTY
+                                    .withHoverEvent(new HoverEvent.ShowText(translatable("eventutils.updatechecker.hover")))
+                                    .withClickEvent(new ClickEvent.OpenUrl(URI.create("https://modrinth.com/mod/alerts/version/" + latestVersion))))
+                            .append(Text.literal("§7§o" + EventUtils.translate("eventutils.updatechecker.config"))
+                                    .setStyle(Style.EMPTY.withClickEvent(new ClickEvent.RunCommand("/event utils")))),
+                    false);
+            *///?} else {
             client.player.sendMessage(Text.literal("§6[EVENTUTILS]§r §e" + EventUtils.translate("eventutils.updatechecker.new")+"§r §7(v" + Versions.EU_VERSION + " -> v" + latestVersion.replace(Versions.MC_VERSION + "-", "") + ")" + "\n")
                             .setStyle(Style.EMPTY
                                     .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, translatable("eventutils.updatechecker.hover")))
                                     .withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://modrinth.com/mod/alerts/version/" + latestVersion)))
                             .append(Text.literal("§7§o" + EventUtils.translate("eventutils.updatechecker.config"))
                                     .setStyle(Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/eventutils config")))),
                     false);
+            //?}
         });
     }
 

diff --git a/src/main/java/cc/aabss/eventutils/mixin/ButtonWidgetMixin.java b/src/main/java/cc/aabss/eventutils/mixin/ButtonWidgetMixin.java
@@ -4,15 +4,12 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.*;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.PressableWidget;
-import net.minecraft.client.network.ServerInfo;
-import net.minecraft.client.realms.gui.screen.RealmsMainScreen;
 import net.minecraft.text.Text;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -22,6 +19,8 @@
 
 @Mixin(ButtonWidget.class)
 public abstract class ButtonWidgetMixin extends PressableWidget {
+    @Shadow public abstract void onPress();
+
     public ButtonWidgetMixin(int i, int j, int k, int l, Text text) {
         super(i, j, k, l, text);
     }
@@ -36,36 +35,10 @@ private void onPress(CallbackInfo ci) {
         final Screen current = client.currentScreen;
         client.setScreen(new ConfirmScreen(yes -> {
             if (yes) {
-                disconnect();
+                this.onPress();
                 return;
             }
             client.setScreen(current);
         }, translatable("eventutils.confirm_disconnect.title"), translatable("eventutils.confirm_disconnect.message")));
     }
-
-    @Unique
-    private void disconnect() {
-        final MinecraftClient client = MinecraftClient.getInstance();
-        if (client == null || client.world == null) return;
-        final TitleScreen titleScreen = new TitleScreen();
-        client.world.disconnect();
-
-        // Singleplayer
-        if (client.isInSingleplayer()) {
-            client.disconnect(new MessageScreen(translatable("menu.savingLevel")));
-            client.setScreen(titleScreen);
-            return;
-        }
-        client.disconnect();
-
-        // Realms
-        final ServerInfo serverInfo = MinecraftClient.getInstance().getCurrentServerEntry();
-        if (serverInfo != null && serverInfo.isRealm()) {
-            client.setScreen(new RealmsMainScreen(titleScreen));
-            return;
-        }
-
-        // Multiplayer
-        client.setScreen(new MultiplayerScreen(titleScreen));
-    }
-}
+}
diff --git a/src/main/java/cc/aabss/eventutils/utility/ConnectUtility.java b/src/main/java/cc/aabss/eventutils/utility/ConnectUtility.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonObject;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.MessageScreen;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.network.ServerAddress;
@@ -22,6 +23,8 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import static net.minecraft.text.Text.translatable;
+
 
 public class ConnectUtility {
     public static void connect(@NotNull String ip) {
@@ -34,7 +37,11 @@ public static void connect(@NotNull String ip) {
         final ServerAddress address = ServerAddress.parse(ip);
         client.execute(() -> {
             try {
+                //? if >=1.21.6 {
+                /*client.disconnect(new MessageScreen(translatable("multiplayer.disconnect.generic")), false);
+                *///?} else {
                 client.disconnect();
+                //?}
 
                 //? if <=1.20.4 {
                 /*ConnectScreen.connect(screen, client, address, new ServerInfo("EventUtils Event Server", ip, ServerInfo.ServerType.OTHER), true);

diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties
diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties
diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties
@@ -0,0 +1,6 @@
+deps.minecraft=1.21.5
+deps.yarn_mappings=1.21.5+build.1
+deps.fabric_api=0.128.2+1.21.5
+
+deps.yacl=3.7.1+1.21.5-fabric
+deps.modmenu=14.0.0-rc.2
diff --git a/versions/1.21.6/gradle.properties b/versions/1.21.6/gradle.properties
@@ -0,0 +1,6 @@
+deps.minecraft=1.21.6
+deps.yarn_mappings=1.21.6+build.1
+deps.fabric_api=0.128.2+1.21.6
+
+deps.yacl=3.7.1+1.21.6-fabric
+deps.modmenu=15.0.0-beta.3