summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorMadis Otenurm2022-11-07 17:35:46 +0200
committerGitHub2022-11-07 16:35:46 +0100
commitfdd4bb49a878975b3d48601e5edd507092347a39 (patch)
tree15f4525a48464d5de09abf2ea0c6652463e154d2 /src/main
parentc3291f55c6fe49a5dce44370bd9187e03c6516f9 (diff)
Sign automatically when requested (#274)
* Skip signing warning * Update ModMenuIntegration.java
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java5
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json2
-rw-r--r--src/main/resources/assets/nochatreports/lang/et_ee.json2
5 files changed, 19 insertions, 1 deletions
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("")));
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index ddb883c..6ffd954 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -97,6 +97,8 @@
"option.NoChatReports.showReloadButton.tooltip": "Adds a button for config reloading to multiplayer menu.",
"option.NoChatReports.whitelistAllServers": "Whitelist all servers",
"option.NoChatReports.whitelistAllServers.tooltip": "Makes the mod behave as if all servers were added to §oWhitelisted Servers§r list.",
+ "option.NoChatReports.skipSigningWarning": "Sign automatically when requested",
+ "option.NoChatReports.skipSigningWarning.tooltip": "Skips the \"Chat Signing Requested\" warning and signs the chat automatically when the server requires it.",
"option.NoChatReports.showNCRButton": "Show NCR button",
"option.NoChatReports.showNCRButton.tooltip": "Adds a button that toggles most of the mod's client-sided functionality to multiplayer menu.",
"option.NoChatReports.enableMod": "Enable mod",
diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json
index 569d85c..36e4cf9 100644
--- a/src/main/resources/assets/nochatreports/lang/et_ee.json
+++ b/src/main/resources/assets/nochatreports/lang/et_ee.json
@@ -97,6 +97,8 @@
"option.NoChatReports.showReloadButton.tooltip": "Lisab mitmikmängu serverite loendisse seadistuste taaslaadimise nupu.",
"option.NoChatReports.whitelistAllServers": "Kõik serverid lubamisloendisse",
"option.NoChatReports.whitelistAllServers.tooltip": "Sunnib modi käituma nii, nagu kõik serverid oleksid lisatud §olubamisloendis serverite§r loendisse.",
+ "option.NoChatReports.skipSigningWarning": "Signeeri nõude korral automaatselt",
+ "option.NoChatReports.skipSigningWarning.tooltip": "Jätab vahele hoiatuskuva \"taodeldi vestluse signeerimist\", signeerides vestluse automaatselt, kui server seda nõuab.",
"option.NoChatReports.showNCRButton": "Kuva NCRi nupp",
"option.NoChatReports.showNCRButton.tooltip": "Lisab mitmikmängumenüüsse nupu, mis lülitab enamikku modi kliendipoolsest funktsionaalsusest.",
"option.NoChatReports.enableMod": "Mod lubatud",