refactoring and added panel upon first startup to enter discord bot token

Author: Dainternetdude

build.gradle

@@ -1,9 +1,10 @@
 plugins {
     id 'java'
+    id 'com.github.johnrengelman.shadow' version '4.0.2'
 }
 
 group 'org.example'
-version '1.0'
+version '1.3'
 
 repositories {
     mavenCentral()
@@ -16,11 +17,19 @@ repositories {
 dependencies {
     //testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     //testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    implementation("net.dv8tion:JDA:4.2.1_276")
+    compile("net.dv8tion:JDA:4.3.0_298")
     compile group: 'commons-net', name: 'commons-net', version: '3.3'
     compile fileTree(include: ['*.jar'], dir: 'libs')
 }
 
 test {
     //useJUnitPlatform()
+}
+
+jar {
+    manifest {
+        attributes(
+                'Main-Class'     : "dain.Start",
+        )
+    }
 }

src/main/java/dain/Bot.java

@@ -1,31 +1,27 @@
 package dain;
 
-import dain.MinecraftChatBridge;
-import dain.Settings;
 import dain.events.DiscordMessageReceiver;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.*;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.TextChannel;
-
 import javax.security.auth.login.LoginException;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class Bot {
 
     private JDA jda;
+    private TokenEntryFrame tokenEntryFrame = null;
 
     public Bot() {
 
         Settings.initialize();
 
-        try {
-            jda = JDABuilder.createDefault(Settings.DISCORD_TOKEN).setActivity(Activity.listening(">help")).build();
-        } catch (LoginException e) {
-            e.printStackTrace();
+        while (jda == null) {
+            jda = loginJDAClient();
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
 
         jda.addEventListener(new DiscordMessageReceiver());
@@ -73,4 +69,15 @@ public void startChatBridge() {
     public JDA getJda() {
         return jda;
     }
+
+    private JDA loginJDAClient() {
+        try {
+            return JDABuilder.createDefault(Settings.DISCORD_TOKEN).setActivity(Activity.listening(Settings.COMMAND_PREFIX + "help")).build();
+        } catch (LoginException e) {
+            if (tokenEntryFrame == null) {
+                tokenEntryFrame = new TokenEntryFrame();
+            }
+            return null;
+        }
+    }
 }

src/main/java/dain/SettingsFrame.java

@@ -1,7 +1,5 @@
 package dain;
 
-import com.apple.laf.AquaButtonBorder;
-
 import javax.swing.*;
 import javax.swing.border.LineBorder;
 import java.awt.*;
@@ -91,7 +89,10 @@ public SettingsFrame() {
         saveButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                if (e.getSource().equals(saveButton)) saveValues();
+                if (e.getSource().equals(saveButton)) {
+                    saveValues();
+                    SettingsFrame.this.dispose();
+                }
             }
         });
         bottomPanel.add(saveButton);

src/main/java/dain/Start.java

@@ -4,6 +4,6 @@ public class Start {
 
     public static void main(String[] args) {
 
-        new Bot();//.startChatBridge();
+        new Bot().startChatBridge();
     }
 }

src/main/java/dain/TokenEntryFrame.java

@@ -0,0 +1,69 @@
+package dain;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class TokenEntryFrame extends JFrame {
+
+
+        public static final int WIDTH_FRAME = 800;
+        public static final int HEIGHT_FRAME = 200;
+
+    public TokenEntryFrame() {
+
+        JLabel onlyLabel = new JLabel("Please enter the token for your Discord bot application:");
+        onlyLabel.setBounds(20, 20, 360, 20);
+        this.add(onlyLabel);
+
+        JTextField onlyTextField = new JTextField("");
+        onlyTextField.setBounds(20, 40, 720, 20);
+        this.add(onlyTextField);
+
+        JButton saveButton = new JButton("Save");
+        saveButton.setBounds(20, 80, 80, 20);
+        this.add(saveButton);
+        saveButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (e.getSource().equals(saveButton)) {
+                    Settings.DISCORD_TOKEN = onlyTextField.getText();
+                    Settings.writeToFile();
+
+                    for (int i = 0; i < 8; i++) { /* we want to wait some time before closing the window
+                                                    because the main window doesn't pop up immediately
+                                                    and the user may become confused */
+                        sleap(250);
+                        TokenEntryFrame.this.setTitle("Please wait."); // give the user feedback in the title bar
+                        sleap(250);
+                        TokenEntryFrame.this.setTitle("Please wait.."); // so that they know their click had an effect
+                        sleap(250);
+                        TokenEntryFrame.this.setTitle("Please wait...");
+                        sleap(250);
+                        TokenEntryFrame.this.setTitle("Please wait");
+                    }
+
+                    TokenEntryFrame.this.dispose();
+                }
+            }
+        });
+
+        this.setLayout(null);
+        this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        //this.setIconImage(logoIcon.getImage());
+        this.setTitle("Discord Bot Token Entry");
+        this.setType(Window.Type.POPUP);
+        this.setLocation(320, 120);
+        this.setSize(WIDTH_FRAME, HEIGHT_FRAME);
+        this.setVisible(true);
+    }
+
+    private void sleap(int ms) {
+        try {
+            Thread.sleep(ms);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}