From 13f88ba18c0d3f7631a4886da39a4b0bb7f371f2 Mon Sep 17 00:00:00 2001 From: Kaktushose <42280757+Kaktushose@users.noreply.github.com> Date: Fri, 10 May 2024 14:32:20 +0200 Subject: [PATCH] reformat code --- .../com/github/kaktushose/nplaybot/Database.java | 1 - .../nplaybot/events/collect/CollectEventService.java | 12 ++++++------ .../events/collect/CollectRewardCommands.java | 10 ++++++---- .../nplaybot/events/contest/ContestEventService.java | 1 + .../nplaybot/rank/commands/RankInfoCommand.java | 1 - 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/github/kaktushose/nplaybot/Database.java b/src/main/java/com/github/kaktushose/nplaybot/Database.java index b029e03..3183701 100644 --- a/src/main/java/com/github/kaktushose/nplaybot/Database.java +++ b/src/main/java/com/github/kaktushose/nplaybot/Database.java @@ -7,7 +7,6 @@ import com.github.kaktushose.nplaybot.settings.SettingsService; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import net.dv8tion.jda.api.entities.Role; public class Database { diff --git a/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectEventService.java b/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectEventService.java index bdda76a..53f3491 100644 --- a/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectEventService.java +++ b/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectEventService.java @@ -134,9 +134,6 @@ public int getCollectLootDrop(Message message) { } } - public record CollectCurrency(String name, String emoji) { - } - public CollectCurrency getCollectCurrency(Guild guild) { log.debug("Querying collect currency emoji"); try (Connection connection = dataSource.getConnection()) { @@ -157,9 +154,6 @@ public CollectCurrency getCollectCurrency(Guild guild) { } } - public record CollectReward(int rewardId, String name, int threshold, int xp, long roleId, String embed) { - } - public List getCollectRewards() { log.debug("Querying collect rewards"); try (Connection connection = dataSource.getConnection()) { @@ -218,4 +212,10 @@ public int getCollectPoints(UserSnowflake user) { throw new RuntimeException(e); } } + + public record CollectCurrency(String name, String emoji) { + } + + public record CollectReward(int rewardId, String name, int threshold, int xp, long roleId, String embed) { + } } diff --git a/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectRewardCommands.java b/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectRewardCommands.java index 3da17e8..c05b879 100644 --- a/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectRewardCommands.java +++ b/src/main/java/com/github/kaktushose/nplaybot/events/collect/CollectRewardCommands.java @@ -9,7 +9,9 @@ import com.github.kaktushose.jda.commands.dispatching.reply.Replyable; import com.github.kaktushose.nplaybot.Database; import com.github.kaktushose.nplaybot.permissions.BotPermissions; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Mentions; import net.dv8tion.jda.api.entities.Role; @@ -24,13 +26,13 @@ @Permissions(BotPermissions.MANAGE_EVENTS) public class CollectRewardCommands { + private static final Gson gson = new Gson(); + private static final String ROLE_REWARD = "Rolle"; + private static final String XP_REWARD = "XP"; @Inject private EmbedCache embedCache; @Inject private Database database; - private static final Gson gson = new Gson(); - private static final String ROLE_REWARD = "Rolle"; - private static final String XP_REWARD = "XP"; private String name; private String rewardType; private Role role; diff --git a/src/main/java/com/github/kaktushose/nplaybot/events/contest/ContestEventService.java b/src/main/java/com/github/kaktushose/nplaybot/events/contest/ContestEventService.java index 433ddd1..31253ff 100644 --- a/src/main/java/com/github/kaktushose/nplaybot/events/contest/ContestEventService.java +++ b/src/main/java/com/github/kaktushose/nplaybot/events/contest/ContestEventService.java @@ -16,6 +16,7 @@ public class ContestEventService { private static final Logger log = LoggerFactory.getLogger(ContestEventService.class); private final DataSource dataSource; + public ContestEventService(DataSource dataSource) { this.dataSource = dataSource; } diff --git a/src/main/java/com/github/kaktushose/nplaybot/rank/commands/RankInfoCommand.java b/src/main/java/com/github/kaktushose/nplaybot/rank/commands/RankInfoCommand.java index b4216ee..7a670c1 100644 --- a/src/main/java/com/github/kaktushose/nplaybot/rank/commands/RankInfoCommand.java +++ b/src/main/java/com/github/kaktushose/nplaybot/rank/commands/RankInfoCommand.java @@ -9,7 +9,6 @@ import com.github.kaktushose.nplaybot.rank.model.UserInfo; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; -import net.dv8tion.jda.api.entities.UserSnowflake; import net.dv8tion.jda.api.interactions.commands.Command; @Interaction