From ae6872501bc17cbd182eecca3e762d1086ba828f Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 19 Sep 2022 21:09:52 +0200 Subject: Some work on encryption GUIs --- .../nochatreports/gui/EncryptionConfigScreen.java | 86 ++++++++++++++++++++++ .../nochatreports/gui/EncryptionWarningScreen.java | 43 +++++++++++ .../mixins/client/MixinChatScreen.java | 3 +- 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java create mode 100644 src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java new file mode 100644 index 0000000..77caf15 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java @@ -0,0 +1,86 @@ +package com.aizistral.nochatreports.gui; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.blaze3d.vertex.PoseStack; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.MultiLineLabel; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen; +import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.FormattedText; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.BaseCommandBlock; + +@Environment(EnvType.CLIENT) +public class EncryptionConfigScreen extends Screen { + private static final ResourceLocation ENCRYPTION_ICONS = new ResourceLocation("nochatreports", "textures/gui/encryption_gui_icons.png"); + private static final int FIELDS_Y_START = 40; + private final Screen previous; + protected EditBox keyField; + private MultiLineLabel keyDesc = MultiLineLabel.EMPTY; + + protected EncryptionConfigScreen(Screen previous) { + super(CommonComponents.EMPTY); + this.previous = previous; + } + + @Override + protected void init() { + super.init(); + + int w = (int) (this.width * 0.7); + + this.keyDesc = MultiLineLabel.create(this.font, Component.translatable("gui.nochatreports.encryption_config.key_desc"), w); + int i = (this.keyDesc.getLineCount() + 1) * this.getLineHeight(); + + w -= 6; + + this.keyField = new EditBox(this.font, (this.width - w)/2, FIELDS_Y_START + i, w, 20, CommonComponents.EMPTY); + this.keyField.setMaxLength(32500); + this.keyField.setResponder(this::onEdited); + this.addWidget(this.keyField); + } + + @Override + public void render(PoseStack poseStack, int i, int j, float f) { + this.renderBackground(poseStack); + AbstractCommandBlockEditScreen.drawCenteredString(poseStack, this.font, Component.literal("Set command"), this.width / 2, 10, 0xFFFFFF); + + int k = (this.width - this.keyDesc.getWidth()) / 2; + this.keyDesc.renderLeftAligned(poseStack, k, FIELDS_Y_START, this.getLineHeight(), 0xFFFFFF); + + this.keyField.render(poseStack, i, j, f); + super.render(poseStack, i, j, f); + } + + protected int getLineHeight() { + return this.font.lineHeight * 2; + } + + @Override + public void tick() { + this.keyField.tick(); + } + + private void onEdited(String string) { + // TODO Validate + } + + protected void onDone() { + // NO-OP + } + + @Override + public void onClose() { + this.minecraft.setScreen(this.previous); + } + + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java new file mode 100644 index 0000000..6c6f8e0 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java @@ -0,0 +1,43 @@ +package com.aizistral.nochatreports.gui; + +import com.aizistral.nochatreports.NoChatReportsClient; +import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen; +import net.minecraft.client.gui.screens.multiplayer.WarningScreen; +import net.minecraft.client.multiplayer.resolver.ServerAddress; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; + +@Environment(EnvType.CLIENT) +public class EncryptionWarningScreen extends WarningScreen { + private static final Component TITLE = Component.translatable("gui.nochatreports.encryption_warning.header").withStyle(ChatFormatting.BOLD); + private static final Component CONTENT = Component.translatable("gui.nochatreports.encryption_warning.contents"); + private static final Component CHECK = Component.translatable("gui.nochatreports.encryption_warning.check"); + private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT); + + private final Screen previous; + + public EncryptionWarningScreen(Screen previous) { + super(TITLE, CONTENT, null, NARRATION); + this.previous = previous; + } + + @Override + protected void initButtons(int i) { + this.addRenderableWidget(new Button(this.width / 2 - 155, 100 + i, 150, 20, CommonComponents.GUI_PROCEED, button -> { + this.minecraft.setScreen(new EncryptionConfigScreen(this.previous)); + })); + this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> { + this.minecraft.setScreen(this.previous); + })); + } + +} 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 38816d9..8ded5ab 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -13,6 +13,7 @@ import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.config.NCRConfigClient; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.gui.EncryptionWarningScreen; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferUploader; @@ -93,7 +94,7 @@ public abstract class MixinChatScreen extends Screen { if (i == 1 && this.clicked(x, y)) { this.playDownSound(Minecraft.getInstance().getSoundManager()); - // TODO Open GUI + Minecraft.getInstance().setScreen(new EncryptionWarningScreen(MixinChatScreen.this)); return true; } -- cgit v1.2.3