From 303607f8a3ed44b50fd8e7f688c3449704832d3b Mon Sep 17 00:00:00 2001 From: mrcndz Date: Tue, 23 Jun 2026 21:58:19 -0300 Subject: [PATCH 1/2] feat: add Minecraft 26.2 support Update dependencies to 26.2 (fabric-api 0.153.0+26.2, loader 0.19.3) and fix two API renames: Minecraft.screen -> gui.screen(), Minecraft.getToastManager() -> gui.toastManager(). --- gradle.properties | 6 +++--- .../modflared/mixin/client/ConnectScreenRunnableMixin.java | 2 +- .../httxrafa/modflared/tunnel/manager/TunnelManager.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 54e611e..17d08ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ org.gradle.configuration-cache=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.1 -loader_version=0.18.4 +minecraft_version=26.2 +loader_version=0.19.3 loom_version=1.15-SNAPSHOT # Mod Properties @@ -17,7 +17,7 @@ maven_group=dev.httxrafa.modflared archives_base_name=modflared # Dependencies -fabric_version=0.144.3+26.1 +fabric_version=0.153.0+26.2 # Modrinth Properties modrinth_project_id=modflared diff --git a/src/main/java/dev/httxrafa/modflared/mixin/client/ConnectScreenRunnableMixin.java b/src/main/java/dev/httxrafa/modflared/mixin/client/ConnectScreenRunnableMixin.java index f68b98c..3c968dd 100644 --- a/src/main/java/dev/httxrafa/modflared/mixin/client/ConnectScreenRunnableMixin.java +++ b/src/main/java/dev/httxrafa/modflared/mixin/client/ConnectScreenRunnableMixin.java @@ -23,7 +23,7 @@ public class ConnectScreenRunnableMixin { var status = Modflared.TUNNEL_MANAGER.handleConnect(address); Modflared.TUNNEL_MANAGER.prepareConnection(status, connection); - var currentScreen = Minecraft.getInstance().screen; + var currentScreen = Minecraft.getInstance().gui.screen(); if (currentScreen instanceof ConnectScreen connectScreen) { ((IConnectScreen) connectScreen).setStatus(status); } diff --git a/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java b/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java index f777c92..56b3e9d 100644 --- a/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java +++ b/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java @@ -231,7 +231,7 @@ public void loadForcedTunnels() { } public static void displayErrorToast() { - Minecraft.getInstance().getToastManager().addToast(new SystemToast(SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("gui.toast.title.error"), Component.translatable("gui.toast.body.error"))); + Minecraft.getInstance().gui.toastManager().addToast(new SystemToast(SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("gui.toast.title.error"), Component.translatable("gui.toast.body.error"))); } } From 536e29568a70e1f2c40b59d1ef46b6af3f295cbc Mon Sep 17 00:00:00 2001 From: mrcndz Date: Tue, 23 Jun 2026 22:02:17 -0300 Subject: [PATCH 2/2] fix: guard displayErrorToast against null Minecraft instance --- .../dev/httxrafa/modflared/tunnel/manager/TunnelManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java b/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java index 56b3e9d..144bdea 100644 --- a/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java +++ b/src/main/java/dev/httxrafa/modflared/tunnel/manager/TunnelManager.java @@ -231,7 +231,9 @@ public void loadForcedTunnels() { } public static void displayErrorToast() { - Minecraft.getInstance().gui.toastManager().addToast(new SystemToast(SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("gui.toast.title.error"), Component.translatable("gui.toast.body.error"))); + var minecraft = Minecraft.getInstance(); + if (minecraft == null || minecraft.gui == null) return; + minecraft.gui.toastManager().addToast(new SystemToast(SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("gui.toast.title.error"), Component.translatable("gui.toast.body.error"))); } }