From 45e1e1a1399163b0ef38fc66c5abdb4238c4ca4b Mon Sep 17 00:00:00 2001
From: isXander <xander@isxander.dev>
Date: Thu, 3 Aug 2023 00:10:21 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Make=20invalid=20name=20ch?=
 =?UTF-8?q?eck=20more=20intuitive.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/SubmitUnknownControllerScreen.java | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java b/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java
index d8912ba..a79c855 100644
--- a/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java
+++ b/src/main/java/dev/isxander/controlify/gui/screen/SubmitUnknownControllerScreen.java
@@ -32,7 +32,7 @@ public class SubmitUnknownControllerScreen extends Screen {
 
     private final Screen lastScreen;
 
-    private int invalidNameTicks;
+    private boolean invalidName;
 
     private Button submitButton;
     private EditBox nameField;
@@ -111,6 +111,11 @@ public class SubmitUnknownControllerScreen extends Screen {
         );
         this.nameField.setHint(Component.translatable("controlify.controller_submission.name_hint"));
         this.nameField.setValue(controller.name());
+        this.nameField.setFilter(s -> {
+            invalidName = !checkValidName(s);
+            submitButton.active = !invalidName;
+            return true;
+        });
     }
 
     @Override
@@ -119,27 +124,12 @@ public class SubmitUnknownControllerScreen extends Screen {
 
         super.render(graphics, mouseX, mouseY, delta);
 
-        if (invalidNameTicks > 0) {
+        if (invalidName) {
             graphics.drawCenteredString(font, Component.translatable("controlify.controller_submission.invalid_name").withStyle(ChatFormatting.RED), this.width / 2, nameField.getRectangle().bottom() + 4, -1);
         }
     }
 
-    @Override
-    public void tick() {
-        if (invalidNameTicks > 0) {
-            invalidNameTicks--;
-            submitButton.active = invalidNameTicks < 50;
-        }
-    }
-
     protected void onSubmitButton(Button button) {
-        invalidNameTicks = 0;
-
-        if (!checkValidName()) {
-            invalidNameTicks = 100;
-            return;
-        }
-
         if (submit()) {
             dontShowAgain();
             onClose();
@@ -188,9 +178,8 @@ public class SubmitUnknownControllerScreen extends Screen {
         return gson.toJson(object);
     }
 
-    private boolean checkValidName() {
-        String name = nameField.getValue().trim();
-        return NAME_PATTERN.matcher(name).matches();
+    private boolean checkValidName(String name) {
+        return NAME_PATTERN.matcher(name.trim()).matches();
     }
 
     private void dontShowAgain() {