From f541dd47eb11543841ebee922584e9ccdb89034b Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 29 Jul 2022 17:03:08 +0200 Subject: Let players join Realms with mod disabled Fixes #108 --- .../nochatreports/NoChatReportsClient.java | 2 ++ .../mixins/client/MixinRealmsConnect.java | 30 ++++++++++++++++++++++ src/main/resources/nochatreports.mixins.json | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index bcd1a84..7f1d28d 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -29,6 +29,8 @@ import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.realms.RealmsConnect; +import net.minecraft.realms.RealmsScreen; /** * Client initializer for the mod. Some networking setup here, as well as few screen-related events. diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java new file mode 100644 index 0000000..9d8a3a5 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java @@ -0,0 +1,30 @@ +package com.aizistral.nochatreports.mixins.client; + +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.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.realmsclient.dto.RealmsServer; + +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.realms.RealmsConnect; + +@Mixin(RealmsConnect.class) +public class MixinRealmsConnect { + + /** + * @reason Always treat Realms servers as insecure, there is nothing we can do about them. + * @author Aizistral + */ + + @Inject(method = "connect", at = @At("HEAD")) + private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) { + ServerSafetyState.setLastConnectedServer(serverAddress); + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.setAllowsUnsafeServer(true); + } + +} diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index efe9c5c..a3afe8b 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -26,7 +26,8 @@ "client.MixinClientboundHelloPacket", "client.MixinJoinMultiplayerScreen", "client.MixinGuiMessageTag", - "client.MixinToastComponent" + "client.MixinToastComponent", + "client.MixinRealmsConnect" ], "server": [ "server.MixinDedicatedServer" -- cgit v1.2.3