From 5f1235436bb7b45c865680032685f0a240b04964 Mon Sep 17 00:00:00 2001 From: Alan19 Date: Mon, 24 Dec 2018 12:57:57 -0500 Subject: [PATCH] Delete Maven libraries, move files --- .gitignore | 3 --- ...jackson_core_jackson_annotations_2_9_0.xml | 13 ---------- ...terxml_jackson_core_jackson_core_2_9_6.xml | 13 ---------- ...ml_jackson_core_jackson_databind_2_9_6.xml | 13 ---------- ...le_api_client_google_api_client_1_23_0.xml | 13 ---------- ...e_api_services_sheets_v4_rev539_1_23_0.xml | 13 ---------- ..._com_google_code_findbugs_jsr305_1_3_9.xml | 13 ---------- ...aven__com_google_guava_guava_jdk5_17_0.xml | 13 ---------- ..._http_client_google_http_client_1_23_0.xml | 13 ---------- ...ent_google_http_client_jackson2_1_23_0.xml | 13 ---------- ...auth_client_google_oauth_client_1_23_0.xml | 13 ---------- ...lient_google_oauth_client_java6_1_23_0.xml | 13 ---------- ...lient_google_oauth_client_jetty_1_23_0.xml | 13 ---------- ...eovisionaries_nv_websocket_client_1_31.xml | 13 ---------- ...reup_okhttp3_logging_interceptor_3_9_1.xml | 13 ---------- ...ven__com_squareup_okhttp3_okhttp_3_9_1.xml | 13 ---------- .../Maven__com_squareup_okio_okio_1_13_0.xml | 13 ---------- ...Maven__commons_codec_commons_codec_1_3.xml | 13 ---------- ..._commons_logging_commons_logging_1_1_1.xml | 13 ---------- ...apache_httpcomponents_httpclient_4_0_1.xml | 13 ---------- ...g_apache_httpcomponents_httpcore_4_0_1.xml | 13 ---------- ..._apache_logging_log4j_log4j_api_2_11_0.xml | 13 ---------- ...Maven__org_javacord_javacord_api_3_0_0.xml | 13 ---------- ...aven__org_javacord_javacord_core_3_0_0.xml | 13 ---------- .../Maven__org_mortbay_jetty_jetty_6_1_26.xml | 13 ---------- ...n__org_mortbay_jetty_jetty_util_6_1_26.xml | 13 ---------- ...mortbay_jetty_servlet_api_2_5_20081211.xml | 13 ---------- .idea/modules.xml | 8 ------- .idea/vcs.xml | 1 + build.gradle | 4 ++-- pom.xml | 24 +++++++++---------- .../java/{logic => doom}/DoomHandler.java | 2 +- src/main/java/{logic => doom}/DoomWriter.java | 2 +- src/main/java/logic/CommandHandler.java | 5 ++-- src/main/java/logic/DiceRoller.java | 1 + src/main/java/logic/StatisticsGenerator.java | 1 + .../{logic => statistics}/DiceResult.java | 2 +- .../GenerateNoDiceMessage.java | 2 +- .../GenerateOverloadMessage.java | 2 +- .../GenerateStatistics.java | 11 ++++----- .../ScanDice.java | 2 +- .../StatisticsContext.java | 2 +- .../StatisticsState.java | 2 +- .../resultvisitors/DifficultyVisitor.java | 4 ++-- .../resultvisitors/DoomVisitor.java | 4 ++-- .../resultvisitors/ResultVisitor.java | 4 ++-- .../resultvisitors/SumVisitor.java | 4 ++-- 47 files changed, 41 insertions(+), 387 deletions(-) delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_google_api_client_google_api_client_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_google_apis_google_api_services_sheets_v4_rev539_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_jdk5_17_0.xml delete mode 100644 .idea/libraries/Maven__com_google_http_client_google_http_client_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_google_oauth_client_google_oauth_client_java6_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_google_oauth_client_google_oauth_client_jetty_1_23_0.xml delete mode 100644 .idea/libraries/Maven__com_neovisionaries_nv_websocket_client_1_31.xml delete mode 100644 .idea/libraries/Maven__com_squareup_okhttp3_logging_interceptor_3_9_1.xml delete mode 100644 .idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_1.xml delete mode 100644 .idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_3.xml delete mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_0_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_0_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_0.xml delete mode 100644 .idea/libraries/Maven__org_javacord_javacord_api_3_0_0.xml delete mode 100644 .idea/libraries/Maven__org_javacord_javacord_core_3_0_0.xml delete mode 100644 .idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml delete mode 100644 .idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml delete mode 100644 .idea/libraries/Maven__org_mortbay_jetty_servlet_api_2_5_20081211.xml delete mode 100644 .idea/modules.xml rename src/main/java/{logic => doom}/DoomHandler.java (98%) rename src/main/java/{logic => doom}/DoomWriter.java (99%) rename src/main/java/{logic => statistics}/DiceResult.java (98%) rename src/main/java/{logic/statisticstates => statistics}/GenerateNoDiceMessage.java (92%) rename src/main/java/{logic/statisticstates => statistics}/GenerateOverloadMessage.java (92%) rename src/main/java/{logic/statisticstates => statistics}/GenerateStatistics.java (91%) rename src/main/java/{logic/statisticstates => statistics}/ScanDice.java (98%) rename src/main/java/{logic/statisticstates => statistics}/StatisticsContext.java (95%) rename src/main/java/{logic/statisticstates => statistics}/StatisticsState.java (72%) rename src/main/java/{logic/statisticstates => statistics}/resultvisitors/DifficultyVisitor.java (97%) rename src/main/java/{logic/statisticstates => statistics}/resultvisitors/DoomVisitor.java (93%) rename src/main/java/{logic/statisticstates => statistics}/resultvisitors/ResultVisitor.java (91%) rename src/main/java/{logic/statisticstates => statistics}/resultvisitors/SumVisitor.java (94%) diff --git a/.gitignore b/.gitignore index 4b35aca..92df37c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,7 @@ - -/.gradle/ /.idea/ /build/ /tokens/ /gradlew -/build.gradle /target/ /out/ /settings.gradle diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml deleted file mode 100644 index 06441f4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml deleted file mode 100644 index eebe10d..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml deleted file mode 100644 index 51087da..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_api_client_google_api_client_1_23_0.xml b/.idea/libraries/Maven__com_google_api_client_google_api_client_1_23_0.xml deleted file mode 100644 index 87e6cb0..0000000 --- a/.idea/libraries/Maven__com_google_api_client_google_api_client_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_apis_google_api_services_sheets_v4_rev539_1_23_0.xml b/.idea/libraries/Maven__com_google_apis_google_api_services_sheets_v4_rev539_1_23_0.xml deleted file mode 100644 index 815bc68..0000000 --- a/.idea/libraries/Maven__com_google_apis_google_api_services_sheets_v4_rev539_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml deleted file mode 100644 index 0e66824..0000000 --- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_jdk5_17_0.xml b/.idea/libraries/Maven__com_google_guava_guava_jdk5_17_0.xml deleted file mode 100644 index 02d3dda..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_jdk5_17_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_1_23_0.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_1_23_0.xml deleted file mode 100644 index 32007ba..0000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_23_0.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_23_0.xml deleted file mode 100644 index cf9c8b9..0000000 --- a/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_23_0.xml b/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_23_0.xml deleted file mode 100644 index d872131..0000000 --- a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_java6_1_23_0.xml b/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_java6_1_23_0.xml deleted file mode 100644 index db68bca..0000000 --- a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_java6_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_jetty_1_23_0.xml b/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_jetty_1_23_0.xml deleted file mode 100644 index 01922e2..0000000 --- a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_jetty_1_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_neovisionaries_nv_websocket_client_1_31.xml b/.idea/libraries/Maven__com_neovisionaries_nv_websocket_client_1_31.xml deleted file mode 100644 index 8078e75..0000000 --- a/.idea/libraries/Maven__com_neovisionaries_nv_websocket_client_1_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_logging_interceptor_3_9_1.xml b/.idea/libraries/Maven__com_squareup_okhttp3_logging_interceptor_3_9_1.xml deleted file mode 100644 index 13e6970..0000000 --- a/.idea/libraries/Maven__com_squareup_okhttp3_logging_interceptor_3_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_1.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_1.xml deleted file mode 100644 index ba9cb81..0000000 --- a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml deleted file mode 100644 index cb99e2f..0000000 --- a/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml deleted file mode 100644 index 3688001..0000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml deleted file mode 100644 index b770f56..0000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_0_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_0_1.xml deleted file mode 100644 index a9ca4c6..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_0_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_0_1.xml deleted file mode 100644 index eee5c06..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_0.xml deleted file mode 100644 index c5b5952..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javacord_javacord_api_3_0_0.xml b/.idea/libraries/Maven__org_javacord_javacord_api_3_0_0.xml deleted file mode 100644 index 1232a0c..0000000 --- a/.idea/libraries/Maven__org_javacord_javacord_api_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javacord_javacord_core_3_0_0.xml b/.idea/libraries/Maven__org_javacord_javacord_core_3_0_0.xml deleted file mode 100644 index 6eb2548..0000000 --- a/.idea/libraries/Maven__org_javacord_javacord_core_3_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml b/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml deleted file mode 100644 index 0f5d0b8..0000000 --- a/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml b/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml deleted file mode 100644 index f6ec2b9..0000000 --- a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mortbay_jetty_servlet_api_2_5_20081211.xml b/.idea/libraries/Maven__org_mortbay_jetty_servlet_api_2_5_20081211.xml deleted file mode 100644 index 4863239..0000000 --- a/.idea/libraries/Maven__org_mortbay_jetty_servlet_api_2_5_20081211.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index dd8f5a7..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..8306744 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 284c1f2..c59f57e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,12 @@ plugins { id 'application' } - +apply plugin: 'distribution' apply plugin: 'java' apply plugin: 'maven' group = 'main' -version = '4.0.1' +version = '4.2' description = "A bot for the Facets tabletop RPG" diff --git a/pom.xml b/pom.xml index e7782f3..7e6a224 100644 --- a/pom.xml +++ b/pom.xml @@ -18,19 +18,19 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - - true - discord.TwoDee - - + + + + + + + + + + - - + + org.apache.maven.plugins diff --git a/src/main/java/logic/DoomHandler.java b/src/main/java/doom/DoomHandler.java similarity index 98% rename from src/main/java/logic/DoomHandler.java rename to src/main/java/doom/DoomHandler.java index e9828a6..65a322e 100644 --- a/src/main/java/logic/DoomHandler.java +++ b/src/main/java/doom/DoomHandler.java @@ -1,4 +1,4 @@ -package logic; +package doom; import org.javacord.api.entity.message.embed.EmbedBuilder; diff --git a/src/main/java/logic/DoomWriter.java b/src/main/java/doom/DoomWriter.java similarity index 99% rename from src/main/java/logic/DoomWriter.java rename to src/main/java/doom/DoomWriter.java index 8666fd1..5b7f5fb 100644 --- a/src/main/java/logic/DoomWriter.java +++ b/src/main/java/doom/DoomWriter.java @@ -1,4 +1,4 @@ -package logic; +package doom; import org.javacord.api.entity.message.embed.EmbedBuilder; diff --git a/src/main/java/logic/CommandHandler.java b/src/main/java/logic/CommandHandler.java index 042efd0..5bb195e 100644 --- a/src/main/java/logic/CommandHandler.java +++ b/src/main/java/logic/CommandHandler.java @@ -1,9 +1,10 @@ package logic; import com.google.api.services.sheets.v4.model.ValueRange; -import com.vdurmont.emoji.EmojiParser; import discord.TwoDee; -import logic.statisticstates.StatisticsContext; +import doom.DoomHandler; +import doom.DoomWriter; +import statistics.StatisticsContext; import org.javacord.api.DiscordApi; import org.javacord.api.entity.channel.TextChannel; import org.javacord.api.entity.message.Message; diff --git a/src/main/java/logic/DiceRoller.java b/src/main/java/logic/DiceRoller.java index dd56438..336868f 100644 --- a/src/main/java/logic/DiceRoller.java +++ b/src/main/java/logic/DiceRoller.java @@ -1,6 +1,7 @@ package logic; import discord.TwoDee; +import doom.DoomWriter; import org.javacord.api.DiscordApi; import org.javacord.api.entity.message.MessageAuthor; import org.javacord.api.entity.message.embed.EmbedBuilder; diff --git a/src/main/java/logic/StatisticsGenerator.java b/src/main/java/logic/StatisticsGenerator.java index 66788a1..ba4632c 100644 --- a/src/main/java/logic/StatisticsGenerator.java +++ b/src/main/java/logic/StatisticsGenerator.java @@ -3,6 +3,7 @@ import discord.TwoDee; import org.javacord.api.entity.message.MessageAuthor; import org.javacord.api.entity.message.embed.EmbedBuilder; +import statistics.DiceResult; import java.awt.*; import java.text.DecimalFormat; diff --git a/src/main/java/logic/DiceResult.java b/src/main/java/statistics/DiceResult.java similarity index 98% rename from src/main/java/logic/DiceResult.java rename to src/main/java/statistics/DiceResult.java index 91f29d6..408b916 100644 --- a/src/main/java/logic/DiceResult.java +++ b/src/main/java/statistics/DiceResult.java @@ -1,4 +1,4 @@ -package logic; +package statistics; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/logic/statisticstates/GenerateNoDiceMessage.java b/src/main/java/statistics/GenerateNoDiceMessage.java similarity index 92% rename from src/main/java/logic/statisticstates/GenerateNoDiceMessage.java rename to src/main/java/statistics/GenerateNoDiceMessage.java index 3e11674..d7e4f14 100644 --- a/src/main/java/logic/statisticstates/GenerateNoDiceMessage.java +++ b/src/main/java/statistics/GenerateNoDiceMessage.java @@ -1,4 +1,4 @@ -package logic.statisticstates; +package statistics; import org.javacord.api.entity.message.embed.EmbedBuilder; diff --git a/src/main/java/logic/statisticstates/GenerateOverloadMessage.java b/src/main/java/statistics/GenerateOverloadMessage.java similarity index 92% rename from src/main/java/logic/statisticstates/GenerateOverloadMessage.java rename to src/main/java/statistics/GenerateOverloadMessage.java index 9e74fb4..09c4cc6 100644 --- a/src/main/java/logic/statisticstates/GenerateOverloadMessage.java +++ b/src/main/java/statistics/GenerateOverloadMessage.java @@ -1,4 +1,4 @@ -package logic.statisticstates; +package statistics; import org.javacord.api.entity.message.embed.EmbedBuilder; diff --git a/src/main/java/logic/statisticstates/GenerateStatistics.java b/src/main/java/statistics/GenerateStatistics.java similarity index 91% rename from src/main/java/logic/statisticstates/GenerateStatistics.java rename to src/main/java/statistics/GenerateStatistics.java index c151066..43f2baf 100644 --- a/src/main/java/logic/statisticstates/GenerateStatistics.java +++ b/src/main/java/statistics/GenerateStatistics.java @@ -1,11 +1,10 @@ -package logic.statisticstates; +package statistics; -import logic.DiceResult; import logic.EmbedField; -import logic.statisticstates.resultvisitors.DifficultyVisitor; -import logic.statisticstates.resultvisitors.DoomVisitor; -import logic.statisticstates.resultvisitors.ResultVisitor; -import logic.statisticstates.resultvisitors.SumVisitor; +import statistics.resultvisitors.DifficultyVisitor; +import statistics.resultvisitors.DoomVisitor; +import statistics.resultvisitors.ResultVisitor; +import statistics.resultvisitors.SumVisitor; import org.javacord.api.entity.message.embed.EmbedBuilder; import java.util.ArrayList; diff --git a/src/main/java/logic/statisticstates/ScanDice.java b/src/main/java/statistics/ScanDice.java similarity index 98% rename from src/main/java/logic/statisticstates/ScanDice.java rename to src/main/java/statistics/ScanDice.java index 713a035..13f1b26 100644 --- a/src/main/java/logic/statisticstates/ScanDice.java +++ b/src/main/java/statistics/ScanDice.java @@ -1,4 +1,4 @@ -package logic.statisticstates; +package statistics; import logic.DiceParameterHandler; diff --git a/src/main/java/logic/statisticstates/StatisticsContext.java b/src/main/java/statistics/StatisticsContext.java similarity index 95% rename from src/main/java/logic/statisticstates/StatisticsContext.java rename to src/main/java/statistics/StatisticsContext.java index 91524f4..23c3f90 100644 --- a/src/main/java/logic/statisticstates/StatisticsContext.java +++ b/src/main/java/statistics/StatisticsContext.java @@ -1,4 +1,4 @@ -package logic.statisticstates; +package statistics; import org.javacord.api.entity.message.embed.EmbedBuilder; diff --git a/src/main/java/logic/statisticstates/StatisticsState.java b/src/main/java/statistics/StatisticsState.java similarity index 72% rename from src/main/java/logic/statisticstates/StatisticsState.java rename to src/main/java/statistics/StatisticsState.java index 76414f3..6faac0f 100644 --- a/src/main/java/logic/statisticstates/StatisticsState.java +++ b/src/main/java/statistics/StatisticsState.java @@ -1,4 +1,4 @@ -package logic.statisticstates; +package statistics; public interface StatisticsState { void process(StatisticsContext context); diff --git a/src/main/java/logic/statisticstates/resultvisitors/DifficultyVisitor.java b/src/main/java/statistics/resultvisitors/DifficultyVisitor.java similarity index 97% rename from src/main/java/logic/statisticstates/resultvisitors/DifficultyVisitor.java rename to src/main/java/statistics/resultvisitors/DifficultyVisitor.java index ec4c508..50a17dc 100644 --- a/src/main/java/logic/statisticstates/resultvisitors/DifficultyVisitor.java +++ b/src/main/java/statistics/resultvisitors/DifficultyVisitor.java @@ -1,6 +1,6 @@ -package logic.statisticstates.resultvisitors; +package statistics.resultvisitors; -import logic.DiceResult; +import statistics.DiceResult; import logic.EmbedField; import java.util.ArrayList; diff --git a/src/main/java/logic/statisticstates/resultvisitors/DoomVisitor.java b/src/main/java/statistics/resultvisitors/DoomVisitor.java similarity index 93% rename from src/main/java/logic/statisticstates/resultvisitors/DoomVisitor.java rename to src/main/java/statistics/resultvisitors/DoomVisitor.java index 27de0d1..d1d5ccf 100644 --- a/src/main/java/logic/statisticstates/resultvisitors/DoomVisitor.java +++ b/src/main/java/statistics/resultvisitors/DoomVisitor.java @@ -1,6 +1,6 @@ -package logic.statisticstates.resultvisitors; +package statistics.resultvisitors; -import logic.DiceResult; +import statistics.DiceResult; import logic.EmbedField; import java.util.ArrayList; diff --git a/src/main/java/logic/statisticstates/resultvisitors/ResultVisitor.java b/src/main/java/statistics/resultvisitors/ResultVisitor.java similarity index 91% rename from src/main/java/logic/statisticstates/resultvisitors/ResultVisitor.java rename to src/main/java/statistics/resultvisitors/ResultVisitor.java index 6f9d1f1..0f10e57 100644 --- a/src/main/java/logic/statisticstates/resultvisitors/ResultVisitor.java +++ b/src/main/java/statistics/resultvisitors/ResultVisitor.java @@ -1,6 +1,6 @@ -package logic.statisticstates.resultvisitors; +package statistics.resultvisitors; -import logic.DiceResult; +import statistics.DiceResult; import logic.EmbedField; import java.text.DecimalFormat; diff --git a/src/main/java/logic/statisticstates/resultvisitors/SumVisitor.java b/src/main/java/statistics/resultvisitors/SumVisitor.java similarity index 94% rename from src/main/java/logic/statisticstates/resultvisitors/SumVisitor.java rename to src/main/java/statistics/resultvisitors/SumVisitor.java index 0fcc6c2..1573332 100644 --- a/src/main/java/logic/statisticstates/resultvisitors/SumVisitor.java +++ b/src/main/java/statistics/resultvisitors/SumVisitor.java @@ -1,6 +1,6 @@ -package logic.statisticstates.resultvisitors; +package statistics.resultvisitors; -import logic.DiceResult; +import statistics.DiceResult; import logic.EmbedField; import java.util.*;