diff options
Diffstat (limited to 'src/main/java/com/aizistral')
5 files changed, 65 insertions, 7 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index d9297ab..4e0df95 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.gui.UnsafeServerScreen; import com.aizistral.nochatreports.mixins.client.MixinChatListener; +import com.aizistral.nochatreports.mixins.client.MixinToastComponent; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; @@ -39,7 +40,7 @@ public class NoReportsConfig { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; private boolean demandOnClient, demandOnServer, enableDebugLog, convertToGameMessage = true, - showServerSafety = true, suppressMessageTrustIndicators = true, alwaysHideReportButton = false, + showServerSafety = true, suppressVanillaSecurityNotices = true, alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, showReloadButton = true; private List<String> whitelistedServers; @@ -175,15 +176,17 @@ public class NoReportsConfig { } /** - * @return True if vanilla's Chat Trust Status indicators should be removed.<br><br> + * @return True if vanilla's Chat Trust Status indicators and "Chat messages can't be verified" + * toast should be removed.<br><br> * * This is true by default. * * @see MixinChatListener#onEvaluateTrustLevel + * @see MixinToastComponent#onAddToast */ - public static boolean suppressMessageTrustIndicators() { - return getInstance().suppressMessageTrustIndicators; + public static boolean suppressVanillaSecurityNotices() { + return getInstance().suppressVanillaSecurityNotices; } /** diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 9659f79..fb8b726 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.mixins.client; +import java.time.Instant; import java.util.Base64; import org.spongepowered.asm.mixin.Mixin; @@ -11,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.core.NoReportsConfig; +import net.minecraft.client.gui.components.toasts.SystemToast; import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.client.multiplayer.chat.ChatListener; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; @@ -30,8 +32,8 @@ public class MixinChatListener { @Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true) private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, - Component component, PlayerInfo playerInfo, CallbackInfoReturnable<ChatTrustLevel> info) { - if (NoReportsConfig.suppressMessageTrustIndicators()) { + Component component, PlayerInfo playerInfo, Instant instant, CallbackInfoReturnable<ChatTrustLevel> info) { + if (NoReportsConfig.suppressVanillaSecurityNotices()) { info.setReturnValue(ChatTrustLevel.SECURE); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java index 66a47ec..cac9460 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java @@ -21,7 +21,7 @@ public class MixinGuiMessageTag { @Inject(method = "system", at = @At("HEAD"), cancellable = true) private static void onSystem(CallbackInfoReturnable<GuiMessageTag> info) { - if (NoReportsConfig.suppressMessageTrustIndicators()) { + if (NoReportsConfig.suppressVanillaSecurityNotices()) { info.setReturnValue(null); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java new file mode 100644 index 0000000..239f5df --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java @@ -0,0 +1,26 @@ +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.NoReportsConfig; + +import net.minecraft.client.gui.components.toasts.SystemToast; +import net.minecraft.client.gui.components.toasts.SystemToast.SystemToastIds; +import net.minecraft.client.gui.components.toasts.Toast; +import net.minecraft.client.gui.components.toasts.ToastComponent; + +@Mixin(ToastComponent.class) +public class MixinToastComponent { + + @Inject(method = "addToast", at = @At("HEAD"), cancellable = true) + private void onAddToast(Toast toast, CallbackInfo info) { + if (NoReportsConfig.suppressVanillaSecurityNotices()) + if (toast instanceof SystemToast sys && sys.getToken() == SystemToastIds.UNSECURE_SERVER_WARNING) { + info.cancel(); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java new file mode 100644 index 0000000..3a544d3 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java @@ -0,0 +1,27 @@ +package com.aizistral.nochatreports.mixins.server; + +import org.spongepowered.asm.mixin.Mixin; +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; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.core.NoReportsConfig; + +import net.minecraft.network.protocol.game.ClientboundServerDataPacket; +import net.minecraft.network.protocol.status.ServerStatus; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; + +@Mixin(ServerStatus.class) +public class MixinServerStatus { + + @Inject(method = "enforcesSecureChat", at = @At("HEAD"), cancellable = true) + public void onSecureChatCheck(CallbackInfoReturnable<Boolean> info) { + if (NoReportsConfig.convertToGameMessage()) { + info.setReturnValue(true); + } + } + +} |
