From 000e0e5d5c07fea3ec8671548e3e18a04071e7a1 Mon Sep 17 00:00:00 2001
From: Nekojimi <Jim@nekojimi.moe>
Date: Thu, 11 Aug 2022 12:38:27 +0100
Subject: [PATCH] Fix reading of API token.

---
 nbactions.xml                                         | 6 +++---
 src/main/java/moe/nekojimi/chords/CommandOptions.java | 2 +-
 src/main/java/moe/nekojimi/chords/Main.java           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nbactions.xml b/nbactions.xml
index 3517b23..93ac04d 100644
--- a/nbactions.xml
+++ b/nbactions.xml
@@ -10,7 +10,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
             </goals>
             <properties>
-                <exec.args>-classpath %classpath moe.nekojimi.chords.Main ODkwNjU5MjI2NDE2OTg0MDY0.YUzBCw.jHZWpIZSYeaYA7Sc7h93W_jV-rk</exec.args>
+                <exec.args>-classpath %classpath moe.nekojimi.chords.Main -token ODkwNjU5MjI2NDE2OTg0MDY0.YUzBCw.jHZWpIZSYeaYA7Sc7h93W_jV-rk</exec.args>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>
@@ -24,7 +24,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
             </goals>
             <properties>
-                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath moe.nekojimi.chords.Main ODkwNjU5MjI2NDE2OTg0MDY0.YUzBCw.jHZWpIZSYeaYA7Sc7h93W_jV-rk</exec.args>
+                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath moe.nekojimi.chords.Main -token ODkwNjU5MjI2NDE2OTg0MDY0.YUzBCw.jHZWpIZSYeaYA7Sc7h93W_jV-rk</exec.args>
                 <exec.executable>java</exec.executable>
                 <jpda.listen>true</jpda.listen>
             </properties>
@@ -39,7 +39,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
             </goals>
             <properties>
-                <exec.args>-classpath %classpath ${packageClassName} ODkwNjU5MjI2NDE2OTg0MDY0.YUzBCw.jHZWpIZSYeaYA7Sc7h93W_jV-rk</exec.args>
+                <exec.args>-classpath %classpath moe.nekojimi.chords.Main -token ODkwNjU5MjI2NDE2OTg0MDY0.YUzBCw.jHZWpIZSYeaYA7Sc7h93W_jV-rk</exec.args>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>
diff --git a/src/main/java/moe/nekojimi/chords/CommandOptions.java b/src/main/java/moe/nekojimi/chords/CommandOptions.java
index 27c1848..232a7b6 100644
--- a/src/main/java/moe/nekojimi/chords/CommandOptions.java
+++ b/src/main/java/moe/nekojimi/chords/CommandOptions.java
@@ -25,7 +25,7 @@ import com.beust.jcommander.Parameter;
 public class CommandOptions
 {
 
-    @Parameter(description = "The API token for Discord.", required = true)
+    @Parameter(names = "-token", description = "The API token for Discord.", required = true)
     private String token;
 
     @Parameter(names = "-local-addr", description = "The local address to bind to.")
diff --git a/src/main/java/moe/nekojimi/chords/Main.java b/src/main/java/moe/nekojimi/chords/Main.java
index 5bc3107..3ccdc9e 100644
--- a/src/main/java/moe/nekojimi/chords/Main.java
+++ b/src/main/java/moe/nekojimi/chords/Main.java
@@ -88,7 +88,7 @@ public final class Main extends ListenerAdapter
                 GatewayIntent.GUILD_MEMBERS
         );
 
-        JDABuilder builder = JDABuilder.createDefault(args[0], intents);
+        JDABuilder builder = JDABuilder.createDefault(options.getToken(), intents);
 
         // Disable parts of the cache
         builder.disableCache(CacheFlag.MEMBER_OVERRIDES);