From aa5a701813afb05e9f43a4eb0b7c30ac671da4af Mon Sep 17 00:00:00 2001 From: Reason <28310208+Reasonlesss@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:25:52 +0100 Subject: [PATCH 1/2] add vip to helpbot --- .../bot/command/impl/stats/individualized/ProfileCommand.java | 3 ++- src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java | 2 ++ src/main/java/com/diamondfire/helpbot/df/ranks/RankBranch.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java index c0d9647a..eb3cf6b3 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/ProfileCommand.java @@ -76,7 +76,8 @@ protected void execute(CommandEvent event, Player player) { String rankString; { - Rank highRank = RankUtil.getHighRank(set); + Rank[] ranks = RankUtil.getRanks(set); + Rank highRank = RankUtil.getHighRank(ranks); if (highRank == null) { rankString = ""; } else { diff --git a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java index 771f5121..b955793c 100644 --- a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java +++ b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java @@ -4,6 +4,8 @@ import net.dv8tion.jda.api.entities.emoji.Emoji; public enum Rank { + // VIP Pass + VIP("VIP", 1, RankBranch.VIP, "VIP"), // Ranks NOBLE("Noble", 1, RankBranch.DONOR, "Noble"), EMPEROR("Emperor", 2, RankBranch.DONOR, "Emperor"), diff --git a/src/main/java/com/diamondfire/helpbot/df/ranks/RankBranch.java b/src/main/java/com/diamondfire/helpbot/df/ranks/RankBranch.java index 6a503f6c..88df39d4 100644 --- a/src/main/java/com/diamondfire/helpbot/df/ranks/RankBranch.java +++ b/src/main/java/com/diamondfire/helpbot/df/ranks/RankBranch.java @@ -4,6 +4,7 @@ public enum RankBranch { DONOR, + VIP, RETIREMENT, BUILDER, YOUTUBER, From be2537d984e5b646c62b5a6e1b1003806355b87f Mon Sep 17 00:00:00 2001 From: Reason <28310208+Reasonlesss@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:32:32 +0100 Subject: [PATCH 2/2] Add VIP to HelpBot --- src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java | 3 +-- src/main/java/com/diamondfire/helpbot/df/ranks/RankUtil.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java index b955793c..6590fd4e 100644 --- a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java +++ b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java @@ -4,8 +4,6 @@ import net.dv8tion.jda.api.entities.emoji.Emoji; public enum Rank { - // VIP Pass - VIP("VIP", 1, RankBranch.VIP, "VIP"), // Ranks NOBLE("Noble", 1, RankBranch.DONOR, "Noble"), EMPEROR("Emperor", 2, RankBranch.DONOR, "Emperor"), @@ -15,6 +13,7 @@ public enum Rank { RETIRED("Retired", 1, RankBranch.RETIREMENT, "Retired"), EMERITUS("Emeritus", 2, RankBranch.RETIREMENT, "Emeritus"), //Special + VIP("VIP", 1, RankBranch.VIP, "VIP"), BUILDER("B", 1, RankBranch.BUILDER, "Builder"), YOUTUBER("YT", 1, RankBranch.YOUTUBER, "Youtube"), // Support diff --git a/src/main/java/com/diamondfire/helpbot/df/ranks/RankUtil.java b/src/main/java/com/diamondfire/helpbot/df/ranks/RankUtil.java index 88cdf8e2..e070704f 100644 --- a/src/main/java/com/diamondfire/helpbot/df/ranks/RankUtil.java +++ b/src/main/java/com/diamondfire/helpbot/df/ranks/RankUtil.java @@ -26,7 +26,7 @@ public static Rank[] getRanks(ResultSet set) { } catch (SQLException ignored) { } - return ranks.toArray(Rank[]::new); + return ranks.stream().sorted(Comparator.comparingInt(Enum::ordinal)).toArray(Rank[]::new); } public static Rank getHighRank(ResultSet set) {