diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..06803dd --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..1c24f9a --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml new file mode 100644 index 0000000..49b4ec7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_5.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_5.xml new file mode 100644 index 0000000..1c8e0ca --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml new file mode 100644 index 0000000..75e6312 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_7.xml new file mode 100644 index 0000000..d8729f4 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_8_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_soundlibs_jlayer_1_0_1_2.xml b/.idea/libraries/Maven__com_googlecode_soundlibs_jlayer_1_0_1_2.xml new file mode 100644 index 0000000..9a6f268 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_soundlibs_jlayer_1_0_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_soundlibs_mp3spi_1_9_5_2.xml b/.idea/libraries/Maven__com_googlecode_soundlibs_mp3spi_1_9_5_2.xml new file mode 100644 index 0000000..1bb6527 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_soundlibs_mp3spi_1_9_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_soundlibs_tritonus_share_0_3_7_3.xml b/.idea/libraries/Maven__com_googlecode_soundlibs_tritonus_share_0_3_7_3.xml new file mode 100644 index 0000000..1ce935e --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_soundlibs_tritonus_share_0_3_7_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_koloboke_koloboke_api_jdk8_1_0_0.xml b/.idea/libraries/Maven__com_koloboke_koloboke_api_jdk8_1_0_0.xml new file mode 100644 index 0000000..6fb49c7 --- /dev/null +++ b/.idea/libraries/Maven__com_koloboke_koloboke_api_jdk8_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_koloboke_koloboke_impl_common_jdk8_1_0_0.xml b/.idea/libraries/Maven__com_koloboke_koloboke_impl_common_jdk8_1_0_0.xml new file mode 100644 index 0000000..e169279 --- /dev/null +++ b/.idea/libraries/Maven__com_koloboke_koloboke_impl_common_jdk8_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sedmelluq_lavaplayer_1_2_39.xml b/.idea/libraries/Maven__com_sedmelluq_lavaplayer_1_2_39.xml new file mode 100644 index 0000000..7eaf0e3 --- /dev/null +++ b/.idea/libraries/Maven__com_sedmelluq_lavaplayer_1_2_39.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sedmelluq_lavaplayer_common_1_0_5.xml b/.idea/libraries/Maven__com_sedmelluq_lavaplayer_common_1_0_5.xml new file mode 100644 index 0000000..358deb6 --- /dev/null +++ b/.idea/libraries/Maven__com_sedmelluq_lavaplayer_common_1_0_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vdurmont_emoji_java_3_2_0.xml b/.idea/libraries/Maven__com_vdurmont_emoji_java_3_2_0.xml new file mode 100644 index 0000000..c4d9dba --- /dev/null +++ b/.idea/libraries/Maven__com_vdurmont_emoji_java_3_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml new file mode 100644 index 0000000..67c2ad2 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml new file mode 100644 index 0000000..eab40b3 --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jflac_jflac_1_3.xml b/.idea/libraries/Maven__jflac_jflac_1_3.xml new file mode 100644 index 0000000..79eb9ce --- /dev/null +++ b/.idea/libraries/Maven__jflac_jflac_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_3_8_2.xml b/.idea/libraries/Maven__junit_junit_3_8_2.xml new file mode 100644 index 0000000..f9abdfd --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_3_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_iharder_base64_2_3_9.xml b/.idea/libraries/Maven__net_iharder_base64_2_3_9.xml new file mode 100644 index 0000000..919652e --- /dev/null +++ b/.idea/libraries/Maven__net_iharder_base64_2_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_4_3_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_4_3_0.xml new file mode 100644 index 0000000..71b9d41 --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_4_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_jodah_typetools_0_4_8.xml b/.idea/libraries/Maven__net_jodah_typetools_0_4_8.xml new file mode 100644 index 0000000..e8832ba --- /dev/null +++ b/.idea/libraries/Maven__net_jodah_typetools_0_4_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml new file mode 100644 index 0000000..666266c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml new file mode 100644 index 0000000..c82bb7c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml new file mode 100644 index 0000000..a9f6e19 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_3.xml new file mode 100644 index 0000000..cbec018 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_3_v20170317.xml new file mode 100644 index 0000000..3a6f2d9 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_3_v20170317.xml new file mode 100644 index 0000000..e015d49 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_3_v20170317.xml new file mode 100644 index 0000000..25f2e9c --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_3_v20170317.xml new file mode 100644 index 0000000..1e62b5a --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_3_v20170317.xml new file mode 100644 index 0000000..34023bd --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_3_v20170317.xml new file mode 100644 index 0000000..211fba8 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_3_v20170317.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_3_v20170317.xml new file mode 100644 index 0000000..d0fa741 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_3_v20170317.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jcraft_jorbis_0_0_17.xml b/.idea/libraries/Maven__org_jcraft_jorbis_0_0_17.xml new file mode 100644 index 0000000..1c0f9b3 --- /dev/null +++ b/.idea/libraries/Maven__org_jcraft_jorbis_0_0_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20140107.xml b/.idea/libraries/Maven__org_json_json_20140107.xml new file mode 100644 index 0000000..0092a09 --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20140107.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jsoup_jsoup_1_10_1.xml b/.idea/libraries/Maven__org_jsoup_jsoup_1_10_1.xml new file mode 100644 index 0000000..79084d1 --- /dev/null +++ b/.idea/libraries/Maven__org_jsoup_jsoup_1_10_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_24.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_24.xml new file mode 100644 index 0000000..45ba817 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_24.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_tritonus_tritonus_dsp_0_3_6.xml b/.idea/libraries/Maven__org_tritonus_tritonus_dsp_0_3_6.xml new file mode 100644 index 0000000..0164fd0 --- /dev/null +++ b/.idea/libraries/Maven__org_tritonus_tritonus_dsp_0_3_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..7ca5089 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/handiebot/HandieBot.java b/src/main/java/handiebot/HandieBot.java index d973651..5f6a57f 100644 --- a/src/main/java/handiebot/HandieBot.java +++ b/src/main/java/handiebot/HandieBot.java @@ -93,7 +93,7 @@ public class HandieBot { public static void main(String[] args) throws DiscordException, RateLimitException { - musicPlayer = new MusicPlayer(); + //musicPlayer = new MusicPlayer(); List argsList = Arrays.asList(args); @@ -108,10 +108,10 @@ public class HandieBot { log = new BotLog(window.getOutputArea()); } - log.log(BotLog.TYPE.INFO, resourceBundle.getString("log.loggingIn")); - client = new ClientBuilder().withToken(TOKEN).build(); - client.getDispatcher().registerListener(new HandieBot()); - client.login(); + //log.log(BotLog.TYPE.INFO, resourceBundle.getString("log.loggingIn")); + //client = new ClientBuilder().withToken(TOKEN).build(); + //client.getDispatcher().registerListener(new HandieBot()); + //client.login(); } /** diff --git a/src/main/java/handiebot/command/MouseListener.java b/src/main/java/handiebot/command/MouseListener.java new file mode 100644 index 0000000..377f52a --- /dev/null +++ b/src/main/java/handiebot/command/MouseListener.java @@ -0,0 +1,8 @@ +package handiebot.command; + +/** + * Author: Zino + * Date: 7/13/2017. + */ +public class MouseListener { +} diff --git a/src/main/java/handiebot/view/BotWindow.java b/src/main/java/handiebot/view/BotWindow.java index aa44685..b5ffc92 100644 --- a/src/main/java/handiebot/view/BotWindow.java +++ b/src/main/java/handiebot/view/BotWindow.java @@ -1,13 +1,17 @@ package handiebot.view; import handiebot.HandieBot; +import handiebot.lavaplayer.playlist.Playlist; import javax.imageio.ImageIO; import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; +import java.util.*; import static handiebot.HandieBot.resourceBundle; @@ -30,6 +34,26 @@ public class BotWindow extends JFrame { scrollPane.setViewportView(outputArea); scrollPane.setAutoscrolls(true); getContentPane().add(scrollPane, BorderLayout.CENTER); + + //Playlist shower + java.util.List playlists = Playlist.getAvailablePlaylists(); + String labels[] = new String[playlists.size()]; + int i=0; + for (String playlist : playlists) { + labels[i] = playlist; + i++; + } + JList list = new JList<>(labels); + /*list.addListSelectionListener(new ListSelectionListener() { + @Override + public void valueChanged(ListSelectionEvent e) { + + } + });*/ + JScrollPane jScrollPane = new JScrollPane(list); + jScrollPane.setPreferredSize(new Dimension(100, 200)); + getContentPane().add(jScrollPane, BorderLayout.EAST); + //Command field. JTextField commandField = new JTextField(); commandField.setFont(new Font("Courier New", Font.PLAIN, 16)); @@ -61,6 +85,8 @@ public class BotWindow extends JFrame { setVisible(true); } + //private void selected + public JTextPane getOutputArea(){ return this.outputArea; } diff --git a/src/main/java/handiebot/view/CommandLineListener.java b/src/main/java/handiebot/view/CommandLineListener.java index a71b9f3..d671bbf 100644 --- a/src/main/java/handiebot/view/CommandLineListener.java +++ b/src/main/java/handiebot/view/CommandLineListener.java @@ -39,9 +39,11 @@ public class CommandLineListener implements KeyListener { * @param command The first word typed, or the command itself. * @param args The list of arguments for the command. */ - private void executeCommand(String command, String[] args){ - if (command.equals("quit")){ - Commands.executeCommand("quit", null); + private void executeCommand(String command, String[] args) { + switch (command) { + case "quit": + Commands.executeCommand("quit", null); + break; } } } diff --git a/src/main/java/handiebot/view/MenuBar.java b/src/main/java/handiebot/view/MenuBar.java index 5c6ca06..a23ebbc 100644 --- a/src/main/java/handiebot/view/MenuBar.java +++ b/src/main/java/handiebot/view/MenuBar.java @@ -18,6 +18,7 @@ public class MenuBar extends JMenuBar { JMenu fileMenu = new JMenu(resourceBundle.getString("menu.filemenu.title")); fileMenu.add(new ActionItem(resourceBundle.getString("menu.filemenu.quit"), new CommandAction(Commands.get("quit")))); this.add(fileMenu); + } }