2 files changed, 26 insertions, 7 deletions
diff --git a/src/main/kotlin/com/dulkirfabric/features/AliasImpl.kt b/src/main/kotlin/com/dulkirfabric/features/AliasImpl.kt
new file mode 100644
index 0000000..2e552e7
--- /dev/null
+++ b/src/main/kotlin/com/dulkirfabric/features/AliasImpl.kt
@@ -0,0 +1,16 @@
+package com.dulkirfabric.features
+
+import com.dulkirfabric.config.DulkirConfig
+import com.dulkirfabric.events.chat.ModifyCommandEvent
+import meteordevelopment.orbit.EventHandler
+
+object AliasImpl {
+    @EventHandler
+    fun onCommand(event: ModifyCommandEvent) {
+        DulkirConfig.configOptions.aliasList.forEach {
+            if (it.alias == event.command) {
+                event.command = it.command
+            }
+        }
+    }
+}
+\ No newline at end of file
diff --git a/src/main/kotlin/com/dulkirfabric/features/KeyShortCutImpl.kt b/src/main/kotlin/com/dulkirfabric/features/KeyShortCutImpl.kt
index fdca658..8e2112a 100644
--- a/src/main/kotlin/com/dulkirfabric/features/KeyShortCutImpl.kt
+++ b/src/main/kotlin/com/dulkirfabric/features/KeyShortCutImpl.kt
@@ -1,5 +1,6 @@
 package com.dulkirfabric.features
 
+import com.dulkirfabric.commands.DynamicKeyCommand
 import com.dulkirfabric.config.DulkirConfig
 import com.dulkirfabric.events.WorldKeyPressEvent
 import com.dulkirfabric.util.TextUtils
@@ -20,14 +21,16 @@ object KeyShortCutImpl {
                 lastCommandHandle = System.currentTimeMillis()
                 prevCode = event.key
 
-                // This conditional allows for these shortcuts to work for commands or normal messages
-                // You have to do it this way because the messages are handled differently on the client
-                // side in modern versions of Minecraft.
-                if (it.command.startsWith("/"))
-                    TextUtils.sendCommand(it.command.substring(1))
-                else
-                    TextUtils.sendMessage(it.command)
+                TextUtils.sendCommand(it.command.trimStart('/'))
             }
         }
+
+        if (DulkirConfig.configOptions.dynamicKey.code == event.key) {
+            if (event.key == prevCode && System.currentTimeMillis() - lastCommandHandle < 1000)
+                return
+            lastCommandHandle = System.currentTimeMillis()
+            prevCode = event.key
+            TextUtils.sendCommand(DynamicKeyCommand.command.trimStart('/'))
+        }
     }
 }
 \ No newline at end of file