summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAizistral2022-09-18 02:56:22 +0200
committerAizistral2022-09-18 02:56:22 +0200
commit211954d8dfc66585bf9512131c36f560c0bf52f4 (patch)
tree9fec4eeb27ef7d5ab012da9dbf40cac6dbf55520
parent8e221ee3c86df941f647f86dbbb858c93a6178bd (diff)
Add encryption button to chat screen
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java38
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java2
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json5
-rw-r--r--src/main/resources/assets/nochatreports/textures/gui/encryption_toggle_button.pngbin0 -> 1453 bytes
5 files changed, 45 insertions, 4 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index e8472ad..8c014f6 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -39,6 +39,10 @@ public final class NCRConfigClient extends JSONConfig {
this.enableMod = !this.enableMod;
}
+ public void toggleEncryption() {
+ this.enableChatEncryption = !this.enableChatEncryption;
+ }
+
/**
* @return True if client with No Chat Reports installed should demand that mod is present on
* every server that it tries to join. In that case client will not be able to join servers that
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
index 7ff6207..38816d9 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -22,12 +22,14 @@ import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.math.Matrix4f;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.ImageButton;
import net.minecraft.client.gui.screens.ChatScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.locale.Language;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
@@ -40,6 +42,7 @@ import net.minecraft.util.FormattedCharSequence;
@Mixin(ChatScreen.class)
public abstract class MixinChatScreen extends Screen {
private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png");
+ private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png");
protected MixinChatScreen() {
super(null);
@@ -66,11 +69,42 @@ public abstract class MixinChatScreen extends Screen {
var button = new ImageButton(this.width - 23, this.height - 37, 20, 20, this.getXOffset(trust),
0, 20, CHAT_STATUS_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
this.renderTooltipNoGap(poseStack, this.minecraft.font.split(trust.getTooltip(), 250), i, j),
- Component.translatable("gui.socialInteractions.report"));
+ Component.empty());
button.active = false;
button.visible = true;
this.addRenderableOnly(button);
+
+ button = new ImageButton(this.width - 48, this.height - 37, 20, 20, NCRConfig.getClient().enableChatEncryption() ? 0 : 20,
+ 0, 20, ENCRYPTION_BUTTON, 64, 64, btn -> {
+ NCRConfig.getClient().toggleEncryption();
+ ((ImageButton)btn).xTexStart = NCRConfig.getClient().enableChatEncryption() ? 0 : 20;
+ }, (btn, poseStack, i, j) ->
+ this.renderTooltip(poseStack, this.minecraft.font.split(
+ Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance()
+ .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getClient()
+ .enableChatEncryption() ? "on" : "off")), 250), 250), i, j),
+ Component.empty()) {
+
+ @Override
+ public boolean mouseClicked(double x, double y, int i) {
+ if (!this.active || !this.visible)
+ return false;
+
+ if (i == 1 && this.clicked(x, y)) {
+ this.playDownSound(Minecraft.getInstance().getSoundManager());
+ // TODO Open GUI
+ return true;
+ }
+
+ return super.mouseClicked(x, y, i);
+ }
+
+ };
+ button.active = true;
+ button.visible = true;
+
+ this.addRenderableWidget(button);
}
private int getXOffset(ServerSafetyLevel level) {
@@ -92,7 +126,7 @@ public abstract class MixinChatScreen extends Screen {
if (list.isEmpty())
return;
int k = 0;
- int l = list.size() == 1 ? -2 : 0;
+ int l = list.size() == 1 ? -2 : -2;
for (ClientTooltipComponent clientTooltipComponent : list) {
m = clientTooltipComponent.getWidth(this.font);
if (m > k) {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index 872aee4..6c357c6 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -100,7 +100,7 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
if (list.isEmpty())
return;
int k = 0;
- int l = list.size() == 1 ? -2 : 0;
+ int l = list.size() == 1 ? -2 : -2;
for (ClientTooltipComponent clientTooltipComponent : list) {
m = clientTooltipComponent.getWidth(this.font);
if (m > k) {
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index c5920ce..f9ada3b 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -17,7 +17,10 @@
"gui.nochatreports.ncr_state_on": "§a§lEnabled§r",
"gui.nochatreports.ncr_state_off": "§c§lDisabled§r",
"tag.nochatreports.encrypted": "Encrypted using: %1$s",
- "tag.nochatreports.encrypted_original": "Undecrypted: %1$s",
+ "tag.nochatreports.encrypted_original": "Non-decrypted: %1$s",
+ "gui.nochatreports.encryption_tooltip": "§lEncryption:§r %1$s\nRight-click to configure.",
+ "gui.nochatreports.encryption_state_on": "§a§lEnabled§r",
+ "gui.nochatreports.encryption_state_off": "§c§lDisabled§r",
"configuration.NoChatReports.config": "No Chat Reports",
diff --git a/src/main/resources/assets/nochatreports/textures/gui/encryption_toggle_button.png b/src/main/resources/assets/nochatreports/textures/gui/encryption_toggle_button.png
new file mode 100644
index 0000000..5d82048
--- /dev/null
+++ b/src/main/resources/assets/nochatreports/textures/gui/encryption_toggle_button.png
Binary files differ