From 78b56537b830a6f367ef4bb1293c57fd485cc09c Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 13:30:42 -0400 Subject: Ready to merge, 99% sure --- .../nochatreports/ModMenuIntegration.java | 29 ++++++++++++++-------- .../resources/assets/nochatreports/lang/en_us.json | 29 ++++++++++++++++++++-- 2 files changed, 45 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 4b7d06a..ea6d9de 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -28,12 +28,12 @@ public class ModMenuIntegration implements ModMenuApi { // Set category ConfigCategory general = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.general")); - // Set an option for demandOnClient + // Set an option for demandOnServer ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NoReportsConfig.getInstance().demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) .setDefaultValue(true) - .setTooltip(Component.translatable("option.NoChatReports.demandOnClient.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnClient = newValue) + .setTooltip(Component.translatable("option.NoChatReports.demandOnServer.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnServer = newValue) .build()); // Set an option for enableDebugLog @@ -43,13 +43,6 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue) .build()); - // Set an option for convertToGameMessage - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) - .build()); - // Set an option for showServerSafety general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety) .setDefaultValue(true) @@ -71,6 +64,20 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideYellowChatIndicators = newValue) .build()); + // Set an option for hideGrayChatIndicators + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NoReportsConfig.getInstance().hideGrayChatIndicators) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.hideGrayChatIndicators.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideGrayChatIndicators = newValue) + .build()); + + // Set an option for hideWarningToast + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NoReportsConfig.getInstance().hideWarningToast) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.hideWarningToast.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideWarningToast = newValue) + .build()); + // Set an option for alwaysHideReportButton general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().alwaysHideReportButton) .setDefaultValue(false) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index ef7e613..7ea4dfd 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -9,5 +9,30 @@ "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", "gui.nochatreports.unsafe_server.contents": "This server requires all chat messages to be signed, which means they can be reported to Mojang, which may result in a ban from all multiplayer servers. This likely means that the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which is the default since 1.19.1. You can choose to play anyway, but No Chat Reports will not be able to protect you.", "gui.nochatreports.unsafe_server.check": "Do not show again for this server", - "gui.nochatrepords.reload_config_tooltip": "Reload No Chat Reports config. Use carefully." -} + "gui.nochatrepords.reload_config_tooltip": "Reload No Chat Reports config. Use carefully.", + + "configuration.NoChatReports.config": "No Chat Reports", + "configuration.NoChatReports.category.general": "General Cat", + "option.NoChatReports.demandOnServer": "Demand on server", + "option.NoChatReports.demandOnServer.tooltip": "True if client with No Chat Reports installed should demand that mod is present on every server that it tries to join.", + "option.NoChatReports.enableDebugLog": "Enable debug log", + "option.NoChatReports.enableDebugLog.tooltip": "True if mod should log some additional information about its activity and message signatures. Generally only useful for debugging.", + "option.NoChatReports.showServerSafety":"Show server safety", + "option.NoChatReports.showServerSafety.tooltip":"True if current server safety level should be indicated on client by an icon in the bottom-right corner of chat screen.", + "option.NoChatReports.hideRedChatIndicators":"Hide red chat indicators", + "option.NoChatReports.hideRedChatIndicators.tooltip":"True if vanilla's unsigned messages trust indicator should be removed.", + "option.NoChatReports.hideYellowChatIndicators":"Hide yellow chat indicators", + "option.NoChatReports.hideYellowChatIndicators.tooltip":"True if vanilla's modified/hidden messages trust indicator should be removed.", + "option.NoChatReports.hideGrayChatIndicators":"Hide gray chat indicators", + "option.NoChatReports.hideGrayChatIndicators.tooltip":"True if vanilla's system messages trust indicator should be removed.", + "option.NoChatReports.hideWarningToast":"Hide warning toast", + "option.NoChatReports.hideWarningToast.tooltip":"True if \u0022Chat messages can't be verified\u0022 toast should be removed.", + "option.NoChatReports.alwaysHideReportButton":"Always hide report button", + "option.NoChatReports.alwaysHideReportButton.tooltip":"True if reporting buttons should always be hidden from social interactions screen.", + "option.NoChatReports.versionEasterEgg":"Version easter egg", + "option.NoChatReports.versionEasterEgg.tooltip":"True if \u00221.19.1\u0022 should be changed to \u00221.19.84\u0022 on titlebar and title screen.", + "option.NoChatReports.disableTelemetry":"Diable telemetry", + "option.NoChatReports.disableTelemetry.tooltip":"True if sending telemetry to Mojang should be disabled.", + "option.NoChatReports.showReloadButton":"Show reload button", + "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen." +} \ No newline at end of file -- cgit v1.2.3