From 6865a2fbe3ddba02ac609041e20c9bc83d29641e Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 10 May 2024 20:28:07 +0200 Subject: Fix some Forge stuff --- .../nochatreports/common/mixins/client/MixinChatListener.java | 7 +++++-- .../nochatreports/common/mixins/client/MixinTitleScreen.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index abed585..4a04d2f 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -23,6 +23,7 @@ import com.aizistral.nochatreports.common.gui.UnsafeServerScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.chat.ChatListener; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; import net.minecraft.core.RegistryAccess; @@ -64,8 +65,10 @@ public class MixinChatListener { } if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) { - Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen - instanceof ChatScreen chat ? chat : new ChatScreen(""))); + Screen returnScreen = Minecraft.getInstance().screen instanceof ChatScreen chat ? chat + : new ChatScreen(""); + Screen unsafeScreen = new UnsafeServerScreen(returnScreen); + Minecraft.getInstance().setScreen(unsafeScreen); if (NCRConfig.getClient().hideSigningRequestMessage()) { info.cancel(); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index 87be749..538ca3c 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -21,7 +21,7 @@ public class MixinTitleScreen extends Screen { throw new IllegalStateException("Can't touch this"); } - @Inject(method = "method_55814", at = @At("HEAD"), cancellable = true) + @Inject(method = { "realmsButtonClicked", "method_55814", "lambda$createNormalMenuOptions$9" }, at = @At("HEAD"), cancellable = true) private void onRealmsButtonClicked(Button button, CallbackInfo info) { if (RealmsWarningScreen.shouldShow()) { this.minecraft.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); -- cgit v1.2.3