rewrite command manager, stop using essential relocate, and reformat code (#34)

* reformat code

* reformat code
rewrite command manager
stop using essential relocate

2 files changed, 18 insertions, 19 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
index 69b1584..ed05760 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
@@ -6,16 +6,15 @@ import cc.polyfrost.oneconfig.gui.elements.BasicElement;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
-import cc.polyfrost.oneconfig.utils.color.ColorUtils;
 
 public class NumberInputField extends TextInputField {
     private final BasicElement upArrow = new BasicElement(12, 14, false);
     private final BasicElement downArrow = new BasicElement(12, 14, false);
+    private final ColorAnimation colorTop = new ColorAnimation(ColorPalette.SECONDARY);
+    private final ColorAnimation colorBottom = new ColorAnimation(ColorPalette.SECONDARY);
     private float min;
     private float max;
     private float step;
-    private final ColorAnimation colorTop = new ColorAnimation(ColorPalette.SECONDARY);
-    private final ColorAnimation colorBottom  = new ColorAnimation(ColorPalette.SECONDARY);
     private float current;
 
     public NumberInputField(int width, int height, float defaultValue, float min, float max, float step) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
index 91a8ff2..b16472d 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
@@ -2,7 +2,6 @@ package cc.polyfrost.oneconfig.gui.elements.text;
 
 import cc.polyfrost.oneconfig.config.OneConfigConfig;
 import cc.polyfrost.oneconfig.gui.elements.BasicElement;
-import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
@@ -11,6 +10,7 @@ import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.MathUtils;
 import cc.polyfrost.oneconfig.utils.TextUtils;
+import gg.essential.universal.UKeyboard;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -23,24 +23,24 @@ import java.util.ArrayList;
 public class TextInputField extends BasicElement {
 
     protected final String defaultText;
-    protected String input, selectedText;
     protected final boolean multiLine;
+    protected String input, selectedText;
     protected boolean password;
 
     protected int caretPos;
     protected int x, y;
     protected float start, end;
     protected int startLine, endLine;
-    private long clickTimeD1;
     protected long vg;
     protected int prevCaret = 0;
     protected boolean isDoubleClick = false;
     protected boolean onlyNums = false;
     protected boolean errored = false;
     protected boolean centered = false;
-    private int lines = 1;
     protected SVGs icon;
     protected ArrayList<String> wrappedText = null;
+    private long clickTimeD1;
+    private int lines = 1;
 
     public TextInputField(int width, int height, String defaultText, boolean multiLine, boolean password, SVGs icon) {
         super(width, height, false);
@@ -60,28 +60,28 @@ public class TextInputField extends BasicElement {
         this.centered = centered;
     }
 
-    public void onlyAcceptNumbers(boolean state) {
-        onlyNums = state;
+    public static boolean isAllowedCharacter(char character) {
+        return character != 167 && character >= ' ' && character != 127;
     }
 
-    public void setInput(String input) {
-        this.input = input;
+    public void onlyAcceptNumbers(boolean state) {
+        onlyNums = state;
     }
 
     public String getInput() {
         return input;
     }
 
-    public void setPassword(boolean password) {
-        this.password = password;
+    public void setInput(String input) {
+        this.input = input;
     }
 
     public boolean getPassword() {
         return password;
     }
 
-    public void setErrored(boolean errored) {
-        this.errored = errored;
+    public void setPassword(boolean password) {
+        this.password = password;
     }
 
     public void setCentered(boolean centered) {
@@ -92,6 +92,10 @@ public class TextInputField extends BasicElement {
         return errored;
     }
 
+    public void setErrored(boolean errored) {
+        this.errored = errored;
+    }
+
     @Override
     public void draw(long vg, int x, int y) {
         this.x = x;
@@ -529,10 +533,6 @@ public class TextInputField extends BasicElement {
         return 0;
     }
 
-    public static boolean isAllowedCharacter(char character) {
-        return character != 167 && character >= ' ' && character != 127;
-    }
-
     public int getLines() {
         return lines;
     }