From d128215bc47003e0560e5da6dd7548cfd766ff55 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 10:27:07 +0000 Subject: [PATCH 01/57] Add local sample game bootstrap service Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/444104a4-0c8e-4a40-a44f-dd1f35258ed3 Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../LocalDevelopmentSampleGameService.java | 249 ++++++++++++++++++ src/main/java/ti4/spring/jda/JdaService.java | 7 + ...LocalDevelopmentSampleGameServiceTest.java | 49 ++++ 3 files changed, 305 insertions(+) create mode 100644 src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java create mode 100644 src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java new file mode 100644 index 0000000000..1a3295b897 --- /dev/null +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -0,0 +1,249 @@ +package ti4.service.game; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import javax.annotation.Nullable; +import lombok.experimental.UtilityClass; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.channel.concrete.Category; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; +import net.dv8tion.jda.api.requests.restaction.ChannelAction; +import ti4.game.Game; +import ti4.game.Player; +import ti4.game.persistence.GameManager; +import ti4.helpers.Constants; +import ti4.helpers.Storage; +import ti4.logging.BotLogger; + +@UtilityClass +public class LocalDevelopmentSampleGameService { + + static final String SAMPLE_GAME_NAME = "pbd15036"; + static final String SAMPLE_GAME_FILE_NAME = SAMPLE_GAME_NAME + Constants.TXT; + + public static boolean isLocalDevelopmentStartup(String[] args) { + return args.length == 3; + } + + public static void seedSampleGameFileIfMissing() { + Path sourcePath = getSampleGameSourcePath(); + if (sourcePath == null) { + BotLogger.warning("LocalDevelopmentSampleGameService: RESOURCE_PATH is not configured; skipping sample game."); + return; + } + if (!Files.exists(sourcePath)) { + BotLogger.warning("LocalDevelopmentSampleGameService: sample game file not found: " + sourcePath); + return; + } + + try { + copySampleGameFileIfMissing(sourcePath, Storage.getGamePath(SAMPLE_GAME_FILE_NAME)); + } catch (IOException e) { + BotLogger.error("LocalDevelopmentSampleGameService: failed to seed local sample game file.", e); + } + } + + public static void bootstrapSampleGame(Guild guild, @Nullable String localUserId) { + if (guild == null) { + return; + } + + Game game = GameManager.reload(SAMPLE_GAME_NAME); + if (game == null) { + BotLogger.warning("LocalDevelopmentSampleGameService: sample game could not be loaded: " + SAMPLE_GAME_NAME); + return; + } + + prepareGameForLocalDevelopment(game); + + Member localMember = localUserId == null ? null : guild.getMemberById(localUserId); + Role gameRole = ensureGameRole(guild, game.getName(), localMember); + Category category = ensureCategory(guild, game.getName()); + + TextChannel tableTalkChannel = ensurePublicChannel( + guild, category, getTableTalkChannelName(game), game.getTableTalkChannel(), gameRole, localMember); + game.setTableTalkChannelID(tableTalkChannel.getId()); + + TextChannel actionsChannel = + ensurePublicChannel(guild, category, getActionsChannelName(game), game.getMainGameChannel(), gameRole, localMember); + game.setMainChannelID(actionsChannel.getId()); + + if (localMember != null) { + for (Player player : game.getRealPlayers()) { + TextChannel privateChannel = + ensurePrivateChannel(guild, category, getPrivateChannelName(game, player), player.getPrivateChannel(), localMember); + player.setPrivateChannelID(privateChannel.getId()); + } + } else { + BotLogger.warning("LocalDevelopmentSampleGameService: local user is not a member of guild `" + guild.getName() + + "`; skipping sample private channel creation."); + } + + ThreadChannel botThread = ensureBotMapThread(game, actionsChannel); + game.setBotMapUpdatesThreadID(botThread.getId()); + + for (Player player : game.getRealPlayers()) { + player.getCardsInfoThread(); + } + + GameManager.save(game, "Bootstrapped local development sample game"); + } + + static void copySampleGameFileIfMissing(Path sourcePath, Path targetPath) throws IOException { + if (Files.exists(targetPath)) { + return; + } + Files.createDirectories(targetPath.getParent()); + Files.copy(sourcePath, targetPath); + } + + static void prepareGameForLocalDevelopment(Game game) { + game.setHasEnded(false); + game.setEndedDate(0); + } + + @Nullable + static Path getSampleGameSourcePath() { + String resourcePath = Storage.getResourcePath(); + if (resourcePath == null) { + return null; + } + return Path.of(resourcePath) + .getParent() + .resolve("../test/resources/maps/" + SAMPLE_GAME_FILE_NAME) + .normalize(); + } + + private static Role ensureGameRole(Guild guild, String gameName, @Nullable Member localMember) { + Role role = guild.getRolesByName(gameName, true).stream().findFirst().orElseGet(() -> + guild.createRole().setName(gameName).setMentionable(true).complete()); + if (localMember != null && !localMember.getRoles().contains(role)) { + guild.addRoleToMember(localMember, role).complete(); + } + return role; + } + + private static Category ensureCategory(Guild guild, String categoryName) { + return guild.getCategoriesByName(categoryName, true).stream().findFirst().orElseGet(() -> + guild.createCategory(categoryName).complete()); + } + + private static TextChannel ensurePublicChannel( + Guild guild, + Category category, + String channelName, + @Nullable TextChannel existingChannel, + Role gameRole, + @Nullable Member localMember) { + if (isChannelOnGuild(existingChannel, guild)) { + return existingChannel; + } + + TextChannel channel = guild.getTextChannelsByName(channelName, true).stream() + .findFirst() + .orElseGet(() -> configurePublicChannel( + guild.createTextChannel(channelName, category), gameRole, localMember) + .complete()); + if (channel.getParentCategory() == null || !category.getId().equals(channel.getParentCategoryId())) { + channel.getManager().setParent(category).complete(); + } + return channel; + } + + private static ChannelAction configurePublicChannel( + ChannelAction action, Role gameRole, @Nullable Member localMember) { + long publicPermissions = Permission.VIEW_CHANNEL.getRawValue() + | Permission.MESSAGE_SEND.getRawValue() + | Permission.MESSAGE_HISTORY.getRawValue(); + action = action.syncPermissionOverrides().addRolePermissionOverride(gameRole.getIdLong(), publicPermissions, 0); + if (localMember != null) { + long memberPermissions = publicPermissions + | Permission.MANAGE_THREADS.getRawValue() + | Permission.CREATE_PRIVATE_THREADS.getRawValue() + | Permission.CREATE_PUBLIC_THREADS.getRawValue(); + action = action.addMemberPermissionOverride(localMember.getIdLong(), memberPermissions, 0); + } + return action; + } + + private static TextChannel ensurePrivateChannel( + Guild guild, + Category category, + String channelName, + @Nullable TextChannel existingChannel, + Member localMember) { + if (isChannelOnGuild(existingChannel, guild)) { + return existingChannel; + } + + TextChannel channel = guild.getTextChannelsByName(channelName, true).stream() + .findFirst() + .orElseGet(() -> configurePrivateChannel(guild.createTextChannel(channelName, category), guild, localMember) + .complete()); + if (channel.getParentCategory() == null || !category.getId().equals(channel.getParentCategoryId())) { + channel.getManager().setParent(category).complete(); + } + return channel; + } + + private static ChannelAction configurePrivateChannel( + ChannelAction action, Guild guild, Member localMember) { + Role everyoneRole = guild.getPublicRole(); + long denyPermissions = Permission.VIEW_CHANNEL.getRawValue(); + long allowPermissions = Permission.VIEW_CHANNEL.getRawValue() + | Permission.MESSAGE_SEND.getRawValue() + | Permission.MESSAGE_HISTORY.getRawValue() + | Permission.MANAGE_THREADS.getRawValue(); + return action.syncPermissionOverrides() + .addRolePermissionOverride(everyoneRole.getIdLong(), 0, denyPermissions) + .addMemberPermissionOverride(localMember.getIdLong(), allowPermissions, 0); + } + + private static ThreadChannel ensureBotMapThread(Game game, TextChannel actionsChannel) { + ThreadChannel existingThread = game.getBotMapUpdatesThread(); + if (existingThread != null && actionsChannel.getGuild().equals(existingThread.getGuild())) { + return existingThread; + } + + String threadName = game.getName() + Constants.BOT_CHANNEL_SUFFIX; + List matchingThreads = + actionsChannel.getGuild().getThreadChannelsByName(threadName, true); + if (!matchingThreads.isEmpty()) { + return matchingThreads.getFirst(); + } + + return actionsChannel.createThreadChannel(threadName) + .setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK) + .complete(); + } + + private static boolean isChannelOnGuild(@Nullable TextChannel channel, Guild guild) { + return channel != null && guild.getId().equals(channel.getGuild().getId()); + } + + private static String getTableTalkChannelName(Game game) { + String customName = sanitizeChannelName(game.getCustomName()); + if (customName.isBlank()) { + return game.getName(); + } + return game.getName() + "-" + customName; + } + + private static String getActionsChannelName(Game game) { + return game.getName() + Constants.ACTIONS_CHANNEL_SUFFIX; + } + + private static String getPrivateChannelName(Game game, Player player) { + return game.getName() + "-" + sanitizeChannelName(player.getUserName()) + "-private"; + } + + private static String sanitizeChannelName(String name) { + return name.replace("/", "").replace(" ", "-").replace(".", "").replace(":", ""); + } +} diff --git a/src/main/java/ti4/spring/jda/JdaService.java b/src/main/java/ti4/spring/jda/JdaService.java index 72aee63cad..2408638bfe 100644 --- a/src/main/java/ti4/spring/jda/JdaService.java +++ b/src/main/java/ti4/spring/jda/JdaService.java @@ -76,6 +76,7 @@ import ti4.selections.SelectionManager; import ti4.service.draft.SliceGenerationPipeline; import ti4.service.emoji.ApplicationEmojiService; +import ti4.service.game.LocalDevelopmentSampleGameService; import ti4.service.statistics.StatisticsPipeline; import ti4.settings.GlobalSettings; import ti4.settings.GlobalSettings.ImplementedSettings; @@ -309,6 +310,9 @@ public void init() { AliasHandler.init(); // create directories for games files Storage.init(); + if (LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(args)) { + LocalDevelopmentSampleGameService.seedSampleGameFileIfMissing(); + } SelectionManager.init(); initializeWhitelistedRoles(); TIGLHelper.validateTIGLness(); @@ -317,6 +321,9 @@ public void init() { BotLogger.info("LOADING GAMES"); GameManager.initialize(); + if (LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(args)) { + LocalDevelopmentSampleGameService.bootstrapSampleGame(guildPrimary, args[1]); + } BotLogger.info("FINISHED LOADING GAMES"); if (DataMigrationManager.runMigrations()) { diff --git a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java new file mode 100644 index 0000000000..d304704639 --- /dev/null +++ b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java @@ -0,0 +1,49 @@ +package ti4.service.game; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.nio.file.Files; +import java.nio.file.Path; +import org.junit.jupiter.api.Test; +import ti4.game.Game; +import ti4.testUtils.BaseTi4Test; + +class LocalDevelopmentSampleGameServiceTest extends BaseTi4Test { + + @Test + void copySampleGameFileIfMissingCopiesMissingFileWithoutOverwriting() throws Exception { + Path tempDirectory = Files.createTempDirectory("local-dev-sample"); + Path sourceFile = tempDirectory.resolve("source.txt"); + Path targetFile = tempDirectory.resolve("target.txt"); + + Files.writeString(sourceFile, "sample"); + LocalDevelopmentSampleGameService.copySampleGameFileIfMissing(sourceFile, targetFile); + assertEquals("sample", Files.readString(targetFile)); + + Files.writeString(targetFile, "existing"); + LocalDevelopmentSampleGameService.copySampleGameFileIfMissing(sourceFile, targetFile); + assertEquals("existing", Files.readString(targetFile)); + } + + @Test + void prepareGameForLocalDevelopmentClearsEndedState() { + Game game = new Game(); + game.setHasEnded(true); + game.setEndedDate(123L); + + LocalDevelopmentSampleGameService.prepareGameForLocalDevelopment(game); + + assertFalse(game.isHasEnded()); + assertEquals(0, game.getEndedDate()); + } + + @Test + void isLocalDevelopmentStartupRequiresSingleGuildLaunchArguments() { + assertTrue(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user", "guild"})); + assertFalse(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user"})); + assertFalse(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup( + new String[] {"token", "user", "guild", "community"})); + } +} From 80aa191cff866a40f6f6019caa20c293c6d62264 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 10:33:10 +0000 Subject: [PATCH 02/57] Format local sample game bootstrap Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/444104a4-0c8e-4a40-a44f-dd1f35258ed3 Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../LocalDevelopmentSampleGameService.java | 47 ++++++++++++------- ...LocalDevelopmentSampleGameServiceTest.java | 3 +- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index 1a3295b897..d6357e9bc9 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -34,7 +34,8 @@ public static boolean isLocalDevelopmentStartup(String[] args) { public static void seedSampleGameFileIfMissing() { Path sourcePath = getSampleGameSourcePath(); if (sourcePath == null) { - BotLogger.warning("LocalDevelopmentSampleGameService: RESOURCE_PATH is not configured; skipping sample game."); + BotLogger.warning( + "LocalDevelopmentSampleGameService: RESOURCE_PATH is not configured; skipping sample game."); return; } if (!Files.exists(sourcePath)) { @@ -56,7 +57,8 @@ public static void bootstrapSampleGame(Guild guild, @Nullable String localUserId Game game = GameManager.reload(SAMPLE_GAME_NAME); if (game == null) { - BotLogger.warning("LocalDevelopmentSampleGameService: sample game could not be loaded: " + SAMPLE_GAME_NAME); + BotLogger.warning( + "LocalDevelopmentSampleGameService: sample game could not be loaded: " + SAMPLE_GAME_NAME); return; } @@ -70,19 +72,23 @@ public static void bootstrapSampleGame(Guild guild, @Nullable String localUserId guild, category, getTableTalkChannelName(game), game.getTableTalkChannel(), gameRole, localMember); game.setTableTalkChannelID(tableTalkChannel.getId()); - TextChannel actionsChannel = - ensurePublicChannel(guild, category, getActionsChannelName(game), game.getMainGameChannel(), gameRole, localMember); + TextChannel actionsChannel = ensurePublicChannel( + guild, category, getActionsChannelName(game), game.getMainGameChannel(), gameRole, localMember); game.setMainChannelID(actionsChannel.getId()); if (localMember != null) { for (Player player : game.getRealPlayers()) { - TextChannel privateChannel = - ensurePrivateChannel(guild, category, getPrivateChannelName(game, player), player.getPrivateChannel(), localMember); + TextChannel privateChannel = ensurePrivateChannel( + guild, + category, + getPrivateChannelName(game, player), + getPrivateTextChannel(player), + localMember); player.setPrivateChannelID(privateChannel.getId()); } } else { - BotLogger.warning("LocalDevelopmentSampleGameService: local user is not a member of guild `" + guild.getName() - + "`; skipping sample private channel creation."); + BotLogger.warning("LocalDevelopmentSampleGameService: local user is not a member of guild `" + + guild.getName() + "`; skipping sample private channel creation."); } ThreadChannel botThread = ensureBotMapThread(game, actionsChannel); @@ -121,8 +127,10 @@ static Path getSampleGameSourcePath() { } private static Role ensureGameRole(Guild guild, String gameName, @Nullable Member localMember) { - Role role = guild.getRolesByName(gameName, true).stream().findFirst().orElseGet(() -> - guild.createRole().setName(gameName).setMentionable(true).complete()); + Role role = guild.getRolesByName(gameName, true).stream().findFirst().orElseGet(() -> guild.createRole() + .setName(gameName) + .setMentionable(true) + .complete()); if (localMember != null && !localMember.getRoles().contains(role)) { guild.addRoleToMember(localMember, role).complete(); } @@ -130,8 +138,9 @@ private static Role ensureGameRole(Guild guild, String gameName, @Nullable Membe } private static Category ensureCategory(Guild guild, String categoryName) { - return guild.getCategoriesByName(categoryName, true).stream().findFirst().orElseGet(() -> - guild.createCategory(categoryName).complete()); + return guild.getCategoriesByName(categoryName, true).stream() + .findFirst() + .orElseGet(() -> guild.createCategory(categoryName).complete()); } private static TextChannel ensurePublicChannel( @@ -184,7 +193,8 @@ private static TextChannel ensurePrivateChannel( TextChannel channel = guild.getTextChannelsByName(channelName, true).stream() .findFirst() - .orElseGet(() -> configurePrivateChannel(guild.createTextChannel(channelName, category), guild, localMember) + .orElseGet(() -> configurePrivateChannel( + guild.createTextChannel(channelName, category), guild, localMember) .complete()); if (channel.getParentCategory() == null || !category.getId().equals(channel.getParentCategoryId())) { channel.getManager().setParent(category).complete(); @@ -212,13 +222,13 @@ private static ThreadChannel ensureBotMapThread(Game game, TextChannel actionsCh } String threadName = game.getName() + Constants.BOT_CHANNEL_SUFFIX; - List matchingThreads = - actionsChannel.getGuild().getThreadChannelsByName(threadName, true); + List matchingThreads = actionsChannel.getGuild().getThreadChannelsByName(threadName, true); if (!matchingThreads.isEmpty()) { return matchingThreads.getFirst(); } - return actionsChannel.createThreadChannel(threadName) + return actionsChannel + .createThreadChannel(threadName) .setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK) .complete(); } @@ -227,6 +237,11 @@ private static boolean isChannelOnGuild(@Nullable TextChannel channel, Guild gui return channel != null && guild.getId().equals(channel.getGuild().getId()); } + @Nullable + private static TextChannel getPrivateTextChannel(Player player) { + return player.getPrivateChannel() instanceof TextChannel channel ? channel : null; + } + private static String getTableTalkChannelName(Game game) { String customName = sanitizeChannelName(game.getCustomName()); if (customName.isBlank()) { diff --git a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java index d304704639..6aef804215 100644 --- a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java +++ b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java @@ -41,7 +41,8 @@ void prepareGameForLocalDevelopmentClearsEndedState() { @Test void isLocalDevelopmentStartupRequiresSingleGuildLaunchArguments() { - assertTrue(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user", "guild"})); + assertTrue( + LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user", "guild"})); assertFalse(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user"})); assertFalse(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup( new String[] {"token", "user", "guild", "community"})); From f64ec7c2aadef931fd11c44d15578c6c24e0b08d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 10:38:46 +0000 Subject: [PATCH 03/57] Refine local sample game bootstrap Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/444104a4-0c8e-4a40-a44f-dd1f35258ed3 Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../game/LocalDevelopmentSampleGameService.java | 14 +++++++++++--- .../LocalDevelopmentSampleGameServiceTest.java | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index d6357e9bc9..6d39058a7c 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -14,6 +14,7 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; +import org.apache.commons.lang3.StringUtils; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; @@ -28,7 +29,7 @@ public class LocalDevelopmentSampleGameService { static final String SAMPLE_GAME_FILE_NAME = SAMPLE_GAME_NAME + Constants.TXT; public static boolean isLocalDevelopmentStartup(String[] args) { - return args.length == 3; + return args != null && args.length == 3 && StringUtils.isNoneBlank(args); } public static void seedSampleGameFileIfMissing() { @@ -95,7 +96,7 @@ public static void bootstrapSampleGame(Guild guild, @Nullable String localUserId game.setBotMapUpdatesThreadID(botThread.getId()); for (Player player : game.getRealPlayers()) { - player.getCardsInfoThread(); + ensureCardsInfoThread(player); } GameManager.save(game, "Bootstrapped local development sample game"); @@ -242,6 +243,13 @@ private static TextChannel getPrivateTextChannel(Player player) { return player.getPrivateChannel() instanceof TextChannel channel ? channel : null; } + private static void ensureCardsInfoThread(Player player) { + if (player.getCardsInfoThread() == null) { + BotLogger.warning("LocalDevelopmentSampleGameService: failed to create cards info thread for " + + player.getUserName() + " in game " + player.getGame().getName()); + } + } + private static String getTableTalkChannelName(Game game) { String customName = sanitizeChannelName(game.getCustomName()); if (customName.isBlank()) { @@ -259,6 +267,6 @@ private static String getPrivateChannelName(Game game, Player player) { } private static String sanitizeChannelName(String name) { - return name.replace("/", "").replace(" ", "-").replace(".", "").replace(":", ""); + return name.replaceAll("[/:. ]+", "-").replaceAll("^-|-$", ""); } } diff --git a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java index 6aef804215..17bd2764aa 100644 --- a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java +++ b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java @@ -13,7 +13,7 @@ class LocalDevelopmentSampleGameServiceTest extends BaseTi4Test { @Test - void copySampleGameFileIfMissingCopiesMissingFileWithoutOverwriting() throws Exception { + void copySampleGameFileIfMissingCreatesNewFileButDoesNotOverwrite() throws Exception { Path tempDirectory = Files.createTempDirectory("local-dev-sample"); Path sourceFile = tempDirectory.resolve("source.txt"); Path targetFile = tempDirectory.resolve("target.txt"); From f01db7c9d5db7e2421389499e776c699b3dbb02d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 10:44:22 +0000 Subject: [PATCH 04/57] Fix local startup validation edge cases Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/444104a4-0c8e-4a40-a44f-dd1f35258ed3 Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../game/LocalDevelopmentSampleGameService.java | 17 ++++++++++++----- src/main/java/ti4/spring/jda/JdaService.java | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index 6d39058a7c..c8f1834c0f 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -14,7 +14,6 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; -import org.apache.commons.lang3.StringUtils; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; @@ -29,7 +28,15 @@ public class LocalDevelopmentSampleGameService { static final String SAMPLE_GAME_FILE_NAME = SAMPLE_GAME_NAME + Constants.TXT; public static boolean isLocalDevelopmentStartup(String[] args) { - return args != null && args.length == 3 && StringUtils.isNoneBlank(args); + if (args == null || args.length != 3) { + return false; + } + for (String arg : args) { + if (arg == null || arg.isBlank()) { + return false; + } + } + return true; } public static void seedSampleGameFileIfMissing() { @@ -96,7 +103,7 @@ public static void bootstrapSampleGame(Guild guild, @Nullable String localUserId game.setBotMapUpdatesThreadID(botThread.getId()); for (Player player : game.getRealPlayers()) { - ensureCardsInfoThread(player); + warnIfCardsInfoThreadMissing(player); } GameManager.save(game, "Bootstrapped local development sample game"); @@ -243,7 +250,7 @@ private static TextChannel getPrivateTextChannel(Player player) { return player.getPrivateChannel() instanceof TextChannel channel ? channel : null; } - private static void ensureCardsInfoThread(Player player) { + private static void warnIfCardsInfoThreadMissing(Player player) { if (player.getCardsInfoThread() == null) { BotLogger.warning("LocalDevelopmentSampleGameService: failed to create cards info thread for " + player.getUserName() + " in game " + player.getGame().getName()); @@ -267,6 +274,6 @@ private static String getPrivateChannelName(Game game, Player player) { } private static String sanitizeChannelName(String name) { - return name.replaceAll("[/:. ]+", "-").replaceAll("^-|-$", ""); + return name.replaceAll("[/:. ]+", "-").replaceAll("^-+|-+$", ""); } } diff --git a/src/main/java/ti4/spring/jda/JdaService.java b/src/main/java/ti4/spring/jda/JdaService.java index 2408638bfe..a75ad22824 100644 --- a/src/main/java/ti4/spring/jda/JdaService.java +++ b/src/main/java/ti4/spring/jda/JdaService.java @@ -322,7 +322,8 @@ public void init() { BotLogger.info("LOADING GAMES"); GameManager.initialize(); if (LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(args)) { - LocalDevelopmentSampleGameService.bootstrapSampleGame(guildPrimary, args[1]); + String localUserId = args.length > 1 ? args[1] : null; + LocalDevelopmentSampleGameService.bootstrapSampleGame(guildPrimary, localUserId); } BotLogger.info("FINISHED LOADING GAMES"); From 9752e72a8eaae74bf4e4b9da0d11745194da9beb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 10:49:33 +0000 Subject: [PATCH 05/57] Harden local sample channel naming Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/444104a4-0c8e-4a40-a44f-dd1f35258ed3 Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../ti4/service/game/LocalDevelopmentSampleGameService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index c8f1834c0f..9711dd0742 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -273,7 +273,11 @@ private static String getPrivateChannelName(Game game, Player player) { return game.getName() + "-" + sanitizeChannelName(player.getUserName()) + "-private"; } + @Nullable private static String sanitizeChannelName(String name) { + if (name == null) { + return ""; + } return name.replaceAll("[/:. ]+", "-").replaceAll("^-+|-+$", ""); } } From be26e67ccfe5eb555c7c3f4d7310f3c47dd9340d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 11:23:23 +0000 Subject: [PATCH 06/57] Add recreate game and local dev commands Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/c9203464-1fed-4a9b-ae7a-4b9efbe44c4b Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../java/ti4/commands/admin/AdminCommand.java | 3 +- .../java/ti4/commands/admin/RecreateGame.java | 39 ++ .../commands/developer/DeveloperCommand.java | 3 +- .../commands/developer/LocalDevelopment.java | 64 +++ .../ti4/game/persistence/GameLoadService.java | 8 + .../ti4/game/persistence/GameManager.java | 6 + src/main/java/ti4/helpers/Constants.java | 3 + .../LocalDevelopmentSampleGameService.java | 361 ++++++-------- .../ti4/service/game/RecreateGameService.java | 463 ++++++++++++++++++ src/main/java/ti4/spring/jda/JdaService.java | 6 +- ...LocalDevelopmentSampleGameServiceTest.java | 73 ++- .../service/game/RecreateGameServiceTest.java | 31 ++ 12 files changed, 826 insertions(+), 234 deletions(-) create mode 100644 src/main/java/ti4/commands/admin/RecreateGame.java create mode 100644 src/main/java/ti4/commands/developer/LocalDevelopment.java create mode 100644 src/main/java/ti4/service/game/RecreateGameService.java create mode 100644 src/test/java/ti4/service/game/RecreateGameServiceTest.java diff --git a/src/main/java/ti4/commands/admin/AdminCommand.java b/src/main/java/ti4/commands/admin/AdminCommand.java index b966e95118..58b417c492 100644 --- a/src/main/java/ti4/commands/admin/AdminCommand.java +++ b/src/main/java/ti4/commands/admin/AdminCommand.java @@ -20,7 +20,8 @@ public class AdminCommand implements ParentCommand { new DeletePersistenceManagerFile(), new CardsInfoForPlayer(), new UpdateThreadArchiveTime(), - new GetChannelHtml()) + new GetChannelHtml(), + new RecreateGame()) .collect(Collectors.toMap(Subcommand::getName, subcommand -> subcommand)); @Override diff --git a/src/main/java/ti4/commands/admin/RecreateGame.java b/src/main/java/ti4/commands/admin/RecreateGame.java new file mode 100644 index 0000000000..0087178e93 --- /dev/null +++ b/src/main/java/ti4/commands/admin/RecreateGame.java @@ -0,0 +1,39 @@ +package ti4.commands.admin; + +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import net.dv8tion.jda.api.interactions.commands.OptionMapping; +import net.dv8tion.jda.api.interactions.commands.OptionType; +import ti4.commands.Subcommand; +import ti4.game.Game; +import ti4.game.persistence.GameManager; +import ti4.helpers.Constants; +import ti4.message.MessageHelper; +import ti4.service.game.RecreateGameService; + +class RecreateGame extends Subcommand { + + RecreateGame() { + super(Constants.RECREATE_GAME, "Recreate a game's channels and roles."); + addOption(OptionType.STRING, Constants.GAME_NAME, "Game to recreate", true, true); + } + + @Override + public void execute(SlashCommandInteractionEvent event) { + String gameName = event.getOption(Constants.GAME_NAME, OptionMapping::getAsString); + if (gameName == null || !GameManager.isValid(gameName)) { + MessageHelper.replyToMessage(event, "Invalid game name."); + return; + } + + Game game = GameManager.getManagedGame(gameName).getGame(); + Guild guild = game.getGuild() != null ? game.getGuild() : event.getGuild(); + if (guild == null) { + MessageHelper.replyToMessage(event, "Could not determine which guild should host this game."); + return; + } + + RecreateGameService.RecreateGameResult result = RecreateGameService.recreateGame(game, guild); + MessageHelper.replyToMessage(event, result.getSummary()); + } +} diff --git a/src/main/java/ti4/commands/developer/DeveloperCommand.java b/src/main/java/ti4/commands/developer/DeveloperCommand.java index c56005ddc9..19841dc5a3 100644 --- a/src/main/java/ti4/commands/developer/DeveloperCommand.java +++ b/src/main/java/ti4/commands/developer/DeveloperCommand.java @@ -24,7 +24,8 @@ public class DeveloperCommand implements ParentCommand { new CustomCommand(), new RunAgainstSpecificGame(), new ProduceNucleusGenStats(), - new RunSql()) + new RunSql(), + new LocalDevelopment()) .collect(Collectors.toMap(Subcommand::getName, subcommand -> subcommand)); @Override diff --git a/src/main/java/ti4/commands/developer/LocalDevelopment.java b/src/main/java/ti4/commands/developer/LocalDevelopment.java new file mode 100644 index 0000000000..b9da0f0959 --- /dev/null +++ b/src/main/java/ti4/commands/developer/LocalDevelopment.java @@ -0,0 +1,64 @@ +package ti4.commands.developer; + +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; +import net.dv8tion.jda.api.interactions.commands.OptionMapping; +import net.dv8tion.jda.api.interactions.commands.OptionType; +import net.dv8tion.jda.api.interactions.commands.build.OptionData; +import ti4.commands.Subcommand; +import ti4.helpers.Constants; +import ti4.message.MessageHelper; +import ti4.service.game.LocalDevelopmentSampleGameService; +import ti4.service.game.RecreateGameService; + +class LocalDevelopment extends Subcommand { + + private static final String ACTION_CREATE = "create"; + private static final String ACTION_CLEAN = "clean"; + + LocalDevelopment() { + super(Constants.LOCAL_DEV, "Manage local development test games."); + addOptions(new OptionData(OptionType.STRING, Constants.ACTION, "Local development action") + .setRequired(true) + .addChoice("Create", ACTION_CREATE) + .addChoice("Clean", ACTION_CLEAN)); + addOptions(new OptionData(OptionType.STRING, Constants.SOURCE, "Source game name") + .setRequired(false) + .setAutoComplete(true)); + addOptions(new OptionData(OptionType.STRING, Constants.CONFIRM, "Type YES to confirm cleanup") + .setRequired(false)); + } + + @Override + public void execute(SlashCommandInteractionEvent event) { + Guild guild = event.getGuild(); + if (guild == null) { + MessageHelper.replyToMessage(event, "This command must be run in a server."); + return; + } + + String action = event.getOption(Constants.ACTION, ACTION_CREATE, OptionMapping::getAsString); + if (ACTION_CLEAN.equals(action)) { + String confirm = event.getOption(Constants.CONFIRM, "", OptionMapping::getAsString); + if (!"YES".equals(confirm)) { + MessageHelper.replyToMessage(event, "Cleanup requires `confirm: YES`."); + return; + } + var result = LocalDevelopmentSampleGameService.cleanTestGames(guild); + MessageHelper.replyToMessage(event, result.getSummary()); + return; + } + + String sourceGame = event.getOption( + Constants.SOURCE, + LocalDevelopmentSampleGameService.DEFAULT_SOURCE_GAME_NAME, + OptionMapping::getAsString); + RecreateGameService.RecreateGameResult result = LocalDevelopmentSampleGameService.createAndRecreateTestGame( + guild, event.getUser().getId(), sourceGame); + if (result == null) { + MessageHelper.replyToMessage(event, "Failed to create a local development test game from `" + sourceGame + "`."); + return; + } + MessageHelper.replyToMessage(event, result.getSummary()); + } +} diff --git a/src/main/java/ti4/game/persistence/GameLoadService.java b/src/main/java/ti4/game/persistence/GameLoadService.java index dc4e32c777..5dc641582f 100644 --- a/src/main/java/ti4/game/persistence/GameLoadService.java +++ b/src/main/java/ti4/game/persistence/GameLoadService.java @@ -134,6 +134,14 @@ public static Game load(String gameName) { }); } + @Nullable + static Game load(Path path) { + if (path == null) { + return null; + } + return readGame(path.toFile()); + } + @Nullable private static Game readGame(@NotNull File gameFile) { if (!gameFile.exists()) { diff --git a/src/main/java/ti4/game/persistence/GameManager.java b/src/main/java/ti4/game/persistence/GameManager.java index ceb55bcfdb..3b9b13077d 100644 --- a/src/main/java/ti4/game/persistence/GameManager.java +++ b/src/main/java/ti4/game/persistence/GameManager.java @@ -7,6 +7,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.nio.file.Path; import javax.annotation.Nullable; import lombok.experimental.UtilityClass; import ti4.game.Game; @@ -122,6 +123,11 @@ public static Game reload(String gameName) { return game; } + @Nullable + public static Game loadFromPath(Path path) { + return GameLoadService.load(path); + } + public static List getGameNames() { return new ArrayList<>(gameNameToManagedGame.keySet()); } diff --git a/src/main/java/ti4/helpers/Constants.java b/src/main/java/ti4/helpers/Constants.java index 8bbf006031..f1b4506097 100644 --- a/src/main/java/ti4/helpers/Constants.java +++ b/src/main/java/ti4/helpers/Constants.java @@ -1019,6 +1019,7 @@ public static String solaxPing() { public static final String TTPG_FILE_NAME = "ttpg_file_name"; public static final String GAME_FUN_NAME = "game_fun_name"; public static final String CATEGORY = "category"; + public static final String ACTION = "action"; public static final String SEND_JSON_TO_S3 = "send_games_to_s3"; public static final String SERVER_LIMIT_STATS = "server_limit_stats"; public static final String END = "end"; @@ -1051,12 +1052,14 @@ public static String solaxPing() { public static final String FIX_CHANNEL_PERMISSIONS = "fix_channel_permissions"; public static final String CATEGORY_CHANNEL_COUNT = "category_channel_count"; public static final String BEGIN_VIDEO_GEN = "begin_video_gen"; + public static final String RECREATE_GAME = "recreate_game"; public static final String INCLUDE_SUBCOMMANDS = "include_subcommands"; public static final String INCLUDE_OPTIONS = "include_options"; public static final String CARDS_INFO = "cards_info"; public static final String FRANKEN = "franken"; public static final String SHOW_GAME_AS_PLAYER = "show_game_as"; public static final String CHECK_PRIVATE_COMMUNICATIONS = "check_private_communications"; + public static final String LOCAL_DEV = "local_dev"; // DRAFTS public static final String BAG_DRAFT = "bag_draft"; diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index 9711dd0742..55ad1815e7 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -1,19 +1,20 @@ package ti4.service.game; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; +import java.util.UUID; import javax.annotation.Nullable; +import lombok.Getter; import lombok.experimental.UtilityClass; -import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.channel.concrete.Category; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; -import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; -import net.dv8tion.jda.api.requests.restaction.ChannelAction; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; @@ -24,260 +25,208 @@ @UtilityClass public class LocalDevelopmentSampleGameService { - static final String SAMPLE_GAME_NAME = "pbd15036"; - static final String SAMPLE_GAME_FILE_NAME = SAMPLE_GAME_NAME + Constants.TXT; + public static final String DEFAULT_SOURCE_GAME_NAME = "pbd15036"; public static boolean isLocalDevelopmentStartup(String[] args) { - if (args == null || args.length != 3) { + if (args == null || args.length < 3 || args.length > 4) { return false; } - for (String arg : args) { - if (arg == null || arg.isBlank()) { + for (int i = 0; i < 3; i++) { + if (args[i] == null || args[i].isBlank()) { return false; } } - return true; + return args.length == 3 || !args[3].matches("\\d+"); } - public static void seedSampleGameFileIfMissing() { - Path sourcePath = getSampleGameSourcePath(); - if (sourcePath == null) { - BotLogger.warning( - "LocalDevelopmentSampleGameService: RESOURCE_PATH is not configured; skipping sample game."); - return; - } - if (!Files.exists(sourcePath)) { - BotLogger.warning("LocalDevelopmentSampleGameService: sample game file not found: " + sourcePath); - return; - } - - try { - copySampleGameFileIfMissing(sourcePath, Storage.getGamePath(SAMPLE_GAME_FILE_NAME)); - } catch (IOException e) { - BotLogger.error("LocalDevelopmentSampleGameService: failed to seed local sample game file.", e); + public static String getStartupSourceGameName(String[] args) { + if (!isLocalDevelopmentStartup(args) || args.length < 4 || args[3] == null || args[3].isBlank()) { + return DEFAULT_SOURCE_GAME_NAME; } + return args[3]; } - public static void bootstrapSampleGame(Guild guild, @Nullable String localUserId) { + @Nullable + public static RecreateGameService.RecreateGameResult createAndRecreateTestGame( + Guild guild, @Nullable String developerUserId, @Nullable String sourceGameName) { if (guild == null) { - return; + return null; } - - Game game = GameManager.reload(SAMPLE_GAME_NAME); + String effectiveSourceGame = sourceGameName == null || sourceGameName.isBlank() + ? DEFAULT_SOURCE_GAME_NAME + : sourceGameName; + String testGameName = buildTestGameName(effectiveSourceGame, UUID.randomUUID()); + Game game = cloneSourceGame(effectiveSourceGame, testGameName); if (game == null) { - BotLogger.warning( - "LocalDevelopmentSampleGameService: sample game could not be loaded: " + SAMPLE_GAME_NAME); - return; + return null; } + Member developer = developerUserId == null ? null : guild.getMemberById(developerUserId); + return RecreateGameService.recreateGame(game, guild, developer); + } - prepareGameForLocalDevelopment(game); - - Member localMember = localUserId == null ? null : guild.getMemberById(localUserId); - Role gameRole = ensureGameRole(guild, game.getName(), localMember); - Category category = ensureCategory(guild, game.getName()); - - TextChannel tableTalkChannel = ensurePublicChannel( - guild, category, getTableTalkChannelName(game), game.getTableTalkChannel(), gameRole, localMember); - game.setTableTalkChannelID(tableTalkChannel.getId()); - - TextChannel actionsChannel = ensurePublicChannel( - guild, category, getActionsChannelName(game), game.getMainGameChannel(), gameRole, localMember); - game.setMainChannelID(actionsChannel.getId()); - - if (localMember != null) { - for (Player player : game.getRealPlayers()) { - TextChannel privateChannel = ensurePrivateChannel( - guild, - category, - getPrivateChannelName(game, player), - getPrivateTextChannel(player), - localMember); - player.setPrivateChannelID(privateChannel.getId()); + public static LocalDevelopmentCleanResult cleanTestGames(@Nullable Guild guild) { + LocalDevelopmentCleanResult result = new LocalDevelopmentCleanResult(); + List testGameNames = GameManager.getGameNames().stream() + .filter(RecreateGameService::isTestGame) + .toList(); + for (String gameName : testGameNames) { + Game game = GameManager.reload(gameName); + if (game != null && guild != null) { + deleteDiscordResources(game, guild, result); + } + if (GameManager.delete(gameName)) { + result.getDeletedGames().add(gameName); + } else { + result.getNotes().add("Failed to delete save for " + gameName); } - } else { - BotLogger.warning("LocalDevelopmentSampleGameService: local user is not a member of guild `" - + guild.getName() + "`; skipping sample private channel creation."); - } - - ThreadChannel botThread = ensureBotMapThread(game, actionsChannel); - game.setBotMapUpdatesThreadID(botThread.getId()); - - for (Player player : game.getRealPlayers()) { - warnIfCardsInfoThreadMissing(player); } + return result; + } - GameManager.save(game, "Bootstrapped local development sample game"); + static String buildTestGameName(String sourceGameName, UUID uuid) { + return sourceGameName + RecreateGameService.TEST_GAME_MARKER + uuid; } - static void copySampleGameFileIfMissing(Path sourcePath, Path targetPath) throws IOException { - if (Files.exists(targetPath)) { - return; + @Nullable + static Game cloneSourceGame(String sourceGameName, String targetGameName) { + Path sourcePath = resolveSourceGamePath(sourceGameName); + if (sourcePath == null) { + BotLogger.warning("LocalDevelopmentSampleGameService: source game not found: " + sourceGameName); + return null; } - Files.createDirectories(targetPath.getParent()); - Files.copy(sourcePath, targetPath); + Game game = GameManager.loadFromPath(sourcePath); + if (game == null) { + BotLogger.warning("LocalDevelopmentSampleGameService: failed to load source game: " + sourcePath); + return null; + } + prepareClonedGame(game, targetGameName); + if (!GameManager.save(game, "Created local development test game from " + sourceGameName)) { + BotLogger.warning("LocalDevelopmentSampleGameService: failed to save cloned test game: " + targetGameName); + return null; + } + return GameManager.reload(targetGameName); } - static void prepareGameForLocalDevelopment(Game game) { + static void prepareClonedGame(Game game, String targetGameName) { + game.setName(targetGameName); game.setHasEnded(false); game.setEndedDate(0); + game.setTableTalkChannelID(null); + game.setMainChannelID(null); + game.setSavedChannelID(null); + game.setSavedMessage(null); + game.setBotMapUpdatesThreadID(null); + game.setLaunchPostThreadID(null); + for (Player player : game.getPlayers().values()) { + player.setRoleIDForCommunity(null); + player.setPrivateChannelID(null); + player.setCardsInfoThreadID(null); + player.setBagInfoThreadID(null); + } } @Nullable - static Path getSampleGameSourcePath() { + static Path resolveSourceGamePath(String sourceGameName) { + String fileName = sourceGameName.endsWith(Constants.TXT) ? sourceGameName : sourceGameName + Constants.TXT; + Path storagePath = Storage.getGamePath(fileName); + if (Files.exists(storagePath)) { + return storagePath; + } String resourcePath = Storage.getResourcePath(); if (resourcePath == null) { return null; } - return Path.of(resourcePath) + Path testResourcePath = Path.of(resourcePath) .getParent() - .resolve("../test/resources/maps/" + SAMPLE_GAME_FILE_NAME) + .resolve("../test/resources/maps/" + fileName) .normalize(); + return Files.exists(testResourcePath) ? testResourcePath : null; } - private static Role ensureGameRole(Guild guild, String gameName, @Nullable Member localMember) { - Role role = guild.getRolesByName(gameName, true).stream().findFirst().orElseGet(() -> guild.createRole() - .setName(gameName) - .setMentionable(true) - .complete()); - if (localMember != null && !localMember.getRoles().contains(role)) { - guild.addRoleToMember(localMember, role).complete(); - } - return role; - } - - private static Category ensureCategory(Guild guild, String categoryName) { - return guild.getCategoriesByName(categoryName, true).stream() - .findFirst() - .orElseGet(() -> guild.createCategory(categoryName).complete()); - } - - private static TextChannel ensurePublicChannel( - Guild guild, - Category category, - String channelName, - @Nullable TextChannel existingChannel, - Role gameRole, - @Nullable Member localMember) { - if (isChannelOnGuild(existingChannel, guild)) { - return existingChannel; - } - - TextChannel channel = guild.getTextChannelsByName(channelName, true).stream() - .findFirst() - .orElseGet(() -> configurePublicChannel( - guild.createTextChannel(channelName, category), gameRole, localMember) - .complete()); - if (channel.getParentCategory() == null || !category.getId().equals(channel.getParentCategoryId())) { - channel.getManager().setParent(category).complete(); - } - return channel; - } - - private static ChannelAction configurePublicChannel( - ChannelAction action, Role gameRole, @Nullable Member localMember) { - long publicPermissions = Permission.VIEW_CHANNEL.getRawValue() - | Permission.MESSAGE_SEND.getRawValue() - | Permission.MESSAGE_HISTORY.getRawValue(); - action = action.syncPermissionOverrides().addRolePermissionOverride(gameRole.getIdLong(), publicPermissions, 0); - if (localMember != null) { - long memberPermissions = publicPermissions - | Permission.MANAGE_THREADS.getRawValue() - | Permission.CREATE_PRIVATE_THREADS.getRawValue() - | Permission.CREATE_PUBLIC_THREADS.getRawValue(); - action = action.addMemberPermissionOverride(localMember.getIdLong(), memberPermissions, 0); + private static void deleteDiscordResources(Game game, Guild guild, LocalDevelopmentCleanResult result) { + Set deletedChannelIds = new LinkedHashSet<>(); + deleteChannel(game.getTableTalkChannel(), deletedChannelIds, result); + deleteChannel(game.getMainGameChannel(), deletedChannelIds, result); + for (Player player : game.getPlayers().values()) { + if (player.getPrivateChannel() instanceof TextChannel channel) { + deleteChannel(channel, deletedChannelIds, result); + } + Role communityRole = player.getRoleForCommunity(); + if (communityRole != null && guild.equals(communityRole.getGuild())) { + deleteRole(communityRole, result); + } } - return action; - } - private static TextChannel ensurePrivateChannel( - Guild guild, - Category category, - String channelName, - @Nullable TextChannel existingChannel, - Member localMember) { - if (isChannelOnGuild(existingChannel, guild)) { - return existingChannel; + String sanitizedPrefix = RecreateGameService.getSanitizedGameChannelPrefix(game.getName()); + for (TextChannel channel : guild.getTextChannels()) { + if (channel.getName().startsWith(sanitizedPrefix)) { + deleteChannel(channel, deletedChannelIds, result); + } } - TextChannel channel = guild.getTextChannelsByName(channelName, true).stream() - .findFirst() - .orElseGet(() -> configurePrivateChannel( - guild.createTextChannel(channelName, category), guild, localMember) - .complete()); - if (channel.getParentCategory() == null || !category.getId().equals(channel.getParentCategoryId())) { - channel.getManager().setParent(category).complete(); + for (Role role : guild.getRolesByName(game.getName(), true)) { + deleteRole(role, result); } - return channel; - } - - private static ChannelAction configurePrivateChannel( - ChannelAction action, Guild guild, Member localMember) { - Role everyoneRole = guild.getPublicRole(); - long denyPermissions = Permission.VIEW_CHANNEL.getRawValue(); - long allowPermissions = Permission.VIEW_CHANNEL.getRawValue() - | Permission.MESSAGE_SEND.getRawValue() - | Permission.MESSAGE_HISTORY.getRawValue() - | Permission.MANAGE_THREADS.getRawValue(); - return action.syncPermissionOverrides() - .addRolePermissionOverride(everyoneRole.getIdLong(), 0, denyPermissions) - .addMemberPermissionOverride(localMember.getIdLong(), allowPermissions, 0); - } - - private static ThreadChannel ensureBotMapThread(Game game, TextChannel actionsChannel) { - ThreadChannel existingThread = game.getBotMapUpdatesThread(); - if (existingThread != null && actionsChannel.getGuild().equals(existingThread.getGuild())) { - return existingThread; + for (Role role : guild.getRolesByName(game.getName() + " GM", true)) { + deleteRole(role, result); } - String threadName = game.getName() + Constants.BOT_CHANNEL_SUFFIX; - List matchingThreads = actionsChannel.getGuild().getThreadChannelsByName(threadName, true); - if (!matchingThreads.isEmpty()) { - return matchingThreads.getFirst(); + Category category = guild.getCategoriesByName(game.getName(), true).stream().findFirst().orElse(null); + if (category != null && category.getChannels().isEmpty()) { + try { + category.delete().complete(); + result.getDeletedCategories().add(category.getName()); + } catch (Exception e) { + result.getNotes().add("Failed to delete category " + category.getName()); + } } - - return actionsChannel - .createThreadChannel(threadName) - .setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK) - .complete(); } - private static boolean isChannelOnGuild(@Nullable TextChannel channel, Guild guild) { - return channel != null && guild.getId().equals(channel.getGuild().getId()); - } - - @Nullable - private static TextChannel getPrivateTextChannel(Player player) { - return player.getPrivateChannel() instanceof TextChannel channel ? channel : null; - } - - private static void warnIfCardsInfoThreadMissing(Player player) { - if (player.getCardsInfoThread() == null) { - BotLogger.warning("LocalDevelopmentSampleGameService: failed to create cards info thread for " - + player.getUserName() + " in game " + player.getGame().getName()); + private static void deleteChannel( + @Nullable TextChannel channel, Set deletedChannelIds, LocalDevelopmentCleanResult result) { + if (channel == null || !deletedChannelIds.add(channel.getId())) { + return; } - } - - private static String getTableTalkChannelName(Game game) { - String customName = sanitizeChannelName(game.getCustomName()); - if (customName.isBlank()) { - return game.getName(); + try { + channel.delete().complete(); + result.getDeletedChannels().add(channel.getName()); + } catch (Exception e) { + result.getNotes().add("Failed to delete channel " + channel.getName()); } - return game.getName() + "-" + customName; } - private static String getActionsChannelName(Game game) { - return game.getName() + Constants.ACTIONS_CHANNEL_SUFFIX; - } - - private static String getPrivateChannelName(Game game, Player player) { - return game.getName() + "-" + sanitizeChannelName(player.getUserName()) + "-private"; - } - - @Nullable - private static String sanitizeChannelName(String name) { - if (name == null) { - return ""; + private static void deleteRole(Role role, LocalDevelopmentCleanResult result) { + try { + role.delete().complete(); + result.getDeletedRoles().add(role.getName()); + } catch (Exception e) { + result.getNotes().add("Failed to delete role " + role.getName()); + } + } + + @Getter + public static class LocalDevelopmentCleanResult { + private final List deletedGames = new ArrayList<>(); + private final List deletedChannels = new ArrayList<>(); + private final List deletedRoles = new ArrayList<>(); + private final List deletedCategories = new ArrayList<>(); + private final List notes = new ArrayList<>(); + + public String getSummary() { + List lines = new ArrayList<>(); + lines.add("Deleted test games: " + deletedGames.size()); + if (!deletedGames.isEmpty()) { + lines.add(String.join(", ", deletedGames)); + } + lines.add("Deleted channels: " + deletedChannels.size()); + lines.add("Deleted roles: " + deletedRoles.size()); + if (!deletedCategories.isEmpty()) { + lines.add("Deleted categories: " + String.join(", ", deletedCategories)); + } + if (!notes.isEmpty()) { + lines.add("Notes: " + String.join(" | ", notes)); + } + return String.join("\n", lines); } - return name.replaceAll("[/:. ]+", "-").replaceAll("^-+|-+$", ""); } } diff --git a/src/main/java/ti4/service/game/RecreateGameService.java b/src/main/java/ti4/service/game/RecreateGameService.java new file mode 100644 index 0000000000..ca83e65ae8 --- /dev/null +++ b/src/main/java/ti4/service/game/RecreateGameService.java @@ -0,0 +1,463 @@ +package ti4.service.game; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import javax.annotation.Nullable; +import lombok.Getter; +import lombok.experimental.UtilityClass; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.channel.concrete.Category; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; +import net.dv8tion.jda.api.requests.restaction.ChannelAction; +import ti4.game.Game; +import ti4.game.Player; +import ti4.game.persistence.GameManager; +import ti4.helpers.Constants; +import ti4.helpers.Helper; +import ti4.logging.BotLogger; +import ti4.message.MessageHelper; +import ti4.service.fow.GMService; + +@UtilityClass +public class RecreateGameService { + + public static final String LIMBO_CATEGORY_NAME = "The in-limbo PBD Archive"; + public static final String TEST_GAME_MARKER = "::test::"; + private static final String FOW_GM_CHANNEL_SUFFIX = "-gm-room"; + private static final String FOW_MAIN_CHANNEL_SUFFIX = "-anonymous-announcements-private"; + + public static RecreateGameResult recreateGame(Game game, Guild guild) { + return recreateGame(game, guild, null); + } + + public static RecreateGameResult recreateGame(Game game, Guild guild, @Nullable Member extraAccessMember) { + RecreateGameResult result = new RecreateGameResult(game.getName()); + if (guild == null) { + result.addNote("No guild was available."); + return result; + } + + if (game.isFowMode()) { + recreateFogOfWarRoles(game, guild, extraAccessMember, result); + moveFogOfWarChannelsOutOfLimbo(game, guild, result); + } else { + Role gameRole = game.isCommunityMode() ? null : ensurePrimaryGameRole(game, guild, extraAccessMember, result); + Category targetCategory = ensureTargetCategory(game, guild); + TextChannel tableTalkChannel = ensurePrimaryTextChannel( + guild, + game, + targetCategory, + getTableTalkChannelName(game), + game.getTableTalkChannel(), + gameRole, + extraAccessMember, + result); + if (tableTalkChannel != null) { + game.setTableTalkChannelID(tableTalkChannel.getId()); + } + + TextChannel actionsChannel = ensurePrimaryTextChannel( + guild, + game, + targetCategory, + getActionsChannelName(game), + game.getMainGameChannel(), + gameRole, + extraAccessMember, + result); + if (actionsChannel != null) { + game.setMainChannelID(actionsChannel.getId()); + ThreadChannel botThread = ensureBotMapThread(game, actionsChannel); + if (botThread != null) { + game.setBotMapUpdatesThreadID(botThread.getId()); + } + } + + recreateCommunityRoles(game, guild, result); + ensureCardsInfoThreads(game, result); + } + + Helper.fixGameChannelPermissions(guild, game); + List missingPlayers = collectMissingPlayers(game, guild); + result.getMissingPlayers().addAll(missingPlayers); + + if (!GameManager.save(game, "Recreated game resources")) { + result.addNote("Game save failed after recreation."); + } + pingGame(game, result); + return result; + } + + public static String getSourceGameName(String gameName) { + if (gameName == null) { + return ""; + } + int markerIndex = gameName.indexOf(TEST_GAME_MARKER); + return markerIndex == -1 ? gameName : gameName.substring(0, markerIndex); + } + + public static boolean isTestGame(String gameName) { + return gameName != null && gameName.contains(TEST_GAME_MARKER); + } + + public static String getSanitizedGameChannelPrefix(String gameName) { + return sanitizeTextChannelSegment(gameName); + } + + private static void recreateFogOfWarRoles( + Game game, Guild guild, @Nullable Member extraAccessMember, RecreateGameResult result) { + Role gameRole = ensureNamedRole(guild, game.getName(), true, result); + Role gmRole = ensureNamedRole(guild, game.getName() + " GM", true, result); + + for (Player player : game.getRealPlayers()) { + Member member = guild.getMemberById(player.getUserID()); + if (member == null) { + continue; + } + guild.addRoleToMember(member, gameRole).complete(); + } + + Member owner = guild.getMemberById(game.getOwnerID()); + if (owner != null) { + guild.addRoleToMember(owner, gmRole).complete(); + } + if (extraAccessMember != null) { + guild.addRoleToMember(extraAccessMember, gameRole).complete(); + guild.addRoleToMember(extraAccessMember, gmRole).complete(); + } + } + + private static void moveFogOfWarChannelsOutOfLimbo(Game game, Guild guild, RecreateGameResult result) { + Category targetCategory = ensureTargetCategory(game, guild); + if (targetCategory == null) { + return; + } + + TextChannel gmChannel = guild.getTextChannelsByName(game.getName() + FOW_GM_CHANNEL_SUFFIX, true).stream() + .findFirst() + .orElse(null); + TextChannel mainChannel = guild.getTextChannelsByName(game.getName() + FOW_MAIN_CHANNEL_SUFFIX, true).stream() + .findFirst() + .orElse(game.getMainGameChannel()); + + moveChannelIfNeeded(gmChannel, targetCategory, result); + moveChannelIfNeeded(mainChannel, targetCategory, result); + if (mainChannel != null) { + game.setMainChannelID(mainChannel.getId()); + } + } + + @Nullable + private static Role ensurePrimaryGameRole( + Game game, Guild guild, @Nullable Member extraAccessMember, RecreateGameResult result) { + Role role = ensureNamedRole(guild, game.getName(), true, result); + for (Player player : game.getRealPlayers()) { + Member member = guild.getMemberById(player.getUserID()); + if (member != null) { + guild.addRoleToMember(member, role).complete(); + } + } + if (extraAccessMember != null) { + guild.addRoleToMember(extraAccessMember, role).complete(); + } + return role; + } + + private static void recreateCommunityRoles(Game game, Guild guild, RecreateGameResult result) { + if (!game.isCommunityMode()) { + return; + } + for (Player player : game.getRealPlayers()) { + if (player.getRoleForCommunity() != null) { + continue; + } + Role role = guild.createRole() + .setName(game.getName() + "-" + player.getUserName()) + .setMentionable(false) + .complete(); + player.setRoleIDForCommunity(role.getId()); + Member member = guild.getMemberById(player.getUserID()); + if (member != null) { + guild.addRoleToMember(member, role).complete(); + } + result.getRecreatedRoles().add(role.getName()); + } + } + + @Nullable + private static Category ensureTargetCategory(Game game, Guild guild) { + String categoryName = getTargetCategoryName(game); + if (categoryName == null || categoryName.isBlank()) { + return null; + } + return ensureCategoryOnGuild(guild, categoryName); + } + + @Nullable + private static String getTargetCategoryName(Game game) { + if (game.isFowMode()) { + return game.getName(); + } + String categoryName = CreateGameService.getCategoryNameForGame(getSourceGameName(game.getName())); + if (categoryName != null) { + return categoryName; + } + TextChannel mainChannel = game.getMainGameChannel(); + if (mainChannel != null && mainChannel.getParentCategory() != null && !isInLimbo(mainChannel)) { + return mainChannel.getParentCategory().getName(); + } + TextChannel tableTalkChannel = game.getTableTalkChannel(); + if (tableTalkChannel != null && tableTalkChannel.getParentCategory() != null && !isInLimbo(tableTalkChannel)) { + return tableTalkChannel.getParentCategory().getName(); + } + return game.getName(); + } + + private static Category ensureCategoryOnGuild(Guild guild, String categoryName) { + return guild.getCategoriesByName(categoryName, true).stream() + .findFirst() + .orElseGet(() -> createCategoryOnGuild(guild, categoryName)); + } + + private static Category createCategoryOnGuild(Guild guild, String categoryName) { + EnumSet allow = EnumSet.of(Permission.VIEW_CHANNEL); + EnumSet deny = EnumSet.of(Permission.VIEW_CHANNEL); + Role bothelperRole = CreateGameService.getRole("Bothelper", guild); + Role spectatorRole = CreateGameService.getRole("Spectator", guild); + Role everyoneRole = guild.getPublicRole(); + ChannelAction createCategoryAction = guild.createCategory(categoryName); + if (bothelperRole != null) { + createCategoryAction = createCategoryAction.addRolePermissionOverride(bothelperRole.getIdLong(), allow, null); + } + if (spectatorRole != null) { + createCategoryAction = createCategoryAction.addRolePermissionOverride(spectatorRole.getIdLong(), allow, null); + } + if (everyoneRole != null) { + createCategoryAction = createCategoryAction.addRolePermissionOverride(everyoneRole.getIdLong(), null, deny); + } + return createCategoryAction.complete(); + } + + @Nullable + private static TextChannel ensurePrimaryTextChannel( + Guild guild, + Game game, + @Nullable Category targetCategory, + String channelName, + @Nullable TextChannel existingChannel, + @Nullable Role role, + @Nullable Member extraAccessMember, + RecreateGameResult result) { + TextChannel channel = existingChannel; + if (channel == null || !guild.equals(channel.getGuild())) { + channel = guild.getTextChannelsByName(channelName, true).stream().findFirst().orElse(null); + } + if (channel == null && targetCategory != null) { + channel = createPrimaryTextChannel(guild, game, targetCategory, channelName, role, extraAccessMember); + result.getCreatedChannels().add(channel.getName()); + } + moveChannelIfNeeded(channel, targetCategory, result); + if (channel != null && extraAccessMember != null) { + ensureExtraMemberPermission(channel, extraAccessMember); + } + return channel; + } + + private static TextChannel createPrimaryTextChannel( + Guild guild, + Game game, + Category targetCategory, + String channelName, + @Nullable Role role, + @Nullable Member extraAccessMember) { + ChannelAction action = guild.createTextChannel(channelName, targetCategory).syncPermissionOverrides(); + long allow = Permission.PIN_MESSAGES.getRawValue() + | Permission.VIEW_CHANNEL.getRawValue() + | Permission.MESSAGE_SEND.getRawValue() + | Permission.MESSAGE_HISTORY.getRawValue(); + if (role != null) { + action = action.addRolePermissionOverride(role.getIdLong(), allow, 0); + } else { + for (Player player : game.getRealPlayers()) { + Member member = guild.getMemberById(player.getUserID()); + if (member != null) { + action = action.addMemberPermissionOverride(member.getIdLong(), allow, 0); + } + } + } + if (extraAccessMember != null) { + long developerAllow = allow + | Permission.MANAGE_THREADS.getRawValue() + | Permission.CREATE_PUBLIC_THREADS.getRawValue() + | Permission.CREATE_PRIVATE_THREADS.getRawValue(); + action = action.addMemberPermissionOverride(extraAccessMember.getIdLong(), developerAllow, 0); + } + return action.complete(); + } + + @Nullable + private static ThreadChannel ensureBotMapThread(Game game, TextChannel actionsChannel) { + if (game.isFowMode()) { + return null; + } + ThreadChannel botThread = game.getBotMapUpdatesThread(); + if (botThread != null && actionsChannel.getGuild().equals(botThread.getGuild())) { + return botThread; + } + List matchingThreads = + actionsChannel.getGuild().getThreadChannelsByName(game.getName() + Constants.BOT_CHANNEL_SUFFIX, true); + if (!matchingThreads.isEmpty()) { + return matchingThreads.getFirst(); + } + return actionsChannel + .createThreadChannel(game.getName() + Constants.BOT_CHANNEL_SUFFIX) + .setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK) + .complete(); + } + + private static void ensureCardsInfoThreads(Game game, RecreateGameResult result) { + for (Player player : game.getRealPlayers()) { + if (player.getCardsInfoThread() == null) { + result.addNote("Cards info thread missing for " + player.getUserName()); + } + } + } + + private static void moveChannelIfNeeded( + @Nullable TextChannel channel, @Nullable Category targetCategory, RecreateGameResult result) { + if (channel == null || targetCategory == null) { + return; + } + Category parentCategory = channel.getParentCategory(); + if (parentCategory == null + || isInLimbo(channel) + || !targetCategory.getId().equals(channel.getParentCategoryId())) { + channel.getManager().setParent(targetCategory).complete(); + result.getMovedChannels().add(channel.getName()); + } + } + + private static boolean isInLimbo(TextChannel channel) { + return channel.getParentCategory() != null + && LIMBO_CATEGORY_NAME.equalsIgnoreCase(channel.getParentCategory().getName()); + } + + private static void ensureExtraMemberPermission(TextChannel channel, Member extraAccessMember) { + long developerAllow = Permission.PIN_MESSAGES.getRawValue() + | Permission.VIEW_CHANNEL.getRawValue() + | Permission.MESSAGE_SEND.getRawValue() + | Permission.MESSAGE_HISTORY.getRawValue() + | Permission.MANAGE_THREADS.getRawValue() + | Permission.CREATE_PUBLIC_THREADS.getRawValue() + | Permission.CREATE_PRIVATE_THREADS.getRawValue(); + channel.getManager() + .putMemberPermissionOverride(extraAccessMember.getIdLong(), developerAllow, 0) + .complete(); + } + + private static Role ensureNamedRole(Guild guild, String roleName, boolean mentionable, RecreateGameResult result) { + Role role = guild.getRolesByName(roleName, true).stream().findFirst().orElse(null); + if (role != null) { + return role; + } + role = guild.createRole().setName(roleName).setMentionable(mentionable).complete(); + result.getRecreatedRoles().add(role.getName()); + return role; + } + + private static List collectMissingPlayers(Game game, Guild guild) { + List missingPlayers = new ArrayList<>(); + for (Player player : game.getRealPlayers()) { + if (guild.getMemberById(player.getUserID()) == null) { + missingPlayers.add(player.getUserName() + " (" + player.getUserID() + ")"); + } + } + return missingPlayers; + } + + private static void pingGame(Game game, RecreateGameResult result) { + TextChannel channel = game.getTableTalkChannel(); + if (channel == null) { + channel = game.getMainGameChannel(); + } + if (channel == null) { + return; + } + StringBuilder message = new StringBuilder(game.getPing()) + .append(" this game's Discord resources were recreated."); + if (!result.getMissingPlayers().isEmpty()) { + message.append("\nMissing from server: ").append(String.join(", ", result.getMissingPlayers())); + } + MessageHelper.sendMessageToChannel(channel, message.toString()); + if (game.isFowMode()) { + MessageHelper.sendMessageToChannel(GMService.getGMChannel(game), message.toString()); + } + } + + private static String getTableTalkChannelName(Game game) { + String customName = sanitizeTextChannelSegment(game.getCustomName()); + if (customName.isBlank()) { + return getSanitizedGameChannelPrefix(game.getName()); + } + return getSanitizedGameChannelPrefix(game.getName()) + "-" + customName; + } + + private static String getActionsChannelName(Game game) { + return getSanitizedGameChannelPrefix(game.getName()) + Constants.ACTIONS_CHANNEL_SUFFIX; + } + + private static String sanitizeTextChannelSegment(String name) { + if (name == null) { + return ""; + } + return name.toLowerCase() + .replaceAll("[^a-z0-9]+", "-") + .replaceAll("^-+|-+$", ""); + } + + @Getter + public static class RecreateGameResult { + private final String gameName; + private final List recreatedRoles = new ArrayList<>(); + private final List createdChannels = new ArrayList<>(); + private final List movedChannels = new ArrayList<>(); + private final List missingPlayers = new ArrayList<>(); + private final List notes = new ArrayList<>(); + + public RecreateGameResult(String gameName) { + this.gameName = gameName; + } + + public void addNote(String note) { + notes.add(note); + } + + public String getSummary() { + List lines = new ArrayList<>(); + lines.add("Recreated game resources for `" + gameName + "`."); + if (!recreatedRoles.isEmpty()) { + lines.add("Recreated roles: " + String.join(", ", recreatedRoles)); + } + if (!createdChannels.isEmpty()) { + lines.add("Created channels: " + String.join(", ", createdChannels)); + } + if (!movedChannels.isEmpty()) { + lines.add("Moved channels: " + String.join(", ", movedChannels)); + } + if (!missingPlayers.isEmpty()) { + lines.add("Missing from server: " + String.join(", ", missingPlayers)); + } + if (!notes.isEmpty()) { + lines.add("Notes: " + String.join(" | ", new LinkedHashSet<>(notes))); + } + return String.join("\n", lines); + } + } +} diff --git a/src/main/java/ti4/spring/jda/JdaService.java b/src/main/java/ti4/spring/jda/JdaService.java index a75ad22824..f55d1367b4 100644 --- a/src/main/java/ti4/spring/jda/JdaService.java +++ b/src/main/java/ti4/spring/jda/JdaService.java @@ -310,9 +310,6 @@ public void init() { AliasHandler.init(); // create directories for games files Storage.init(); - if (LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(args)) { - LocalDevelopmentSampleGameService.seedSampleGameFileIfMissing(); - } SelectionManager.init(); initializeWhitelistedRoles(); TIGLHelper.validateTIGLness(); @@ -323,7 +320,8 @@ public void init() { GameManager.initialize(); if (LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(args)) { String localUserId = args.length > 1 ? args[1] : null; - LocalDevelopmentSampleGameService.bootstrapSampleGame(guildPrimary, localUserId); + String sourceGameName = LocalDevelopmentSampleGameService.getStartupSourceGameName(args); + LocalDevelopmentSampleGameService.createAndRecreateTestGame(guildPrimary, localUserId, sourceGameName); } BotLogger.info("FINISHED LOADING GAMES"); diff --git a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java index 17bd2764aa..7f7faf6e81 100644 --- a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java +++ b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java @@ -2,49 +2,78 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.nio.file.Files; -import java.nio.file.Path; +import java.util.UUID; import org.junit.jupiter.api.Test; import ti4.game.Game; +import ti4.game.Player; import ti4.testUtils.BaseTi4Test; class LocalDevelopmentSampleGameServiceTest extends BaseTi4Test { @Test - void copySampleGameFileIfMissingCreatesNewFileButDoesNotOverwrite() throws Exception { - Path tempDirectory = Files.createTempDirectory("local-dev-sample"); - Path sourceFile = tempDirectory.resolve("source.txt"); - Path targetFile = tempDirectory.resolve("target.txt"); - - Files.writeString(sourceFile, "sample"); - LocalDevelopmentSampleGameService.copySampleGameFileIfMissing(sourceFile, targetFile); - assertEquals("sample", Files.readString(targetFile)); - - Files.writeString(targetFile, "existing"); - LocalDevelopmentSampleGameService.copySampleGameFileIfMissing(sourceFile, targetFile); - assertEquals("existing", Files.readString(targetFile)); - } - - @Test - void prepareGameForLocalDevelopmentClearsEndedState() { + void prepareClonedGameRenamesGameAndClearsDiscordIds() { Game game = new Game(); + game.setName("source"); game.setHasEnded(true); game.setEndedDate(123L); + game.setTableTalkChannelID("table"); + game.setMainChannelID("main"); + game.setSavedChannelID("saved"); + game.setSavedMessage("message"); + game.setBotMapUpdatesThreadID("bot"); + game.setLaunchPostThreadID("launch"); + Player player = game.addPlayer("1", "player"); + player.setRoleIDForCommunity("role"); + player.setPrivateChannelID("private"); + player.setCardsInfoThreadID("cards"); + player.setBagInfoThreadID("bag"); - LocalDevelopmentSampleGameService.prepareGameForLocalDevelopment(game); + LocalDevelopmentSampleGameService.prepareClonedGame(game, "source::test::uuid"); + assertEquals("source::test::uuid", game.getName()); assertFalse(game.isHasEnded()); assertEquals(0, game.getEndedDate()); + assertNull(game.getTableTalkChannelID()); + assertNull(game.getMainChannelID()); + assertNull(game.getSavedChannelID()); + assertNull(game.getSavedMessage()); + assertNull(game.getBotMapUpdatesThreadID()); + assertNull(game.getLaunchPostThreadID()); + assertNull(player.getRoleIDForCommunity()); + assertNull(player.getPrivateChannelID()); + assertNull(player.getCardsInfoThreadID()); + assertNull(player.getBagInfoThreadID()); } @Test - void isLocalDevelopmentStartupRequiresSingleGuildLaunchArguments() { + void isLocalDevelopmentStartupAcceptsOptionalNonGuildSourceArgument() { assertTrue( LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user", "guild"})); - assertFalse(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup(new String[] {"token", "user"})); + assertTrue(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup( + new String[] {"token", "user", "guild", "pbd15036"})); assertFalse(LocalDevelopmentSampleGameService.isLocalDevelopmentStartup( - new String[] {"token", "user", "guild", "community"})); + new String[] {"token", "user", "guild", "123456789"})); + } + + @Test + void startupSourceGameDefaultsAndRespectsOverride() { + assertEquals( + LocalDevelopmentSampleGameService.DEFAULT_SOURCE_GAME_NAME, + LocalDevelopmentSampleGameService.getStartupSourceGameName(new String[] {"token", "user", "guild"})); + assertEquals( + "pbd42", + LocalDevelopmentSampleGameService.getStartupSourceGameName( + new String[] {"token", "user", "guild", "pbd42"})); + } + + @Test + void buildTestGameNameUsesMarkerAndUuid() { + UUID uuid = UUID.fromString("123e4567-e89b-12d3-a456-426614174000"); + assertEquals( + "pbd15036::test::123e4567-e89b-12d3-a456-426614174000", + LocalDevelopmentSampleGameService.buildTestGameName("pbd15036", uuid)); } } diff --git a/src/test/java/ti4/service/game/RecreateGameServiceTest.java b/src/test/java/ti4/service/game/RecreateGameServiceTest.java new file mode 100644 index 0000000000..dd6ecc5c2c --- /dev/null +++ b/src/test/java/ti4/service/game/RecreateGameServiceTest.java @@ -0,0 +1,31 @@ +package ti4.service.game; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import ti4.testUtils.BaseTi4Test; + +class RecreateGameServiceTest extends BaseTi4Test { + + @Test + void sourceGameNameStripsTestSuffix() { + assertEquals("pbd15036", RecreateGameService.getSourceGameName("pbd15036::test::abc")); + assertEquals("pbd15036", RecreateGameService.getSourceGameName("pbd15036")); + } + + @Test + void testGameDetectionMatchesMarker() { + assertTrue(RecreateGameService.isTestGame("pbd15036::test::abc")); + assertFalse(RecreateGameService.isTestGame("pbd15036")); + } + + @Test + void sanitizedGameChannelPrefixRemovesUnsupportedCharacters() { + assertEquals( + "pbd15036-test-123e4567-e89b-12d3-a456-426614174000", + RecreateGameService.getSanitizedGameChannelPrefix( + "pbd15036::test::123e4567-e89b-12d3-a456-426614174000")); + } +} From ea4f6ab495b78af8e713764ea958fee72fec53a1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 11:28:35 +0000 Subject: [PATCH 07/57] Format recreate game and local dev workflow Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/c9203464-1fed-4a9b-ae7a-4b9efbe44c4b Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../commands/developer/LocalDevelopment.java | 7 +++-- .../ti4/game/persistence/GameManager.java | 2 +- .../LocalDevelopmentSampleGameService.java | 9 +++--- .../ti4/service/game/RecreateGameService.java | 29 ++++++++++--------- ...LocalDevelopmentSampleGameServiceTest.java | 7 ++--- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/main/java/ti4/commands/developer/LocalDevelopment.java b/src/main/java/ti4/commands/developer/LocalDevelopment.java index b9da0f0959..29f8ed53a9 100644 --- a/src/main/java/ti4/commands/developer/LocalDevelopment.java +++ b/src/main/java/ti4/commands/developer/LocalDevelopment.java @@ -25,8 +25,8 @@ class LocalDevelopment extends Subcommand { addOptions(new OptionData(OptionType.STRING, Constants.SOURCE, "Source game name") .setRequired(false) .setAutoComplete(true)); - addOptions(new OptionData(OptionType.STRING, Constants.CONFIRM, "Type YES to confirm cleanup") - .setRequired(false)); + addOptions( + new OptionData(OptionType.STRING, Constants.CONFIRM, "Type YES to confirm cleanup").setRequired(false)); } @Override @@ -56,7 +56,8 @@ public void execute(SlashCommandInteractionEvent event) { RecreateGameService.RecreateGameResult result = LocalDevelopmentSampleGameService.createAndRecreateTestGame( guild, event.getUser().getId(), sourceGame); if (result == null) { - MessageHelper.replyToMessage(event, "Failed to create a local development test game from `" + sourceGame + "`."); + MessageHelper.replyToMessage( + event, "Failed to create a local development test game from `" + sourceGame + "`."); return; } MessageHelper.replyToMessage(event, result.getSummary()); diff --git a/src/main/java/ti4/game/persistence/GameManager.java b/src/main/java/ti4/game/persistence/GameManager.java index 3b9b13077d..9124152a6c 100644 --- a/src/main/java/ti4/game/persistence/GameManager.java +++ b/src/main/java/ti4/game/persistence/GameManager.java @@ -1,5 +1,6 @@ package ti4.game.persistence; +import java.nio.file.Path; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -7,7 +8,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.nio.file.Path; import javax.annotation.Nullable; import lombok.experimental.UtilityClass; import ti4.game.Game; diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index 55ad1815e7..d61bcd4a17 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -52,9 +52,8 @@ public static RecreateGameService.RecreateGameResult createAndRecreateTestGame( if (guild == null) { return null; } - String effectiveSourceGame = sourceGameName == null || sourceGameName.isBlank() - ? DEFAULT_SOURCE_GAME_NAME - : sourceGameName; + String effectiveSourceGame = + sourceGameName == null || sourceGameName.isBlank() ? DEFAULT_SOURCE_GAME_NAME : sourceGameName; String testGameName = buildTestGameName(effectiveSourceGame, UUID.randomUUID()); Game game = cloneSourceGame(effectiveSourceGame, testGameName); if (game == null) { @@ -171,7 +170,9 @@ private static void deleteDiscordResources(Game game, Guild guild, LocalDevelopm deleteRole(role, result); } - Category category = guild.getCategoriesByName(game.getName(), true).stream().findFirst().orElse(null); + Category category = guild.getCategoriesByName(game.getName(), true).stream() + .findFirst() + .orElse(null); if (category != null && category.getChannels().isEmpty()) { try { category.delete().complete(); diff --git a/src/main/java/ti4/service/game/RecreateGameService.java b/src/main/java/ti4/service/game/RecreateGameService.java index ca83e65ae8..0d70be07a2 100644 --- a/src/main/java/ti4/service/game/RecreateGameService.java +++ b/src/main/java/ti4/service/game/RecreateGameService.java @@ -4,7 +4,6 @@ import java.util.EnumSet; import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; import javax.annotation.Nullable; import lombok.Getter; import lombok.experimental.UtilityClass; @@ -21,7 +20,6 @@ import ti4.game.persistence.GameManager; import ti4.helpers.Constants; import ti4.helpers.Helper; -import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.fow.GMService; @@ -48,7 +46,8 @@ public static RecreateGameResult recreateGame(Game game, Guild guild, @Nullable recreateFogOfWarRoles(game, guild, extraAccessMember, result); moveFogOfWarChannelsOutOfLimbo(game, guild, result); } else { - Role gameRole = game.isCommunityMode() ? null : ensurePrimaryGameRole(game, guild, extraAccessMember, result); + Role gameRole = + game.isCommunityMode() ? null : ensurePrimaryGameRole(game, guild, extraAccessMember, result); Category targetCategory = ensureTargetCategory(game, guild); TextChannel tableTalkChannel = ensurePrimaryTextChannel( guild, @@ -234,10 +233,12 @@ private static Category createCategoryOnGuild(Guild guild, String categoryName) Role everyoneRole = guild.getPublicRole(); ChannelAction createCategoryAction = guild.createCategory(categoryName); if (bothelperRole != null) { - createCategoryAction = createCategoryAction.addRolePermissionOverride(bothelperRole.getIdLong(), allow, null); + createCategoryAction = + createCategoryAction.addRolePermissionOverride(bothelperRole.getIdLong(), allow, null); } if (spectatorRole != null) { - createCategoryAction = createCategoryAction.addRolePermissionOverride(spectatorRole.getIdLong(), allow, null); + createCategoryAction = + createCategoryAction.addRolePermissionOverride(spectatorRole.getIdLong(), allow, null); } if (everyoneRole != null) { createCategoryAction = createCategoryAction.addRolePermissionOverride(everyoneRole.getIdLong(), null, deny); @@ -257,7 +258,9 @@ private static TextChannel ensurePrimaryTextChannel( RecreateGameResult result) { TextChannel channel = existingChannel; if (channel == null || !guild.equals(channel.getGuild())) { - channel = guild.getTextChannelsByName(channelName, true).stream().findFirst().orElse(null); + channel = guild.getTextChannelsByName(channelName, true).stream() + .findFirst() + .orElse(null); } if (channel == null && targetCategory != null) { channel = createPrimaryTextChannel(guild, game, targetCategory, channelName, role, extraAccessMember); @@ -277,7 +280,8 @@ private static TextChannel createPrimaryTextChannel( String channelName, @Nullable Role role, @Nullable Member extraAccessMember) { - ChannelAction action = guild.createTextChannel(channelName, targetCategory).syncPermissionOverrides(); + ChannelAction action = + guild.createTextChannel(channelName, targetCategory).syncPermissionOverrides(); long allow = Permission.PIN_MESSAGES.getRawValue() | Permission.VIEW_CHANNEL.getRawValue() | Permission.MESSAGE_SEND.getRawValue() @@ -346,7 +350,8 @@ private static void moveChannelIfNeeded( private static boolean isInLimbo(TextChannel channel) { return channel.getParentCategory() != null - && LIMBO_CATEGORY_NAME.equalsIgnoreCase(channel.getParentCategory().getName()); + && LIMBO_CATEGORY_NAME.equalsIgnoreCase( + channel.getParentCategory().getName()); } private static void ensureExtraMemberPermission(TextChannel channel, Member extraAccessMember) { @@ -390,8 +395,8 @@ private static void pingGame(Game game, RecreateGameResult result) { if (channel == null) { return; } - StringBuilder message = new StringBuilder(game.getPing()) - .append(" this game's Discord resources were recreated."); + StringBuilder message = + new StringBuilder(game.getPing()).append(" this game's Discord resources were recreated."); if (!result.getMissingPlayers().isEmpty()) { message.append("\nMissing from server: ").append(String.join(", ", result.getMissingPlayers())); } @@ -417,9 +422,7 @@ private static String sanitizeTextChannelSegment(String name) { if (name == null) { return ""; } - return name.toLowerCase() - .replaceAll("[^a-z0-9]+", "-") - .replaceAll("^-+|-+$", ""); + return name.toLowerCase().replaceAll("[^a-z0-9]+", "-").replaceAll("^-+|-+$", ""); } @Getter diff --git a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java index 7f7faf6e81..2574eb53db 100644 --- a/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java +++ b/src/test/java/ti4/service/game/LocalDevelopmentSampleGameServiceTest.java @@ -63,10 +63,9 @@ void startupSourceGameDefaultsAndRespectsOverride() { assertEquals( LocalDevelopmentSampleGameService.DEFAULT_SOURCE_GAME_NAME, LocalDevelopmentSampleGameService.getStartupSourceGameName(new String[] {"token", "user", "guild"})); - assertEquals( - "pbd42", - LocalDevelopmentSampleGameService.getStartupSourceGameName( - new String[] {"token", "user", "guild", "pbd42"})); + assertEquals("pbd42", LocalDevelopmentSampleGameService.getStartupSourceGameName(new String[] { + "token", "user", "guild", "pbd42" + })); } @Test From 48ccc1f5e63dca6258cfb0f4418094259fc26dd0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 11:35:00 +0000 Subject: [PATCH 08/57] Tighten local dev source path resolution Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/c9203464-1fed-4a9b-ae7a-4b9efbe44c4b Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- .../service/game/LocalDevelopmentSampleGameService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java index d61bcd4a17..3fdd54480c 100644 --- a/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java +++ b/src/main/java/ti4/service/game/LocalDevelopmentSampleGameService.java @@ -135,9 +135,13 @@ static Path resolveSourceGamePath(String sourceGameName) { if (resourcePath == null) { return null; } - Path testResourcePath = Path.of(resourcePath) + Path mainResourcesPath = Path.of(resourcePath); + Path testResourcePath = mainResourcesPath .getParent() - .resolve("../test/resources/maps/" + fileName) + .resolveSibling("test") + .resolve("resources") + .resolve("maps") + .resolve(fileName) .normalize(); return Files.exists(testResourcePath) ? testResourcePath : null; } From b6a5efae8a0e7d277e1d049f2baafadb1d0e157a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 11:36:52 +0000 Subject: [PATCH 09/57] Relax local dev clean confirmation casing Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/c9203464-1fed-4a9b-ae7a-4b9efbe44c4b Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- src/main/java/ti4/commands/developer/LocalDevelopment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ti4/commands/developer/LocalDevelopment.java b/src/main/java/ti4/commands/developer/LocalDevelopment.java index 29f8ed53a9..0611658f9a 100644 --- a/src/main/java/ti4/commands/developer/LocalDevelopment.java +++ b/src/main/java/ti4/commands/developer/LocalDevelopment.java @@ -40,7 +40,7 @@ public void execute(SlashCommandInteractionEvent event) { String action = event.getOption(Constants.ACTION, ACTION_CREATE, OptionMapping::getAsString); if (ACTION_CLEAN.equals(action)) { String confirm = event.getOption(Constants.CONFIRM, "", OptionMapping::getAsString); - if (!"YES".equals(confirm)) { + if (!"YES".equalsIgnoreCase(confirm)) { MessageHelper.replyToMessage(event, "Cleanup requires `confirm: YES`."); return; } From ee8eb947b3f4af2cbfd604378ef3c559aba91412 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 16:08:28 +0000 Subject: [PATCH 10/57] Merge master package moves into recreate workflow Agent-Logs-Url: https://github.com/AsyncTI4/TI4_map_generator_bot/sessions/77b67617-2780-4fe9-8d0a-f86c22440e94 Co-authored-by: wholton <3317595+wholton@users.noreply.github.com> --- spotbugs-exclude.xml | 6 - src/main/java/ti4/AsyncTI4DiscordBot.java | 2 +- .../ti4/commands/SlashCommandManager.java | 144 ----------------- src/main/java/ti4/cron/AutoPingCron.java | 2 +- .../java/ti4/cron/CategoryCleanupCron.java | 2 +- .../cron/LogButtonRuntimeStatisticsCron.java | 2 +- .../{spring/jda => discord}/JdaService.java | 60 +++----- .../buttons/ButtonProcessor.java | 10 +- .../buttons/ButtonRuntimeWarningService.java | 2 +- .../interactions}/buttons/Buttons.java | 2 +- .../actioncards/ActionCardButtonHandler.java | 4 +- .../ActionCardDeck2ButtonHandler.java | 6 +- .../ActionCardHandButtonHandler.java | 6 +- .../PickFromDiscardButtonHandler.java | 4 +- .../ShowActionCardsButtonHandler.java | 4 +- .../agenda/AgendaResolveButtonHandler.java | 96 ++++++------ .../ChecksAndBalancesButtonHandler.java | 6 +- .../agenda/ColonialButtonHandler.java | 4 +- .../agenda/DrawAgendaButtonHandler.java | 4 +- .../handlers/agenda/EdictPhaseHandler.java | 6 +- .../agenda/LookAgendaButtonHandler.java | 4 +- .../agenda/PutAgendaButtonHandler.java | 6 +- .../handlers/agenda/VoteButtonHandler.java | 6 +- .../resolver/AbolishmentAgendaResolver.java | 2 +- .../AbsolAbolishmentAgendaResolver.java | 2 +- .../resolver/AbsolArtifactAgendaResolver.java | 4 +- .../resolver/AbsolChecksAgendaResolver.java | 2 +- .../AbsolConstitutionAgendaResolver.java | 2 +- .../resolver/AbsolMeasuresAgendaResolver.java | 2 +- .../resolver/AbsolSeedsAgendaResolver.java | 2 +- .../agenda/resolver/AgendaResolver.java | 2 +- .../resolver/ArmsReductionAgendaResolver.java | 2 +- .../resolver/ArticlesOfWarAgendaResolver.java | 2 +- .../resolver/ArtifactAgendaResolver.java | 4 +- .../ChecksAndBalancesFlagAgendaResolver.java | 2 +- .../resolver/ClandestineAgendaResolver.java | 2 +- .../resolver/ConstitutionAgendaResolver.java | 2 +- .../resolver/ConventionsAgendaResolver.java | 2 +- .../agenda/resolver/CrisisAgendaResolver.java | 4 +- .../resolver/DefenseActAgendaResolver.java | 2 +- .../resolver/DisarmamentAgendaResolver.java | 2 +- .../EconomicEqualityAgendaResolver.java | 2 +- .../resolver/ElectSecretAgendaResolver.java | 2 +- .../ExecutionDirectiveAgendaResolver.java | 2 +- .../resolver/ForAgainstAgendaResolver.java | 2 +- .../GrantReallocationAgendaResolver.java | 4 +- .../resolver/IncentiveAgendaResolver.java | 2 +- .../MinisterAntiquitiesAgendaResolver.java | 2 +- .../MiscountMessageAgendaResolver.java | 2 +- .../agenda/resolver/MutinyAgendaResolver.java | 2 +- .../agenda/resolver/NexusAgendaResolver.java | 2 +- .../resolver/PlowsharesAgendaResolver.java | 2 +- .../PoliticalCensureAgendaResolver.java | 2 +- .../resolver/RearmamentAgendaResolver.java | 2 +- .../RedistributionAgendaResolver.java | 4 +- .../resolver/RegulationsAgendaResolver.java | 2 +- ...epresentativeGovernmentAgendaResolver.java | 2 +- .../RevolutionFlagAgendaResolver.java | 2 +- .../resolver/SanctionsAgendaResolver.java | 2 +- .../resolver/SchematicsAgendaResolver.java | 2 +- .../resolver/SeedEmpireAgendaResolver.java | 2 +- .../SharedResearchAgendaResolver.java | 2 +- .../StandardizationAgendaResolver.java | 2 +- .../resolver/TravelBanAgendaResolver.java | 2 +- .../UnconventionalAgendaResolver.java | 2 +- .../VoiceOfTheCouncilLawAgendaResolver.java | 2 +- .../resolver/WarrantAgendaResolver.java | 2 +- .../resolver/WormholeReconAgendaResolver.java | 2 +- .../WormholeResearchAgendaResolver.java | 2 +- .../combat/BombardmentButtonHandler.java | 6 +- .../handlers/combat/CombatButtonHandler.java | 6 +- .../handlers/combat/RetreatButtonHandler.java | 6 +- .../CommandCounterButtonHandler.java | 6 +- .../ConvertCommoditiesButtonHandler.java | 4 +- .../handlers/draft/FrankenButtonHandler.java | 6 +- .../handlers/draft/MiltyButtonHandler.java | 4 +- .../explore/ExploreButtonHandler.java | 6 +- .../explore/StarChartsButtonHandler.java | 4 +- .../facilities/CoreFactoryButtonHandler.java | 6 +- .../faction/FactionMiscButtonHandler.java | 4 +- .../faction/OtherHeroButtonHandler.java | 6 +- .../base/arborec/ArborecButtonHandlers.java | 4 +- .../base/argent/ArgentButtonHandler.java | 4 +- .../base/creuss/CreussButtonHandler.java | 6 +- .../base/jolnar/JolnarButtonHandler.java | 4 +- .../base/l1z1x/L1Z1XButtonHandler.java | 4 +- .../base/muaat/MuaatHeroButtonHandler.java | 4 +- .../base/naalu/NaaluButtonHandler.java | 4 +- .../base/nekro/NekroAgentButtonHandler.java | 4 +- .../nekro/NekroFollowTechButtonHandler.java | 6 +- .../base/nekro/NekroHeroButtonHandler.java | 6 +- .../base/winnu/WinnuButtonHandler.java | 4 +- .../base/xxcha/XxchaAgentButtonHandler.java | 4 +- .../base/yin/YinHeroButtonHandler.java | 8 +- .../base/yin/YinSpinnerButtonHandler.java | 4 +- .../base/yssaril/YssarilButtonHandler.java | 6 +- .../cymiae/CymiaeButtonHandler.java | 6 +- .../dihmohn/DihmohnButtonHandler.java | 4 +- .../glimmer/GlimmerButtonHandler.java | 4 +- .../kollect/KollectAgentButtonHandler.java | 6 +- .../kollect/KollectButtonHandler.java | 4 +- .../qhet/QhetButtonHandler.java | 6 +- .../toldar/ToldarButtonHandler.java | 4 +- .../zelian/ZelianHeroButtonHandler.java | 4 +- .../ZephyrionAgentButtonHandler.java | 4 +- .../ZephyrionBountyButtonHandler.java | 6 +- .../ZephyrionBreakthroughButtonHandler.java | 6 +- .../faction/pok/cabal/CabalButtonHandler.java | 6 +- .../pok/mahact/MahactAgentButtonHandler.java | 4 +- .../mahact/MahactCommanderButtonHandler.java | 4 +- .../pok/mahact/MahactHeroButtonHandler.java | 6 +- .../keleres/KeleresButtonHandler.java | 6 +- .../ralnel/RalNelButtonHandler.java | 4 +- .../GalacticEventButtonHandler.java | 8 +- .../game/CreateGameButtonHandler.java | 10 +- .../handlers/game/EditTagsButtonHandler.java | 6 +- .../handlers/game/EndGameButtonHandler.java | 6 +- .../handlers/game/RematchButtonHandler.java | 4 +- .../handlers/game/ShowGameButtonHandler.java | 4 +- .../game/SwapFactionButtonHandler.java | 4 +- .../handlers/game/UndoButtonHandler.java | 4 +- .../info/AbilityInfoButtonHandler.java | 4 +- .../info/BreakthroughInfoButtonHandler.java | 4 +- .../handlers/info/CardsInfoButtonHandler.java | 4 +- .../info/LeaderInfoButtonHandler.java | 4 +- .../info/ListPlayerInfoButtonHandler.java | 6 +- .../info/PromissoryInfoButtonHandler.java | 4 +- .../handlers/info/RelicInfoButtonHandler.java | 4 +- .../SecretObjectiveInfoButtonHandler.java | 4 +- .../handlers/info/TechInfoButtonHandler.java | 4 +- .../handlers/info/UnitInfoButtonHandler.java | 4 +- .../map/AddTileListButtonHandler.java | 4 +- .../handlers/map/MapViewButtonHandler.java | 6 +- .../map/RingSelectionButtonHandler.java | 4 +- .../milty/MiltyDraftButtonHandlers.java | 6 +- .../milty/SettingMenuButtonHandlers.java | 4 +- .../SecretObjectiveButtonHandler.java | 6 +- .../ElectVoiceOfTheCouncilButtonHandler.java | 4 +- .../options/GameOptionButtonHandler.java | 4 +- .../options/PingIntervalButtonHandler.java | 6 +- .../PlayerPreferenceButtonHandler.java | 6 +- .../handlers/other/CaptureButtonHandler.java | 4 +- .../other/DeleteButtonsButtonHandler.java | 6 +- .../handlers/other/NotepadButtonHandler.java | 6 +- .../handlers/other/TrapButtonHandler.java | 4 +- .../phases/DoAnotherActionButtonHandler.java | 4 +- .../phases/GamePhaseButtonHandler.java | 6 +- .../phases/ProceedToScoringButtonHandler.java | 4 +- .../phases/StatusPhaseButtonHandler.java | 6 +- .../phases/StrategyPhaseButtonHandler.java | 4 +- .../handlers/phases/TurnEndButtonHandler.java | 4 +- .../planet/IndustrexButtonHandler.java | 4 +- .../planet/LegendaryPlanetButtonHandler.java | 4 +- .../handlers/planet/MalliceButtonHandler.java | 4 +- .../planet/PlanetExhaustButtonHandler.java | 6 +- .../planet/PlanetInfoButtonHandler.java | 4 +- .../handlers/planet/PrismButtonHandler.java | 6 +- .../planet/TradeStationButtonHandler.java | 6 +- .../PlayerPromissoryButtonHandler.java | 4 +- .../relics/DrawRelicButtonHandler.java | 4 +- .../relics/HomebrewRelicButtonHandler.java | 4 +- .../relics/JRStructureButtonHandler.java | 4 +- .../handlers/relics/RelicButtonHandler.java | 4 +- .../relics/StellarConverterButtonHandler.java | 4 +- .../spending/SpendingButtonHandler.java | 8 +- .../StatsTrackingButtonHandler.java | 4 +- .../DiplomacyStrategyCardButtonHandler.java | 4 +- .../FollowStrategyCardButtonHandler.java | 4 +- .../IgnisStrategyCardButtonHandler.java | 4 +- .../LeadershipStrategyCardButtonHandler.java | 6 +- .../PickStrategyCardButtonHandler.java | 6 +- .../PoliticsStrategyCardButtonHandler.java | 4 +- .../TradeStrategyCardButtonHandler.java | 4 +- .../WarfareStrategyCardButtonHandler.java | 6 +- .../tech/ExhaustTechButtonHandler.java | 4 +- .../handlers/tech/GetTechButtonHandler.java | 4 +- .../handlers/tech/TechUseButtonHandler.java | 6 +- .../tech/specific/AbsolX89ButtonHandler.java | 4 +- .../tech/specific/DacxiveButtonHandler.java | 4 +- .../IntegratedEconomyButtonHandler.java | 4 +- .../PsychoarchaeologyButtonHandler.java | 4 +- .../unit/AssignHitsButtonHandlers.java | 4 +- .../unit/ModifyUnitButtonHandler.java | 4 +- .../unit/TacticalActionButtonHandlers.java | 4 +- .../unit/UnitManagementButtonHandler.java | 4 +- .../unit/UnitPickerHandlerHelper.java | 2 +- .../interactions}/commands/Command.java | 20 +-- .../commands/CommandGameState.java | 4 +- .../interactions}/commands/CommandHelper.java | 4 +- .../commands/GameStateCommand.java | 2 +- .../commands/GameStateSubcommand.java | 2 +- .../interactions}/commands/ParentCommand.java | 2 +- .../commands/SlashCommandManager.java | 145 ++++++++++++++++++ .../interactions}/commands/Subcommand.java | 2 +- .../commands/SubcommandGroup.java | 2 +- .../commands/admin/AdminCommand.java | 10 +- .../commands/admin/CardsInfoForPlayer.java | 4 +- .../commands/admin/DeleteGame.java | 4 +- .../admin/DeletePersistenceManagerFile.java | 4 +- .../commands/admin/DisableBot.java | 4 +- .../commands/admin/GetChannelHtml.java | 4 +- .../commands/admin/RecreateGame.java | 4 +- .../commands/admin/ReloadMapperObjects.java | 4 +- .../commands/admin/TourneyWinner.java | 6 +- .../admin/UpdateThreadArchiveTime.java | 4 +- .../commands/admin/UpdateVanityContainer.java | 6 +- .../commands/agenda/AddControlToken.java | 4 +- .../interactions}/commands/agenda/AddLaw.java | 4 +- .../commands/agenda/AgendaCommand.java | 6 +- .../commands/agenda/Cleanup.java | 4 +- .../commands/agenda/DrawAgenda.java | 4 +- .../commands/agenda/ExhaustSC.java | 4 +- .../commands/agenda/LawInfo.java | 4 +- .../commands/agenda/ListVoteCount.java | 4 +- .../commands/agenda/LookAtAgenda.java | 4 +- .../agenda/PutDiscardBackIntoDeckAgendas.java | 4 +- .../agenda/PutDrawnAgendaBackIntoDeck.java | 4 +- .../commands/agenda/RemoveLaw.java | 4 +- .../commands/agenda/ResetAgendas.java | 4 +- .../agenda/ResetDrawStateAgendas.java | 4 +- .../commands/agenda/RevealAgenda.java | 4 +- .../commands/agenda/RevealSpecificAgenda.java | 4 +- .../commands/agenda/ReviseLaw.java | 6 +- .../commands/agenda/ShowDiscardedAgendas.java | 4 +- .../commands/agenda/ShuffleAgendas.java | 4 +- .../commands/async/AsyncCommand.java | 6 +- .../commands/async/ShowHeroes.java | 6 +- .../commands/async/ShowTourneyWinners.java | 4 +- .../commands/bothelper/ArchiveOldThreads.java | 4 +- .../bothelper/BeginVideoGeneration.java | 4 +- .../commands/bothelper/BothelperCommand.java | 10 +- .../commands/bothelper/CheckNextPingTime.java | 4 +- .../commands/bothelper/CorrectFaction.java | 6 +- .../bothelper/CreateFOWGameChannels.java | 4 +- .../bothelper/CreateGameChannels.java | 6 +- .../bothelper/DeleteFOWCommThreads.java | 4 +- .../commands/bothelper/EditStoredValue.java | 4 +- .../commands/bothelper/EditTrackRecord.java | 4 +- .../bothelper/FixGameChannelPermissions.java | 4 +- .../commands/bothelper/JazzCommand.java | 10 +- .../commands/bothelper/ListButtons.java | 4 +- .../bothelper/ListCategoryChannelCounts.java | 4 +- .../commands/bothelper/ListDeadGames.java | 6 +- .../bothelper/ListSlashCommandsUsed.java | 4 +- .../commands/bothelper/ListStoredValues.java | 4 +- .../commands/bothelper/ReloadGame.java | 4 +- .../commands/bothelper/RemoveTitle.java | 4 +- .../commands/bothelper/ReserveGame.java | 6 +- .../commands/bothelper/ServerGameStats.java | 6 +- .../commands/bothelper/ServerLimitStats.java | 6 +- .../commands/bothelper/SetGameLimit.java | 4 +- .../bothelper/SetStatsTrackedUser.java | 4 +- .../breakthrough/BreakthroughActivate.java | 4 +- .../breakthrough/BreakthroughCommand.java | 6 +- .../breakthrough/BreakthroughExhaust.java | 4 +- .../breakthrough/BreakthroughInfo.java | 6 +- .../breakthrough/BreakthroughLock.java | 4 +- .../breakthrough/BreakthroughReady.java | 4 +- .../breakthrough/BreakthroughSetTg.java | 4 +- .../breakthrough/BreakthroughUnlock.java | 4 +- .../commands/button/GenericButtonCommand.java | 6 +- .../commands/cardsac/ACCardsCommand.java | 6 +- .../commands/cardsac/ACInfo.java | 4 +- .../commands/cardsac/DiscardAC.java | 4 +- .../commands/cardsac/DiscardACRandom.java | 4 +- .../commands/cardsac/DrawAC.java | 4 +- .../commands/cardsac/DrawSpecificAC.java | 4 +- .../commands/cardsac/MakeCopiesOfACs.java | 4 +- .../commands/cardsac/PickACFromDiscard.java | 4 +- .../commands/cardsac/PickACFromPurged.java | 4 +- .../commands/cardsac/PlayAC.java | 4 +- .../commands/cardsac/PurgeAC.java | 4 +- .../cardsac/RevealAndPutACIntoDiscard.java | 4 +- .../commands/cardsac/SendAC.java | 6 +- .../commands/cardsac/SendACRandom.java | 6 +- .../commands/cardsac/ShowAC.java | 6 +- .../cardsac/ShowACRemainingCardCount.java | 4 +- .../commands/cardsac/ShowACToAll.java | 4 +- .../commands/cardsac/ShowAllAC.java | 6 +- .../commands/cardsac/ShowAllUnplayedACs.java | 4 +- .../cardsac/ShowDiscardActionCards.java | 4 +- .../cardsac/ShowGarboziaActionCards.java | 4 +- .../cardsac/ShowPurgedActionCards.java | 4 +- .../cardsac/ShuffleACBackIntoDeck.java | 4 +- .../commands/cardsac/ShuffleACDeck.java | 4 +- .../commands/cardsac/ShuffleACFromHand.java | 4 +- .../commands/cardspn/PNCardsCommand.java | 6 +- .../commands/cardspn/PNInfo.java | 4 +- .../commands/cardspn/PNReset.java | 4 +- .../commands/cardspn/PlayPN.java | 4 +- .../commands/cardspn/PurgePN.java | 4 +- .../commands/cardspn/SendPN.java | 6 +- .../commands/cardspn/SendRandomPN.java | 6 +- .../commands/cardspn/ShowAllPN.java | 6 +- .../commands/cardspn/ShowPN.java | 6 +- .../commands/cardspn/ShowPNToAll.java | 4 +- .../commands/cardsso/DealSO.java | 4 +- .../commands/cardsso/DealSOToAll.java | 4 +- .../commands/cardsso/DiscardSO.java | 4 +- .../commands/cardsso/DrawSO.java | 4 +- .../commands/cardsso/DrawSpecificSO.java | 4 +- .../commands/cardsso/ListAllScored.java | 4 +- .../commands/cardsso/SOCardsCommand.java | 6 +- .../commands/cardsso/SOInfo.java | 4 +- .../commands/cardsso/ScoreSO.java | 4 +- .../commands/cardsso/ShowAllSO.java | 6 +- .../commands/cardsso/ShowAllSOToAll.java | 4 +- .../commands/cardsso/ShowRandomSO.java | 6 +- .../commands/cardsso/ShowSO.java | 6 +- .../commands/cardsso/ShowSOToAll.java | 4 +- .../commands/cardsso/ShowUnScoredSOs.java | 4 +- .../commands/cardsso/ShuffleSecretDeck.java | 4 +- .../commands/cardsso/UnscoreSO.java | 4 +- .../commands/combat/CombatCommand.java | 6 +- .../commands/combat/CombatRoll.java | 4 +- .../commands/combat/StartCombat.java | 4 +- .../commands/context/BanUser.java | 2 +- .../commands/context/ContextCommand.java | 4 +- .../context/ContextCommandManager.java | 2 +- .../commands/context/DeleteMessage.java | 4 +- .../commands/context/MessageCommand.java | 2 +- .../commands/context/UserCommand.java | 2 +- .../commands/custom/ACRemoveFromGame.java | 4 +- .../commands/custom/AgendaRemoveFromGame.java | 4 +- .../commands/custom/ChangeToBaseGame.java | 4 +- .../commands/custom/CustomCommand.java | 6 +- .../commands/custom/CustomizationOptions.java | 6 +- .../custom/DiscardSpecificAgenda.java | 4 +- .../commands/custom/OfferAutoPassOptions.java | 4 +- .../commands/custom/PeekAtSecretDeck.java | 4 +- .../commands/custom/PeekAtStage1.java | 4 +- .../commands/custom/PeekAtStage2.java | 4 +- .../commands/custom/PoRemoveFromGame.java | 4 +- .../commands/custom/PoSetDeck.java | 4 +- .../commands/custom/RevealSpecificStage1.java | 4 +- .../commands/custom/RevealSpecificStage2.java | 4 +- .../commands/custom/SCAddToGame.java | 4 +- .../commands/custom/SCRemoveFromGame.java | 4 +- .../commands/custom/SetThreadName.java | 4 +- .../custom/SetUpPeakableObjectives.java | 4 +- .../custom/ShuffleBackInUnrevealedObj.java | 4 +- .../commands/custom/SoAddToGame.java | 4 +- .../commands/custom/SoRemoveFromGame.java | 4 +- .../commands/custom/SpinTilesInRings.java | 4 +- .../commands/custom/SwapStage1.java | 4 +- .../commands/custom/SwapStage2.java | 4 +- .../developer/ButtonProcessingStatistics.java | 6 +- .../commands/developer/CacheStatistics.java | 4 +- .../commands/developer/CustomCommand.java | 6 +- .../commands/developer/DeveloperCommand.java | 10 +- .../developer/GiveTheBotABreather.java | 4 +- .../commands/developer/LocalDevelopment.java | 4 +- .../developer/ProduceNucleusGenStats.java | 4 +- .../commands/developer/RestoreGame.java | 4 +- .../developer/RunAgainstAllGames.java | 4 +- .../developer/RunAgainstSpecificGame.java | 4 +- .../commands/developer/RunCron.java | 4 +- .../developer/RunManualDataMigration.java | 6 +- .../commands/developer/RunSql.java | 4 +- .../commands/developer/SetGlobalSetting.java | 4 +- .../commands/draft/DraftCommand.java | 22 +-- .../andcat/AndcatDraftableAddPackage.java | 4 +- .../AndcatDraftableClearPlayerChoices.java | 4 +- .../draft/andcat/AndcatDraftableGroup.java | 6 +- .../andcat/AndcatDraftableModifyPackage.java | 4 +- .../andcat/AndcatDraftableRemovePackage.java | 4 +- .../AndcatDraftableSetPlayerChoices.java | 4 +- .../faction/FactionDraftableAddFaction.java | 4 +- .../draft/faction/FactionDraftableGroup.java | 6 +- .../FactionDraftableRemoveFaction.java | 4 +- .../FactionDraftableSetKeleresFlavor.java | 4 +- .../manage/DraftManagerAddAllGamePlayers.java | 4 +- .../manage/DraftManagerAddDraftable.java | 4 +- .../manage/DraftManagerAddOrchestrator.java | 4 +- .../draft/manage/DraftManagerAddPlayer.java | 4 +- .../draft/manage/DraftManagerCanEndDraft.java | 4 +- .../manage/DraftManagerCanSetupPlayers.java | 4 +- .../DraftManagerClearMissingPlayers.java | 4 +- .../draft/manage/DraftManagerDebug.java | 4 +- .../draft/manage/DraftManagerGroup.java | 6 +- .../draft/manage/DraftManagerListPlayers.java | 4 +- .../draft/manage/DraftManagerMakePick.java | 4 +- .../manage/DraftManagerPostDraftWork.java | 4 +- .../manage/DraftManagerRemoveDraftable.java | 4 +- .../manage/DraftManagerRemovePlayer.java | 4 +- .../manage/DraftManagerReplacePlayer.java | 4 +- ...raftManagerSendCustomDraftableCommand.java | 4 +- ...tManagerSendCustomOrchestratorCommand.java | 4 +- .../draft/manage/DraftManagerSetupDraft.java | 4 +- .../DraftManagerSetupNucleusCommand.java | 4 +- .../manage/DraftManagerSetupPlayers.java | 4 +- .../draft/manage/DraftManagerStartDraft.java | 4 +- .../DraftManagerSwapDraftingPlayers.java | 4 +- .../draft/manage/DraftManagerTryEndDraft.java | 4 +- .../draft/manage/DraftManagerUnpick.java | 4 +- .../manage/DraftManagerValidateState.java | 4 +- .../MantisTileDraftableConfigure.java | 4 +- .../mantistile/MantisTileDraftableGroup.java | 6 +- .../MantisTileDraftableSetTiles.java | 4 +- .../MantisTileDraftableStartBuilding.java | 4 +- .../publicsnake/PublicSnakeDraftGroup.java | 6 +- ...blicSnakeDraftOrchestratorSendButtons.java | 4 +- ...akeDraftOrchestratorSetDraftDirection.java | 4 +- ...akeDraftOrchestratorSetDraftingPlayer.java | 4 +- .../PublicSnakeDraftOrchestratorSetOrder.java | 4 +- .../draft/seat/SeatDraftableGroup.java | 6 +- .../draft/seat/SeatDraftableSetSeatCount.java | 4 +- .../SeatDraftableSetSeatsForMapTemplate.java | 4 +- .../draft/slice/SliceDraftableAddSlice.java | 4 +- .../draft/slice/SliceDraftableGroup.java | 6 +- .../slice/SliceDraftableModifySlice.java | 4 +- .../slice/SliceDraftableRemoveSlice.java | 4 +- .../SpeakerOrderDraftableGroup.java | 6 +- .../SpeakerOrderDraftableSetPickCount.java | 4 +- .../interactions}/commands/ds/ATS.java | 4 +- .../interactions}/commands/ds/AddOmenDie.java | 4 +- .../commands/ds/DiscordantStarsCommand.java | 6 +- .../commands/ds/DishonorCount.java | 4 +- .../commands/ds/DrawBlueBackTile.java | 4 +- .../commands/ds/DrawRedBackTile.java | 4 +- .../interactions}/commands/ds/FlipGrace.java | 4 +- .../interactions}/commands/ds/HonorCount.java | 4 +- .../interactions}/commands/ds/KyroHero.java | 4 +- .../interactions}/commands/ds/PathToken.java | 4 +- .../commands/ds/SetPlanetTradeGoods.java | 4 +- .../interactions}/commands/ds/SetPolicy.java | 6 +- .../commands/ds/StarBalanceCount.java | 4 +- .../commands/ds/SteelBalanceCount.java | 4 +- .../interactions}/commands/ds/TrapReveal.java | 4 +- .../interactions}/commands/ds/TrapSwap.java | 4 +- .../interactions}/commands/ds/TrapToken.java | 4 +- .../interactions}/commands/ds/ZelianHero.java | 4 +- .../commands/event/AddEvent.java | 4 +- .../commands/event/DrawEvent.java | 4 +- .../commands/event/EventCommand.java | 6 +- .../commands/event/EventInfo.java | 4 +- .../commands/event/LookAtBottomEvent.java | 4 +- .../commands/event/LookAtTopEvent.java | 4 +- .../commands/event/PlayEvent.java | 4 +- .../event/PutDiscardBackIntoDeckEvents.java | 4 +- .../commands/event/PutEventBottom.java | 4 +- .../commands/event/PutEventTop.java | 4 +- .../commands/event/RemoveEvent.java | 4 +- .../commands/event/ResetEvents.java | 4 +- .../commands/event/RevealEvent.java | 4 +- .../commands/event/RevealSpecificEvent.java | 4 +- .../commands/event/ShowDiscardedEvents.java | 4 +- .../commands/event/ShuffleEvents.java | 4 +- .../commands/explore/ExploreCommand.java | 6 +- .../explore/ExploreDiscardFragment.java | 4 +- .../explore/ExploreDiscardFromDeck.java | 4 +- .../explore/ExploreDrawAndDiscard.java | 4 +- .../commands/explore/ExploreFrontier.java | 4 +- .../commands/explore/ExploreInfo.java | 4 +- .../commands/explore/ExploreLookAtTop.java | 4 +- .../commands/explore/ExplorePlanet.java | 4 +- .../explore/ExploreRemoveFromGame.java | 4 +- .../commands/explore/ExploreReset.java | 4 +- .../commands/explore/ExploreShuffle.java | 4 +- .../explore/ExploreShuffleBackIntoDeck.java | 4 +- .../ExploreShuffleIntoDeckFromHand.java | 4 +- .../commands/explore/ExploreUse.java | 4 +- .../commands/fow/AddFogTile.java | 6 +- .../interactions}/commands/fow/Announce.java | 4 +- .../commands/fow/CheckChannels.java | 6 +- .../commands/fow/CreateFoWGameButton.java | 8 +- .../commands/fow/FOWCommand.java | 6 +- .../commands/fow/FOWOptions.java | 4 +- .../interactions}/commands/fow/GMCommand.java | 4 +- .../commands/fow/PingActivePlayer.java | 4 +- .../commands/fow/PingSystem.java | 4 +- .../fow/PrivateCommunicationsCheck.java | 4 +- .../commands/fow/RemoveFogTile.java | 6 +- .../commands/fow/ShowGameAsPlayer.java | 4 +- .../interactions}/commands/fow/Whisper.java | 6 +- .../commands/franken/AbilityAdd.java | 2 +- .../commands/franken/AbilityAddRemove.java | 4 +- .../commands/franken/AbilityRemove.java | 2 +- .../commands/franken/ApplyDraftBags.java | 4 +- .../commands/franken/BanFaction.java | 4 +- .../commands/franken/BreakthroughAdd.java | 4 +- .../commands/franken/BreakthroughRemove.java | 4 +- .../commands/franken/BuildMap.java | 4 +- .../commands/franken/DraftLimits.java | 4 +- .../commands/franken/FactionTechAdd.java | 2 +- .../franken/FactionTechAddRemove.java | 4 +- .../commands/franken/FactionTechRemove.java | 2 +- .../commands/franken/FrankenCommand.java | 8 +- .../commands/franken/FrankenEdit.java | 4 +- .../commands/franken/FrankenViewCard.java | 4 +- .../commands/franken/LeaderAdd.java | 2 +- .../commands/franken/LeaderAddRemove.java | 4 +- .../commands/franken/LeaderRemove.java | 2 +- .../interactions}/commands/franken/PNAdd.java | 2 +- .../commands/franken/PNAddRemove.java | 4 +- .../commands/franken/PNRemove.java | 2 +- .../franken/SetFactionDisplayName.java | 4 +- .../commands/franken/SetFactionIcon.java | 4 +- .../franken/SetHomeSystemPosition.java | 4 +- .../commands/franken/ShowFrankenBag.java | 4 +- .../commands/franken/ShowFrankenHand.java | 4 +- .../commands/franken/StartFrankenDraft.java | 4 +- .../commands/franken/UnitAdd.java | 2 +- .../commands/franken/UnitAddRemove.java | 4 +- .../commands/franken/UnitRemove.java | 2 +- .../commands/franken/ban/Ban.java | 4 +- .../commands/franken/ban/BanService.java | 2 +- .../commands/franken/ban/IBanService.java | 2 +- .../commands/game/AddPlayer.java | 4 +- .../commands/game/CreateGameButton.java | 6 +- .../commands/game/EliminatePlayer.java | 4 +- .../commands/game/GalacticEventsSetup.java | 6 +- .../commands/game/GameCommand.java | 6 +- .../interactions}/commands/game/GameEnd.java | 4 +- .../commands/game/GameOptions.java | 4 +- .../interactions}/commands/game/Info.java | 4 +- .../interactions}/commands/game/Join.java | 4 +- .../interactions}/commands/game/Leave.java | 4 +- .../interactions}/commands/game/Observer.java | 4 +- .../interactions}/commands/game/Ping.java | 4 +- .../interactions}/commands/game/Replace.java | 12 +- .../interactions}/commands/game/SCCount.java | 4 +- .../interactions}/commands/game/SetDeck.java | 4 +- .../interactions}/commands/game/SetOrder.java | 4 +- .../commands/game/SetUnitCap.java | 4 +- .../interactions}/commands/game/Setup.java | 4 +- .../commands/game/SetupGameChannels.java | 4 +- .../commands/game/StartPhase.java | 4 +- .../commands/game/StartScenario.java | 6 +- .../interactions}/commands/game/Swap.java | 8 +- .../interactions}/commands/game/Tags.java | 6 +- .../interactions}/commands/game/Undo.java | 4 +- .../commands/game/WeirdGameSetup.java | 4 +- .../interactions}/commands/help/Absol.java | 4 +- .../commands/help/DiscordantStars.java | 4 +- .../interactions}/commands/help/FoWHelp.java | 4 +- .../commands/help/FoWPlusHelp.java | 6 +- .../commands/help/HelpAction.java | 4 +- .../commands/help/HelpCommand.java | 6 +- .../commands/help/HowToMoveUnits.java | 4 +- .../commands/help/HowToPlayTI4.java | 4 +- .../commands/help/Monuments.java | 4 +- .../commands/help/NewPlayerInfo.java | 4 +- .../commands/help/SampleColors.java | 4 +- .../commands/help/SampleDecals.java | 4 +- .../commands/help/WhatsTIGL.java | 4 +- .../commands/installation/AddSweepToken.java | 4 +- .../installation/InstallationCommand.java | 6 +- .../installation/RemoveSweepToken.java | 4 +- .../commands/leaders/ExhaustLeader.java | 4 +- .../commands/leaders/HeroPlay.java | 4 +- .../commands/leaders/HeroUnplay.java | 4 +- .../commands/leaders/LeaderCommand.java | 6 +- .../commands/leaders/LeaderInfo.java | 4 +- .../commands/leaders/LockLeader.java | 4 +- .../commands/leaders/PurgeLeader.java | 4 +- .../commands/leaders/RefreshLeader.java | 4 +- .../commands/leaders/ResetLeader.java | 4 +- .../commands/leaders/UnlockLeader.java | 4 +- .../commands/map/AddAdjacencyOverride.java | 4 +- .../map/AddAdjacencyOverrideList.java | 4 +- .../commands/map/AddBorderAnomaly.java | 4 +- .../commands/map/AddCustomAdjacentTile.java | 4 +- .../interactions}/commands/map/AddTile.java | 4 +- .../commands/map/AddTileList.java | 4 +- .../commands/map/AddTileListRandom.java | 6 +- .../commands/map/AddTileRandom.java | 4 +- .../commands/map/CustomHyperlanes.java | 4 +- .../commands/map/ExportToJson.java | 4 +- .../commands/map/ImportFromJson.java | 4 +- .../commands/map/InitTspmap.java | 4 +- .../commands/map/InteractiveBuilder.java | 4 +- .../commands/map/MapCommand.java | 6 +- .../interactions}/commands/map/MoveTile.java | 6 +- .../interactions}/commands/map/Preset.java | 4 +- .../commands/map/PreviewMapTemplate.java | 4 +- .../commands/map/RemoveAdjacencyOverride.java | 4 +- .../commands/map/RemoveBorderAnomaly.java | 4 +- .../map/RemoveCustomAdjacentTile.java | 4 +- .../commands/map/RemoveTile.java | 4 +- .../commands/map/SetMapTemplate.java | 4 +- .../commands/map/ShowMapSetup.java | 4 +- .../commands/map/ShowMapString.java | 4 +- .../commands/map/SpawnFracture.java | 6 +- .../commands/milty/DebugMilty.java | 4 +- .../commands/milty/ForcePick.java | 4 +- .../commands/milty/MiltyCommand.java | 6 +- .../commands/milty/SetupMilty.java | 4 +- .../commands/milty/ShowMilty.java | 4 +- .../commands/milty/StartMilty.java | 4 +- .../omega_phase/AssignPlayerPriority.java | 4 +- .../omega_phase/ClearPriorityTrack.java | 4 +- .../omega_phase/ElectVoiceOfTheCouncil.java | 4 +- .../omega_phase/OmegaPhaseCommand.java | 6 +- .../omega_phase/PrintPriorityTrack.java | 4 +- .../commands/omega_phase/ResetObjectives.java | 4 +- .../omega_phase/ResetVoiceOfTheCouncil.java | 4 +- .../commands/planet/PlanetAdd.java | 2 +- .../commands/planet/PlanetAddRemove.java | 4 +- .../commands/planet/PlanetCommand.java | 6 +- .../commands/planet/PlanetExhaust.java | 2 +- .../commands/planet/PlanetExhaustAbility.java | 4 +- .../commands/planet/PlanetExhaustAll.java | 4 +- .../commands/planet/PlanetInfo.java | 4 +- .../commands/planet/PlanetRefresh.java | 2 +- .../commands/planet/PlanetRefreshAbility.java | 2 +- .../commands/planet/PlanetRefreshAll.java | 4 +- .../commands/planet/PlanetRemove.java | 2 +- .../commands/player/AbilityInfo.java | 4 +- .../commands/player/AddAllianceMember.java | 6 +- .../commands/player/AddTeamMate.java | 4 +- .../commands/player/CCsButton.java | 6 +- .../commands/player/ChangeColor.java | 4 +- .../commands/player/ChangeUnitDecal.java | 4 +- .../commands/player/ClearDebt.java | 6 +- .../interactions}/commands/player/Pass.java | 4 +- .../commands/player/PlayerCommand.java | 6 +- .../commands/player/RemoveAllianceMember.java | 8 +- .../commands/player/RemoveTeamMate.java | 4 +- .../interactions}/commands/player/SCPick.java | 4 +- .../interactions}/commands/player/SCPlay.java | 4 +- .../commands/player/SCUnpick.java | 4 +- .../commands/player/SCUnplay.java | 4 +- .../commands/player/SendCommodities.java | 6 +- .../commands/player/SendDebt.java | 6 +- .../interactions}/commands/player/SendTG.java | 6 +- .../commands/player/SetStatsAnchor.java | 4 +- .../interactions}/commands/player/Setup.java | 4 +- .../commands/player/Speaker.java | 4 +- .../interactions}/commands/player/Stats.java | 6 +- .../commands/player/TurnEnd.java | 4 +- .../commands/player/TurnStart.java | 4 +- .../commands/player/UnitInfo.java | 4 +- .../commands/relic/RelicAddBackIntoDeck.java | 4 +- .../commands/relic/RelicAddCodexRelics.java | 4 +- .../commands/relic/RelicBottom.java | 4 +- .../commands/relic/RelicCommand.java | 6 +- .../commands/relic/RelicDraw.java | 4 +- .../commands/relic/RelicDrawSpecific.java | 4 +- .../commands/relic/RelicExhaust.java | 4 +- .../commands/relic/RelicInfo.java | 4 +- .../commands/relic/RelicLookAtTop.java | 4 +- .../commands/relic/RelicPurge.java | 4 +- .../commands/relic/RelicPurgeFragments.java | 4 +- .../commands/relic/RelicReady.java | 4 +- .../commands/relic/RelicSend.java | 6 +- .../commands/relic/RelicSendFragments.java | 6 +- .../commands/relic/RelicShowRemaining.java | 4 +- .../commands/relic/RelicShuffleBack.java | 4 +- .../commands/rules/AskRulesQuestion.java | 6 +- .../commands/rules/RulesCommand.java | 6 +- .../search/SearchAbilitiesSubcommand.java | 2 +- .../search/SearchActionCardsSubcommand.java | 2 +- .../search/SearchAgendasSubcommand.java | 2 +- .../search/SearchAttachmentsSubcommand.java | 2 +- .../commands/search/SearchBreakthroughs.java | 2 +- .../commands/search/SearchCommand.java | 6 +- .../commands/search/SearchCommand2.java | 6 +- .../search/SearchCommandsSubcommand.java | 4 +- .../SearchComponentModelSubcommand.java | 4 +- .../search/SearchDecksSubcommand.java | 2 +- .../commands/search/SearchEmojis.java | 6 +- .../search/SearchEventsSubcommand.java | 2 +- .../search/SearchExploresSubcommand.java | 2 +- .../search/SearchFactionsSubcommand.java | 2 +- .../commands/search/SearchForGame.java | 4 +- .../SearchGalacticEventsSubcommand.java | 2 +- .../commands/search/SearchGames.java | 4 +- .../search/SearchGenomesSubcommand.java | 2 +- .../commands/search/SearchHelper.java | 2 +- .../search/SearchLeadersSubcommand.java | 2 +- .../commands/search/SearchMyGames.java | 4 +- .../commands/search/SearchMyTitles.java | 4 +- .../search/SearchParadigmsSubcommand.java | 2 +- .../search/SearchPlanetsSubcommand.java | 2 +- .../SearchPromissoryNotesSubcommand.java | 2 +- .../SearchPublicObjectivesSubcommand.java | 2 +- .../search/SearchRelicsSubcommand.java | 2 +- .../commands/search/SearchRules.java | 2 +- .../SearchSecretObjectivesSubcommand.java | 2 +- .../commands/search/SearchSources.java | 4 +- .../search/SearchStrategyCardsSubcommand.java | 2 +- .../search/SearchTechsSubcommand.java | 2 +- .../search/SearchTilesSubcommand.java | 2 +- .../search/SearchTokensSubcommand.java | 2 +- .../search/SearchUnitsSubcommand.java | 2 +- .../special/AddFactionCCToFleetSupply.java | 2 +- .../AddRemoveFactionCCToFromFleet.java | 6 +- .../commands/special/AdjustRoundNumber.java | 4 +- .../commands/special/Bounties.java | 6 +- .../commands/special/CheckAllDistance.java | 4 +- .../commands/special/CheckDistance.java | 4 +- .../commands/special/CloneGame.java | 4 +- .../commands/special/DiploSystem.java | 4 +- .../commands/special/FighterConscription.java | 4 +- .../commands/special/Galvanize.java | 4 +- .../special/GeneratePainBoxMapString.java | 4 +- .../commands/special/IonFlip.java | 4 +- .../commands/special/LoreCommand.java | 4 +- .../commands/special/MakeSecretIntoPO.java | 4 +- .../commands/special/MoveAllUnits.java | 6 +- .../commands/special/MoveCoatl.java | 4 +- .../commands/special/MoveCreussWormhole.java | 4 +- .../commands/special/NaaluCommander.java | 4 +- .../commands/special/NovaSeed.java | 4 +- .../commands/special/Rematch.java | 4 +- .../RemoveFactionCCFromFleetSupply.java | 2 +- .../commands/special/RiseOfMessiah.java | 4 +- .../commands/special/SearchWarrant.java | 4 +- .../commands/special/SearchWinningPath.java | 6 +- .../commands/special/SetExpedition.java | 4 +- .../commands/special/SetupNeutralPlayer.java | 4 +- .../commands/special/SleeperToken.java | 4 +- .../commands/special/Special2Command.java | 6 +- .../commands/special/SpecialCommand.java | 6 +- .../commands/special/StasisInfantry.java | 4 +- .../commands/special/StellarConverter.java | 4 +- .../commands/special/SwapSC.java | 6 +- .../commands/special/SwapTwoSystems.java | 6 +- .../commands/special/SystemInfo.java | 4 +- .../commands/spin/AddSpinSetting.java | 4 +- .../commands/spin/ExecuteSpin.java | 4 +- .../commands/spin/ListSpinSettings.java | 4 +- .../commands/spin/RemoveSpinSetting.java | 4 +- .../commands/spin/SpinCommand.java | 6 +- .../commands/statistics/AverageTurnTime.java | 4 +- .../statistics/CommunityStatistics.java | 4 +- .../commands/statistics/CompareAFKTimes.java | 4 +- .../commands/statistics/DiceLuck.java | 4 +- .../ExpeditionWinRateStatisticsService.java | 2 +- .../statistics/ExpeditionWinRates.java | 4 +- .../commands/statistics/ExportToCSV.java | 4 +- .../commands/statistics/FactionGames.java | 4 +- .../statistics/FactionRecordOfSCPick.java | 4 +- .../statistics/FactionRecordOfTech.java | 4 +- .../commands/statistics/FactionTopColors.java | 4 +- .../commands/statistics/GameStatistics.java | 4 +- .../statistics/GameStatisticsFilterer.java | 2 +- .../statistics/GameWinsWithOtherFactions.java | 4 +- .../commands/statistics/HitsPerTurn.java | 4 +- .../commands/statistics/LifetimeRecord.java | 4 +- .../commands/statistics/ListTitlesGiven.java | 4 +- .../statistics/MatchmakingRatingCommand.java | 4 +- .../commands/statistics/MedianTurnTime.java | 4 +- .../commands/statistics/OptIn.java | 4 +- .../commands/statistics/OptOut.java | 4 +- .../commands/statistics/PlayerStatistics.java | 4 +- .../commands/statistics/PoliticsPosition.java | 4 +- .../statistics/StatisticsCommand.java | 6 +- .../StellarConverterStatistics.java | 4 +- .../commands/statistics/SurveyResults.java | 4 +- .../commands/status/AddCustomPO.java | 6 +- .../commands/status/Cleanup.java | 4 +- .../commands/status/ListDiceLuck.java | 4 +- .../commands/status/ListSpends.java | 4 +- .../commands/status/ListTurnOrder.java | 4 +- .../commands/status/ListTurnStats.java | 4 +- .../commands/status/MarkFollowed.java | 4 +- .../interactions}/commands/status/POInfo.java | 4 +- .../status/PeekPublicObjectiveDeck.java | 4 +- .../commands/status/PersonalCleanup.java | 4 +- .../commands/status/RemoveCustomPO.java | 4 +- .../commands/status/RevealStage1.java | 4 +- .../commands/status/RevealStage2.java | 4 +- .../commands/status/SCTradeGoods.java | 4 +- .../commands/status/ScorePublic.java | 4 +- .../commands/status/ShufflePublicBack.java | 4 +- .../commands/status/ShufflePublicDeck.java | 4 +- .../commands/status/StatusCommand.java | 6 +- .../commands/status/UnscorePublic.java | 4 +- .../commands/tech/GetTechButton.java | 6 +- .../interactions}/commands/tech/TechAdd.java | 2 +- .../commands/tech/TechAddRemove.java | 4 +- .../commands/tech/TechChangeType.java | 4 +- .../commands/tech/TechCommand.java | 6 +- .../commands/tech/TechExhaust.java | 2 +- .../interactions}/commands/tech/TechInfo.java | 4 +- .../commands/tech/TechPurge.java | 2 +- .../commands/tech/TechRefresh.java | 2 +- .../commands/tech/TechRemove.java | 2 +- .../commands/tech/TechShowDeck.java | 4 +- .../commands/tech/TechUnpurge.java | 2 +- .../commands/tf/DiscardVeiledCard.java | 4 +- .../commands/tf/DoEdictPhase.java | 6 +- .../commands/tf/DrawRandomAbility.java | 4 +- .../commands/tf/DrawRandomGenome.java | 4 +- .../commands/tf/DrawRandomParadigm.java | 4 +- .../commands/tf/DrawRandomUnit.java | 4 +- .../commands/tf/DrawSpecificParadigm.java | 4 +- .../interactions}/commands/tf/FixColors.java | 4 +- .../commands/tf/RadicalAdvancement.java | 4 +- .../commands/tf/ReverseSplice.java | 4 +- .../commands/tf/SetupStartingFleet.java | 4 +- .../commands/tf/StartNewSplice.java | 4 +- .../commands/tf/TwilightFallCommand.java | 6 +- .../commands/tigl/ChangeNickname.java | 4 +- .../interactions}/commands/tigl/Games.java | 4 +- .../commands/tigl/IsFractured.java | 4 +- .../commands/tigl/TiglCommand.java | 6 +- .../commands/tokens/AddCCCommand.java | 2 +- .../tokens/AddFrontierTokensCommand.java | 4 +- .../tokens/AddRemoveTokenCommand.java | 6 +- .../commands/tokens/AddTokenCommand.java | 2 +- .../commands/tokens/RemoveAllCC.java | 4 +- .../commands/tokens/RemoveCCCommand.java | 2 +- .../commands/tokens/RemoveTokenCommand.java | 2 +- .../commands/transaction/ChangeDebtIcon.java | 4 +- .../transaction/TransactionCommand.java | 6 +- .../transaction/TransactionStart.java | 4 +- .../uncategorized/AllInfoCommand.java | 6 +- .../uncategorized/CardsInfoCommand.java | 4 +- .../SelectionBoxDemoCommand.java | 6 +- .../uncategorized/ServerPromoteCommand.java | 4 +- .../uncategorized/ShowDistancesCommand.java | 4 +- .../uncategorized/ShowGameCommand.java | 4 +- .../commands/units/AddCaptureUnits.java | 4 +- .../commands/units/AddUnitDamage.java | 6 +- .../commands/units/AddUnits.java | 8 +- .../commands/units/CaptureCommand.java | 6 +- .../commands/units/FixRemoveCaptureUnits.java | 4 +- .../commands/units/ModifyUnitsButtons.java | 4 +- .../commands/units/MoveUnits.java | 8 +- .../commands/units/RemoveAllUnitDamage.java | 6 +- .../commands/units/RemoveAllUnits.java | 6 +- .../commands/units/RemoveCaptureUnits.java | 4 +- .../commands/units/RemoveUnitDamage.java | 6 +- .../commands/units/RemoveUnits.java | 6 +- .../commands/units/UnitCommandHelper.java | 4 +- .../commands/user/MessageMyGames.java | 4 +- .../commands/user/OfferAFKTimeOptions.java | 4 +- .../commands/user/SetFowFilter.java | 4 +- .../user/SetPersonalPingInterval.java | 4 +- .../commands/user/SetPingOnNextTurn.java | 4 +- .../commands/user/SetPreferredColourList.java | 4 +- .../commands/user/SetPreferredSettings.java | 4 +- .../commands/user/ShowUserSettings.java | 6 +- .../interactions}/commands/user/Survey.java | 4 +- .../commands/user/UserCommand.java | 6 +- .../commands/user/WipeTurnTime.java | 4 +- .../interactions}/context/ButtonContext.java | 2 +- .../context/ListenerContext.java | 8 +- .../interactions}/context/ModalContext.java | 2 +- .../context/SelectionMenuContext.java | 2 +- .../listeners/AutoCompleteListener.java | 5 +- .../listeners}/AutoCompleteProvider.java | 14 +- .../interactions}/listeners/BanListener.java | 2 +- .../listeners/BotRuntimeStatsListener.java | 2 +- .../listeners/ButtonListener.java | 6 +- .../listeners/ChannelCreationListener.java | 8 +- .../listeners/ContextMenuListener.java | 10 +- .../listeners/DeletionListener.java | 4 +- .../listeners/ListenerInterface.java | 6 +- .../listeners/MessageListener.java | 4 +- .../listeners/ModalListener.java | 22 +-- .../listeners/SelectionMenuListener.java | 6 +- .../listeners/SlashCommandListener.java | 10 +- .../listeners/ThreadCreateListener.java | 2 +- .../listeners/UserJoinServerListener.java | 4 +- .../listeners/UserLeaveServerListener.java | 4 +- .../routing}/AnnotationHandler.java | 10 +- .../interactions/routing}/ButtonHandler.java | 2 +- .../routing}/ManyButtonHandlers.java | 2 +- .../routing}/ManyModalHandlers.java | 2 +- .../routing}/ManySelectionHandlers.java | 2 +- .../interactions/routing}/ModalHandler.java | 2 +- .../interactions/routing}/NamedParam.java | 2 +- .../routing}/SelectionHandler.java | 2 +- .../interactions}/selections/Selection.java | 4 +- .../selections/SelectionManager.java | 6 +- .../selections/SelectionMenuProcessor.java | 10 +- .../selections/selectmenus/BigSelectDemo.java | 6 +- .../selections/selectmenus/SelectFaction.java | 6 +- src/main/java/ti4/draft/BagDraft.java | 4 +- src/main/java/ti4/draft/DraftItem.java | 2 +- .../executors/ExecutionHistoryManager.java | 2 +- src/main/java/ti4/game/Expeditions.java | 4 +- src/main/java/ti4/game/Game.java | 4 +- src/main/java/ti4/game/Player.java | 4 +- .../ti4/game/persistence/GameManager.java | 2 +- .../migration/DataMigrationManager.java | 2 +- .../migration/MigrationHelper.java | 2 +- .../java/ti4/helpers/ActionCardHelper.java | 8 +- src/main/java/ti4/helpers/AgendaHelper.java | 55 ++----- src/main/java/ti4/helpers/ButtonHelper.java | 17 +- .../ti4/helpers/ButtonHelperAbilities.java | 8 +- .../ti4/helpers/ButtonHelperActionCards.java | 4 +- .../java/ti4/helpers/ButtonHelperAgents.java | 10 +- .../ti4/helpers/ButtonHelperCommanders.java | 8 +- .../java/ti4/helpers/ButtonHelperExplore.java | 2 +- .../helpers/ButtonHelperFactionSpecific.java | 8 +- .../java/ti4/helpers/ButtonHelperHeroes.java | 4 +- .../ti4/helpers/ButtonHelperModifyUnits.java | 4 +- .../java/ti4/helpers/ButtonHelperRelics.java | 4 +- .../java/ti4/helpers/ButtonHelperSCs.java | 6 +- .../java/ti4/helpers/ButtonHelperStats.java | 2 +- .../helpers/ButtonHelperTacticalAction.java | 6 +- .../helpers/ButtonHelperTwilightsFall.java | 6 +- .../ButtonHelperTwilightsFallActionCards.java | 4 +- .../ti4/helpers/ComponentActionHelper.java | 6 +- src/main/java/ti4/helpers/CryypterHelper.java | 4 +- .../java/ti4/helpers/DisasterWatchHelper.java | 2 +- .../ti4/helpers/DiscordantStarsHelper.java | 2 +- .../ti4/helpers/GameLaunchThreadHelper.java | 2 +- src/main/java/ti4/helpers/Helper.java | 2 +- src/main/java/ti4/helpers/NewStuffHelper.java | 4 +- .../ti4/helpers/PlayerPreferenceHelper.java | 4 +- .../java/ti4/helpers/PlayerTitleHelper.java | 4 +- .../ti4/helpers/PromissoryNoteHelper.java | 2 +- src/main/java/ti4/helpers/RelicHelper.java | 2 +- .../java/ti4/helpers/RiftUnitsHelper.java | 4 +- .../ti4/helpers/SecretObjectiveHelper.java | 2 +- .../java/ti4/helpers/SleeperTokenHelper.java | 4 +- src/main/java/ti4/helpers/StatusHelper.java | 2 +- src/main/java/ti4/helpers/TIGLHelper.java | 2 +- src/main/java/ti4/helpers/TitlesHelper.java | 2 +- .../java/ti4/helpers/TransactionHelper.java | 6 +- src/main/java/ti4/helpers/Units.java | 2 +- .../java/ti4/helpers/async/JimboButtons.java | 2 +- .../java/ti4/helpers/async/JimboHandlers.java | 4 +- .../ti4/helpers/async/RoundSummaryHelper.java | 6 +- .../ignis_aurora/IgnisAuroraHelperTechs.java | 4 +- ...AndcatReferenceCardsDraftableSettings.java | 2 +- .../menus/DraftSystemSettings.java | 4 +- .../menus/FactionDraftableSettings.java | 2 +- .../settingsFramework/menus/GameSettings.java | 2 +- .../menus/GameSetupSettings.java | 2 +- .../menus/MiltySettings.java | 2 +- .../menus/MiltySliceDraftableSettings.java | 2 +- .../menus/PlayerFactionSettings.java | 2 +- .../menus/PublicSnakeDraftSettings.java | 2 +- .../settingsFramework/menus/SettingsMenu.java | 2 +- .../menus/SliceDraftableSettings.java | 2 +- .../menus/SliceGenerationSettings.java | 2 +- .../settings/ChoiceSetting.java | 2 +- .../settings/DoubleSetting.java | 2 +- .../settings/IntegerRangeSetting.java | 2 +- .../settings/IntegerSetting.java | 2 +- .../settings/ListSetting.java | 2 +- .../BreakthroughCommandHelper.java | 6 +- .../thundersedge/DSHelperBreakthroughs.java | 6 +- .../thundersedge/TeHelperAbilities.java | 4 +- .../thundersedge/TeHelperActionCards.java | 6 +- .../helpers/thundersedge/TeHelperAgents.java | 4 +- .../thundersedge/TeHelperCommanders.java | 4 +- .../helpers/thundersedge/TeHelperGeneral.java | 6 +- .../thundersedge/TeHelperPromissories.java | 4 +- .../helpers/thundersedge/TeHelperTechs.java | 4 +- .../helpers/thundersedge/TeHelperUnits.java | 4 +- src/main/java/ti4/image/DrawingUtil.java | 2 +- src/main/java/ti4/image/MapGenerator.java | 2 +- .../java/ti4/image/PlayerAreaGenerator.java | 2 +- src/main/java/ti4/image/TileGenerator.java | 2 +- src/main/java/ti4/logging/BotLogger.java | 3 +- .../java/ti4/logging/LogBufferManager.java | 2 +- src/main/java/ti4/logging/LogOrigin.java | 13 +- .../{rollbar => logging}/RollbarManager.java | 7 +- src/main/java/ti4/message/MessageHelper.java | 4 +- src/main/java/ti4/model/PlanetModel.java | 2 +- .../java/ti4/service/PlotCardsService.java | 4 +- .../java/ti4/service/ShowGameService.java | 2 +- .../ti4/service/StatusCleanupService.java | 2 +- .../ti4/service/SusSlashCommandService.java | 6 +- .../java/ti4/service/VeiledHeartService.java | 4 +- .../service/abilities/MahactTokenService.java | 4 +- .../abilities/PuppetSoftHeBladeService.java | 4 +- .../agenda/IxthianArtifactService.java | 6 +- .../ti4/service/async/BanCleanupService.java | 2 +- .../ti4/service/async/DrumrollService.java | 2 +- .../java/ti4/service/async/RoleService.java | 2 +- .../service/async/VanityButtonService.java | 4 +- .../service/breakthrough/AlRaithService.java | 4 +- .../breakthrough/DataSkimmerService.java | 4 +- .../breakthrough/DeepgloomService.java | 4 +- .../breakthrough/DeorbitBarrageService.java | 4 +- .../breakthrough/EidolonMaximumService.java | 4 +- .../breakthrough/FealtyUplinkService.java | 4 +- .../breakthrough/MindsieveService.java | 4 +- .../breakthrough/PsychosporeService.java | 4 +- .../ResonanceGeneratorService.java | 4 +- .../breakthrough/SowingReapingService.java | 4 +- .../breakthrough/StellarGenesisService.java | 4 +- .../service/breakthrough/TheIconService.java | 4 +- .../breakthrough/ThundersParadoxService.java | 4 +- .../service/breakthrough/ValefarZService.java | 2 +- .../breakthrough/VaultsOfTheHeirService.java | 4 +- .../breakthrough/VisionariaSelectService.java | 4 +- .../breakthrough/VoidTetherService.java | 4 +- .../service/button/ReactionCheckService.java | 2 +- .../ti4/service/combat/CombatRollService.java | 4 +- .../service/combat/StartCombatService.java | 4 +- .../service/decks/ShowActionCardsService.java | 2 +- .../AndcatReferenceCardsMessageHelper.java | 2 +- .../ti4/service/draft/DraftButtonService.java | 2 +- .../java/ti4/service/draft/Draftable.java | 2 +- .../service/draft/MantisMapBuildService.java | 4 +- .../ti4/service/draft/PlayerSetupService.java | 4 +- .../service/draft/PublicDraftInfoService.java | 2 +- .../service/draft/SliceGeneratorService.java | 2 +- .../AndcatReferenceCardsDraftable.java | 2 +- .../draft/draftables/FactionDraftable.java | 2 +- .../draft/draftables/MahactKingDraftable.java | 2 +- .../PublicSnakeDraftOrchestrator.java | 2 +- .../emoji/ApplicationEmojiService.java | 2 +- .../explore/AddFrontierTokensService.java | 4 +- .../ti4/service/explore/ExploreService.java | 4 +- .../service/fow/BlindSelectionService.java | 6 +- .../ti4/service/fow/CreateFoWGameService.java | 4 +- .../java/ti4/service/fow/FOWPlusService.java | 8 +- .../fow/FowCommunicationThreadService.java | 4 +- src/main/java/ti4/service/fow/GMService.java | 6 +- .../java/ti4/service/fow/LoreService.java | 8 +- .../ti4/service/fow/RiftSetModeService.java | 8 +- .../franken/FrankenAbilityService.java | 2 +- .../franken/FrankenDraftBagService.java | 2 +- .../ti4/service/game/CreateGameService.java | 6 +- .../java/ti4/service/game/EndGameService.java | 2 +- .../ti4/service/game/HomebrewService.java | 4 +- .../ti4/service/game/ManagedGameService.java | 2 +- .../ti4/service/game/RoundOneService.java | 4 +- .../java/ti4/service/game/SpeakerService.java | 2 +- .../ti4/service/game/StartPhaseService.java | 2 +- .../ti4/service/info/AbilityInfoService.java | 2 +- .../ti4/service/info/CardsInfoService.java | 4 +- .../ti4/service/info/LeaderInfoService.java | 4 +- .../ti4/service/info/RelicInfoService.java | 4 +- .../info/SecretObjectiveInfoService.java | 2 +- .../ti4/service/info/TechInfoService.java | 4 +- .../ti4/service/info/UnitInfoService.java | 4 +- .../service/leader/NaaluCommanderService.java | 2 +- .../ti4/service/leader/PlayHeroService.java | 2 +- .../ti4/service/map/AddTileListService.java | 4 +- .../service/map/CustomHyperlaneService.java | 6 +- .../java/ti4/service/map/FractureService.java | 6 +- .../ti4/service/map/MapJsonIOService.java | 4 +- .../ti4/service/milty/FinishDraftService.java | 2 +- .../service/milty/GenerateSlicesService.java | 2 +- .../milty/MiltyDraftDisplayService.java | 4 +- .../ti4/service/milty/MiltyDraftManager.java | 2 +- .../java/ti4/service/milty/MiltyService.java | 2 +- .../objectives/DiscardSecretService.java | 2 +- .../ScorePublicObjectiveService.java | 2 +- .../ti4/service/option/FOWOptionService.java | 4 +- .../ti4/service/option/GameOptionService.java | 2 +- .../ti4/service/option/TEOptionService.java | 4 +- .../ti4/service/planet/AddPlanetService.java | 2 +- .../ti4/service/planet/EmelparService.java | 4 +- .../ti4/service/planet/FaunusService.java | 4 +- .../ti4/service/planet/IndustrexService.java | 2 +- .../ti4/service/planet/PlanetInfoService.java | 2 +- .../ti4/service/relic/HeartOfIxthService.java | 4 +- .../ti4/service/relic/NeuraloopService.java | 4 +- .../ti4/service/relic/SilverFlameService.java | 4 +- .../statistics/ExportToCsvService.java | 2 +- ...actionRecordOfStrategyCardPickService.java | 2 +- .../FactionRecordOfTechService.java | 2 +- .../FactionTopColorsStatisticsService.java | 2 +- .../GameWinsWithOtherFactionsService.java | 2 +- .../game/AllNamesStatisticsService.java | 2 +- .../EndingRoundPhaseStatisticsService.java | 2 +- ...onAverageTurnsInGameStatisticsService.java | 2 +- .../FactionPerformanceStatisticsService.java | 2 +- .../FactionWinPercentStatisticsService.java | 2 +- .../game/GameCountStatisticsService.java | 2 +- .../game/GameLengthStatisticsService.java | 2 +- .../game/GameModeStatisticsService.java | 2 +- .../MostPlayedFactionsStatisticsService.java | 2 +- .../game/MostPlayerColorService.java | 2 +- .../MostWinningColorStatisticsService.java | 2 +- .../MostWinningFactionsStatisticsService.java | 2 +- .../game/RoundTimeStatisticsService.java | 2 +- ...etObjectiveWinChanceStatisticsService.java | 2 +- ...pendToWinCorrelationStatisticsService.java | 2 +- .../VictoryPointsScoredStatisticsService.java | 2 +- .../game/WinningPathPersistenceService.java | 2 +- .../game/WinningPathsStatisticsService.java | 2 +- ...ayerExpectedWinDeltaStatisticsService.java | 2 +- .../PlayerGameCountStatisticsService.java | 2 +- .../PlayerWinPercentStatisticsService.java | 2 +- .../strategycard/PickStrategyCardService.java | 2 +- .../strategycard/PlayStrategyCardService.java | 2 +- .../tactical/TacticalActionService.java | 2 +- .../movement/AbsolLuxarchTreatiseButton.java | 2 +- .../tactical/movement/AetherstreamButton.java | 2 +- .../movement/BelkoseaAgentButton.java | 2 +- .../tactical/movement/DominusOrbButton.java | 2 +- .../movement/EkoPlanetAbilityButton.java | 2 +- .../EmergencyModificationsButton.java | 2 +- .../tactical/movement/EyeOfVogulButton.java | 2 +- .../movement/FirmamentAgentButton.java | 2 +- .../tactical/movement/GhostAgentButton.java | 2 +- .../tactical/movement/GhostMechButton.java | 2 +- .../tactical/movement/GravityDriveButton.java | 2 +- .../movement/LightWaveDeflectorButton.java | 2 +- .../movement/LightningDrivesButton.java | 2 +- .../tactical/movement/MidasTurbineButton.java | 2 +- .../movement/NavigationRelaysButton.java | 2 +- .../tactical/movement/NivynMechButton.java | 2 +- .../tactical/movement/QhetAgentButton.java | 2 +- .../movement/RealityFieldImpactorButton.java | 2 +- .../tactical/movement/SaarAgentButton.java | 2 +- .../tactical/movement/TempestButton.java | 2 +- .../tactical/movement/UydaiHeroButton.java | 2 +- .../movement/VaylerianCommanderButton.java | 2 +- .../movement/VaylerianHeroButton.java | 2 +- .../tactical/movement/WraithEngineButton.java | 2 +- .../tactical/planet/CrimsonDeployButton.java | 2 +- .../planet/DihmohnAgentPlanetButton.java | 2 +- .../tactical/planet/TnelisDeployButton.java | 2 +- .../postmovement/AtokeraHeroButton.java | 2 +- .../postmovement/BombardmentButton.java | 2 +- .../postmovement/CombatDronesButton.java | 2 +- .../postmovement/GhostCommanderButton.java | 2 +- .../postmovement/KhraskCommanderButton.java | 2 +- .../postmovement/MirvedaCommanderButton.java | 2 +- .../postmovement/MoveAvernusButton.java | 2 +- .../postmovement/MuaatHeroButton.java | 2 +- .../postmovement/NokarAgentButton.java | 2 +- .../tactical/postmovement/RiftUsedButton.java | 2 +- .../postmovement/RohdhnaHeroButton.java | 2 +- .../postmovement/SardakkHeroButton.java | 2 +- .../postmovement/ShroudOfLithButton.java | 2 +- .../postmovement/TnelisAgentButton.java | 2 +- .../postmovement/VaylerianBTButton.java | 2 +- .../postmovement/WeirdWormholeButton.java | 2 +- .../postmovement/ZelianAgentButton.java | 2 +- .../postmovement/ZelianHeroButton.java | 2 +- .../ti4/service/tech/BastionTechService.java | 4 +- .../ti4/service/tech/ListTechService.java | 4 +- .../ti4/service/tech/PlayerTechService.java | 6 +- .../ti4/service/tigl/TiglReportService.java | 2 +- .../java/ti4/service/turn/EndTurnService.java | 2 +- .../java/ti4/service/turn/PassService.java | 2 +- .../ti4/service/turn/StartTurnService.java | 2 +- .../ti4/service/unit/DestroyUnitService.java | 2 +- .../ti4/service/unit/GalvanizeService.java | 4 +- .../spring/api/image/GameImageController.java | 2 +- .../ti4/spring/context/RequestContext.java | 2 +- .../resilience/CircuitBreakerFilter.java | 2 +- .../spring/resilience/ErrorLoggingFilter.java | 2 +- .../service/jda/JdaLifecycleService.java | 25 +++ .../PersistAllEntitiesService.java | 2 +- .../TourneyWinnerService.java | 2 +- .../game/persistence/GameLoadServiceTest.java | 10 +- .../game/persistence/GameSaveLoadTest.java | 95 ++++++------ .../game/persistence/GameSaveServiceTest.java | 57 ++----- .../ti4/game/persistence/GameTestHelper.java | 17 -- .../game/persistence/GameUndoServiceTest.java | 55 +------ .../ti4/game/persistence/TestGameHarness.java | 118 ++++++++++++++ .../java/ti4/helpers/AgendaHelperTest.java | 45 ++++++ src/test/java/ti4/testUtils/BaseTi4Test.java | 4 +- .../stats/GameStatsDashboardPayloadTest.java | 16 +- 1151 files changed, 2770 insertions(+), 2735 deletions(-) delete mode 100644 src/main/java/ti4/commands/SlashCommandManager.java rename src/main/java/ti4/{spring/jda => discord}/JdaService.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/ButtonProcessor.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/ButtonRuntimeWarningService.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/Buttons.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/actioncards/ActionCardButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/actioncards/ActionCardHandButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java (85%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java (90%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/AgendaResolveButtonHandler.java (84%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/ColonialButtonHandler.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/DrawAgendaButtonHandler.java (90%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/EdictPhaseHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/LookAgendaButtonHandler.java (88%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/PutAgendaButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/VoteButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java (90%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java (90%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java (88%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/AgendaResolver.java (79%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java (89%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java (90%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java (90%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/NexusAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java (89%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/combat/BombardmentButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/combat/CombatButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/combat/RetreatButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/commandcounter/CommandCounterButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java (81%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/draft/FrankenButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/draft/MiltyButtonHandler.java (77%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/explore/ExploreButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/explore/StarChartsButtonHandler.java (82%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/facilities/CoreFactoryButtonHandler.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/FactionMiscButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/OtherHeroButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/argent/ArgentButtonHandler.java (89%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/creuss/CreussButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java (84%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java (83%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java (85%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java (87%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java (82%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java (87%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/galacticevent/GalacticEventButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/CreateGameButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/EditTagsButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/EndGameButtonHandler.java (86%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/RematchButtonHandler.java (77%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/ShowGameButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/SwapFactionButtonHandler.java (84%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/game/UndoButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/AbilityInfoButtonHandler.java (81%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/BreakthroughInfoButtonHandler.java (84%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/CardsInfoButtonHandler.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/LeaderInfoButtonHandler.java (82%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/ListPlayerInfoButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/PromissoryInfoButtonHandler.java (78%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/RelicInfoButtonHandler.java (82%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java (82%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/TechInfoButtonHandler.java (81%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/info/UnitInfoButtonHandler.java (87%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/map/AddTileListButtonHandler.java (85%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/map/MapViewButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/map/RingSelectionButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/milty/MiltyDraftButtonHandlers.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/milty/SettingMenuButtonHandlers.java (86%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/objective/SecretObjectiveButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java (81%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/options/GameOptionButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/options/PingIntervalButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/options/PlayerPreferenceButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/other/CaptureButtonHandler.java (88%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/other/DeleteButtonsButtonHandler.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/other/NotepadButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/other/TrapButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/phases/DoAnotherActionButtonHandler.java (89%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/phases/GamePhaseButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/phases/ProceedToScoringButtonHandler.java (81%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/phases/StatusPhaseButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/phases/StrategyPhaseButtonHandler.java (96%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/phases/TurnEndButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/IndustrexButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/LegendaryPlanetButtonHandler.java (85%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/MalliceButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/PlanetExhaustButtonHandler.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/PlanetInfoButtonHandler.java (76%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/PrismButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/planet/TradeStationButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java (95%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/relics/DrawRelicButtonHandler.java (89%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/relics/HomebrewRelicButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/relics/JRStructureButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/relics/RelicButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/relics/StellarConverterButtonHandler.java (80%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/spending/SpendingButtonHandler.java (97%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/statistics/StatsTrackingButtonHandler.java (94%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java (87%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java (88%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java (88%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java (80%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/ExhaustTechButtonHandler.java (83%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/GetTechButtonHandler.java (80%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/TechUseButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java (92%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/specific/DacxiveButtonHandler.java (89%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java (93%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java (83%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/unit/AssignHitsButtonHandlers.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/unit/ModifyUnitButtonHandler.java (91%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/unit/TacticalActionButtonHandlers.java (99%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/unit/UnitManagementButtonHandler.java (98%) rename src/main/java/ti4/{ => discord/interactions}/buttons/handlers/unit/UnitPickerHandlerHelper.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/Command.java (78%) rename src/main/java/ti4/{ => discord/interactions}/commands/CommandGameState.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/CommandHelper.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/GameStateCommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/GameStateSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/ParentCommand.java (98%) create mode 100644 src/main/java/ti4/discord/interactions/commands/SlashCommandManager.java rename src/main/java/ti4/{ => discord/interactions}/commands/Subcommand.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/SubcommandGroup.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/AdminCommand.java (83%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/CardsInfoForPlayer.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/DeleteGame.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/DeletePersistenceManagerFile.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/DisableBot.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/GetChannelHtml.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/RecreateGame.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/ReloadMapperObjects.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/TourneyWinner.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/UpdateThreadArchiveTime.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/admin/UpdateVanityContainer.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/AddControlToken.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/AddLaw.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/AgendaCommand.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/Cleanup.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/DrawAgenda.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ExhaustSC.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/LawInfo.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ListVoteCount.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/LookAtAgenda.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/PutDiscardBackIntoDeckAgendas.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/PutDrawnAgendaBackIntoDeck.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/RemoveLaw.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ResetAgendas.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ResetDrawStateAgendas.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/RevealAgenda.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/RevealSpecificAgenda.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ReviseLaw.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ShowDiscardedAgendas.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/agenda/ShuffleAgendas.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/async/AsyncCommand.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/async/ShowHeroes.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/async/ShowTourneyWinners.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ArchiveOldThreads.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/BeginVideoGeneration.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/BothelperCommand.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/CheckNextPingTime.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/CorrectFaction.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/CreateFOWGameChannels.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/CreateGameChannels.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/DeleteFOWCommThreads.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/EditStoredValue.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/EditTrackRecord.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/FixGameChannelPermissions.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/JazzCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ListButtons.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ListCategoryChannelCounts.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ListDeadGames.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ListSlashCommandsUsed.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ListStoredValues.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ReloadGame.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/RemoveTitle.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ReserveGame.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ServerGameStats.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/ServerLimitStats.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/SetGameLimit.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/bothelper/SetStatsTrackedUser.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughActivate.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughCommand.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughExhaust.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughInfo.java (82%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughLock.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughReady.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughSetTg.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/breakthrough/BreakthroughUnlock.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/button/GenericButtonCommand.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ACCardsCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ACInfo.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/DiscardAC.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/DiscardACRandom.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/DrawAC.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/DrawSpecificAC.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/MakeCopiesOfACs.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/PickACFromDiscard.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/PickACFromPurged.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/PlayAC.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/PurgeAC.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/RevealAndPutACIntoDiscard.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/SendAC.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/SendACRandom.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowAC.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowACRemainingCardCount.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowACToAll.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowAllAC.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowAllUnplayedACs.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowDiscardActionCards.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowGarboziaActionCards.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShowPurgedActionCards.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShuffleACBackIntoDeck.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShuffleACDeck.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsac/ShuffleACFromHand.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/PNCardsCommand.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/PNInfo.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/PNReset.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/PlayPN.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/PurgePN.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/SendPN.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/SendRandomPN.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/ShowAllPN.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/ShowPN.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardspn/ShowPNToAll.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/DealSO.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/DealSOToAll.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/DiscardSO.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/DrawSO.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/DrawSpecificSO.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ListAllScored.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/SOCardsCommand.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/SOInfo.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ScoreSO.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShowAllSO.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShowAllSOToAll.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShowRandomSO.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShowSO.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShowSOToAll.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShowUnScoredSOs.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/ShuffleSecretDeck.java (83%) rename src/main/java/ti4/{ => discord/interactions}/commands/cardsso/UnscoreSO.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/combat/CombatCommand.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/combat/CombatRoll.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/combat/StartCombat.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/context/BanUser.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/context/ContextCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/context/ContextCommandManager.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/context/DeleteMessage.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/context/MessageCommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/context/UserCommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/ACRemoveFromGame.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/AgendaRemoveFromGame.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/ChangeToBaseGame.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/CustomCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/CustomizationOptions.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/DiscardSpecificAgenda.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/OfferAutoPassOptions.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/PeekAtSecretDeck.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/PeekAtStage1.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/PeekAtStage2.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/PoRemoveFromGame.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/PoSetDeck.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/RevealSpecificStage1.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/RevealSpecificStage2.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SCAddToGame.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SCRemoveFromGame.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SetThreadName.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SetUpPeakableObjectives.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/ShuffleBackInUnrevealedObj.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SoAddToGame.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SoRemoveFromGame.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SpinTilesInRings.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SwapStage1.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/custom/SwapStage2.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/ButtonProcessingStatistics.java (77%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/CacheStatistics.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/CustomCommand.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/DeveloperCommand.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/GiveTheBotABreather.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/LocalDevelopment.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/ProduceNucleusGenStats.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/RestoreGame.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/RunAgainstAllGames.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/RunAgainstSpecificGame.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/RunCron.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/RunManualDataMigration.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/RunSql.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/developer/SetGlobalSetting.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/DraftCommand.java (56%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/andcat/AndcatDraftableAddPackage.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/andcat/AndcatDraftableGroup.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/andcat/AndcatDraftableModifyPackage.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/andcat/AndcatDraftableRemovePackage.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/faction/FactionDraftableAddFaction.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/faction/FactionDraftableGroup.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/faction/FactionDraftableRemoveFaction.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/faction/FactionDraftableSetKeleresFlavor.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerAddAllGamePlayers.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerAddDraftable.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerAddOrchestrator.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerAddPlayer.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerCanEndDraft.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerCanSetupPlayers.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerClearMissingPlayers.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerDebug.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerGroup.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerListPlayers.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerMakePick.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerPostDraftWork.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerRemoveDraftable.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerRemovePlayer.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerReplacePlayer.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerSetupDraft.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerSetupNucleusCommand.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerSetupPlayers.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerStartDraft.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerSwapDraftingPlayers.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerTryEndDraft.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerUnpick.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/manage/DraftManagerValidateState.java (83%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/mantistile/MantisTileDraftableConfigure.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/mantistile/MantisTileDraftableGroup.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/mantistile/MantisTileDraftableSetTiles.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/mantistile/MantisTileDraftableStartBuilding.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/publicsnake/PublicSnakeDraftGroup.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/seat/SeatDraftableGroup.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/seat/SeatDraftableSetSeatCount.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/slice/SliceDraftableAddSlice.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/slice/SliceDraftableGroup.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/slice/SliceDraftableModifySlice.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/slice/SliceDraftableRemoveSlice.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/ATS.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/AddOmenDie.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/DiscordantStarsCommand.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/DishonorCount.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/DrawBlueBackTile.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/DrawRedBackTile.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/FlipGrace.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/HonorCount.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/KyroHero.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/PathToken.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/SetPlanetTradeGoods.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/SetPolicy.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/StarBalanceCount.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/SteelBalanceCount.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/TrapReveal.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/TrapSwap.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/TrapToken.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/ds/ZelianHero.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/AddEvent.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/DrawEvent.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/EventCommand.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/EventInfo.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/LookAtBottomEvent.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/LookAtTopEvent.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/PlayEvent.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/PutDiscardBackIntoDeckEvents.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/PutEventBottom.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/PutEventTop.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/RemoveEvent.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/ResetEvents.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/RevealEvent.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/RevealSpecificEvent.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/ShowDiscardedEvents.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/event/ShuffleEvents.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreCommand.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreDiscardFragment.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreDiscardFromDeck.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreDrawAndDiscard.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreFrontier.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreInfo.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreLookAtTop.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExplorePlanet.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreRemoveFromGame.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreReset.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreShuffle.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreShuffleBackIntoDeck.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreShuffleIntoDeckFromHand.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/explore/ExploreUse.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/AddFogTile.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/Announce.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/CheckChannels.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/CreateFoWGameButton.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/FOWCommand.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/FOWOptions.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/GMCommand.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/PingActivePlayer.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/PingSystem.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/PrivateCommunicationsCheck.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/RemoveFogTile.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/ShowGameAsPlayer.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/fow/Whisper.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/AbilityAdd.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/AbilityAddRemove.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/AbilityRemove.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/ApplyDraftBags.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/BanFaction.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/BreakthroughAdd.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/BreakthroughRemove.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/BuildMap.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/DraftLimits.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/FactionTechAdd.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/FactionTechAddRemove.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/FactionTechRemove.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/FrankenCommand.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/FrankenEdit.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/FrankenViewCard.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/LeaderAdd.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/LeaderAddRemove.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/LeaderRemove.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/PNAdd.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/PNAddRemove.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/PNRemove.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/SetFactionDisplayName.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/SetFactionIcon.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/SetHomeSystemPosition.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/ShowFrankenBag.java (82%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/ShowFrankenHand.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/StartFrankenDraft.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/UnitAdd.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/UnitAddRemove.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/UnitRemove.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/ban/Ban.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/ban/BanService.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/franken/ban/IBanService.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/AddPlayer.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/CreateGameButton.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/EliminatePlayer.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/GalacticEventsSetup.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/GameCommand.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/GameEnd.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/GameOptions.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Info.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Join.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Leave.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Observer.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Ping.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Replace.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/SCCount.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/SetDeck.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/SetOrder.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/SetUnitCap.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Setup.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/SetupGameChannels.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/StartPhase.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/StartScenario.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Swap.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Tags.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/Undo.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/game/WeirdGameSetup.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/Absol.java (76%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/DiscordantStars.java (78%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/FoWHelp.java (76%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/FoWPlusHelp.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/HelpAction.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/HelpCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/HowToMoveUnits.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/HowToPlayTI4.java (79%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/Monuments.java (77%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/NewPlayerInfo.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/SampleColors.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/SampleDecals.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/help/WhatsTIGL.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/installation/AddSweepToken.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/installation/InstallationCommand.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/installation/RemoveSweepToken.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/ExhaustLeader.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/HeroPlay.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/HeroUnplay.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/LeaderCommand.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/LeaderInfo.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/LockLeader.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/PurgeLeader.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/RefreshLeader.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/ResetLeader.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/leaders/UnlockLeader.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddAdjacencyOverride.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddAdjacencyOverrideList.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddBorderAnomaly.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddCustomAdjacentTile.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddTile.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddTileList.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddTileListRandom.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/AddTileRandom.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/CustomHyperlanes.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/ExportToJson.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/ImportFromJson.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/InitTspmap.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/InteractiveBuilder.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/MapCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/MoveTile.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/Preset.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/PreviewMapTemplate.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/RemoveAdjacencyOverride.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/RemoveBorderAnomaly.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/RemoveCustomAdjacentTile.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/RemoveTile.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/SetMapTemplate.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/ShowMapSetup.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/ShowMapString.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/map/SpawnFracture.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/milty/DebugMilty.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/milty/ForcePick.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/milty/MiltyCommand.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/milty/SetupMilty.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/milty/ShowMilty.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/milty/StartMilty.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/AssignPlayerPriority.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/ClearPriorityTrack.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/ElectVoiceOfTheCouncil.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/OmegaPhaseCommand.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/PrintPriorityTrack.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/ResetObjectives.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/omega_phase/ResetVoiceOfTheCouncil.java (82%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetAdd.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetAddRemove.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetCommand.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetExhaust.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetExhaustAbility.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetExhaustAll.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetInfo.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetRefresh.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetRefreshAbility.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetRefreshAll.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/planet/PlanetRemove.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/AbilityInfo.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/AddAllianceMember.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/AddTeamMate.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/CCsButton.java (77%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/ChangeColor.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/ChangeUnitDecal.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/ClearDebt.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/Pass.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/PlayerCommand.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/RemoveAllianceMember.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/RemoveTeamMate.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SCPick.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SCPlay.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SCUnpick.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SCUnplay.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SendCommodities.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SendDebt.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SendTG.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/SetStatsAnchor.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/Setup.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/Speaker.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/Stats.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/TurnEnd.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/TurnStart.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/player/UnitInfo.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicAddBackIntoDeck.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicAddCodexRelics.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicBottom.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicCommand.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicDraw.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicDrawSpecific.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicExhaust.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicInfo.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicLookAtTop.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicPurge.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicPurgeFragments.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicReady.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicSend.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicSendFragments.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicShowRemaining.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/relic/RelicShuffleBack.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/rules/AskRulesQuestion.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/rules/RulesCommand.java (79%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchAbilitiesSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchActionCardsSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchAgendasSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchAttachmentsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchBreakthroughs.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchCommand.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchCommand2.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchCommandsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchComponentModelSubcommand.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchDecksSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchEmojis.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchEventsSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchExploresSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchFactionsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchForGame.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchGalacticEventsSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchGames.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchGenomesSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchHelper.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchLeadersSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchMyGames.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchMyTitles.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchParadigmsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchPlanetsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchPromissoryNotesSubcommand.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchPublicObjectivesSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchRelicsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchRules.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchSecretObjectivesSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchSources.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchStrategyCardsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchTechsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchTilesSubcommand.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchTokensSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/search/SearchUnitsSubcommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/AddFactionCCToFleetSupply.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/AddRemoveFactionCCToFromFleet.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/AdjustRoundNumber.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/Bounties.java (79%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/CheckAllDistance.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/CheckDistance.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/CloneGame.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/DiploSystem.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/FighterConscription.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/Galvanize.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/GeneratePainBoxMapString.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/IonFlip.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/LoreCommand.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/MakeSecretIntoPO.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/MoveAllUnits.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/MoveCoatl.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/MoveCreussWormhole.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/NaaluCommander.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/NovaSeed.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/Rematch.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/RemoveFactionCCFromFleetSupply.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/RiseOfMessiah.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SearchWarrant.java (85%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SearchWinningPath.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SetExpedition.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SetupNeutralPlayer.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SleeperToken.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/Special2Command.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SpecialCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/StasisInfantry.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/StellarConverter.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SwapSC.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SwapTwoSystems.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/special/SystemInfo.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/spin/AddSpinSetting.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/spin/ExecuteSpin.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/spin/ListSpinSettings.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/spin/RemoveSpinSetting.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/spin/SpinCommand.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/AverageTurnTime.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/CommunityStatistics.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/CompareAFKTimes.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/DiceLuck.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/ExpeditionWinRateStatisticsService.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/ExpeditionWinRates.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/ExportToCSV.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/FactionGames.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/FactionRecordOfSCPick.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/FactionRecordOfTech.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/FactionTopColors.java (83%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/GameStatistics.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/GameStatisticsFilterer.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/GameWinsWithOtherFactions.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/HitsPerTurn.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/LifetimeRecord.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/ListTitlesGiven.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/MatchmakingRatingCommand.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/MedianTurnTime.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/OptIn.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/OptOut.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/PlayerStatistics.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/PoliticsPosition.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/StatisticsCommand.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/StellarConverterStatistics.java (83%) rename src/main/java/ti4/{ => discord/interactions}/commands/statistics/SurveyResults.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/AddCustomPO.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/Cleanup.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ListDiceLuck.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ListSpends.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ListTurnOrder.java (83%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ListTurnStats.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/MarkFollowed.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/POInfo.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/PeekPublicObjectiveDeck.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/PersonalCleanup.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/RemoveCustomPO.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/RevealStage1.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/RevealStage2.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/SCTradeGoods.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ScorePublic.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ShufflePublicBack.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/ShufflePublicDeck.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/StatusCommand.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/status/UnscorePublic.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/GetTechButton.java (76%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechAdd.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechAddRemove.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechChangeType.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechCommand.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechExhaust.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechInfo.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechPurge.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechRefresh.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechRemove.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechShowDeck.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/tech/TechUnpurge.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DiscardVeiledCard.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DoEdictPhase.java (69%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DrawRandomAbility.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DrawRandomGenome.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DrawRandomParadigm.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DrawRandomUnit.java (90%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/DrawSpecificParadigm.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/FixColors.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/RadicalAdvancement.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/ReverseSplice.java (82%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/SetupStartingFleet.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/StartNewSplice.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/tf/TwilightFallCommand.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/tigl/ChangeNickname.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/tigl/Games.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/tigl/IsFractured.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/tigl/TiglCommand.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/AddCCCommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/AddFrontierTokensCommand.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/AddRemoveTokenCommand.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/AddTokenCommand.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/RemoveAllCC.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/RemoveCCCommand.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/tokens/RemoveTokenCommand.java (99%) rename src/main/java/ti4/{ => discord/interactions}/commands/transaction/ChangeDebtIcon.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/transaction/TransactionCommand.java (80%) rename src/main/java/ti4/{ => discord/interactions}/commands/transaction/TransactionStart.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/uncategorized/AllInfoCommand.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/uncategorized/CardsInfoCommand.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/uncategorized/SelectionBoxDemoCommand.java (71%) rename src/main/java/ti4/{ => discord/interactions}/commands/uncategorized/ServerPromoteCommand.java (98%) rename src/main/java/ti4/{ => discord/interactions}/commands/uncategorized/ShowDistancesCommand.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/uncategorized/ShowGameCommand.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/AddCaptureUnits.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/AddUnitDamage.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/AddUnits.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/CaptureCommand.java (84%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/FixRemoveCaptureUnits.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/ModifyUnitsButtons.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/MoveUnits.java (96%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/RemoveAllUnitDamage.java (91%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/RemoveAllUnits.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/RemoveCaptureUnits.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/RemoveUnitDamage.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/RemoveUnits.java (93%) rename src/main/java/ti4/{ => discord/interactions}/commands/units/UnitCommandHelper.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/MessageMyGames.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/OfferAFKTimeOptions.java (87%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/SetFowFilter.java (94%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/SetPersonalPingInterval.java (89%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/SetPingOnNextTurn.java (88%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/SetPreferredColourList.java (95%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/SetPreferredSettings.java (97%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/ShowUserSettings.java (92%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/Survey.java (81%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/UserCommand.java (86%) rename src/main/java/ti4/{ => discord/interactions}/commands/user/WipeTurnTime.java (95%) rename src/main/java/ti4/{listeners => discord/interactions}/context/ButtonContext.java (97%) rename src/main/java/ti4/{listeners => discord/interactions}/context/ListenerContext.java (97%) rename src/main/java/ti4/{listeners => discord/interactions}/context/ModalContext.java (98%) rename src/main/java/ti4/{listeners => discord/interactions}/context/SelectionMenuContext.java (96%) rename src/main/java/ti4/{ => discord/interactions}/listeners/AutoCompleteListener.java (89%) rename src/main/java/ti4/{autocomplete => discord/interactions/listeners}/AutoCompleteProvider.java (99%) rename src/main/java/ti4/{ => discord/interactions}/listeners/BanListener.java (96%) rename src/main/java/ti4/{ => discord/interactions}/listeners/BotRuntimeStatsListener.java (94%) rename src/main/java/ti4/{ => discord/interactions}/listeners/ButtonListener.java (94%) rename src/main/java/ti4/{ => discord/interactions}/listeners/ChannelCreationListener.java (94%) rename src/main/java/ti4/{ => discord/interactions}/listeners/ContextMenuListener.java (90%) rename src/main/java/ti4/{ => discord/interactions}/listeners/DeletionListener.java (98%) rename src/main/java/ti4/{ => discord/interactions}/listeners/ListenerInterface.java (94%) rename src/main/java/ti4/{ => discord/interactions}/listeners/MessageListener.java (99%) rename src/main/java/ti4/{ => discord/interactions}/listeners/ModalListener.java (85%) rename src/main/java/ti4/{ => discord/interactions}/listeners/SelectionMenuListener.java (85%) rename src/main/java/ti4/{ => discord/interactions}/listeners/SlashCommandListener.java (94%) rename src/main/java/ti4/{ => discord/interactions}/listeners/ThreadCreateListener.java (93%) rename src/main/java/ti4/{ => discord/interactions}/listeners/UserJoinServerListener.java (97%) rename src/main/java/ti4/{ => discord/interactions}/listeners/UserLeaveServerListener.java (99%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/AnnotationHandler.java (98%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/ButtonHandler.java (96%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/ManyButtonHandlers.java (89%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/ManyModalHandlers.java (89%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/ManySelectionHandlers.java (89%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/ModalHandler.java (90%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/NamedParam.java (94%) rename src/main/java/ti4/{listeners/annotations => discord/interactions/routing}/SelectionHandler.java (90%) rename src/main/java/ti4/{ => discord/interactions}/selections/Selection.java (80%) rename src/main/java/ti4/{ => discord/interactions}/selections/SelectionManager.java (80%) rename src/main/java/ti4/{ => discord/interactions}/selections/SelectionMenuProcessor.java (94%) rename src/main/java/ti4/{ => discord/interactions}/selections/selectmenus/BigSelectDemo.java (95%) rename src/main/java/ti4/{ => discord/interactions}/selections/selectmenus/SelectFaction.java (94%) rename src/main/java/ti4/{ => game/persistence}/migration/DataMigrationManager.java (99%) rename src/main/java/ti4/{ => game/persistence}/migration/MigrationHelper.java (99%) rename src/main/java/ti4/{rollbar => logging}/RollbarManager.java (97%) create mode 100644 src/main/java/ti4/spring/service/jda/JdaLifecycleService.java delete mode 100644 src/test/java/ti4/game/persistence/GameTestHelper.java create mode 100644 src/test/java/ti4/game/persistence/TestGameHarness.java create mode 100644 src/test/java/ti4/helpers/AgendaHelperTest.java diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index b4e4870242..ac9a1b5a69 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -11,12 +11,6 @@ - - - - - - diff --git a/src/main/java/ti4/AsyncTI4DiscordBot.java b/src/main/java/ti4/AsyncTI4DiscordBot.java index e274263b03..8bd1076eab 100644 --- a/src/main/java/ti4/AsyncTI4DiscordBot.java +++ b/src/main/java/ti4/AsyncTI4DiscordBot.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; import ti4.logging.BotLogger; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; import ti4.settings.GlobalSettings; import ti4.settings.GlobalSettings.ImplementedSettings; diff --git a/src/main/java/ti4/commands/SlashCommandManager.java b/src/main/java/ti4/commands/SlashCommandManager.java deleted file mode 100644 index 2287831c3d..0000000000 --- a/src/main/java/ti4/commands/SlashCommandManager.java +++ /dev/null @@ -1,144 +0,0 @@ -package ti4.commands; - -import java.util.Collection; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import lombok.experimental.UtilityClass; -import ti4.commands.admin.AdminCommand; -import ti4.commands.agenda.AgendaCommand; -import ti4.commands.async.AsyncCommand; -import ti4.commands.bothelper.BothelperCommand; -import ti4.commands.breakthrough.BreakthroughCommand; -import ti4.commands.button.GenericButtonCommand; -import ti4.commands.cardsac.ACCardsCommand; -import ti4.commands.cardspn.PNCardsCommand; -import ti4.commands.cardsso.SOCardsCommand; -import ti4.commands.combat.CombatCommand; -import ti4.commands.custom.CustomCommand; -import ti4.commands.developer.DeveloperCommand; -import ti4.commands.draft.DraftCommand; -import ti4.commands.ds.DiscordantStarsCommand; -import ti4.commands.event.EventCommand; -import ti4.commands.explore.ExploreCommand; -import ti4.commands.fow.FOWCommand; -import ti4.commands.franken.FrankenCommand; -import ti4.commands.game.GameCommand; -import ti4.commands.help.HelpCommand; -import ti4.commands.installation.InstallationCommand; -import ti4.commands.leaders.LeaderCommand; -import ti4.commands.map.MapCommand; -import ti4.commands.milty.MiltyCommand; -import ti4.commands.omega_phase.OmegaPhaseCommand; -import ti4.commands.planet.PlanetCommand; -import ti4.commands.player.PlayerCommand; -import ti4.commands.relic.RelicCommand; -import ti4.commands.rules.RulesCommand; -import ti4.commands.search.SearchCommand; -import ti4.commands.search.SearchCommand2; -import ti4.commands.special.Special2Command; -import ti4.commands.special.SpecialCommand; -import ti4.commands.spin.SpinCommand; -import ti4.commands.statistics.StatisticsCommand; -import ti4.commands.status.StatusCommand; -import ti4.commands.tech.TechCommand; -import ti4.commands.tf.TwilightFallCommand; -import ti4.commands.tigl.TiglCommand; -import ti4.commands.tokens.AddCCCommand; -import ti4.commands.tokens.AddFrontierTokensCommand; -import ti4.commands.tokens.AddTokenCommand; -import ti4.commands.tokens.RemoveAllCC; -import ti4.commands.tokens.RemoveCCCommand; -import ti4.commands.tokens.RemoveTokenCommand; -import ti4.commands.transaction.TransactionCommand; -import ti4.commands.uncategorized.AllInfoCommand; -import ti4.commands.uncategorized.CardsInfoCommand; -import ti4.commands.uncategorized.SelectionBoxDemoCommand; -import ti4.commands.uncategorized.ShowDistancesCommand; -import ti4.commands.uncategorized.ShowGameCommand; -import ti4.commands.units.AddUnitDamage; -import ti4.commands.units.AddUnits; -import ti4.commands.units.CaptureCommand; -import ti4.commands.units.ModifyUnitsButtons; -import ti4.commands.units.MoveUnits; -import ti4.commands.units.RemoveAllUnitDamage; -import ti4.commands.units.RemoveAllUnits; -import ti4.commands.units.RemoveUnitDamage; -import ti4.commands.units.RemoveUnits; -import ti4.commands.user.UserCommand; - -@UtilityClass -public class SlashCommandManager { - - private static final Map commands = Stream.of( - new AddUnits(), - new RemoveUnits(), - new RemoveAllUnits(), - new AllInfoCommand(), - new CardsInfoCommand(), - new ShowGameCommand(), - new ShowDistancesCommand(), - new AddCCCommand(), - new RemoveCCCommand(), - new RemoveAllCC(), - new SearchCommand2(), - new AddFrontierTokensCommand(), - new MoveUnits(), - new ModifyUnitsButtons(), - new RemoveTokenCommand(), - new AddTokenCommand(), - new AddUnitDamage(), - new RemoveUnitDamage(), - new RemoveAllUnitDamage(), - new TransactionCommand(), - new MapCommand(), - new HelpCommand(), - new SearchCommand(), - new ExploreCommand(), - new RelicCommand(), - new RulesCommand(), - new AdminCommand(), - new DeveloperCommand(), - new BothelperCommand(), - new PlayerCommand(), - new GameCommand(), - new ACCardsCommand(), - new PNCardsCommand(), - new SOCardsCommand(), - new StatusCommand(), - new AgendaCommand(), - new EventCommand(), - new SpecialCommand(), - new Special2Command(), - new LeaderCommand(), - new CombatCommand(), - new CustomCommand(), - new FOWCommand(), - new InstallationCommand(), - new MiltyCommand(), - new FrankenCommand(), - new CaptureCommand(), - new GenericButtonCommand(), - new DiscordantStarsCommand(), - new TwilightFallCommand(), - new StatisticsCommand(), - new TechCommand(), - new BreakthroughCommand(), - new PlanetCommand(), - new SelectionBoxDemoCommand(), - new UserCommand(), - new TiglCommand(), - new AsyncCommand(), - new OmegaPhaseCommand(), - new DraftCommand(), - new SpinCommand()) - .collect(Collectors.toMap(ParentCommand::getName, command -> command)); - - public static ParentCommand getCommand(String name) { - return commands.get(name); - } - - public static Collection getCommands() { - return commands.values(); - } -} diff --git a/src/main/java/ti4/cron/AutoPingCron.java b/src/main/java/ti4/cron/AutoPingCron.java index a113b8cd19..25ddce74b1 100644 --- a/src/main/java/ti4/cron/AutoPingCron.java +++ b/src/main/java/ti4/cron/AutoPingCron.java @@ -9,7 +9,7 @@ import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; diff --git a/src/main/java/ti4/cron/CategoryCleanupCron.java b/src/main/java/ti4/cron/CategoryCleanupCron.java index 3cd3d6a97a..8aea22188e 100644 --- a/src/main/java/ti4/cron/CategoryCleanupCron.java +++ b/src/main/java/ti4/cron/CategoryCleanupCron.java @@ -3,8 +3,8 @@ import java.util.concurrent.TimeUnit; import lombok.experimental.UtilityClass; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.JdaService; import ti4.logging.BotLogger; -import ti4.spring.jda.JdaService; @UtilityClass public class CategoryCleanupCron { diff --git a/src/main/java/ti4/cron/LogButtonRuntimeStatisticsCron.java b/src/main/java/ti4/cron/LogButtonRuntimeStatisticsCron.java index 9565d1d9b5..62c0670491 100644 --- a/src/main/java/ti4/cron/LogButtonRuntimeStatisticsCron.java +++ b/src/main/java/ti4/cron/LogButtonRuntimeStatisticsCron.java @@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit; import lombok.experimental.UtilityClass; -import ti4.buttons.ButtonProcessor; +import ti4.discord.interactions.buttons.ButtonProcessor; import ti4.logging.BotLogger; @UtilityClass diff --git a/src/main/java/ti4/spring/jda/JdaService.java b/src/main/java/ti4/discord/JdaService.java similarity index 95% rename from src/main/java/ti4/spring/jda/JdaService.java rename to src/main/java/ti4/discord/JdaService.java index f55d1367b4..cee1df1509 100644 --- a/src/main/java/ti4/spring/jda/JdaService.java +++ b/src/main/java/ti4/discord/JdaService.java @@ -1,15 +1,13 @@ -package ti4.spring.jda; +package ti4.discord; import jakarta.annotation.Nullable; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; -import lombok.RequiredArgsConstructor; +import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.OnlineStatus; @@ -24,10 +22,6 @@ import net.dv8tion.jda.api.utils.ChunkingFilter; import net.dv8tion.jda.api.utils.MemberCachePolicy; import org.apache.commons.lang3.function.Consumers; -import org.springframework.boot.ApplicationArguments; -import org.springframework.stereotype.Service; -import ti4.commands.SlashCommandManager; -import ti4.commands.context.ContextCommandManager; import ti4.cron.AutoPingCron; import ti4.cron.CategoryCleanupCron; import ti4.cron.CloseLaunchThreadsCron; @@ -46,8 +40,26 @@ import ti4.cron.UploadRecentStatsCron; import ti4.cron.UploadStatsCron; import ti4.cron.WinningPathCron; +import ti4.discord.interactions.commands.SlashCommandManager; +import ti4.discord.interactions.commands.context.ContextCommandManager; +import ti4.discord.interactions.listeners.AutoCompleteListener; +import ti4.discord.interactions.listeners.BanListener; +import ti4.discord.interactions.listeners.BotRuntimeStatsListener; +import ti4.discord.interactions.listeners.ButtonListener; +import ti4.discord.interactions.listeners.ChannelCreationListener; +import ti4.discord.interactions.listeners.ContextMenuListener; +import ti4.discord.interactions.listeners.DeletionListener; +import ti4.discord.interactions.listeners.MessageListener; +import ti4.discord.interactions.listeners.ModalListener; +import ti4.discord.interactions.listeners.SelectionMenuListener; +import ti4.discord.interactions.listeners.SlashCommandListener; +import ti4.discord.interactions.listeners.ThreadCreateListener; +import ti4.discord.interactions.listeners.UserJoinServerListener; +import ti4.discord.interactions.listeners.UserLeaveServerListener; +import ti4.discord.interactions.selections.SelectionManager; import ti4.executors.ExecutorServiceManager; import ti4.game.persistence.GameManager; +import ti4.game.persistence.migration.DataMigrationManager; import ti4.helpers.AliasHandler; import ti4.helpers.Constants; import ti4.helpers.Storage; @@ -56,24 +68,8 @@ import ti4.image.Mapper; import ti4.image.PositionMapper; import ti4.image.TileHelper; -import ti4.listeners.AutoCompleteListener; -import ti4.listeners.BanListener; -import ti4.listeners.BotRuntimeStatsListener; -import ti4.listeners.ButtonListener; -import ti4.listeners.ChannelCreationListener; -import ti4.listeners.ContextMenuListener; -import ti4.listeners.DeletionListener; -import ti4.listeners.MessageListener; -import ti4.listeners.ModalListener; -import ti4.listeners.SelectionMenuListener; -import ti4.listeners.SlashCommandListener; -import ti4.listeners.ThreadCreateListener; -import ti4.listeners.UserJoinServerListener; -import ti4.listeners.UserLeaveServerListener; import ti4.logging.BotLogger; import ti4.logging.LogBufferManager; -import ti4.migration.DataMigrationManager; -import ti4.selections.SelectionManager; import ti4.service.draft.SliceGenerationPipeline; import ti4.service.emoji.ApplicationEmojiService; import ti4.service.game.LocalDevelopmentSampleGameService; @@ -81,12 +77,11 @@ import ti4.settings.GlobalSettings; import ti4.settings.GlobalSettings.ImplementedSettings; -@RequiredArgsConstructor -@Service +@UtilityClass public class JdaService { - // TODO: Eventually we need to make these non-static and autowire in this service. - // Another thought: we may not want to trust any old "Admin" role on a server + // TODO: + // we may not want to trust any old "Admin" role on a server // should actually have admin rights public static final Set adminRoles = new HashSet<>(); public static final Set developerRoles = new HashSet<>(); @@ -118,12 +113,8 @@ public class JdaService { public static final List serversToCreateNewGamesOn = new ArrayList<>(); public static final List fowServers = new ArrayList<>(); - private final ApplicationArguments applicationArguments; - - @PostConstruct - public void init() { + public static void initialize(String[] args) { BotLogger.info("STARTING JDA"); - String[] args = applicationArguments.getSourceArgs(); jda = JDABuilder.createDefault(args[0]) // This is a privileged gateway intent that is used to update user information and join/leaves // (including kicks). This is required to cache all members of a guild (including chunking) @@ -599,8 +590,7 @@ public static String getUsername(String userId) { return null; } - @PreDestroy - public void shutdown() { + public static void shutdown() { try { jda.getPresence().setPresence(OnlineStatus.DO_NOT_DISTURB, Activity.customStatus("BOT IS SHUTTING DOWN")); BotLogger.info("SHUTDOWN PROCESS STARTED"); diff --git a/src/main/java/ti4/buttons/ButtonProcessor.java b/src/main/java/ti4/discord/interactions/buttons/ButtonProcessor.java similarity index 98% rename from src/main/java/ti4/buttons/ButtonProcessor.java rename to src/main/java/ti4/discord/interactions/buttons/ButtonProcessor.java index 92cb98b9b3..5d1add93f6 100644 --- a/src/main/java/ti4/buttons/ButtonProcessor.java +++ b/src/main/java/ti4/discord/interactions/buttons/ButtonProcessor.java @@ -1,4 +1,4 @@ -package ti4.buttons; +package ti4.discord.interactions.buttons; import java.text.DecimalFormat; import java.time.ZoneId; @@ -11,6 +11,9 @@ import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.context.ButtonContext; +import ti4.discord.interactions.routing.AnnotationHandler; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.executors.ExecutorServiceManager; import ti4.game.Game; import ti4.game.Player; @@ -25,13 +28,10 @@ import ti4.helpers.DisplayType; import ti4.helpers.SearchGameHelper; import ti4.helpers.StatusHelper; -import ti4.listeners.annotations.AnnotationHandler; -import ti4.listeners.annotations.ButtonHandler; -import ti4.listeners.context.ButtonContext; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; +import ti4.logging.RollbarManager; import ti4.message.MessageHelper; -import ti4.rollbar.RollbarManager; import ti4.service.button.ReactionService; import ti4.service.game.GameNameService; import ti4.service.strategycard.PlayStrategyCardService; diff --git a/src/main/java/ti4/buttons/ButtonRuntimeWarningService.java b/src/main/java/ti4/discord/interactions/buttons/ButtonRuntimeWarningService.java similarity index 98% rename from src/main/java/ti4/buttons/ButtonRuntimeWarningService.java rename to src/main/java/ti4/discord/interactions/buttons/ButtonRuntimeWarningService.java index ae455f0e29..8a4004b64e 100644 --- a/src/main/java/ti4/buttons/ButtonRuntimeWarningService.java +++ b/src/main/java/ti4/discord/interactions/buttons/ButtonRuntimeWarningService.java @@ -1,4 +1,4 @@ -package ti4.buttons; +package ti4.discord.interactions.buttons; import java.time.LocalDateTime; import lombok.Getter; diff --git a/src/main/java/ti4/buttons/Buttons.java b/src/main/java/ti4/discord/interactions/buttons/Buttons.java similarity index 99% rename from src/main/java/ti4/buttons/Buttons.java rename to src/main/java/ti4/discord/interactions/buttons/Buttons.java index db8e536102..6b7d1a8552 100644 --- a/src/main/java/ti4/buttons/Buttons.java +++ b/src/main/java/ti4/discord/interactions/buttons/Buttons.java @@ -1,4 +1,4 @@ -package ti4.buttons; +package ti4.discord.interactions.buttons; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ti4/buttons/handlers/actioncards/ActionCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/actioncards/ActionCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardButtonHandler.java index 9616e5893e..fe97f1d5b9 100644 --- a/src/main/java/ti4/buttons/handlers/actioncards/ActionCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardButtonHandler.java @@ -1,7 +1,8 @@ -package ti4.buttons.handlers.actioncards; +package ti4.discord.interactions.buttons.handlers.actioncards; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; @@ -11,7 +12,6 @@ import ti4.helpers.ButtonHelperCommanders; import ti4.helpers.ButtonHelperModifyUnits; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.GameMessageManager; import ti4.message.MessageHelper; import ti4.service.button.ReactionService; diff --git a/src/main/java/ti4/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java index 2606440671..1ec045cd69 100644 --- a/src/main/java/ti4/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardDeck2ButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.actioncards; +package ti4.discord.interactions.buttons.handlers.actioncards; import java.util.ArrayList; import java.util.Collections; @@ -12,7 +12,8 @@ import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Planet; @@ -28,7 +29,6 @@ import ti4.helpers.Helper; import ti4.helpers.UnusedCommanderHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.ExploreModel; diff --git a/src/main/java/ti4/buttons/handlers/actioncards/ActionCardHandButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardHandButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/actioncards/ActionCardHandButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardHandButtonHandler.java index 40c825b4bb..bc9107aa13 100644 --- a/src/main/java/ti4/buttons/handlers/actioncards/ActionCardHandButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ActionCardHandButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.actioncards; +package ti4.discord.interactions.buttons.handlers.actioncards; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,8 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; @@ -17,7 +18,6 @@ import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java similarity index 85% rename from src/main/java/ti4/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java index 93198c9ce4..f764d913b4 100644 --- a/src/main/java/ti4/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/PickFromDiscardButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.actioncards; +package ti4.discord.interactions.buttons.handlers.actioncards; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class PickFromDiscardButtonHandler { diff --git a/src/main/java/ti4/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java similarity index 90% rename from src/main/java/ti4/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java index f0bb57dcd3..ab320beb62 100644 --- a/src/main/java/ti4/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/ShowActionCardsButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.actioncards; +package ti4.discord.interactions.buttons.handlers.actioncards; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.decks.ShowActionCardsService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/agenda/AgendaResolveButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/AgendaResolveButtonHandler.java similarity index 84% rename from src/main/java/ti4/buttons/handlers/agenda/AgendaResolveButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/AgendaResolveButtonHandler.java index ee680f1181..121dea25f4 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/AgendaResolveButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/AgendaResolveButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -9,52 +9,53 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; -import ti4.buttons.Buttons; -import ti4.buttons.handlers.agenda.resolver.AbolishmentAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AbsolAbolishmentAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AbsolArtifactAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AbsolChecksAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AbsolConstitutionAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AbsolMeasuresAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AbsolSeedsAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.AgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ArmsReductionAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ArticlesOfWarAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ArtifactAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ChecksAndBalancesFlagAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ClandestineAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ConstitutionAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ConventionsAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.CrisisAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.DefenseActAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.DisarmamentAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.EconomicEqualityAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ElectSecretAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.ExecutionDirectiveAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.GrantReallocationAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.IncentiveAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.MinisterAntiquitiesAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.MiscountMessageAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.MutinyAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.NexusAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.PlowsharesAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.PoliticalCensureAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.RearmamentAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.RedistributionAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.RegulationsAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.RepresentativeGovernmentAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.RevolutionFlagAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.SanctionsAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.SchematicsAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.SeedEmpireAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.SharedResearchAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.StandardizationAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.TravelBanAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.UnconventionalAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.VoiceOfTheCouncilLawAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.WarrantAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.WormholeReconAgendaResolver; -import ti4.buttons.handlers.agenda.resolver.WormholeResearchAgendaResolver; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbolishmentAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbsolAbolishmentAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbsolArtifactAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbsolChecksAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbsolConstitutionAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbsolMeasuresAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AbsolSeedsAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.AgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ArmsReductionAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ArticlesOfWarAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ArtifactAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ChecksAndBalancesFlagAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ClandestineAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ConstitutionAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ConventionsAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.CrisisAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.DefenseActAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.DisarmamentAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.EconomicEqualityAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ElectSecretAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.ExecutionDirectiveAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.GrantReallocationAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.IncentiveAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.MinisterAntiquitiesAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.MiscountMessageAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.MutinyAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.NexusAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.PlowsharesAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.PoliticalCensureAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.RearmamentAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.RedistributionAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.RegulationsAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.RepresentativeGovernmentAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.RevolutionFlagAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.SanctionsAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.SchematicsAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.SeedEmpireAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.SharedResearchAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.StandardizationAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.TravelBanAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.UnconventionalAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.VoiceOfTheCouncilLawAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.WarrantAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.WormholeReconAgendaResolver; +import ti4.discord.interactions.buttons.handlers.agenda.resolver.WormholeResearchAgendaResolver; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AgendaHelper; @@ -63,7 +64,6 @@ import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.AgendaModel; import ti4.service.fow.RiftSetModeService; diff --git a/src/main/java/ti4/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java index 4bf495f055..ea245c94f6 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/ChecksAndBalancesButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import java.util.Collections; import java.util.List; @@ -6,11 +6,11 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.handlers.strategycard.PickStrategyCardButtonHandler; +import ti4.discord.interactions.buttons.handlers.strategycard.PickStrategyCardButtonHandler; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.game.StartPhaseService; diff --git a/src/main/java/ti4/buttons/handlers/agenda/ColonialButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/ColonialButtonHandler.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/agenda/ColonialButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/ColonialButtonHandler.java index 71446c01f7..be946ab141 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/ColonialButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/ColonialButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/agenda/DrawAgendaButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/DrawAgendaButtonHandler.java similarity index 90% rename from src/main/java/ti4/buttons/handlers/agenda/DrawAgendaButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/DrawAgendaButtonHandler.java index 156b3c83f0..3f45e6863b 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/DrawAgendaButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/DrawAgendaButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AgendaHelper; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/agenda/EdictPhaseHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/EdictPhaseHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/agenda/EdictPhaseHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/EdictPhaseHandler.java index 8ffd8e49ed..2d222a6c65 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/EdictPhaseHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/EdictPhaseHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import java.util.ArrayList; import java.util.Arrays; @@ -8,7 +8,8 @@ import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -20,7 +21,6 @@ import ti4.helpers.DiceHelper.Die; import ti4.helpers.RelicHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.AgendaModel; import ti4.model.RelicModel; diff --git a/src/main/java/ti4/buttons/handlers/agenda/LookAgendaButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/LookAgendaButtonHandler.java similarity index 88% rename from src/main/java/ti4/buttons/handlers/agenda/LookAgendaButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/LookAgendaButtonHandler.java index b85d652e62..e3a07f3f8b 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/LookAgendaButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/LookAgendaButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.agenda.LookAgendaService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/agenda/PutAgendaButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/PutAgendaButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/PutAgendaButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/PutAgendaButtonHandler.java index 4dfcbc1d5f..d36bf27dbd 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/PutAgendaButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/PutAgendaButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.helpers.AgendaHelper; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.AgendaModel; diff --git a/src/main/java/ti4/buttons/handlers/agenda/VoteButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/VoteButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/agenda/VoteButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/VoteButtonHandler.java index 447e2ec859..ba5f92172f 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/VoteButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/VoteButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda; +package ti4.discord.interactions.buttons.handlers.agenda; import java.util.ArrayList; import java.util.List; @@ -10,7 +10,8 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; @@ -18,7 +19,6 @@ import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.AgendaModel; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java similarity index 90% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java index bd148c1f0a..1535d5cd7a 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbolishmentAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java similarity index 90% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java index be0b07c0ab..b631c3e669 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolAbolishmentAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java index b575d9e326..80030c4e5d 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolArtifactAgendaResolver.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java similarity index 88% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java index bc47862682..17ba9f16a9 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolChecksAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java index 8b6dd2b3fc..b615914be7 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolConstitutionAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java index 3c908de71e..43884d3f43 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolMeasuresAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java index 0d6a116222..0f3f83d674 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AbsolSeedsAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/AgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AgendaResolver.java similarity index 79% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/AgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AgendaResolver.java index f66707d5b9..fac740fbfc 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/AgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/AgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java index 4c29391b38..df91a89afc 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArmsReductionAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java index 3191fb24c2..fddf4a01fb 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArticlesOfWarAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java index 42d614b590..3ca9c651aa 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ArtifactAgendaResolver.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.AgendaHelper; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java similarity index 89% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java index ce7a1ece65..d0008d13e4 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ChecksAndBalancesFlagAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java index 6b818abb53..05db2350b9 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ClandestineAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java index 56849874be..44b9c9a842 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ConstitutionAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.ArrayList; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java index 9b0ab9aabb..823dcf35be 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ConventionsAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java index 9fca929060..3e9be0fb3a 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/CrisisAgendaResolver.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.helpers.Helper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java index 58916ab9e3..2bba8c71db 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/DefenseActAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java index 3916269383..b162d2ea41 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/DisarmamentAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java index 457d682e7f..446a45acf8 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/EconomicEqualityAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java index c71420bad4..f8a410db1c 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ElectSecretAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java index 0c811b15b0..489fe537e8 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ExecutionDirectiveAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java similarity index 90% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java index b9dd0440f7..724677097b 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/ForAgainstAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java index c6b1fc38e4..eb0eefaaaf 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/GrantReallocationAgendaResolver.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java similarity index 90% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java index a92c6980a6..d8c39188d0 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/IncentiveAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java index 19b38a6c2e..2dc04a6721 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MinisterAntiquitiesAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java index d8d9b9e967..74cbb4fb4f 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MiscountMessageAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java index fd138c675d..de3b389928 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/MutinyAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/NexusAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/NexusAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/NexusAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/NexusAgendaResolver.java index 1784460c43..962c3146ca 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/NexusAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/NexusAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java index 49c1f1e134..ab881a5205 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/PlowsharesAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java index 6a6ee7d87a..d589dfcda1 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/PoliticalCensureAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java index 62f9799a6d..2ede584f57 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RearmamentAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java index 9964e2b8bd..250c5fb633 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RedistributionAgendaResolver.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java index 23c320e891..21e3330b4d 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RegulationsAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java index fb79843881..0dd65bc599 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RepresentativeGovernmentAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java similarity index 89% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java index bb6646d7cf..5f8a323255 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/RevolutionFlagAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java index db3dbba120..cb6fb01aa8 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SanctionsAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java index 926eda3b97..0ab2d66a6f 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SchematicsAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java index c7f9b70423..3e4d1be76a 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SeedEmpireAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java index a552b31f7d..033e275da8 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/SharedResearchAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java index 41bfb670b2..6b48af7617 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/StandardizationAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java index 93234ed33f..326e906d0b 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/TravelBanAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java index 25abc46f12..aaf0f4c290 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/UnconventionalAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java index 2ffe02a6b2..922d5a14f6 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/VoiceOfTheCouncilLawAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java index f27b709b76..f27a9591fd 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WarrantAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java index 3ca9245f66..abae0e6cc3 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WormholeReconAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java index f54b2494ca..24216949d7 100644 --- a/src/main/java/ti4/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/agenda/resolver/WormholeResearchAgendaResolver.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.agenda.resolver; +package ti4.discord.interactions.buttons.handlers.agenda.resolver; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; diff --git a/src/main/java/ti4/buttons/handlers/combat/BombardmentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/combat/BombardmentButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/combat/BombardmentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/combat/BombardmentButtonHandler.java index 95535cabea..46890cff31 100644 --- a/src/main/java/ti4/buttons/handlers/combat/BombardmentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/combat/BombardmentButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.combat; +package ti4.discord.interactions.buttons.handlers.combat; import static org.apache.commons.lang3.StringUtils.capitalize; @@ -9,7 +9,8 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -17,7 +18,6 @@ import ti4.helpers.ExploreHelper; import ti4.helpers.FoWHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.UnitModel; diff --git a/src/main/java/ti4/buttons/handlers/combat/CombatButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/combat/CombatButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/combat/CombatButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/combat/CombatButtonHandler.java index 6bb12c56fa..c084a79e3e 100644 --- a/src/main/java/ti4/buttons/handlers/combat/CombatButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/combat/CombatButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.combat; +package ti4.discord.interactions.buttons.handlers.combat; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,8 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -15,7 +16,6 @@ import ti4.helpers.CombatTempModHelper; import ti4.helpers.Constants; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.TemporaryCombatModifierModel; diff --git a/src/main/java/ti4/buttons/handlers/combat/RetreatButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/combat/RetreatButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/combat/RetreatButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/combat/RetreatButtonHandler.java index f68dd48e47..b3353b7c5d 100644 --- a/src/main/java/ti4/buttons/handlers/combat/RetreatButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/combat/RetreatButtonHandler.java @@ -1,11 +1,12 @@ -package ti4.buttons.handlers.combat; +package ti4.discord.interactions.buttons.handlers.combat; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -13,7 +14,6 @@ import ti4.helpers.ButtonHelperModifyUnits; import ti4.helpers.Units.UnitType; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.BreakthroughModel; import ti4.service.emoji.FactionEmojis; diff --git a/src/main/java/ti4/buttons/handlers/commandcounter/CommandCounterButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/commandcounter/CommandCounterButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/commandcounter/CommandCounterButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/commandcounter/CommandCounterButtonHandler.java index e16e3df3db..f39e2c11a1 100644 --- a/src/main/java/ti4/buttons/handlers/commandcounter/CommandCounterButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/commandcounter/CommandCounterButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.commandcounter; +package ti4.discord.interactions.buttons.handlers.commandcounter; import java.util.Arrays; import java.util.List; @@ -7,7 +7,8 @@ import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -17,7 +18,6 @@ import ti4.helpers.ButtonHelperSCs; import ti4.helpers.CommandCounterHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.button.ReactionService; diff --git a/src/main/java/ti4/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java similarity index 81% rename from src/main/java/ti4/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java index 6d5285385a..ab8aaedcd3 100644 --- a/src/main/java/ti4/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/commodities/ConvertCommoditiesButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.commodities; +package ti4.discord.interactions.buttons.handlers.commodities; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.commodities.CommodityConversionService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/draft/FrankenButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/draft/FrankenButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/draft/FrankenButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/draft/FrankenButtonHandler.java index 51610096ce..82b96685e6 100644 --- a/src/main/java/ti4/buttons/handlers/draft/FrankenButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/draft/FrankenButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.draft; +package ti4.discord.interactions.buttons.handlers.draft; import java.awt.Color; import java.util.ArrayList; @@ -17,7 +17,8 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.draft.BagDraft; import ti4.draft.DraftBag; import ti4.draft.DraftCategory; @@ -28,7 +29,6 @@ import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.GameMessageManager; import ti4.message.GameMessageType; diff --git a/src/main/java/ti4/buttons/handlers/draft/MiltyButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/draft/MiltyButtonHandler.java similarity index 77% rename from src/main/java/ti4/buttons/handlers/draft/MiltyButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/draft/MiltyButtonHandler.java index 381a183b1c..ce56e7737d 100644 --- a/src/main/java/ti4/buttons/handlers/draft/MiltyButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/draft/MiltyButtonHandler.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.draft; +package ti4.discord.interactions.buttons.handlers.draft; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.milty.MiltyService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/explore/ExploreButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/explore/ExploreButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/explore/ExploreButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/explore/ExploreButtonHandler.java index cd75ba0426..6de4ce49b4 100644 --- a/src/main/java/ti4/buttons/handlers/explore/ExploreButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/explore/ExploreButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.explore; +package ti4.discord.interactions.buttons.handlers.explore; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,8 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Planet; @@ -24,7 +25,6 @@ import ti4.helpers.Units.UnitType; import ti4.image.Mapper; import ti4.image.TileHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.ExploreModel; diff --git a/src/main/java/ti4/buttons/handlers/explore/StarChartsButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/explore/StarChartsButtonHandler.java similarity index 82% rename from src/main/java/ti4/buttons/handlers/explore/StarChartsButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/explore/StarChartsButtonHandler.java index 992c2710c0..bb734cb96b 100644 --- a/src/main/java/ti4/buttons/handlers/explore/StarChartsButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/explore/StarChartsButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.explore; +package ti4.discord.interactions.buttons.handlers.explore; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class StarChartsButtonHandler { diff --git a/src/main/java/ti4/buttons/handlers/facilities/CoreFactoryButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/facilities/CoreFactoryButtonHandler.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/facilities/CoreFactoryButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/facilities/CoreFactoryButtonHandler.java index 085549a671..8fc8d38963 100644 --- a/src/main/java/ti4/buttons/handlers/facilities/CoreFactoryButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/facilities/CoreFactoryButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.facilities; +package ti4.discord.interactions.buttons.handlers.facilities; import java.util.ArrayList; import java.util.HashSet; @@ -7,13 +7,13 @@ import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperSCs; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.turn.StartTurnService; diff --git a/src/main/java/ti4/buttons/handlers/faction/FactionMiscButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/FactionMiscButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/faction/FactionMiscButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/FactionMiscButtonHandler.java index 0b2af67321..9217b8bd09 100644 --- a/src/main/java/ti4/buttons/handlers/faction/FactionMiscButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/FactionMiscButtonHandler.java @@ -1,9 +1,10 @@ -package ti4.buttons.handlers.faction; +package ti4.discord.interactions.buttons.handlers.faction; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; @@ -11,7 +12,6 @@ import ti4.helpers.ButtonHelperAgents; import ti4.helpers.ButtonHelperHeroes; import ti4.helpers.PromissoryNoteHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.leader.CommanderUnlockCheckService; diff --git a/src/main/java/ti4/buttons/handlers/faction/OtherHeroButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/OtherHeroButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/faction/OtherHeroButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/OtherHeroButtonHandler.java index 300537d8ae..eab7394806 100644 --- a/src/main/java/ti4/buttons/handlers/faction/OtherHeroButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/OtherHeroButtonHandler.java @@ -1,11 +1,12 @@ -package ti4.buttons.handlers.faction; +package ti4.discord.interactions.buttons.handlers.faction; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; @@ -21,7 +22,6 @@ import ti4.helpers.Units.UnitKey; import ti4.helpers.Units.UnitType; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.leader.PurgeHeroService; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java index 0052e758ab..15a047d12e 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/arborec/ArborecButtonHandlers.java @@ -1,9 +1,10 @@ -package ti4.buttons.handlers.faction.base.arborec; +package ti4.discord.interactions.buttons.handlers.faction.base.arborec; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -11,7 +12,6 @@ import ti4.helpers.ButtonHelperAgents; import ti4.helpers.Helper; import ti4.image.TileHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.emoji.UnitEmojis; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/argent/ArgentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/argent/ArgentButtonHandler.java similarity index 89% rename from src/main/java/ti4/buttons/handlers/faction/base/argent/ArgentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/argent/ArgentButtonHandler.java index 4c7800a7c4..44909b1172 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/argent/ArgentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/argent/ArgentButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.faction.base.argent; +package ti4.discord.interactions.buttons.handlers.faction.base.argent; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.helpers.ButtonHelper; import ti4.helpers.CommandCounterHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/base/creuss/CreussButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/creuss/CreussButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/base/creuss/CreussButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/creuss/CreussButtonHandler.java index 649285a8ef..4e4829eb5d 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/creuss/CreussButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/creuss/CreussButtonHandler.java @@ -1,17 +1,17 @@ -package ti4.buttons.handlers.faction.base.creuss; +package ti4.discord.interactions.buttons.handlers.faction.base.creuss; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.helpers.ButtonHelper; import ti4.helpers.FoWHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java index 03e9510e4e..47da6569bf 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/jolnar/JolnarButtonHandler.java @@ -1,16 +1,16 @@ -package ti4.buttons.handlers.faction.base.jolnar; +package ti4.discord.interactions.buttons.handlers.faction.base.jolnar; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.PatternHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.TechnologyModel; import ti4.service.tech.ListTechService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java similarity index 84% rename from src/main/java/ti4/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java index 7ab0345919..f6af60937d 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/l1z1x/L1Z1XButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.faction.base.l1z1x; +package ti4.discord.interactions.buttons.handlers.faction.base.l1z1x; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.UnitHolder; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperModifyUnits; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class L1Z1XButtonHandler { diff --git a/src/main/java/ti4/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java similarity index 83% rename from src/main/java/ti4/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java index bb5996e233..6b96c52056 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/muaat/MuaatHeroButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.faction.base.muaat; +package ti4.discord.interactions.buttons.handlers.faction.base.muaat; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.leader.MuaatHeroService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java index f48150a89a..ec12e85656 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/naalu/NaaluButtonHandler.java @@ -1,16 +1,16 @@ -package ti4.buttons.handlers.faction.base.naalu; +package ti4.discord.interactions.buttons.handlers.faction.base.naalu; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.leader.NaaluCommanderService; import ti4.service.leader.PlayHeroService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java index 40886e263c..974a12f76b 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroAgentButtonHandler.java @@ -1,16 +1,16 @@ -package ti4.buttons.handlers.faction.base.nekro; +package ti4.discord.interactions.buttons.handlers.faction.base.nekro; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperAbilities; import ti4.helpers.ButtonHelperAgents; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java index e4d56374ce..bad3c4c994 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroFollowTechButtonHandler.java @@ -1,15 +1,15 @@ -package ti4.buttons.handlers.faction.base.nekro; +package ti4.discord.interactions.buttons.handlers.faction.base.nekro; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.FoWHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java index 5f0963af31..54d9fe5a51 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/nekro/NekroHeroButtonHandler.java @@ -1,11 +1,12 @@ -package ti4.buttons.handlers.faction.base.nekro; +package ti4.discord.interactions.buttons.handlers.faction.base.nekro; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; @@ -14,7 +15,6 @@ import ti4.helpers.ButtonHelperAgents; import ti4.helpers.Helper; import ti4.helpers.Units; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.TechnologyModel; import ti4.service.tech.ListTechService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java index 8af63eca5b..5c6ad79480 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/winnu/WinnuButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.faction.base.winnu; +package ti4.discord.interactions.buttons.handlers.faction.base.winnu; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.helpers.AliasHandler; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.leader.CommanderUnlockCheckService; import ti4.service.strategycard.PlayStrategyCardService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java index d0226f1695..2ebe132d89 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/xxcha/XxchaAgentButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.faction.base.xxcha; +package ti4.discord.interactions.buttons.handlers.faction.base.xxcha; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.unit.RemoveUnitService; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java index dde4c0f9b7..d67190b000 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yin/YinHeroButtonHandler.java @@ -1,12 +1,13 @@ -package ti4.buttons.handlers.faction.base.yin; +package ti4.discord.interactions.buttons.handlers.faction.base.yin; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; -import ti4.buttons.handlers.agenda.VoteButtonHandler; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.buttons.handlers.agenda.VoteButtonHandler; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; @@ -15,7 +16,6 @@ import ti4.helpers.AliasHandler; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.combat.StartCombatService; import ti4.service.emoji.UnitEmojis; diff --git a/src/main/java/ti4/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java index 80fc61b261..4b343dc599 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yin/YinSpinnerButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.base.yin; +package ti4.discord.interactions.buttons.handlers.faction.base.yin; import java.io.File; import java.util.ArrayList; @@ -8,11 +8,11 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import ti4.ResourceHelper; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java index 1cddf93330..498606c3d0 100644 --- a/src/main/java/ti4/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/base/yssaril/YssarilButtonHandler.java @@ -1,17 +1,17 @@ -package ti4.buttons.handlers.faction.base.yssaril; +package ti4.discord.interactions.buttons.handlers.faction.base.yssaril; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.ActionCardModel; import ti4.service.emoji.CardEmojis; diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java index bf91e2d19f..b28753401c 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/cymiae/CymiaeButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.discordantstars.cymiae; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.cymiae; import java.util.ArrayList; import java.util.List; @@ -7,13 +7,13 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java index 7ac03b58ed..226eee46e0 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/dihmohn/DihmohnButtonHandler.java @@ -1,17 +1,17 @@ -package ti4.buttons.handlers.faction.discordantstars.dihmohn; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.dihmohn; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperFactionSpecific; import ti4.helpers.ButtonHelperHeroes; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.leader.PurgeHeroService; diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java index 86aae11e08..abc514bcce 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/glimmer/GlimmerButtonHandler.java @@ -1,15 +1,15 @@ -package ti4.buttons.handlers.faction.discordantstars.glimmer; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.glimmer; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperHeroes; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java index b3c7e74110..73ed62d11e 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/kollect/KollectAgentButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.discordantstars.kollect; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.kollect; import java.util.ArrayList; import java.util.List; @@ -7,13 +7,13 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Constants; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.ExploreModel; import ti4.service.leader.CommanderUnlockCheckService; diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java similarity index 85% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java index bb8b85e345..604b16b012 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/kollect/KollectButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.faction.discordantstars.kollect; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.kollect; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperFactionSpecific; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java index f2ed682d32..9d7711dcaf 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/qhet/QhetButtonHandler.java @@ -1,18 +1,18 @@ -package ti4.buttons.handlers.faction.discordantstars.qhet; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.qhet; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.helpers.AliasHandler; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.emoji.FactionEmojis; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java similarity index 87% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java index ebdec2b691..9e5404abca 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/toldar/ToldarButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.faction.discordantstars.toldar; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.toldar; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java similarity index 82% rename from src/main/java/ti4/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java index 9cff805f82..27ab70678b 100644 --- a/src/main/java/ti4/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/discordantstars/zelian/ZelianHeroButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.faction.discordantstars.zelian; +package ti4.discord.interactions.buttons.handlers.faction.discordantstars.zelian; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.leader.ZelianHeroService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java index 0e6b81eedf..98c19ae515 100644 --- a/src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionAgentButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.other.zephyrion; +package ti4.discord.interactions.buttons.handlers.faction.other.zephyrion; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperAgents; import ti4.helpers.ButtonHelperModifyUnits; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.UnitModel; diff --git a/src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java index e0d721e2ed..d9724f97e2 100644 --- a/src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionBountyButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.other.zephyrion; +package ti4.discord.interactions.buttons.handlers.faction.other.zephyrion; import java.util.ArrayList; import java.util.List; @@ -7,13 +7,13 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperAgents; import ti4.helpers.Units.UnitType; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java index e42aeb6318..f25c731560 100644 --- a/src/main/java/ti4/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/other/zephyrion/ZephyrionBreakthroughButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.other.zephyrion; +package ti4.discord.interactions.buttons.handlers.faction.other.zephyrion; import static org.apache.commons.lang3.StringUtils.capitalize; @@ -8,7 +8,8 @@ import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; @@ -16,7 +17,6 @@ import ti4.helpers.Constants; import ti4.helpers.UnusedAgentHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.LeaderModel; import ti4.model.Source.ComponentSource; diff --git a/src/main/java/ti4/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java index bafe2ced51..b2ce412559 100644 --- a/src/main/java/ti4/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/cabal/CabalButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.pok.cabal; +package ti4.discord.interactions.buttons.handlers.faction.pok.cabal; import java.util.ArrayList; import java.util.Arrays; @@ -9,7 +9,8 @@ import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; @@ -22,7 +23,6 @@ import ti4.helpers.FoWHelper; import ti4.helpers.RiftUnitsHelper; import ti4.helpers.Units; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.UnitModel; import ti4.service.emoji.MiscEmojis; diff --git a/src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java index 1e0d747e14..0757243d3a 100644 --- a/src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactAgentButtonHandler.java @@ -1,7 +1,8 @@ -package ti4.buttons.handlers.faction.pok.mahact; +package ti4.discord.interactions.buttons.handlers.faction.pok.mahact; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -10,7 +11,6 @@ import ti4.helpers.CommandCounterHelper; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java similarity index 87% rename from src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java index 38804aed5c..8a4a4c9d46 100644 --- a/src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactCommanderButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.faction.pok.mahact; +package ti4.discord.interactions.buttons.handlers.faction.pok.mahact; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java index a6feb50d69..fe25fbb60e 100644 --- a/src/main/java/ti4/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/pok/mahact/MahactHeroButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.faction.pok.mahact; +package ti4.discord.interactions.buttons.handlers.faction.pok.mahact; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,8 @@ import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -16,7 +17,6 @@ import ti4.helpers.Constants; import ti4.helpers.FoWHelper; import ti4.helpers.Units; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.UnitModel; import ti4.service.combat.StartCombatService; diff --git a/src/main/java/ti4/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java index 3649b849ed..e2c58797c9 100644 --- a/src/main/java/ti4/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/thundersedge/keleres/KeleresButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.faction.thundersedge.keleres; +package ti4.discord.interactions.buttons.handlers.faction.thundersedge.keleres; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.leader.PurgeHeroService; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java index 45de629559..a214eb1dff 100644 --- a/src/main/java/ti4/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/faction/thundersedge/ralnel/RalNelButtonHandler.java @@ -1,9 +1,10 @@ -package ti4.buttons.handlers.faction.thundersedge.ralnel; +package ti4.discord.interactions.buttons.handlers.faction.thundersedge.ralnel; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -11,7 +12,6 @@ import ti4.helpers.ButtonHelperHeroes; import ti4.helpers.ButtonHelperModifyUnits; import ti4.helpers.CommandCounterHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/galacticevent/GalacticEventButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/galacticevent/GalacticEventButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/galacticevent/GalacticEventButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/galacticevent/GalacticEventButtonHandler.java index 56784870fc..8f29ff6aff 100644 --- a/src/main/java/ti4/buttons/handlers/galacticevent/GalacticEventButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/galacticevent/GalacticEventButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.galacticevent; +package ti4.discord.interactions.buttons.handlers.galacticevent; import java.util.ArrayList; import java.util.List; @@ -6,13 +6,13 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.commands.special.SetupNeutralPlayer; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.special.SetupNeutralPlayer; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.TechnologyModel; diff --git a/src/main/java/ti4/buttons/handlers/game/CreateGameButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/CreateGameButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/game/CreateGameButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/CreateGameButtonHandler.java index c7ce5aa66b..4697a7ffd0 100644 --- a/src/main/java/ti4/buttons/handlers/game/CreateGameButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/CreateGameButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import java.util.ArrayList; import java.util.List; @@ -17,19 +17,19 @@ import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.CommandHelper; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.routing.ButtonHandler; +import ti4.discord.interactions.routing.ModalHandler; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.DateTimeHelper; import ti4.helpers.SearchGameHelper; -import ti4.listeners.annotations.ButtonHandler; -import ti4.listeners.annotations.ModalHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; import ti4.service.game.CreateGameService; import ti4.settings.users.UserSettingsManager; -import ti4.spring.jda.JdaService; import ti4.spring.service.statistics.AverageTurnTimeService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/game/EditTagsButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/EditTagsButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/game/EditTagsButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/EditTagsButtonHandler.java index 5415926099..8176c67e8e 100644 --- a/src/main/java/ti4/buttons/handlers/game/EditTagsButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/EditTagsButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import java.util.ArrayList; import java.util.Arrays; @@ -12,9 +12,9 @@ import net.dv8tion.jda.api.interactions.modals.ModalMapping; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; +import ti4.discord.interactions.routing.ModalHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; -import ti4.listeners.annotations.ModalHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/game/EndGameButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/EndGameButtonHandler.java similarity index 86% rename from src/main/java/ti4/buttons/handlers/game/EndGameButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/EndGameButtonHandler.java index 5bcc1b81f1..9811037328 100644 --- a/src/main/java/ti4/buttons/handlers/game/EndGameButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/EndGameButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.game.EndGameService; diff --git a/src/main/java/ti4/buttons/handlers/game/RematchButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/RematchButtonHandler.java similarity index 77% rename from src/main/java/ti4/buttons/handlers/game/RematchButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/RematchButtonHandler.java index 769a7c81f2..a8ef24cec6 100644 --- a/src/main/java/ti4/buttons/handlers/game/RematchButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/RematchButtonHandler.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.game.RematchService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/game/ShowGameButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/ShowGameButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/game/ShowGameButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/ShowGameButtonHandler.java index dc4831a78f..2058948eae 100644 --- a/src/main/java/ti4/buttons/handlers/game/ShowGameButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/ShowGameButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.helpers.DisplayType; import ti4.image.MapRenderPipeline; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.ShowGameService; diff --git a/src/main/java/ti4/buttons/handlers/game/SwapFactionButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/SwapFactionButtonHandler.java similarity index 84% rename from src/main/java/ti4/buttons/handlers/game/SwapFactionButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/SwapFactionButtonHandler.java index b1cb2006e4..c38102cf2a 100644 --- a/src/main/java/ti4/buttons/handlers/game/SwapFactionButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/SwapFactionButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.game.SwapFactionService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/game/UndoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/game/UndoButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/game/UndoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/game/UndoButtonHandler.java index 28b79a2bc5..0e9e8a5eb5 100644 --- a/src/main/java/ti4/buttons/handlers/game/UndoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/game/UndoButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.game; +package ti4.discord.interactions.buttons.handlers.game; import java.io.IOException; import java.nio.file.DirectoryStream; @@ -11,13 +11,13 @@ import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; import ti4.helpers.ButtonHelper; import ti4.helpers.Constants; import ti4.helpers.Storage; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/info/AbilityInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/AbilityInfoButtonHandler.java similarity index 81% rename from src/main/java/ti4/buttons/handlers/info/AbilityInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/AbilityInfoButtonHandler.java index 132964f8a5..ca9ad67285 100644 --- a/src/main/java/ti4/buttons/handlers/info/AbilityInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/AbilityInfoButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.info.AbilityInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/info/BreakthroughInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/BreakthroughInfoButtonHandler.java similarity index 84% rename from src/main/java/ti4/buttons/handlers/info/BreakthroughInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/BreakthroughInfoButtonHandler.java index 358a6fa8e0..9029d45db1 100644 --- a/src/main/java/ti4/buttons/handlers/info/BreakthroughInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/BreakthroughInfoButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class BreakthroughInfoButtonHandler { diff --git a/src/main/java/ti4/buttons/handlers/info/CardsInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/CardsInfoButtonHandler.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/info/CardsInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/CardsInfoButtonHandler.java index 95b8c7a864..97fe28fe40 100644 --- a/src/main/java/ti4/buttons/handlers/info/CardsInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/CardsInfoButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.service.breakthrough.EidolonMaximumService; import ti4.service.info.CardsInfoService; diff --git a/src/main/java/ti4/buttons/handlers/info/LeaderInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/LeaderInfoButtonHandler.java similarity index 82% rename from src/main/java/ti4/buttons/handlers/info/LeaderInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/LeaderInfoButtonHandler.java index a2dee56aa1..e941780d0f 100644 --- a/src/main/java/ti4/buttons/handlers/info/LeaderInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/LeaderInfoButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.info.LeaderInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/info/ListPlayerInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/ListPlayerInfoButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/info/ListPlayerInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/ListPlayerInfoButtonHandler.java index 5e5aba2f34..7e060d85c4 100644 --- a/src/main/java/ti4/buttons/handlers/info/ListPlayerInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/ListPlayerInfoButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import java.util.ArrayList; import java.util.List; @@ -8,13 +8,13 @@ import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.BreakthroughModel; diff --git a/src/main/java/ti4/buttons/handlers/info/PromissoryInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/PromissoryInfoButtonHandler.java similarity index 78% rename from src/main/java/ti4/buttons/handlers/info/PromissoryInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/PromissoryInfoButtonHandler.java index c7c7dea2d4..c5bb0a61a9 100644 --- a/src/main/java/ti4/buttons/handlers/info/PromissoryInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/PromissoryInfoButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.PromissoryNoteHelper; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class PromissoryInfoButtonHandler { diff --git a/src/main/java/ti4/buttons/handlers/info/RelicInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/RelicInfoButtonHandler.java similarity index 82% rename from src/main/java/ti4/buttons/handlers/info/RelicInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/RelicInfoButtonHandler.java index c0d73943b7..16c1e6475c 100644 --- a/src/main/java/ti4/buttons/handlers/info/RelicInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/RelicInfoButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.info.RelicInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java similarity index 82% rename from src/main/java/ti4/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java index 6383e89509..3554493390 100644 --- a/src/main/java/ti4/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/SecretObjectiveInfoButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.info.SecretObjectiveInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/info/TechInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/TechInfoButtonHandler.java similarity index 81% rename from src/main/java/ti4/buttons/handlers/info/TechInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/TechInfoButtonHandler.java index 74cb4018e9..f0ca37b033 100644 --- a/src/main/java/ti4/buttons/handlers/info/TechInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/TechInfoButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Player; import ti4.helpers.Constants; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.info.TechInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/info/UnitInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/info/UnitInfoButtonHandler.java similarity index 87% rename from src/main/java/ti4/buttons/handlers/info/UnitInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/info/UnitInfoButtonHandler.java index b539293097..1af97d1657 100644 --- a/src/main/java/ti4/buttons/handlers/info/UnitInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/info/UnitInfoButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.info; +package ti4.discord.interactions.buttons.handlers.info; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.info.UnitInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/map/AddTileListButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/map/AddTileListButtonHandler.java similarity index 85% rename from src/main/java/ti4/buttons/handlers/map/AddTileListButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/map/AddTileListButtonHandler.java index f02692fd12..a4178c2e01 100644 --- a/src/main/java/ti4/buttons/handlers/map/AddTileListButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/map/AddTileListButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.map; +package ti4.discord.interactions.buttons.handlers.map; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.service.map.AddTileListService; diff --git a/src/main/java/ti4/buttons/handlers/map/MapViewButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/map/MapViewButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/map/MapViewButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/map/MapViewButtonHandler.java index 062c80eee3..8e0d4e3b96 100644 --- a/src/main/java/ti4/buttons/handlers/map/MapViewButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/map/MapViewButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.map; +package ti4.discord.interactions.buttons.handlers.map; import java.io.IOException; import java.util.ArrayList; @@ -7,13 +7,13 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.DisplayType; import ti4.image.TileGenerator; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/map/RingSelectionButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/map/RingSelectionButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/map/RingSelectionButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/map/RingSelectionButtonHandler.java index 18c1725161..b167c10813 100644 --- a/src/main/java/ti4/buttons/handlers/map/RingSelectionButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/map/RingSelectionButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.map; +package ti4.discord.interactions.buttons.handlers.map; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/milty/MiltyDraftButtonHandlers.java b/src/main/java/ti4/discord/interactions/buttons/handlers/milty/MiltyDraftButtonHandlers.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/milty/MiltyDraftButtonHandlers.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/milty/MiltyDraftButtonHandlers.java index 349529b5c1..6e237e08d2 100644 --- a/src/main/java/ti4/buttons/handlers/milty/MiltyDraftButtonHandlers.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/milty/MiltyDraftButtonHandlers.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.milty; +package ti4.discord.interactions.buttons.handlers.milty; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.FactionModel; import ti4.service.emoji.MiltyDraftEmojis; diff --git a/src/main/java/ti4/buttons/handlers/milty/SettingMenuButtonHandlers.java b/src/main/java/ti4/discord/interactions/buttons/handlers/milty/SettingMenuButtonHandlers.java similarity index 86% rename from src/main/java/ti4/buttons/handlers/milty/SettingMenuButtonHandlers.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/milty/SettingMenuButtonHandlers.java index 1c2cdbe846..757791a391 100644 --- a/src/main/java/ti4/buttons/handlers/milty/SettingMenuButtonHandlers.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/milty/SettingMenuButtonHandlers.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.milty; +package ti4.discord.interactions.buttons.handlers.milty; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class SettingMenuButtonHandlers { diff --git a/src/main/java/ti4/buttons/handlers/objective/SecretObjectiveButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/objective/SecretObjectiveButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/objective/SecretObjectiveButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/objective/SecretObjectiveButtonHandler.java index a8306336b1..e4be108612 100644 --- a/src/main/java/ti4/buttons/handlers/objective/SecretObjectiveButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/objective/SecretObjectiveButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.objective; +package ti4.discord.interactions.buttons.handlers.objective; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.SecretObjectiveHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java similarity index 81% rename from src/main/java/ti4/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java index 996a8e683a..c43a7958cb 100644 --- a/src/main/java/ti4/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/omegaphase/ElectVoiceOfTheCouncilButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.omegaphase; +package ti4.discord.interactions.buttons.handlers.omegaphase; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.helpers.ButtonHelper; import ti4.helpers.omega_phase.VoiceOfTheCouncilHelper; -import ti4.listeners.annotations.ButtonHandler; final class ElectVoiceOfTheCouncilButtonHandler { @ButtonHandler("elect_voice_of_the_council") diff --git a/src/main/java/ti4/buttons/handlers/options/GameOptionButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/options/GameOptionButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/options/GameOptionButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/options/GameOptionButtonHandler.java index 8fe3e99241..3feaf68081 100644 --- a/src/main/java/ti4/buttons/handlers/options/GameOptionButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/options/GameOptionButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.options; +package ti4.discord.interactions.buttons.handlers.options; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.option.GameOptionService; diff --git a/src/main/java/ti4/buttons/handlers/options/PingIntervalButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/options/PingIntervalButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/options/PingIntervalButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/options/PingIntervalButtonHandler.java index 2104cfcacb..7739da7ab4 100644 --- a/src/main/java/ti4/buttons/handlers/options/PingIntervalButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/options/PingIntervalButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.options; +package ti4.discord.interactions.buttons.handlers.options; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.listeners.annotations.ButtonHandler; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.player.PingIntervalService; diff --git a/src/main/java/ti4/buttons/handlers/options/PlayerPreferenceButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/options/PlayerPreferenceButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/options/PlayerPreferenceButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/options/PlayerPreferenceButtonHandler.java index 9d74b78767..643f481111 100644 --- a/src/main/java/ti4/buttons/handlers/options/PlayerPreferenceButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/options/PlayerPreferenceButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.options; +package ti4.discord.interactions.buttons.handlers.options; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.settings.users.UserSettingsManager; diff --git a/src/main/java/ti4/buttons/handlers/other/CaptureButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/other/CaptureButtonHandler.java similarity index 88% rename from src/main/java/ti4/buttons/handlers/other/CaptureButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/other/CaptureButtonHandler.java index d3e58a1ece..35f98e85ea 100644 --- a/src/main/java/ti4/buttons/handlers/other/CaptureButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/other/CaptureButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.other; +package ti4.discord.interactions.buttons.handlers.other; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperFactionSpecific; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/other/DeleteButtonsButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/other/DeleteButtonsButtonHandler.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/other/DeleteButtonsButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/other/DeleteButtonsButtonHandler.java index 1fbc54ef6f..873b145f99 100644 --- a/src/main/java/ti4/buttons/handlers/other/DeleteButtonsButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/other/DeleteButtonsButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.other; +package ti4.discord.interactions.buttons.handlers.other; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,8 @@ import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -25,7 +26,6 @@ import ti4.helpers.Units.UnitKey; import ti4.helpers.Units.UnitType; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.UnitModel; diff --git a/src/main/java/ti4/buttons/handlers/other/NotepadButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/other/NotepadButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/other/NotepadButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/other/NotepadButtonHandler.java index a09d71e4ad..af80a83b3d 100644 --- a/src/main/java/ti4/buttons/handlers/other/NotepadButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/other/NotepadButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.other; +package ti4.discord.interactions.buttons.handlers.other; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.label.Label; @@ -9,10 +9,10 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; +import ti4.discord.interactions.routing.ModalHandler; import ti4.game.Player; import ti4.helpers.StringHelper; -import ti4.listeners.annotations.ButtonHandler; -import ti4.listeners.annotations.ModalHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/other/TrapButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/other/TrapButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/other/TrapButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/other/TrapButtonHandler.java index 85a47bf8a2..8d215d3668 100644 --- a/src/main/java/ti4/buttons/handlers/other/TrapButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/other/TrapButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.other; +package ti4.discord.interactions.buttons.handlers.other; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/phases/DoAnotherActionButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/DoAnotherActionButtonHandler.java similarity index 89% rename from src/main/java/ti4/buttons/handlers/phases/DoAnotherActionButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/phases/DoAnotherActionButtonHandler.java index 4f4acd8295..704fd2f363 100644 --- a/src/main/java/ti4/buttons/handlers/phases/DoAnotherActionButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/DoAnotherActionButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.phases; +package ti4.discord.interactions.buttons.handlers.phases; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.turn.StartTurnService; diff --git a/src/main/java/ti4/buttons/handlers/phases/GamePhaseButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/GamePhaseButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/phases/GamePhaseButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/phases/GamePhaseButtonHandler.java index c6be109860..73169b2b09 100644 --- a/src/main/java/ti4/buttons/handlers/phases/GamePhaseButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/GamePhaseButtonHandler.java @@ -1,11 +1,12 @@ -package ti4.buttons.handlers.phases; +package ti4.discord.interactions.buttons.handlers.phases; import java.util.List; import java.util.Objects; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; @@ -14,7 +15,6 @@ import ti4.helpers.Helper; import ti4.helpers.PlayerPreferenceHelper; import ti4.helpers.omega_phase.PriorityTrackHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.StatusCleanupService; import ti4.service.agenda.IsPlayerElectedService; diff --git a/src/main/java/ti4/buttons/handlers/phases/ProceedToScoringButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/ProceedToScoringButtonHandler.java similarity index 81% rename from src/main/java/ti4/buttons/handlers/phases/ProceedToScoringButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/phases/ProceedToScoringButtonHandler.java index 0f4d06c6a9..7faeff8755 100644 --- a/src/main/java/ti4/buttons/handlers/phases/ProceedToScoringButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/ProceedToScoringButtonHandler.java @@ -1,11 +1,11 @@ -package ti4.buttons.handlers.phases; +package ti4.discord.interactions.buttons.handlers.phases; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.helpers.ButtonHelper; import ti4.helpers.StatusHelper; -import ti4.listeners.annotations.ButtonHandler; @UtilityClass class ProceedToScoringButtonHandler { diff --git a/src/main/java/ti4/buttons/handlers/phases/StatusPhaseButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/StatusPhaseButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/phases/StatusPhaseButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/phases/StatusPhaseButtonHandler.java index 6793cc0ccf..850e8e5407 100644 --- a/src/main/java/ti4/buttons/handlers/phases/StatusPhaseButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/StatusPhaseButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.phases; +package ti4.discord.interactions.buttons.handlers.phases; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,8 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; @@ -17,7 +18,6 @@ import ti4.helpers.ObjectiveHelper; import ti4.helpers.SecretObjectiveHelper; import ti4.helpers.StatusHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.StatusCleanupService; diff --git a/src/main/java/ti4/buttons/handlers/phases/StrategyPhaseButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/StrategyPhaseButtonHandler.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/phases/StrategyPhaseButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/phases/StrategyPhaseButtonHandler.java index bdc09802fe..583d483459 100644 --- a/src/main/java/ti4/buttons/handlers/phases/StrategyPhaseButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/StrategyPhaseButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.phases; +package ti4.discord.interactions.buttons.handlers.phases; import java.util.Map; import java.util.Objects; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.omega_phase.PriorityTrackHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.game.StartPhaseService; import ti4.service.player.RefreshCardsService; diff --git a/src/main/java/ti4/buttons/handlers/phases/TurnEndButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/TurnEndButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/phases/TurnEndButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/phases/TurnEndButtonHandler.java index fe13c6d807..3e3ed6e2a5 100644 --- a/src/main/java/ti4/buttons/handlers/phases/TurnEndButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/phases/TurnEndButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.phases; +package ti4.discord.interactions.buttons.handlers.phases; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.leader.CommanderUnlockCheckService; diff --git a/src/main/java/ti4/buttons/handlers/planet/IndustrexButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/IndustrexButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/planet/IndustrexButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/IndustrexButtonHandler.java index bb30495c78..5dcc9b2693 100644 --- a/src/main/java/ti4/buttons/handlers/planet/IndustrexButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/IndustrexButtonHandler.java @@ -1,17 +1,17 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import java.util.List; import java.util.regex.Pattern; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.RegexHelper; import ti4.helpers.Units; import ti4.helpers.Units.UnitType; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.planet.IndustrexService; import ti4.service.regex.RegexService; diff --git a/src/main/java/ti4/buttons/handlers/planet/LegendaryPlanetButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/LegendaryPlanetButtonHandler.java similarity index 85% rename from src/main/java/ti4/buttons/handlers/planet/LegendaryPlanetButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/LegendaryPlanetButtonHandler.java index c3dc04a92a..8f5922e05d 100644 --- a/src/main/java/ti4/buttons/handlers/planet/LegendaryPlanetButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/LegendaryPlanetButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.explore.ExploreService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/planet/MalliceButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/MalliceButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/planet/MalliceButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/MalliceButtonHandler.java index 6802cf6e4c..3c74edbb9c 100644 --- a/src/main/java/ti4/buttons/handlers/planet/MalliceButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/MalliceButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperAbilities; import ti4.helpers.ButtonHelperAgents; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.leader.CommanderUnlockCheckService; diff --git a/src/main/java/ti4/buttons/handlers/planet/PlanetExhaustButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/PlanetExhaustButtonHandler.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/planet/PlanetExhaustButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/PlanetExhaustButtonHandler.java index b50c9b0a84..4652fc9c4b 100644 --- a/src/main/java/ti4/buttons/handlers/planet/PlanetExhaustButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/PlanetExhaustButtonHandler.java @@ -1,16 +1,16 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import static org.apache.commons.lang3.StringUtils.countMatches; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.planet.PlanetExhaustAbility; +import ti4.discord.interactions.commands.planet.PlanetExhaustAbility; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.service.planet.PlanetService; diff --git a/src/main/java/ti4/buttons/handlers/planet/PlanetInfoButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/PlanetInfoButtonHandler.java similarity index 76% rename from src/main/java/ti4/buttons/handlers/planet/PlanetInfoButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/PlanetInfoButtonHandler.java index 32aba2f4d6..116e57b11f 100644 --- a/src/main/java/ti4/buttons/handlers/planet/PlanetInfoButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/PlanetInfoButtonHandler.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import lombok.experimental.UtilityClass; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Player; import ti4.helpers.Constants; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.planet.PlanetInfoService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/planet/PrismButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/PrismButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/planet/PrismButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/PrismButtonHandler.java index e3ccd37baa..215cefd23d 100644 --- a/src/main/java/ti4/buttons/handlers/planet/PrismButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/PrismButtonHandler.java @@ -1,15 +1,15 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.TechnologyModel; diff --git a/src/main/java/ti4/buttons/handlers/planet/TradeStationButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/TradeStationButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/planet/TradeStationButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/planet/TradeStationButtonHandler.java index abb8689bae..864417ce77 100644 --- a/src/main/java/ti4/buttons/handlers/planet/TradeStationButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/planet/TradeStationButtonHandler.java @@ -1,15 +1,15 @@ -package ti4.buttons.handlers.planet; +package ti4.discord.interactions.buttons.handlers.planet; import java.util.ArrayList; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.commodities.CommodityConversionService; diff --git a/src/main/java/ti4/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java similarity index 95% rename from src/main/java/ti4/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java index 3257ffbc6c..ee93e0ff45 100644 --- a/src/main/java/ti4/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/promissory/PlayerPromissoryButtonHandler.java @@ -1,7 +1,8 @@ -package ti4.buttons.handlers.promissory; +package ti4.discord.interactions.buttons.handlers.promissory; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; @@ -11,7 +12,6 @@ import ti4.helpers.Constants; import ti4.helpers.PromissoryNoteHelper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.TechnologyModel; import ti4.model.metadata.TechSummariesMetadataManager; diff --git a/src/main/java/ti4/buttons/handlers/relics/DrawRelicButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/DrawRelicButtonHandler.java similarity index 89% rename from src/main/java/ti4/buttons/handlers/relics/DrawRelicButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/relics/DrawRelicButtonHandler.java index a35e6c59bc..02a880f76e 100644 --- a/src/main/java/ti4/buttons/handlers/relics/DrawRelicButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/DrawRelicButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.relics; +package ti4.discord.interactions.buttons.handlers.relics; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.PromissoryNoteHelper; import ti4.helpers.RelicHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/relics/HomebrewRelicButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/HomebrewRelicButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/relics/HomebrewRelicButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/relics/HomebrewRelicButtonHandler.java index 343e85feae..8cd84e679f 100644 --- a/src/main/java/ti4/buttons/handlers/relics/HomebrewRelicButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/HomebrewRelicButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.relics; +package ti4.discord.interactions.buttons.handlers.relics; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/relics/JRStructureButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/JRStructureButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/relics/JRStructureButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/relics/JRStructureButtonHandler.java index dd788c6a0f..81f340bebd 100644 --- a/src/main/java/ti4/buttons/handlers/relics/JRStructureButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/JRStructureButtonHandler.java @@ -1,16 +1,16 @@ -package ti4.buttons.handlers.relics; +package ti4.discord.interactions.buttons.handlers.relics; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperAbilities; import ti4.helpers.ButtonHelperAgents; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/relics/RelicButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/RelicButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/relics/RelicButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/relics/RelicButtonHandler.java index 5f41322eff..f4b1e6dc68 100644 --- a/src/main/java/ti4/buttons/handlers/relics/RelicButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/RelicButtonHandler.java @@ -1,10 +1,11 @@ -package ti4.buttons.handlers.relics; +package ti4.discord.interactions.buttons.handlers.relics; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; @@ -14,7 +15,6 @@ import ti4.helpers.RelicHelper; import ti4.helpers.thundersedge.DSHelperBreakthroughs; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.RelicModel; diff --git a/src/main/java/ti4/buttons/handlers/relics/StellarConverterButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/StellarConverterButtonHandler.java similarity index 80% rename from src/main/java/ti4/buttons/handlers/relics/StellarConverterButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/relics/StellarConverterButtonHandler.java index bd6ccd309e..047035d775 100644 --- a/src/main/java/ti4/buttons/handlers/relics/StellarConverterButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/relics/StellarConverterButtonHandler.java @@ -1,9 +1,9 @@ -package ti4.buttons.handlers.relics; +package ti4.discord.interactions.buttons.handlers.relics; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.relic.StellarConverterService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/spending/SpendingButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/spending/SpendingButtonHandler.java similarity index 97% rename from src/main/java/ti4/buttons/handlers/spending/SpendingButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/spending/SpendingButtonHandler.java index 6c1552062c..7043b55ca2 100644 --- a/src/main/java/ti4/buttons/handlers/spending/SpendingButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/spending/SpendingButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.spending; +package ti4.discord.interactions.buttons.handlers.spending; import java.util.ArrayList; import java.util.List; @@ -8,8 +8,9 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.commands.planet.PlanetExhaust; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.planet.PlanetExhaust; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; @@ -18,7 +19,6 @@ import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.emoji.MiscEmojis; diff --git a/src/main/java/ti4/buttons/handlers/statistics/StatsTrackingButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/statistics/StatsTrackingButtonHandler.java similarity index 94% rename from src/main/java/ti4/buttons/handlers/statistics/StatsTrackingButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/statistics/StatsTrackingButtonHandler.java index ca156c581e..ec3b685b5c 100644 --- a/src/main/java/ti4/buttons/handlers/statistics/StatsTrackingButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/statistics/StatsTrackingButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.statistics; +package ti4.discord.interactions.buttons.handlers.statistics; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java similarity index 87% rename from src/main/java/ti4/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java index c3843a3270..19f492a093 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/DiplomacyStrategyCardButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java similarity index 88% rename from src/main/java/ti4/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java index c6194489bc..c91a4aa2cf 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/FollowStrategyCardButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java index 78f6831c0b..d82fd2c106 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/IgnisStrategyCardButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.EventHelper; import ti4.helpers.RelicHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.emoji.ExploreEmojis; diff --git a/src/main/java/ti4/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java similarity index 88% rename from src/main/java/ti4/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java index 8d6189f2ea..37d9f6e884 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/LeadershipStrategyCardButtonHandler.java @@ -1,14 +1,14 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.button.ReactionService; diff --git a/src/main/java/ti4/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java index d1ec7124eb..9409aa246e 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/PickStrategyCardButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import java.util.ArrayList; import java.util.Collections; @@ -9,7 +9,8 @@ import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; @@ -18,7 +19,6 @@ import ti4.helpers.ButtonHelperAgents; import ti4.helpers.FoWHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.abilities.MahactTokenService; diff --git a/src/main/java/ti4/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java index d6c4f0e2b4..b469ff1ab7 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/PoliticsStrategyCardButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Constants; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.emoji.MiscEmojis; import ti4.service.game.SpeakerService; diff --git a/src/main/java/ti4/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java similarity index 80% rename from src/main/java/ti4/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java index be7e8ef29e..7633b8ef4a 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/TradeStrategyCardButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.strategycard.TradeStrategyCardService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java index b0d4bf3808..d38dcab127 100644 --- a/src/main/java/ti4/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/strategycard/WarfareStrategyCardButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.strategycard; +package ti4.discord.interactions.buttons.handlers.strategycard; import java.util.ArrayList; import java.util.List; @@ -6,13 +6,13 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperTacticalAction; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.StrategyCardModel; diff --git a/src/main/java/ti4/buttons/handlers/tech/ExhaustTechButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/ExhaustTechButtonHandler.java similarity index 83% rename from src/main/java/ti4/buttons/handlers/tech/ExhaustTechButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/ExhaustTechButtonHandler.java index 5a2649e1fa..1220066024 100644 --- a/src/main/java/ti4/buttons/handlers/tech/ExhaustTechButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/ExhaustTechButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.tech; +package ti4.discord.interactions.buttons.handlers.tech; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.tech.PlayerTechService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/tech/GetTechButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/GetTechButtonHandler.java similarity index 80% rename from src/main/java/ti4/buttons/handlers/tech/GetTechButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/GetTechButtonHandler.java index 70f086cfff..d10c5b5dc2 100644 --- a/src/main/java/ti4/buttons/handlers/tech/GetTechButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/GetTechButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.tech; +package ti4.discord.interactions.buttons.handlers.tech; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; -import ti4.listeners.annotations.ButtonHandler; import ti4.service.tech.PlayerTechService; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/tech/TechUseButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/TechUseButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/tech/TechUseButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/TechUseButtonHandler.java index 2d0ac105d1..e46a8d00b2 100644 --- a/src/main/java/ti4/buttons/handlers/tech/TechUseButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/TechUseButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.tech; +package ti4.discord.interactions.buttons.handlers.tech; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -10,14 +10,14 @@ import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.TechnologyModel; diff --git a/src/main/java/ti4/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java similarity index 92% rename from src/main/java/ti4/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java index 1dce1743bc..c95df05176 100644 --- a/src/main/java/ti4/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/AbsolX89ButtonHandler.java @@ -1,16 +1,16 @@ -package ti4.buttons.handlers.tech.specific; +package ti4.discord.interactions.buttons.handlers.tech.specific; import java.util.HashSet; import java.util.Set; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.game.UnitHolder; import ti4.helpers.ButtonHelper; import ti4.helpers.Units.UnitKey; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.UnitModel; import ti4.service.unit.DestroyUnitService; diff --git a/src/main/java/ti4/buttons/handlers/tech/specific/DacxiveButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/DacxiveButtonHandler.java similarity index 89% rename from src/main/java/ti4/buttons/handlers/tech/specific/DacxiveButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/DacxiveButtonHandler.java index 4ea863a034..53767cac06 100644 --- a/src/main/java/ti4/buttons/handlers/tech/specific/DacxiveButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/DacxiveButtonHandler.java @@ -1,13 +1,13 @@ -package ti4.buttons.handlers.tech.specific; +package ti4.discord.interactions.buttons.handlers.tech.specific; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.service.unit.AddUnitService; diff --git a/src/main/java/ti4/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java similarity index 93% rename from src/main/java/ti4/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java index 4235f41b7c..be2c5483bd 100644 --- a/src/main/java/ti4/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/IntegratedEconomyButtonHandler.java @@ -1,9 +1,10 @@ -package ti4.buttons.handlers.tech.specific; +package ti4.discord.interactions.buttons.handlers.tech.specific; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; @@ -11,7 +12,6 @@ import ti4.game.UnitHolder; import ti4.helpers.ButtonHelper; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java similarity index 83% rename from src/main/java/ti4/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java index 25ad5d7545..35670ccec4 100644 --- a/src/main/java/ti4/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/tech/specific/PsychoarchaeologyButtonHandler.java @@ -1,10 +1,10 @@ -package ti4.buttons.handlers.tech.specific; +package ti4.discord.interactions.buttons.handlers.tech.specific; import lombok.experimental.UtilityClass; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/unit/AssignHitsButtonHandlers.java b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/AssignHitsButtonHandlers.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/unit/AssignHitsButtonHandlers.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/unit/AssignHitsButtonHandlers.java index d6111a8533..127be29ecb 100644 --- a/src/main/java/ti4/buttons/handlers/unit/AssignHitsButtonHandlers.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/AssignHitsButtonHandlers.java @@ -1,10 +1,11 @@ -package ti4.buttons.handlers.unit; +package ti4.discord.interactions.buttons.handlers.unit; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -16,7 +17,6 @@ import ti4.helpers.Units.UnitKey; import ti4.helpers.Units.UnitState; import ti4.helpers.Units.UnitType; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/unit/ModifyUnitButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/ModifyUnitButtonHandler.java similarity index 91% rename from src/main/java/ti4/buttons/handlers/unit/ModifyUnitButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/unit/ModifyUnitButtonHandler.java index 816e981171..f98cf4845b 100644 --- a/src/main/java/ti4/buttons/handlers/unit/ModifyUnitButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/ModifyUnitButtonHandler.java @@ -1,12 +1,12 @@ -package ti4.buttons.handlers.unit; +package ti4.discord.interactions.buttons.handlers.unit; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; @UtilityClass diff --git a/src/main/java/ti4/buttons/handlers/unit/TacticalActionButtonHandlers.java b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/TacticalActionButtonHandlers.java similarity index 99% rename from src/main/java/ti4/buttons/handlers/unit/TacticalActionButtonHandlers.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/unit/TacticalActionButtonHandlers.java index a2ad31e780..ced5958e21 100644 --- a/src/main/java/ti4/buttons/handlers/unit/TacticalActionButtonHandlers.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/TacticalActionButtonHandlers.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.unit; +package ti4.discord.interactions.buttons.handlers.unit; import java.util.List; import lombok.experimental.UtilityClass; @@ -6,6 +6,7 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -17,7 +18,6 @@ import ti4.helpers.Units.UnitState; import ti4.helpers.Units.UnitType; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/buttons/handlers/unit/UnitManagementButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/UnitManagementButtonHandler.java similarity index 98% rename from src/main/java/ti4/buttons/handlers/unit/UnitManagementButtonHandler.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/unit/UnitManagementButtonHandler.java index 2f6546c58d..ca2c0b3c21 100644 --- a/src/main/java/ti4/buttons/handlers/unit/UnitManagementButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/UnitManagementButtonHandler.java @@ -1,10 +1,11 @@ -package ti4.buttons.handlers.unit; +package ti4.discord.interactions.buttons.handlers.unit; import java.util.List; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -12,7 +13,6 @@ import ti4.helpers.ButtonHelper; import ti4.helpers.ButtonHelperTacticalAction; import ti4.helpers.Helper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.planet.AddPlanetToPlayAreaService; diff --git a/src/main/java/ti4/buttons/handlers/unit/UnitPickerHandlerHelper.java b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/UnitPickerHandlerHelper.java similarity index 96% rename from src/main/java/ti4/buttons/handlers/unit/UnitPickerHandlerHelper.java rename to src/main/java/ti4/discord/interactions/buttons/handlers/unit/UnitPickerHandlerHelper.java index 2d51629687..cc88e69240 100644 --- a/src/main/java/ti4/buttons/handlers/unit/UnitPickerHandlerHelper.java +++ b/src/main/java/ti4/discord/interactions/buttons/handlers/unit/UnitPickerHandlerHelper.java @@ -1,4 +1,4 @@ -package ti4.buttons.handlers.unit; +package ti4.discord.interactions.buttons.handlers.unit; import java.util.regex.Matcher; import lombok.experimental.UtilityClass; diff --git a/src/main/java/ti4/commands/Command.java b/src/main/java/ti4/discord/interactions/commands/Command.java similarity index 78% rename from src/main/java/ti4/commands/Command.java rename to src/main/java/ti4/discord/interactions/commands/Command.java index 01994ad2e1..11f3f60e29 100644 --- a/src/main/java/ti4/commands/Command.java +++ b/src/main/java/ti4/discord/interactions/commands/Command.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; @@ -15,11 +15,11 @@ public interface Command { default boolean accept(T event) { if (event instanceof SlashCommandInteractionEvent slashEvent) return slashEvent.getName().equals(getName()); - if (event instanceof MessageContextInteractionEvent msgEvent) - return msgEvent.getName().equals(getName()); - if (event instanceof UserContextInteractionEvent usrEvent) - return usrEvent.getName().equals(getName()); - else return false; + if (event instanceof MessageContextInteractionEvent messageEvent) + return messageEvent.getName().equals(getName()); + if (event instanceof UserContextInteractionEvent userEvent) + return userEvent.getName().equals(getName()); + return false; } default void preExecute(T event) {} @@ -34,13 +34,9 @@ default boolean isSuspicious(T event) { return false; } - default void register(CommandListUpdateAction update) { - return; - } + default void register(CommandListUpdateAction update) {} - default void registerSearchCommands(CommandListUpdateAction update) { - return; - } + default void registerSearchCommands(CommandListUpdateAction update) {} default void onException(T event, Throwable throwable) { String messageText = "Error trying to execute command: " + getName(); diff --git a/src/main/java/ti4/commands/CommandGameState.java b/src/main/java/ti4/discord/interactions/commands/CommandGameState.java similarity index 96% rename from src/main/java/ti4/commands/CommandGameState.java rename to src/main/java/ti4/discord/interactions/commands/CommandGameState.java index c5ac69f5c4..c70ad71e1e 100644 --- a/src/main/java/ti4/commands/CommandGameState.java +++ b/src/main/java/ti4/discord/interactions/commands/CommandGameState.java @@ -1,11 +1,11 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.jetbrains.annotations.NotNull; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; import ti4.service.event.EventAuditService; import ti4.service.game.GameNameService; diff --git a/src/main/java/ti4/commands/CommandHelper.java b/src/main/java/ti4/discord/interactions/commands/CommandHelper.java similarity index 99% rename from src/main/java/ti4/commands/CommandHelper.java rename to src/main/java/ti4/discord/interactions/commands/CommandHelper.java index 6c64a266e6..e963f44c43 100644 --- a/src/main/java/ti4/commands/CommandHelper.java +++ b/src/main/java/ti4/discord/interactions/commands/CommandHelper.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import java.util.ArrayList; import java.util.Arrays; @@ -21,6 +21,7 @@ import net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.JdaService; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; @@ -32,7 +33,6 @@ import ti4.image.TileHelper; import ti4.logging.BotLogger; import ti4.service.game.GameNameService; -import ti4.spring.jda.JdaService; @UtilityClass public class CommandHelper { diff --git a/src/main/java/ti4/commands/GameStateCommand.java b/src/main/java/ti4/discord/interactions/commands/GameStateCommand.java similarity index 97% rename from src/main/java/ti4/commands/GameStateCommand.java rename to src/main/java/ti4/discord/interactions/commands/GameStateCommand.java index f11846a9e8..c90498c246 100644 --- a/src/main/java/ti4/commands/GameStateCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/GameStateCommand.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/ti4/commands/GameStateSubcommand.java b/src/main/java/ti4/discord/interactions/commands/GameStateSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/GameStateSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/GameStateSubcommand.java index 477a05d0dd..4afa92915c 100644 --- a/src/main/java/ti4/commands/GameStateSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/GameStateSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/ti4/commands/ParentCommand.java b/src/main/java/ti4/discord/interactions/commands/ParentCommand.java similarity index 98% rename from src/main/java/ti4/commands/ParentCommand.java rename to src/main/java/ti4/discord/interactions/commands/ParentCommand.java index 6a745bea0b..35edd4a433 100644 --- a/src/main/java/ti4/commands/ParentCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/ParentCommand.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import java.util.Collections; import java.util.List; diff --git a/src/main/java/ti4/discord/interactions/commands/SlashCommandManager.java b/src/main/java/ti4/discord/interactions/commands/SlashCommandManager.java new file mode 100644 index 0000000000..e3c2f1fa39 --- /dev/null +++ b/src/main/java/ti4/discord/interactions/commands/SlashCommandManager.java @@ -0,0 +1,145 @@ +package ti4.discord.interactions.commands; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import lombok.experimental.UtilityClass; +import ti4.discord.interactions.commands.admin.AdminCommand; +import ti4.discord.interactions.commands.agenda.AgendaCommand; +import ti4.discord.interactions.commands.async.AsyncCommand; +import ti4.discord.interactions.commands.bothelper.BothelperCommand; +import ti4.discord.interactions.commands.breakthrough.BreakthroughCommand; +import ti4.discord.interactions.commands.button.GenericButtonCommand; +import ti4.discord.interactions.commands.cardsac.ACCardsCommand; +import ti4.discord.interactions.commands.cardspn.PNCardsCommand; +import ti4.discord.interactions.commands.cardsso.SOCardsCommand; +import ti4.discord.interactions.commands.combat.CombatCommand; +import ti4.discord.interactions.commands.custom.CustomCommand; +import ti4.discord.interactions.commands.developer.DeveloperCommand; +import ti4.discord.interactions.commands.draft.DraftCommand; +import ti4.discord.interactions.commands.ds.DiscordantStarsCommand; +import ti4.discord.interactions.commands.event.EventCommand; +import ti4.discord.interactions.commands.explore.ExploreCommand; +import ti4.discord.interactions.commands.fow.FOWCommand; +import ti4.discord.interactions.commands.franken.FrankenCommand; +import ti4.discord.interactions.commands.game.GameCommand; +import ti4.discord.interactions.commands.help.HelpCommand; +import ti4.discord.interactions.commands.installation.InstallationCommand; +import ti4.discord.interactions.commands.leaders.LeaderCommand; +import ti4.discord.interactions.commands.map.MapCommand; +import ti4.discord.interactions.commands.milty.MiltyCommand; +import ti4.discord.interactions.commands.omega_phase.OmegaPhaseCommand; +import ti4.discord.interactions.commands.planet.PlanetCommand; +import ti4.discord.interactions.commands.player.PlayerCommand; +import ti4.discord.interactions.commands.relic.RelicCommand; +import ti4.discord.interactions.commands.rules.RulesCommand; +import ti4.discord.interactions.commands.search.SearchCommand; +import ti4.discord.interactions.commands.search.SearchCommand2; +import ti4.discord.interactions.commands.special.Special2Command; +import ti4.discord.interactions.commands.special.SpecialCommand; +import ti4.discord.interactions.commands.spin.SpinCommand; +import ti4.discord.interactions.commands.statistics.StatisticsCommand; +import ti4.discord.interactions.commands.status.StatusCommand; +import ti4.discord.interactions.commands.tech.TechCommand; +import ti4.discord.interactions.commands.tf.TwilightFallCommand; +import ti4.discord.interactions.commands.tigl.TiglCommand; +import ti4.discord.interactions.commands.tokens.AddCCCommand; +import ti4.discord.interactions.commands.tokens.AddFrontierTokensCommand; +import ti4.discord.interactions.commands.tokens.AddTokenCommand; +import ti4.discord.interactions.commands.tokens.RemoveAllCC; +import ti4.discord.interactions.commands.tokens.RemoveCCCommand; +import ti4.discord.interactions.commands.tokens.RemoveTokenCommand; +import ti4.discord.interactions.commands.transaction.TransactionCommand; +import ti4.discord.interactions.commands.uncategorized.AllInfoCommand; +import ti4.discord.interactions.commands.uncategorized.CardsInfoCommand; +import ti4.discord.interactions.commands.uncategorized.SelectionBoxDemoCommand; +import ti4.discord.interactions.commands.uncategorized.ShowDistancesCommand; +import ti4.discord.interactions.commands.uncategorized.ShowGameCommand; +import ti4.discord.interactions.commands.units.AddUnitDamage; +import ti4.discord.interactions.commands.units.AddUnits; +import ti4.discord.interactions.commands.units.CaptureCommand; +import ti4.discord.interactions.commands.units.ModifyUnitsButtons; +import ti4.discord.interactions.commands.units.MoveUnits; +import ti4.discord.interactions.commands.units.RemoveAllUnitDamage; +import ti4.discord.interactions.commands.units.RemoveAllUnits; +import ti4.discord.interactions.commands.units.RemoveUnitDamage; +import ti4.discord.interactions.commands.units.RemoveUnits; +import ti4.discord.interactions.commands.user.UserCommand; + +@UtilityClass +public class SlashCommandManager { + + private static final Map commands = Stream.of( + new AddUnits(), + new RemoveUnits(), + new RemoveAllUnits(), + new AllInfoCommand(), + new CardsInfoCommand(), + new ShowGameCommand(), + new ShowDistancesCommand(), + new AddCCCommand(), + new RemoveCCCommand(), + new RemoveAllCC(), + new SearchCommand2(), + new AddFrontierTokensCommand(), + new MoveUnits(), + new ModifyUnitsButtons(), + new RemoveTokenCommand(), + new AddTokenCommand(), + new AddUnitDamage(), + new RemoveUnitDamage(), + new RemoveAllUnitDamage(), + new TransactionCommand(), + new MapCommand(), + new HelpCommand(), + new SearchCommand(), + new ExploreCommand(), + new RelicCommand(), + new RulesCommand(), + new AdminCommand(), + new DeveloperCommand(), + new BothelperCommand(), + new PlayerCommand(), + new GameCommand(), + new ACCardsCommand(), + new PNCardsCommand(), + new SOCardsCommand(), + new StatusCommand(), + new AgendaCommand(), + new EventCommand(), + new SpecialCommand(), + new Special2Command(), + new LeaderCommand(), + new CombatCommand(), + new CustomCommand(), + new FOWCommand(), + new InstallationCommand(), + new MiltyCommand(), + new FrankenCommand(), + new CaptureCommand(), + new GenericButtonCommand(), + new DiscordantStarsCommand(), + new TwilightFallCommand(), + new StatisticsCommand(), + new TechCommand(), + new BreakthroughCommand(), + new PlanetCommand(), + new SelectionBoxDemoCommand(), + new UserCommand(), + new TiglCommand(), + new AsyncCommand(), + new OmegaPhaseCommand(), + new DraftCommand(), + new SpinCommand()) + .collect(Collectors.toMap(ParentCommand::getName, command -> command)); + + public static ParentCommand getCommand(String name) { + return commands.get(name); + } + + public static Collection getCommands() { + return List.copyOf(commands.values()); + } +} diff --git a/src/main/java/ti4/commands/Subcommand.java b/src/main/java/ti4/discord/interactions/commands/Subcommand.java similarity index 93% rename from src/main/java/ti4/commands/Subcommand.java rename to src/main/java/ti4/discord/interactions/commands/Subcommand.java index a96705a80e..3a71324521 100644 --- a/src/main/java/ti4/commands/Subcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/Subcommand.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.build.SubcommandData; diff --git a/src/main/java/ti4/commands/SubcommandGroup.java b/src/main/java/ti4/discord/interactions/commands/SubcommandGroup.java similarity index 97% rename from src/main/java/ti4/commands/SubcommandGroup.java rename to src/main/java/ti4/discord/interactions/commands/SubcommandGroup.java index d2e3e0367a..65c35d74f3 100644 --- a/src/main/java/ti4/commands/SubcommandGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/SubcommandGroup.java @@ -1,4 +1,4 @@ -package ti4.commands; +package ti4.discord.interactions.commands; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/admin/AdminCommand.java b/src/main/java/ti4/discord/interactions/commands/admin/AdminCommand.java similarity index 83% rename from src/main/java/ti4/commands/admin/AdminCommand.java rename to src/main/java/ti4/discord/interactions/commands/admin/AdminCommand.java index 58b417c492..8cabcbf1b3 100644 --- a/src/main/java/ti4/commands/admin/AdminCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/AdminCommand.java @@ -1,14 +1,14 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.CommandHelper; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; -import ti4.spring.jda.JdaService; public class AdminCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/admin/CardsInfoForPlayer.java b/src/main/java/ti4/discord/interactions/commands/admin/CardsInfoForPlayer.java similarity index 88% rename from src/main/java/ti4/commands/admin/CardsInfoForPlayer.java rename to src/main/java/ti4/discord/interactions/commands/admin/CardsInfoForPlayer.java index 2f326264f3..60428a42bb 100644 --- a/src/main/java/ti4/commands/admin/CardsInfoForPlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/CardsInfoForPlayer.java @@ -1,9 +1,9 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.info.CardsInfoService; diff --git a/src/main/java/ti4/commands/admin/DeleteGame.java b/src/main/java/ti4/discord/interactions/commands/admin/DeleteGame.java similarity index 92% rename from src/main/java/ti4/commands/admin/DeleteGame.java rename to src/main/java/ti4/discord/interactions/commands/admin/DeleteGame.java index 0647109b28..34976e9988 100644 --- a/src/main/java/ti4/commands/admin/DeleteGame.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/DeleteGame.java @@ -1,9 +1,9 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/admin/DeletePersistenceManagerFile.java b/src/main/java/ti4/discord/interactions/commands/admin/DeletePersistenceManagerFile.java similarity index 88% rename from src/main/java/ti4/commands/admin/DeletePersistenceManagerFile.java rename to src/main/java/ti4/discord/interactions/commands/admin/DeletePersistenceManagerFile.java index f0c186bf2b..595bb8b0f2 100644 --- a/src/main/java/ti4/commands/admin/DeletePersistenceManagerFile.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/DeletePersistenceManagerFile.java @@ -1,9 +1,9 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.json.PersistenceManager; public class DeletePersistenceManagerFile extends Subcommand { diff --git a/src/main/java/ti4/commands/admin/DisableBot.java b/src/main/java/ti4/discord/interactions/commands/admin/DisableBot.java similarity index 85% rename from src/main/java/ti4/commands/admin/DisableBot.java rename to src/main/java/ti4/discord/interactions/commands/admin/DisableBot.java index bddedf79cc..97e2c4b43d 100644 --- a/src/main/java/ti4/commands/admin/DisableBot.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/DisableBot.java @@ -1,7 +1,7 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; import ti4.settings.GlobalSettings; diff --git a/src/main/java/ti4/commands/admin/GetChannelHtml.java b/src/main/java/ti4/discord/interactions/commands/admin/GetChannelHtml.java similarity index 97% rename from src/main/java/ti4/commands/admin/GetChannelHtml.java rename to src/main/java/ti4/discord/interactions/commands/admin/GetChannelHtml.java index 097ab434ff..d321c375a7 100644 --- a/src/main/java/ti4/commands/admin/GetChannelHtml.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/GetChannelHtml.java @@ -1,4 +1,4 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import java.io.File; import java.time.Duration; @@ -11,7 +11,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.executors.ExecutorServiceManager; import ti4.helpers.Constants; import ti4.helpers.RepositoryDispatchEvent; diff --git a/src/main/java/ti4/commands/admin/RecreateGame.java b/src/main/java/ti4/discord/interactions/commands/admin/RecreateGame.java similarity index 93% rename from src/main/java/ti4/commands/admin/RecreateGame.java rename to src/main/java/ti4/discord/interactions/commands/admin/RecreateGame.java index 0087178e93..44221eab44 100644 --- a/src/main/java/ti4/commands/admin/RecreateGame.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/RecreateGame.java @@ -1,10 +1,10 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/admin/ReloadMapperObjects.java b/src/main/java/ti4/discord/interactions/commands/admin/ReloadMapperObjects.java similarity index 80% rename from src/main/java/ti4/commands/admin/ReloadMapperObjects.java rename to src/main/java/ti4/discord/interactions/commands/admin/ReloadMapperObjects.java index ea68ffe2fb..47d357a63b 100644 --- a/src/main/java/ti4/commands/admin/ReloadMapperObjects.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/ReloadMapperObjects.java @@ -1,7 +1,7 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/admin/TourneyWinner.java b/src/main/java/ti4/discord/interactions/commands/admin/TourneyWinner.java similarity index 94% rename from src/main/java/ti4/commands/admin/TourneyWinner.java rename to src/main/java/ti4/discord/interactions/commands/admin/TourneyWinner.java index c0cc3c3917..d1c62b8a9c 100644 --- a/src/main/java/ti4/commands/admin/TourneyWinner.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/TourneyWinner.java @@ -1,4 +1,4 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import java.util.List; import net.dv8tion.jda.api.entities.User; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.spring.context.SpringContext; diff --git a/src/main/java/ti4/commands/admin/UpdateThreadArchiveTime.java b/src/main/java/ti4/discord/interactions/commands/admin/UpdateThreadArchiveTime.java similarity index 97% rename from src/main/java/ti4/commands/admin/UpdateThreadArchiveTime.java rename to src/main/java/ti4/discord/interactions/commands/admin/UpdateThreadArchiveTime.java index 2d876ee764..0042f3c8ff 100644 --- a/src/main/java/ti4/commands/admin/UpdateThreadArchiveTime.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/UpdateThreadArchiveTime.java @@ -1,4 +1,4 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import java.util.List; import net.dv8tion.jda.api.entities.Guild; @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.logging.BotLogger; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/admin/UpdateVanityContainer.java b/src/main/java/ti4/discord/interactions/commands/admin/UpdateVanityContainer.java similarity index 95% rename from src/main/java/ti4/commands/admin/UpdateVanityContainer.java rename to src/main/java/ti4/discord/interactions/commands/admin/UpdateVanityContainer.java index e0bbae8fcb..bac73edfb9 100644 --- a/src/main/java/ti4/commands/admin/UpdateVanityContainer.java +++ b/src/main/java/ti4/discord/interactions/commands/admin/UpdateVanityContainer.java @@ -1,4 +1,4 @@ -package ti4.commands.admin; +package ti4.discord.interactions.commands.admin; import java.util.ArrayList; import java.util.List; @@ -13,8 +13,8 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.componentsV2.MessageV2Builder; import ti4.message.componentsV2.MessageV2Editor; import ti4.service.emoji.MiscEmojis; diff --git a/src/main/java/ti4/commands/agenda/AddControlToken.java b/src/main/java/ti4/discord/interactions/commands/agenda/AddControlToken.java similarity index 95% rename from src/main/java/ti4/commands/agenda/AddControlToken.java rename to src/main/java/ti4/discord/interactions/commands/agenda/AddControlToken.java index d4d4c1d633..c2f86c2e38 100644 --- a/src/main/java/ti4/commands/agenda/AddControlToken.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/AddControlToken.java @@ -1,9 +1,9 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/AddLaw.java b/src/main/java/ti4/discord/interactions/commands/agenda/AddLaw.java similarity index 95% rename from src/main/java/ti4/commands/agenda/AddLaw.java rename to src/main/java/ti4/discord/interactions/commands/agenda/AddLaw.java index 58562e30fa..d138a1e5a7 100644 --- a/src/main/java/ti4/commands/agenda/AddLaw.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/AddLaw.java @@ -1,11 +1,11 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import software.amazon.awssdk.utils.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/AgendaCommand.java b/src/main/java/ti4/discord/interactions/commands/agenda/AgendaCommand.java similarity index 89% rename from src/main/java/ti4/commands/agenda/AgendaCommand.java rename to src/main/java/ti4/discord/interactions/commands/agenda/AgendaCommand.java index 3fd2eabc34..4defb4503b 100644 --- a/src/main/java/ti4/commands/agenda/AgendaCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/AgendaCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class AgendaCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/agenda/Cleanup.java b/src/main/java/ti4/discord/interactions/commands/agenda/Cleanup.java similarity index 92% rename from src/main/java/ti4/commands/agenda/Cleanup.java rename to src/main/java/ti4/discord/interactions/commands/agenda/Cleanup.java index ea60047440..6986a119a6 100644 --- a/src/main/java/ti4/commands/agenda/Cleanup.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/Cleanup.java @@ -1,11 +1,11 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/DrawAgenda.java b/src/main/java/ti4/discord/interactions/commands/agenda/DrawAgenda.java similarity index 90% rename from src/main/java/ti4/commands/agenda/DrawAgenda.java rename to src/main/java/ti4/discord/interactions/commands/agenda/DrawAgenda.java index a5e36447e8..0696fc92cb 100644 --- a/src/main/java/ti4/commands/agenda/DrawAgenda.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/DrawAgenda.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.AgendaHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/ExhaustSC.java b/src/main/java/ti4/discord/interactions/commands/agenda/ExhaustSC.java similarity index 93% rename from src/main/java/ti4/commands/agenda/ExhaustSC.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ExhaustSC.java index ce994e9c71..7a5a4f9f26 100644 --- a/src/main/java/ti4/commands/agenda/ExhaustSC.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ExhaustSC.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/agenda/LawInfo.java b/src/main/java/ti4/discord/interactions/commands/agenda/LawInfo.java similarity index 94% rename from src/main/java/ti4/commands/agenda/LawInfo.java rename to src/main/java/ti4/discord/interactions/commands/agenda/LawInfo.java index 83b7394cd6..6170fcca86 100644 --- a/src/main/java/ti4/commands/agenda/LawInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/LawInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.image.Mapper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/ListVoteCount.java b/src/main/java/ti4/discord/interactions/commands/agenda/ListVoteCount.java similarity index 80% rename from src/main/java/ti4/commands/agenda/ListVoteCount.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ListVoteCount.java index 46b416ba42..ab85a4872d 100644 --- a/src/main/java/ti4/commands/agenda/ListVoteCount.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ListVoteCount.java @@ -1,7 +1,7 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.AgendaHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/LookAtAgenda.java b/src/main/java/ti4/discord/interactions/commands/agenda/LookAtAgenda.java similarity index 91% rename from src/main/java/ti4/commands/agenda/LookAtAgenda.java rename to src/main/java/ti4/discord/interactions/commands/agenda/LookAtAgenda.java index 7093a7a2b2..80f882b8c3 100644 --- a/src/main/java/ti4/commands/agenda/LookAtAgenda.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/LookAtAgenda.java @@ -1,9 +1,9 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/PutDiscardBackIntoDeckAgendas.java b/src/main/java/ti4/discord/interactions/commands/agenda/PutDiscardBackIntoDeckAgendas.java similarity index 95% rename from src/main/java/ti4/commands/agenda/PutDiscardBackIntoDeckAgendas.java rename to src/main/java/ti4/discord/interactions/commands/agenda/PutDiscardBackIntoDeckAgendas.java index dbd276255c..e3f1c21513 100644 --- a/src/main/java/ti4/commands/agenda/PutDiscardBackIntoDeckAgendas.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/PutDiscardBackIntoDeckAgendas.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/PutDrawnAgendaBackIntoDeck.java b/src/main/java/ti4/discord/interactions/commands/agenda/PutDrawnAgendaBackIntoDeck.java similarity index 91% rename from src/main/java/ti4/commands/agenda/PutDrawnAgendaBackIntoDeck.java rename to src/main/java/ti4/discord/interactions/commands/agenda/PutDrawnAgendaBackIntoDeck.java index bb60fe76f7..ac6287044c 100644 --- a/src/main/java/ti4/commands/agenda/PutDrawnAgendaBackIntoDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/PutDrawnAgendaBackIntoDeck.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.AgendaHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/RemoveLaw.java b/src/main/java/ti4/discord/interactions/commands/agenda/RemoveLaw.java similarity index 91% rename from src/main/java/ti4/commands/agenda/RemoveLaw.java rename to src/main/java/ti4/discord/interactions/commands/agenda/RemoveLaw.java index 1a37b7b335..3d60f893e8 100644 --- a/src/main/java/ti4/commands/agenda/RemoveLaw.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/RemoveLaw.java @@ -1,9 +1,9 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/ResetAgendas.java b/src/main/java/ti4/discord/interactions/commands/agenda/ResetAgendas.java similarity index 93% rename from src/main/java/ti4/commands/agenda/ResetAgendas.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ResetAgendas.java index a11f4bc179..35b3ed800b 100644 --- a/src/main/java/ti4/commands/agenda/ResetAgendas.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ResetAgendas.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/ResetDrawStateAgendas.java b/src/main/java/ti4/discord/interactions/commands/agenda/ResetDrawStateAgendas.java similarity index 92% rename from src/main/java/ti4/commands/agenda/ResetDrawStateAgendas.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ResetDrawStateAgendas.java index ac7b1c3d10..2c5c14baf5 100644 --- a/src/main/java/ti4/commands/agenda/ResetDrawStateAgendas.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ResetDrawStateAgendas.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/agenda/RevealAgenda.java b/src/main/java/ti4/discord/interactions/commands/agenda/RevealAgenda.java similarity index 89% rename from src/main/java/ti4/commands/agenda/RevealAgenda.java rename to src/main/java/ti4/discord/interactions/commands/agenda/RevealAgenda.java index 32453b34c6..822b447850 100644 --- a/src/main/java/ti4/commands/agenda/RevealAgenda.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/RevealAgenda.java @@ -1,9 +1,9 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.AgendaHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/RevealSpecificAgenda.java b/src/main/java/ti4/discord/interactions/commands/agenda/RevealSpecificAgenda.java similarity index 95% rename from src/main/java/ti4/commands/agenda/RevealSpecificAgenda.java rename to src/main/java/ti4/discord/interactions/commands/agenda/RevealSpecificAgenda.java index 12694706ad..19b6824f6f 100644 --- a/src/main/java/ti4/commands/agenda/RevealSpecificAgenda.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/RevealSpecificAgenda.java @@ -1,4 +1,4 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import java.util.Map; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.AgendaHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/ReviseLaw.java b/src/main/java/ti4/discord/interactions/commands/agenda/ReviseLaw.java similarity index 93% rename from src/main/java/ti4/commands/agenda/ReviseLaw.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ReviseLaw.java index 64cdeed663..5c7d6802e9 100644 --- a/src/main/java/ti4/commands/agenda/ReviseLaw.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ReviseLaw.java @@ -1,12 +1,12 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import software.amazon.awssdk.utils.StringUtils; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/ShowDiscardedAgendas.java b/src/main/java/ti4/discord/interactions/commands/agenda/ShowDiscardedAgendas.java similarity index 80% rename from src/main/java/ti4/commands/agenda/ShowDiscardedAgendas.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ShowDiscardedAgendas.java index ce35829d33..1694e663db 100644 --- a/src/main/java/ti4/commands/agenda/ShowDiscardedAgendas.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ShowDiscardedAgendas.java @@ -1,7 +1,7 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.AgendaHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/agenda/ShuffleAgendas.java b/src/main/java/ti4/discord/interactions/commands/agenda/ShuffleAgendas.java similarity index 92% rename from src/main/java/ti4/commands/agenda/ShuffleAgendas.java rename to src/main/java/ti4/discord/interactions/commands/agenda/ShuffleAgendas.java index fc3509ef65..d38353f025 100644 --- a/src/main/java/ti4/commands/agenda/ShuffleAgendas.java +++ b/src/main/java/ti4/discord/interactions/commands/agenda/ShuffleAgendas.java @@ -1,10 +1,10 @@ -package ti4.commands.agenda; +package ti4.discord.interactions.commands.agenda; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/async/AsyncCommand.java b/src/main/java/ti4/discord/interactions/commands/async/AsyncCommand.java similarity index 81% rename from src/main/java/ti4/commands/async/AsyncCommand.java rename to src/main/java/ti4/discord/interactions/commands/async/AsyncCommand.java index 5abbc3f356..84ef5feee7 100644 --- a/src/main/java/ti4/commands/async/AsyncCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/async/AsyncCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.async; +package ti4.discord.interactions.commands.async; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; public class AsyncCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/async/ShowHeroes.java b/src/main/java/ti4/discord/interactions/commands/async/ShowHeroes.java similarity index 93% rename from src/main/java/ti4/commands/async/ShowHeroes.java rename to src/main/java/ti4/discord/interactions/commands/async/ShowHeroes.java index 2bcec3e85d..6145e7fea0 100644 --- a/src/main/java/ti4/commands/async/ShowHeroes.java +++ b/src/main/java/ti4/discord/interactions/commands/async/ShowHeroes.java @@ -1,4 +1,4 @@ -package ti4.commands.async; +package ti4.discord.interactions.commands.async; import java.util.List; import net.dv8tion.jda.api.entities.Member; @@ -6,14 +6,14 @@ import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.apache.commons.lang3.StringUtils; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.TIGLHelper; import ti4.helpers.TIGLHelper.TIGLRank; import ti4.message.MessageHelper; import ti4.service.emoji.FactionEmojis; import ti4.service.emoji.LeaderEmojis; import ti4.service.emoji.TI4Emoji; -import ti4.spring.jda.JdaService; class ShowHeroes extends Subcommand { diff --git a/src/main/java/ti4/commands/async/ShowTourneyWinners.java b/src/main/java/ti4/discord/interactions/commands/async/ShowTourneyWinners.java similarity index 88% rename from src/main/java/ti4/commands/async/ShowTourneyWinners.java rename to src/main/java/ti4/discord/interactions/commands/async/ShowTourneyWinners.java index 31528e9b83..aa2f2c1b0f 100644 --- a/src/main/java/ti4/commands/async/ShowTourneyWinners.java +++ b/src/main/java/ti4/discord/interactions/commands/async/ShowTourneyWinners.java @@ -1,7 +1,7 @@ -package ti4.commands.async; +package ti4.discord.interactions.commands.async; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; import ti4.spring.context.SpringContext; import ti4.spring.service.tournamentwinner.TourneyWinnerService; diff --git a/src/main/java/ti4/commands/bothelper/ArchiveOldThreads.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ArchiveOldThreads.java similarity index 91% rename from src/main/java/ti4/commands/bothelper/ArchiveOldThreads.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ArchiveOldThreads.java index 52e8cb9b59..de702530bc 100644 --- a/src/main/java/ti4/commands/bothelper/ArchiveOldThreads.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ArchiveOldThreads.java @@ -1,10 +1,10 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.ThreadArchiveHelper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/BeginVideoGeneration.java b/src/main/java/ti4/discord/interactions/commands/bothelper/BeginVideoGeneration.java similarity index 94% rename from src/main/java/ti4/commands/bothelper/BeginVideoGeneration.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/BeginVideoGeneration.java index c0229c701d..1e520d1230 100644 --- a/src/main/java/ti4/commands/bothelper/BeginVideoGeneration.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/BeginVideoGeneration.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -7,7 +7,7 @@ import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.batch.BatchClient; import software.amazon.awssdk.services.batch.model.SubmitJobRequest; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/BothelperCommand.java b/src/main/java/ti4/discord/interactions/commands/bothelper/BothelperCommand.java similarity index 88% rename from src/main/java/ti4/commands/bothelper/BothelperCommand.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/BothelperCommand.java index dc4415b32d..469d0d8c7b 100644 --- a/src/main/java/ti4/commands/bothelper/BothelperCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/BothelperCommand.java @@ -1,14 +1,14 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.CommandHelper; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; -import ti4.spring.jda.JdaService; public class BothelperCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/bothelper/CheckNextPingTime.java b/src/main/java/ti4/discord/interactions/commands/bothelper/CheckNextPingTime.java similarity index 94% rename from src/main/java/ti4/commands/bothelper/CheckNextPingTime.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/CheckNextPingTime.java index 166e664267..5580ec2f9b 100644 --- a/src/main/java/ti4/commands/bothelper/CheckNextPingTime.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/CheckNextPingTime.java @@ -1,10 +1,10 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.time.Instant; import java.time.ZoneId; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/bothelper/CorrectFaction.java b/src/main/java/ti4/discord/interactions/commands/bothelper/CorrectFaction.java similarity index 95% rename from src/main/java/ti4/commands/bothelper/CorrectFaction.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/CorrectFaction.java index 0c0304045b..3e26ed8f85 100644 --- a/src/main/java/ti4/commands/bothelper/CorrectFaction.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/CorrectFaction.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.ArrayList; import java.util.HashSet; @@ -9,8 +9,8 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/bothelper/CreateFOWGameChannels.java b/src/main/java/ti4/discord/interactions/commands/bothelper/CreateFOWGameChannels.java similarity index 97% rename from src/main/java/ti4/commands/bothelper/CreateFOWGameChannels.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/CreateFOWGameChannels.java index 648a32f18f..d20af18269 100644 --- a/src/main/java/ti4/commands/bothelper/CreateFOWGameChannels.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/CreateFOWGameChannels.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.List; import net.dv8tion.jda.api.entities.Guild; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/CreateGameChannels.java b/src/main/java/ti4/discord/interactions/commands/bothelper/CreateGameChannels.java similarity index 98% rename from src/main/java/ti4/commands/bothelper/CreateGameChannels.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/CreateGameChannels.java index b719a50447..e503d2620c 100644 --- a/src/main/java/ti4/commands/bothelper/CreateGameChannels.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/CreateGameChannels.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.ArrayList; import java.util.List; @@ -11,13 +11,13 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.CreateGameService; -import ti4.spring.jda.JdaService; class CreateGameChannels extends Subcommand { diff --git a/src/main/java/ti4/commands/bothelper/DeleteFOWCommThreads.java b/src/main/java/ti4/discord/interactions/commands/bothelper/DeleteFOWCommThreads.java similarity index 96% rename from src/main/java/ti4/commands/bothelper/DeleteFOWCommThreads.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/DeleteFOWCommThreads.java index e3b3167bc7..8c425a373c 100644 --- a/src/main/java/ti4/commands/bothelper/DeleteFOWCommThreads.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/DeleteFOWCommThreads.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/bothelper/EditStoredValue.java b/src/main/java/ti4/discord/interactions/commands/bothelper/EditStoredValue.java similarity index 91% rename from src/main/java/ti4/commands/bothelper/EditStoredValue.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/EditStoredValue.java index 30893fe64c..3e48ebd2ab 100644 --- a/src/main/java/ti4/commands/bothelper/EditStoredValue.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/EditStoredValue.java @@ -1,8 +1,8 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/EditTrackRecord.java b/src/main/java/ti4/discord/interactions/commands/bothelper/EditTrackRecord.java similarity index 94% rename from src/main/java/ti4/commands/bothelper/EditTrackRecord.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/EditTrackRecord.java index d832a86b08..3789617603 100644 --- a/src/main/java/ti4/commands/bothelper/EditTrackRecord.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/EditTrackRecord.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.components.label.Label; import net.dv8tion.jda.api.components.textinput.TextInput; @@ -8,7 +8,7 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.logging.BotLogger; import ti4.settings.users.UserSettingsManager; diff --git a/src/main/java/ti4/commands/bothelper/FixGameChannelPermissions.java b/src/main/java/ti4/discord/interactions/commands/bothelper/FixGameChannelPermissions.java similarity index 86% rename from src/main/java/ti4/commands/bothelper/FixGameChannelPermissions.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/FixGameChannelPermissions.java index 161c92fc2c..52c88c8c93 100644 --- a/src/main/java/ti4/commands/bothelper/FixGameChannelPermissions.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/FixGameChannelPermissions.java @@ -1,8 +1,8 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/JazzCommand.java b/src/main/java/ti4/discord/interactions/commands/bothelper/JazzCommand.java similarity index 91% rename from src/main/java/ti4/commands/bothelper/JazzCommand.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/JazzCommand.java index e2df86879e..c5ebee096a 100644 --- a/src/main/java/ti4/commands/bothelper/JazzCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/JazzCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.ArrayList; import java.util.List; @@ -6,16 +6,16 @@ import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.helpers.Constants; import ti4.helpers.settingsFramework.menus.MiltySettings; import ti4.json.JsonMapperManager; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.emoji.MiscEmojis; -import ti4.spring.jda.JdaService; class JazzCommand extends Subcommand { diff --git a/src/main/java/ti4/commands/bothelper/ListButtons.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ListButtons.java similarity index 96% rename from src/main/java/ti4/commands/bothelper/ListButtons.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ListButtons.java index 35ce1987c4..2199bb852b 100644 --- a/src/main/java/ti4/commands/bothelper/ListButtons.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ListButtons.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.Objects; import net.dv8tion.jda.api.components.buttons.Button; @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.ButtonHelper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/ListCategoryChannelCounts.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ListCategoryChannelCounts.java similarity index 94% rename from src/main/java/ti4/commands/bothelper/ListCategoryChannelCounts.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ListCategoryChannelCounts.java index 692de51ebb..db7c50e58b 100644 --- a/src/main/java/ti4/commands/bothelper/ListCategoryChannelCounts.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ListCategoryChannelCounts.java @@ -1,11 +1,11 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.text.NumberFormat; import java.util.List; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.Category; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/bothelper/ListDeadGames.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ListDeadGames.java similarity index 97% rename from src/main/java/ti4/commands/bothelper/ListDeadGames.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ListDeadGames.java index 5ea2a05f71..223a74ad78 100644 --- a/src/main/java/ti4/commands/bothelper/ListDeadGames.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ListDeadGames.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; @@ -7,14 +7,14 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.persistence.GameManager; import ti4.game.persistence.ManagedGame; import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.logging.BotLogger; import ti4.message.MessageHelper; -import ti4.spring.jda.JdaService; class ListDeadGames extends Subcommand { diff --git a/src/main/java/ti4/commands/bothelper/ListSlashCommandsUsed.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ListSlashCommandsUsed.java similarity index 88% rename from src/main/java/ti4/commands/bothelper/ListSlashCommandsUsed.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ListSlashCommandsUsed.java index 34dfce8701..c929686c47 100644 --- a/src/main/java/ti4/commands/bothelper/ListSlashCommandsUsed.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ListSlashCommandsUsed.java @@ -1,9 +1,9 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.ListSlashCommandsUsedService; diff --git a/src/main/java/ti4/commands/bothelper/ListStoredValues.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ListStoredValues.java similarity index 96% rename from src/main/java/ti4/commands/bothelper/ListStoredValues.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ListStoredValues.java index faedf17f1c..532f70a6e2 100644 --- a/src/main/java/ti4/commands/bothelper/ListStoredValues.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ListStoredValues.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.LinkedList; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.StringHelper; diff --git a/src/main/java/ti4/commands/bothelper/ReloadGame.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ReloadGame.java similarity index 91% rename from src/main/java/ti4/commands/bothelper/ReloadGame.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ReloadGame.java index ead22bbfae..6793071b2a 100644 --- a/src/main/java/ti4/commands/bothelper/ReloadGame.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ReloadGame.java @@ -1,9 +1,9 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/bothelper/RemoveTitle.java b/src/main/java/ti4/discord/interactions/commands/bothelper/RemoveTitle.java similarity index 93% rename from src/main/java/ti4/commands/bothelper/RemoveTitle.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/RemoveTitle.java index 0456533088..5c061fca56 100644 --- a/src/main/java/ti4/commands/bothelper/RemoveTitle.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/RemoveTitle.java @@ -1,9 +1,9 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/bothelper/ReserveGame.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ReserveGame.java similarity index 93% rename from src/main/java/ti4/commands/bothelper/ReserveGame.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ReserveGame.java index 2c4b3b91cf..52929eb08b 100644 --- a/src/main/java/ti4/commands/bothelper/ReserveGame.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ReserveGame.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; import ti4.service.async.ReserveGameNumberService; diff --git a/src/main/java/ti4/commands/bothelper/ServerGameStats.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ServerGameStats.java similarity index 97% rename from src/main/java/ti4/commands/bothelper/ServerGameStats.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ServerGameStats.java index e56cba1e43..9c058c17aa 100644 --- a/src/main/java/ti4/commands/bothelper/ServerGameStats.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ServerGameStats.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.time.Duration; import java.time.OffsetDateTime; @@ -16,13 +16,13 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.TimeUtil; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.persistence.GameManager; import ti4.game.persistence.ManagedGame; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.CreateGameService; -import ti4.spring.jda.JdaService; class ServerGameStats extends Subcommand { diff --git a/src/main/java/ti4/commands/bothelper/ServerLimitStats.java b/src/main/java/ti4/discord/interactions/commands/bothelper/ServerLimitStats.java similarity index 98% rename from src/main/java/ti4/commands/bothelper/ServerLimitStats.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/ServerLimitStats.java index d0426c167c..2ae2ab7212 100644 --- a/src/main/java/ti4/commands/bothelper/ServerLimitStats.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/ServerLimitStats.java @@ -1,4 +1,4 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import java.text.NumberFormat; import java.time.Duration; @@ -12,11 +12,11 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.utils.TimeUtil; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.CreateGameService; -import ti4.spring.jda.JdaService; class ServerLimitStats extends Subcommand { diff --git a/src/main/java/ti4/commands/bothelper/SetGameLimit.java b/src/main/java/ti4/discord/interactions/commands/bothelper/SetGameLimit.java similarity index 92% rename from src/main/java/ti4/commands/bothelper/SetGameLimit.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/SetGameLimit.java index 68480bb27a..26d38cd244 100644 --- a/src/main/java/ti4/commands/bothelper/SetGameLimit.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/SetGameLimit.java @@ -1,9 +1,9 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.settings.users.UserSettingsManager; diff --git a/src/main/java/ti4/commands/bothelper/SetStatsTrackedUser.java b/src/main/java/ti4/discord/interactions/commands/bothelper/SetStatsTrackedUser.java similarity index 92% rename from src/main/java/ti4/commands/bothelper/SetStatsTrackedUser.java rename to src/main/java/ti4/discord/interactions/commands/bothelper/SetStatsTrackedUser.java index f6cad34333..e5775bad4a 100644 --- a/src/main/java/ti4/commands/bothelper/SetStatsTrackedUser.java +++ b/src/main/java/ti4/discord/interactions/commands/bothelper/SetStatsTrackedUser.java @@ -1,10 +1,10 @@ -package ti4.commands.bothelper; +package ti4.discord.interactions.commands.bothelper; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughActivate.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughActivate.java similarity index 89% rename from src/main/java/ti4/commands/breakthrough/BreakthroughActivate.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughActivate.java index 484c0580c6..c58eb7edfe 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughActivate.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughActivate.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughCommand.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughCommand.java similarity index 85% rename from src/main/java/ti4/commands/breakthrough/BreakthroughCommand.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughCommand.java index 4532642e4d..e730e11959 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class BreakthroughCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughExhaust.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughExhaust.java similarity index 88% rename from src/main/java/ti4/commands/breakthrough/BreakthroughExhaust.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughExhaust.java index d8dd4e96f3..1cba59d062 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughExhaust.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughExhaust.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughInfo.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughInfo.java similarity index 82% rename from src/main/java/ti4/commands/breakthrough/BreakthroughInfo.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughInfo.java index c87c816f1f..13d70ed8d9 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughInfo.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughLock.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughLock.java similarity index 88% rename from src/main/java/ti4/commands/breakthrough/BreakthroughLock.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughLock.java index fe89ddb2dc..3165373332 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughLock.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughLock.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughReady.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughReady.java similarity index 88% rename from src/main/java/ti4/commands/breakthrough/BreakthroughReady.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughReady.java index 6800e09004..d015dacbf1 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughReady.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughReady.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughSetTg.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughSetTg.java similarity index 91% rename from src/main/java/ti4/commands/breakthrough/BreakthroughSetTg.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughSetTg.java index 4a96f2a403..58a902495e 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughSetTg.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughSetTg.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/breakthrough/BreakthroughUnlock.java b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughUnlock.java similarity index 88% rename from src/main/java/ti4/commands/breakthrough/BreakthroughUnlock.java rename to src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughUnlock.java index bdf3131a88..07bdb53fc3 100644 --- a/src/main/java/ti4/commands/breakthrough/BreakthroughUnlock.java +++ b/src/main/java/ti4/discord/interactions/commands/breakthrough/BreakthroughUnlock.java @@ -1,9 +1,9 @@ -package ti4.commands.breakthrough; +package ti4.discord.interactions.commands.breakthrough; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/button/GenericButtonCommand.java b/src/main/java/ti4/discord/interactions/commands/button/GenericButtonCommand.java similarity index 93% rename from src/main/java/ti4/commands/button/GenericButtonCommand.java rename to src/main/java/ti4/discord/interactions/commands/button/GenericButtonCommand.java index c4d716a469..07b6b5677e 100644 --- a/src/main/java/ti4/commands/button/GenericButtonCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/button/GenericButtonCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.button; +package ti4.discord.interactions.commands.button; import java.util.Collections; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.buttons.Buttons; -import ti4.commands.ParentCommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.ParentCommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/ACCardsCommand.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ACCardsCommand.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/ACCardsCommand.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ACCardsCommand.java index 4059e69093..6c91a86da6 100644 --- a/src/main/java/ti4/commands/cardsac/ACCardsCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ACCardsCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class ACCardsCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/cardsac/ACInfo.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ACInfo.java similarity index 84% rename from src/main/java/ti4/commands/cardsac/ACInfo.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ACInfo.java index 651be990c4..5f120ce591 100644 --- a/src/main/java/ti4/commands/cardsac/ACInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ACInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/DiscardAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/DiscardAC.java similarity index 89% rename from src/main/java/ti4/commands/cardsac/DiscardAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/DiscardAC.java index 7a714032af..1353b183cf 100644 --- a/src/main/java/ti4/commands/cardsac/DiscardAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/DiscardAC.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsac/DiscardACRandom.java b/src/main/java/ti4/discord/interactions/commands/cardsac/DiscardACRandom.java similarity index 92% rename from src/main/java/ti4/commands/cardsac/DiscardACRandom.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/DiscardACRandom.java index 1cc553f62c..bd9099dfef 100644 --- a/src/main/java/ti4/commands/cardsac/DiscardACRandom.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/DiscardACRandom.java @@ -1,11 +1,11 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsac/DrawAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/DrawAC.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/DrawAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/DrawAC.java index fda2a8bb8b..6f45193e43 100644 --- a/src/main/java/ti4/commands/cardsac/DrawAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/DrawAC.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsac/DrawSpecificAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/DrawSpecificAC.java similarity index 94% rename from src/main/java/ti4/commands/cardsac/DrawSpecificAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/DrawSpecificAC.java index 0af4e0de75..0ef09b1a3c 100644 --- a/src/main/java/ti4/commands/cardsac/DrawSpecificAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/DrawSpecificAC.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/MakeCopiesOfACs.java b/src/main/java/ti4/discord/interactions/commands/cardsac/MakeCopiesOfACs.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/MakeCopiesOfACs.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/MakeCopiesOfACs.java index 05afb69128..72c48e28f5 100644 --- a/src/main/java/ti4/commands/cardsac/MakeCopiesOfACs.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/MakeCopiesOfACs.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/PickACFromDiscard.java b/src/main/java/ti4/discord/interactions/commands/cardsac/PickACFromDiscard.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/PickACFromDiscard.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/PickACFromDiscard.java index 8569a5d556..aa83f8acce 100644 --- a/src/main/java/ti4/commands/cardsac/PickACFromDiscard.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/PickACFromDiscard.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsac/PickACFromPurged.java b/src/main/java/ti4/discord/interactions/commands/cardsac/PickACFromPurged.java similarity index 95% rename from src/main/java/ti4/commands/cardsac/PickACFromPurged.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/PickACFromPurged.java index 669da5ce2d..f8392c7482 100644 --- a/src/main/java/ti4/commands/cardsac/PickACFromPurged.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/PickACFromPurged.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardsac/PlayAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/PlayAC.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/PlayAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/PlayAC.java index b166ede0a5..38dee44961 100644 --- a/src/main/java/ti4/commands/cardsac/PlayAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/PlayAC.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/PurgeAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/PurgeAC.java similarity index 94% rename from src/main/java/ti4/commands/cardsac/PurgeAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/PurgeAC.java index 16ead00bbb..77c37367f1 100644 --- a/src/main/java/ti4/commands/cardsac/PurgeAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/PurgeAC.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardsac/RevealAndPutACIntoDiscard.java b/src/main/java/ti4/discord/interactions/commands/cardsac/RevealAndPutACIntoDiscard.java similarity index 89% rename from src/main/java/ti4/commands/cardsac/RevealAndPutACIntoDiscard.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/RevealAndPutACIntoDiscard.java index efeda15cac..9db613c83a 100644 --- a/src/main/java/ti4/commands/cardsac/RevealAndPutACIntoDiscard.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/RevealAndPutACIntoDiscard.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/cardsac/SendAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/SendAC.java similarity index 93% rename from src/main/java/ti4/commands/cardsac/SendAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/SendAC.java index ad9877a9ab..ef098480f4 100644 --- a/src/main/java/ti4/commands/cardsac/SendAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/SendAC.java @@ -1,11 +1,11 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardsac/SendACRandom.java b/src/main/java/ti4/discord/interactions/commands/cardsac/SendACRandom.java similarity index 88% rename from src/main/java/ti4/commands/cardsac/SendACRandom.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/SendACRandom.java index e5e29df77f..d23d774873 100644 --- a/src/main/java/ti4/commands/cardsac/SendACRandom.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/SendACRandom.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardsac/ShowAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowAC.java similarity index 93% rename from src/main/java/ti4/commands/cardsac/ShowAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowAC.java index 053fe27222..5e1ddb7bff 100644 --- a/src/main/java/ti4/commands/cardsac/ShowAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowAC.java @@ -1,11 +1,11 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardsac/ShowACRemainingCardCount.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowACRemainingCardCount.java similarity index 85% rename from src/main/java/ti4/commands/cardsac/ShowACRemainingCardCount.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowACRemainingCardCount.java index 88b7aff58d..8bfd966613 100644 --- a/src/main/java/ti4/commands/cardsac/ShowACRemainingCardCount.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowACRemainingCardCount.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/ShowACToAll.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowACToAll.java similarity index 93% rename from src/main/java/ti4/commands/cardsac/ShowACToAll.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowACToAll.java index eaa2518519..3674c22f5a 100644 --- a/src/main/java/ti4/commands/cardsac/ShowACToAll.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowACToAll.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsac/ShowAllAC.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowAllAC.java similarity index 89% rename from src/main/java/ti4/commands/cardsac/ShowAllAC.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowAllAC.java index a4c04b62f8..8ce036ffa0 100644 --- a/src/main/java/ti4/commands/cardsac/ShowAllAC.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowAllAC.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardsac/ShowAllUnplayedACs.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowAllUnplayedACs.java similarity index 81% rename from src/main/java/ti4/commands/cardsac/ShowAllUnplayedACs.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowAllUnplayedACs.java index 425cd4cc5d..3e0d4f97a9 100644 --- a/src/main/java/ti4/commands/cardsac/ShowAllUnplayedACs.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowAllUnplayedACs.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.decks.ShowActionCardsService; diff --git a/src/main/java/ti4/commands/cardsac/ShowDiscardActionCards.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowDiscardActionCards.java similarity index 89% rename from src/main/java/ti4/commands/cardsac/ShowDiscardActionCards.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowDiscardActionCards.java index 2be1740483..dd69a33628 100644 --- a/src/main/java/ti4/commands/cardsac/ShowDiscardActionCards.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowDiscardActionCards.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.decks.ShowActionCardsService; diff --git a/src/main/java/ti4/commands/cardsac/ShowGarboziaActionCards.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowGarboziaActionCards.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/ShowGarboziaActionCards.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowGarboziaActionCards.java index e736a2bf9e..810071fd09 100644 --- a/src/main/java/ti4/commands/cardsac/ShowGarboziaActionCards.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowGarboziaActionCards.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/ShowPurgedActionCards.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowPurgedActionCards.java similarity index 92% rename from src/main/java/ti4/commands/cardsac/ShowPurgedActionCards.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShowPurgedActionCards.java index 0869553d17..e7793e688e 100644 --- a/src/main/java/ti4/commands/cardsac/ShowPurgedActionCards.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShowPurgedActionCards.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/cardsac/ShuffleACBackIntoDeck.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACBackIntoDeck.java similarity index 94% rename from src/main/java/ti4/commands/cardsac/ShuffleACBackIntoDeck.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACBackIntoDeck.java index 626c5d3f7f..986bb94046 100644 --- a/src/main/java/ti4/commands/cardsac/ShuffleACBackIntoDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACBackIntoDeck.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/cardsac/ShuffleACDeck.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACDeck.java similarity index 91% rename from src/main/java/ti4/commands/cardsac/ShuffleACDeck.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACDeck.java index 16c9aa21ab..492d88bc22 100644 --- a/src/main/java/ti4/commands/cardsac/ShuffleACDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACDeck.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsac/ShuffleACFromHand.java b/src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACFromHand.java similarity index 94% rename from src/main/java/ti4/commands/cardsac/ShuffleACFromHand.java rename to src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACFromHand.java index d8ecf2919b..d55c87d125 100644 --- a/src/main/java/ti4/commands/cardsac/ShuffleACFromHand.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsac/ShuffleACFromHand.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsac; +package ti4.discord.interactions.commands.cardsac; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/cardspn/PNCardsCommand.java b/src/main/java/ti4/discord/interactions/commands/cardspn/PNCardsCommand.java similarity index 85% rename from src/main/java/ti4/commands/cardspn/PNCardsCommand.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/PNCardsCommand.java index 7ecb9c27c7..2dbb555ec9 100644 --- a/src/main/java/ti4/commands/cardspn/PNCardsCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/PNCardsCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class PNCardsCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/cardspn/PNInfo.java b/src/main/java/ti4/discord/interactions/commands/cardspn/PNInfo.java similarity index 89% rename from src/main/java/ti4/commands/cardspn/PNInfo.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/PNInfo.java index 0a81b9aeb7..e764a26f3b 100644 --- a/src/main/java/ti4/commands/cardspn/PNInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/PNInfo.java @@ -1,9 +1,9 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.PromissoryNoteHelper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardspn/PNReset.java b/src/main/java/ti4/discord/interactions/commands/cardspn/PNReset.java similarity index 94% rename from src/main/java/ti4/commands/cardspn/PNReset.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/PNReset.java index 56f2e0d821..464c7d1a8b 100644 --- a/src/main/java/ti4/commands/cardspn/PNReset.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/PNReset.java @@ -1,11 +1,11 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/cardspn/PlayPN.java b/src/main/java/ti4/discord/interactions/commands/cardspn/PlayPN.java similarity index 96% rename from src/main/java/ti4/commands/cardspn/PlayPN.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/PlayPN.java index 3815ea66b5..f6fa041a28 100644 --- a/src/main/java/ti4/commands/cardspn/PlayPN.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/PlayPN.java @@ -1,10 +1,10 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.PromissoryNoteHelper; diff --git a/src/main/java/ti4/commands/cardspn/PurgePN.java b/src/main/java/ti4/discord/interactions/commands/cardspn/PurgePN.java similarity index 94% rename from src/main/java/ti4/commands/cardspn/PurgePN.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/PurgePN.java index 9c8fc2d2ce..d658a93e93 100644 --- a/src/main/java/ti4/commands/cardspn/PurgePN.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/PurgePN.java @@ -1,10 +1,10 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardspn/SendPN.java b/src/main/java/ti4/discord/interactions/commands/cardspn/SendPN.java similarity index 97% rename from src/main/java/ti4/commands/cardspn/SendPN.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/SendPN.java index 11def9f8c4..afc041e5f4 100644 --- a/src/main/java/ti4/commands/cardspn/SendPN.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/SendPN.java @@ -1,11 +1,11 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperAbilities; diff --git a/src/main/java/ti4/commands/cardspn/SendRandomPN.java b/src/main/java/ti4/discord/interactions/commands/cardspn/SendRandomPN.java similarity index 88% rename from src/main/java/ti4/commands/cardspn/SendRandomPN.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/SendRandomPN.java index 830373241c..fe3e64d0c5 100644 --- a/src/main/java/ti4/commands/cardspn/SendRandomPN.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/SendRandomPN.java @@ -1,10 +1,10 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardspn/ShowAllPN.java b/src/main/java/ti4/discord/interactions/commands/cardspn/ShowAllPN.java similarity index 88% rename from src/main/java/ti4/commands/cardspn/ShowAllPN.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/ShowAllPN.java index d87a7b6599..a1f12aa908 100644 --- a/src/main/java/ti4/commands/cardspn/ShowAllPN.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/ShowAllPN.java @@ -1,10 +1,10 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardspn/ShowPN.java b/src/main/java/ti4/discord/interactions/commands/cardspn/ShowPN.java similarity index 95% rename from src/main/java/ti4/commands/cardspn/ShowPN.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/ShowPN.java index e02ab17c77..fa1d0429c4 100644 --- a/src/main/java/ti4/commands/cardspn/ShowPN.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/ShowPN.java @@ -1,4 +1,4 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.List; import java.util.Map; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardspn/ShowPNToAll.java b/src/main/java/ti4/discord/interactions/commands/cardspn/ShowPNToAll.java similarity index 94% rename from src/main/java/ti4/commands/cardspn/ShowPNToAll.java rename to src/main/java/ti4/discord/interactions/commands/cardspn/ShowPNToAll.java index 50ae3cb8ca..0e652b3e10 100644 --- a/src/main/java/ti4/commands/cardspn/ShowPNToAll.java +++ b/src/main/java/ti4/discord/interactions/commands/cardspn/ShowPNToAll.java @@ -1,11 +1,11 @@ -package ti4.commands.cardspn; +package ti4.discord.interactions.commands.cardspn; import java.util.Map; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.PromissoryNoteHelper; diff --git a/src/main/java/ti4/commands/cardsso/DealSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/DealSO.java similarity index 93% rename from src/main/java/ti4/commands/cardsso/DealSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/DealSO.java index 1a3a78c86d..286c3d385d 100644 --- a/src/main/java/ti4/commands/cardsso/DealSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/DealSO.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsso/DealSOToAll.java b/src/main/java/ti4/discord/interactions/commands/cardsso/DealSOToAll.java similarity index 88% rename from src/main/java/ti4/commands/cardsso/DealSOToAll.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/DealSOToAll.java index ab4bb410e7..38e844c5e2 100644 --- a/src/main/java/ti4/commands/cardsso/DealSOToAll.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/DealSOToAll.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.objectives.DrawSecretService; diff --git a/src/main/java/ti4/commands/cardsso/DiscardSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/DiscardSO.java similarity index 90% rename from src/main/java/ti4/commands/cardsso/DiscardSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/DiscardSO.java index 3cefc7fd74..a6dbc8e954 100644 --- a/src/main/java/ti4/commands/cardsso/DiscardSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/DiscardSO.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.objectives.DiscardSecretService; diff --git a/src/main/java/ti4/commands/cardsso/DrawSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/DrawSO.java similarity index 91% rename from src/main/java/ti4/commands/cardsso/DrawSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/DrawSO.java index dac98df18b..661a935bb1 100644 --- a/src/main/java/ti4/commands/cardsso/DrawSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/DrawSO.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.objectives.DrawSecretService; diff --git a/src/main/java/ti4/commands/cardsso/DrawSpecificSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/DrawSpecificSO.java similarity index 95% rename from src/main/java/ti4/commands/cardsso/DrawSpecificSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/DrawSpecificSO.java index 68d140f2b9..3b5e347bb5 100644 --- a/src/main/java/ti4/commands/cardsso/DrawSpecificSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/DrawSpecificSO.java @@ -1,11 +1,11 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsso/ListAllScored.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ListAllScored.java similarity index 91% rename from src/main/java/ti4/commands/cardsso/ListAllScored.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ListAllScored.java index 199f851393..a95dab74f8 100644 --- a/src/main/java/ti4/commands/cardsso/ListAllScored.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ListAllScored.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsso/SOCardsCommand.java b/src/main/java/ti4/discord/interactions/commands/cardsso/SOCardsCommand.java similarity index 88% rename from src/main/java/ti4/commands/cardsso/SOCardsCommand.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/SOCardsCommand.java index cf1ce629d1..549bde3de0 100644 --- a/src/main/java/ti4/commands/cardsso/SOCardsCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/SOCardsCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class SOCardsCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/cardsso/SOInfo.java b/src/main/java/ti4/discord/interactions/commands/cardsso/SOInfo.java similarity index 85% rename from src/main/java/ti4/commands/cardsso/SOInfo.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/SOInfo.java index e9ed61203c..64e8a9f95f 100644 --- a/src/main/java/ti4/commands/cardsso/SOInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/SOInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.info.SecretObjectiveInfoService; diff --git a/src/main/java/ti4/commands/cardsso/ScoreSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ScoreSO.java similarity index 91% rename from src/main/java/ti4/commands/cardsso/ScoreSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ScoreSO.java index 8a7222faab..517a6b4862 100644 --- a/src/main/java/ti4/commands/cardsso/ScoreSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ScoreSO.java @@ -1,9 +1,9 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.SecretObjectiveHelper; diff --git a/src/main/java/ti4/commands/cardsso/ShowAllSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowAllSO.java similarity index 88% rename from src/main/java/ti4/commands/cardsso/ShowAllSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShowAllSO.java index 91a3b3cbaf..9ad314b050 100644 --- a/src/main/java/ti4/commands/cardsso/ShowAllSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowAllSO.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsso/ShowAllSOToAll.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowAllSOToAll.java similarity index 94% rename from src/main/java/ti4/commands/cardsso/ShowAllSOToAll.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShowAllSOToAll.java index 3256419586..c860515013 100644 --- a/src/main/java/ti4/commands/cardsso/ShowAllSOToAll.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowAllSOToAll.java @@ -1,4 +1,4 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.ArrayList; import java.util.Collections; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/cardsso/ShowRandomSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowRandomSO.java similarity index 90% rename from src/main/java/ti4/commands/cardsso/ShowRandomSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShowRandomSO.java index 82b6d91621..51ff727e41 100644 --- a/src/main/java/ti4/commands/cardsso/ShowRandomSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowRandomSO.java @@ -1,12 +1,12 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsso/ShowSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowSO.java similarity index 94% rename from src/main/java/ti4/commands/cardsso/ShowSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShowSO.java index be03e4a153..a96f787df5 100644 --- a/src/main/java/ti4/commands/cardsso/ShowSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowSO.java @@ -1,12 +1,12 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/cardsso/ShowSOToAll.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowSOToAll.java similarity index 96% rename from src/main/java/ti4/commands/cardsso/ShowSOToAll.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShowSOToAll.java index 218fd976e2..c011783c3a 100644 --- a/src/main/java/ti4/commands/cardsso/ShowSOToAll.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowSOToAll.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/cardsso/ShowUnScoredSOs.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowUnScoredSOs.java similarity index 81% rename from src/main/java/ti4/commands/cardsso/ShowUnScoredSOs.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShowUnScoredSOs.java index 5d208b8883..3481fd713d 100644 --- a/src/main/java/ti4/commands/cardsso/ShowUnScoredSOs.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShowUnScoredSOs.java @@ -1,7 +1,7 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.SecretObjectiveHelper; diff --git a/src/main/java/ti4/commands/cardsso/ShuffleSecretDeck.java b/src/main/java/ti4/discord/interactions/commands/cardsso/ShuffleSecretDeck.java similarity index 83% rename from src/main/java/ti4/commands/cardsso/ShuffleSecretDeck.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/ShuffleSecretDeck.java index b76884ef7d..8fdf475a27 100644 --- a/src/main/java/ti4/commands/cardsso/ShuffleSecretDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/ShuffleSecretDeck.java @@ -1,8 +1,8 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.Collections; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.message.MessageHelper; class ShuffleSecretDeck extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/cardsso/UnscoreSO.java b/src/main/java/ti4/discord/interactions/commands/cardsso/UnscoreSO.java similarity index 95% rename from src/main/java/ti4/commands/cardsso/UnscoreSO.java rename to src/main/java/ti4/discord/interactions/commands/cardsso/UnscoreSO.java index f2d212dced..4e9b51f579 100644 --- a/src/main/java/ti4/commands/cardsso/UnscoreSO.java +++ b/src/main/java/ti4/discord/interactions/commands/cardsso/UnscoreSO.java @@ -1,10 +1,10 @@ -package ti4.commands.cardsso; +package ti4.discord.interactions.commands.cardsso; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/combat/CombatCommand.java b/src/main/java/ti4/discord/interactions/commands/combat/CombatCommand.java similarity index 80% rename from src/main/java/ti4/commands/combat/CombatCommand.java rename to src/main/java/ti4/discord/interactions/commands/combat/CombatCommand.java index 4ecd9e4f30..17cb4783e3 100644 --- a/src/main/java/ti4/commands/combat/CombatCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/combat/CombatCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.combat; +package ti4.discord.interactions.commands.combat; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class CombatCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/combat/CombatRoll.java b/src/main/java/ti4/discord/interactions/commands/combat/CombatRoll.java similarity index 96% rename from src/main/java/ti4/commands/combat/CombatRoll.java rename to src/main/java/ti4/discord/interactions/commands/combat/CombatRoll.java index 17808e7599..f0ae0fed09 100644 --- a/src/main/java/ti4/commands/combat/CombatRoll.java +++ b/src/main/java/ti4/discord/interactions/commands/combat/CombatRoll.java @@ -1,10 +1,10 @@ -package ti4.commands.combat; +package ti4.discord.interactions.commands.combat; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/combat/StartCombat.java b/src/main/java/ti4/discord/interactions/commands/combat/StartCombat.java similarity index 92% rename from src/main/java/ti4/commands/combat/StartCombat.java rename to src/main/java/ti4/discord/interactions/commands/combat/StartCombat.java index 744217b403..798a45392c 100644 --- a/src/main/java/ti4/commands/combat/StartCombat.java +++ b/src/main/java/ti4/discord/interactions/commands/combat/StartCombat.java @@ -1,10 +1,10 @@ -package ti4.commands.combat; +package ti4.discord.interactions.commands.combat; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/context/BanUser.java b/src/main/java/ti4/discord/interactions/commands/context/BanUser.java similarity index 95% rename from src/main/java/ti4/commands/context/BanUser.java rename to src/main/java/ti4/discord/interactions/commands/context/BanUser.java index 142aac2a5b..5800462e7e 100644 --- a/src/main/java/ti4/commands/context/BanUser.java +++ b/src/main/java/ti4/discord/interactions/commands/context/BanUser.java @@ -1,4 +1,4 @@ -package ti4.commands.context; +package ti4.discord.interactions.commands.context; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/ti4/commands/context/ContextCommand.java b/src/main/java/ti4/discord/interactions/commands/context/ContextCommand.java similarity index 91% rename from src/main/java/ti4/commands/context/ContextCommand.java rename to src/main/java/ti4/discord/interactions/commands/context/ContextCommand.java index 8a073a030d..1067801619 100644 --- a/src/main/java/ti4/commands/context/ContextCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/context/ContextCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.context; +package ti4.discord.interactions.commands.context; import java.util.List; import net.dv8tion.jda.api.Permission; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction; -import ti4.commands.Command; +import ti4.discord.interactions.commands.Command; public interface ContextCommand extends Command> { diff --git a/src/main/java/ti4/commands/context/ContextCommandManager.java b/src/main/java/ti4/discord/interactions/commands/context/ContextCommandManager.java similarity index 92% rename from src/main/java/ti4/commands/context/ContextCommandManager.java rename to src/main/java/ti4/discord/interactions/commands/context/ContextCommandManager.java index 095ee3e947..69fbebcbea 100644 --- a/src/main/java/ti4/commands/context/ContextCommandManager.java +++ b/src/main/java/ti4/discord/interactions/commands/context/ContextCommandManager.java @@ -1,4 +1,4 @@ -package ti4.commands.context; +package ti4.discord.interactions.commands.context; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/ti4/commands/context/DeleteMessage.java b/src/main/java/ti4/discord/interactions/commands/context/DeleteMessage.java similarity index 90% rename from src/main/java/ti4/commands/context/DeleteMessage.java rename to src/main/java/ti4/discord/interactions/commands/context/DeleteMessage.java index 8d7f4602a2..8679b9c28b 100644 --- a/src/main/java/ti4/commands/context/DeleteMessage.java +++ b/src/main/java/ti4/discord/interactions/commands/context/DeleteMessage.java @@ -1,9 +1,9 @@ -package ti4.commands.context; +package ti4.discord.interactions.commands.context; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.listeners.DeletionListener; +import ti4.discord.interactions.listeners.DeletionListener; import ti4.logging.BotLogger; import ti4.spring.service.messagecache.SavedBotMessagesService; diff --git a/src/main/java/ti4/commands/context/MessageCommand.java b/src/main/java/ti4/discord/interactions/commands/context/MessageCommand.java similarity index 96% rename from src/main/java/ti4/commands/context/MessageCommand.java rename to src/main/java/ti4/discord/interactions/commands/context/MessageCommand.java index 2b11f63c35..5017765238 100644 --- a/src/main/java/ti4/commands/context/MessageCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/context/MessageCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.context; +package ti4.discord.interactions.commands.context; import java.util.List; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/ti4/commands/context/UserCommand.java b/src/main/java/ti4/discord/interactions/commands/context/UserCommand.java similarity index 96% rename from src/main/java/ti4/commands/context/UserCommand.java rename to src/main/java/ti4/discord/interactions/commands/context/UserCommand.java index f847710fab..1337853e63 100644 --- a/src/main/java/ti4/commands/context/UserCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/context/UserCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.context; +package ti4.discord.interactions.commands.context; import java.util.List; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/ti4/commands/custom/ACRemoveFromGame.java b/src/main/java/ti4/discord/interactions/commands/custom/ACRemoveFromGame.java similarity index 91% rename from src/main/java/ti4/commands/custom/ACRemoveFromGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/ACRemoveFromGame.java index 8497fa69b3..9e9cb56431 100644 --- a/src/main/java/ti4/commands/custom/ACRemoveFromGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/ACRemoveFromGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/AgendaRemoveFromGame.java b/src/main/java/ti4/discord/interactions/commands/custom/AgendaRemoveFromGame.java similarity index 91% rename from src/main/java/ti4/commands/custom/AgendaRemoveFromGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/AgendaRemoveFromGame.java index 0847ff80b2..e6a60ee2ad 100644 --- a/src/main/java/ti4/commands/custom/AgendaRemoveFromGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/AgendaRemoveFromGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/ChangeToBaseGame.java b/src/main/java/ti4/discord/interactions/commands/custom/ChangeToBaseGame.java similarity index 93% rename from src/main/java/ti4/commands/custom/ChangeToBaseGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/ChangeToBaseGame.java index ec57beb54e..51d498ece1 100644 --- a/src/main/java/ti4/commands/custom/ChangeToBaseGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/ChangeToBaseGame.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/custom/CustomCommand.java b/src/main/java/ti4/discord/interactions/commands/custom/CustomCommand.java similarity index 91% rename from src/main/java/ti4/commands/custom/CustomCommand.java rename to src/main/java/ti4/discord/interactions/commands/custom/CustomCommand.java index 076edd291b..0ce62f36de 100644 --- a/src/main/java/ti4/commands/custom/CustomCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/CustomCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class CustomCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/custom/CustomizationOptions.java b/src/main/java/ti4/discord/interactions/commands/custom/CustomizationOptions.java similarity index 98% rename from src/main/java/ti4/commands/custom/CustomizationOptions.java rename to src/main/java/ti4/discord/interactions/commands/custom/CustomizationOptions.java index af8228c5a6..f071ab8dc2 100644 --- a/src/main/java/ti4/commands/custom/CustomizationOptions.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/CustomizationOptions.java @@ -1,4 +1,4 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/custom/DiscardSpecificAgenda.java b/src/main/java/ti4/discord/interactions/commands/custom/DiscardSpecificAgenda.java similarity index 91% rename from src/main/java/ti4/commands/custom/DiscardSpecificAgenda.java rename to src/main/java/ti4/discord/interactions/commands/custom/DiscardSpecificAgenda.java index 1f63444e36..74ecf7d832 100644 --- a/src/main/java/ti4/commands/custom/DiscardSpecificAgenda.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/DiscardSpecificAgenda.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/OfferAutoPassOptions.java b/src/main/java/ti4/discord/interactions/commands/custom/OfferAutoPassOptions.java similarity index 86% rename from src/main/java/ti4/commands/custom/OfferAutoPassOptions.java rename to src/main/java/ti4/discord/interactions/commands/custom/OfferAutoPassOptions.java index bbea55001f..c2404c67dc 100644 --- a/src/main/java/ti4/commands/custom/OfferAutoPassOptions.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/OfferAutoPassOptions.java @@ -1,7 +1,7 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.PlayerPreferenceHelper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/PeekAtSecretDeck.java b/src/main/java/ti4/discord/interactions/commands/custom/PeekAtSecretDeck.java similarity index 96% rename from src/main/java/ti4/commands/custom/PeekAtSecretDeck.java rename to src/main/java/ti4/discord/interactions/commands/custom/PeekAtSecretDeck.java index 376a052c49..a301215d0e 100644 --- a/src/main/java/ti4/commands/custom/PeekAtSecretDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/PeekAtSecretDeck.java @@ -1,4 +1,4 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import java.util.Collections; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/custom/PeekAtStage1.java b/src/main/java/ti4/discord/interactions/commands/custom/PeekAtStage1.java similarity index 90% rename from src/main/java/ti4/commands/custom/PeekAtStage1.java rename to src/main/java/ti4/discord/interactions/commands/custom/PeekAtStage1.java index a0787c8fb9..cd70337c0f 100644 --- a/src/main/java/ti4/commands/custom/PeekAtStage1.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/PeekAtStage1.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.ObjectiveHelper; diff --git a/src/main/java/ti4/commands/custom/PeekAtStage2.java b/src/main/java/ti4/discord/interactions/commands/custom/PeekAtStage2.java similarity index 90% rename from src/main/java/ti4/commands/custom/PeekAtStage2.java rename to src/main/java/ti4/discord/interactions/commands/custom/PeekAtStage2.java index 6ebeb233b0..14aea976ac 100644 --- a/src/main/java/ti4/commands/custom/PeekAtStage2.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/PeekAtStage2.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.ObjectiveHelper; diff --git a/src/main/java/ti4/commands/custom/PoRemoveFromGame.java b/src/main/java/ti4/discord/interactions/commands/custom/PoRemoveFromGame.java similarity index 91% rename from src/main/java/ti4/commands/custom/PoRemoveFromGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/PoRemoveFromGame.java index 44695bea18..8e078c58b1 100644 --- a/src/main/java/ti4/commands/custom/PoRemoveFromGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/PoRemoveFromGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/PoSetDeck.java b/src/main/java/ti4/discord/interactions/commands/custom/PoSetDeck.java similarity index 96% rename from src/main/java/ti4/commands/custom/PoSetDeck.java rename to src/main/java/ti4/discord/interactions/commands/custom/PoSetDeck.java index d39642c773..33822cf39d 100644 --- a/src/main/java/ti4/commands/custom/PoSetDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/PoSetDeck.java @@ -1,4 +1,4 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import java.util.Arrays; import java.util.Collections; @@ -8,7 +8,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.image.Mapper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/RevealSpecificStage1.java b/src/main/java/ti4/discord/interactions/commands/custom/RevealSpecificStage1.java similarity index 94% rename from src/main/java/ti4/commands/custom/RevealSpecificStage1.java rename to src/main/java/ti4/discord/interactions/commands/custom/RevealSpecificStage1.java index fc788bad18..77c76bbe3e 100644 --- a/src/main/java/ti4/commands/custom/RevealSpecificStage1.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/RevealSpecificStage1.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/custom/RevealSpecificStage2.java b/src/main/java/ti4/discord/interactions/commands/custom/RevealSpecificStage2.java similarity index 94% rename from src/main/java/ti4/commands/custom/RevealSpecificStage2.java rename to src/main/java/ti4/discord/interactions/commands/custom/RevealSpecificStage2.java index 3e14e2f834..06249289f2 100644 --- a/src/main/java/ti4/commands/custom/RevealSpecificStage2.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/RevealSpecificStage2.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/custom/SCAddToGame.java b/src/main/java/ti4/discord/interactions/commands/custom/SCAddToGame.java similarity index 90% rename from src/main/java/ti4/commands/custom/SCAddToGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/SCAddToGame.java index fe747ed39d..1211912d5a 100644 --- a/src/main/java/ti4/commands/custom/SCAddToGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SCAddToGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/SCRemoveFromGame.java b/src/main/java/ti4/discord/interactions/commands/custom/SCRemoveFromGame.java similarity index 90% rename from src/main/java/ti4/commands/custom/SCRemoveFromGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/SCRemoveFromGame.java index 28010c7342..4d82ae447d 100644 --- a/src/main/java/ti4/commands/custom/SCRemoveFromGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SCRemoveFromGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/SetThreadName.java b/src/main/java/ti4/discord/interactions/commands/custom/SetThreadName.java similarity index 94% rename from src/main/java/ti4/commands/custom/SetThreadName.java rename to src/main/java/ti4/discord/interactions/commands/custom/SetThreadName.java index 7167f05314..1b691c6506 100644 --- a/src/main/java/ti4/commands/custom/SetThreadName.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SetThreadName.java @@ -1,4 +1,4 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; import ti4.logging.BotLogger; diff --git a/src/main/java/ti4/commands/custom/SetUpPeakableObjectives.java b/src/main/java/ti4/discord/interactions/commands/custom/SetUpPeakableObjectives.java similarity index 93% rename from src/main/java/ti4/commands/custom/SetUpPeakableObjectives.java rename to src/main/java/ti4/discord/interactions/commands/custom/SetUpPeakableObjectives.java index b59ddc896b..ad389800a0 100644 --- a/src/main/java/ti4/commands/custom/SetUpPeakableObjectives.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SetUpPeakableObjectives.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/ShuffleBackInUnrevealedObj.java b/src/main/java/ti4/discord/interactions/commands/custom/ShuffleBackInUnrevealedObj.java similarity index 93% rename from src/main/java/ti4/commands/custom/ShuffleBackInUnrevealedObj.java rename to src/main/java/ti4/discord/interactions/commands/custom/ShuffleBackInUnrevealedObj.java index 877b759b34..d4bd271214 100644 --- a/src/main/java/ti4/commands/custom/ShuffleBackInUnrevealedObj.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/ShuffleBackInUnrevealedObj.java @@ -1,10 +1,10 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/SoAddToGame.java b/src/main/java/ti4/discord/interactions/commands/custom/SoAddToGame.java similarity index 93% rename from src/main/java/ti4/commands/custom/SoAddToGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/SoAddToGame.java index 252cc75f03..222df5a8c5 100644 --- a/src/main/java/ti4/commands/custom/SoAddToGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SoAddToGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/custom/SoRemoveFromGame.java b/src/main/java/ti4/discord/interactions/commands/custom/SoRemoveFromGame.java similarity index 91% rename from src/main/java/ti4/commands/custom/SoRemoveFromGame.java rename to src/main/java/ti4/discord/interactions/commands/custom/SoRemoveFromGame.java index 0f25dbd478..5aacfec9c6 100644 --- a/src/main/java/ti4/commands/custom/SoRemoveFromGame.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SoRemoveFromGame.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/SpinTilesInRings.java b/src/main/java/ti4/discord/interactions/commands/custom/SpinTilesInRings.java similarity index 89% rename from src/main/java/ti4/commands/custom/SpinTilesInRings.java rename to src/main/java/ti4/discord/interactions/commands/custom/SpinTilesInRings.java index 01bd4e6c0a..45d5a7f455 100644 --- a/src/main/java/ti4/commands/custom/SpinTilesInRings.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SpinTilesInRings.java @@ -1,7 +1,7 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.SpinRingsHelper; diff --git a/src/main/java/ti4/commands/custom/SwapStage1.java b/src/main/java/ti4/discord/interactions/commands/custom/SwapStage1.java similarity index 91% rename from src/main/java/ti4/commands/custom/SwapStage1.java rename to src/main/java/ti4/discord/interactions/commands/custom/SwapStage1.java index 7d98d062bb..408e8d6d97 100644 --- a/src/main/java/ti4/commands/custom/SwapStage1.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SwapStage1.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/custom/SwapStage2.java b/src/main/java/ti4/discord/interactions/commands/custom/SwapStage2.java similarity index 91% rename from src/main/java/ti4/commands/custom/SwapStage2.java rename to src/main/java/ti4/discord/interactions/commands/custom/SwapStage2.java index d96fbf8154..2d9a02806e 100644 --- a/src/main/java/ti4/commands/custom/SwapStage2.java +++ b/src/main/java/ti4/discord/interactions/commands/custom/SwapStage2.java @@ -1,9 +1,9 @@ -package ti4.commands.custom; +package ti4.discord.interactions.commands.custom; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/developer/ButtonProcessingStatistics.java b/src/main/java/ti4/discord/interactions/commands/developer/ButtonProcessingStatistics.java similarity index 77% rename from src/main/java/ti4/commands/developer/ButtonProcessingStatistics.java rename to src/main/java/ti4/discord/interactions/commands/developer/ButtonProcessingStatistics.java index 2b057e7ee6..3bc71385a5 100644 --- a/src/main/java/ti4/commands/developer/ButtonProcessingStatistics.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/ButtonProcessingStatistics.java @@ -1,8 +1,8 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.ButtonProcessor; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.ButtonProcessor; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; class ButtonProcessingStatistics extends Subcommand { diff --git a/src/main/java/ti4/commands/developer/CacheStatistics.java b/src/main/java/ti4/discord/interactions/commands/developer/CacheStatistics.java similarity index 85% rename from src/main/java/ti4/commands/developer/CacheStatistics.java rename to src/main/java/ti4/discord/interactions/commands/developer/CacheStatistics.java index 36516c25ed..dd6e6e1606 100644 --- a/src/main/java/ti4/commands/developer/CacheStatistics.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/CacheStatistics.java @@ -1,9 +1,9 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.cache.CacheManager; import ti4.cache.CacheStatsToStringConverter; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; class CacheStatistics extends Subcommand { diff --git a/src/main/java/ti4/commands/developer/CustomCommand.java b/src/main/java/ti4/discord/interactions/commands/developer/CustomCommand.java similarity index 93% rename from src/main/java/ti4/commands/developer/CustomCommand.java rename to src/main/java/ti4/discord/interactions/commands/developer/CustomCommand.java index b843435183..bde96ddc6a 100644 --- a/src/main/java/ti4/commands/developer/CustomCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/CustomCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; diff --git a/src/main/java/ti4/commands/developer/DeveloperCommand.java b/src/main/java/ti4/discord/interactions/commands/developer/DeveloperCommand.java similarity index 85% rename from src/main/java/ti4/commands/developer/DeveloperCommand.java rename to src/main/java/ti4/discord/interactions/commands/developer/DeveloperCommand.java index 19841dc5a3..d68c4faafc 100644 --- a/src/main/java/ti4/commands/developer/DeveloperCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/DeveloperCommand.java @@ -1,14 +1,14 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.CommandHelper; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; -import ti4.spring.jda.JdaService; public class DeveloperCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/developer/GiveTheBotABreather.java b/src/main/java/ti4/discord/interactions/commands/developer/GiveTheBotABreather.java similarity index 90% rename from src/main/java/ti4/commands/developer/GiveTheBotABreather.java rename to src/main/java/ti4/discord/interactions/commands/developer/GiveTheBotABreather.java index 3bd18193ae..3a3ecff560 100644 --- a/src/main/java/ti4/commands/developer/GiveTheBotABreather.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/GiveTheBotABreather.java @@ -1,10 +1,10 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.executors.CircuitBreaker; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/developer/LocalDevelopment.java b/src/main/java/ti4/discord/interactions/commands/developer/LocalDevelopment.java similarity index 96% rename from src/main/java/ti4/commands/developer/LocalDevelopment.java rename to src/main/java/ti4/discord/interactions/commands/developer/LocalDevelopment.java index 0611658f9a..e39807291f 100644 --- a/src/main/java/ti4/commands/developer/LocalDevelopment.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/LocalDevelopment.java @@ -1,11 +1,11 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.LocalDevelopmentSampleGameService; diff --git a/src/main/java/ti4/commands/developer/ProduceNucleusGenStats.java b/src/main/java/ti4/discord/interactions/commands/developer/ProduceNucleusGenStats.java similarity index 98% rename from src/main/java/ti4/commands/developer/ProduceNucleusGenStats.java rename to src/main/java/ti4/discord/interactions/commands/developer/ProduceNucleusGenStats.java index dfc63865fd..c0a8212490 100644 --- a/src/main/java/ti4/commands/developer/ProduceNucleusGenStats.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/ProduceNucleusGenStats.java @@ -1,4 +1,4 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.util.ArrayList; import java.util.Collections; @@ -11,7 +11,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/developer/RestoreGame.java b/src/main/java/ti4/discord/interactions/commands/developer/RestoreGame.java similarity index 95% rename from src/main/java/ti4/commands/developer/RestoreGame.java rename to src/main/java/ti4/discord/interactions/commands/developer/RestoreGame.java index ba60167d7b..14ab69f480 100644 --- a/src/main/java/ti4/commands/developer/RestoreGame.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/RestoreGame.java @@ -1,11 +1,11 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.io.File; import net.dv8tion.jda.api.entities.Message.Attachment; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/developer/RunAgainstAllGames.java b/src/main/java/ti4/discord/interactions/commands/developer/RunAgainstAllGames.java similarity index 97% rename from src/main/java/ti4/commands/developer/RunAgainstAllGames.java rename to src/main/java/ti4/discord/interactions/commands/developer/RunAgainstAllGames.java index 3091b06747..4b738d6f08 100644 --- a/src/main/java/ti4/commands/developer/RunAgainstAllGames.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/RunAgainstAllGames.java @@ -1,11 +1,11 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.game.persistence.GamesPage; diff --git a/src/main/java/ti4/commands/developer/RunAgainstSpecificGame.java b/src/main/java/ti4/discord/interactions/commands/developer/RunAgainstSpecificGame.java similarity index 94% rename from src/main/java/ti4/commands/developer/RunAgainstSpecificGame.java rename to src/main/java/ti4/discord/interactions/commands/developer/RunAgainstSpecificGame.java index 71789ac064..5eba480553 100644 --- a/src/main/java/ti4/commands/developer/RunAgainstSpecificGame.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/RunAgainstSpecificGame.java @@ -1,9 +1,9 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/developer/RunCron.java b/src/main/java/ti4/discord/interactions/commands/developer/RunCron.java similarity index 91% rename from src/main/java/ti4/commands/developer/RunCron.java rename to src/main/java/ti4/discord/interactions/commands/developer/RunCron.java index 730f1a3f74..658f682017 100644 --- a/src/main/java/ti4/commands/developer/RunCron.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/RunCron.java @@ -1,10 +1,10 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; import ti4.cron.CronManager; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/developer/RunManualDataMigration.java b/src/main/java/ti4/discord/interactions/commands/developer/RunManualDataMigration.java similarity index 94% rename from src/main/java/ti4/commands/developer/RunManualDataMigration.java rename to src/main/java/ti4/discord/interactions/commands/developer/RunManualDataMigration.java index ddf3c4f72f..3f7aaa725e 100644 --- a/src/main/java/ti4/commands/developer/RunManualDataMigration.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/RunManualDataMigration.java @@ -1,18 +1,18 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; +import ti4.game.persistence.migration.DataMigrationManager; import ti4.helpers.Constants; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.MessageHelper; -import ti4.migration.DataMigrationManager; class RunManualDataMigration extends Subcommand { diff --git a/src/main/java/ti4/commands/developer/RunSql.java b/src/main/java/ti4/discord/interactions/commands/developer/RunSql.java similarity index 92% rename from src/main/java/ti4/commands/developer/RunSql.java rename to src/main/java/ti4/discord/interactions/commands/developer/RunSql.java index 1f0b634d9d..0add76c703 100644 --- a/src/main/java/ti4/commands/developer/RunSql.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/RunSql.java @@ -1,11 +1,11 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; import ti4.spring.context.SpringContext; import ti4.spring.service.developer.RunSqlService; diff --git a/src/main/java/ti4/commands/developer/SetGlobalSetting.java b/src/main/java/ti4/discord/interactions/commands/developer/SetGlobalSetting.java similarity index 95% rename from src/main/java/ti4/commands/developer/SetGlobalSetting.java rename to src/main/java/ti4/discord/interactions/commands/developer/SetGlobalSetting.java index 76e2bc6fa2..54b1952641 100644 --- a/src/main/java/ti4/commands/developer/SetGlobalSetting.java +++ b/src/main/java/ti4/discord/interactions/commands/developer/SetGlobalSetting.java @@ -1,10 +1,10 @@ -package ti4.commands.developer; +package ti4.discord.interactions.commands.developer; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.settings.GlobalSettings; diff --git a/src/main/java/ti4/commands/draft/DraftCommand.java b/src/main/java/ti4/discord/interactions/commands/draft/DraftCommand.java similarity index 56% rename from src/main/java/ti4/commands/draft/DraftCommand.java rename to src/main/java/ti4/discord/interactions/commands/draft/DraftCommand.java index 2b421add8f..5986818cb6 100644 --- a/src/main/java/ti4/commands/draft/DraftCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/DraftCommand.java @@ -1,18 +1,18 @@ -package ti4.commands.draft; +package ti4.discord.interactions.commands.draft; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.SubcommandGroup; -import ti4.commands.draft.andcat.AndcatDraftableGroup; -import ti4.commands.draft.faction.FactionDraftableGroup; -import ti4.commands.draft.manage.DraftManagerGroup; -import ti4.commands.draft.mantistile.MantisTileDraftableGroup; -import ti4.commands.draft.publicsnake.PublicSnakeDraftGroup; -import ti4.commands.draft.seat.SeatDraftableGroup; -import ti4.commands.draft.slice.SliceDraftableGroup; -import ti4.commands.draft.speakerorder.SpeakerOrderDraftableGroup; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.SubcommandGroup; +import ti4.discord.interactions.commands.draft.andcat.AndcatDraftableGroup; +import ti4.discord.interactions.commands.draft.faction.FactionDraftableGroup; +import ti4.discord.interactions.commands.draft.manage.DraftManagerGroup; +import ti4.discord.interactions.commands.draft.mantistile.MantisTileDraftableGroup; +import ti4.discord.interactions.commands.draft.publicsnake.PublicSnakeDraftGroup; +import ti4.discord.interactions.commands.draft.seat.SeatDraftableGroup; +import ti4.discord.interactions.commands.draft.slice.SliceDraftableGroup; +import ti4.discord.interactions.commands.draft.speakerorder.SpeakerOrderDraftableGroup; import ti4.helpers.Constants; public class DraftCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableAddPackage.java b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableAddPackage.java similarity index 94% rename from src/main/java/ti4/commands/draft/andcat/AndcatDraftableAddPackage.java rename to src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableAddPackage.java index 6f3c0fdbca..cef9c6386e 100644 --- a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableAddPackage.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableAddPackage.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.andcat; +package ti4.discord.interactions.commands.draft.andcat; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.AndcatReferenceCardsDraftable; diff --git a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java similarity index 96% rename from src/main/java/ti4/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java rename to src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java index 1f3ecf5b29..83c37f4fe2 100644 --- a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableClearPlayerChoices.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.andcat; +package ti4.discord.interactions.commands.draft.andcat; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableGroup.java similarity index 94% rename from src/main/java/ti4/commands/draft/andcat/AndcatDraftableGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableGroup.java index 67883be031..2fd4cc8fb9 100644 --- a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableGroup.java @@ -1,4 +1,4 @@ -package ti4.commands.draft.andcat; +package ti4.discord.interactions.commands.draft.andcat; import java.util.List; import java.util.Map; @@ -6,8 +6,8 @@ import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableModifyPackage.java b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableModifyPackage.java similarity index 95% rename from src/main/java/ti4/commands/draft/andcat/AndcatDraftableModifyPackage.java rename to src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableModifyPackage.java index 103171d918..95e34c0cb4 100644 --- a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableModifyPackage.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableModifyPackage.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.andcat; +package ti4.discord.interactions.commands.draft.andcat; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.AndcatReferenceCardsDraftable; diff --git a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableRemovePackage.java b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableRemovePackage.java similarity index 95% rename from src/main/java/ti4/commands/draft/andcat/AndcatDraftableRemovePackage.java rename to src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableRemovePackage.java index fd65dc25d2..519f0391c0 100644 --- a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableRemovePackage.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableRemovePackage.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.andcat; +package ti4.discord.interactions.commands.draft.andcat; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java similarity index 98% rename from src/main/java/ti4/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java rename to src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java index 12787960e4..48ac4bd514 100644 --- a/src/main/java/ti4/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/andcat/AndcatDraftableSetPlayerChoices.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.andcat; +package ti4.discord.interactions.commands.draft.andcat; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/draft/faction/FactionDraftableAddFaction.java b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableAddFaction.java similarity index 92% rename from src/main/java/ti4/commands/draft/faction/FactionDraftableAddFaction.java rename to src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableAddFaction.java index 2db3549d85..5634d0d305 100644 --- a/src/main/java/ti4/commands/draft/faction/FactionDraftableAddFaction.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableAddFaction.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.faction; +package ti4.discord.interactions.commands.draft.faction; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.FactionDraftable; diff --git a/src/main/java/ti4/commands/draft/faction/FactionDraftableGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableGroup.java similarity index 86% rename from src/main/java/ti4/commands/draft/faction/FactionDraftableGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableGroup.java index d2f5796189..1cf693b7b5 100644 --- a/src/main/java/ti4/commands/draft/faction/FactionDraftableGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableGroup.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.faction; +package ti4.discord.interactions.commands.draft.faction; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/faction/FactionDraftableRemoveFaction.java b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableRemoveFaction.java similarity index 92% rename from src/main/java/ti4/commands/draft/faction/FactionDraftableRemoveFaction.java rename to src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableRemoveFaction.java index 79f73c94a8..8d6adda745 100644 --- a/src/main/java/ti4/commands/draft/faction/FactionDraftableRemoveFaction.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableRemoveFaction.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.faction; +package ti4.discord.interactions.commands.draft.faction; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.FactionDraftable; diff --git a/src/main/java/ti4/commands/draft/faction/FactionDraftableSetKeleresFlavor.java b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableSetKeleresFlavor.java similarity index 93% rename from src/main/java/ti4/commands/draft/faction/FactionDraftableSetKeleresFlavor.java rename to src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableSetKeleresFlavor.java index 9986353132..7699cfd45b 100644 --- a/src/main/java/ti4/commands/draft/faction/FactionDraftableSetKeleresFlavor.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/faction/FactionDraftableSetKeleresFlavor.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.faction; +package ti4.discord.interactions.commands.draft.faction; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.FactionDraftable; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerAddAllGamePlayers.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddAllGamePlayers.java similarity index 93% rename from src/main/java/ti4/commands/draft/manage/DraftManagerAddAllGamePlayers.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddAllGamePlayers.java index 355fe3874b..29a5ad728e 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerAddAllGamePlayers.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddAllGamePlayers.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerAddDraftable.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddDraftable.java similarity index 94% rename from src/main/java/ti4/commands/draft/manage/DraftManagerAddDraftable.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddDraftable.java index 2375491bfa..cbdb3c31be 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerAddDraftable.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddDraftable.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerAddOrchestrator.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddOrchestrator.java similarity index 95% rename from src/main/java/ti4/commands/draft/manage/DraftManagerAddOrchestrator.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddOrchestrator.java index 4f7b935192..c76e90f3fc 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerAddOrchestrator.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddOrchestrator.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerAddPlayer.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddPlayer.java similarity index 91% rename from src/main/java/ti4/commands/draft/manage/DraftManagerAddPlayer.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddPlayer.java index 95ecb18081..35cede44e7 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerAddPlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerAddPlayer.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerCanEndDraft.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerCanEndDraft.java similarity index 87% rename from src/main/java/ti4/commands/draft/manage/DraftManagerCanEndDraft.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerCanEndDraft.java index ae747923dc..85e9ea97dc 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerCanEndDraft.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerCanEndDraft.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.Objects; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerCanSetupPlayers.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerCanSetupPlayers.java similarity index 88% rename from src/main/java/ti4/commands/draft/manage/DraftManagerCanSetupPlayers.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerCanSetupPlayers.java index 00de4ef014..e2b3ab5a03 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerCanSetupPlayers.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerCanSetupPlayers.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.Objects; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerClearMissingPlayers.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerClearMissingPlayers.java similarity index 92% rename from src/main/java/ti4/commands/draft/manage/DraftManagerClearMissingPlayers.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerClearMissingPlayers.java index 9b359ca0d3..d187c2e4bc 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerClearMissingPlayers.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerClearMissingPlayers.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerDebug.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerDebug.java similarity index 95% rename from src/main/java/ti4/commands/draft/manage/DraftManagerDebug.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerDebug.java index 0e00ab57f3..2e2bd61de5 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerDebug.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerDebug.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.StringHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerGroup.java similarity index 91% rename from src/main/java/ti4/commands/draft/manage/DraftManagerGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerGroup.java index 694d65b9fe..84a0da4521 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerGroup.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.helpers.Constants; public class DraftManagerGroup extends SubcommandGroup { diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerListPlayers.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerListPlayers.java similarity index 90% rename from src/main/java/ti4/commands/draft/manage/DraftManagerListPlayers.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerListPlayers.java index 59bf58e3c7..b94e78a0b7 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerListPlayers.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerListPlayers.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerMakePick.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerMakePick.java similarity index 96% rename from src/main/java/ti4/commands/draft/manage/DraftManagerMakePick.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerMakePick.java index cf398ef426..3610ba35d2 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerMakePick.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerMakePick.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerPostDraftWork.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerPostDraftWork.java similarity index 88% rename from src/main/java/ti4/commands/draft/manage/DraftManagerPostDraftWork.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerPostDraftWork.java index da79e4a31a..db423ac4df 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerPostDraftWork.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerPostDraftWork.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerRemoveDraftable.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerRemoveDraftable.java similarity index 92% rename from src/main/java/ti4/commands/draft/manage/DraftManagerRemoveDraftable.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerRemoveDraftable.java index 72d4b2fd03..962ee59afb 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerRemoveDraftable.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerRemoveDraftable.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerRemovePlayer.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerRemovePlayer.java similarity index 94% rename from src/main/java/ti4/commands/draft/manage/DraftManagerRemovePlayer.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerRemovePlayer.java index d44891bc1f..34019f1c87 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerRemovePlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerRemovePlayer.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerReplacePlayer.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerReplacePlayer.java similarity index 95% rename from src/main/java/ti4/commands/draft/manage/DraftManagerReplacePlayer.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerReplacePlayer.java index 5429307343..620e606f62 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerReplacePlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerReplacePlayer.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java similarity index 96% rename from src/main/java/ti4/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java index 8fbc2730c1..ca0e829401 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSendCustomDraftableCommand.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java similarity index 95% rename from src/main/java/ti4/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java index 0c02388587..4dfaf1d552 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSendCustomOrchestratorCommand.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerSetupDraft.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupDraft.java similarity index 85% rename from src/main/java/ti4/commands/draft/manage/DraftManagerSetupDraft.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupDraft.java index 64a39e91f0..61747dbe68 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerSetupDraft.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupDraft.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.settingsFramework.menus.DraftSystemSettings; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerSetupNucleusCommand.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupNucleusCommand.java similarity index 93% rename from src/main/java/ti4/commands/draft/manage/DraftManagerSetupNucleusCommand.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupNucleusCommand.java index 4b13c8e45d..ea87ca4f83 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerSetupNucleusCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupNucleusCommand.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.Collection; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerSetupPlayers.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupPlayers.java similarity index 90% rename from src/main/java/ti4/commands/draft/manage/DraftManagerSetupPlayers.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupPlayers.java index d7d2593741..777a8324e2 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerSetupPlayers.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSetupPlayers.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerStartDraft.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerStartDraft.java similarity index 85% rename from src/main/java/ti4/commands/draft/manage/DraftManagerStartDraft.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerStartDraft.java index 3a19fa58ff..c53aee77e5 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerStartDraft.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerStartDraft.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerSwapDraftingPlayers.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSwapDraftingPlayers.java similarity index 93% rename from src/main/java/ti4/commands/draft/manage/DraftManagerSwapDraftingPlayers.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSwapDraftingPlayers.java index fb21893179..0b78015d12 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerSwapDraftingPlayers.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerSwapDraftingPlayers.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerTryEndDraft.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerTryEndDraft.java similarity index 90% rename from src/main/java/ti4/commands/draft/manage/DraftManagerTryEndDraft.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerTryEndDraft.java index 89d266fbb1..87e7159323 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerTryEndDraft.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerTryEndDraft.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerUnpick.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerUnpick.java similarity index 95% rename from src/main/java/ti4/commands/draft/manage/DraftManagerUnpick.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerUnpick.java index efb546f7fd..c1297642d1 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerUnpick.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerUnpick.java @@ -1,11 +1,11 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/draft/manage/DraftManagerValidateState.java b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerValidateState.java similarity index 83% rename from src/main/java/ti4/commands/draft/manage/DraftManagerValidateState.java rename to src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerValidateState.java index 30406d8927..317bb57f74 100644 --- a/src/main/java/ti4/commands/draft/manage/DraftManagerValidateState.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/manage/DraftManagerValidateState.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.manage; +package ti4.discord.interactions.commands.draft.manage; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableConfigure.java b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableConfigure.java similarity index 96% rename from src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableConfigure.java rename to src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableConfigure.java index eed0f0e7b1..e4d80587c6 100644 --- a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableConfigure.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableConfigure.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.mantistile; +package ti4.discord.interactions.commands.draft.mantistile; import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.MantisTileDraftable; diff --git a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableGroup.java similarity index 87% rename from src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableGroup.java index 63bfb4f791..1fe0d5b37d 100644 --- a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableGroup.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.mantistile; +package ti4.discord.interactions.commands.draft.mantistile; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableSetTiles.java b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableSetTiles.java similarity index 95% rename from src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableSetTiles.java rename to src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableSetTiles.java index 9058b2c573..2308659d47 100644 --- a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableSetTiles.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableSetTiles.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.mantistile; +package ti4.discord.interactions.commands.draft.mantistile; import java.util.List; import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.draft.DraftCategory; import ti4.draft.DraftItem; import ti4.draft.items.BlueTileDraftItem; diff --git a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableStartBuilding.java b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableStartBuilding.java similarity index 90% rename from src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableStartBuilding.java rename to src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableStartBuilding.java index efd51a6173..b671f72fbc 100644 --- a/src/main/java/ti4/commands/draft/mantistile/MantisTileDraftableStartBuilding.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/mantistile/MantisTileDraftableStartBuilding.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.mantistile; +package ti4.discord.interactions.commands.draft.mantistile; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.MantisMapBuildContext; diff --git a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftGroup.java similarity index 89% rename from src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftGroup.java index e7d757e0c7..169f483d56 100644 --- a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftGroup.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.publicsnake; +package ti4.discord.interactions.commands.draft.publicsnake; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java similarity index 89% rename from src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java rename to src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java index 61d9a8681e..dc10582a6d 100644 --- a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSendButtons.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.publicsnake; +package ti4.discord.interactions.commands.draft.publicsnake; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.orchestrators.PublicSnakeDraftOrchestrator; diff --git a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java similarity index 92% rename from src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java rename to src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java index 0cf81d6e05..0b7f7d5b60 100644 --- a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftDirection.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.publicsnake; +package ti4.discord.interactions.commands.draft.publicsnake; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.orchestrators.PublicSnakeDraftOrchestrator; diff --git a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java similarity index 93% rename from src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java rename to src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java index cc390aefef..bb37e60d3c 100644 --- a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetDraftingPlayer.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.publicsnake; +package ti4.discord.interactions.commands.draft.publicsnake; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.orchestrators.PublicSnakeDraftOrchestrator; diff --git a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java similarity index 96% rename from src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java rename to src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java index d5c71be6ad..98848b68c7 100644 --- a/src/main/java/ti4/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/publicsnake/PublicSnakeDraftOrchestratorSetOrder.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.publicsnake; +package ti4.discord.interactions.commands.draft.publicsnake; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.orchestrators.PublicSnakeDraftOrchestrator; diff --git a/src/main/java/ti4/commands/draft/seat/SeatDraftableGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableGroup.java similarity index 86% rename from src/main/java/ti4/commands/draft/seat/SeatDraftableGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableGroup.java index ae8fa4a900..eb8c5943bf 100644 --- a/src/main/java/ti4/commands/draft/seat/SeatDraftableGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableGroup.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.seat; +package ti4.discord.interactions.commands.draft.seat; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/seat/SeatDraftableSetSeatCount.java b/src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableSetSeatCount.java similarity index 91% rename from src/main/java/ti4/commands/draft/seat/SeatDraftableSetSeatCount.java rename to src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableSetSeatCount.java index a058cad9eb..dd52ca66ff 100644 --- a/src/main/java/ti4/commands/draft/seat/SeatDraftableSetSeatCount.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableSetSeatCount.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.seat; +package ti4.discord.interactions.commands.draft.seat; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.SeatDraftable; diff --git a/src/main/java/ti4/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java b/src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java similarity index 93% rename from src/main/java/ti4/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java rename to src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java index 063fad688d..d7d3862509 100644 --- a/src/main/java/ti4/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/seat/SeatDraftableSetSeatsForMapTemplate.java @@ -1,7 +1,7 @@ -package ti4.commands.draft.seat; +package ti4.discord.interactions.commands.draft.seat; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.image.Mapper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/draft/slice/SliceDraftableAddSlice.java b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableAddSlice.java similarity index 97% rename from src/main/java/ti4/commands/draft/slice/SliceDraftableAddSlice.java rename to src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableAddSlice.java index 033c02d83e..65b8e33d11 100644 --- a/src/main/java/ti4/commands/draft/slice/SliceDraftableAddSlice.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableAddSlice.java @@ -1,11 +1,11 @@ -package ti4.commands.draft.slice; +package ti4.discord.interactions.commands.draft.slice; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.SliceDraftable; diff --git a/src/main/java/ti4/commands/draft/slice/SliceDraftableGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableGroup.java similarity index 93% rename from src/main/java/ti4/commands/draft/slice/SliceDraftableGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableGroup.java index c6dc96701e..6d8fdfa113 100644 --- a/src/main/java/ti4/commands/draft/slice/SliceDraftableGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableGroup.java @@ -1,4 +1,4 @@ -package ti4.commands.draft.slice; +package ti4.discord.interactions.commands.draft.slice; import java.util.List; import java.util.Map; @@ -6,8 +6,8 @@ import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/draft/slice/SliceDraftableModifySlice.java b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableModifySlice.java similarity index 97% rename from src/main/java/ti4/commands/draft/slice/SliceDraftableModifySlice.java rename to src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableModifySlice.java index e17bbcb8b4..817658fb11 100644 --- a/src/main/java/ti4/commands/draft/slice/SliceDraftableModifySlice.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableModifySlice.java @@ -1,11 +1,11 @@ -package ti4.commands.draft.slice; +package ti4.discord.interactions.commands.draft.slice; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.SliceDraftable; diff --git a/src/main/java/ti4/commands/draft/slice/SliceDraftableRemoveSlice.java b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableRemoveSlice.java similarity index 92% rename from src/main/java/ti4/commands/draft/slice/SliceDraftableRemoveSlice.java rename to src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableRemoveSlice.java index 5527115d33..3eef7b15aa 100644 --- a/src/main/java/ti4/commands/draft/slice/SliceDraftableRemoveSlice.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/slice/SliceDraftableRemoveSlice.java @@ -1,8 +1,8 @@ -package ti4.commands.draft.slice; +package ti4.discord.interactions.commands.draft.slice; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.SliceDraftable; diff --git a/src/main/java/ti4/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java b/src/main/java/ti4/discord/interactions/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java similarity index 85% rename from src/main/java/ti4/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java rename to src/main/java/ti4/discord/interactions/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java index 2a355d18e8..951954df58 100644 --- a/src/main/java/ti4/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/speakerorder/SpeakerOrderDraftableGroup.java @@ -1,10 +1,10 @@ -package ti4.commands.draft.speakerorder; +package ti4.discord.interactions.commands.draft.speakerorder; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.Subcommand; -import ti4.commands.SubcommandGroup; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.SubcommandGroup; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.draft.DraftManager; diff --git a/src/main/java/ti4/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java b/src/main/java/ti4/discord/interactions/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java similarity index 93% rename from src/main/java/ti4/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java rename to src/main/java/ti4/discord/interactions/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java index eee9084379..07a0e2ac3f 100644 --- a/src/main/java/ti4/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java +++ b/src/main/java/ti4/discord/interactions/commands/draft/speakerorder/SpeakerOrderDraftableSetPickCount.java @@ -1,9 +1,9 @@ -package ti4.commands.draft.speakerorder; +package ti4.discord.interactions.commands.draft.speakerorder; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.draft.draftables.SpeakerOrderDraftable; diff --git a/src/main/java/ti4/commands/ds/ATS.java b/src/main/java/ti4/discord/interactions/commands/ds/ATS.java similarity index 89% rename from src/main/java/ti4/commands/ds/ATS.java rename to src/main/java/ti4/discord/interactions/commands/ds/ATS.java index 9a1a2509d2..4eeff9e5ea 100644 --- a/src/main/java/ti4/commands/ds/ATS.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/ATS.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/AddOmenDie.java b/src/main/java/ti4/discord/interactions/commands/ds/AddOmenDie.java similarity index 90% rename from src/main/java/ti4/commands/ds/AddOmenDie.java rename to src/main/java/ti4/discord/interactions/commands/ds/AddOmenDie.java index ee8f6bf71d..013cad0660 100644 --- a/src/main/java/ti4/commands/ds/AddOmenDie.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/AddOmenDie.java @@ -1,10 +1,10 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ButtonHelperAbilities; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/DiscordantStarsCommand.java b/src/main/java/ti4/discord/interactions/commands/ds/DiscordantStarsCommand.java similarity index 89% rename from src/main/java/ti4/commands/ds/DiscordantStarsCommand.java rename to src/main/java/ti4/discord/interactions/commands/ds/DiscordantStarsCommand.java index 9d3c7dc88a..c6137edc93 100644 --- a/src/main/java/ti4/commands/ds/DiscordantStarsCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/DiscordantStarsCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class DiscordantStarsCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/ds/DishonorCount.java b/src/main/java/ti4/discord/interactions/commands/ds/DishonorCount.java similarity index 90% rename from src/main/java/ti4/commands/ds/DishonorCount.java rename to src/main/java/ti4/discord/interactions/commands/ds/DishonorCount.java index 65b92567aa..fa38a87eec 100644 --- a/src/main/java/ti4/commands/ds/DishonorCount.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/DishonorCount.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ButtonHelperFactionSpecific; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/ds/DrawBlueBackTile.java b/src/main/java/ti4/discord/interactions/commands/ds/DrawBlueBackTile.java similarity index 90% rename from src/main/java/ti4/commands/ds/DrawBlueBackTile.java rename to src/main/java/ti4/discord/interactions/commands/ds/DrawBlueBackTile.java index da8ec85d8b..9c6fee3955 100644 --- a/src/main/java/ti4/commands/ds/DrawBlueBackTile.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/DrawBlueBackTile.java @@ -1,10 +1,10 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.DiscordantStarsHelper; diff --git a/src/main/java/ti4/commands/ds/DrawRedBackTile.java b/src/main/java/ti4/discord/interactions/commands/ds/DrawRedBackTile.java similarity index 89% rename from src/main/java/ti4/commands/ds/DrawRedBackTile.java rename to src/main/java/ti4/discord/interactions/commands/ds/DrawRedBackTile.java index 5bc4453a70..9b45db3aa2 100644 --- a/src/main/java/ti4/commands/ds/DrawRedBackTile.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/DrawRedBackTile.java @@ -1,10 +1,10 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.DiscordantStarsHelper; diff --git a/src/main/java/ti4/commands/ds/FlipGrace.java b/src/main/java/ti4/discord/interactions/commands/ds/FlipGrace.java similarity index 90% rename from src/main/java/ti4/commands/ds/FlipGrace.java rename to src/main/java/ti4/discord/interactions/commands/ds/FlipGrace.java index 124e8b0134..360276a55f 100644 --- a/src/main/java/ti4/commands/ds/FlipGrace.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/FlipGrace.java @@ -1,7 +1,7 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/HonorCount.java b/src/main/java/ti4/discord/interactions/commands/ds/HonorCount.java similarity index 90% rename from src/main/java/ti4/commands/ds/HonorCount.java rename to src/main/java/ti4/discord/interactions/commands/ds/HonorCount.java index c0c5c28ce6..5ece6e2cbb 100644 --- a/src/main/java/ti4/commands/ds/HonorCount.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/HonorCount.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ButtonHelperFactionSpecific; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/ds/KyroHero.java b/src/main/java/ti4/discord/interactions/commands/ds/KyroHero.java similarity index 93% rename from src/main/java/ti4/commands/ds/KyroHero.java rename to src/main/java/ti4/discord/interactions/commands/ds/KyroHero.java index e251914837..2f1ffd5622 100644 --- a/src/main/java/ti4/commands/ds/KyroHero.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/KyroHero.java @@ -1,10 +1,10 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/ds/PathToken.java b/src/main/java/ti4/discord/interactions/commands/ds/PathToken.java similarity index 88% rename from src/main/java/ti4/commands/ds/PathToken.java rename to src/main/java/ti4/discord/interactions/commands/ds/PathToken.java index 7bf764cf49..968c139d5d 100644 --- a/src/main/java/ti4/commands/ds/PathToken.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/PathToken.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/SetPlanetTradeGoods.java b/src/main/java/ti4/discord/interactions/commands/ds/SetPlanetTradeGoods.java similarity index 94% rename from src/main/java/ti4/commands/ds/SetPlanetTradeGoods.java rename to src/main/java/ti4/discord/interactions/commands/ds/SetPlanetTradeGoods.java index 7f79945302..2f3ede4461 100644 --- a/src/main/java/ti4/commands/ds/SetPlanetTradeGoods.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/SetPlanetTradeGoods.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/SetPolicy.java b/src/main/java/ti4/discord/interactions/commands/ds/SetPolicy.java similarity index 98% rename from src/main/java/ti4/commands/ds/SetPolicy.java rename to src/main/java/ti4/discord/interactions/commands/ds/SetPolicy.java index b79766c03f..d7e1341bbf 100644 --- a/src/main/java/ti4/commands/ds/SetPolicy.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/SetPolicy.java @@ -1,4 +1,4 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/ds/StarBalanceCount.java b/src/main/java/ti4/discord/interactions/commands/ds/StarBalanceCount.java similarity index 89% rename from src/main/java/ti4/commands/ds/StarBalanceCount.java rename to src/main/java/ti4/discord/interactions/commands/ds/StarBalanceCount.java index 3ffcf74f51..ef7b9a87b6 100644 --- a/src/main/java/ti4/commands/ds/StarBalanceCount.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/StarBalanceCount.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/SteelBalanceCount.java b/src/main/java/ti4/discord/interactions/commands/ds/SteelBalanceCount.java similarity index 89% rename from src/main/java/ti4/commands/ds/SteelBalanceCount.java rename to src/main/java/ti4/discord/interactions/commands/ds/SteelBalanceCount.java index d735b3c8db..3d3e1c9ac5 100644 --- a/src/main/java/ti4/commands/ds/SteelBalanceCount.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/SteelBalanceCount.java @@ -1,9 +1,9 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/ds/TrapReveal.java b/src/main/java/ti4/discord/interactions/commands/ds/TrapReveal.java similarity index 94% rename from src/main/java/ti4/commands/ds/TrapReveal.java rename to src/main/java/ti4/discord/interactions/commands/ds/TrapReveal.java index 9e6307dd84..57cabbf2d8 100644 --- a/src/main/java/ti4/commands/ds/TrapReveal.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/TrapReveal.java @@ -1,10 +1,10 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import java.util.Collection; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/ds/TrapSwap.java b/src/main/java/ti4/discord/interactions/commands/ds/TrapSwap.java similarity index 97% rename from src/main/java/ti4/commands/ds/TrapSwap.java rename to src/main/java/ti4/discord/interactions/commands/ds/TrapSwap.java index d1a77d9011..937348b5c0 100644 --- a/src/main/java/ti4/commands/ds/TrapSwap.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/TrapSwap.java @@ -1,11 +1,11 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import java.util.Map; import javax.annotation.Nullable; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/ds/TrapToken.java b/src/main/java/ti4/discord/interactions/commands/ds/TrapToken.java similarity index 94% rename from src/main/java/ti4/commands/ds/TrapToken.java rename to src/main/java/ti4/discord/interactions/commands/ds/TrapToken.java index 0806896ca1..a603e59d0a 100644 --- a/src/main/java/ti4/commands/ds/TrapToken.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/TrapToken.java @@ -1,11 +1,11 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import java.util.Collection; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/ds/ZelianHero.java b/src/main/java/ti4/discord/interactions/commands/ds/ZelianHero.java similarity index 97% rename from src/main/java/ti4/commands/ds/ZelianHero.java rename to src/main/java/ti4/discord/interactions/commands/ds/ZelianHero.java index 5c92bfeb43..486b7f8da7 100644 --- a/src/main/java/ti4/commands/ds/ZelianHero.java +++ b/src/main/java/ti4/discord/interactions/commands/ds/ZelianHero.java @@ -1,11 +1,11 @@ -package ti4.commands.ds; +package ti4.discord.interactions.commands.ds; import java.util.List; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Planet; diff --git a/src/main/java/ti4/commands/event/AddEvent.java b/src/main/java/ti4/discord/interactions/commands/event/AddEvent.java similarity index 91% rename from src/main/java/ti4/commands/event/AddEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/AddEvent.java index 67069a1999..af67834b8a 100644 --- a/src/main/java/ti4/commands/event/AddEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/AddEvent.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/event/DrawEvent.java b/src/main/java/ti4/discord/interactions/commands/event/DrawEvent.java similarity index 89% rename from src/main/java/ti4/commands/event/DrawEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/DrawEvent.java index a9381a7951..e2cd757761 100644 --- a/src/main/java/ti4/commands/event/DrawEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/DrawEvent.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/event/EventCommand.java b/src/main/java/ti4/discord/interactions/commands/event/EventCommand.java similarity index 88% rename from src/main/java/ti4/commands/event/EventCommand.java rename to src/main/java/ti4/discord/interactions/commands/event/EventCommand.java index 05fd34630e..107866415b 100644 --- a/src/main/java/ti4/commands/event/EventCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/event/EventCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class EventCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/event/EventInfo.java b/src/main/java/ti4/discord/interactions/commands/event/EventInfo.java similarity index 93% rename from src/main/java/ti4/commands/event/EventInfo.java rename to src/main/java/ti4/discord/interactions/commands/event/EventInfo.java index 0df07953dd..c0c15472b8 100644 --- a/src/main/java/ti4/commands/event/EventInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/event/EventInfo.java @@ -1,11 +1,11 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/event/LookAtBottomEvent.java b/src/main/java/ti4/discord/interactions/commands/event/LookAtBottomEvent.java similarity index 95% rename from src/main/java/ti4/commands/event/LookAtBottomEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/LookAtBottomEvent.java index ed60400b75..93f1901a89 100644 --- a/src/main/java/ti4/commands/event/LookAtBottomEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/LookAtBottomEvent.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/event/LookAtTopEvent.java b/src/main/java/ti4/discord/interactions/commands/event/LookAtTopEvent.java similarity index 95% rename from src/main/java/ti4/commands/event/LookAtTopEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/LookAtTopEvent.java index 1fbc750ab8..28ff8b82de 100644 --- a/src/main/java/ti4/commands/event/LookAtTopEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/LookAtTopEvent.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/event/PlayEvent.java b/src/main/java/ti4/discord/interactions/commands/event/PlayEvent.java similarity index 96% rename from src/main/java/ti4/commands/event/PlayEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/PlayEvent.java index d094c0c1ca..bf8dbc49e5 100644 --- a/src/main/java/ti4/commands/event/PlayEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/PlayEvent.java @@ -1,4 +1,4 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import java.util.Map; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; @@ -8,7 +8,7 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/event/PutDiscardBackIntoDeckEvents.java b/src/main/java/ti4/discord/interactions/commands/event/PutDiscardBackIntoDeckEvents.java similarity index 94% rename from src/main/java/ti4/commands/event/PutDiscardBackIntoDeckEvents.java rename to src/main/java/ti4/discord/interactions/commands/event/PutDiscardBackIntoDeckEvents.java index d9543fd744..05b48d5b1a 100644 --- a/src/main/java/ti4/commands/event/PutDiscardBackIntoDeckEvents.java +++ b/src/main/java/ti4/discord/interactions/commands/event/PutDiscardBackIntoDeckEvents.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/event/PutEventBottom.java b/src/main/java/ti4/discord/interactions/commands/event/PutEventBottom.java similarity index 92% rename from src/main/java/ti4/commands/event/PutEventBottom.java rename to src/main/java/ti4/discord/interactions/commands/event/PutEventBottom.java index b73627d36e..245dfeb480 100644 --- a/src/main/java/ti4/commands/event/PutEventBottom.java +++ b/src/main/java/ti4/discord/interactions/commands/event/PutEventBottom.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/event/PutEventTop.java b/src/main/java/ti4/discord/interactions/commands/event/PutEventTop.java similarity index 92% rename from src/main/java/ti4/commands/event/PutEventTop.java rename to src/main/java/ti4/discord/interactions/commands/event/PutEventTop.java index e9485fd23b..7e4355d111 100644 --- a/src/main/java/ti4/commands/event/PutEventTop.java +++ b/src/main/java/ti4/discord/interactions/commands/event/PutEventTop.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/event/RemoveEvent.java b/src/main/java/ti4/discord/interactions/commands/event/RemoveEvent.java similarity index 91% rename from src/main/java/ti4/commands/event/RemoveEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/RemoveEvent.java index a01a6a60ea..0109b78072 100644 --- a/src/main/java/ti4/commands/event/RemoveEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/RemoveEvent.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/event/ResetEvents.java b/src/main/java/ti4/discord/interactions/commands/event/ResetEvents.java similarity index 92% rename from src/main/java/ti4/commands/event/ResetEvents.java rename to src/main/java/ti4/discord/interactions/commands/event/ResetEvents.java index 23b6cfa0a5..116f80092e 100644 --- a/src/main/java/ti4/commands/event/ResetEvents.java +++ b/src/main/java/ti4/discord/interactions/commands/event/ResetEvents.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/event/RevealEvent.java b/src/main/java/ti4/discord/interactions/commands/event/RevealEvent.java similarity index 93% rename from src/main/java/ti4/commands/event/RevealEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/RevealEvent.java index 4092cefed8..d261811bd6 100644 --- a/src/main/java/ti4/commands/event/RevealEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/RevealEvent.java @@ -1,9 +1,9 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.EventHelper; diff --git a/src/main/java/ti4/commands/event/RevealSpecificEvent.java b/src/main/java/ti4/discord/interactions/commands/event/RevealSpecificEvent.java similarity index 95% rename from src/main/java/ti4/commands/event/RevealSpecificEvent.java rename to src/main/java/ti4/discord/interactions/commands/event/RevealSpecificEvent.java index a8b0686846..e252f9fd80 100644 --- a/src/main/java/ti4/commands/event/RevealSpecificEvent.java +++ b/src/main/java/ti4/discord/interactions/commands/event/RevealSpecificEvent.java @@ -1,4 +1,4 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/event/ShowDiscardedEvents.java b/src/main/java/ti4/discord/interactions/commands/event/ShowDiscardedEvents.java similarity index 90% rename from src/main/java/ti4/commands/event/ShowDiscardedEvents.java rename to src/main/java/ti4/discord/interactions/commands/event/ShowDiscardedEvents.java index f4b17c8536..052c9e5fc5 100644 --- a/src/main/java/ti4/commands/event/ShowDiscardedEvents.java +++ b/src/main/java/ti4/discord/interactions/commands/event/ShowDiscardedEvents.java @@ -1,8 +1,8 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import java.util.Map.Entry; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.image.Mapper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/event/ShuffleEvents.java b/src/main/java/ti4/discord/interactions/commands/event/ShuffleEvents.java similarity index 91% rename from src/main/java/ti4/commands/event/ShuffleEvents.java rename to src/main/java/ti4/discord/interactions/commands/event/ShuffleEvents.java index 564d273937..cc650b196d 100644 --- a/src/main/java/ti4/commands/event/ShuffleEvents.java +++ b/src/main/java/ti4/discord/interactions/commands/event/ShuffleEvents.java @@ -1,10 +1,10 @@ -package ti4.commands.event; +package ti4.discord.interactions.commands.event; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreCommand.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreCommand.java similarity index 88% rename from src/main/java/ti4/commands/explore/ExploreCommand.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreCommand.java index a7d0065094..5076848c7b 100644 --- a/src/main/java/ti4/commands/explore/ExploreCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class ExploreCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/explore/ExploreDiscardFragment.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreDiscardFragment.java similarity index 96% rename from src/main/java/ti4/commands/explore/ExploreDiscardFragment.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreDiscardFragment.java index ef95042d9c..78c62b2495 100644 --- a/src/main/java/ti4/commands/explore/ExploreDiscardFragment.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreDiscardFragment.java @@ -1,4 +1,4 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/explore/ExploreDiscardFromDeck.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreDiscardFromDeck.java similarity index 94% rename from src/main/java/ti4/commands/explore/ExploreDiscardFromDeck.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreDiscardFromDeck.java index 647bf413ec..ec21209146 100644 --- a/src/main/java/ti4/commands/explore/ExploreDiscardFromDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreDiscardFromDeck.java @@ -1,9 +1,9 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.PatternHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreDrawAndDiscard.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreDrawAndDiscard.java similarity index 94% rename from src/main/java/ti4/commands/explore/ExploreDrawAndDiscard.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreDrawAndDiscard.java index 421c1f3dc1..a026402cbf 100644 --- a/src/main/java/ti4/commands/explore/ExploreDrawAndDiscard.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreDrawAndDiscard.java @@ -1,10 +1,10 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/explore/ExploreFrontier.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreFrontier.java similarity index 95% rename from src/main/java/ti4/commands/explore/ExploreFrontier.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreFrontier.java index bd9a1f63ca..8c9550d0f2 100644 --- a/src/main/java/ti4/commands/explore/ExploreFrontier.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreFrontier.java @@ -1,10 +1,10 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.ButtonHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreInfo.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreInfo.java similarity index 93% rename from src/main/java/ti4/commands/explore/ExploreInfo.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreInfo.java index 65d9204e94..7623790e50 100644 --- a/src/main/java/ti4/commands/explore/ExploreInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreInfo.java @@ -1,4 +1,4 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.explore.ExploreService; diff --git a/src/main/java/ti4/commands/explore/ExploreLookAtTop.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreLookAtTop.java similarity index 95% rename from src/main/java/ti4/commands/explore/ExploreLookAtTop.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreLookAtTop.java index b931c9b689..4af41f4417 100644 --- a/src/main/java/ti4/commands/explore/ExploreLookAtTop.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreLookAtTop.java @@ -1,10 +1,10 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/explore/ExplorePlanet.java b/src/main/java/ti4/discord/interactions/commands/explore/ExplorePlanet.java similarity index 96% rename from src/main/java/ti4/commands/explore/ExplorePlanet.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExplorePlanet.java index 9f8fe9675a..e1efb43e3c 100644 --- a/src/main/java/ti4/commands/explore/ExplorePlanet.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExplorePlanet.java @@ -1,4 +1,4 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import java.util.Optional; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/explore/ExploreRemoveFromGame.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreRemoveFromGame.java similarity index 94% rename from src/main/java/ti4/commands/explore/ExploreRemoveFromGame.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreRemoveFromGame.java index 06ce2f070e..07ec2f58b4 100644 --- a/src/main/java/ti4/commands/explore/ExploreRemoveFromGame.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreRemoveFromGame.java @@ -1,9 +1,9 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.PatternHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreReset.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreReset.java similarity index 94% rename from src/main/java/ti4/commands/explore/ExploreReset.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreReset.java index d02a3c3616..01e0c33bd2 100644 --- a/src/main/java/ti4/commands/explore/ExploreReset.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreReset.java @@ -1,10 +1,10 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreShuffle.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffle.java similarity index 84% rename from src/main/java/ti4/commands/explore/ExploreShuffle.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffle.java index 3bae013596..7163528486 100644 --- a/src/main/java/ti4/commands/explore/ExploreShuffle.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffle.java @@ -1,7 +1,7 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreShuffleBackIntoDeck.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffleBackIntoDeck.java similarity index 94% rename from src/main/java/ti4/commands/explore/ExploreShuffleBackIntoDeck.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffleBackIntoDeck.java index 0be4c80f62..7ce13b0e93 100644 --- a/src/main/java/ti4/commands/explore/ExploreShuffleBackIntoDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffleBackIntoDeck.java @@ -1,9 +1,9 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.PatternHelper; diff --git a/src/main/java/ti4/commands/explore/ExploreShuffleIntoDeckFromHand.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffleIntoDeckFromHand.java similarity index 94% rename from src/main/java/ti4/commands/explore/ExploreShuffleIntoDeckFromHand.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffleIntoDeckFromHand.java index 91e3705de4..132615cc04 100644 --- a/src/main/java/ti4/commands/explore/ExploreShuffleIntoDeckFromHand.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreShuffleIntoDeckFromHand.java @@ -1,9 +1,9 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/explore/ExploreUse.java b/src/main/java/ti4/discord/interactions/commands/explore/ExploreUse.java similarity index 96% rename from src/main/java/ti4/commands/explore/ExploreUse.java rename to src/main/java/ti4/discord/interactions/commands/explore/ExploreUse.java index 91f33dbe75..65187c196b 100644 --- a/src/main/java/ti4/commands/explore/ExploreUse.java +++ b/src/main/java/ti4/discord/interactions/commands/explore/ExploreUse.java @@ -1,4 +1,4 @@ -package ti4.commands.explore; +package ti4.discord.interactions.commands.explore; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/fow/AddFogTile.java b/src/main/java/ti4/discord/interactions/commands/fow/AddFogTile.java similarity index 94% rename from src/main/java/ti4/commands/fow/AddFogTile.java rename to src/main/java/ti4/discord/interactions/commands/fow/AddFogTile.java index eb5bd0b197..71d9b69c22 100644 --- a/src/main/java/ti4/commands/fow/AddFogTile.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/AddFogTile.java @@ -1,4 +1,4 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import ti4.ResourceHelper; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.AliasHandler; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/fow/Announce.java b/src/main/java/ti4/discord/interactions/commands/fow/Announce.java similarity index 88% rename from src/main/java/ti4/commands/fow/Announce.java rename to src/main/java/ti4/discord/interactions/commands/fow/Announce.java index 9d514cc0c0..ed499bdddc 100644 --- a/src/main/java/ti4/commands/fow/Announce.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/Announce.java @@ -1,9 +1,9 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/fow/CheckChannels.java b/src/main/java/ti4/discord/interactions/commands/fow/CheckChannels.java similarity index 94% rename from src/main/java/ti4/commands/fow/CheckChannels.java rename to src/main/java/ti4/discord/interactions/commands/fow/CheckChannels.java index 69b031d6a1..946d7f7884 100644 --- a/src/main/java/ti4/commands/fow/CheckChannels.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/CheckChannels.java @@ -1,4 +1,4 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.Buttons; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.FoWHelper; diff --git a/src/main/java/ti4/commands/fow/CreateFoWGameButton.java b/src/main/java/ti4/discord/interactions/commands/fow/CreateFoWGameButton.java similarity index 95% rename from src/main/java/ti4/commands/fow/CreateFoWGameButton.java rename to src/main/java/ti4/discord/interactions/commands/fow/CreateFoWGameButton.java index 3630178b82..7468396043 100644 --- a/src/main/java/ti4/commands/fow/CreateFoWGameButton.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/CreateFoWGameButton.java @@ -1,4 +1,4 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import java.util.ArrayList; import java.util.List; @@ -10,13 +10,13 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.fow.CreateFoWGameService; import ti4.service.game.CreateGameService; -import ti4.spring.jda.JdaService; class CreateFoWGameButton extends Subcommand { diff --git a/src/main/java/ti4/commands/fow/FOWCommand.java b/src/main/java/ti4/discord/interactions/commands/fow/FOWCommand.java similarity index 87% rename from src/main/java/ti4/commands/fow/FOWCommand.java rename to src/main/java/ti4/discord/interactions/commands/fow/FOWCommand.java index 2bf87258ca..534b6d5b1c 100644 --- a/src/main/java/ti4/commands/fow/FOWCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/FOWCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class FOWCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/fow/FOWOptions.java b/src/main/java/ti4/discord/interactions/commands/fow/FOWOptions.java similarity index 81% rename from src/main/java/ti4/commands/fow/FOWOptions.java rename to src/main/java/ti4/discord/interactions/commands/fow/FOWOptions.java index b50f7b4c8a..55ffa69b07 100644 --- a/src/main/java/ti4/commands/fow/FOWOptions.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/FOWOptions.java @@ -1,7 +1,7 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.option.FOWOptionService; diff --git a/src/main/java/ti4/commands/fow/GMCommand.java b/src/main/java/ti4/discord/interactions/commands/fow/GMCommand.java similarity index 85% rename from src/main/java/ti4/commands/fow/GMCommand.java rename to src/main/java/ti4/discord/interactions/commands/fow/GMCommand.java index ad9303a87c..248e820d1b 100644 --- a/src/main/java/ti4/commands/fow/GMCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/GMCommand.java @@ -1,7 +1,7 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.message.MessageHelper; import ti4.service.fow.GMService; diff --git a/src/main/java/ti4/commands/fow/PingActivePlayer.java b/src/main/java/ti4/discord/interactions/commands/fow/PingActivePlayer.java similarity index 96% rename from src/main/java/ti4/commands/fow/PingActivePlayer.java rename to src/main/java/ti4/discord/interactions/commands/fow/PingActivePlayer.java index b6205a7142..3c46b44bef 100644 --- a/src/main/java/ti4/commands/fow/PingActivePlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/PingActivePlayer.java @@ -1,7 +1,7 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/fow/PingSystem.java b/src/main/java/ti4/discord/interactions/commands/fow/PingSystem.java similarity index 91% rename from src/main/java/ti4/commands/fow/PingSystem.java rename to src/main/java/ti4/discord/interactions/commands/fow/PingSystem.java index d1905a49dd..f65ae08d86 100644 --- a/src/main/java/ti4/commands/fow/PingSystem.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/PingSystem.java @@ -1,9 +1,9 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.FoWHelper; import ti4.image.PositionMapper; diff --git a/src/main/java/ti4/commands/fow/PrivateCommunicationsCheck.java b/src/main/java/ti4/discord/interactions/commands/fow/PrivateCommunicationsCheck.java similarity index 94% rename from src/main/java/ti4/commands/fow/PrivateCommunicationsCheck.java rename to src/main/java/ti4/discord/interactions/commands/fow/PrivateCommunicationsCheck.java index bf5012c018..1e76ba4bbf 100644 --- a/src/main/java/ti4/commands/fow/PrivateCommunicationsCheck.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/PrivateCommunicationsCheck.java @@ -1,8 +1,8 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/fow/RemoveFogTile.java b/src/main/java/ti4/discord/interactions/commands/fow/RemoveFogTile.java similarity index 93% rename from src/main/java/ti4/commands/fow/RemoveFogTile.java rename to src/main/java/ti4/discord/interactions/commands/fow/RemoveFogTile.java index a47cc45bda..6ae35d0120 100644 --- a/src/main/java/ti4/commands/fow/RemoveFogTile.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/RemoveFogTile.java @@ -1,4 +1,4 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import java.util.HashSet; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/fow/ShowGameAsPlayer.java b/src/main/java/ti4/discord/interactions/commands/fow/ShowGameAsPlayer.java similarity index 90% rename from src/main/java/ti4/commands/fow/ShowGameAsPlayer.java rename to src/main/java/ti4/discord/interactions/commands/fow/ShowGameAsPlayer.java index b63ae0eb16..7f17a4025e 100644 --- a/src/main/java/ti4/commands/fow/ShowGameAsPlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/ShowGameAsPlayer.java @@ -1,9 +1,9 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.ShowGameService; import ti4.service.fow.UserOverridenGenericInteractionCreateEvent; diff --git a/src/main/java/ti4/commands/fow/Whisper.java b/src/main/java/ti4/discord/interactions/commands/fow/Whisper.java similarity index 92% rename from src/main/java/ti4/commands/fow/Whisper.java rename to src/main/java/ti4/discord/interactions/commands/fow/Whisper.java index 3a5ae108e2..98c0249740 100644 --- a/src/main/java/ti4/commands/fow/Whisper.java +++ b/src/main/java/ti4/discord/interactions/commands/fow/Whisper.java @@ -1,11 +1,11 @@ -package ti4.commands.fow; +package ti4.discord.interactions.commands.fow; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/franken/AbilityAdd.java b/src/main/java/ti4/discord/interactions/commands/franken/AbilityAdd.java similarity index 91% rename from src/main/java/ti4/commands/franken/AbilityAdd.java rename to src/main/java/ti4/discord/interactions/commands/franken/AbilityAdd.java index b065812aba..b9f479d3e7 100644 --- a/src/main/java/ti4/commands/franken/AbilityAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/AbilityAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/AbilityAddRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/AbilityAddRemove.java similarity index 95% rename from src/main/java/ti4/commands/franken/AbilityAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/AbilityAddRemove.java index 2912b8067e..bd0296e300 100644 --- a/src/main/java/ti4/commands/franken/AbilityAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/AbilityAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/franken/AbilityRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/AbilityRemove.java similarity index 91% rename from src/main/java/ti4/commands/franken/AbilityRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/AbilityRemove.java index e8774d145c..3914f972d0 100644 --- a/src/main/java/ti4/commands/franken/AbilityRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/AbilityRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/ApplyDraftBags.java b/src/main/java/ti4/discord/interactions/commands/franken/ApplyDraftBags.java similarity index 92% rename from src/main/java/ti4/commands/franken/ApplyDraftBags.java rename to src/main/java/ti4/discord/interactions/commands/franken/ApplyDraftBags.java index 05c0fce615..a1fa123299 100644 --- a/src/main/java/ti4/commands/franken/ApplyDraftBags.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/ApplyDraftBags.java @@ -1,9 +1,9 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.draft.BagDraft; import ti4.game.Game; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/franken/BanFaction.java b/src/main/java/ti4/discord/interactions/commands/franken/BanFaction.java similarity index 95% rename from src/main/java/ti4/commands/franken/BanFaction.java rename to src/main/java/ti4/discord/interactions/commands/franken/BanFaction.java index f7d66c768e..0b5115ad0b 100644 --- a/src/main/java/ti4/commands/franken/BanFaction.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/BanFaction.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/franken/BreakthroughAdd.java b/src/main/java/ti4/discord/interactions/commands/franken/BreakthroughAdd.java similarity index 93% rename from src/main/java/ti4/commands/franken/BreakthroughAdd.java rename to src/main/java/ti4/discord/interactions/commands/franken/BreakthroughAdd.java index 64da4d99d7..d54819cfa9 100644 --- a/src/main/java/ti4/commands/franken/BreakthroughAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/BreakthroughAdd.java @@ -1,10 +1,10 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/franken/BreakthroughRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/BreakthroughRemove.java similarity index 93% rename from src/main/java/ti4/commands/franken/BreakthroughRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/BreakthroughRemove.java index e32d5a2152..4f9e1d5b66 100644 --- a/src/main/java/ti4/commands/franken/BreakthroughRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/BreakthroughRemove.java @@ -1,10 +1,10 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.thundersedge.BreakthroughCommandHelper; diff --git a/src/main/java/ti4/commands/franken/BuildMap.java b/src/main/java/ti4/discord/interactions/commands/franken/BuildMap.java similarity index 97% rename from src/main/java/ti4/commands/franken/BuildMap.java rename to src/main/java/ti4/discord/interactions/commands/franken/BuildMap.java index 896fbed070..c3c7c4da89 100644 --- a/src/main/java/ti4/commands/franken/BuildMap.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/BuildMap.java @@ -1,9 +1,9 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.draft.BagDraft; import ti4.draft.DraftBag; import ti4.draft.DraftCategory; diff --git a/src/main/java/ti4/commands/franken/DraftLimits.java b/src/main/java/ti4/discord/interactions/commands/franken/DraftLimits.java similarity index 96% rename from src/main/java/ti4/commands/franken/DraftLimits.java rename to src/main/java/ti4/discord/interactions/commands/franken/DraftLimits.java index cd13a2ee5f..f205b4b197 100644 --- a/src/main/java/ti4/commands/franken/DraftLimits.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/DraftLimits.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/franken/FactionTechAdd.java b/src/main/java/ti4/discord/interactions/commands/franken/FactionTechAdd.java similarity index 91% rename from src/main/java/ti4/commands/franken/FactionTechAdd.java rename to src/main/java/ti4/discord/interactions/commands/franken/FactionTechAdd.java index 948804a4d4..2cdc98ef5d 100644 --- a/src/main/java/ti4/commands/franken/FactionTechAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/FactionTechAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/FactionTechAddRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/FactionTechAddRemove.java similarity index 95% rename from src/main/java/ti4/commands/franken/FactionTechAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/FactionTechAddRemove.java index 81847cebb6..4feb769ce1 100644 --- a/src/main/java/ti4/commands/franken/FactionTechAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/FactionTechAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/franken/FactionTechRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/FactionTechRemove.java similarity index 92% rename from src/main/java/ti4/commands/franken/FactionTechRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/FactionTechRemove.java index a352323da4..c22478dd49 100644 --- a/src/main/java/ti4/commands/franken/FactionTechRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/FactionTechRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/FrankenCommand.java b/src/main/java/ti4/discord/interactions/commands/franken/FrankenCommand.java similarity index 89% rename from src/main/java/ti4/commands/franken/FrankenCommand.java rename to src/main/java/ti4/discord/interactions/commands/franken/FrankenCommand.java index 97cc62cb62..36029b0a77 100644 --- a/src/main/java/ti4/commands/franken/FrankenCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/FrankenCommand.java @@ -1,11 +1,11 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; -import ti4.commands.franken.ban.Ban; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.franken.ban.Ban; import ti4.helpers.Constants; public class FrankenCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/franken/FrankenEdit.java b/src/main/java/ti4/discord/interactions/commands/franken/FrankenEdit.java similarity index 97% rename from src/main/java/ti4/commands/franken/FrankenEdit.java rename to src/main/java/ti4/discord/interactions/commands/franken/FrankenEdit.java index fc266ce4f9..348cda9459 100644 --- a/src/main/java/ti4/commands/franken/FrankenEdit.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/FrankenEdit.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.Objects; import net.dv8tion.jda.api.entities.User; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.draft.DraftBag; import ti4.draft.DraftItem; import ti4.game.Game; diff --git a/src/main/java/ti4/commands/franken/FrankenViewCard.java b/src/main/java/ti4/discord/interactions/commands/franken/FrankenViewCard.java similarity index 90% rename from src/main/java/ti4/commands/franken/FrankenViewCard.java rename to src/main/java/ti4/discord/interactions/commands/franken/FrankenViewCard.java index cbaaeee852..2f140090d4 100644 --- a/src/main/java/ti4/commands/franken/FrankenViewCard.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/FrankenViewCard.java @@ -1,11 +1,11 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.components.container.Container; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.draft.DraftItem; import ti4.message.componentsV2.MessageV2Builder; diff --git a/src/main/java/ti4/commands/franken/LeaderAdd.java b/src/main/java/ti4/discord/interactions/commands/franken/LeaderAdd.java similarity index 94% rename from src/main/java/ti4/commands/franken/LeaderAdd.java rename to src/main/java/ti4/discord/interactions/commands/franken/LeaderAdd.java index c575ec7834..4530219c87 100644 --- a/src/main/java/ti4/commands/franken/LeaderAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/LeaderAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/LeaderAddRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/LeaderAddRemove.java similarity index 95% rename from src/main/java/ti4/commands/franken/LeaderAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/LeaderAddRemove.java index 3468426922..b72ac4fc23 100644 --- a/src/main/java/ti4/commands/franken/LeaderAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/LeaderAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/franken/LeaderRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/LeaderRemove.java similarity index 91% rename from src/main/java/ti4/commands/franken/LeaderRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/LeaderRemove.java index be8afc4ba9..9331b3ff86 100644 --- a/src/main/java/ti4/commands/franken/LeaderRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/LeaderRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/PNAdd.java b/src/main/java/ti4/discord/interactions/commands/franken/PNAdd.java similarity index 91% rename from src/main/java/ti4/commands/franken/PNAdd.java rename to src/main/java/ti4/discord/interactions/commands/franken/PNAdd.java index 858a3308c2..6c4349f8a1 100644 --- a/src/main/java/ti4/commands/franken/PNAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/PNAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/PNAddRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/PNAddRemove.java similarity index 94% rename from src/main/java/ti4/commands/franken/PNAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/PNAddRemove.java index 22ea6a1fa2..333bebea15 100644 --- a/src/main/java/ti4/commands/franken/PNAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/PNAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/franken/PNRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/PNRemove.java similarity index 91% rename from src/main/java/ti4/commands/franken/PNRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/PNRemove.java index 9f8a419830..149b5c421d 100644 --- a/src/main/java/ti4/commands/franken/PNRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/PNRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/SetFactionDisplayName.java b/src/main/java/ti4/discord/interactions/commands/franken/SetFactionDisplayName.java similarity index 93% rename from src/main/java/ti4/commands/franken/SetFactionDisplayName.java rename to src/main/java/ti4/discord/interactions/commands/franken/SetFactionDisplayName.java index a9a9abba52..df66739c64 100644 --- a/src/main/java/ti4/commands/franken/SetFactionDisplayName.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/SetFactionDisplayName.java @@ -1,10 +1,10 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/franken/SetFactionIcon.java b/src/main/java/ti4/discord/interactions/commands/franken/SetFactionIcon.java similarity index 96% rename from src/main/java/ti4/commands/franken/SetFactionIcon.java rename to src/main/java/ti4/discord/interactions/commands/franken/SetFactionIcon.java index 84ace11227..f2411d0497 100644 --- a/src/main/java/ti4/commands/franken/SetFactionIcon.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/SetFactionIcon.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.entities.emoji.CustomEmoji; import net.dv8tion.jda.api.entities.emoji.Emoji; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/franken/SetHomeSystemPosition.java b/src/main/java/ti4/discord/interactions/commands/franken/SetHomeSystemPosition.java similarity index 94% rename from src/main/java/ti4/commands/franken/SetHomeSystemPosition.java rename to src/main/java/ti4/discord/interactions/commands/franken/SetHomeSystemPosition.java index fde13d6c97..5a7d5f9c01 100644 --- a/src/main/java/ti4/commands/franken/SetHomeSystemPosition.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/SetHomeSystemPosition.java @@ -1,10 +1,10 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/franken/ShowFrankenBag.java b/src/main/java/ti4/discord/interactions/commands/franken/ShowFrankenBag.java similarity index 82% rename from src/main/java/ti4/commands/franken/ShowFrankenBag.java rename to src/main/java/ti4/discord/interactions/commands/franken/ShowFrankenBag.java index 73c382f6f0..d878ac278a 100644 --- a/src/main/java/ti4/commands/franken/ShowFrankenBag.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/ShowFrankenBag.java @@ -1,7 +1,7 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.franken.FrankenDraftBagService; diff --git a/src/main/java/ti4/commands/franken/ShowFrankenHand.java b/src/main/java/ti4/discord/interactions/commands/franken/ShowFrankenHand.java similarity index 81% rename from src/main/java/ti4/commands/franken/ShowFrankenHand.java rename to src/main/java/ti4/discord/interactions/commands/franken/ShowFrankenHand.java index df48563792..2f3194fae9 100644 --- a/src/main/java/ti4/commands/franken/ShowFrankenHand.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/ShowFrankenHand.java @@ -1,7 +1,7 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.franken.FrankenDraftBagService; diff --git a/src/main/java/ti4/commands/franken/StartFrankenDraft.java b/src/main/java/ti4/discord/interactions/commands/franken/StartFrankenDraft.java similarity index 96% rename from src/main/java/ti4/commands/franken/StartFrankenDraft.java rename to src/main/java/ti4/discord/interactions/commands/franken/StartFrankenDraft.java index c6c9db81c2..578d3b8207 100644 --- a/src/main/java/ti4/commands/franken/StartFrankenDraft.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/StartFrankenDraft.java @@ -1,10 +1,10 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.draft.FrankenDraft; import ti4.draft.InauguralSpliceFrankenDraft; import ti4.draft.OnePickFrankenDraft; diff --git a/src/main/java/ti4/commands/franken/UnitAdd.java b/src/main/java/ti4/discord/interactions/commands/franken/UnitAdd.java similarity index 95% rename from src/main/java/ti4/commands/franken/UnitAdd.java rename to src/main/java/ti4/discord/interactions/commands/franken/UnitAdd.java index 0f5b0d8b24..32d8881a01 100644 --- a/src/main/java/ti4/commands/franken/UnitAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/UnitAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/UnitAddRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/UnitAddRemove.java similarity index 95% rename from src/main/java/ti4/commands/franken/UnitAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/UnitAddRemove.java index 1dbd6b2a22..d54edaf2b1 100644 --- a/src/main/java/ti4/commands/franken/UnitAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/UnitAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/franken/UnitRemove.java b/src/main/java/ti4/discord/interactions/commands/franken/UnitRemove.java similarity index 91% rename from src/main/java/ti4/commands/franken/UnitRemove.java rename to src/main/java/ti4/discord/interactions/commands/franken/UnitRemove.java index 2596b96ae5..44ebb2446d 100644 --- a/src/main/java/ti4/commands/franken/UnitRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/UnitRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.franken; +package ti4.discord.interactions.commands.franken; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/franken/ban/Ban.java b/src/main/java/ti4/discord/interactions/commands/franken/ban/Ban.java similarity index 97% rename from src/main/java/ti4/commands/franken/ban/Ban.java rename to src/main/java/ti4/discord/interactions/commands/franken/ban/Ban.java index 9a856227ec..175861ba83 100644 --- a/src/main/java/ti4/commands/franken/ban/Ban.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/ban/Ban.java @@ -1,11 +1,11 @@ -package ti4.commands.franken.ban; +package ti4.discord.interactions.commands.franken.ban; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/franken/ban/BanService.java b/src/main/java/ti4/discord/interactions/commands/franken/ban/BanService.java similarity index 99% rename from src/main/java/ti4/commands/franken/ban/BanService.java rename to src/main/java/ti4/discord/interactions/commands/franken/ban/BanService.java index f379524262..a76ca6332f 100644 --- a/src/main/java/ti4/commands/franken/ban/BanService.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/ban/BanService.java @@ -1,4 +1,4 @@ -package ti4.commands.franken.ban; +package ti4.discord.interactions.commands.franken.ban; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/ti4/commands/franken/ban/IBanService.java b/src/main/java/ti4/discord/interactions/commands/franken/ban/IBanService.java similarity index 80% rename from src/main/java/ti4/commands/franken/ban/IBanService.java rename to src/main/java/ti4/discord/interactions/commands/franken/ban/IBanService.java index 1f603108df..5dd6d9422c 100644 --- a/src/main/java/ti4/commands/franken/ban/IBanService.java +++ b/src/main/java/ti4/discord/interactions/commands/franken/ban/IBanService.java @@ -1,4 +1,4 @@ -package ti4.commands.franken.ban; +package ti4.discord.interactions.commands.franken.ban; import ti4.game.Game; import ti4.service.franken.FrankenBanList; diff --git a/src/main/java/ti4/commands/game/AddPlayer.java b/src/main/java/ti4/discord/interactions/commands/game/AddPlayer.java similarity index 96% rename from src/main/java/ti4/commands/game/AddPlayer.java rename to src/main/java/ti4/discord/interactions/commands/game/AddPlayer.java index c46f43e50b..f2dcb33055 100644 --- a/src/main/java/ti4/commands/game/AddPlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/game/AddPlayer.java @@ -1,11 +1,11 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/game/CreateGameButton.java b/src/main/java/ti4/discord/interactions/commands/game/CreateGameButton.java similarity index 97% rename from src/main/java/ti4/commands/game/CreateGameButton.java rename to src/main/java/ti4/discord/interactions/commands/game/CreateGameButton.java index 6211130624..3816502631 100644 --- a/src/main/java/ti4/commands/game/CreateGameButton.java +++ b/src/main/java/ti4/discord/interactions/commands/game/CreateGameButton.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import java.util.List; @@ -12,8 +12,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.CreateGameService; diff --git a/src/main/java/ti4/commands/game/EliminatePlayer.java b/src/main/java/ti4/discord/interactions/commands/game/EliminatePlayer.java similarity index 92% rename from src/main/java/ti4/commands/game/EliminatePlayer.java rename to src/main/java/ti4/discord/interactions/commands/game/EliminatePlayer.java index 4d3c956444..c665cab487 100644 --- a/src/main/java/ti4/commands/game/EliminatePlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/game/EliminatePlayer.java @@ -1,11 +1,11 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; diff --git a/src/main/java/ti4/commands/game/GalacticEventsSetup.java b/src/main/java/ti4/discord/interactions/commands/game/GalacticEventsSetup.java similarity index 97% rename from src/main/java/ti4/commands/game/GalacticEventsSetup.java rename to src/main/java/ti4/discord/interactions/commands/game/GalacticEventsSetup.java index df84edc7f2..5e5f30bc3e 100644 --- a/src/main/java/ti4/commands/game/GalacticEventsSetup.java +++ b/src/main/java/ti4/discord/interactions/commands/game/GalacticEventsSetup.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.buttons.Buttons; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/game/GameCommand.java b/src/main/java/ti4/discord/interactions/commands/game/GameCommand.java similarity index 90% rename from src/main/java/ti4/commands/game/GameCommand.java rename to src/main/java/ti4/discord/interactions/commands/game/GameCommand.java index 7859dc32f7..83ab3ed202 100644 --- a/src/main/java/ti4/commands/game/GameCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/game/GameCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class GameCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/game/GameEnd.java b/src/main/java/ti4/discord/interactions/commands/game/GameEnd.java similarity index 95% rename from src/main/java/ti4/commands/game/GameEnd.java rename to src/main/java/ti4/discord/interactions/commands/game/GameEnd.java index 0d43565ca6..67088dc3fb 100644 --- a/src/main/java/ti4/commands/game/GameEnd.java +++ b/src/main/java/ti4/discord/interactions/commands/game/GameEnd.java @@ -1,11 +1,11 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/game/GameOptions.java b/src/main/java/ti4/discord/interactions/commands/game/GameOptions.java similarity index 81% rename from src/main/java/ti4/commands/game/GameOptions.java rename to src/main/java/ti4/discord/interactions/commands/game/GameOptions.java index d388824e1b..4e0edae682 100644 --- a/src/main/java/ti4/commands/game/GameOptions.java +++ b/src/main/java/ti4/discord/interactions/commands/game/GameOptions.java @@ -1,7 +1,7 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.option.GameOptionService; diff --git a/src/main/java/ti4/commands/game/Info.java b/src/main/java/ti4/discord/interactions/commands/game/Info.java similarity index 99% rename from src/main/java/ti4/commands/game/Info.java rename to src/main/java/ti4/discord/interactions/commands/game/Info.java index 1a1ca8f114..fc6a6ddca9 100644 --- a/src/main/java/ti4/commands/game/Info.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Info.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.List; import java.util.Map; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/game/Join.java b/src/main/java/ti4/discord/interactions/commands/game/Join.java similarity index 91% rename from src/main/java/ti4/commands/game/Join.java rename to src/main/java/ti4/discord/interactions/commands/game/Join.java index 7b546dbbd7..3d67b0fd96 100644 --- a/src/main/java/ti4/commands/game/Join.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Join.java @@ -1,10 +1,10 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/game/Leave.java b/src/main/java/ti4/discord/interactions/commands/game/Leave.java similarity index 92% rename from src/main/java/ti4/commands/game/Leave.java rename to src/main/java/ti4/discord/interactions/commands/game/Leave.java index 00f32227f7..0ebad3e495 100644 --- a/src/main/java/ti4/commands/game/Leave.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Leave.java @@ -1,9 +1,9 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/game/Observer.java b/src/main/java/ti4/discord/interactions/commands/game/Observer.java similarity index 98% rename from src/main/java/ti4/commands/game/Observer.java rename to src/main/java/ti4/discord/interactions/commands/game/Observer.java index fbc4666586..1bc48ca75e 100644 --- a/src/main/java/ti4/commands/game/Observer.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Observer.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.persistence.GameManager; import ti4.game.persistence.ManagedGame; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/game/Ping.java b/src/main/java/ti4/discord/interactions/commands/game/Ping.java similarity index 87% rename from src/main/java/ti4/commands/game/Ping.java rename to src/main/java/ti4/discord/interactions/commands/game/Ping.java index 7006a98abf..a1d16f18c6 100644 --- a/src/main/java/ti4/commands/game/Ping.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Ping.java @@ -1,8 +1,8 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/game/Replace.java b/src/main/java/ti4/discord/interactions/commands/game/Replace.java similarity index 97% rename from src/main/java/ti4/commands/game/Replace.java rename to src/main/java/ti4/discord/interactions/commands/game/Replace.java index f41ee3bc30..b7af2c660c 100644 --- a/src/main/java/ti4/commands/game/Replace.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Replace.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.LinkedHashMap; import java.util.List; @@ -18,10 +18,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.buttons.handlers.statistics.StatsTrackingButtonHandler; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.buttons.handlers.statistics.StatsTrackingButtonHandler; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; @@ -32,7 +33,6 @@ import ti4.service.milty.MiltyDraftDisplayService; import ti4.service.milty.MiltyDraftManager; import ti4.settings.users.UserSettingsManager; -import ti4.spring.jda.JdaService; class Replace extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/game/SCCount.java b/src/main/java/ti4/discord/interactions/commands/game/SCCount.java similarity index 92% rename from src/main/java/ti4/commands/game/SCCount.java rename to src/main/java/ti4/discord/interactions/commands/game/SCCount.java index 6d34e92d82..dd0d1042b4 100644 --- a/src/main/java/ti4/commands/game/SCCount.java +++ b/src/main/java/ti4/discord/interactions/commands/game/SCCount.java @@ -1,10 +1,10 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/game/SetDeck.java b/src/main/java/ti4/discord/interactions/commands/game/SetDeck.java similarity index 97% rename from src/main/java/ti4/commands/game/SetDeck.java rename to src/main/java/ti4/discord/interactions/commands/game/SetDeck.java index 687b6bdf63..6566590de2 100644 --- a/src/main/java/ti4/commands/game/SetDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/game/SetDeck.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import java.util.HashMap; @@ -10,7 +10,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.collections4.CollectionUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/game/SetOrder.java b/src/main/java/ti4/discord/interactions/commands/game/SetOrder.java similarity index 93% rename from src/main/java/ti4/commands/game/SetOrder.java rename to src/main/java/ti4/discord/interactions/commands/game/SetOrder.java index dee208599b..2b5c386c43 100644 --- a/src/main/java/ti4/commands/game/SetOrder.java +++ b/src/main/java/ti4/discord/interactions/commands/game/SetOrder.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.game.SetOrderService; diff --git a/src/main/java/ti4/commands/game/SetUnitCap.java b/src/main/java/ti4/discord/interactions/commands/game/SetUnitCap.java similarity index 95% rename from src/main/java/ti4/commands/game/SetUnitCap.java rename to src/main/java/ti4/discord/interactions/commands/game/SetUnitCap.java index 512e9d128a..f53a64fbcb 100644 --- a/src/main/java/ti4/commands/game/SetUnitCap.java +++ b/src/main/java/ti4/discord/interactions/commands/game/SetUnitCap.java @@ -1,9 +1,9 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.AliasHandler; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/game/Setup.java b/src/main/java/ti4/discord/interactions/commands/game/Setup.java similarity index 98% rename from src/main/java/ti4/commands/game/Setup.java rename to src/main/java/ti4/discord/interactions/commands/game/Setup.java index 12e0d7b368..a31379560f 100644 --- a/src/main/java/ti4/commands/game/Setup.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Setup.java @@ -1,10 +1,10 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/game/SetupGameChannels.java b/src/main/java/ti4/discord/interactions/commands/game/SetupGameChannels.java similarity index 98% rename from src/main/java/ti4/commands/game/SetupGameChannels.java rename to src/main/java/ti4/discord/interactions/commands/game/SetupGameChannels.java index 59d6bcb8cf..f0270ce0a5 100644 --- a/src/main/java/ti4/commands/game/SetupGameChannels.java +++ b/src/main/java/ti4/discord/interactions/commands/game/SetupGameChannels.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.ChannelType; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/game/StartPhase.java b/src/main/java/ti4/discord/interactions/commands/game/StartPhase.java similarity index 90% rename from src/main/java/ti4/commands/game/StartPhase.java rename to src/main/java/ti4/discord/interactions/commands/game/StartPhase.java index 1a631a93b0..d3f065f132 100644 --- a/src/main/java/ti4/commands/game/StartPhase.java +++ b/src/main/java/ti4/discord/interactions/commands/game/StartPhase.java @@ -1,10 +1,10 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.game.StartPhaseService; diff --git a/src/main/java/ti4/commands/game/StartScenario.java b/src/main/java/ti4/discord/interactions/commands/game/StartScenario.java similarity index 98% rename from src/main/java/ti4/commands/game/StartScenario.java rename to src/main/java/ti4/discord/interactions/commands/game/StartScenario.java index b505d7bce3..faf5bc7dfe 100644 --- a/src/main/java/ti4/commands/game/StartScenario.java +++ b/src/main/java/ti4/discord/interactions/commands/game/StartScenario.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; -import ti4.commands.player.AddAllianceMember; +import ti4.discord.interactions.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.player.AddAllianceMember; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/game/Swap.java b/src/main/java/ti4/discord/interactions/commands/game/Swap.java similarity index 93% rename from src/main/java/ti4/commands/game/Swap.java rename to src/main/java/ti4/discord/interactions/commands/game/Swap.java index 5e30fbd35e..a18b5d20aa 100644 --- a/src/main/java/ti4/commands/game/Swap.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Swap.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.Collection; import net.dv8tion.jda.api.entities.User; @@ -6,14 +6,14 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.SwapFactionService; -import ti4.spring.jda.JdaService; class Swap extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/game/Tags.java b/src/main/java/ti4/discord/interactions/commands/game/Tags.java similarity index 80% rename from src/main/java/ti4/commands/game/Tags.java rename to src/main/java/ti4/discord/interactions/commands/game/Tags.java index 7f89cc73c3..b7578e3b11 100644 --- a/src/main/java/ti4/commands/game/Tags.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Tags.java @@ -1,9 +1,9 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.Buttons; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.message.MessageHelper; class Tags extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/game/Undo.java b/src/main/java/ti4/discord/interactions/commands/game/Undo.java similarity index 95% rename from src/main/java/ti4/commands/game/Undo.java rename to src/main/java/ti4/discord/interactions/commands/game/Undo.java index 64b8c0be03..733e8edc5e 100644 --- a/src/main/java/ti4/commands/game/Undo.java +++ b/src/main/java/ti4/discord/interactions/commands/game/Undo.java @@ -1,10 +1,10 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/game/WeirdGameSetup.java b/src/main/java/ti4/discord/interactions/commands/game/WeirdGameSetup.java similarity index 99% rename from src/main/java/ti4/commands/game/WeirdGameSetup.java rename to src/main/java/ti4/discord/interactions/commands/game/WeirdGameSetup.java index 0e7e0d33ed..9dbcc41d98 100644 --- a/src/main/java/ti4/commands/game/WeirdGameSetup.java +++ b/src/main/java/ti4/discord/interactions/commands/game/WeirdGameSetup.java @@ -1,4 +1,4 @@ -package ti4.commands.game; +package ti4.discord.interactions.commands.game; import java.util.ArrayList; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/help/Absol.java b/src/main/java/ti4/discord/interactions/commands/help/Absol.java similarity index 76% rename from src/main/java/ti4/commands/help/Absol.java rename to src/main/java/ti4/discord/interactions/commands/help/Absol.java index bb6ad32294..867869211e 100644 --- a/src/main/java/ti4/commands/help/Absol.java +++ b/src/main/java/ti4/discord/interactions/commands/help/Absol.java @@ -1,7 +1,7 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; class Absol extends Subcommand { diff --git a/src/main/java/ti4/commands/help/DiscordantStars.java b/src/main/java/ti4/discord/interactions/commands/help/DiscordantStars.java similarity index 78% rename from src/main/java/ti4/commands/help/DiscordantStars.java rename to src/main/java/ti4/discord/interactions/commands/help/DiscordantStars.java index 42cc53085f..2619ae372a 100644 --- a/src/main/java/ti4/commands/help/DiscordantStars.java +++ b/src/main/java/ti4/discord/interactions/commands/help/DiscordantStars.java @@ -1,7 +1,7 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; class DiscordantStars extends Subcommand { diff --git a/src/main/java/ti4/commands/help/FoWHelp.java b/src/main/java/ti4/discord/interactions/commands/help/FoWHelp.java similarity index 76% rename from src/main/java/ti4/commands/help/FoWHelp.java rename to src/main/java/ti4/discord/interactions/commands/help/FoWHelp.java index 260fc690ee..f511493c9b 100644 --- a/src/main/java/ti4/commands/help/FoWHelp.java +++ b/src/main/java/ti4/discord/interactions/commands/help/FoWHelp.java @@ -1,7 +1,7 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; class FoWHelp extends Subcommand { diff --git a/src/main/java/ti4/commands/help/FoWPlusHelp.java b/src/main/java/ti4/discord/interactions/commands/help/FoWPlusHelp.java similarity index 81% rename from src/main/java/ti4/commands/help/FoWPlusHelp.java rename to src/main/java/ti4/discord/interactions/commands/help/FoWPlusHelp.java index d40789432f..453283b175 100644 --- a/src/main/java/ti4/commands/help/FoWPlusHelp.java +++ b/src/main/java/ti4/discord/interactions/commands/help/FoWPlusHelp.java @@ -1,9 +1,9 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; -import ti4.spring.jda.JdaService; class FoWPlusHelp extends Subcommand { diff --git a/src/main/java/ti4/commands/help/HelpAction.java b/src/main/java/ti4/discord/interactions/commands/help/HelpAction.java similarity index 87% rename from src/main/java/ti4/commands/help/HelpAction.java rename to src/main/java/ti4/discord/interactions/commands/help/HelpAction.java index b6f2b517c5..432da991cb 100644 --- a/src/main/java/ti4/commands/help/HelpAction.java +++ b/src/main/java/ti4/discord/interactions/commands/help/HelpAction.java @@ -1,7 +1,7 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/help/HelpCommand.java b/src/main/java/ti4/discord/interactions/commands/help/HelpCommand.java similarity index 91% rename from src/main/java/ti4/commands/help/HelpCommand.java rename to src/main/java/ti4/discord/interactions/commands/help/HelpCommand.java index 9d5259be52..a2e2e5af6f 100644 --- a/src/main/java/ti4/commands/help/HelpCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/help/HelpCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import java.nio.file.Files; import java.nio.file.Paths; @@ -7,8 +7,8 @@ import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import ti4.ResourceHelper; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/help/HowToMoveUnits.java b/src/main/java/ti4/discord/interactions/commands/help/HowToMoveUnits.java similarity index 98% rename from src/main/java/ti4/commands/help/HowToMoveUnits.java rename to src/main/java/ti4/discord/interactions/commands/help/HowToMoveUnits.java index 19d065999a..797bdb5d0d 100644 --- a/src/main/java/ti4/commands/help/HowToMoveUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/help/HowToMoveUnits.java @@ -1,10 +1,10 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.emoji.MiscEmojis; diff --git a/src/main/java/ti4/commands/help/HowToPlayTI4.java b/src/main/java/ti4/discord/interactions/commands/help/HowToPlayTI4.java similarity index 79% rename from src/main/java/ti4/commands/help/HowToPlayTI4.java rename to src/main/java/ti4/discord/interactions/commands/help/HowToPlayTI4.java index 68b50d1cdb..59b425138b 100644 --- a/src/main/java/ti4/commands/help/HowToPlayTI4.java +++ b/src/main/java/ti4/discord/interactions/commands/help/HowToPlayTI4.java @@ -1,7 +1,7 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; public class HowToPlayTI4 extends Subcommand { diff --git a/src/main/java/ti4/commands/help/Monuments.java b/src/main/java/ti4/discord/interactions/commands/help/Monuments.java similarity index 77% rename from src/main/java/ti4/commands/help/Monuments.java rename to src/main/java/ti4/discord/interactions/commands/help/Monuments.java index 1374dc310e..1357bc4da6 100644 --- a/src/main/java/ti4/commands/help/Monuments.java +++ b/src/main/java/ti4/discord/interactions/commands/help/Monuments.java @@ -1,7 +1,7 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; class Monuments extends Subcommand { diff --git a/src/main/java/ti4/commands/help/NewPlayerInfo.java b/src/main/java/ti4/discord/interactions/commands/help/NewPlayerInfo.java similarity index 88% rename from src/main/java/ti4/commands/help/NewPlayerInfo.java rename to src/main/java/ti4/discord/interactions/commands/help/NewPlayerInfo.java index 8578aeecc8..db553555b1 100644 --- a/src/main/java/ti4/commands/help/NewPlayerInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/help/NewPlayerInfo.java @@ -1,8 +1,8 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.CreateGameService; diff --git a/src/main/java/ti4/commands/help/SampleColors.java b/src/main/java/ti4/discord/interactions/commands/help/SampleColors.java similarity index 98% rename from src/main/java/ti4/commands/help/SampleColors.java rename to src/main/java/ti4/discord/interactions/commands/help/SampleColors.java index 29903e7700..fca67f0ab6 100644 --- a/src/main/java/ti4/commands/help/SampleColors.java +++ b/src/main/java/ti4/discord/interactions/commands/help/SampleColors.java @@ -1,4 +1,4 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import java.awt.BasicStroke; import java.awt.Color; @@ -15,7 +15,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import ti4.ResourceHelper; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.Storage; import ti4.image.DrawingUtil; diff --git a/src/main/java/ti4/commands/help/SampleDecals.java b/src/main/java/ti4/discord/interactions/commands/help/SampleDecals.java similarity index 98% rename from src/main/java/ti4/commands/help/SampleDecals.java rename to src/main/java/ti4/discord/interactions/commands/help/SampleDecals.java index 4a9d6e8bda..a6cc1ec3ca 100644 --- a/src/main/java/ti4/commands/help/SampleDecals.java +++ b/src/main/java/ti4/discord/interactions/commands/help/SampleDecals.java @@ -1,4 +1,4 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import java.awt.*; import java.awt.image.BufferedImage; @@ -12,7 +12,7 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.FileUpload; import ti4.ResourceHelper; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.Storage; import ti4.helpers.Units; diff --git a/src/main/java/ti4/commands/help/WhatsTIGL.java b/src/main/java/ti4/discord/interactions/commands/help/WhatsTIGL.java similarity index 89% rename from src/main/java/ti4/commands/help/WhatsTIGL.java rename to src/main/java/ti4/discord/interactions/commands/help/WhatsTIGL.java index 6801293abe..a66950abb2 100644 --- a/src/main/java/ti4/commands/help/WhatsTIGL.java +++ b/src/main/java/ti4/discord/interactions/commands/help/WhatsTIGL.java @@ -1,10 +1,10 @@ -package ti4.commands.help; +package ti4.discord.interactions.commands.help; import java.nio.file.Files; import java.nio.file.Paths; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.ResourceHelper; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; class WhatsTIGL extends Subcommand { diff --git a/src/main/java/ti4/commands/installation/AddSweepToken.java b/src/main/java/ti4/discord/interactions/commands/installation/AddSweepToken.java similarity index 92% rename from src/main/java/ti4/commands/installation/AddSweepToken.java rename to src/main/java/ti4/discord/interactions/commands/installation/AddSweepToken.java index abed16e831..e9498e2596 100644 --- a/src/main/java/ti4/commands/installation/AddSweepToken.java +++ b/src/main/java/ti4/discord/interactions/commands/installation/AddSweepToken.java @@ -1,10 +1,10 @@ -package ti4.commands.installation; +package ti4.discord.interactions.commands.installation; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/installation/InstallationCommand.java b/src/main/java/ti4/discord/interactions/commands/installation/InstallationCommand.java similarity index 80% rename from src/main/java/ti4/commands/installation/InstallationCommand.java rename to src/main/java/ti4/discord/interactions/commands/installation/InstallationCommand.java index 3a45c2c0ce..ca9da1b0d9 100644 --- a/src/main/java/ti4/commands/installation/InstallationCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/installation/InstallationCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.installation; +package ti4.discord.interactions.commands.installation; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class InstallationCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/installation/RemoveSweepToken.java b/src/main/java/ti4/discord/interactions/commands/installation/RemoveSweepToken.java similarity index 90% rename from src/main/java/ti4/commands/installation/RemoveSweepToken.java rename to src/main/java/ti4/discord/interactions/commands/installation/RemoveSweepToken.java index 27b8cd20f6..7ab05a4257 100644 --- a/src/main/java/ti4/commands/installation/RemoveSweepToken.java +++ b/src/main/java/ti4/discord/interactions/commands/installation/RemoveSweepToken.java @@ -1,10 +1,10 @@ -package ti4.commands.installation; +package ti4.discord.interactions.commands.installation; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Tile; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/leaders/ExhaustLeader.java b/src/main/java/ti4/discord/interactions/commands/leaders/ExhaustLeader.java similarity index 95% rename from src/main/java/ti4/commands/leaders/ExhaustLeader.java rename to src/main/java/ti4/discord/interactions/commands/leaders/ExhaustLeader.java index 7087174d87..5b5ff11078 100644 --- a/src/main/java/ti4/commands/leaders/ExhaustLeader.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/ExhaustLeader.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/leaders/HeroPlay.java b/src/main/java/ti4/discord/interactions/commands/leaders/HeroPlay.java similarity index 94% rename from src/main/java/ti4/commands/leaders/HeroPlay.java rename to src/main/java/ti4/discord/interactions/commands/leaders/HeroPlay.java index f4425a0a57..515baa44ca 100644 --- a/src/main/java/ti4/commands/leaders/HeroPlay.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/HeroPlay.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/leaders/HeroUnplay.java b/src/main/java/ti4/discord/interactions/commands/leaders/HeroUnplay.java similarity index 92% rename from src/main/java/ti4/commands/leaders/HeroUnplay.java rename to src/main/java/ti4/discord/interactions/commands/leaders/HeroUnplay.java index 398d25203d..e74d3594ef 100644 --- a/src/main/java/ti4/commands/leaders/HeroUnplay.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/HeroUnplay.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Leader; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/leaders/LeaderCommand.java b/src/main/java/ti4/discord/interactions/commands/leaders/LeaderCommand.java similarity index 85% rename from src/main/java/ti4/commands/leaders/LeaderCommand.java rename to src/main/java/ti4/discord/interactions/commands/leaders/LeaderCommand.java index b5f09fe1d7..3c51d61f3e 100644 --- a/src/main/java/ti4/commands/leaders/LeaderCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/LeaderCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class LeaderCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/leaders/LeaderInfo.java b/src/main/java/ti4/discord/interactions/commands/leaders/LeaderInfo.java similarity index 87% rename from src/main/java/ti4/commands/leaders/LeaderInfo.java rename to src/main/java/ti4/discord/interactions/commands/leaders/LeaderInfo.java index 9c8b21f6c3..6ebde78ed8 100644 --- a/src/main/java/ti4/commands/leaders/LeaderInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/LeaderInfo.java @@ -1,9 +1,9 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.info.LeaderInfoService; diff --git a/src/main/java/ti4/commands/leaders/LockLeader.java b/src/main/java/ti4/discord/interactions/commands/leaders/LockLeader.java similarity index 92% rename from src/main/java/ti4/commands/leaders/LockLeader.java rename to src/main/java/ti4/discord/interactions/commands/leaders/LockLeader.java index 82e9a9e1bb..2cb4a7141a 100644 --- a/src/main/java/ti4/commands/leaders/LockLeader.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/LockLeader.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Leader; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/leaders/PurgeLeader.java b/src/main/java/ti4/discord/interactions/commands/leaders/PurgeLeader.java similarity index 94% rename from src/main/java/ti4/commands/leaders/PurgeLeader.java rename to src/main/java/ti4/discord/interactions/commands/leaders/PurgeLeader.java index 9f0e8e3bd7..6e9ba6d74e 100644 --- a/src/main/java/ti4/commands/leaders/PurgeLeader.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/PurgeLeader.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Leader; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/leaders/RefreshLeader.java b/src/main/java/ti4/discord/interactions/commands/leaders/RefreshLeader.java similarity index 95% rename from src/main/java/ti4/commands/leaders/RefreshLeader.java rename to src/main/java/ti4/discord/interactions/commands/leaders/RefreshLeader.java index 1374b7de70..a4143114d5 100644 --- a/src/main/java/ti4/commands/leaders/RefreshLeader.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/RefreshLeader.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Leader; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/leaders/ResetLeader.java b/src/main/java/ti4/discord/interactions/commands/leaders/ResetLeader.java similarity index 88% rename from src/main/java/ti4/commands/leaders/ResetLeader.java rename to src/main/java/ti4/discord/interactions/commands/leaders/ResetLeader.java index 50397ec8bb..feb35d5c11 100644 --- a/src/main/java/ti4/commands/leaders/ResetLeader.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/ResetLeader.java @@ -1,9 +1,9 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/leaders/UnlockLeader.java b/src/main/java/ti4/discord/interactions/commands/leaders/UnlockLeader.java similarity index 90% rename from src/main/java/ti4/commands/leaders/UnlockLeader.java rename to src/main/java/ti4/discord/interactions/commands/leaders/UnlockLeader.java index 6780180f06..d602e51f72 100644 --- a/src/main/java/ti4/commands/leaders/UnlockLeader.java +++ b/src/main/java/ti4/discord/interactions/commands/leaders/UnlockLeader.java @@ -1,10 +1,10 @@ -package ti4.commands.leaders; +package ti4.discord.interactions.commands.leaders; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.leader.UnlockLeaderService; diff --git a/src/main/java/ti4/commands/map/AddAdjacencyOverride.java b/src/main/java/ti4/discord/interactions/commands/map/AddAdjacencyOverride.java similarity index 95% rename from src/main/java/ti4/commands/map/AddAdjacencyOverride.java rename to src/main/java/ti4/discord/interactions/commands/map/AddAdjacencyOverride.java index 1f5a1d420e..80f47412b0 100644 --- a/src/main/java/ti4/commands/map/AddAdjacencyOverride.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddAdjacencyOverride.java @@ -1,9 +1,9 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/map/AddAdjacencyOverrideList.java b/src/main/java/ti4/discord/interactions/commands/map/AddAdjacencyOverrideList.java similarity index 95% rename from src/main/java/ti4/commands/map/AddAdjacencyOverrideList.java rename to src/main/java/ti4/discord/interactions/commands/map/AddAdjacencyOverrideList.java index 25b3b32910..b41646f959 100644 --- a/src/main/java/ti4/commands/map/AddAdjacencyOverrideList.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddAdjacencyOverrideList.java @@ -1,9 +1,9 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/map/AddBorderAnomaly.java b/src/main/java/ti4/discord/interactions/commands/map/AddBorderAnomaly.java similarity index 96% rename from src/main/java/ti4/commands/map/AddBorderAnomaly.java rename to src/main/java/ti4/discord/interactions/commands/map/AddBorderAnomaly.java index 61d40d305c..fbc23ede5f 100644 --- a/src/main/java/ti4/commands/map/AddBorderAnomaly.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddBorderAnomaly.java @@ -1,11 +1,11 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.HashSet; import java.util.Set; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/map/AddCustomAdjacentTile.java b/src/main/java/ti4/discord/interactions/commands/map/AddCustomAdjacentTile.java similarity index 96% rename from src/main/java/ti4/commands/map/AddCustomAdjacentTile.java rename to src/main/java/ti4/discord/interactions/commands/map/AddCustomAdjacentTile.java index e206530a95..93bc6e41df 100644 --- a/src/main/java/ti4/commands/map/AddCustomAdjacentTile.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddCustomAdjacentTile.java @@ -1,4 +1,4 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.ArrayList; import java.util.Collections; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/map/AddTile.java b/src/main/java/ti4/discord/interactions/commands/map/AddTile.java similarity index 95% rename from src/main/java/ti4/commands/map/AddTile.java rename to src/main/java/ti4/discord/interactions/commands/map/AddTile.java index 13123f48bd..08d993af0d 100644 --- a/src/main/java/ti4/commands/map/AddTile.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddTile.java @@ -1,11 +1,11 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.Set; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import ti4.ResourceHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/map/AddTileList.java b/src/main/java/ti4/discord/interactions/commands/map/AddTileList.java similarity index 87% rename from src/main/java/ti4/commands/map/AddTileList.java rename to src/main/java/ti4/discord/interactions/commands/map/AddTileList.java index 801b5a34af..8ca08446ee 100644 --- a/src/main/java/ti4/commands/map/AddTileList.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddTileList.java @@ -1,9 +1,9 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.logging.BotLogger; import ti4.service.map.AddTileListService; diff --git a/src/main/java/ti4/commands/map/AddTileListRandom.java b/src/main/java/ti4/discord/interactions/commands/map/AddTileListRandom.java similarity index 96% rename from src/main/java/ti4/commands/map/AddTileListRandom.java rename to src/main/java/ti4/discord/interactions/commands/map/AddTileListRandom.java index 4d40ac440c..1ccb2c5616 100644 --- a/src/main/java/ti4/commands/map/AddTileListRandom.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddTileListRandom.java @@ -1,4 +1,4 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.ArrayList; import java.util.Collections; @@ -13,10 +13,10 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; +import ti4.discord.interactions.routing.ModalHandler; import ti4.game.Game; import ti4.helpers.Constants; -import ti4.listeners.annotations.ModalHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.Source.ComponentSource; diff --git a/src/main/java/ti4/commands/map/AddTileRandom.java b/src/main/java/ti4/discord/interactions/commands/map/AddTileRandom.java similarity index 97% rename from src/main/java/ti4/commands/map/AddTileRandom.java rename to src/main/java/ti4/discord/interactions/commands/map/AddTileRandom.java index f1206013cb..998e1cf7b0 100644 --- a/src/main/java/ti4/commands/map/AddTileRandom.java +++ b/src/main/java/ti4/discord/interactions/commands/map/AddTileRandom.java @@ -1,4 +1,4 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.ArrayList; import java.util.Collections; @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/map/CustomHyperlanes.java b/src/main/java/ti4/discord/interactions/commands/map/CustomHyperlanes.java similarity index 81% rename from src/main/java/ti4/commands/map/CustomHyperlanes.java rename to src/main/java/ti4/discord/interactions/commands/map/CustomHyperlanes.java index 7e613ebfb9..54c0649968 100644 --- a/src/main/java/ti4/commands/map/CustomHyperlanes.java +++ b/src/main/java/ti4/discord/interactions/commands/map/CustomHyperlanes.java @@ -1,7 +1,7 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.service.map.CustomHyperlaneService; class CustomHyperlanes extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/map/ExportToJson.java b/src/main/java/ti4/discord/interactions/commands/map/ExportToJson.java similarity index 96% rename from src/main/java/ti4/commands/map/ExportToJson.java rename to src/main/java/ti4/discord/interactions/commands/map/ExportToJson.java index e52e532c67..0ecee088ca 100644 --- a/src/main/java/ti4/commands/map/ExportToJson.java +++ b/src/main/java/ti4/discord/interactions/commands/map/ExportToJson.java @@ -1,4 +1,4 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.io.File; import java.io.FileWriter; @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.FileUpload; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.FoWHelper; diff --git a/src/main/java/ti4/commands/map/ImportFromJson.java b/src/main/java/ti4/discord/interactions/commands/map/ImportFromJson.java similarity index 92% rename from src/main/java/ti4/commands/map/ImportFromJson.java rename to src/main/java/ti4/discord/interactions/commands/map/ImportFromJson.java index add6f41583..471dd5fea8 100644 --- a/src/main/java/ti4/commands/map/ImportFromJson.java +++ b/src/main/java/ti4/discord/interactions/commands/map/ImportFromJson.java @@ -1,4 +1,4 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.components.label.Label; import net.dv8tion.jda.api.components.textinput.TextInput; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.modals.Modal; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.FoWHelper; diff --git a/src/main/java/ti4/commands/map/InitTspmap.java b/src/main/java/ti4/discord/interactions/commands/map/InitTspmap.java similarity index 93% rename from src/main/java/ti4/commands/map/InitTspmap.java rename to src/main/java/ti4/discord/interactions/commands/map/InitTspmap.java index a148b16895..eb40d4f29a 100644 --- a/src/main/java/ti4/commands/map/InitTspmap.java +++ b/src/main/java/ti4/discord/interactions/commands/map/InitTspmap.java @@ -1,9 +1,9 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/map/InteractiveBuilder.java b/src/main/java/ti4/discord/interactions/commands/map/InteractiveBuilder.java similarity index 85% rename from src/main/java/ti4/commands/map/InteractiveBuilder.java rename to src/main/java/ti4/discord/interactions/commands/map/InteractiveBuilder.java index e44351bb51..5d495ae336 100644 --- a/src/main/java/ti4/commands/map/InteractiveBuilder.java +++ b/src/main/java/ti4/discord/interactions/commands/map/InteractiveBuilder.java @@ -1,7 +1,7 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.async.JimboHandlers; diff --git a/src/main/java/ti4/commands/map/MapCommand.java b/src/main/java/ti4/discord/interactions/commands/map/MapCommand.java similarity index 91% rename from src/main/java/ti4/commands/map/MapCommand.java rename to src/main/java/ti4/discord/interactions/commands/map/MapCommand.java index 6a0f0f6bd5..c437071e99 100644 --- a/src/main/java/ti4/commands/map/MapCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/map/MapCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class MapCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/map/MoveTile.java b/src/main/java/ti4/discord/interactions/commands/map/MoveTile.java similarity index 93% rename from src/main/java/ti4/commands/map/MoveTile.java rename to src/main/java/ti4/discord/interactions/commands/map/MoveTile.java index 0525487a2a..bd136d9142 100644 --- a/src/main/java/ti4/commands/map/MoveTile.java +++ b/src/main/java/ti4/discord/interactions/commands/map/MoveTile.java @@ -1,10 +1,10 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/map/Preset.java b/src/main/java/ti4/discord/interactions/commands/map/Preset.java similarity index 91% rename from src/main/java/ti4/commands/map/Preset.java rename to src/main/java/ti4/discord/interactions/commands/map/Preset.java index 51f0afb3f6..c5bd91be59 100644 --- a/src/main/java/ti4/commands/map/Preset.java +++ b/src/main/java/ti4/discord/interactions/commands/map/Preset.java @@ -1,8 +1,8 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.map.MapPresetService; diff --git a/src/main/java/ti4/commands/map/PreviewMapTemplate.java b/src/main/java/ti4/discord/interactions/commands/map/PreviewMapTemplate.java similarity index 94% rename from src/main/java/ti4/commands/map/PreviewMapTemplate.java rename to src/main/java/ti4/discord/interactions/commands/map/PreviewMapTemplate.java index fa9ef84467..a73d4c8f43 100644 --- a/src/main/java/ti4/commands/map/PreviewMapTemplate.java +++ b/src/main/java/ti4/discord/interactions/commands/map/PreviewMapTemplate.java @@ -1,11 +1,11 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.MapTemplateHelper; diff --git a/src/main/java/ti4/commands/map/RemoveAdjacencyOverride.java b/src/main/java/ti4/discord/interactions/commands/map/RemoveAdjacencyOverride.java similarity index 93% rename from src/main/java/ti4/commands/map/RemoveAdjacencyOverride.java rename to src/main/java/ti4/discord/interactions/commands/map/RemoveAdjacencyOverride.java index 851b74a5dc..fe665ce822 100644 --- a/src/main/java/ti4/commands/map/RemoveAdjacencyOverride.java +++ b/src/main/java/ti4/discord/interactions/commands/map/RemoveAdjacencyOverride.java @@ -1,10 +1,10 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.image.PositionMapper; diff --git a/src/main/java/ti4/commands/map/RemoveBorderAnomaly.java b/src/main/java/ti4/discord/interactions/commands/map/RemoveBorderAnomaly.java similarity index 96% rename from src/main/java/ti4/commands/map/RemoveBorderAnomaly.java rename to src/main/java/ti4/discord/interactions/commands/map/RemoveBorderAnomaly.java index 81c19be8e1..1c381a5551 100644 --- a/src/main/java/ti4/commands/map/RemoveBorderAnomaly.java +++ b/src/main/java/ti4/discord/interactions/commands/map/RemoveBorderAnomaly.java @@ -1,11 +1,11 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.ArrayList; import java.util.Set; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/map/RemoveCustomAdjacentTile.java b/src/main/java/ti4/discord/interactions/commands/map/RemoveCustomAdjacentTile.java similarity index 93% rename from src/main/java/ti4/commands/map/RemoveCustomAdjacentTile.java rename to src/main/java/ti4/discord/interactions/commands/map/RemoveCustomAdjacentTile.java index 3c9c0e714f..a58aa08296 100644 --- a/src/main/java/ti4/commands/map/RemoveCustomAdjacentTile.java +++ b/src/main/java/ti4/discord/interactions/commands/map/RemoveCustomAdjacentTile.java @@ -1,10 +1,10 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.Helper; import ti4.image.PositionMapper; diff --git a/src/main/java/ti4/commands/map/RemoveTile.java b/src/main/java/ti4/discord/interactions/commands/map/RemoveTile.java similarity index 92% rename from src/main/java/ti4/commands/map/RemoveTile.java rename to src/main/java/ti4/discord/interactions/commands/map/RemoveTile.java index de8512d688..a958a23800 100644 --- a/src/main/java/ti4/commands/map/RemoveTile.java +++ b/src/main/java/ti4/discord/interactions/commands/map/RemoveTile.java @@ -1,10 +1,10 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import java.util.Set; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/map/SetMapTemplate.java b/src/main/java/ti4/discord/interactions/commands/map/SetMapTemplate.java similarity index 95% rename from src/main/java/ti4/commands/map/SetMapTemplate.java rename to src/main/java/ti4/discord/interactions/commands/map/SetMapTemplate.java index 8311b065b4..8ff3b18961 100644 --- a/src/main/java/ti4/commands/map/SetMapTemplate.java +++ b/src/main/java/ti4/discord/interactions/commands/map/SetMapTemplate.java @@ -1,10 +1,10 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/map/ShowMapSetup.java b/src/main/java/ti4/discord/interactions/commands/map/ShowMapSetup.java similarity index 88% rename from src/main/java/ti4/commands/map/ShowMapSetup.java rename to src/main/java/ti4/discord/interactions/commands/map/ShowMapSetup.java index 69fd4ce95d..271d4063f7 100644 --- a/src/main/java/ti4/commands/map/ShowMapSetup.java +++ b/src/main/java/ti4/discord/interactions/commands/map/ShowMapSetup.java @@ -1,9 +1,9 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.message.MessageHelper; class ShowMapSetup extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/map/ShowMapString.java b/src/main/java/ti4/discord/interactions/commands/map/ShowMapString.java similarity index 90% rename from src/main/java/ti4/commands/map/ShowMapString.java rename to src/main/java/ti4/discord/interactions/commands/map/ShowMapString.java index b2ce1d5f6e..aa194a29c8 100644 --- a/src/main/java/ti4/commands/map/ShowMapString.java +++ b/src/main/java/ti4/discord/interactions/commands/map/ShowMapString.java @@ -1,8 +1,8 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/map/SpawnFracture.java b/src/main/java/ti4/discord/interactions/commands/map/SpawnFracture.java similarity index 88% rename from src/main/java/ti4/commands/map/SpawnFracture.java rename to src/main/java/ti4/discord/interactions/commands/map/SpawnFracture.java index da46cb8446..bd961c018d 100644 --- a/src/main/java/ti4/commands/map/SpawnFracture.java +++ b/src/main/java/ti4/discord/interactions/commands/map/SpawnFracture.java @@ -1,9 +1,9 @@ -package ti4.commands.map; +package ti4.discord.interactions.commands.map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/milty/DebugMilty.java b/src/main/java/ti4/discord/interactions/commands/milty/DebugMilty.java similarity index 94% rename from src/main/java/ti4/commands/milty/DebugMilty.java rename to src/main/java/ti4/discord/interactions/commands/milty/DebugMilty.java index 6ae0c1649c..31aafe1db2 100644 --- a/src/main/java/ti4/commands/milty/DebugMilty.java +++ b/src/main/java/ti4/discord/interactions/commands/milty/DebugMilty.java @@ -1,10 +1,10 @@ -package ti4.commands.milty; +package ti4.discord.interactions.commands.milty; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.settingsFramework.menus.MiltySettings; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/milty/ForcePick.java b/src/main/java/ti4/discord/interactions/commands/milty/ForcePick.java similarity index 96% rename from src/main/java/ti4/commands/milty/ForcePick.java rename to src/main/java/ti4/discord/interactions/commands/milty/ForcePick.java index 63b89a69e3..850b013a7a 100644 --- a/src/main/java/ti4/commands/milty/ForcePick.java +++ b/src/main/java/ti4/discord/interactions/commands/milty/ForcePick.java @@ -1,10 +1,10 @@ -package ti4.commands.milty; +package ti4.discord.interactions.commands.milty; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/milty/MiltyCommand.java b/src/main/java/ti4/discord/interactions/commands/milty/MiltyCommand.java similarity index 81% rename from src/main/java/ti4/commands/milty/MiltyCommand.java rename to src/main/java/ti4/discord/interactions/commands/milty/MiltyCommand.java index 976e361482..2a94d42862 100644 --- a/src/main/java/ti4/commands/milty/MiltyCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/milty/MiltyCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.milty; +package ti4.discord.interactions.commands.milty; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class MiltyCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/milty/SetupMilty.java b/src/main/java/ti4/discord/interactions/commands/milty/SetupMilty.java similarity index 80% rename from src/main/java/ti4/commands/milty/SetupMilty.java rename to src/main/java/ti4/discord/interactions/commands/milty/SetupMilty.java index 55f46c1bdc..18e127ee32 100644 --- a/src/main/java/ti4/commands/milty/SetupMilty.java +++ b/src/main/java/ti4/discord/interactions/commands/milty/SetupMilty.java @@ -1,7 +1,7 @@ -package ti4.commands.milty; +package ti4.discord.interactions.commands.milty; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.service.milty.MiltyService; class SetupMilty extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/milty/ShowMilty.java b/src/main/java/ti4/discord/interactions/commands/milty/ShowMilty.java similarity index 85% rename from src/main/java/ti4/commands/milty/ShowMilty.java rename to src/main/java/ti4/discord/interactions/commands/milty/ShowMilty.java index 400594579a..c9de1d4a69 100644 --- a/src/main/java/ti4/commands/milty/ShowMilty.java +++ b/src/main/java/ti4/discord/interactions/commands/milty/ShowMilty.java @@ -1,7 +1,7 @@ -package ti4.commands.milty; +package ti4.discord.interactions.commands.milty; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.service.milty.MiltyDraftDisplayService; import ti4.service.milty.MiltyDraftManager; diff --git a/src/main/java/ti4/commands/milty/StartMilty.java b/src/main/java/ti4/discord/interactions/commands/milty/StartMilty.java similarity index 97% rename from src/main/java/ti4/commands/milty/StartMilty.java rename to src/main/java/ti4/discord/interactions/commands/milty/StartMilty.java index ab5b18e72e..018ee56cbd 100644 --- a/src/main/java/ti4/commands/milty/StartMilty.java +++ b/src/main/java/ti4/discord/interactions/commands/milty/StartMilty.java @@ -1,4 +1,4 @@ -package ti4.commands.milty; +package ti4.discord.interactions.commands.milty; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/omega_phase/AssignPlayerPriority.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/AssignPlayerPriority.java similarity index 94% rename from src/main/java/ti4/commands/omega_phase/AssignPlayerPriority.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/AssignPlayerPriority.java index 635006af3b..730c06c3ee 100644 --- a/src/main/java/ti4/commands/omega_phase/AssignPlayerPriority.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/AssignPlayerPriority.java @@ -1,9 +1,9 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.omega_phase.PriorityTrackHelper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/omega_phase/ClearPriorityTrack.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/ClearPriorityTrack.java similarity index 81% rename from src/main/java/ti4/commands/omega_phase/ClearPriorityTrack.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/ClearPriorityTrack.java index 9578682c3b..59c03711ad 100644 --- a/src/main/java/ti4/commands/omega_phase/ClearPriorityTrack.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/ClearPriorityTrack.java @@ -1,7 +1,7 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.omega_phase.PriorityTrackHelper; diff --git a/src/main/java/ti4/commands/omega_phase/ElectVoiceOfTheCouncil.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/ElectVoiceOfTheCouncil.java similarity index 89% rename from src/main/java/ti4/commands/omega_phase/ElectVoiceOfTheCouncil.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/ElectVoiceOfTheCouncil.java index c6da28baa3..e9a39abfd4 100644 --- a/src/main/java/ti4/commands/omega_phase/ElectVoiceOfTheCouncil.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/ElectVoiceOfTheCouncil.java @@ -1,9 +1,9 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.omega_phase.VoiceOfTheCouncilHelper; diff --git a/src/main/java/ti4/commands/omega_phase/OmegaPhaseCommand.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/OmegaPhaseCommand.java similarity index 84% rename from src/main/java/ti4/commands/omega_phase/OmegaPhaseCommand.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/OmegaPhaseCommand.java index 492bb7e599..ad326b2530 100644 --- a/src/main/java/ti4/commands/omega_phase/OmegaPhaseCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/OmegaPhaseCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class OmegaPhaseCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/omega_phase/PrintPriorityTrack.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/PrintPriorityTrack.java similarity index 81% rename from src/main/java/ti4/commands/omega_phase/PrintPriorityTrack.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/PrintPriorityTrack.java index 4f20a3dff7..1701eb682a 100644 --- a/src/main/java/ti4/commands/omega_phase/PrintPriorityTrack.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/PrintPriorityTrack.java @@ -1,7 +1,7 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.omega_phase.PriorityTrackHelper; diff --git a/src/main/java/ti4/commands/omega_phase/ResetObjectives.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/ResetObjectives.java similarity index 96% rename from src/main/java/ti4/commands/omega_phase/ResetObjectives.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/ResetObjectives.java index 7a8c45aa6b..f95a5249e2 100644 --- a/src/main/java/ti4/commands/omega_phase/ResetObjectives.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/ResetObjectives.java @@ -1,11 +1,11 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/omega_phase/ResetVoiceOfTheCouncil.java b/src/main/java/ti4/discord/interactions/commands/omega_phase/ResetVoiceOfTheCouncil.java similarity index 82% rename from src/main/java/ti4/commands/omega_phase/ResetVoiceOfTheCouncil.java rename to src/main/java/ti4/discord/interactions/commands/omega_phase/ResetVoiceOfTheCouncil.java index 341c3a75f6..63e28b6aec 100644 --- a/src/main/java/ti4/commands/omega_phase/ResetVoiceOfTheCouncil.java +++ b/src/main/java/ti4/discord/interactions/commands/omega_phase/ResetVoiceOfTheCouncil.java @@ -1,7 +1,7 @@ -package ti4.commands.omega_phase; +package ti4.discord.interactions.commands.omega_phase; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.omega_phase.VoiceOfTheCouncilHelper; diff --git a/src/main/java/ti4/commands/planet/PlanetAdd.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetAdd.java similarity index 91% rename from src/main/java/ti4/commands/planet/PlanetAdd.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetAdd.java index 58028deafb..132b2afc4a 100644 --- a/src/main/java/ti4/commands/planet/PlanetAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/commands/planet/PlanetAddRemove.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetAddRemove.java similarity index 98% rename from src/main/java/ti4/commands/planet/PlanetAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetAddRemove.java index bbd4ac0dd6..5d7f77e67b 100644 --- a/src/main/java/ti4/commands/planet/PlanetAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -11,7 +11,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/planet/PlanetCommand.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetCommand.java similarity index 86% rename from src/main/java/ti4/commands/planet/PlanetCommand.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetCommand.java index ab2bdf1a04..7346bc56e4 100644 --- a/src/main/java/ti4/commands/planet/PlanetCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class PlanetCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/planet/PlanetExhaust.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaust.java similarity index 96% rename from src/main/java/ti4/commands/planet/PlanetExhaust.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaust.java index 3509bc3810..aa156cdf0c 100644 --- a/src/main/java/ti4/commands/planet/PlanetExhaust.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaust.java @@ -1,4 +1,4 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/commands/planet/PlanetExhaustAbility.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaustAbility.java similarity index 99% rename from src/main/java/ti4/commands/planet/PlanetExhaustAbility.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaustAbility.java index e654d31e31..03a5579a5f 100644 --- a/src/main/java/ti4/commands/planet/PlanetExhaustAbility.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaustAbility.java @@ -1,11 +1,11 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/planet/PlanetExhaustAll.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaustAll.java similarity index 90% rename from src/main/java/ti4/commands/planet/PlanetExhaustAll.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaustAll.java index 144e813660..6619da0674 100644 --- a/src/main/java/ti4/commands/planet/PlanetExhaustAll.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetExhaustAll.java @@ -1,9 +1,9 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/planet/PlanetInfo.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetInfo.java similarity index 81% rename from src/main/java/ti4/commands/planet/PlanetInfo.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetInfo.java index 1579a1a520..2b07c50dbd 100644 --- a/src/main/java/ti4/commands/planet/PlanetInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.planet.PlanetInfoService; diff --git a/src/main/java/ti4/commands/planet/PlanetRefresh.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRefresh.java similarity index 93% rename from src/main/java/ti4/commands/planet/PlanetRefresh.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetRefresh.java index b48b0e48ff..db41034f09 100644 --- a/src/main/java/ti4/commands/planet/PlanetRefresh.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRefresh.java @@ -1,4 +1,4 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/planet/PlanetRefreshAbility.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRefreshAbility.java similarity index 93% rename from src/main/java/ti4/commands/planet/PlanetRefreshAbility.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetRefreshAbility.java index f94e30b0f2..b4adb2524e 100644 --- a/src/main/java/ti4/commands/planet/PlanetRefreshAbility.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRefreshAbility.java @@ -1,4 +1,4 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/planet/PlanetRefreshAll.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRefreshAll.java similarity index 90% rename from src/main/java/ti4/commands/planet/PlanetRefreshAll.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetRefreshAll.java index 7f76aab747..ee4ad701b5 100644 --- a/src/main/java/ti4/commands/planet/PlanetRefreshAll.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRefreshAll.java @@ -1,9 +1,9 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/planet/PlanetRemove.java b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRemove.java similarity index 96% rename from src/main/java/ti4/commands/planet/PlanetRemove.java rename to src/main/java/ti4/discord/interactions/commands/planet/PlanetRemove.java index de4d486033..383c6851ac 100644 --- a/src/main/java/ti4/commands/planet/PlanetRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/planet/PlanetRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.planet; +package ti4.discord.interactions.commands.planet; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import ti4.game.Game; diff --git a/src/main/java/ti4/commands/player/AbilityInfo.java b/src/main/java/ti4/discord/interactions/commands/player/AbilityInfo.java similarity index 81% rename from src/main/java/ti4/commands/player/AbilityInfo.java rename to src/main/java/ti4/discord/interactions/commands/player/AbilityInfo.java index df7d5943ba..6be498f7ff 100644 --- a/src/main/java/ti4/commands/player/AbilityInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/player/AbilityInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.info.AbilityInfoService; diff --git a/src/main/java/ti4/commands/player/AddAllianceMember.java b/src/main/java/ti4/discord/interactions/commands/player/AddAllianceMember.java similarity index 97% rename from src/main/java/ti4/commands/player/AddAllianceMember.java rename to src/main/java/ti4/discord/interactions/commands/player/AddAllianceMember.java index 86019c0281..bf76a5acb2 100644 --- a/src/main/java/ti4/commands/player/AddAllianceMember.java +++ b/src/main/java/ti4/discord/interactions/commands/player/AddAllianceMember.java @@ -1,11 +1,11 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/AddTeamMate.java b/src/main/java/ti4/discord/interactions/commands/player/AddTeamMate.java similarity index 93% rename from src/main/java/ti4/commands/player/AddTeamMate.java rename to src/main/java/ti4/discord/interactions/commands/player/AddTeamMate.java index bb225b821b..831415ad6d 100644 --- a/src/main/java/ti4/commands/player/AddTeamMate.java +++ b/src/main/java/ti4/discord/interactions/commands/player/AddTeamMate.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/CCsButton.java b/src/main/java/ti4/discord/interactions/commands/player/CCsButton.java similarity index 77% rename from src/main/java/ti4/commands/player/CCsButton.java rename to src/main/java/ti4/discord/interactions/commands/player/CCsButton.java index 92a3f1c969..cf9e91a12b 100644 --- a/src/main/java/ti4/commands/player/CCsButton.java +++ b/src/main/java/ti4/discord/interactions/commands/player/CCsButton.java @@ -1,8 +1,8 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; class CCsButton extends Subcommand { diff --git a/src/main/java/ti4/commands/player/ChangeColor.java b/src/main/java/ti4/discord/interactions/commands/player/ChangeColor.java similarity index 95% rename from src/main/java/ti4/commands/player/ChangeColor.java rename to src/main/java/ti4/discord/interactions/commands/player/ChangeColor.java index d8185d4993..6f0ddde5f3 100644 --- a/src/main/java/ti4/commands/player/ChangeColor.java +++ b/src/main/java/ti4/discord/interactions/commands/player/ChangeColor.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/player/ChangeUnitDecal.java b/src/main/java/ti4/discord/interactions/commands/player/ChangeUnitDecal.java similarity index 94% rename from src/main/java/ti4/commands/player/ChangeUnitDecal.java rename to src/main/java/ti4/discord/interactions/commands/player/ChangeUnitDecal.java index 927f45a01c..6950dabac4 100644 --- a/src/main/java/ti4/commands/player/ChangeUnitDecal.java +++ b/src/main/java/ti4/discord/interactions/commands/player/ChangeUnitDecal.java @@ -1,9 +1,9 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/player/ClearDebt.java b/src/main/java/ti4/discord/interactions/commands/player/ClearDebt.java similarity index 94% rename from src/main/java/ti4/commands/player/ClearDebt.java rename to src/main/java/ti4/discord/interactions/commands/player/ClearDebt.java index 3745bdf0b2..78f3c367f8 100644 --- a/src/main/java/ti4/commands/player/ClearDebt.java +++ b/src/main/java/ti4/discord/interactions/commands/player/ClearDebt.java @@ -1,11 +1,11 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/Pass.java b/src/main/java/ti4/discord/interactions/commands/player/Pass.java similarity index 90% rename from src/main/java/ti4/commands/player/Pass.java rename to src/main/java/ti4/discord/interactions/commands/player/Pass.java index 61f76ed924..6e4c4cf7d0 100644 --- a/src/main/java/ti4/commands/player/Pass.java +++ b/src/main/java/ti4/discord/interactions/commands/player/Pass.java @@ -1,9 +1,9 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/PlayerCommand.java b/src/main/java/ti4/discord/interactions/commands/player/PlayerCommand.java similarity index 90% rename from src/main/java/ti4/commands/player/PlayerCommand.java rename to src/main/java/ti4/discord/interactions/commands/player/PlayerCommand.java index 4fc3b3f7a6..4417f5b392 100644 --- a/src/main/java/ti4/commands/player/PlayerCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/player/PlayerCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class PlayerCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/player/RemoveAllianceMember.java b/src/main/java/ti4/discord/interactions/commands/player/RemoveAllianceMember.java similarity index 92% rename from src/main/java/ti4/commands/player/RemoveAllianceMember.java rename to src/main/java/ti4/discord/interactions/commands/player/RemoveAllianceMember.java index 3dc999eb8c..5526b5a1df 100644 --- a/src/main/java/ti4/commands/player/RemoveAllianceMember.java +++ b/src/main/java/ti4/discord/interactions/commands/player/RemoveAllianceMember.java @@ -1,17 +1,17 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; import ti4.logging.BotLogger; import ti4.message.MessageHelper; -import ti4.spring.jda.JdaService; class RemoveAllianceMember extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/player/RemoveTeamMate.java b/src/main/java/ti4/discord/interactions/commands/player/RemoveTeamMate.java similarity index 91% rename from src/main/java/ti4/commands/player/RemoveTeamMate.java rename to src/main/java/ti4/discord/interactions/commands/player/RemoveTeamMate.java index 157f1f0d89..4a8e94cfe3 100644 --- a/src/main/java/ti4/commands/player/RemoveTeamMate.java +++ b/src/main/java/ti4/discord/interactions/commands/player/RemoveTeamMate.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/player/SCPick.java b/src/main/java/ti4/discord/interactions/commands/player/SCPick.java similarity index 98% rename from src/main/java/ti4/commands/player/SCPick.java rename to src/main/java/ti4/discord/interactions/commands/player/SCPick.java index 76b5b684ba..19a414cb0e 100644 --- a/src/main/java/ti4/commands/player/SCPick.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SCPick.java @@ -1,4 +1,4 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.ArrayDeque; import java.util.Collection; @@ -10,7 +10,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/SCPlay.java b/src/main/java/ti4/discord/interactions/commands/player/SCPlay.java similarity index 95% rename from src/main/java/ti4/commands/player/SCPlay.java rename to src/main/java/ti4/discord/interactions/commands/player/SCPlay.java index c4e94d1e7c..e1a87f6b3a 100644 --- a/src/main/java/ti4/commands/player/SCPlay.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SCPlay.java @@ -1,4 +1,4 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.Collections; import java.util.Set; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/SCUnpick.java b/src/main/java/ti4/discord/interactions/commands/player/SCUnpick.java similarity index 93% rename from src/main/java/ti4/commands/player/SCUnpick.java rename to src/main/java/ti4/discord/interactions/commands/player/SCUnpick.java index cc0a296f7d..a46cf77ce4 100644 --- a/src/main/java/ti4/commands/player/SCUnpick.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SCUnpick.java @@ -1,4 +1,4 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/SCUnplay.java b/src/main/java/ti4/discord/interactions/commands/player/SCUnplay.java similarity index 95% rename from src/main/java/ti4/commands/player/SCUnplay.java rename to src/main/java/ti4/discord/interactions/commands/player/SCUnplay.java index 583cd6d336..dea3abb997 100644 --- a/src/main/java/ti4/commands/player/SCUnplay.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SCUnplay.java @@ -1,4 +1,4 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.Collections; import java.util.Set; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/SendCommodities.java b/src/main/java/ti4/discord/interactions/commands/player/SendCommodities.java similarity index 96% rename from src/main/java/ti4/commands/player/SendCommodities.java rename to src/main/java/ti4/discord/interactions/commands/player/SendCommodities.java index 1e7cdb1a62..11f94ed862 100644 --- a/src/main/java/ti4/commands/player/SendCommodities.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SendCommodities.java @@ -1,11 +1,11 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperAbilities; diff --git a/src/main/java/ti4/commands/player/SendDebt.java b/src/main/java/ti4/discord/interactions/commands/player/SendDebt.java similarity index 94% rename from src/main/java/ti4/commands/player/SendDebt.java rename to src/main/java/ti4/discord/interactions/commands/player/SendDebt.java index ef08fee036..13523bf431 100644 --- a/src/main/java/ti4/commands/player/SendDebt.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SendDebt.java @@ -1,11 +1,11 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/SendTG.java b/src/main/java/ti4/discord/interactions/commands/player/SendTG.java similarity index 95% rename from src/main/java/ti4/commands/player/SendTG.java rename to src/main/java/ti4/discord/interactions/commands/player/SendTG.java index a9df231af7..9750b8df39 100644 --- a/src/main/java/ti4/commands/player/SendTG.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SendTG.java @@ -1,11 +1,11 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperAbilities; diff --git a/src/main/java/ti4/commands/player/SetStatsAnchor.java b/src/main/java/ti4/discord/interactions/commands/player/SetStatsAnchor.java similarity index 93% rename from src/main/java/ti4/commands/player/SetStatsAnchor.java rename to src/main/java/ti4/discord/interactions/commands/player/SetStatsAnchor.java index 571d17a745..cfe89ebcaf 100644 --- a/src/main/java/ti4/commands/player/SetStatsAnchor.java +++ b/src/main/java/ti4/discord/interactions/commands/player/SetStatsAnchor.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.PositionMapper; diff --git a/src/main/java/ti4/commands/player/Setup.java b/src/main/java/ti4/discord/interactions/commands/player/Setup.java similarity index 96% rename from src/main/java/ti4/commands/player/Setup.java rename to src/main/java/ti4/discord/interactions/commands/player/Setup.java index eead7f97b6..a57375f6a3 100644 --- a/src/main/java/ti4/commands/player/Setup.java +++ b/src/main/java/ti4/discord/interactions/commands/player/Setup.java @@ -1,11 +1,11 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/player/Speaker.java b/src/main/java/ti4/discord/interactions/commands/player/Speaker.java similarity index 90% rename from src/main/java/ti4/commands/player/Speaker.java rename to src/main/java/ti4/discord/interactions/commands/player/Speaker.java index 3c73a1f90a..1f3938d607 100644 --- a/src/main/java/ti4/commands/player/Speaker.java +++ b/src/main/java/ti4/discord/interactions/commands/player/Speaker.java @@ -1,9 +1,9 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/Stats.java b/src/main/java/ti4/discord/interactions/commands/player/Stats.java similarity index 99% rename from src/main/java/ti4/commands/player/Stats.java rename to src/main/java/ti4/discord/interactions/commands/player/Stats.java index 74280d5238..4b32111ba3 100644 --- a/src/main/java/ti4/commands/player/Stats.java +++ b/src/main/java/ti4/discord/interactions/commands/player/Stats.java @@ -1,4 +1,4 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import java.util.ArrayList; import java.util.List; @@ -14,8 +14,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.AliasHandler; diff --git a/src/main/java/ti4/commands/player/TurnEnd.java b/src/main/java/ti4/discord/interactions/commands/player/TurnEnd.java similarity index 93% rename from src/main/java/ti4/commands/player/TurnEnd.java rename to src/main/java/ti4/discord/interactions/commands/player/TurnEnd.java index 58f6d9e43e..7fe6100ac3 100644 --- a/src/main/java/ti4/commands/player/TurnEnd.java +++ b/src/main/java/ti4/discord/interactions/commands/player/TurnEnd.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/TurnStart.java b/src/main/java/ti4/discord/interactions/commands/player/TurnStart.java similarity index 89% rename from src/main/java/ti4/commands/player/TurnStart.java rename to src/main/java/ti4/discord/interactions/commands/player/TurnStart.java index b665a05352..a5396b9f64 100644 --- a/src/main/java/ti4/commands/player/TurnStart.java +++ b/src/main/java/ti4/discord/interactions/commands/player/TurnStart.java @@ -1,9 +1,9 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/player/UnitInfo.java b/src/main/java/ti4/discord/interactions/commands/player/UnitInfo.java similarity index 90% rename from src/main/java/ti4/commands/player/UnitInfo.java rename to src/main/java/ti4/discord/interactions/commands/player/UnitInfo.java index b07592b37f..6b059097a1 100644 --- a/src/main/java/ti4/commands/player/UnitInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/player/UnitInfo.java @@ -1,10 +1,10 @@ -package ti4.commands.player; +package ti4.discord.interactions.commands.player; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.info.UnitInfoService; diff --git a/src/main/java/ti4/commands/relic/RelicAddBackIntoDeck.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicAddBackIntoDeck.java similarity index 92% rename from src/main/java/ti4/commands/relic/RelicAddBackIntoDeck.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicAddBackIntoDeck.java index 00bc22ef33..05e8f73b61 100644 --- a/src/main/java/ti4/commands/relic/RelicAddBackIntoDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicAddBackIntoDeck.java @@ -1,10 +1,10 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/relic/RelicAddCodexRelics.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicAddCodexRelics.java similarity index 94% rename from src/main/java/ti4/commands/relic/RelicAddCodexRelics.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicAddCodexRelics.java index 1b0fe907fd..149e8ee6f1 100644 --- a/src/main/java/ti4/commands/relic/RelicAddCodexRelics.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicAddCodexRelics.java @@ -1,9 +1,9 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.List; import java.util.regex.Pattern; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/relic/RelicBottom.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicBottom.java similarity index 93% rename from src/main/java/ti4/commands/relic/RelicBottom.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicBottom.java index 53a7dec7c5..12e7db6138 100644 --- a/src/main/java/ti4/commands/relic/RelicBottom.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicBottom.java @@ -1,10 +1,10 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/relic/RelicCommand.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicCommand.java similarity index 88% rename from src/main/java/ti4/commands/relic/RelicCommand.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicCommand.java index 83bb685d22..68ead5d55e 100644 --- a/src/main/java/ti4/commands/relic/RelicCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class RelicCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/relic/RelicDraw.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicDraw.java similarity index 86% rename from src/main/java/ti4/commands/relic/RelicDraw.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicDraw.java index 1d91d43160..d8f33c023c 100644 --- a/src/main/java/ti4/commands/relic/RelicDraw.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicDraw.java @@ -1,9 +1,9 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.RelicHelper; diff --git a/src/main/java/ti4/commands/relic/RelicDrawSpecific.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicDrawSpecific.java similarity index 95% rename from src/main/java/ti4/commands/relic/RelicDrawSpecific.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicDrawSpecific.java index 6f2b13595c..4ab85d0c71 100644 --- a/src/main/java/ti4/commands/relic/RelicDrawSpecific.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicDrawSpecific.java @@ -1,11 +1,11 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/relic/RelicExhaust.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicExhaust.java similarity index 92% rename from src/main/java/ti4/commands/relic/RelicExhaust.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicExhaust.java index 742ef63dec..d8af1f343e 100644 --- a/src/main/java/ti4/commands/relic/RelicExhaust.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicExhaust.java @@ -1,9 +1,9 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/relic/RelicInfo.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicInfo.java similarity index 81% rename from src/main/java/ti4/commands/relic/RelicInfo.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicInfo.java index 16e25c5a93..83f9d4e857 100644 --- a/src/main/java/ti4/commands/relic/RelicInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.info.RelicInfoService; diff --git a/src/main/java/ti4/commands/relic/RelicLookAtTop.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicLookAtTop.java similarity index 90% rename from src/main/java/ti4/commands/relic/RelicLookAtTop.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicLookAtTop.java index f9bc201d2f..0d59a17563 100644 --- a/src/main/java/ti4/commands/relic/RelicLookAtTop.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicLookAtTop.java @@ -1,8 +1,8 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/relic/RelicPurge.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicPurge.java similarity index 94% rename from src/main/java/ti4/commands/relic/RelicPurge.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicPurge.java index e1345924f7..7e39caf02a 100644 --- a/src/main/java/ti4/commands/relic/RelicPurge.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicPurge.java @@ -1,10 +1,10 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/relic/RelicPurgeFragments.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicPurgeFragments.java similarity index 98% rename from src/main/java/ti4/commands/relic/RelicPurgeFragments.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicPurgeFragments.java index 7cc4dda413..a3835c5c37 100644 --- a/src/main/java/ti4/commands/relic/RelicPurgeFragments.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicPurgeFragments.java @@ -1,4 +1,4 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/relic/RelicReady.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicReady.java similarity index 92% rename from src/main/java/ti4/commands/relic/RelicReady.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicReady.java index 7e231b54dd..56584be32c 100644 --- a/src/main/java/ti4/commands/relic/RelicReady.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicReady.java @@ -1,9 +1,9 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/relic/RelicSend.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicSend.java similarity index 92% rename from src/main/java/ti4/commands/relic/RelicSend.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicSend.java index 777c1fe3e8..a5c16fcb5d 100644 --- a/src/main/java/ti4/commands/relic/RelicSend.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicSend.java @@ -1,12 +1,12 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/relic/RelicSendFragments.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicSendFragments.java similarity index 91% rename from src/main/java/ti4/commands/relic/RelicSendFragments.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicSendFragments.java index 206fcdb070..1255ef9c4b 100644 --- a/src/main/java/ti4/commands/relic/RelicSendFragments.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicSendFragments.java @@ -1,10 +1,10 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperAbilities; diff --git a/src/main/java/ti4/commands/relic/RelicShowRemaining.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicShowRemaining.java similarity index 90% rename from src/main/java/ti4/commands/relic/RelicShowRemaining.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicShowRemaining.java index 459ed95511..03c4859324 100644 --- a/src/main/java/ti4/commands/relic/RelicShowRemaining.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicShowRemaining.java @@ -1,10 +1,10 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.RelicHelper; diff --git a/src/main/java/ti4/commands/relic/RelicShuffleBack.java b/src/main/java/ti4/discord/interactions/commands/relic/RelicShuffleBack.java similarity index 94% rename from src/main/java/ti4/commands/relic/RelicShuffleBack.java rename to src/main/java/ti4/discord/interactions/commands/relic/RelicShuffleBack.java index 500f060b5f..473ea980b9 100644 --- a/src/main/java/ti4/commands/relic/RelicShuffleBack.java +++ b/src/main/java/ti4/discord/interactions/commands/relic/RelicShuffleBack.java @@ -1,9 +1,9 @@ -package ti4.commands.relic; +package ti4.discord.interactions.commands.relic; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/rules/AskRulesQuestion.java b/src/main/java/ti4/discord/interactions/commands/rules/AskRulesQuestion.java similarity index 94% rename from src/main/java/ti4/commands/rules/AskRulesQuestion.java rename to src/main/java/ti4/discord/interactions/commands/rules/AskRulesQuestion.java index 74d7022290..9674cb87c3 100644 --- a/src/main/java/ti4/commands/rules/AskRulesQuestion.java +++ b/src/main/java/ti4/discord/interactions/commands/rules/AskRulesQuestion.java @@ -1,4 +1,4 @@ -package ti4.commands.rules; +package ti4.discord.interactions.commands.rules; import java.util.Collections; import java.util.List; @@ -7,10 +7,10 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.logging.BotLogger; import ti4.message.MessageHelper; -import ti4.spring.jda.JdaService; class AskRulesQuestion extends Subcommand { diff --git a/src/main/java/ti4/commands/rules/RulesCommand.java b/src/main/java/ti4/discord/interactions/commands/rules/RulesCommand.java similarity index 79% rename from src/main/java/ti4/commands/rules/RulesCommand.java rename to src/main/java/ti4/discord/interactions/commands/rules/RulesCommand.java index 2b86a53ff0..10ae4aa341 100644 --- a/src/main/java/ti4/commands/rules/RulesCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/rules/RulesCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.rules; +package ti4.discord.interactions.commands.rules; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; public class RulesCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/search/SearchAbilitiesSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchAbilitiesSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchAbilitiesSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchAbilitiesSubcommand.java index 5bb38628b1..9e91737abf 100644 --- a/src/main/java/ti4/commands/search/SearchAbilitiesSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchAbilitiesSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchActionCardsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchActionCardsSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchActionCardsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchActionCardsSubcommand.java index 342be525a9..5f7104597c 100644 --- a/src/main/java/ti4/commands/search/SearchActionCardsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchActionCardsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchAgendasSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchAgendasSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchAgendasSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchAgendasSubcommand.java index 1b655fea7e..144bf332e9 100644 --- a/src/main/java/ti4/commands/search/SearchAgendasSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchAgendasSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchAttachmentsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchAttachmentsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchAttachmentsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchAttachmentsSubcommand.java index a295d9b1a8..45e994668c 100644 --- a/src/main/java/ti4/commands/search/SearchAttachmentsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchAttachmentsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchBreakthroughs.java b/src/main/java/ti4/discord/interactions/commands/search/SearchBreakthroughs.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchBreakthroughs.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchBreakthroughs.java index b8940da2a1..a19246c2b6 100644 --- a/src/main/java/ti4/commands/search/SearchBreakthroughs.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchBreakthroughs.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchCommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchCommand.java similarity index 95% rename from src/main/java/ti4/commands/search/SearchCommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchCommand.java index d52b306bf7..f2a6ff5698 100644 --- a/src/main/java/ti4/commands/search/SearchCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class SearchCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/search/SearchCommand2.java b/src/main/java/ti4/discord/interactions/commands/search/SearchCommand2.java similarity index 90% rename from src/main/java/ti4/commands/search/SearchCommand2.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchCommand2.java index 0499ab9095..fc40cbdab9 100644 --- a/src/main/java/ti4/commands/search/SearchCommand2.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchCommand2.java @@ -1,10 +1,10 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class SearchCommand2 implements ParentCommand { diff --git a/src/main/java/ti4/commands/search/SearchCommandsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchCommandsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchCommandsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchCommandsSubcommand.java index f5ed6b7ff2..f2b36e7832 100644 --- a/src/main/java/ti4/commands/search/SearchCommandsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchCommandsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/search/SearchComponentModelSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchComponentModelSubcommand.java similarity index 87% rename from src/main/java/ti4/commands/search/SearchComponentModelSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchComponentModelSubcommand.java index 68b88d67a3..478519b571 100644 --- a/src/main/java/ti4/commands/search/SearchComponentModelSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchComponentModelSubcommand.java @@ -1,8 +1,8 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; abstract class SearchComponentModelSubcommand extends Subcommand { diff --git a/src/main/java/ti4/commands/search/SearchDecksSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchDecksSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchDecksSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchDecksSubcommand.java index 0d49b4d282..1ae2fc538c 100644 --- a/src/main/java/ti4/commands/search/SearchDecksSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchDecksSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchEmojis.java b/src/main/java/ti4/discord/interactions/commands/search/SearchEmojis.java similarity index 95% rename from src/main/java/ti4/commands/search/SearchEmojis.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchEmojis.java index eef1f3439c..76db20c052 100644 --- a/src/main/java/ti4/commands/search/SearchEmojis.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchEmojis.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.ArrayList; import java.util.Comparator; @@ -10,11 +10,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.emoji.TI4Emoji; -import ti4.spring.jda.JdaService; class SearchEmojis extends Subcommand { diff --git a/src/main/java/ti4/commands/search/SearchEventsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchEventsSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchEventsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchEventsSubcommand.java index 29118a3a69..4c2595a3dc 100644 --- a/src/main/java/ti4/commands/search/SearchEventsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchEventsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchExploresSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchExploresSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchExploresSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchExploresSubcommand.java index 0f928bfa07..6e1b7a3943 100644 --- a/src/main/java/ti4/commands/search/SearchExploresSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchExploresSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchFactionsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchFactionsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchFactionsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchFactionsSubcommand.java index 79de06d329..8d4c4fedaf 100644 --- a/src/main/java/ti4/commands/search/SearchFactionsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchFactionsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchForGame.java b/src/main/java/ti4/discord/interactions/commands/search/SearchForGame.java similarity index 91% rename from src/main/java/ti4/commands/search/SearchForGame.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchForGame.java index 17a75bc2f9..2bee65d5a5 100644 --- a/src/main/java/ti4/commands/search/SearchForGame.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchForGame.java @@ -1,9 +1,9 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/search/SearchGalacticEventsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchGalacticEventsSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchGalacticEventsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchGalacticEventsSubcommand.java index 561ec6133d..bf14aed55f 100644 --- a/src/main/java/ti4/commands/search/SearchGalacticEventsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchGalacticEventsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchGames.java b/src/main/java/ti4/discord/interactions/commands/search/SearchGames.java similarity index 99% rename from src/main/java/ti4/commands/search/SearchGames.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchGames.java index 397a307b7e..79998ebd36 100644 --- a/src/main/java/ti4/commands/search/SearchGames.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchGames.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.HashSet; import java.util.LinkedHashMap; @@ -12,7 +12,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; diff --git a/src/main/java/ti4/commands/search/SearchGenomesSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchGenomesSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchGenomesSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchGenomesSubcommand.java index 8c7f9cb17e..50ae00f825 100644 --- a/src/main/java/ti4/commands/search/SearchGenomesSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchGenomesSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchHelper.java b/src/main/java/ti4/discord/interactions/commands/search/SearchHelper.java similarity index 95% rename from src/main/java/ti4/commands/search/SearchHelper.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchHelper.java index c0036f63c8..5f3315bc03 100644 --- a/src/main/java/ti4/commands/search/SearchHelper.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchHelper.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import lombok.experimental.UtilityClass; diff --git a/src/main/java/ti4/commands/search/SearchLeadersSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchLeadersSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchLeadersSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchLeadersSubcommand.java index a7665975cb..5787824001 100644 --- a/src/main/java/ti4/commands/search/SearchLeadersSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchLeadersSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchMyGames.java b/src/main/java/ti4/discord/interactions/commands/search/SearchMyGames.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchMyGames.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchMyGames.java index 65c289d8a9..fc554bacea 100644 --- a/src/main/java/ti4/commands/search/SearchMyGames.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchMyGames.java @@ -1,11 +1,11 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.SearchGameHelper; import ti4.service.async.RoleService; diff --git a/src/main/java/ti4/commands/search/SearchMyTitles.java b/src/main/java/ti4/discord/interactions/commands/search/SearchMyTitles.java similarity index 91% rename from src/main/java/ti4/commands/search/SearchMyTitles.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchMyTitles.java index 11a16f4896..ad92075d4b 100644 --- a/src/main/java/ti4/commands/search/SearchMyTitles.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchMyTitles.java @@ -1,11 +1,11 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.TitlesHelper; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/search/SearchParadigmsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchParadigmsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchParadigmsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchParadigmsSubcommand.java index 67ef17bb13..c7a7d0dce2 100644 --- a/src/main/java/ti4/commands/search/SearchParadigmsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchParadigmsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchPlanetsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchPlanetsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchPlanetsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchPlanetsSubcommand.java index 1b79459c53..4e2089f948 100644 --- a/src/main/java/ti4/commands/search/SearchPlanetsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchPlanetsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchPromissoryNotesSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchPromissoryNotesSubcommand.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchPromissoryNotesSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchPromissoryNotesSubcommand.java index cbd3aa98a7..77ed9b7f44 100644 --- a/src/main/java/ti4/commands/search/SearchPromissoryNotesSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchPromissoryNotesSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchPublicObjectivesSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchPublicObjectivesSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchPublicObjectivesSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchPublicObjectivesSubcommand.java index 090bb9990f..bc6bf4c9de 100644 --- a/src/main/java/ti4/commands/search/SearchPublicObjectivesSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchPublicObjectivesSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchRelicsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchRelicsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchRelicsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchRelicsSubcommand.java index 2f1ddf3ec3..ddbe9b1c71 100644 --- a/src/main/java/ti4/commands/search/SearchRelicsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchRelicsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchRules.java b/src/main/java/ti4/discord/interactions/commands/search/SearchRules.java similarity index 96% rename from src/main/java/ti4/commands/search/SearchRules.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchRules.java index fcc730d03a..ca08348965 100644 --- a/src/main/java/ti4/commands/search/SearchRules.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchRules.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchSecretObjectivesSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchSecretObjectivesSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchSecretObjectivesSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchSecretObjectivesSubcommand.java index 5da06d050a..41e8001f1e 100644 --- a/src/main/java/ti4/commands/search/SearchSecretObjectivesSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchSecretObjectivesSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchSources.java b/src/main/java/ti4/discord/interactions/commands/search/SearchSources.java similarity index 99% rename from src/main/java/ti4/commands/search/SearchSources.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchSources.java index 46975d7776..bc8e239746 100644 --- a/src/main/java/ti4/commands/search/SearchSources.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchSources.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Arrays; import java.util.Collection; @@ -15,7 +15,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.image.Mapper; import ti4.logging.BotLogger; diff --git a/src/main/java/ti4/commands/search/SearchStrategyCardsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchStrategyCardsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchStrategyCardsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchStrategyCardsSubcommand.java index 41598e7675..da8a49e091 100644 --- a/src/main/java/ti4/commands/search/SearchStrategyCardsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchStrategyCardsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchTechsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchTechsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchTechsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchTechsSubcommand.java index 709b751532..7781cdbfaa 100644 --- a/src/main/java/ti4/commands/search/SearchTechsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchTechsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.List; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/ti4/commands/search/SearchTilesSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchTilesSubcommand.java similarity index 99% rename from src/main/java/ti4/commands/search/SearchTilesSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchTilesSubcommand.java index ca0054a72e..d76e4b1fd3 100644 --- a/src/main/java/ti4/commands/search/SearchTilesSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchTilesSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/main/java/ti4/commands/search/SearchTokensSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchTokensSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchTokensSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchTokensSubcommand.java index b96ce2033a..b1dc15592c 100644 --- a/src/main/java/ti4/commands/search/SearchTokensSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchTokensSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/search/SearchUnitsSubcommand.java b/src/main/java/ti4/discord/interactions/commands/search/SearchUnitsSubcommand.java similarity index 97% rename from src/main/java/ti4/commands/search/SearchUnitsSubcommand.java rename to src/main/java/ti4/discord/interactions/commands/search/SearchUnitsSubcommand.java index 9276ac9979..7970bf53d3 100644 --- a/src/main/java/ti4/commands/search/SearchUnitsSubcommand.java +++ b/src/main/java/ti4/discord/interactions/commands/search/SearchUnitsSubcommand.java @@ -1,4 +1,4 @@ -package ti4.commands.search; +package ti4.discord.interactions.commands.search; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/ti4/commands/special/AddFactionCCToFleetSupply.java b/src/main/java/ti4/discord/interactions/commands/special/AddFactionCCToFleetSupply.java similarity index 92% rename from src/main/java/ti4/commands/special/AddFactionCCToFleetSupply.java rename to src/main/java/ti4/discord/interactions/commands/special/AddFactionCCToFleetSupply.java index d9d2df8946..e03bb35aa1 100644 --- a/src/main/java/ti4/commands/special/AddFactionCCToFleetSupply.java +++ b/src/main/java/ti4/discord/interactions/commands/special/AddFactionCCToFleetSupply.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.List; import ti4.game.Game; diff --git a/src/main/java/ti4/commands/special/AddRemoveFactionCCToFromFleet.java b/src/main/java/ti4/discord/interactions/commands/special/AddRemoveFactionCCToFromFleet.java similarity index 91% rename from src/main/java/ti4/commands/special/AddRemoveFactionCCToFromFleet.java rename to src/main/java/ti4/discord/interactions/commands/special/AddRemoveFactionCCToFromFleet.java index 4578507130..14245e00dc 100644 --- a/src/main/java/ti4/commands/special/AddRemoveFactionCCToFromFleet.java +++ b/src/main/java/ti4/discord/interactions/commands/special/AddRemoveFactionCCToFromFleet.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.ArrayList; import java.util.List; @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/AdjustRoundNumber.java b/src/main/java/ti4/discord/interactions/commands/special/AdjustRoundNumber.java similarity index 86% rename from src/main/java/ti4/commands/special/AdjustRoundNumber.java rename to src/main/java/ti4/discord/interactions/commands/special/AdjustRoundNumber.java index 1ebbf82a7a..6be611c124 100644 --- a/src/main/java/ti4/commands/special/AdjustRoundNumber.java +++ b/src/main/java/ti4/discord/interactions/commands/special/AdjustRoundNumber.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/Bounties.java b/src/main/java/ti4/discord/interactions/commands/special/Bounties.java similarity index 79% rename from src/main/java/ti4/commands/special/Bounties.java rename to src/main/java/ti4/discord/interactions/commands/special/Bounties.java index 55f955e127..4ade0c4541 100644 --- a/src/main/java/ti4/commands/special/Bounties.java +++ b/src/main/java/ti4/discord/interactions/commands/special/Bounties.java @@ -1,8 +1,8 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.handlers.faction.other.zephyrion.ZephyrionBountyButtonHandler; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.buttons.handlers.faction.other.zephyrion.ZephyrionBountyButtonHandler; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/CheckAllDistance.java b/src/main/java/ti4/discord/interactions/commands/special/CheckAllDistance.java similarity index 96% rename from src/main/java/ti4/commands/special/CheckAllDistance.java rename to src/main/java/ti4/discord/interactions/commands/special/CheckAllDistance.java index 57f5ac4a3a..52532d267d 100644 --- a/src/main/java/ti4/commands/special/CheckAllDistance.java +++ b/src/main/java/ti4/discord/interactions/commands/special/CheckAllDistance.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.io.File; import java.io.PrintWriter; @@ -11,7 +11,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/special/CheckDistance.java b/src/main/java/ti4/discord/interactions/commands/special/CheckDistance.java similarity index 94% rename from src/main/java/ti4/commands/special/CheckDistance.java rename to src/main/java/ti4/discord/interactions/commands/special/CheckDistance.java index 80e4e214d3..4e62658c85 100644 --- a/src/main/java/ti4/commands/special/CheckDistance.java +++ b/src/main/java/ti4/discord/interactions/commands/special/CheckDistance.java @@ -1,11 +1,11 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/special/CloneGame.java b/src/main/java/ti4/discord/interactions/commands/special/CloneGame.java similarity index 88% rename from src/main/java/ti4/commands/special/CloneGame.java rename to src/main/java/ti4/discord/interactions/commands/special/CloneGame.java index 29cd92d312..fb668ddeab 100644 --- a/src/main/java/ti4/commands/special/CloneGame.java +++ b/src/main/java/ti4/discord/interactions/commands/special/CloneGame.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.game.CloneGameService; diff --git a/src/main/java/ti4/commands/special/DiploSystem.java b/src/main/java/ti4/discord/interactions/commands/special/DiploSystem.java similarity index 91% rename from src/main/java/ti4/commands/special/DiploSystem.java rename to src/main/java/ti4/discord/interactions/commands/special/DiploSystem.java index ea5dca3736..29da69dd90 100644 --- a/src/main/java/ti4/commands/special/DiploSystem.java +++ b/src/main/java/ti4/discord/interactions/commands/special/DiploSystem.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.DiploSystemHelper; diff --git a/src/main/java/ti4/commands/special/FighterConscription.java b/src/main/java/ti4/discord/interactions/commands/special/FighterConscription.java similarity index 90% rename from src/main/java/ti4/commands/special/FighterConscription.java rename to src/main/java/ti4/discord/interactions/commands/special/FighterConscription.java index 914f9e5af8..994c6693a6 100644 --- a/src/main/java/ti4/commands/special/FighterConscription.java +++ b/src/main/java/ti4/discord/interactions/commands/special/FighterConscription.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/Galvanize.java b/src/main/java/ti4/discord/interactions/commands/special/Galvanize.java similarity index 84% rename from src/main/java/ti4/commands/special/Galvanize.java rename to src/main/java/ti4/discord/interactions/commands/special/Galvanize.java index b5ba10a467..31b1b547c7 100644 --- a/src/main/java/ti4/commands/special/Galvanize.java +++ b/src/main/java/ti4/discord/interactions/commands/special/Galvanize.java @@ -1,7 +1,7 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.unit.GalvanizeService; diff --git a/src/main/java/ti4/commands/special/GeneratePainBoxMapString.java b/src/main/java/ti4/discord/interactions/commands/special/GeneratePainBoxMapString.java similarity index 97% rename from src/main/java/ti4/commands/special/GeneratePainBoxMapString.java rename to src/main/java/ti4/discord/interactions/commands/special/GeneratePainBoxMapString.java index 1afb8b284b..8deb12be2d 100644 --- a/src/main/java/ti4/commands/special/GeneratePainBoxMapString.java +++ b/src/main/java/ti4/discord/interactions/commands/special/GeneratePainBoxMapString.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +10,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/special/IonFlip.java b/src/main/java/ti4/discord/interactions/commands/special/IonFlip.java similarity index 95% rename from src/main/java/ti4/commands/special/IonFlip.java rename to src/main/java/ti4/discord/interactions/commands/special/IonFlip.java index 89bbf84cb3..560f9c6599 100644 --- a/src/main/java/ti4/commands/special/IonFlip.java +++ b/src/main/java/ti4/discord/interactions/commands/special/IonFlip.java @@ -1,10 +1,10 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.game.UnitHolder; diff --git a/src/main/java/ti4/commands/special/LoreCommand.java b/src/main/java/ti4/discord/interactions/commands/special/LoreCommand.java similarity index 86% rename from src/main/java/ti4/commands/special/LoreCommand.java rename to src/main/java/ti4/discord/interactions/commands/special/LoreCommand.java index 4d08653b95..922e576a03 100644 --- a/src/main/java/ti4/commands/special/LoreCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/special/LoreCommand.java @@ -1,7 +1,7 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.message.MessageHelper; import ti4.service.fow.LoreService; diff --git a/src/main/java/ti4/commands/special/MakeSecretIntoPO.java b/src/main/java/ti4/discord/interactions/commands/special/MakeSecretIntoPO.java similarity index 95% rename from src/main/java/ti4/commands/special/MakeSecretIntoPO.java rename to src/main/java/ti4/discord/interactions/commands/special/MakeSecretIntoPO.java index f63f6becb9..8e8e1a55cd 100644 --- a/src/main/java/ti4/commands/special/MakeSecretIntoPO.java +++ b/src/main/java/ti4/discord/interactions/commands/special/MakeSecretIntoPO.java @@ -1,11 +1,11 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.LinkedHashMap; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/MoveAllUnits.java b/src/main/java/ti4/discord/interactions/commands/special/MoveAllUnits.java similarity index 95% rename from src/main/java/ti4/commands/special/MoveAllUnits.java rename to src/main/java/ti4/discord/interactions/commands/special/MoveAllUnits.java index edea50e135..4bd5228830 100644 --- a/src/main/java/ti4/commands/special/MoveAllUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/special/MoveAllUnits.java @@ -1,11 +1,11 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/special/MoveCoatl.java b/src/main/java/ti4/discord/interactions/commands/special/MoveCoatl.java similarity index 95% rename from src/main/java/ti4/commands/special/MoveCoatl.java rename to src/main/java/ti4/discord/interactions/commands/special/MoveCoatl.java index 8ad9101870..15168bcf5b 100644 --- a/src/main/java/ti4/commands/special/MoveCoatl.java +++ b/src/main/java/ti4/discord/interactions/commands/special/MoveCoatl.java @@ -1,10 +1,10 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/special/MoveCreussWormhole.java b/src/main/java/ti4/discord/interactions/commands/special/MoveCreussWormhole.java similarity index 96% rename from src/main/java/ti4/commands/special/MoveCreussWormhole.java rename to src/main/java/ti4/discord/interactions/commands/special/MoveCreussWormhole.java index fd11797bc6..1e352af7ae 100644 --- a/src/main/java/ti4/commands/special/MoveCreussWormhole.java +++ b/src/main/java/ti4/discord/interactions/commands/special/MoveCreussWormhole.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/special/NaaluCommander.java b/src/main/java/ti4/discord/interactions/commands/special/NaaluCommander.java similarity index 84% rename from src/main/java/ti4/commands/special/NaaluCommander.java rename to src/main/java/ti4/discord/interactions/commands/special/NaaluCommander.java index 62f1ac528b..3eabcbc92b 100644 --- a/src/main/java/ti4/commands/special/NaaluCommander.java +++ b/src/main/java/ti4/discord/interactions/commands/special/NaaluCommander.java @@ -1,7 +1,7 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.leader.NaaluCommanderService; diff --git a/src/main/java/ti4/commands/special/NovaSeed.java b/src/main/java/ti4/discord/interactions/commands/special/NovaSeed.java similarity index 93% rename from src/main/java/ti4/commands/special/NovaSeed.java rename to src/main/java/ti4/discord/interactions/commands/special/NovaSeed.java index 0ec401334a..151bc371ad 100644 --- a/src/main/java/ti4/commands/special/NovaSeed.java +++ b/src/main/java/ti4/discord/interactions/commands/special/NovaSeed.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/Rematch.java b/src/main/java/ti4/discord/interactions/commands/special/Rematch.java similarity index 90% rename from src/main/java/ti4/commands/special/Rematch.java rename to src/main/java/ti4/discord/interactions/commands/special/Rematch.java index f3d811f4f9..7145886641 100644 --- a/src/main/java/ti4/commands/special/Rematch.java +++ b/src/main/java/ti4/discord/interactions/commands/special/Rematch.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/special/RemoveFactionCCFromFleetSupply.java b/src/main/java/ti4/discord/interactions/commands/special/RemoveFactionCCFromFleetSupply.java similarity index 90% rename from src/main/java/ti4/commands/special/RemoveFactionCCFromFleetSupply.java rename to src/main/java/ti4/discord/interactions/commands/special/RemoveFactionCCFromFleetSupply.java index 86dcfac8cf..d0b533600f 100644 --- a/src/main/java/ti4/commands/special/RemoveFactionCCFromFleetSupply.java +++ b/src/main/java/ti4/discord/interactions/commands/special/RemoveFactionCCFromFleetSupply.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.List; import ti4.game.Game; diff --git a/src/main/java/ti4/commands/special/RiseOfMessiah.java b/src/main/java/ti4/discord/interactions/commands/special/RiseOfMessiah.java similarity index 89% rename from src/main/java/ti4/commands/special/RiseOfMessiah.java rename to src/main/java/ti4/discord/interactions/commands/special/RiseOfMessiah.java index 501fd7661d..6c30558594 100644 --- a/src/main/java/ti4/commands/special/RiseOfMessiah.java +++ b/src/main/java/ti4/discord/interactions/commands/special/RiseOfMessiah.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ActionCardHelper; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/SearchWarrant.java b/src/main/java/ti4/discord/interactions/commands/special/SearchWarrant.java similarity index 85% rename from src/main/java/ti4/commands/special/SearchWarrant.java rename to src/main/java/ti4/discord/interactions/commands/special/SearchWarrant.java index 8f904281ce..5bdace50ae 100644 --- a/src/main/java/ti4/commands/special/SearchWarrant.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SearchWarrant.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; class SearchWarrant extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/special/SearchWinningPath.java b/src/main/java/ti4/discord/interactions/commands/special/SearchWinningPath.java similarity index 94% rename from src/main/java/ti4/commands/special/SearchWinningPath.java rename to src/main/java/ti4/discord/interactions/commands/special/SearchWinningPath.java index 85776458e0..b6f6cb0bc4 100644 --- a/src/main/java/ti4/commands/special/SearchWinningPath.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SearchWinningPath.java @@ -1,12 +1,12 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.HashSet; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; -import ti4.commands.statistics.GameStatisticsFilterer; +import ti4.discord.interactions.commands.Subcommand; +import ti4.discord.interactions.commands.statistics.GameStatisticsFilterer; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GamesPage; diff --git a/src/main/java/ti4/commands/special/SetExpedition.java b/src/main/java/ti4/discord/interactions/commands/special/SetExpedition.java similarity index 93% rename from src/main/java/ti4/commands/special/SetExpedition.java rename to src/main/java/ti4/discord/interactions/commands/special/SetExpedition.java index cb6dbb3d10..66d0683def 100644 --- a/src/main/java/ti4/commands/special/SetExpedition.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SetExpedition.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Expeditions; import ti4.game.Game; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/SetupNeutralPlayer.java b/src/main/java/ti4/discord/interactions/commands/special/SetupNeutralPlayer.java similarity index 95% rename from src/main/java/ti4/commands/special/SetupNeutralPlayer.java rename to src/main/java/ti4/discord/interactions/commands/special/SetupNeutralPlayer.java index f3c69d15fa..0bb38aa0e3 100644 --- a/src/main/java/ti4/commands/special/SetupNeutralPlayer.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SetupNeutralPlayer.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.Collections; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/special/SleeperToken.java b/src/main/java/ti4/discord/interactions/commands/special/SleeperToken.java similarity index 95% rename from src/main/java/ti4/commands/special/SleeperToken.java rename to src/main/java/ti4/discord/interactions/commands/special/SleeperToken.java index 59181d7712..0d0db116a6 100644 --- a/src/main/java/ti4/commands/special/SleeperToken.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SleeperToken.java @@ -1,10 +1,10 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/Special2Command.java b/src/main/java/ti4/discord/interactions/commands/special/Special2Command.java similarity index 84% rename from src/main/java/ti4/commands/special/Special2Command.java rename to src/main/java/ti4/discord/interactions/commands/special/Special2Command.java index e611bba53f..2d34a2d64e 100644 --- a/src/main/java/ti4/commands/special/Special2Command.java +++ b/src/main/java/ti4/discord/interactions/commands/special/Special2Command.java @@ -1,10 +1,10 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class Special2Command implements ParentCommand { diff --git a/src/main/java/ti4/commands/special/SpecialCommand.java b/src/main/java/ti4/discord/interactions/commands/special/SpecialCommand.java similarity index 91% rename from src/main/java/ti4/commands/special/SpecialCommand.java rename to src/main/java/ti4/discord/interactions/commands/special/SpecialCommand.java index e381d2a390..64017cfde4 100644 --- a/src/main/java/ti4/commands/special/SpecialCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SpecialCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class SpecialCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/special/StasisInfantry.java b/src/main/java/ti4/discord/interactions/commands/special/StasisInfantry.java similarity index 95% rename from src/main/java/ti4/commands/special/StasisInfantry.java rename to src/main/java/ti4/discord/interactions/commands/special/StasisInfantry.java index 4372ee8c60..72f1449b62 100644 --- a/src/main/java/ti4/commands/special/StasisInfantry.java +++ b/src/main/java/ti4/discord/interactions/commands/special/StasisInfantry.java @@ -1,11 +1,11 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.function.Consumer; import java.util.function.Supplier; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/special/StellarConverter.java b/src/main/java/ti4/discord/interactions/commands/special/StellarConverter.java similarity index 90% rename from src/main/java/ti4/commands/special/StellarConverter.java rename to src/main/java/ti4/discord/interactions/commands/special/StellarConverter.java index fd0ed9ee26..f729649a4d 100644 --- a/src/main/java/ti4/commands/special/StellarConverter.java +++ b/src/main/java/ti4/discord/interactions/commands/special/StellarConverter.java @@ -1,9 +1,9 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/special/SwapSC.java b/src/main/java/ti4/discord/interactions/commands/special/SwapSC.java similarity index 94% rename from src/main/java/ti4/commands/special/SwapSC.java rename to src/main/java/ti4/discord/interactions/commands/special/SwapSC.java index 3c7176d45c..1077757407 100644 --- a/src/main/java/ti4/commands/special/SwapSC.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SwapSC.java @@ -1,10 +1,10 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/SwapTwoSystems.java b/src/main/java/ti4/discord/interactions/commands/special/SwapTwoSystems.java similarity index 94% rename from src/main/java/ti4/commands/special/SwapTwoSystems.java rename to src/main/java/ti4/discord/interactions/commands/special/SwapTwoSystems.java index cf25756f19..fdae9aeabf 100644 --- a/src/main/java/ti4/commands/special/SwapTwoSystems.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SwapTwoSystems.java @@ -1,12 +1,12 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.List; import java.util.Set; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/special/SystemInfo.java b/src/main/java/ti4/discord/interactions/commands/special/SystemInfo.java similarity index 98% rename from src/main/java/ti4/commands/special/SystemInfo.java rename to src/main/java/ti4/discord/interactions/commands/special/SystemInfo.java index 540225a08f..37b79ef548 100644 --- a/src/main/java/ti4/commands/special/SystemInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/special/SystemInfo.java @@ -1,4 +1,4 @@ -package ti4.commands.special; +package ti4.discord.interactions.commands.special; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.utils.FileUpload; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Planet; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/spin/AddSpinSetting.java b/src/main/java/ti4/discord/interactions/commands/spin/AddSpinSetting.java similarity index 97% rename from src/main/java/ti4/commands/spin/AddSpinSetting.java rename to src/main/java/ti4/discord/interactions/commands/spin/AddSpinSetting.java index 78a474a19b..b3db9c25de 100644 --- a/src/main/java/ti4/commands/spin/AddSpinSetting.java +++ b/src/main/java/ti4/discord/interactions/commands/spin/AddSpinSetting.java @@ -1,4 +1,4 @@ -package ti4.commands.spin; +package ti4.discord.interactions.commands.spin; import java.util.List; import java.util.Set; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/spin/ExecuteSpin.java b/src/main/java/ti4/discord/interactions/commands/spin/ExecuteSpin.java similarity index 97% rename from src/main/java/ti4/commands/spin/ExecuteSpin.java rename to src/main/java/ti4/discord/interactions/commands/spin/ExecuteSpin.java index 3e53765f1c..20f59c8f45 100644 --- a/src/main/java/ti4/commands/spin/ExecuteSpin.java +++ b/src/main/java/ti4/discord/interactions/commands/spin/ExecuteSpin.java @@ -1,4 +1,4 @@ -package ti4.commands.spin; +package ti4.discord.interactions.commands.spin; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.RandomHelper; diff --git a/src/main/java/ti4/commands/spin/ListSpinSettings.java b/src/main/java/ti4/discord/interactions/commands/spin/ListSpinSettings.java similarity index 86% rename from src/main/java/ti4/commands/spin/ListSpinSettings.java rename to src/main/java/ti4/discord/interactions/commands/spin/ListSpinSettings.java index 1dcf0c62d1..83b68401a0 100644 --- a/src/main/java/ti4/commands/spin/ListSpinSettings.java +++ b/src/main/java/ti4/discord/interactions/commands/spin/ListSpinSettings.java @@ -1,7 +1,7 @@ -package ti4.commands.spin; +package ti4.discord.interactions.commands.spin; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/spin/RemoveSpinSetting.java b/src/main/java/ti4/discord/interactions/commands/spin/RemoveSpinSetting.java similarity index 93% rename from src/main/java/ti4/commands/spin/RemoveSpinSetting.java rename to src/main/java/ti4/discord/interactions/commands/spin/RemoveSpinSetting.java index 896a7201df..7e5a8d7784 100644 --- a/src/main/java/ti4/commands/spin/RemoveSpinSetting.java +++ b/src/main/java/ti4/discord/interactions/commands/spin/RemoveSpinSetting.java @@ -1,4 +1,4 @@ -package ti4.commands.spin; +package ti4.discord.interactions.commands.spin; import java.util.List; import java.util.stream.Collectors; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/spin/SpinCommand.java b/src/main/java/ti4/discord/interactions/commands/spin/SpinCommand.java similarity index 81% rename from src/main/java/ti4/commands/spin/SpinCommand.java rename to src/main/java/ti4/discord/interactions/commands/spin/SpinCommand.java index 20071555fb..afd82bc008 100644 --- a/src/main/java/ti4/commands/spin/SpinCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/spin/SpinCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.spin; +package ti4.discord.interactions.commands.spin; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class SpinCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/statistics/AverageTurnTime.java b/src/main/java/ti4/discord/interactions/commands/statistics/AverageTurnTime.java similarity index 91% rename from src/main/java/ti4/commands/statistics/AverageTurnTime.java rename to src/main/java/ti4/discord/interactions/commands/statistics/AverageTurnTime.java index 46f08dd9e6..735a41d4b8 100644 --- a/src/main/java/ti4/commands/statistics/AverageTurnTime.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/AverageTurnTime.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.spring.service.statistics.AverageTurnTimeService; diff --git a/src/main/java/ti4/commands/statistics/CommunityStatistics.java b/src/main/java/ti4/discord/interactions/commands/statistics/CommunityStatistics.java similarity index 81% rename from src/main/java/ti4/commands/statistics/CommunityStatistics.java rename to src/main/java/ti4/discord/interactions/commands/statistics/CommunityStatistics.java index 9211f712a8..3a6b9a16a3 100644 --- a/src/main/java/ti4/commands/statistics/CommunityStatistics.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/CommunityStatistics.java @@ -1,7 +1,7 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.game.CommunityStatisticsService; diff --git a/src/main/java/ti4/commands/statistics/CompareAFKTimes.java b/src/main/java/ti4/discord/interactions/commands/statistics/CompareAFKTimes.java similarity index 96% rename from src/main/java/ti4/commands/statistics/CompareAFKTimes.java rename to src/main/java/ti4/discord/interactions/commands/statistics/CompareAFKTimes.java index a59117e76c..c7799460c1 100644 --- a/src/main/java/ti4/commands/statistics/CompareAFKTimes.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/CompareAFKTimes.java @@ -1,4 +1,4 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import java.util.List; import java.util.Objects; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.persistence.GameManager; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/statistics/DiceLuck.java b/src/main/java/ti4/discord/interactions/commands/statistics/DiceLuck.java similarity index 92% rename from src/main/java/ti4/commands/statistics/DiceLuck.java rename to src/main/java/ti4/discord/interactions/commands/statistics/DiceLuck.java index 22a7ed54db..d749f7d8e2 100644 --- a/src/main/java/ti4/commands/statistics/DiceLuck.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/DiceLuck.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.spring.service.statistics.DiceLuckService; diff --git a/src/main/java/ti4/commands/statistics/ExpeditionWinRateStatisticsService.java b/src/main/java/ti4/discord/interactions/commands/statistics/ExpeditionWinRateStatisticsService.java similarity index 99% rename from src/main/java/ti4/commands/statistics/ExpeditionWinRateStatisticsService.java rename to src/main/java/ti4/discord/interactions/commands/statistics/ExpeditionWinRateStatisticsService.java index 909b53e59c..290663e373 100644 --- a/src/main/java/ti4/commands/statistics/ExpeditionWinRateStatisticsService.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/ExpeditionWinRateStatisticsService.java @@ -1,4 +1,4 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/main/java/ti4/commands/statistics/ExpeditionWinRates.java b/src/main/java/ti4/discord/interactions/commands/statistics/ExpeditionWinRates.java similarity index 80% rename from src/main/java/ti4/commands/statistics/ExpeditionWinRates.java rename to src/main/java/ti4/discord/interactions/commands/statistics/ExpeditionWinRates.java index 5ef887b517..5d39aa3e6e 100644 --- a/src/main/java/ti4/commands/statistics/ExpeditionWinRates.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/ExpeditionWinRates.java @@ -1,7 +1,7 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; class ExpeditionWinRates extends Subcommand { diff --git a/src/main/java/ti4/commands/statistics/ExportToCSV.java b/src/main/java/ti4/discord/interactions/commands/statistics/ExportToCSV.java similarity index 81% rename from src/main/java/ti4/commands/statistics/ExportToCSV.java rename to src/main/java/ti4/discord/interactions/commands/statistics/ExportToCSV.java index 75ed4688f3..6d142bc99f 100644 --- a/src/main/java/ti4/commands/statistics/ExportToCSV.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/ExportToCSV.java @@ -1,7 +1,7 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.service.statistics.ExportToCsvService; class ExportToCSV extends Subcommand { diff --git a/src/main/java/ti4/commands/statistics/FactionGames.java b/src/main/java/ti4/discord/interactions/commands/statistics/FactionGames.java similarity index 91% rename from src/main/java/ti4/commands/statistics/FactionGames.java rename to src/main/java/ti4/discord/interactions/commands/statistics/FactionGames.java index 7935e86157..2cd196faf5 100644 --- a/src/main/java/ti4/commands/statistics/FactionGames.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/FactionGames.java @@ -1,10 +1,10 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.SearchGameForFactionHelper; diff --git a/src/main/java/ti4/commands/statistics/FactionRecordOfSCPick.java b/src/main/java/ti4/discord/interactions/commands/statistics/FactionRecordOfSCPick.java similarity index 90% rename from src/main/java/ti4/commands/statistics/FactionRecordOfSCPick.java rename to src/main/java/ti4/discord/interactions/commands/statistics/FactionRecordOfSCPick.java index 366090fd33..2d47e20c80 100644 --- a/src/main/java/ti4/commands/statistics/FactionRecordOfSCPick.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/FactionRecordOfSCPick.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.FactionRecordOfStrategyCardPickService; diff --git a/src/main/java/ti4/commands/statistics/FactionRecordOfTech.java b/src/main/java/ti4/discord/interactions/commands/statistics/FactionRecordOfTech.java similarity index 89% rename from src/main/java/ti4/commands/statistics/FactionRecordOfTech.java rename to src/main/java/ti4/discord/interactions/commands/statistics/FactionRecordOfTech.java index c3b9bd9e9d..228d5d978f 100644 --- a/src/main/java/ti4/commands/statistics/FactionRecordOfTech.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/FactionRecordOfTech.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.FactionRecordOfTechService; diff --git a/src/main/java/ti4/commands/statistics/FactionTopColors.java b/src/main/java/ti4/discord/interactions/commands/statistics/FactionTopColors.java similarity index 83% rename from src/main/java/ti4/commands/statistics/FactionTopColors.java rename to src/main/java/ti4/discord/interactions/commands/statistics/FactionTopColors.java index 1eea3c40f3..d352dfa46a 100644 --- a/src/main/java/ti4/commands/statistics/FactionTopColors.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/FactionTopColors.java @@ -1,7 +1,7 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.FactionTopColorsStatisticsService; diff --git a/src/main/java/ti4/commands/statistics/GameStatistics.java b/src/main/java/ti4/discord/interactions/commands/statistics/GameStatistics.java similarity index 89% rename from src/main/java/ti4/commands/statistics/GameStatistics.java rename to src/main/java/ti4/discord/interactions/commands/statistics/GameStatistics.java index cbc3465986..56b8441448 100644 --- a/src/main/java/ti4/commands/statistics/GameStatistics.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/GameStatistics.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.game.GameStatisticsService; diff --git a/src/main/java/ti4/commands/statistics/GameStatisticsFilterer.java b/src/main/java/ti4/discord/interactions/commands/statistics/GameStatisticsFilterer.java similarity index 99% rename from src/main/java/ti4/commands/statistics/GameStatisticsFilterer.java rename to src/main/java/ti4/discord/interactions/commands/statistics/GameStatisticsFilterer.java index 1a21230c71..e532e551b3 100644 --- a/src/main/java/ti4/commands/statistics/GameStatisticsFilterer.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/GameStatisticsFilterer.java @@ -1,4 +1,4 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/ti4/commands/statistics/GameWinsWithOtherFactions.java b/src/main/java/ti4/discord/interactions/commands/statistics/GameWinsWithOtherFactions.java similarity index 95% rename from src/main/java/ti4/commands/statistics/GameWinsWithOtherFactions.java rename to src/main/java/ti4/discord/interactions/commands/statistics/GameWinsWithOtherFactions.java index 26960c4dbb..cde20759db 100644 --- a/src/main/java/ti4/commands/statistics/GameWinsWithOtherFactions.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/GameWinsWithOtherFactions.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.GameWinsWithOtherFactionsService; diff --git a/src/main/java/ti4/commands/statistics/HitsPerTurn.java b/src/main/java/ti4/discord/interactions/commands/statistics/HitsPerTurn.java similarity index 91% rename from src/main/java/ti4/commands/statistics/HitsPerTurn.java rename to src/main/java/ti4/discord/interactions/commands/statistics/HitsPerTurn.java index 6423e4397a..7b04ba1277 100644 --- a/src/main/java/ti4/commands/statistics/HitsPerTurn.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/HitsPerTurn.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.spring.service.statistics.AverageHitsPerTurnService; diff --git a/src/main/java/ti4/commands/statistics/LifetimeRecord.java b/src/main/java/ti4/discord/interactions/commands/statistics/LifetimeRecord.java similarity index 92% rename from src/main/java/ti4/commands/statistics/LifetimeRecord.java rename to src/main/java/ti4/discord/interactions/commands/statistics/LifetimeRecord.java index b1ed266729..7e1f9d7e5f 100644 --- a/src/main/java/ti4/commands/statistics/LifetimeRecord.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/LifetimeRecord.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.spring.service.statistics.LifeTimeRecordService; diff --git a/src/main/java/ti4/commands/statistics/ListTitlesGiven.java b/src/main/java/ti4/discord/interactions/commands/statistics/ListTitlesGiven.java similarity index 87% rename from src/main/java/ti4/commands/statistics/ListTitlesGiven.java rename to src/main/java/ti4/discord/interactions/commands/statistics/ListTitlesGiven.java index a2b23e201c..0701e60e15 100644 --- a/src/main/java/ti4/commands/statistics/ListTitlesGiven.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/ListTitlesGiven.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.spring.service.statistics.ListTitlesGivenService; diff --git a/src/main/java/ti4/commands/statistics/MatchmakingRatingCommand.java b/src/main/java/ti4/discord/interactions/commands/statistics/MatchmakingRatingCommand.java similarity index 90% rename from src/main/java/ti4/commands/statistics/MatchmakingRatingCommand.java rename to src/main/java/ti4/discord/interactions/commands/statistics/MatchmakingRatingCommand.java index 8d7134124b..401a025aef 100644 --- a/src/main/java/ti4/commands/statistics/MatchmakingRatingCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/MatchmakingRatingCommand.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.spring.service.statistics.matchmaking.MatchmakingRatingEventService; class MatchmakingRatingCommand extends Subcommand { diff --git a/src/main/java/ti4/commands/statistics/MedianTurnTime.java b/src/main/java/ti4/discord/interactions/commands/statistics/MedianTurnTime.java similarity index 91% rename from src/main/java/ti4/commands/statistics/MedianTurnTime.java rename to src/main/java/ti4/discord/interactions/commands/statistics/MedianTurnTime.java index ff07cefe5d..389e3fdad1 100644 --- a/src/main/java/ti4/commands/statistics/MedianTurnTime.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/MedianTurnTime.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.spring.service.statistics.MedianTurnTimeService; diff --git a/src/main/java/ti4/commands/statistics/OptIn.java b/src/main/java/ti4/discord/interactions/commands/statistics/OptIn.java similarity index 94% rename from src/main/java/ti4/commands/statistics/OptIn.java rename to src/main/java/ti4/discord/interactions/commands/statistics/OptIn.java index c26d02d0bf..4196ec2a97 100644 --- a/src/main/java/ti4/commands/statistics/OptIn.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/OptIn.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.service.statistics.StatisticsOptInOutService; class OptIn extends Subcommand { diff --git a/src/main/java/ti4/commands/statistics/OptOut.java b/src/main/java/ti4/discord/interactions/commands/statistics/OptOut.java similarity index 80% rename from src/main/java/ti4/commands/statistics/OptOut.java rename to src/main/java/ti4/discord/interactions/commands/statistics/OptOut.java index 3e97520e12..33e424eca7 100644 --- a/src/main/java/ti4/commands/statistics/OptOut.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/OptOut.java @@ -1,7 +1,7 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.service.statistics.StatisticsOptInOutService; class OptOut extends Subcommand { diff --git a/src/main/java/ti4/commands/statistics/PlayerStatistics.java b/src/main/java/ti4/discord/interactions/commands/statistics/PlayerStatistics.java similarity index 92% rename from src/main/java/ti4/commands/statistics/PlayerStatistics.java rename to src/main/java/ti4/discord/interactions/commands/statistics/PlayerStatistics.java index 60b9252000..8628784fee 100644 --- a/src/main/java/ti4/commands/statistics/PlayerStatistics.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/PlayerStatistics.java @@ -1,9 +1,9 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.player.PlayerStatisticsService; diff --git a/src/main/java/ti4/commands/statistics/PoliticsPosition.java b/src/main/java/ti4/discord/interactions/commands/statistics/PoliticsPosition.java similarity index 97% rename from src/main/java/ti4/commands/statistics/PoliticsPosition.java rename to src/main/java/ti4/discord/interactions/commands/statistics/PoliticsPosition.java index 1348a4ba17..71d04cb570 100644 --- a/src/main/java/ti4/commands/statistics/PoliticsPosition.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/PoliticsPosition.java @@ -1,4 +1,4 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import java.util.ArrayList; import java.util.Comparator; @@ -6,7 +6,7 @@ import java.util.Map.Entry; import java.util.function.Predicate; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.game.Player; import ti4.game.persistence.GameManager; import ti4.game.persistence.ManagedGame; diff --git a/src/main/java/ti4/commands/statistics/StatisticsCommand.java b/src/main/java/ti4/discord/interactions/commands/statistics/StatisticsCommand.java similarity index 90% rename from src/main/java/ti4/commands/statistics/StatisticsCommand.java rename to src/main/java/ti4/discord/interactions/commands/statistics/StatisticsCommand.java index 375785cb4f..316b4a408c 100644 --- a/src/main/java/ti4/commands/statistics/StatisticsCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/StatisticsCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class StatisticsCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/statistics/StellarConverterStatistics.java b/src/main/java/ti4/discord/interactions/commands/statistics/StellarConverterStatistics.java similarity index 83% rename from src/main/java/ti4/commands/statistics/StellarConverterStatistics.java rename to src/main/java/ti4/discord/interactions/commands/statistics/StellarConverterStatistics.java index f7fe578124..e8353b7a6b 100644 --- a/src/main/java/ti4/commands/statistics/StellarConverterStatistics.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/StellarConverterStatistics.java @@ -1,7 +1,7 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.statistics.StellarConverterStatisticsService; diff --git a/src/main/java/ti4/commands/statistics/SurveyResults.java b/src/main/java/ti4/discord/interactions/commands/statistics/SurveyResults.java similarity index 95% rename from src/main/java/ti4/commands/statistics/SurveyResults.java rename to src/main/java/ti4/discord/interactions/commands/statistics/SurveyResults.java index fc1c0c3c4a..f074c88c7d 100644 --- a/src/main/java/ti4/commands/statistics/SurveyResults.java +++ b/src/main/java/ti4/discord/interactions/commands/statistics/SurveyResults.java @@ -1,11 +1,11 @@ -package ti4.commands.statistics; +package ti4.discord.interactions.commands.statistics; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.message.MessageHelper; import ti4.settings.users.UserSettings; import ti4.settings.users.UserSettingsManager; diff --git a/src/main/java/ti4/commands/status/AddCustomPO.java b/src/main/java/ti4/discord/interactions/commands/status/AddCustomPO.java similarity index 95% rename from src/main/java/ti4/commands/status/AddCustomPO.java rename to src/main/java/ti4/discord/interactions/commands/status/AddCustomPO.java index f9f56333dd..bc43cb5624 100644 --- a/src/main/java/ti4/commands/status/AddCustomPO.java +++ b/src/main/java/ti4/discord/interactions/commands/status/AddCustomPO.java @@ -1,17 +1,17 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; class AddCustomPO extends GameStateSubcommand { - public AddCustomPO() { + AddCustomPO() { super( Constants.ADD_CUSTOM, "Add a custom public objective (as a arbitrary source of victory points)", diff --git a/src/main/java/ti4/commands/status/Cleanup.java b/src/main/java/ti4/discord/interactions/commands/status/Cleanup.java similarity index 91% rename from src/main/java/ti4/commands/status/Cleanup.java rename to src/main/java/ti4/discord/interactions/commands/status/Cleanup.java index 8646ed7677..f46b1b3558 100644 --- a/src/main/java/ti4/commands/status/Cleanup.java +++ b/src/main/java/ti4/discord/interactions/commands/status/Cleanup.java @@ -1,10 +1,10 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/status/ListDiceLuck.java b/src/main/java/ti4/discord/interactions/commands/status/ListDiceLuck.java similarity index 95% rename from src/main/java/ti4/commands/status/ListDiceLuck.java rename to src/main/java/ti4/discord/interactions/commands/status/ListDiceLuck.java index 96c1950f10..a59017a8f1 100644 --- a/src/main/java/ti4/commands/status/ListDiceLuck.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ListDiceLuck.java @@ -1,10 +1,10 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/status/ListSpends.java b/src/main/java/ti4/discord/interactions/commands/status/ListSpends.java similarity index 93% rename from src/main/java/ti4/commands/status/ListSpends.java rename to src/main/java/ti4/discord/interactions/commands/status/ListSpends.java index 11a5eb0f3a..cf935f3726 100644 --- a/src/main/java/ti4/commands/status/ListSpends.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ListSpends.java @@ -1,7 +1,7 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/status/ListTurnOrder.java b/src/main/java/ti4/discord/interactions/commands/status/ListTurnOrder.java similarity index 83% rename from src/main/java/ti4/commands/status/ListTurnOrder.java rename to src/main/java/ti4/discord/interactions/commands/status/ListTurnOrder.java index a010f32588..2c346c19db 100644 --- a/src/main/java/ti4/commands/status/ListTurnOrder.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ListTurnOrder.java @@ -1,7 +1,7 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.service.info.ListTurnOrderService; diff --git a/src/main/java/ti4/commands/status/ListTurnStats.java b/src/main/java/ti4/discord/interactions/commands/status/ListTurnStats.java similarity index 96% rename from src/main/java/ti4/commands/status/ListTurnStats.java rename to src/main/java/ti4/discord/interactions/commands/status/ListTurnStats.java index eafc3f7874..63cfb5cfe4 100644 --- a/src/main/java/ti4/commands/status/ListTurnStats.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ListTurnStats.java @@ -1,10 +1,10 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.Comparator; import java.util.List; import java.util.Optional; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/status/MarkFollowed.java b/src/main/java/ti4/discord/interactions/commands/status/MarkFollowed.java similarity index 92% rename from src/main/java/ti4/commands/status/MarkFollowed.java rename to src/main/java/ti4/discord/interactions/commands/status/MarkFollowed.java index 5bf73703de..fbafa518ca 100644 --- a/src/main/java/ti4/commands/status/MarkFollowed.java +++ b/src/main/java/ti4/discord/interactions/commands/status/MarkFollowed.java @@ -1,9 +1,9 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.Helper; diff --git a/src/main/java/ti4/commands/status/POInfo.java b/src/main/java/ti4/discord/interactions/commands/status/POInfo.java similarity index 96% rename from src/main/java/ti4/commands/status/POInfo.java rename to src/main/java/ti4/discord/interactions/commands/status/POInfo.java index 3ef5077da5..267cc4e230 100644 --- a/src/main/java/ti4/commands/status/POInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/status/POInfo.java @@ -1,4 +1,4 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.List; import java.util.Map; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/status/PeekPublicObjectiveDeck.java b/src/main/java/ti4/discord/interactions/commands/status/PeekPublicObjectiveDeck.java similarity index 95% rename from src/main/java/ti4/commands/status/PeekPublicObjectiveDeck.java rename to src/main/java/ti4/discord/interactions/commands/status/PeekPublicObjectiveDeck.java index c9f56379d3..b6dd1c9e17 100644 --- a/src/main/java/ti4/commands/status/PeekPublicObjectiveDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/status/PeekPublicObjectiveDeck.java @@ -1,4 +1,4 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/status/PersonalCleanup.java b/src/main/java/ti4/discord/interactions/commands/status/PersonalCleanup.java similarity index 96% rename from src/main/java/ti4/commands/status/PersonalCleanup.java rename to src/main/java/ti4/discord/interactions/commands/status/PersonalCleanup.java index 35b1c4da6b..ce9bd6c2fa 100644 --- a/src/main/java/ti4/commands/status/PersonalCleanup.java +++ b/src/main/java/ti4/discord/interactions/commands/status/PersonalCleanup.java @@ -1,4 +1,4 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/status/RemoveCustomPO.java b/src/main/java/ti4/discord/interactions/commands/status/RemoveCustomPO.java similarity index 92% rename from src/main/java/ti4/commands/status/RemoveCustomPO.java rename to src/main/java/ti4/discord/interactions/commands/status/RemoveCustomPO.java index ebeb0fc18c..a3d716062d 100644 --- a/src/main/java/ti4/commands/status/RemoveCustomPO.java +++ b/src/main/java/ti4/discord/interactions/commands/status/RemoveCustomPO.java @@ -1,10 +1,10 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/status/RevealStage1.java b/src/main/java/ti4/discord/interactions/commands/status/RevealStage1.java similarity index 81% rename from src/main/java/ti4/commands/status/RevealStage1.java rename to src/main/java/ti4/discord/interactions/commands/status/RevealStage1.java index 9670caf40e..7866e49e20 100644 --- a/src/main/java/ti4/commands/status/RevealStage1.java +++ b/src/main/java/ti4/discord/interactions/commands/status/RevealStage1.java @@ -1,7 +1,7 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.objectives.RevealPublicObjectiveService; diff --git a/src/main/java/ti4/commands/status/RevealStage2.java b/src/main/java/ti4/discord/interactions/commands/status/RevealStage2.java similarity index 81% rename from src/main/java/ti4/commands/status/RevealStage2.java rename to src/main/java/ti4/discord/interactions/commands/status/RevealStage2.java index 76a79c4c8b..7775d1136a 100644 --- a/src/main/java/ti4/commands/status/RevealStage2.java +++ b/src/main/java/ti4/discord/interactions/commands/status/RevealStage2.java @@ -1,7 +1,7 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.objectives.RevealPublicObjectiveService; diff --git a/src/main/java/ti4/commands/status/SCTradeGoods.java b/src/main/java/ti4/discord/interactions/commands/status/SCTradeGoods.java similarity index 96% rename from src/main/java/ti4/commands/status/SCTradeGoods.java rename to src/main/java/ti4/discord/interactions/commands/status/SCTradeGoods.java index ff7dd131b7..d5d8ea262a 100644 --- a/src/main/java/ti4/commands/status/SCTradeGoods.java +++ b/src/main/java/ti4/discord/interactions/commands/status/SCTradeGoods.java @@ -1,4 +1,4 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.HashSet; import java.util.Map; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/status/ScorePublic.java b/src/main/java/ti4/discord/interactions/commands/status/ScorePublic.java similarity index 91% rename from src/main/java/ti4/commands/status/ScorePublic.java rename to src/main/java/ti4/discord/interactions/commands/status/ScorePublic.java index c21a10e5d8..64b2491741 100644 --- a/src/main/java/ti4/commands/status/ScorePublic.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ScorePublic.java @@ -1,9 +1,9 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.objectives.ScorePublicObjectiveService; diff --git a/src/main/java/ti4/commands/status/ShufflePublicBack.java b/src/main/java/ti4/discord/interactions/commands/status/ShufflePublicBack.java similarity index 93% rename from src/main/java/ti4/commands/status/ShufflePublicBack.java rename to src/main/java/ti4/discord/interactions/commands/status/ShufflePublicBack.java index 03f4fe9d3a..5b5a07078a 100644 --- a/src/main/java/ti4/commands/status/ShufflePublicBack.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ShufflePublicBack.java @@ -1,10 +1,10 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/status/ShufflePublicDeck.java b/src/main/java/ti4/discord/interactions/commands/status/ShufflePublicDeck.java similarity index 90% rename from src/main/java/ti4/commands/status/ShufflePublicDeck.java rename to src/main/java/ti4/discord/interactions/commands/status/ShufflePublicDeck.java index 0e30805159..48b807f544 100644 --- a/src/main/java/ti4/commands/status/ShufflePublicDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/status/ShufflePublicDeck.java @@ -1,9 +1,9 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.message.MessageHelper; public class ShufflePublicDeck extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/status/StatusCommand.java b/src/main/java/ti4/discord/interactions/commands/status/StatusCommand.java similarity index 89% rename from src/main/java/ti4/commands/status/StatusCommand.java rename to src/main/java/ti4/discord/interactions/commands/status/StatusCommand.java index 2859d9ea0e..dee96dd35c 100644 --- a/src/main/java/ti4/commands/status/StatusCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/status/StatusCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class StatusCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/status/UnscorePublic.java b/src/main/java/ti4/discord/interactions/commands/status/UnscorePublic.java similarity index 93% rename from src/main/java/ti4/commands/status/UnscorePublic.java rename to src/main/java/ti4/discord/interactions/commands/status/UnscorePublic.java index 5ee5927ad8..65d7d43fe2 100644 --- a/src/main/java/ti4/commands/status/UnscorePublic.java +++ b/src/main/java/ti4/discord/interactions/commands/status/UnscorePublic.java @@ -1,9 +1,9 @@ -package ti4.commands.status; +package ti4.discord.interactions.commands.status; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tech/GetTechButton.java b/src/main/java/ti4/discord/interactions/commands/tech/GetTechButton.java similarity index 76% rename from src/main/java/ti4/commands/tech/GetTechButton.java rename to src/main/java/ti4/discord/interactions/commands/tech/GetTechButton.java index 4b0fb49417..834fa73dd4 100644 --- a/src/main/java/ti4/commands/tech/GetTechButton.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/GetTechButton.java @@ -1,8 +1,8 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/tech/TechAdd.java b/src/main/java/ti4/discord/interactions/commands/tech/TechAdd.java similarity index 92% rename from src/main/java/ti4/commands/tech/TechAdd.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechAdd.java index 0642c0063b..30255f5717 100644 --- a/src/main/java/ti4/commands/tech/TechAdd.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechAdd.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/tech/TechAddRemove.java b/src/main/java/ti4/discord/interactions/commands/tech/TechAddRemove.java similarity index 96% rename from src/main/java/ti4/commands/tech/TechAddRemove.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechAddRemove.java index 4de778cc0d..0b40e091d9 100644 --- a/src/main/java/ti4/commands/tech/TechAddRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechAddRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.AliasHandler; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tech/TechChangeType.java b/src/main/java/ti4/discord/interactions/commands/tech/TechChangeType.java similarity index 96% rename from src/main/java/ti4/commands/tech/TechChangeType.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechChangeType.java index 95274e6154..3c5d909b85 100644 --- a/src/main/java/ti4/commands/tech/TechChangeType.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechChangeType.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import java.util.List; import java.util.Map; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.AliasHandler; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tech/TechCommand.java b/src/main/java/ti4/discord/interactions/commands/tech/TechCommand.java similarity index 86% rename from src/main/java/ti4/commands/tech/TechCommand.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechCommand.java index f29bbcc2fc..ac3ece7e21 100644 --- a/src/main/java/ti4/commands/tech/TechCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class TechCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/tech/TechExhaust.java b/src/main/java/ti4/discord/interactions/commands/tech/TechExhaust.java similarity index 92% rename from src/main/java/ti4/commands/tech/TechExhaust.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechExhaust.java index 282cc65496..0a9972611b 100644 --- a/src/main/java/ti4/commands/tech/TechExhaust.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechExhaust.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/tech/TechInfo.java b/src/main/java/ti4/discord/interactions/commands/tech/TechInfo.java similarity index 81% rename from src/main/java/ti4/commands/tech/TechInfo.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechInfo.java index d05367d002..a0ca4f0310 100644 --- a/src/main/java/ti4/commands/tech/TechInfo.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechInfo.java @@ -1,7 +1,7 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.info.TechInfoService; diff --git a/src/main/java/ti4/commands/tech/TechPurge.java b/src/main/java/ti4/discord/interactions/commands/tech/TechPurge.java similarity index 91% rename from src/main/java/ti4/commands/tech/TechPurge.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechPurge.java index 643abefd6c..724b5d4628 100644 --- a/src/main/java/ti4/commands/tech/TechPurge.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechPurge.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/tech/TechRefresh.java b/src/main/java/ti4/discord/interactions/commands/tech/TechRefresh.java similarity index 92% rename from src/main/java/ti4/commands/tech/TechRefresh.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechRefresh.java index 08db2a02cd..ddb204347a 100644 --- a/src/main/java/ti4/commands/tech/TechRefresh.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechRefresh.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/tech/TechRemove.java b/src/main/java/ti4/discord/interactions/commands/tech/TechRemove.java similarity index 91% rename from src/main/java/ti4/commands/tech/TechRemove.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechRemove.java index 7a822d14b6..8a0607268c 100644 --- a/src/main/java/ti4/commands/tech/TechRemove.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechRemove.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/tech/TechShowDeck.java b/src/main/java/ti4/discord/interactions/commands/tech/TechShowDeck.java similarity index 88% rename from src/main/java/ti4/commands/tech/TechShowDeck.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechShowDeck.java index 0b4fcbd599..c365c2b851 100644 --- a/src/main/java/ti4/commands/tech/TechShowDeck.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechShowDeck.java @@ -1,9 +1,9 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.service.tech.ShowTechDeckService; diff --git a/src/main/java/ti4/commands/tech/TechUnpurge.java b/src/main/java/ti4/discord/interactions/commands/tech/TechUnpurge.java similarity index 92% rename from src/main/java/ti4/commands/tech/TechUnpurge.java rename to src/main/java/ti4/discord/interactions/commands/tech/TechUnpurge.java index 4aebaf44d7..2cd2b4d151 100644 --- a/src/main/java/ti4/commands/tech/TechUnpurge.java +++ b/src/main/java/ti4/discord/interactions/commands/tech/TechUnpurge.java @@ -1,4 +1,4 @@ -package ti4.commands.tech; +package ti4.discord.interactions.commands.tech; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import ti4.game.Player; diff --git a/src/main/java/ti4/commands/tf/DiscardVeiledCard.java b/src/main/java/ti4/discord/interactions/commands/tf/DiscardVeiledCard.java similarity index 89% rename from src/main/java/ti4/commands/tf/DiscardVeiledCard.java rename to src/main/java/ti4/discord/interactions/commands/tf/DiscardVeiledCard.java index c58b18e5a5..d94700f12d 100644 --- a/src/main/java/ti4/commands/tf/DiscardVeiledCard.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DiscardVeiledCard.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.service.VeiledHeartService; diff --git a/src/main/java/ti4/commands/tf/DoEdictPhase.java b/src/main/java/ti4/discord/interactions/commands/tf/DoEdictPhase.java similarity index 69% rename from src/main/java/ti4/commands/tf/DoEdictPhase.java rename to src/main/java/ti4/discord/interactions/commands/tf/DoEdictPhase.java index 91b76e7b07..d638637b09 100644 --- a/src/main/java/ti4/commands/tf/DoEdictPhase.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DoEdictPhase.java @@ -1,8 +1,8 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.handlers.agenda.EdictPhaseHandler; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.buttons.handlers.agenda.EdictPhaseHandler; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; class DoEdictPhase extends GameStateSubcommand { diff --git a/src/main/java/ti4/commands/tf/DrawRandomAbility.java b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomAbility.java similarity index 90% rename from src/main/java/ti4/commands/tf/DrawRandomAbility.java rename to src/main/java/ti4/discord/interactions/commands/tf/DrawRandomAbility.java index e0010a2388..ce5cab9b26 100644 --- a/src/main/java/ti4/commands/tf/DrawRandomAbility.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomAbility.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tf/DrawRandomGenome.java b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomGenome.java similarity index 90% rename from src/main/java/ti4/commands/tf/DrawRandomGenome.java rename to src/main/java/ti4/discord/interactions/commands/tf/DrawRandomGenome.java index 89a538a7f6..ec239391fc 100644 --- a/src/main/java/ti4/commands/tf/DrawRandomGenome.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomGenome.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tf/DrawRandomParadigm.java b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomParadigm.java similarity index 90% rename from src/main/java/ti4/commands/tf/DrawRandomParadigm.java rename to src/main/java/ti4/discord/interactions/commands/tf/DrawRandomParadigm.java index a1ba378725..d48d961c64 100644 --- a/src/main/java/ti4/commands/tf/DrawRandomParadigm.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomParadigm.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; diff --git a/src/main/java/ti4/commands/tf/DrawRandomUnit.java b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomUnit.java similarity index 90% rename from src/main/java/ti4/commands/tf/DrawRandomUnit.java rename to src/main/java/ti4/discord/interactions/commands/tf/DrawRandomUnit.java index fd7c9f0319..7e3c47a0b7 100644 --- a/src/main/java/ti4/commands/tf/DrawRandomUnit.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DrawRandomUnit.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tf/DrawSpecificParadigm.java b/src/main/java/ti4/discord/interactions/commands/tf/DrawSpecificParadigm.java similarity index 93% rename from src/main/java/ti4/commands/tf/DrawSpecificParadigm.java rename to src/main/java/ti4/discord/interactions/commands/tf/DrawSpecificParadigm.java index 4bb2e7843c..347a951209 100644 --- a/src/main/java/ti4/commands/tf/DrawSpecificParadigm.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/DrawSpecificParadigm.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; diff --git a/src/main/java/ti4/commands/tf/FixColors.java b/src/main/java/ti4/discord/interactions/commands/tf/FixColors.java similarity index 81% rename from src/main/java/ti4/commands/tf/FixColors.java rename to src/main/java/ti4/discord/interactions/commands/tf/FixColors.java index 65545d3b3f..37594d3196 100644 --- a/src/main/java/ti4/commands/tf/FixColors.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/FixColors.java @@ -1,7 +1,7 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.ButtonHelperTwilightsFall; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tf/RadicalAdvancement.java b/src/main/java/ti4/discord/interactions/commands/tf/RadicalAdvancement.java similarity index 91% rename from src/main/java/ti4/commands/tf/RadicalAdvancement.java rename to src/main/java/ti4/discord/interactions/commands/tf/RadicalAdvancement.java index 03038de463..e2cd618c4f 100644 --- a/src/main/java/ti4/commands/tf/RadicalAdvancement.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/RadicalAdvancement.java @@ -1,9 +1,9 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tf/ReverseSplice.java b/src/main/java/ti4/discord/interactions/commands/tf/ReverseSplice.java similarity index 82% rename from src/main/java/ti4/commands/tf/ReverseSplice.java rename to src/main/java/ti4/discord/interactions/commands/tf/ReverseSplice.java index 930ec31722..8f40ab49ff 100644 --- a/src/main/java/ti4/commands/tf/ReverseSplice.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/ReverseSplice.java @@ -1,7 +1,7 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.ButtonHelperTwilightsFall; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/tf/SetupStartingFleet.java b/src/main/java/ti4/discord/interactions/commands/tf/SetupStartingFleet.java similarity index 96% rename from src/main/java/ti4/commands/tf/SetupStartingFleet.java rename to src/main/java/ti4/discord/interactions/commands/tf/SetupStartingFleet.java index 9166908d7f..6897e5d895 100644 --- a/src/main/java/ti4/commands/tf/SetupStartingFleet.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/SetupStartingFleet.java @@ -1,11 +1,11 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.apache.commons.lang3.StringUtils; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/tf/StartNewSplice.java b/src/main/java/ti4/discord/interactions/commands/tf/StartNewSplice.java similarity index 95% rename from src/main/java/ti4/commands/tf/StartNewSplice.java rename to src/main/java/ti4/discord/interactions/commands/tf/StartNewSplice.java index 1759664a9b..fbc0fdd14b 100644 --- a/src/main/java/ti4/commands/tf/StartNewSplice.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/StartNewSplice.java @@ -1,4 +1,4 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelperTwilightsFall; diff --git a/src/main/java/ti4/commands/tf/TwilightFallCommand.java b/src/main/java/ti4/discord/interactions/commands/tf/TwilightFallCommand.java similarity index 88% rename from src/main/java/ti4/commands/tf/TwilightFallCommand.java rename to src/main/java/ti4/discord/interactions/commands/tf/TwilightFallCommand.java index caa4b75786..e05a26ec79 100644 --- a/src/main/java/ti4/commands/tf/TwilightFallCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tf/TwilightFallCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.tf; +package ti4.discord.interactions.commands.tf; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class TwilightFallCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/tigl/ChangeNickname.java b/src/main/java/ti4/discord/interactions/commands/tigl/ChangeNickname.java similarity index 87% rename from src/main/java/ti4/commands/tigl/ChangeNickname.java rename to src/main/java/ti4/discord/interactions/commands/tigl/ChangeNickname.java index 41ee4a0d53..60514ad02c 100644 --- a/src/main/java/ti4/commands/tigl/ChangeNickname.java +++ b/src/main/java/ti4/discord/interactions/commands/tigl/ChangeNickname.java @@ -1,9 +1,9 @@ -package ti4.commands.tigl; +package ti4.discord.interactions.commands.tigl; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.service.tigl.TiglUsernameChangeService; diff --git a/src/main/java/ti4/commands/tigl/Games.java b/src/main/java/ti4/discord/interactions/commands/tigl/Games.java similarity index 92% rename from src/main/java/ti4/commands/tigl/Games.java rename to src/main/java/ti4/discord/interactions/commands/tigl/Games.java index cf8dfa78e4..5489b2940c 100644 --- a/src/main/java/ti4/commands/tigl/Games.java +++ b/src/main/java/ti4/discord/interactions/commands/tigl/Games.java @@ -1,10 +1,10 @@ -package ti4.commands.tigl; +package ti4.discord.interactions.commands.tigl; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.spring.service.tigl.TiglGamesInfoService; diff --git a/src/main/java/ti4/commands/tigl/IsFractured.java b/src/main/java/ti4/discord/interactions/commands/tigl/IsFractured.java similarity index 94% rename from src/main/java/ti4/commands/tigl/IsFractured.java rename to src/main/java/ti4/discord/interactions/commands/tigl/IsFractured.java index 30b63d1fb6..75f600565b 100644 --- a/src/main/java/ti4/commands/tigl/IsFractured.java +++ b/src/main/java/ti4/discord/interactions/commands/tigl/IsFractured.java @@ -1,10 +1,10 @@ -package ti4.commands.tigl; +package ti4.discord.interactions.commands.tigl; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/tigl/TiglCommand.java b/src/main/java/ti4/discord/interactions/commands/tigl/TiglCommand.java similarity index 81% rename from src/main/java/ti4/commands/tigl/TiglCommand.java rename to src/main/java/ti4/discord/interactions/commands/tigl/TiglCommand.java index f0d647c347..a869fde3d4 100644 --- a/src/main/java/ti4/commands/tigl/TiglCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tigl/TiglCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.tigl; +package ti4.discord.interactions.commands.tigl; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class TiglCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/tokens/AddCCCommand.java b/src/main/java/ti4/discord/interactions/commands/tokens/AddCCCommand.java similarity index 97% rename from src/main/java/ti4/commands/tokens/AddCCCommand.java rename to src/main/java/ti4/discord/interactions/commands/tokens/AddCCCommand.java index 3ff530816f..69ab10d0e0 100644 --- a/src/main/java/ti4/commands/tokens/AddCCCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/AddCCCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/tokens/AddFrontierTokensCommand.java b/src/main/java/ti4/discord/interactions/commands/tokens/AddFrontierTokensCommand.java similarity index 93% rename from src/main/java/ti4/commands/tokens/AddFrontierTokensCommand.java rename to src/main/java/ti4/discord/interactions/commands/tokens/AddFrontierTokensCommand.java index b7d140a348..2b47829120 100644 --- a/src/main/java/ti4/commands/tokens/AddFrontierTokensCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/AddFrontierTokensCommand.java @@ -1,11 +1,11 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.service.explore.AddFrontierTokensService; diff --git a/src/main/java/ti4/commands/tokens/AddRemoveTokenCommand.java b/src/main/java/ti4/discord/interactions/commands/tokens/AddRemoveTokenCommand.java similarity index 95% rename from src/main/java/ti4/commands/tokens/AddRemoveTokenCommand.java rename to src/main/java/ti4/discord/interactions/commands/tokens/AddRemoveTokenCommand.java index 196511d28c..034d8cdd0d 100644 --- a/src/main/java/ti4/commands/tokens/AddRemoveTokenCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/AddRemoveTokenCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/tokens/AddTokenCommand.java b/src/main/java/ti4/discord/interactions/commands/tokens/AddTokenCommand.java similarity index 99% rename from src/main/java/ti4/commands/tokens/AddTokenCommand.java rename to src/main/java/ti4/discord/interactions/commands/tokens/AddTokenCommand.java index 343c8b3109..0b40c35ca5 100644 --- a/src/main/java/ti4/commands/tokens/AddTokenCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/AddTokenCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/ti4/commands/tokens/RemoveAllCC.java b/src/main/java/ti4/discord/interactions/commands/tokens/RemoveAllCC.java similarity index 93% rename from src/main/java/ti4/commands/tokens/RemoveAllCC.java rename to src/main/java/ti4/discord/interactions/commands/tokens/RemoveAllCC.java index 18a056798e..ab903601c7 100644 --- a/src/main/java/ti4/commands/tokens/RemoveAllCC.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/RemoveAllCC.java @@ -1,11 +1,11 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Tile; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/tokens/RemoveCCCommand.java b/src/main/java/ti4/discord/interactions/commands/tokens/RemoveCCCommand.java similarity index 97% rename from src/main/java/ti4/commands/tokens/RemoveCCCommand.java rename to src/main/java/ti4/discord/interactions/commands/tokens/RemoveCCCommand.java index 2f699085c0..4d65a929da 100644 --- a/src/main/java/ti4/commands/tokens/RemoveCCCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/RemoveCCCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/ti4/commands/tokens/RemoveTokenCommand.java b/src/main/java/ti4/discord/interactions/commands/tokens/RemoveTokenCommand.java similarity index 99% rename from src/main/java/ti4/commands/tokens/RemoveTokenCommand.java rename to src/main/java/ti4/discord/interactions/commands/tokens/RemoveTokenCommand.java index aa486683be..8ffd3ce32d 100644 --- a/src/main/java/ti4/commands/tokens/RemoveTokenCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/tokens/RemoveTokenCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.tokens; +package ti4.discord.interactions.commands.tokens; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/ti4/commands/transaction/ChangeDebtIcon.java b/src/main/java/ti4/discord/interactions/commands/transaction/ChangeDebtIcon.java similarity index 96% rename from src/main/java/ti4/commands/transaction/ChangeDebtIcon.java rename to src/main/java/ti4/discord/interactions/commands/transaction/ChangeDebtIcon.java index 9907c35481..6b1e5d0f7c 100644 --- a/src/main/java/ti4/commands/transaction/ChangeDebtIcon.java +++ b/src/main/java/ti4/discord/interactions/commands/transaction/ChangeDebtIcon.java @@ -1,4 +1,4 @@ -package ti4.commands.transaction; +package ti4.discord.interactions.commands.transaction; import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.fellbaum.jemoji.EmojiManager; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/transaction/TransactionCommand.java b/src/main/java/ti4/discord/interactions/commands/transaction/TransactionCommand.java similarity index 80% rename from src/main/java/ti4/commands/transaction/TransactionCommand.java rename to src/main/java/ti4/discord/interactions/commands/transaction/TransactionCommand.java index 81e1e7122a..2510d41024 100644 --- a/src/main/java/ti4/commands/transaction/TransactionCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/transaction/TransactionCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.transaction; +package ti4.discord.interactions.commands.transaction; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class TransactionCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/transaction/TransactionStart.java b/src/main/java/ti4/discord/interactions/commands/transaction/TransactionStart.java similarity index 81% rename from src/main/java/ti4/commands/transaction/TransactionStart.java rename to src/main/java/ti4/discord/interactions/commands/transaction/TransactionStart.java index f4e3726e16..9212b85763 100644 --- a/src/main/java/ti4/commands/transaction/TransactionStart.java +++ b/src/main/java/ti4/discord/interactions/commands/transaction/TransactionStart.java @@ -1,7 +1,7 @@ -package ti4.commands.transaction; +package ti4.discord.interactions.commands.transaction; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.helpers.Constants; import ti4.helpers.TransactionHelper; diff --git a/src/main/java/ti4/commands/uncategorized/AllInfoCommand.java b/src/main/java/ti4/discord/interactions/commands/uncategorized/AllInfoCommand.java similarity index 91% rename from src/main/java/ti4/commands/uncategorized/AllInfoCommand.java rename to src/main/java/ti4/discord/interactions/commands/uncategorized/AllInfoCommand.java index 1bbd9843be..5c2d057122 100644 --- a/src/main/java/ti4/commands/uncategorized/AllInfoCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/uncategorized/AllInfoCommand.java @@ -1,8 +1,8 @@ -package ti4.commands.uncategorized; +package ti4.discord.interactions.commands.uncategorized; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ActionCardHelper; diff --git a/src/main/java/ti4/commands/uncategorized/CardsInfoCommand.java b/src/main/java/ti4/discord/interactions/commands/uncategorized/CardsInfoCommand.java similarity index 92% rename from src/main/java/ti4/commands/uncategorized/CardsInfoCommand.java rename to src/main/java/ti4/discord/interactions/commands/uncategorized/CardsInfoCommand.java index a08191aa81..29041d8c74 100644 --- a/src/main/java/ti4/commands/uncategorized/CardsInfoCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/uncategorized/CardsInfoCommand.java @@ -1,9 +1,9 @@ -package ti4.commands.uncategorized; +package ti4.discord.interactions.commands.uncategorized; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/uncategorized/SelectionBoxDemoCommand.java b/src/main/java/ti4/discord/interactions/commands/uncategorized/SelectionBoxDemoCommand.java similarity index 71% rename from src/main/java/ti4/commands/uncategorized/SelectionBoxDemoCommand.java rename to src/main/java/ti4/discord/interactions/commands/uncategorized/SelectionBoxDemoCommand.java index 6fd2b32a91..5c53fd18e7 100644 --- a/src/main/java/ti4/commands/uncategorized/SelectionBoxDemoCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/uncategorized/SelectionBoxDemoCommand.java @@ -1,8 +1,8 @@ -package ti4.commands.uncategorized; +package ti4.discord.interactions.commands.uncategorized; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.ParentCommand; -import ti4.selections.selectmenus.BigSelectDemo; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.selections.selectmenus.BigSelectDemo; public class SelectionBoxDemoCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/uncategorized/ServerPromoteCommand.java b/src/main/java/ti4/discord/interactions/commands/uncategorized/ServerPromoteCommand.java similarity index 98% rename from src/main/java/ti4/commands/uncategorized/ServerPromoteCommand.java rename to src/main/java/ti4/discord/interactions/commands/uncategorized/ServerPromoteCommand.java index 50455e4890..9bd86fad4a 100644 --- a/src/main/java/ti4/commands/uncategorized/ServerPromoteCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/uncategorized/ServerPromoteCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.uncategorized; +package ti4.discord.interactions.commands.uncategorized; import static java.util.Map.entry; @@ -12,7 +12,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.ParentCommand; +import ti4.discord.interactions.commands.ParentCommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/uncategorized/ShowDistancesCommand.java b/src/main/java/ti4/discord/interactions/commands/uncategorized/ShowDistancesCommand.java similarity index 95% rename from src/main/java/ti4/commands/uncategorized/ShowDistancesCommand.java rename to src/main/java/ti4/discord/interactions/commands/uncategorized/ShowDistancesCommand.java index bf353e5af6..529857d44c 100644 --- a/src/main/java/ti4/commands/uncategorized/ShowDistancesCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/uncategorized/ShowDistancesCommand.java @@ -1,4 +1,4 @@ -package ti4.commands.uncategorized; +package ti4.discord.interactions.commands.uncategorized; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/uncategorized/ShowGameCommand.java b/src/main/java/ti4/discord/interactions/commands/uncategorized/ShowGameCommand.java similarity index 95% rename from src/main/java/ti4/commands/uncategorized/ShowGameCommand.java rename to src/main/java/ti4/discord/interactions/commands/uncategorized/ShowGameCommand.java index be383e988a..99d1deb93b 100644 --- a/src/main/java/ti4/commands/uncategorized/ShowGameCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/uncategorized/ShowGameCommand.java @@ -1,11 +1,11 @@ -package ti4.commands.uncategorized; +package ti4.discord.interactions.commands.uncategorized; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.helpers.Constants; import ti4.helpers.DisplayType; diff --git a/src/main/java/ti4/commands/units/AddCaptureUnits.java b/src/main/java/ti4/discord/interactions/commands/units/AddCaptureUnits.java similarity index 95% rename from src/main/java/ti4/commands/units/AddCaptureUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/AddCaptureUnits.java index eb25703016..f626dede79 100644 --- a/src/main/java/ti4/commands/units/AddCaptureUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/AddCaptureUnits.java @@ -1,10 +1,10 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/AddUnitDamage.java b/src/main/java/ti4/discord/interactions/commands/units/AddUnitDamage.java similarity index 93% rename from src/main/java/ti4/commands/units/AddUnitDamage.java rename to src/main/java/ti4/discord/interactions/commands/units/AddUnitDamage.java index 03965a7b08..7b6d9dff93 100644 --- a/src/main/java/ti4/commands/units/AddUnitDamage.java +++ b/src/main/java/ti4/discord/interactions/commands/units/AddUnitDamage.java @@ -1,11 +1,11 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/AddUnits.java b/src/main/java/ti4/discord/interactions/commands/units/AddUnits.java similarity index 96% rename from src/main/java/ti4/commands/units/AddUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/AddUnits.java index 44e19fdb55..e9b4ad8db2 100644 --- a/src/main/java/ti4/commands/units/AddUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/AddUnits.java @@ -1,4 +1,4 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; @@ -6,9 +6,9 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.buttons.Buttons; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.game.UnitHolder; diff --git a/src/main/java/ti4/commands/units/CaptureCommand.java b/src/main/java/ti4/discord/interactions/commands/units/CaptureCommand.java similarity index 84% rename from src/main/java/ti4/commands/units/CaptureCommand.java rename to src/main/java/ti4/discord/interactions/commands/units/CaptureCommand.java index e478683246..c7b07d49c8 100644 --- a/src/main/java/ti4/commands/units/CaptureCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/units/CaptureCommand.java @@ -1,11 +1,11 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class CaptureCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/units/FixRemoveCaptureUnits.java b/src/main/java/ti4/discord/interactions/commands/units/FixRemoveCaptureUnits.java similarity index 95% rename from src/main/java/ti4/commands/units/FixRemoveCaptureUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/FixRemoveCaptureUnits.java index 64642eb2f9..e7617c01de 100644 --- a/src/main/java/ti4/commands/units/FixRemoveCaptureUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/FixRemoveCaptureUnits.java @@ -1,10 +1,10 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/ModifyUnitsButtons.java b/src/main/java/ti4/discord/interactions/commands/units/ModifyUnitsButtons.java similarity index 91% rename from src/main/java/ti4/commands/units/ModifyUnitsButtons.java rename to src/main/java/ti4/discord/interactions/commands/units/ModifyUnitsButtons.java index b00eb5fb1f..29b6e50506 100644 --- a/src/main/java/ti4/commands/units/ModifyUnitsButtons.java +++ b/src/main/java/ti4/discord/interactions/commands/units/ModifyUnitsButtons.java @@ -1,9 +1,9 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.ButtonHelper; diff --git a/src/main/java/ti4/commands/units/MoveUnits.java b/src/main/java/ti4/discord/interactions/commands/units/MoveUnits.java similarity index 96% rename from src/main/java/ti4/commands/units/MoveUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/MoveUnits.java index 19a1abeec6..282527c146 100644 --- a/src/main/java/ti4/commands/units/MoveUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/MoveUnits.java @@ -1,4 +1,4 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.buttons.Buttons; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.game.UnitHolder; diff --git a/src/main/java/ti4/commands/units/RemoveAllUnitDamage.java b/src/main/java/ti4/discord/interactions/commands/units/RemoveAllUnitDamage.java similarity index 91% rename from src/main/java/ti4/commands/units/RemoveAllUnitDamage.java rename to src/main/java/ti4/discord/interactions/commands/units/RemoveAllUnitDamage.java index 52bf80f431..4057366e14 100644 --- a/src/main/java/ti4/commands/units/RemoveAllUnitDamage.java +++ b/src/main/java/ti4/discord/interactions/commands/units/RemoveAllUnitDamage.java @@ -1,11 +1,11 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/RemoveAllUnits.java b/src/main/java/ti4/discord/interactions/commands/units/RemoveAllUnits.java similarity index 92% rename from src/main/java/ti4/commands/units/RemoveAllUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/RemoveAllUnits.java index 5ac43b71ea..d15c6ef44e 100644 --- a/src/main/java/ti4/commands/units/RemoveAllUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/RemoveAllUnits.java @@ -1,11 +1,11 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.game.UnitHolder; diff --git a/src/main/java/ti4/commands/units/RemoveCaptureUnits.java b/src/main/java/ti4/discord/interactions/commands/units/RemoveCaptureUnits.java similarity index 95% rename from src/main/java/ti4/commands/units/RemoveCaptureUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/RemoveCaptureUnits.java index 9e7ae8a628..de26c76902 100644 --- a/src/main/java/ti4/commands/units/RemoveCaptureUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/RemoveCaptureUnits.java @@ -1,10 +1,10 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/RemoveUnitDamage.java b/src/main/java/ti4/discord/interactions/commands/units/RemoveUnitDamage.java similarity index 93% rename from src/main/java/ti4/commands/units/RemoveUnitDamage.java rename to src/main/java/ti4/discord/interactions/commands/units/RemoveUnitDamage.java index eeb1ade618..236e47364a 100644 --- a/src/main/java/ti4/commands/units/RemoveUnitDamage.java +++ b/src/main/java/ti4/discord/interactions/commands/units/RemoveUnitDamage.java @@ -1,11 +1,11 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/RemoveUnits.java b/src/main/java/ti4/discord/interactions/commands/units/RemoveUnits.java similarity index 93% rename from src/main/java/ti4/commands/units/RemoveUnits.java rename to src/main/java/ti4/discord/interactions/commands/units/RemoveUnits.java index a553b83b83..8824b04b7c 100644 --- a/src/main/java/ti4/commands/units/RemoveUnits.java +++ b/src/main/java/ti4/discord/interactions/commands/units/RemoveUnits.java @@ -1,12 +1,12 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.CommandHelper; -import ti4.commands.GameStateCommand; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.GameStateCommand; import ti4.game.Game; import ti4.game.Tile; import ti4.helpers.Constants; diff --git a/src/main/java/ti4/commands/units/UnitCommandHelper.java b/src/main/java/ti4/discord/interactions/commands/units/UnitCommandHelper.java similarity index 95% rename from src/main/java/ti4/commands/units/UnitCommandHelper.java rename to src/main/java/ti4/discord/interactions/commands/units/UnitCommandHelper.java index 3236517491..ec275a9dbd 100644 --- a/src/main/java/ti4/commands/units/UnitCommandHelper.java +++ b/src/main/java/ti4/discord/interactions/commands/units/UnitCommandHelper.java @@ -1,10 +1,10 @@ -package ti4.commands.units; +package ti4.discord.interactions.commands.units; import javax.annotation.Nullable; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import ti4.commands.CommandHelper; +import ti4.discord.interactions.commands.CommandHelper; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; diff --git a/src/main/java/ti4/commands/user/MessageMyGames.java b/src/main/java/ti4/discord/interactions/commands/user/MessageMyGames.java similarity index 92% rename from src/main/java/ti4/commands/user/MessageMyGames.java rename to src/main/java/ti4/discord/interactions/commands/user/MessageMyGames.java index 33897b1fc7..805b21bb34 100644 --- a/src/main/java/ti4/commands/user/MessageMyGames.java +++ b/src/main/java/ti4/discord/interactions/commands/user/MessageMyGames.java @@ -1,11 +1,11 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.SearchGameHelper; diff --git a/src/main/java/ti4/commands/user/OfferAFKTimeOptions.java b/src/main/java/ti4/discord/interactions/commands/user/OfferAFKTimeOptions.java similarity index 87% rename from src/main/java/ti4/commands/user/OfferAFKTimeOptions.java rename to src/main/java/ti4/discord/interactions/commands/user/OfferAFKTimeOptions.java index a8dbdfbc72..511f3ba240 100644 --- a/src/main/java/ti4/commands/user/OfferAFKTimeOptions.java +++ b/src/main/java/ti4/discord/interactions/commands/user/OfferAFKTimeOptions.java @@ -1,7 +1,7 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.helpers.PlayerPreferenceHelper; diff --git a/src/main/java/ti4/commands/user/SetFowFilter.java b/src/main/java/ti4/discord/interactions/commands/user/SetFowFilter.java similarity index 94% rename from src/main/java/ti4/commands/user/SetFowFilter.java rename to src/main/java/ti4/discord/interactions/commands/user/SetFowFilter.java index d32f8b2a72..2054a768ca 100644 --- a/src/main/java/ti4/commands/user/SetFowFilter.java +++ b/src/main/java/ti4/discord/interactions/commands/user/SetFowFilter.java @@ -1,10 +1,10 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.GameStateSubcommand; +import ti4.discord.interactions.commands.GameStateSubcommand; import ti4.game.Player; import ti4.helpers.Constants; import ti4.message.MessageHelper; diff --git a/src/main/java/ti4/commands/user/SetPersonalPingInterval.java b/src/main/java/ti4/discord/interactions/commands/user/SetPersonalPingInterval.java similarity index 89% rename from src/main/java/ti4/commands/user/SetPersonalPingInterval.java rename to src/main/java/ti4/discord/interactions/commands/user/SetPersonalPingInterval.java index 8e57dae42a..f7cd6dcff2 100644 --- a/src/main/java/ti4/commands/user/SetPersonalPingInterval.java +++ b/src/main/java/ti4/discord/interactions/commands/user/SetPersonalPingInterval.java @@ -1,9 +1,9 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.service.player.PingIntervalService; class SetPersonalPingInterval extends Subcommand { diff --git a/src/main/java/ti4/commands/user/SetPingOnNextTurn.java b/src/main/java/ti4/discord/interactions/commands/user/SetPingOnNextTurn.java similarity index 88% rename from src/main/java/ti4/commands/user/SetPingOnNextTurn.java rename to src/main/java/ti4/discord/interactions/commands/user/SetPingOnNextTurn.java index 9b57300bb1..c2ec66c551 100644 --- a/src/main/java/ti4/commands/user/SetPingOnNextTurn.java +++ b/src/main/java/ti4/discord/interactions/commands/user/SetPingOnNextTurn.java @@ -1,9 +1,9 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.service.player.PingOnNextTurn; class SetPingOnNextTurn extends Subcommand { diff --git a/src/main/java/ti4/commands/user/SetPreferredColourList.java b/src/main/java/ti4/discord/interactions/commands/user/SetPreferredColourList.java similarity index 95% rename from src/main/java/ti4/commands/user/SetPreferredColourList.java rename to src/main/java/ti4/discord/interactions/commands/user/SetPreferredColourList.java index 35e329ffc4..bd238c2246 100644 --- a/src/main/java/ti4/commands/user/SetPreferredColourList.java +++ b/src/main/java/ti4/discord/interactions/commands/user/SetPreferredColourList.java @@ -1,11 +1,11 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import java.util.ArrayList; import java.util.List; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.AliasHandler; import ti4.helpers.Helper; import ti4.image.Mapper; diff --git a/src/main/java/ti4/commands/user/SetPreferredSettings.java b/src/main/java/ti4/discord/interactions/commands/user/SetPreferredSettings.java similarity index 97% rename from src/main/java/ti4/commands/user/SetPreferredSettings.java rename to src/main/java/ti4/discord/interactions/commands/user/SetPreferredSettings.java index b4cfd34801..080c2f2d25 100644 --- a/src/main/java/ti4/commands/user/SetPreferredSettings.java +++ b/src/main/java/ti4/discord/interactions/commands/user/SetPreferredSettings.java @@ -1,10 +1,10 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.message.MessageHelper; import ti4.settings.users.UserSettingsManager; diff --git a/src/main/java/ti4/commands/user/ShowUserSettings.java b/src/main/java/ti4/discord/interactions/commands/user/ShowUserSettings.java similarity index 92% rename from src/main/java/ti4/commands/user/ShowUserSettings.java rename to src/main/java/ti4/discord/interactions/commands/user/ShowUserSettings.java index 9fe495324d..9a92d8f848 100644 --- a/src/main/java/ti4/commands/user/ShowUserSettings.java +++ b/src/main/java/ti4/discord/interactions/commands/user/ShowUserSettings.java @@ -1,11 +1,11 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import java.util.List; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.buttons.Buttons; -import ti4.commands.Subcommand; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.Subcommand; import ti4.json.JsonMapperManager; import ti4.message.MessageHelper; import ti4.settings.users.UserSettings; diff --git a/src/main/java/ti4/commands/user/Survey.java b/src/main/java/ti4/discord/interactions/commands/user/Survey.java similarity index 81% rename from src/main/java/ti4/commands/user/Survey.java rename to src/main/java/ti4/discord/interactions/commands/user/Survey.java index dc8412cd9f..e0d9ec8c56 100644 --- a/src/main/java/ti4/commands/user/Survey.java +++ b/src/main/java/ti4/discord/interactions/commands/user/Survey.java @@ -1,7 +1,7 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; import ti4.helpers.PlayerTitleHelper; diff --git a/src/main/java/ti4/commands/user/UserCommand.java b/src/main/java/ti4/discord/interactions/commands/user/UserCommand.java similarity index 86% rename from src/main/java/ti4/commands/user/UserCommand.java rename to src/main/java/ti4/discord/interactions/commands/user/UserCommand.java index 475a073449..96f68d884c 100644 --- a/src/main/java/ti4/commands/user/UserCommand.java +++ b/src/main/java/ti4/discord/interactions/commands/user/UserCommand.java @@ -1,10 +1,10 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import ti4.commands.ParentCommand; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.helpers.Constants; public class UserCommand implements ParentCommand { diff --git a/src/main/java/ti4/commands/user/WipeTurnTime.java b/src/main/java/ti4/discord/interactions/commands/user/WipeTurnTime.java similarity index 95% rename from src/main/java/ti4/commands/user/WipeTurnTime.java rename to src/main/java/ti4/discord/interactions/commands/user/WipeTurnTime.java index ba70c4a439..59d6ace42d 100644 --- a/src/main/java/ti4/commands/user/WipeTurnTime.java +++ b/src/main/java/ti4/discord/interactions/commands/user/WipeTurnTime.java @@ -1,8 +1,8 @@ -package ti4.commands.user; +package ti4.discord.interactions.commands.user; import java.util.HashSet; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; -import ti4.commands.Subcommand; +import ti4.discord.interactions.commands.Subcommand; import ti4.executors.ExecutionLockManager; import ti4.game.Game; import ti4.game.Player; diff --git a/src/main/java/ti4/listeners/context/ButtonContext.java b/src/main/java/ti4/discord/interactions/context/ButtonContext.java similarity index 97% rename from src/main/java/ti4/listeners/context/ButtonContext.java rename to src/main/java/ti4/discord/interactions/context/ButtonContext.java index fc2cd4d773..cd7661dd81 100644 --- a/src/main/java/ti4/listeners/context/ButtonContext.java +++ b/src/main/java/ti4/discord/interactions/context/ButtonContext.java @@ -1,4 +1,4 @@ -package ti4.listeners.context; +package ti4.discord.interactions.context; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/src/main/java/ti4/listeners/context/ListenerContext.java b/src/main/java/ti4/discord/interactions/context/ListenerContext.java similarity index 97% rename from src/main/java/ti4/listeners/context/ListenerContext.java rename to src/main/java/ti4/discord/interactions/context/ListenerContext.java index 6b96a2d409..35729098c9 100644 --- a/src/main/java/ti4/listeners/context/ListenerContext.java +++ b/src/main/java/ti4/discord/interactions/context/ListenerContext.java @@ -1,4 +1,4 @@ -package ti4.listeners.context; +package ti4.discord.interactions.context; import java.util.Collections; import java.util.List; @@ -12,8 +12,9 @@ import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; -import ti4.commands.CommandHelper; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.commands.CommandHelper; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; @@ -25,7 +26,6 @@ import ti4.service.event.EventAuditService; import ti4.service.game.GameNameService; import ti4.settings.users.UserSettingsManager; -import ti4.spring.jda.JdaService; @Getter public abstract class ListenerContext { diff --git a/src/main/java/ti4/listeners/context/ModalContext.java b/src/main/java/ti4/discord/interactions/context/ModalContext.java similarity index 98% rename from src/main/java/ti4/listeners/context/ModalContext.java rename to src/main/java/ti4/discord/interactions/context/ModalContext.java index 6fefa66e3a..6aea0d30f4 100644 --- a/src/main/java/ti4/listeners/context/ModalContext.java +++ b/src/main/java/ti4/discord/interactions/context/ModalContext.java @@ -1,4 +1,4 @@ -package ti4.listeners.context; +package ti4.discord.interactions.context; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/ti4/listeners/context/SelectionMenuContext.java b/src/main/java/ti4/discord/interactions/context/SelectionMenuContext.java similarity index 96% rename from src/main/java/ti4/listeners/context/SelectionMenuContext.java rename to src/main/java/ti4/discord/interactions/context/SelectionMenuContext.java index af4d8a357e..df706f209b 100644 --- a/src/main/java/ti4/listeners/context/SelectionMenuContext.java +++ b/src/main/java/ti4/discord/interactions/context/SelectionMenuContext.java @@ -1,4 +1,4 @@ -package ti4.listeners.context; +package ti4.discord.interactions.context; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ti4/listeners/AutoCompleteListener.java b/src/main/java/ti4/discord/interactions/listeners/AutoCompleteListener.java similarity index 89% rename from src/main/java/ti4/listeners/AutoCompleteListener.java rename to src/main/java/ti4/discord/interactions/listeners/AutoCompleteListener.java index 2b246b0f63..860583e763 100644 --- a/src/main/java/ti4/listeners/AutoCompleteListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/AutoCompleteListener.java @@ -1,11 +1,10 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import javax.annotation.Nonnull; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import ti4.autocomplete.AutoCompleteProvider; +import ti4.discord.JdaService; import ti4.executors.ExecutorServiceManager; -import ti4.spring.jda.JdaService; public class AutoCompleteListener extends ListenerAdapter { diff --git a/src/main/java/ti4/autocomplete/AutoCompleteProvider.java b/src/main/java/ti4/discord/interactions/listeners/AutoCompleteProvider.java similarity index 99% rename from src/main/java/ti4/autocomplete/AutoCompleteProvider.java rename to src/main/java/ti4/discord/interactions/listeners/AutoCompleteProvider.java index f0099c0489..267acc3230 100644 --- a/src/main/java/ti4/autocomplete/AutoCompleteProvider.java +++ b/src/main/java/ti4/discord/interactions/listeners/AutoCompleteProvider.java @@ -1,4 +1,4 @@ -package ti4.autocomplete; +package ti4.discord.interactions.listeners; import java.util.ArrayList; import java.util.Arrays; @@ -24,10 +24,11 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; import org.jetbrains.annotations.NotNull; -import ti4.commands.CommandHelper; -import ti4.commands.statistics.GameStatisticsFilterer; -import ti4.commands.uncategorized.ServerPromoteCommand; import ti4.cron.CronManager; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.commands.statistics.GameStatisticsFilterer; +import ti4.discord.interactions.commands.uncategorized.ServerPromoteCommand; import ti4.game.Game; import ti4.game.Player; import ti4.game.persistence.GameManager; @@ -84,12 +85,11 @@ import ti4.service.statistics.PlayerStatTypes; import ti4.service.statistics.game.GameStatTypes; import ti4.settings.GlobalSettings; -import ti4.spring.jda.JdaService; @UtilityClass -public class AutoCompleteProvider { +class AutoCompleteProvider { - public static void handleAutoCompleteEvent(CommandAutoCompleteInteractionEvent event) { + static void handleAutoCompleteEvent(CommandAutoCompleteInteractionEvent event) { try { resolveAutoCompleteEvent(event); } catch (Exception e) { diff --git a/src/main/java/ti4/listeners/BanListener.java b/src/main/java/ti4/discord/interactions/listeners/BanListener.java similarity index 96% rename from src/main/java/ti4/listeners/BanListener.java rename to src/main/java/ti4/discord/interactions/listeners/BanListener.java index 522290b6a0..fc212dd985 100644 --- a/src/main/java/ti4/listeners/BanListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/BanListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import javax.annotation.Nonnull; import net.dv8tion.jda.api.audit.AuditLogEntry; diff --git a/src/main/java/ti4/listeners/BotRuntimeStatsListener.java b/src/main/java/ti4/discord/interactions/listeners/BotRuntimeStatsListener.java similarity index 94% rename from src/main/java/ti4/listeners/BotRuntimeStatsListener.java rename to src/main/java/ti4/discord/interactions/listeners/BotRuntimeStatsListener.java index 6ff80f5869..e7bc72090d 100644 --- a/src/main/java/ti4/listeners/BotRuntimeStatsListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/BotRuntimeStatsListener.java @@ -3,7 +3,7 @@ // How: Extends ListenerAdapter and handles GenericInteractionCreateEvent to call // BotRuntimeStats.incrementRequestCount(). -package ti4.listeners; +package ti4.discord.interactions.listeners; import javax.annotation.Nonnull; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; diff --git a/src/main/java/ti4/listeners/ButtonListener.java b/src/main/java/ti4/discord/interactions/listeners/ButtonListener.java similarity index 94% rename from src/main/java/ti4/listeners/ButtonListener.java rename to src/main/java/ti4/discord/interactions/listeners/ButtonListener.java index 98c585c326..feff3164b5 100644 --- a/src/main/java/ti4/listeners/ButtonListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/ButtonListener.java @@ -1,14 +1,14 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import java.util.Set; import javax.annotation.Nonnull; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.ButtonProcessor; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.ButtonProcessor; import ti4.helpers.ButtonHelper; import ti4.logging.BotLogger; -import ti4.spring.jda.JdaService; public class ButtonListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/ChannelCreationListener.java b/src/main/java/ti4/discord/interactions/listeners/ChannelCreationListener.java similarity index 94% rename from src/main/java/ti4/listeners/ChannelCreationListener.java rename to src/main/java/ti4/discord/interactions/listeners/ChannelCreationListener.java index 2499d5b4da..3829addd3f 100644 --- a/src/main/java/ti4/listeners/ChannelCreationListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/ChannelCreationListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import java.util.ArrayList; import java.util.List; @@ -9,10 +9,10 @@ import net.dv8tion.jda.api.events.channel.ChannelCreateEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.jetbrains.annotations.NotNull; -import ti4.buttons.Buttons; -import ti4.buttons.handlers.game.CreateGameButtonHandler; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.buttons.handlers.game.CreateGameButtonHandler; import ti4.helpers.ButtonHelper; -import ti4.spring.jda.JdaService; public class ChannelCreationListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/ContextMenuListener.java b/src/main/java/ti4/discord/interactions/listeners/ContextMenuListener.java similarity index 90% rename from src/main/java/ti4/listeners/ContextMenuListener.java rename to src/main/java/ti4/discord/interactions/listeners/ContextMenuListener.java index ca34c10ec9..1339f4224a 100644 --- a/src/main/java/ti4/listeners/ContextMenuListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/ContextMenuListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent; @@ -6,11 +6,11 @@ import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.context.ContextCommand; -import ti4.commands.context.ContextCommandManager; +import ti4.discord.interactions.commands.context.ContextCommand; +import ti4.discord.interactions.commands.context.ContextCommandManager; import ti4.executors.ExecutorServiceManager; import ti4.logging.BotLogger; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; import ti4.service.game.GameNameService; public class ContextMenuListener extends ListenerAdapter implements ListenerInterface { @@ -26,7 +26,7 @@ public void onUserContextInteraction(UserContextInteractionEvent event) { } private void onContextInteraction(GenericContextInteractionEvent event) { - if (!receiveCommands(event)) return; + if (!canReceiveCommands(event)) return; event.getInteraction().deferReply(true).queue(Consumers.nop(), BotLogger::catchRestError); queue(event); } diff --git a/src/main/java/ti4/listeners/DeletionListener.java b/src/main/java/ti4/discord/interactions/listeners/DeletionListener.java similarity index 98% rename from src/main/java/ti4/listeners/DeletionListener.java rename to src/main/java/ti4/discord/interactions/listeners/DeletionListener.java index 0736706c33..a416deac75 100644 --- a/src/main/java/ti4/listeners/DeletionListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/DeletionListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import javax.annotation.Nonnull; import net.dv8tion.jda.api.entities.User; @@ -8,13 +8,13 @@ import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.events.message.MessageDeleteEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import ti4.discord.JdaService; import ti4.executors.ExecutorServiceManager; import ti4.game.Game; import ti4.game.persistence.GameManager; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.game.GameNameService; -import ti4.spring.jda.JdaService; import ti4.spring.service.messagecache.SavedBotMessagesService; public class DeletionListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/ListenerInterface.java b/src/main/java/ti4/discord/interactions/listeners/ListenerInterface.java similarity index 94% rename from src/main/java/ti4/listeners/ListenerInterface.java rename to src/main/java/ti4/discord/interactions/listeners/ListenerInterface.java index b972e787db..2140258e4b 100644 --- a/src/main/java/ti4/listeners/ListenerInterface.java +++ b/src/main/java/ti4/discord/interactions/listeners/ListenerInterface.java @@ -1,18 +1,18 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.JdaService; import ti4.helpers.DateTimeHelper; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.service.game.GameNameService; -import ti4.spring.jda.JdaService; public interface ListenerInterface { long DELAY_THRESHOLD_MILLISECONDS = 2000; - default boolean receiveCommands(GenericCommandInteractionEvent event) { + default boolean canReceiveCommands(GenericCommandInteractionEvent event) { if (!JdaService.isReadyToReceiveCommands() && !"developer setting".equals(event.getInteraction().getFullCommandName())) { event.getInteraction() diff --git a/src/main/java/ti4/listeners/MessageListener.java b/src/main/java/ti4/discord/interactions/listeners/MessageListener.java similarity index 99% rename from src/main/java/ti4/listeners/MessageListener.java rename to src/main/java/ti4/discord/interactions/listeners/MessageListener.java index 224585de72..872c3b98a4 100644 --- a/src/main/java/ti4/listeners/MessageListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/MessageListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import java.util.List; import java.util.Objects; @@ -13,6 +13,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.JdaService; import ti4.executors.ExecutorServiceManager; import ti4.game.Game; import ti4.game.Player; @@ -30,7 +31,6 @@ import ti4.service.fow.WhisperService; import ti4.service.game.CreateGameService; import ti4.service.game.GameNameService; -import ti4.spring.jda.JdaService; import ti4.spring.service.messagecache.SavedBotMessagesService; public class MessageListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/ModalListener.java b/src/main/java/ti4/discord/interactions/listeners/ModalListener.java similarity index 85% rename from src/main/java/ti4/listeners/ModalListener.java rename to src/main/java/ti4/discord/interactions/listeners/ModalListener.java index cf0f80a893..e8dde02d23 100644 --- a/src/main/java/ti4/listeners/ModalListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/ModalListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import java.util.HashMap; import java.util.Map; @@ -7,16 +7,16 @@ import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.JdaService; +import ti4.discord.interactions.context.ModalContext; +import ti4.discord.interactions.routing.AnnotationHandler; +import ti4.discord.interactions.routing.ModalHandler; import ti4.executors.ExecutorServiceManager; import ti4.game.Game; -import ti4.listeners.annotations.AnnotationHandler; -import ti4.listeners.annotations.ModalHandler; -import ti4.listeners.context.ModalContext; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; import ti4.service.game.GameNameService; -import ti4.spring.jda.JdaService; public final class ModalListener extends ListenerAdapter { @@ -107,14 +107,4 @@ private void resolveModalInteractionEvent(@Nonnull ModalContext context) { game.initializeMiltySettings().parseInput(context); } } - - public static String getModalDebugText(ModalInteractionEvent event) { - // for (ModalMapping field : event.getValues()) { - // output.append("\n> Field: ") - // .append(field.getCustomId()) - // .append(" => ") - // .append(field.getAsString()); - // } - return "INPUT:\n```\n" + "MenuID: " + event.getModalId() + "\n```"; - } } diff --git a/src/main/java/ti4/listeners/SelectionMenuListener.java b/src/main/java/ti4/discord/interactions/listeners/SelectionMenuListener.java similarity index 85% rename from src/main/java/ti4/listeners/SelectionMenuListener.java rename to src/main/java/ti4/discord/interactions/listeners/SelectionMenuListener.java index bf5e8bc1df..4365d61a62 100644 --- a/src/main/java/ti4/listeners/SelectionMenuListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/SelectionMenuListener.java @@ -1,12 +1,12 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import javax.annotation.Nonnull; import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.JdaService; +import ti4.discord.interactions.selections.SelectionMenuProcessor; import ti4.logging.BotLogger; -import ti4.selections.SelectionMenuProcessor; -import ti4.spring.jda.JdaService; public class SelectionMenuListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/SlashCommandListener.java b/src/main/java/ti4/discord/interactions/listeners/SlashCommandListener.java similarity index 94% rename from src/main/java/ti4/listeners/SlashCommandListener.java rename to src/main/java/ti4/discord/interactions/listeners/SlashCommandListener.java index e895ff3690..2d7a23744a 100644 --- a/src/main/java/ti4/listeners/SlashCommandListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/SlashCommandListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import java.util.Arrays; import java.util.List; @@ -8,12 +8,12 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.apache.commons.lang3.function.Consumers; -import ti4.commands.ParentCommand; -import ti4.commands.SlashCommandManager; +import ti4.discord.interactions.commands.ParentCommand; +import ti4.discord.interactions.commands.SlashCommandManager; import ti4.executors.ExecutorServiceManager; import ti4.helpers.Constants; import ti4.logging.BotLogger; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; import ti4.service.SusSlashCommandService; import ti4.service.game.GameNameService; @@ -27,7 +27,7 @@ public class SlashCommandListener extends ListenerAdapter implements ListenerInt @Override public void onSlashCommandInteraction(@Nonnull SlashCommandInteractionEvent event) { - if (!receiveCommands(event)) return; + if (!canReceiveCommands(event)) return; if (!isModalCommand(event)) { event.getInteraction().deferReply().queue(Consumers.nop(), BotLogger::catchRestError); diff --git a/src/main/java/ti4/listeners/ThreadCreateListener.java b/src/main/java/ti4/discord/interactions/listeners/ThreadCreateListener.java similarity index 93% rename from src/main/java/ti4/listeners/ThreadCreateListener.java rename to src/main/java/ti4/discord/interactions/listeners/ThreadCreateListener.java index ca56bbac20..9d66865135 100644 --- a/src/main/java/ti4/listeners/ThreadCreateListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/ThreadCreateListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import net.dv8tion.jda.api.events.channel.ChannelCreateEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/ti4/listeners/UserJoinServerListener.java b/src/main/java/ti4/discord/interactions/listeners/UserJoinServerListener.java similarity index 97% rename from src/main/java/ti4/listeners/UserJoinServerListener.java rename to src/main/java/ti4/discord/interactions/listeners/UserJoinServerListener.java index b36503b745..5a06ff1dbb 100644 --- a/src/main/java/ti4/listeners/UserJoinServerListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/UserJoinServerListener.java @@ -1,14 +1,14 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import javax.annotation.Nonnull; import net.dv8tion.jda.api.events.guild.GenericGuildEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import ti4.discord.JdaService; import ti4.executors.ExecutorServiceManager; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.async.RoleService; -import ti4.spring.jda.JdaService; public class UserJoinServerListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/UserLeaveServerListener.java b/src/main/java/ti4/discord/interactions/listeners/UserLeaveServerListener.java similarity index 99% rename from src/main/java/ti4/listeners/UserLeaveServerListener.java rename to src/main/java/ti4/discord/interactions/listeners/UserLeaveServerListener.java index 8dffc9ce1e..0f40a8f969 100644 --- a/src/main/java/ti4/listeners/UserLeaveServerListener.java +++ b/src/main/java/ti4/discord/interactions/listeners/UserLeaveServerListener.java @@ -1,4 +1,4 @@ -package ti4.listeners; +package ti4.discord.interactions.listeners; import java.util.ArrayList; import java.util.List; @@ -12,6 +12,7 @@ import net.dv8tion.jda.api.events.guild.GenericGuildEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import ti4.discord.JdaService; import ti4.executors.ExecutorServiceManager; import ti4.game.Game; import ti4.game.Player; @@ -24,7 +25,6 @@ import ti4.service.async.BanCleanupService; import ti4.service.emoji.MiscEmojis; import ti4.settings.users.UserSettingsManager; -import ti4.spring.jda.JdaService; public class UserLeaveServerListener extends ListenerAdapter { diff --git a/src/main/java/ti4/listeners/annotations/AnnotationHandler.java b/src/main/java/ti4/discord/interactions/routing/AnnotationHandler.java similarity index 98% rename from src/main/java/ti4/listeners/annotations/AnnotationHandler.java rename to src/main/java/ti4/discord/interactions/routing/AnnotationHandler.java index 98220e367f..6152535aaf 100644 --- a/src/main/java/ti4/listeners/annotations/AnnotationHandler.java +++ b/src/main/java/ti4/discord/interactions/routing/AnnotationHandler.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static org.reflections.scanners.Scanners.SubTypes; @@ -25,13 +25,13 @@ import org.reflections.scanners.SubTypesScanner; import org.reflections.util.ClasspathHelper; import org.reflections.util.ConfigurationBuilder; +import ti4.discord.interactions.context.ButtonContext; +import ti4.discord.interactions.context.ListenerContext; +import ti4.discord.interactions.context.ModalContext; +import ti4.discord.interactions.context.SelectionMenuContext; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; -import ti4.listeners.context.ButtonContext; -import ti4.listeners.context.ListenerContext; -import ti4.listeners.context.ModalContext; -import ti4.listeners.context.SelectionMenuContext; import ti4.logging.BotLogger; public final class AnnotationHandler { diff --git a/src/main/java/ti4/listeners/annotations/ButtonHandler.java b/src/main/java/ti4/discord/interactions/routing/ButtonHandler.java similarity index 96% rename from src/main/java/ti4/listeners/annotations/ButtonHandler.java rename to src/main/java/ti4/discord/interactions/routing/ButtonHandler.java index c33bcec7bc..bc409ccd40 100644 --- a/src/main/java/ti4/listeners/annotations/ButtonHandler.java +++ b/src/main/java/ti4/discord/interactions/routing/ButtonHandler.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/listeners/annotations/ManyButtonHandlers.java b/src/main/java/ti4/discord/interactions/routing/ManyButtonHandlers.java similarity index 89% rename from src/main/java/ti4/listeners/annotations/ManyButtonHandlers.java rename to src/main/java/ti4/discord/interactions/routing/ManyButtonHandlers.java index 73b14178d6..0f80fe9847 100644 --- a/src/main/java/ti4/listeners/annotations/ManyButtonHandlers.java +++ b/src/main/java/ti4/discord/interactions/routing/ManyButtonHandlers.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/listeners/annotations/ManyModalHandlers.java b/src/main/java/ti4/discord/interactions/routing/ManyModalHandlers.java similarity index 89% rename from src/main/java/ti4/listeners/annotations/ManyModalHandlers.java rename to src/main/java/ti4/discord/interactions/routing/ManyModalHandlers.java index 639a55e544..b810a05439 100644 --- a/src/main/java/ti4/listeners/annotations/ManyModalHandlers.java +++ b/src/main/java/ti4/discord/interactions/routing/ManyModalHandlers.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/listeners/annotations/ManySelectionHandlers.java b/src/main/java/ti4/discord/interactions/routing/ManySelectionHandlers.java similarity index 89% rename from src/main/java/ti4/listeners/annotations/ManySelectionHandlers.java rename to src/main/java/ti4/discord/interactions/routing/ManySelectionHandlers.java index 97fe6f35ab..3337a4d2c4 100644 --- a/src/main/java/ti4/listeners/annotations/ManySelectionHandlers.java +++ b/src/main/java/ti4/discord/interactions/routing/ManySelectionHandlers.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/listeners/annotations/ModalHandler.java b/src/main/java/ti4/discord/interactions/routing/ModalHandler.java similarity index 90% rename from src/main/java/ti4/listeners/annotations/ModalHandler.java rename to src/main/java/ti4/discord/interactions/routing/ModalHandler.java index f9347f7c27..cd01544adb 100644 --- a/src/main/java/ti4/listeners/annotations/ModalHandler.java +++ b/src/main/java/ti4/discord/interactions/routing/ModalHandler.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/listeners/annotations/NamedParam.java b/src/main/java/ti4/discord/interactions/routing/NamedParam.java similarity index 94% rename from src/main/java/ti4/listeners/annotations/NamedParam.java rename to src/main/java/ti4/discord/interactions/routing/NamedParam.java index 12ef2301db..0b90fecdd5 100644 --- a/src/main/java/ti4/listeners/annotations/NamedParam.java +++ b/src/main/java/ti4/discord/interactions/routing/NamedParam.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/listeners/annotations/SelectionHandler.java b/src/main/java/ti4/discord/interactions/routing/SelectionHandler.java similarity index 90% rename from src/main/java/ti4/listeners/annotations/SelectionHandler.java rename to src/main/java/ti4/discord/interactions/routing/SelectionHandler.java index 0c98613af6..0f8e541a1d 100644 --- a/src/main/java/ti4/listeners/annotations/SelectionHandler.java +++ b/src/main/java/ti4/discord/interactions/routing/SelectionHandler.java @@ -1,4 +1,4 @@ -package ti4.listeners.annotations; +package ti4.discord.interactions.routing; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/ti4/selections/Selection.java b/src/main/java/ti4/discord/interactions/selections/Selection.java similarity index 80% rename from src/main/java/ti4/selections/Selection.java rename to src/main/java/ti4/discord/interactions/selections/Selection.java index 8aca64a1b9..45b87cdfaa 100644 --- a/src/main/java/ti4/selections/Selection.java +++ b/src/main/java/ti4/discord/interactions/selections/Selection.java @@ -1,7 +1,7 @@ -package ti4.selections; +package ti4.discord.interactions.selections; import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent; -import ti4.listeners.context.SelectionMenuContext; +import ti4.discord.interactions.context.SelectionMenuContext; public interface Selection { diff --git a/src/main/java/ti4/selections/SelectionManager.java b/src/main/java/ti4/discord/interactions/selections/SelectionManager.java similarity index 80% rename from src/main/java/ti4/selections/SelectionManager.java rename to src/main/java/ti4/discord/interactions/selections/SelectionManager.java index e7bb492c6c..67d53a4032 100644 --- a/src/main/java/ti4/selections/SelectionManager.java +++ b/src/main/java/ti4/discord/interactions/selections/SelectionManager.java @@ -1,10 +1,10 @@ -package ti4.selections; +package ti4.discord.interactions.selections; import java.util.ArrayList; import java.util.List; import lombok.Getter; -import ti4.selections.selectmenus.BigSelectDemo; -import ti4.selections.selectmenus.SelectFaction; +import ti4.discord.interactions.selections.selectmenus.BigSelectDemo; +import ti4.discord.interactions.selections.selectmenus.SelectFaction; @Getter public final class SelectionManager { diff --git a/src/main/java/ti4/selections/SelectionMenuProcessor.java b/src/main/java/ti4/discord/interactions/selections/SelectionMenuProcessor.java similarity index 94% rename from src/main/java/ti4/selections/SelectionMenuProcessor.java rename to src/main/java/ti4/discord/interactions/selections/SelectionMenuProcessor.java index a9fe3536fc..6442984476 100644 --- a/src/main/java/ti4/selections/SelectionMenuProcessor.java +++ b/src/main/java/ti4/discord/interactions/selections/SelectionMenuProcessor.java @@ -1,17 +1,17 @@ -package ti4.selections; +package ti4.discord.interactions.selections; import java.util.Map; import java.util.function.Consumer; import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.context.SelectionMenuContext; +import ti4.discord.interactions.routing.AnnotationHandler; +import ti4.discord.interactions.routing.SelectionHandler; import ti4.executors.ExecutorServiceManager; import ti4.game.Game; -import ti4.listeners.annotations.AnnotationHandler; -import ti4.listeners.annotations.SelectionHandler; -import ti4.listeners.context.SelectionMenuContext; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; import ti4.service.game.GameNameService; public final class SelectionMenuProcessor { diff --git a/src/main/java/ti4/selections/selectmenus/BigSelectDemo.java b/src/main/java/ti4/discord/interactions/selections/selectmenus/BigSelectDemo.java similarity index 95% rename from src/main/java/ti4/selections/selectmenus/BigSelectDemo.java rename to src/main/java/ti4/discord/interactions/selections/selectmenus/BigSelectDemo.java index 81009a4e11..2caa6bbecc 100644 --- a/src/main/java/ti4/selections/selectmenus/BigSelectDemo.java +++ b/src/main/java/ti4/discord/interactions/selections/selectmenus/BigSelectDemo.java @@ -1,4 +1,4 @@ -package ti4.selections.selectmenus; +package ti4.discord.interactions.selections.selectmenus; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.listeners.context.SelectionMenuContext; +import ti4.discord.interactions.context.SelectionMenuContext; +import ti4.discord.interactions.selections.Selection; import ti4.logging.BotLogger; -import ti4.selections.Selection; public class BigSelectDemo implements Selection { diff --git a/src/main/java/ti4/selections/selectmenus/SelectFaction.java b/src/main/java/ti4/discord/interactions/selections/selectmenus/SelectFaction.java similarity index 94% rename from src/main/java/ti4/selections/selectmenus/SelectFaction.java rename to src/main/java/ti4/discord/interactions/selections/selectmenus/SelectFaction.java index 57a32a7a8a..8cff966ce1 100644 --- a/src/main/java/ti4/selections/selectmenus/SelectFaction.java +++ b/src/main/java/ti4/discord/interactions/selections/selectmenus/SelectFaction.java @@ -1,4 +1,4 @@ -package ti4.selections.selectmenus; +package ti4.discord.interactions.selections.selectmenus; import java.util.ArrayList; import java.util.Comparator; @@ -11,14 +11,14 @@ import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.function.Consumers; +import ti4.discord.interactions.context.SelectionMenuContext; +import ti4.discord.interactions.selections.Selection; import ti4.game.Game; import ti4.helpers.ButtonHelper; import ti4.image.Mapper; -import ti4.listeners.context.SelectionMenuContext; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.model.FactionModel; -import ti4.selections.Selection; import ti4.service.emoji.FactionEmojis; public class SelectFaction implements Selection { diff --git a/src/main/java/ti4/draft/BagDraft.java b/src/main/java/ti4/draft/BagDraft.java index fc2e52ae0b..19eb50b98c 100644 --- a/src/main/java/ti4/draft/BagDraft.java +++ b/src/main/java/ti4/draft/BagDraft.java @@ -9,7 +9,8 @@ import net.dv8tion.jda.api.requests.restaction.ThreadChannelAction; import org.apache.commons.lang3.function.Consumers; import org.jetbrains.annotations.Nullable; -import ti4.buttons.Buttons; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; import ti4.game.Game; import ti4.game.Player; import ti4.helpers.Constants; @@ -17,7 +18,6 @@ import ti4.logging.LogOrigin; import ti4.message.MessageHelper; import ti4.service.franken.FrankenDraftBagService; -import ti4.spring.jda.JdaService; public abstract class BagDraft { private static final Pattern FORWARD_SLASH_PATTERN = Pattern.compile("/"); diff --git a/src/main/java/ti4/draft/DraftItem.java b/src/main/java/ti4/draft/DraftItem.java index 3b0f1a6a55..d161afc5f6 100644 --- a/src/main/java/ti4/draft/DraftItem.java +++ b/src/main/java/ti4/draft/DraftItem.java @@ -7,7 +7,7 @@ import lombok.Getter; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.components.textdisplay.TextDisplay; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; import ti4.draft.items.AbilityDraftItem; import ti4.draft.items.AgentDraftItem; import ti4.draft.items.BlueTileDraftItem; diff --git a/src/main/java/ti4/executors/ExecutionHistoryManager.java b/src/main/java/ti4/executors/ExecutionHistoryManager.java index d957876a87..5cb3eb2c83 100644 --- a/src/main/java/ti4/executors/ExecutionHistoryManager.java +++ b/src/main/java/ti4/executors/ExecutionHistoryManager.java @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; import ti4.helpers.TimedRunnable; import ti4.logging.BotLogger; -import ti4.rollbar.RollbarManager; +import ti4.logging.RollbarManager; public final class ExecutionHistoryManager { diff --git a/src/main/java/ti4/game/Expeditions.java b/src/main/java/ti4/game/Expeditions.java index da139a5d29..c45c6bffaf 100644 --- a/src/main/java/ti4/game/Expeditions.java +++ b/src/main/java/ti4/game/Expeditions.java @@ -12,13 +12,13 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.lang3.function.Consumers; -import ti4.buttons.Buttons; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.helpers.ActionCardHelper; import ti4.helpers.ButtonHelper; import ti4.helpers.FoWHelper; import ti4.helpers.SecretObjectiveHelper; import ti4.helpers.thundersedge.BreakthroughCommandHelper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.message.MessageHelper; import ti4.service.emoji.CardEmojis; diff --git a/src/main/java/ti4/game/Game.java b/src/main/java/ti4/game/Game.java index a1eacfc45a..722d1d1228 100644 --- a/src/main/java/ti4/game/Game.java +++ b/src/main/java/ti4/game/Game.java @@ -40,7 +40,8 @@ import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import ti4.commands.planet.PlanetRemove; +import ti4.discord.JdaService; +import ti4.discord.interactions.commands.planet.PlanetRemove; import ti4.draft.BagDraft; import ti4.draft.DraftCategory; import ti4.draft.FrankenDraft; @@ -97,7 +98,6 @@ import ti4.service.milty.MiltyDraftManager; import ti4.service.option.FOWOptionService.FOWOption; import ti4.service.statistics.round.RoundStatsTracker; -import ti4.spring.jda.JdaService; import tools.jackson.databind.JsonNode; import tools.jackson.databind.json.JsonMapper; diff --git a/src/main/java/ti4/game/Player.java b/src/main/java/ti4/game/Player.java index 91a5095ece..a90ac874b2 100644 --- a/src/main/java/ti4/game/Player.java +++ b/src/main/java/ti4/game/Player.java @@ -46,7 +46,8 @@ import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import ti4.buttons.Buttons; +import ti4.discord.JdaService; +import ti4.discord.interactions.buttons.Buttons; import ti4.draft.DraftBag; import ti4.draft.DraftItem; import ti4.helpers.ActionCardHelper; @@ -101,7 +102,6 @@ import ti4.service.user.AFKService; import ti4.settings.users.UserSettings; import ti4.settings.users.UserSettingsManager; -import ti4.spring.jda.JdaService; public class Player extends PlayerProperties { diff --git a/src/main/java/ti4/game/persistence/GameManager.java b/src/main/java/ti4/game/persistence/GameManager.java index 9124152a6c..db09431b0f 100644 --- a/src/main/java/ti4/game/persistence/GameManager.java +++ b/src/main/java/ti4/game/persistence/GameManager.java @@ -10,9 +10,9 @@ import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; import lombok.experimental.UtilityClass; +import ti4.discord.JdaService; import ti4.game.Game; import ti4.game.Player; -import ti4.spring.jda.JdaService; @UtilityClass public class GameManager { diff --git a/src/main/java/ti4/migration/DataMigrationManager.java b/src/main/java/ti4/game/persistence/migration/DataMigrationManager.java similarity index 99% rename from src/main/java/ti4/migration/DataMigrationManager.java rename to src/main/java/ti4/game/persistence/migration/DataMigrationManager.java index e0ebf6a5da..bbeacc85c9 100644 --- a/src/main/java/ti4/migration/DataMigrationManager.java +++ b/src/main/java/ti4/game/persistence/migration/DataMigrationManager.java @@ -1,4 +1,4 @@ -package ti4.migration; +package ti4.game.persistence.migration; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/ti4/migration/MigrationHelper.java b/src/main/java/ti4/game/persistence/migration/MigrationHelper.java similarity index 99% rename from src/main/java/ti4/migration/MigrationHelper.java rename to src/main/java/ti4/game/persistence/migration/MigrationHelper.java index d5b219546c..778c7cf9a0 100644 --- a/src/main/java/ti4/migration/MigrationHelper.java +++ b/src/main/java/ti4/game/persistence/migration/MigrationHelper.java @@ -1,4 +1,4 @@ -package ti4.migration; +package ti4.game.persistence.migration; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/ti4/helpers/ActionCardHelper.java b/src/main/java/ti4/helpers/ActionCardHelper.java index f61540b929..4418dcf8aa 100644 --- a/src/main/java/ti4/helpers/ActionCardHelper.java +++ b/src/main/java/ti4/helpers/ActionCardHelper.java @@ -19,16 +19,16 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import ti4.buttons.Buttons; -import ti4.buttons.handlers.agenda.VoteButtonHandler; -import ti4.commands.CommandHelper; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.buttons.handlers.agenda.VoteButtonHandler; +import ti4.discord.interactions.commands.CommandHelper; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Player; import ti4.game.Tile; import ti4.game.UnitHolder; import ti4.helpers.thundersedge.TeHelperActionCards; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.message.MessageHelper; import ti4.model.ActionCardModel; import ti4.model.GenericCardModel; diff --git a/src/main/java/ti4/helpers/AgendaHelper.java b/src/main/java/ti4/helpers/AgendaHelper.java index ab36e46c7a..c0368bc7b1 100644 --- a/src/main/java/ti4/helpers/AgendaHelper.java +++ b/src/main/java/ti4/helpers/AgendaHelper.java @@ -28,11 +28,12 @@ import org.apache.commons.lang3.function.Consumers; import org.apache.commons.lang3.math.NumberUtils; import org.jetbrains.annotations.NotNull; -import ti4.buttons.Buttons; -import ti4.buttons.handlers.agenda.VoteButtonHandler; -import ti4.commands.planet.PlanetExhaust; -import ti4.commands.planet.PlanetExhaustAbility; import ti4.cron.AutoPingCron; +import ti4.discord.interactions.buttons.Buttons; +import ti4.discord.interactions.buttons.handlers.agenda.VoteButtonHandler; +import ti4.discord.interactions.commands.planet.PlanetExhaust; +import ti4.discord.interactions.commands.planet.PlanetExhaustAbility; +import ti4.discord.interactions.routing.ButtonHandler; import ti4.game.Game; import ti4.game.Leader; import ti4.game.Planet; @@ -43,7 +44,6 @@ import ti4.helpers.Units.UnitType; import ti4.image.BannerGenerator; import ti4.image.Mapper; -import ti4.listeners.annotations.ButtonHandler; import ti4.logging.BotLogger; import ti4.logging.LogOrigin; import ti4.message.GameMessageManager; @@ -232,23 +232,13 @@ public static List getPossibleWhenNames(Player player) { if (player.hasAbility("quash") && (player.getStrategicCC() > 0 || player.hasRelicReady("emelpar"))) { names.add("Quash"); } - for (String acId : player.getActionCards().keySet()) { + for (String acId : player.getPlayableActionCards()) { ActionCardModel actionCard = Mapper.getActionCard(acId); String actionCardWindow = actionCard.getWindow(); if (actionCardWindow.contains("When an agenda is revealed")) { names.add(actionCard.getName()); } } - if (player.hasPlanet("garbozia")) { - for (String acId : - ActionCardHelper.getGarboziaActionCards(player.getGame()).keySet()) { - ActionCardModel actionCard = Mapper.getActionCard(acId); - String actionCardWindow = actionCard.getWindow(); - if (actionCardWindow.contains("When an agenda is revealed")) { - names.add(actionCard.getName()); - } - } - } for (String pnId : player.getPromissoryNotes().keySet()) { if (!player.ownsPromissoryNote(pnId) && ((pnId.endsWith("_ps") && !pnId.contains("absol")) || "favor".equals(pnId))) { @@ -264,12 +254,7 @@ private static List