From fdd4bb49a878975b3d48601e5edd507092347a39 Mon Sep 17 00:00:00 2001 From: Madis Otenurm Date: Mon, 7 Nov 2022 17:35:46 +0200 Subject: Sign automatically when requested (#274) * Skip signing warning * Update ModMenuIntegration.java--- .../com/aizistral/nochatreports/config/ModMenuIntegration.java | 7 +++++++ .../java/com/aizistral/nochatreports/config/NCRConfigClient.java | 4 +++- .../aizistral/nochatreports/mixins/client/MixinChatListener.java | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java index f2c8db9..9fcb824 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -164,6 +164,13 @@ public final class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NCRConfig.getClient().whitelistAllServers = newValue) .build()); + // Set an option for skipSigningWarning + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.skipSigningWarning"), NCRConfig.getClient().skipSigningWarning) + .setDefaultValue(false) + .setTooltip(this.makeTooltip("option.NoChatReports.skipSigningWarning.tooltip")) + .setSaveConsumer(newValue -> NCRConfig.getClient().skipSigningWarning = newValue) + .build()); + // Set an option for showNCRButton technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton) .setDefaultValue(true) diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index c1915ca..c0abdf4 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -26,7 +26,7 @@ public final class NCRConfigClient extends JSONConfig { hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true, - enableMod = true, skipRealmsWarning = false, hideSigningRequestMessage = false; + enableMod = true, skipRealmsWarning = false, hideSigningRequestMessage = false, skipSigningWarning = false; protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0; @@ -221,4 +221,6 @@ public final class NCRConfigClient extends JSONConfig { return this.hideSigningRequestMessage; } + public boolean skipSigningWarning() { return this.skipSigningWarning; } + } 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 18369d8..0c926d3 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -52,6 +52,11 @@ public class MixinChatListener { if (UnsafeServerScreen.hideThisSession() || ServerSafetyState.allowChatSigning()) return; + if(NCRConfig.getClient().skipSigningWarning()){ + ServerSafetyState.setAllowChatSigning(true); + return; + } + Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen instanceof ChatScreen chat ? chat : new ChatScreen(""))); -- cgit v1.2.3