diff options
| author | Aizistral | 2022-07-02 13:20:47 +0200 |
|---|---|---|
| committer | Aizistral | 2022-07-02 13:20:47 +0200 |
| commit | 7b63d2e072b3e5758fe644420f8cc30b8c54d509 (patch) | |
| tree | 60f9b8638614024ffecbcbc0aa48007c29c711cb /src/main/java/com/aizistral/nochatreports | |
| parent | ae263f13f7cb506c08b12acfecff61c5454bbc8e (diff) | |
Fix warning screen loop
Fixes #42
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java | 25 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java new file mode 100644 index 0000000..a8adf92 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java @@ -0,0 +1,25 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.gui.UnsafeServerScreen; + +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +import net.minecraft.client.multiplayer.ClientPacketListener; + +@Mixin(ClientPacketListener.class) +public class MixinClientPacketListener { + + @Inject(method = "<init>", at = @At("RETURN")) + private void onConstructed(CallbackInfo info) { + var self = (ClientPacketListener) (Object) this; + if (self.callbackScreen instanceof UnsafeServerScreen) { + self.callbackScreen = new JoinMultiplayerScreen(new TitleScreen()); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java index a850aed..751c762 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java @@ -22,7 +22,7 @@ public class MixinConnectScreen { @Inject(method = "startConnecting", at = @At("HEAD")) private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress, @Nullable ServerData serverData, CallbackInfo info) { - ServerSafetyState.reset(); // just to be 100% sure + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure ServerSafetyState.setLastConnectedServer(serverAddress); if (serverAddress != null) |
