2.12!

Utility-Client · Jan 6, 2022 · 226928f · 226928f
1 parent 79587f8
commit 226928f
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 20 deletions.
diff --git a/src/main/java/org/utilityclient/UtilityClient.java b/src/main/java/org/utilityclient/UtilityClient.java
@@ -25,7 +25,7 @@ public class UtilityClient extends Thread {
     public static final CPSThread CPS_THREAD_INSTANCE = new CPSThread();
     public static final DiscordRP DISCORD_INSTANCE = new DiscordRP();
     private static final String CLIENT_NAME = "Utility Client";
-    private static final String CLIENT_VERSION = "2.12-DEV";
+    private static final String CLIENT_VERSION = "2.12";
     private static final UtilityClient CLIENT_INSTANCE = new UtilityClient();
     public static float fovModifier = 1.0f;
     public static ArrayList<KeyBinding> keyBinds = new ArrayList<>();

diff --git a/src/main/java/org/utilityclient/config/Config.java b/src/main/java/org/utilityclient/config/Config.java
@@ -46,35 +46,35 @@ public static HashMap<String, String> getConfig() {
     }
 
     public static int getInteger(String key, int defaultValue) {
-        return Integer.parseInt(getConfig().getOrDefault(key, String.valueOf(defaultValue)));
+        return Integer.parseInt(getOrSetDefault(key, String.valueOf(defaultValue)));
     }
 
     public static int getInteger(ConfigEntry key) {
-        return Integer.parseInt(getConfig().getOrDefault(key.getKey(), String.valueOf(key.getDefaultValue())));
+        return Integer.parseInt(getOrSetDefault(key.getKey(), String.valueOf(key.getDefaultValue())));
     }
 
     public static String getString(String key, String defaultValue) {
-        return getConfig().getOrDefault(key, defaultValue);
+        return getOrSetDefault(key, defaultValue);
     }
 
     public static String getString(ConfigEntry key) {
-        return getConfig().getOrDefault(key.getKey(), key.getDefaultValue());
+        return getOrSetDefault(key.getKey(), key.getDefaultValue());
     }
 
     public static float getFloat(String key, float defaultValue) {
-        return Float.parseFloat(getConfig().getOrDefault(key, String.valueOf(defaultValue)));
+        return Float.parseFloat(getOrSetDefault(key, String.valueOf(defaultValue)));
     }
 
     public static float getFloat(ConfigEntry key, float defaultValue) {
-        return Float.parseFloat(getConfig().getOrDefault(key.getKey(), String.valueOf(defaultValue)));
+        return Float.parseFloat(getOrSetDefault(key.getKey(), String.valueOf(defaultValue)));
     }
 
     public static boolean getBoolean(String key, boolean defaultValue) {
-        return Boolean.parseBoolean(getConfig().getOrDefault(key, String.valueOf(defaultValue)));
+        return Boolean.parseBoolean(getOrSetDefault(key, String.valueOf(defaultValue)));
     }
 
     public static boolean getBoolean(ConfigEntry key, boolean defaultValue) {
-        return Boolean.parseBoolean(getConfig().getOrDefault(key.getKey(), String.valueOf(defaultValue)));
+        return Boolean.parseBoolean(getOrSetDefault(key.getKey(), String.valueOf(defaultValue)));
     }
 
     public static void setInteger(String key, int value) {
@@ -108,4 +108,9 @@ public static void setBoolean(String key, boolean value) {
     public static void setBoolean(ConfigEntry key, boolean value) {
         getConfig().put(key.getKey(), String.valueOf(value));
     }
+
+    public static String getOrSetDefault(String key, String defaultValue) {
+        getConfig().putIfAbsent(key, defaultValue);
+        return getConfig().get(key);
+    }
 }
diff --git a/src/main/java/org/utilityclient/gui/GuiCreateMacro.java b/src/main/java/org/utilityclient/gui/GuiCreateMacro.java
@@ -15,6 +15,8 @@ public class GuiCreateMacro extends GuiScreen {
     private String title;
     private GuiTextField nameInput;
     private GuiTextField messageInput;
+    private int currentKeyCode = 0;
+    private boolean listeningForInput;
 
     public GuiCreateMacro(GuiScreen parentScreenIn)
     {
@@ -26,18 +28,20 @@ public void initGui()
         Keyboard.enableRepeatEvents(true);
         title = I18n.format("uc.options.macro.title");
 
-        nameInput = new GuiTextField(1, fontRendererObj, width / 2 - 100, height / 2 - 66, 200, 20);
+        nameInput = new GuiTextField(1, fontRendererObj, width / 2 - 100, height / 2 - 66 +1, 124, 18);
         nameInput.setMaxStringLength(255);
         nameInput.setFocused(true);
         nameInput.setText(I18n.format("uc.options.macro.default.name"));
 
-        messageInput = new GuiTextField(2, fontRendererObj, width / 2 - 100, height / 2 - 22, 200, 20);
+        messageInput = new GuiTextField(2, fontRendererObj, width / 2 - 100, height / 2 - 22 +1, 200, 18);
         messageInput.setMaxStringLength(100);
         messageInput.setFocused(false);
         messageInput.setText(I18n.format("uc.options.macro.default.message"));
 
-        this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 2 + 22, 100, 20, I18n.format("uc.options.macro.cancel")));
-        this.buttonList.add(new GuiButton(201, this.width / 2, this.height / 2 + 22, 100, 20, I18n.format("uc.options.macro.save")));
+        buttonList.add(new GuiButton(200, width / 2 - 100, this.height / 2 + 22, 100, 20, I18n.format("uc.options.macro.cancel")));
+        buttonList.add(new GuiButton(201, width / 2, this.height / 2 + 22, 100, 20, I18n.format("uc.options.macro.save"), false));
+        buttonList.add(new GuiButton(202, width / 2 + 25, height / 2 - 66, 75, 20, "None"));
+
     }
 
     public void drawScreen(int mouseX, int mouseY, float partialTicks)
@@ -64,12 +68,23 @@ protected void actionPerformed(GuiButton button)
         if (button.id == 200) this.mc.displayGuiScreen(this.parentScreen);
 
         if (button.id == 201) {
-            try {
-                MacroManager.save(nameInput.getText(), new Macro(nameInput.getText(), messageInput.getText(), 0));
-            } catch (IOException e) {
-                e.printStackTrace();
+            if (currentKeyCode != 0) {
+                buttonList.get(1).enabled = true;
+                try {
+                    MacroManager.save(nameInput.getText(), new Macro(nameInput.getText(), messageInput.getText(), currentKeyCode));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                this.mc.displayGuiScreen(this.parentScreen);
+            }else {
+                buttonList.get(1).enabled = false;
             }
-            this.mc.displayGuiScreen(this.parentScreen);
+        }
+
+        if(button.id == 202) {
+            listeningForInput = !listeningForInput;
+            if (listeningForInput) button.displayString = "Press a key...";
+            else button.displayString = Keyboard.getKeyName(currentKeyCode);
         }
     }
 
@@ -82,7 +97,19 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOEx
 
     protected void keyTyped(char typedChar, int keyCode) throws IOException
     {
-        nameInput.textboxKeyTyped(typedChar, keyCode);
-        messageInput.textboxKeyTyped(typedChar, keyCode);
+        if(listeningForInput) {
+            onInput(buttonList.get(2), keyCode);
+        }else {
+            nameInput.textboxKeyTyped(typedChar, keyCode);
+            messageInput.textboxKeyTyped(typedChar, keyCode);
+        }
+
+    }
+
+    public void onInput(GuiButton btn, int keyCode) {
+        if (keyCode != 1) currentKeyCode = keyCode;
+        listeningForInput = false;
+        btn.displayString = Keyboard.getKeyName(currentKeyCode);
+
     }
 }