diff --git a/.gradle/2.13/taskArtifacts/cache.properties.lock b/.gradle/2.13/taskArtifacts/cache.properties.lock index ec7cd3f..abc1fe9 100644 Binary files a/.gradle/2.13/taskArtifacts/cache.properties.lock and b/.gradle/2.13/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.13/taskArtifacts/fileHashes.bin b/.gradle/2.13/taskArtifacts/fileHashes.bin index a102e25..e7b4e59 100644 Binary files a/.gradle/2.13/taskArtifacts/fileHashes.bin and b/.gradle/2.13/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 9e4e20d..2fafa4c 100644 Binary files a/.gradle/2.13/taskArtifacts/fileSnapshots.bin and b/.gradle/2.13/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 3bddf35..ee941cb 100644 Binary files a/.gradle/2.13/taskArtifacts/taskArtifacts.bin and b/.gradle/2.13/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml index fbdb0d6..3bf9c18 100644 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml +++ b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_5.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_5.xml index 73b3015..105e6b8 100644 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_5.xml +++ b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_5.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml index 303ee9d..246d99b 100644 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml +++ b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_sedmelluq_lavaplayer_common_1_0_5.xml b/.idea/libraries/Gradle__com_sedmelluq_lavaplayer_common_1_0_5.xml index 4dd9c7f..2a41d42 100644 --- a/.idea/libraries/Gradle__com_sedmelluq_lavaplayer_common_1_0_5.xml +++ b/.idea/libraries/Gradle__com_sedmelluq_lavaplayer_common_1_0_5.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml index ead3f32..ea493a9 100644 --- a/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml +++ b/.idea/libraries/Gradle__commons_codec_commons_codec_1_9.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Gradle__commons_logging_commons_logging_1_2.xml index 9d03aca..7a70d30 100644 --- a/.idea/libraries/Gradle__commons_logging_commons_logging_1_2.xml +++ b/.idea/libraries/Gradle__commons_logging_commons_logging_1_2.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__mysql_mysql_connector_java_5_1_38.xml b/.idea/libraries/Gradle__mysql_mysql_connector_java_5_1_38.xml index 1bad8c9..b66e8b8 100644 --- a/.idea/libraries/Gradle__mysql_mysql_connector_java_5_1_38.xml +++ b/.idea/libraries/Gradle__mysql_mysql_connector_java_5_1_38.xml @@ -2,8 +2,11 @@ + - + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_iharder_base64_2_3_9.xml b/.idea/libraries/Gradle__net_iharder_base64_2_3_9.xml index 0733a96..0dabef0 100644 --- a/.idea/libraries/Gradle__net_iharder_base64_2_3_9.xml +++ b/.idea/libraries/Gradle__net_iharder_base64_2_3_9.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_java_dev_jna_jna_4_4_0.xml b/.idea/libraries/Gradle__net_java_dev_jna_jna_4_4_0.xml index 8ced7d6..0ced1ae 100644 --- a/.idea/libraries/Gradle__net_java_dev_jna_jna_4_4_0.xml +++ b/.idea/libraries/Gradle__net_java_dev_jna_jna_4_4_0.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml b/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml index 7e69dc8..43ec32e 100644 --- a/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml +++ b/.idea/libraries/Gradle__net_sf_trove4j_trove4j_3_0_3.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_commons_commons_collections4_4_1.xml b/.idea/libraries/Gradle__org_apache_commons_commons_collections4_4_1.xml index 0fdac3b..b4c6feb 100644 --- a/.idea/libraries/Gradle__org_apache_commons_commons_collections4_4_1.xml +++ b/.idea/libraries/Gradle__org_apache_commons_commons_collections4_4_1.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_2.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_2.xml index 3152057..217c1cf 100644 --- a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_2.xml +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_2.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_4.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_4.xml index 8fe3436..8fa2fc3 100644 --- a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_4.xml +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_4.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_json_json_20160810.xml b/.idea/libraries/Gradle__org_json_json_20160810.xml index 976804c..26de386 100644 --- a/.idea/libraries/Gradle__org_json_json_20160810.xml +++ b/.idea/libraries/Gradle__org_json_json_20160810.xml @@ -2,11 +2,8 @@ - - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_1.xml b/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_1.xml index d28c153..e255a75 100644 --- a/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_1.xml +++ b/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_1.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_22.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_22.xml index 0c54512..feeb5bf 100644 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_22.xml +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_22.xml @@ -1,11 +1,9 @@ - + - - - + \ No newline at end of file diff --git a/.idea/modules/Rixa_main.iml b/.idea/modules/Rixa_main.iml index 6626c8d..98fe1a5 100644 --- a/.idea/modules/Rixa_main.iml +++ b/.idea/modules/Rixa_main.iml @@ -14,6 +14,7 @@ + diff --git a/.idea/modules/Rixa_test.iml b/.idea/modules/Rixa_test.iml index 3da79b3..188046f 100644 --- a/.idea/modules/Rixa_test.iml +++ b/.idea/modules/Rixa_test.iml @@ -15,6 +15,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ca60251..be2ecd9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40,62 +77,33 @@ - + - - + + - - + + - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -112,17 +120,6 @@ - musicrole - joinpm - music - greetings - setTitle - "http://rixa.io" - pplay - Staff - sendHelp - The configuration - getMessage( Adding to queue log_channel testin @@ -133,18 +130,34 @@ setString openConn join - "play" "join" leave - disable enable setEna + Track + Track tr + disable + event.getAuthor() + "stop" + shuffle" + messages + message + "Search" + sendHelp(event.getGuild().getId(), rixaGuild.getGuildSettings().getPrefix(), event.getAuthor()); + skip" + skip + reset" + "list" + "play" + MESSAGE_CREATE setTitle(String.format("Help: %s", title)) ; the configuration RixaGuild + author + sendHelp(event.getGuild().getId(), rixaGuild.getGuildSettings().getPrefix(), event.getAuthor(), event.getChannel()); @@ -393,9 +406,9 @@