diff --git a/.gradle/5.2.1/executionHistory/executionHistory.bin b/.gradle/5.2.1/executionHistory/executionHistory.bin index d504493..d94eb5c 100644 Binary files a/.gradle/5.2.1/executionHistory/executionHistory.bin and b/.gradle/5.2.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/5.2.1/executionHistory/executionHistory.lock b/.gradle/5.2.1/executionHistory/executionHistory.lock index 59a0578..743ae0c 100644 Binary files a/.gradle/5.2.1/executionHistory/executionHistory.lock and b/.gradle/5.2.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/5.2.1/fileHashes/fileHashes.bin b/.gradle/5.2.1/fileHashes/fileHashes.bin index bb7354d..90a2ab7 100644 Binary files a/.gradle/5.2.1/fileHashes/fileHashes.bin and b/.gradle/5.2.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/5.2.1/fileHashes/fileHashes.lock b/.gradle/5.2.1/fileHashes/fileHashes.lock index bbd3d54..7b4fc23 100644 Binary files a/.gradle/5.2.1/fileHashes/fileHashes.lock and b/.gradle/5.2.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index fe5ef48..18cb55a 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 37c30f7..de696c3 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/build.gradle b/build.gradle index 518efdd..40b8d12 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'kotlin' apply plugin: 'application' group 'me.notsmatch.teambot' -version '1.0.1-SNAPSHOT' +version '1.0.2-SNAPSHOT' mainClassName = "me.notsmatch.teambot.Main" repositories { diff --git a/build/classes/kotlin/main/me/notsmatch/teambot/command/ChooseCommand.class b/build/classes/kotlin/main/me/notsmatch/teambot/command/ChooseCommand.class new file mode 100644 index 0000000..d014c05 Binary files /dev/null and b/build/classes/kotlin/main/me/notsmatch/teambot/command/ChooseCommand.class differ diff --git a/build/classes/kotlin/main/me/notsmatch/teambot/command/TeamCommand.class b/build/classes/kotlin/main/me/notsmatch/teambot/command/TeamCommand.class index ab67cf9..d3a5c48 100644 Binary files a/build/classes/kotlin/main/me/notsmatch/teambot/command/TeamCommand.class and b/build/classes/kotlin/main/me/notsmatch/teambot/command/TeamCommand.class differ diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin index 9fbacff..ea46b9f 100644 Binary files a/build/kotlin/compileKotlin/build-history.bin and b/build/kotlin/compileKotlin/build-history.bin differ diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab index 7aee8cc..5c7210c 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab and b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at index c30ece8..3e6e8b3 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab index 6dad8e8..5fa42be 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at index e8afbb8..2960e49 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab index a87c054..edb897b 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at index ce90017..e1be6d8 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab index ba2bf7a..5242630 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at index 06df33c..7ea4810 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab index 659f31c..404da65 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at index 7a28704..ab8751f 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab index 5f7e46b..b01bd60 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at index fe1d307..a0df751 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab index 6b0307a..a751af2 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at index e6d53da..ca9107d 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab index b9ddd67..badbd3a 100644 --- a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab +++ b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab @@ -1,2 +1,2 @@ -18 -10 \ No newline at end of file +31 +23 \ No newline at end of file diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab index a77a8e6..dc48560 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab and b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at index 5b7bdc3..ca46eca 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab index 9ac9bf9..ac5662a 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream index 99cb6e9..31a0c7e 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len index c54fd0d..b01f22d 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len index 09407ef..3085af4 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at index a1ac45f..9a02e3d 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i index 504f86b..aa13d7e 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i and b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab index 7291131..b267fb1 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream index 81f7c01..4a6f358 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len index d54e764..eab40ef 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len index b9a4e65..af69040 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values new file mode 100644 index 0000000..6049504 Binary files /dev/null and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at index 495ac34..3883578 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at differ diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s new file mode 100644 index 0000000..3533ddd --- /dev/null +++ b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s @@ -0,0 +1 @@ +êCú.ñ*Ø!òà \ No newline at end of file diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i index 8a24876..627f3ea 100644 Binary files a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i and b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i differ diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin index af5f1cc..d031b49 100644 Binary files a/build/kotlin/compileKotlin/last-build.bin and b/build/kotlin/compileKotlin/last-build.bin differ diff --git a/build/kotlin/compileTestKotlin/build-history.bin b/build/kotlin/compileTestKotlin/build-history.bin new file mode 100644 index 0000000..cbcc64d Binary files /dev/null and b/build/kotlin/compileTestKotlin/build-history.bin differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab new file mode 100644 index 0000000..2aa2d0b Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream new file mode 100644 index 0000000..3946f89 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len new file mode 100644 index 0000000..851b0a9 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.len new file mode 100644 index 0000000..2a17e6e Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at new file mode 100644 index 0000000..a1a0750 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i new file mode 100644 index 0000000..d628718 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab new file mode 100644 index 0000000..073b663 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream new file mode 100644 index 0000000..86d2f20 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len new file mode 100644 index 0000000..62f3e6f Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len new file mode 100644 index 0000000..2a17e6e Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at new file mode 100644 index 0000000..da1c7a1 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i new file mode 100644 index 0000000..24e7fd3 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab new file mode 100644 index 0000000..d7a4810 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream new file mode 100644 index 0000000..86d2f20 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len new file mode 100644 index 0000000..62f3e6f Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len new file mode 100644 index 0000000..2a17e6e Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at new file mode 100644 index 0000000..da1c7a1 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i new file mode 100644 index 0000000..24e7fd3 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab new file mode 100644 index 0000000..0cebedb Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream new file mode 100644 index 0000000..9a8ae4a Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len new file mode 100644 index 0000000..c2e8349 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.len new file mode 100644 index 0000000..01bdaa1 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at new file mode 100644 index 0000000..ee24b23 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i new file mode 100644 index 0000000..d8c8050 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab new file mode 100644 index 0000000..92dfc84 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream new file mode 100644 index 0000000..3946f89 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len new file mode 100644 index 0000000..851b0a9 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len new file mode 100644 index 0000000..2a17e6e Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at new file mode 100644 index 0000000..250894b Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i new file mode 100644 index 0000000..d628718 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/counters.tab new file mode 100644 index 0000000..c9be1cd --- /dev/null +++ b/build/kotlin/compileTestKotlin/caches-jvm/lookups/counters.tab @@ -0,0 +1,2 @@ +17 +16 \ No newline at end of file diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab new file mode 100644 index 0000000..32db231 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream new file mode 100644 index 0000000..3946f89 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len new file mode 100644 index 0000000..851b0a9 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.len new file mode 100644 index 0000000..2a17e6e Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.values.at new file mode 100644 index 0000000..2adfebf Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i new file mode 100644 index 0000000..460b6df Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/file-to-id.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab new file mode 100644 index 0000000..21dd028 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream new file mode 100644 index 0000000..0043dfe Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len new file mode 100644 index 0000000..8f2199b Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.len new file mode 100644 index 0000000..385642d Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.values.at new file mode 100644 index 0000000..da1c7a1 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i new file mode 100644 index 0000000..dc7ae39 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/id-to-file.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab new file mode 100644 index 0000000..b9890c7 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream new file mode 100644 index 0000000..5d7ff17 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len new file mode 100644 index 0000000..36fdcc3 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len new file mode 100644 index 0000000..ddb9816 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at new file mode 100644 index 0000000..f95588e Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i new file mode 100644 index 0000000..e3a6996 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i differ diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i.len new file mode 100644 index 0000000..131e265 Binary files /dev/null and b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i.len differ diff --git a/build/kotlin/compileTestKotlin/last-build.bin b/build/kotlin/compileTestKotlin/last-build.bin new file mode 100644 index 0000000..fd7ae7a Binary files /dev/null and b/build/kotlin/compileTestKotlin/last-build.bin differ diff --git a/build/libs/mk8dx-teambot-1.0.2-SNAPSHOT.jar b/build/libs/mk8dx-teambot-1.0.2-SNAPSHOT.jar new file mode 100644 index 0000000..3106bf0 Binary files /dev/null and b/build/libs/mk8dx-teambot-1.0.2-SNAPSHOT.jar differ diff --git a/build/tmp/fatJar/MANIFEST.MF b/build/tmp/fatJar/MANIFEST.MF index 5a71d6f..c8cedc5 100644 --- a/build/tmp/fatJar/MANIFEST.MF +++ b/build/tmp/fatJar/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Implementation-Title: mk8dx-teambot -Implementation-Version: 1.0.1-SNAPSHOT +Implementation-Version: 1.0.2-SNAPSHOT Main-Class: me.notsmatch.teambot.Main diff --git a/src/main/kotlin/me/notsmatch/teambot/command/TeamCommand.kt b/src/main/kotlin/me/notsmatch/teambot/command/TeamCommand.kt index 35cf894..fb34952 100644 --- a/src/main/kotlin/me/notsmatch/teambot/command/TeamCommand.kt +++ b/src/main/kotlin/me/notsmatch/teambot/command/TeamCommand.kt @@ -8,20 +8,22 @@ import me.notsmatch.teambot.util.TeamUtils import net.dv8tion.jda.api.EmbedBuilder import org.apache.commons.lang3.StringUtils import java.awt.Color +import kotlin.math.ceil +import kotlin.math.round class TeamCommand : Command() { init { this.name = "t" - this.help = "ãƒãƒ¼ãƒ åˆ†ã‘ã‚’ã—ã¾ã™" - this.arguments = "<ãƒãƒ¼ãƒ æ•°> ..." + this.help = "ãƒãƒ¼ãƒ åˆ†ã‘ã‚’ã—ã¾ã™\nãƒãƒ¼ãƒ å½¢å¼\n2: 2v2\n3: 3v3\n4: 4v4\n5: 5v5\n6: 6v6" + this.arguments = "<ãƒãƒ¼ãƒ å½¢å¼> ..." } override fun execute(event: CommandEvent?) { event?.apply { val args = StringUtils.split(args) - var makeTeamSize: Int = 0 + var teamType: Int = 0 if (args.isNotEmpty()) { if(!NumberUtils.isInteger(args[0])){ @@ -32,13 +34,19 @@ class TeamCommand : Command() { null, null ) - setDescription("ãƒãƒ¼ãƒ æ•°ã¯1~6ã§æŒ‡å®šã—ã¦ãã ã•ã„\n``_t <ãƒãƒ¼ãƒ æ•°> ...``") + setDescription("ãƒãƒ¼ãƒ å½¢å¼ã¯2~6ã§æŒ‡å®šã—ã¦ãã ã•ã„\n``_t <ãƒãƒ¼ãƒ å½¢å¼> ...``\n" + + "ãƒãƒ¼ãƒ å½¢å¼\n" + + "2: 2v2\n" + + "3: 3v3\n" + + "4: 4v4\n" + + "5: 5v5\n" + + "6: 6v6") }.build()) } - makeTeamSize = args[0].toInt() + teamType = args[0].toInt() - if(makeTeamSize > 6 || makeTeamSize < 1){ + if(teamType > 6 || teamType < 2){ return reply(EmbedBuilder().apply { setColor(Color.RED) setAuthor( @@ -46,7 +54,13 @@ class TeamCommand : Command() { null, null ) - setDescription("ãƒãƒ¼ãƒ æ•°ã¯1~6ã§æŒ‡å®šã—ã¦ãã ã•ã„\n``_t <ãƒãƒ¼ãƒ æ•°> ...``") + setDescription("ãƒãƒ¼ãƒ å½¢å¼ã¯2~6ã§æŒ‡å®šã—ã¦ãã ã•ã„\n``_t <ãƒãƒ¼ãƒ å½¢å¼> ...``\n" + + "ãƒãƒ¼ãƒ å½¢å¼\n" + + "2: 2v2\n" + + "3: 3v3\n" + + "4: 4v4\n" + + "5: 5v5\n" + + "6: 6v6") }.build()) } } @@ -73,20 +87,23 @@ class TeamCommand : Command() { }.build()) } - // æ ¼ç´ç”¨ + + val makeTeamSize = (players.size + teamType - 1 ) / teamType + val teams = TeamUtils.compose(players, makeTeamSize) //çµæžœå‡ºåŠ› reply(EmbedBuilder().apply { setColor(Color.YELLOW) setAuthor( - "ãƒãƒ¼ãƒ åˆ†ã‘çµæžœ", + "ãƒãƒ¼ãƒ åˆ†ã‘çµæžœ" + "(" + teamType + "v" + teamType + ")", null, null ) - for(i in teams.indices){ - val team = teams[i] - addField(AlphabetUtils.getAlphabet(i).toUpperCase() + " (" + team.size + ")", team.toString().replace("[", "").replace("]", ""), true); + var i = 0 + teams.filter { team -> team.isNotEmpty() }.forEach{ team -> + addField(AlphabetUtils.getAlphabet(i).toUpperCase() + " (" + team.size + ")", team.toString().replace("[", "").replace("]", ""), true) + i++ } }.build()) }