From 53e11fa2b64cd9bb37c220a3f19bfbc6a08f3d22 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 17 May 2023 16:03:18 +0200 Subject: Fix incorrect key display on MacOS Fixes #361 --- .../nochatreports/common/gui/TooltipHelper.java | 20 ++++++++++++++++++++ .../common/mixins/client/MixinChatScreen.java | 4 +++- .../resources/assets/nochatreports/lang/en_us.json | 4 +++- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java b/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java new file mode 100644 index 0000000..54e0e49 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java @@ -0,0 +1,20 @@ +package com.aizistral.nochatreports.common.gui; + +import net.minecraft.client.Minecraft; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +public final class TooltipHelper { + + private TooltipHelper() { + throw new IllegalStateException("Can't touch this"); + } + + public static MutableComponent getCtrl() { + if (Minecraft.ON_OSX) + return Component.translatable("key.nochatreports.cmd"); + else + return Component.translatable("key.nochatreports.ctrl"); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index d9002f8..dde43c3 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -18,6 +18,7 @@ import com.aizistral.nochatreports.common.gui.AdvancedTooltip; import com.aizistral.nochatreports.common.gui.EncryptionButton; import com.aizistral.nochatreports.common.gui.EncryptionWarningScreen; import com.aizistral.nochatreports.common.gui.GUIShenanigans; +import com.aizistral.nochatreports.common.gui.TooltipHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -187,7 +188,8 @@ public abstract class MixinChatScreen extends Screen { if (NCRConfig.getEncryption().isValid()) return Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance() .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption() - .isEnabledAndValid() ? "on" : "off"))); + .isEnabledAndValid() ? "on" : "off")), + TooltipHelper.getCtrl().withStyle(ChatFormatting.BOLD, ChatFormatting.UNDERLINE)); else return Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance() .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption() diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 48566f8..673abcc 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -1,5 +1,7 @@ { "modmenu.descriptionTranslation.nochatreports": "Strips cryptographic signatures from player messages, making it impossible to track and associate them with your Mojang/Microsoft account, as well as use Player Chat Reporting feature.", + "key.nochatreports.ctrl": "Ctrl", + "key.nochatreports.cmd": "Cmd", "gui.nochatreports.secure_chat": "This option cannot work with No Chat Reports, since there are no signatures to verify.", "gui.nochatreports.no_reporting": "Chat reports are disabled on this server, courtesy of No Chat Reports.", "disconnect.nochatreports.client": "This server does not have No Chat Reports, and you have it configured to require itself on server.", @@ -25,7 +27,7 @@ "gui.nochatreports.ncr_state_off": "§c§lDisabled§r", "tag.nochatreports.encrypted": "Encrypted using: %1$s", "tag.nochatreports.encrypted_original": "Non-decrypted: %1$s", - "gui.nochatreports.encryption_tooltip": "§lEncryption:§r %1$s\nRight-click to configure.\n\nWhile encryption is enabled, you can prevent it from being applied to the message by holding §n§lCtrl§r when sending it.", + "gui.nochatreports.encryption_tooltip": "§lEncryption:§r %1$s\nRight-click to configure.\n\nWhile encryption is enabled, you can prevent it from being applied to the message by holding %2$s when sending it.", "gui.nochatreports.encryption_tooltip_invalid": "§lEncryption:§r %1$s\n§cInvalid configuration. Click to configure.", "gui.nochatreports.encryption_state_on": "§a§lEnabled§r", "gui.nochatreports.encryption_state_off": "§c§lDisabled§r", -- cgit v1.2.3