summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorAizistral2023-05-17 16:03:18 +0200
committerAizistral2023-05-17 16:03:18 +0200
commit53e11fa2b64cd9bb37c220a3f19bfbc6a08f3d22 (patch)
tree442e671d2a500832b35c936379c8c27f7bd20d9f /src/main/java
parentaad192e45ff11d8d6ae8fea7c76efa07a6930e67 (diff)
Fix incorrect key display on MacOS
Fixes #361
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java20
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java4
2 files changed, 23 insertions, 1 deletions
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()