Merge branch 'master' of https://github.com/Swofty-Developments/HypixelSkyBlock

Author: ItzKatze

README.md

@@ -1,6 +1,6 @@
 # Hypixel SkyBlock
 
-[<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="Discord" height="55" />](https://discord.gg/ZaGW5wzUJ3)
+[<img src="https://discordapp.com/assets/e4923594e694a21542a489471ecffa50.svg" alt="Discord" height="55" />](https://discord.swofty.net)
 
 A 1.21.11 Minestom-based recreation of Hypixel SkyBlock with a properly abstracted, scalable microservices architecture.
 
@@ -22,7 +22,7 @@ Full documentation is available at **[opensource.swofty.net](https://opensource.
 
 - [Releases](https://github.com/Swofty-Developments/HypixelSkyBlock/releases)
 - [Javadocs](https://swofty-developments.github.io/HypixelSkyBlock/)
-- [Discord](https://discord.gg/ZaGW5wzUJ3)
+- [Discord](https://discord.swofty.net)
 - [Video Guide](https://www.youtube.com/watch?v=pxzJbjjQL-M)
 
 ## Features

commons/src/main/java/net/swofty/commons/CustomWorlds.java

@@ -17,6 +17,7 @@ public enum CustomWorlds {
 	PROTOTYPE_LOBBY("hypixel_prototype_lobby"),
 	BEDWARS_LOBBY("hypixel_bedwars_lobby"),
 	MURDER_MYSTERY_LOBBY("hypixel_murder_mystery_lobby"),
+	SKYWARS_LOBBY("hypixel_skywars_lobby"),
 	;
 
 	private final String folderName;

commons/src/main/java/net/swofty/commons/ServerType.java

@@ -24,7 +24,10 @@ public enum ServerType {
 	BEDWARS_CONFIGURATOR(false),
 	MURDER_MYSTERY_LOBBY(false),
 	MURDER_MYSTERY_GAME(false),
-	MURDER_MYSTERY_CONFIGURATOR(false)
+	MURDER_MYSTERY_CONFIGURATOR(false),
+	SKYWARS_LOBBY(false),
+	SKYWARS_GAME(false),
+	SKYWARS_CONFIGURATOR(false)
 	;
 
 	private final boolean isSkyBlock;

commons/src/main/java/net/swofty/commons/skywars/SkywarsGameType.java

@@ -0,0 +1,82 @@
+package net.swofty.commons.skywars;
+
+import lombok.Getter;
+import org.jetbrains.annotations.Nullable;
+
+@Getter
+public enum SkywarsGameType {
+    SOLO_NORMAL(0, "Solo Normal", 1, 12, false),
+    SOLO_INSANE(1, "Solo Insane", 1, 12, true),
+    DOUBLES_NORMAL(2, "Doubles", 2, 12, false),
+    SOLO_LUCKY_BLOCK(3, "Lucky Block", 1, 12, false),
+    ;
+
+    private final int id;
+    private final String displayName;
+    private final int teamSize;
+    private final int maxTeams;
+    private final boolean insane;
+
+    SkywarsGameType(int id, String displayName, int teamSize, int maxTeams, boolean insane) {
+        this.id = id;
+        this.displayName = displayName;
+        this.teamSize = teamSize;
+        this.maxTeams = maxTeams;
+        this.insane = insane;
+    }
+
+    public int maxPlayers() {
+        return teamSize * maxTeams;
+    }
+
+    public int getMaxPlayers() {
+        return maxPlayers();
+    }
+
+    public int getMinPlayers() {
+        // Minimum is 2 players for solo, or 2 teams for team modes
+        return teamSize == 1 ? 2 : teamSize * 2;
+    }
+
+    public boolean isSolo() {
+        return teamSize == 1;
+    }
+
+    /**
+     * Returns the mode string for this game type.
+     * @return "INSANE" for insane modes, "NORMAL" otherwise
+     */
+    public String getModeString() {
+        return insane ? "INSANE" : "NORMAL";
+    }
+
+    @Nullable
+    public static SkywarsGameType from(String field) {
+        for (SkywarsGameType type : values()) {
+            if (type.name().equalsIgnoreCase(field)) {
+                return type;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public static SkywarsGameType fromDisplayName(String displayName) {
+        for (SkywarsGameType type : values()) {
+            if (type.displayName.equalsIgnoreCase(displayName)) {
+                return type;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public static SkywarsGameType fromId(int id) {
+        for (SkywarsGameType type : values()) {
+            if (type.id == id) {
+                return type;
+            }
+        }
+        return null;
+    }
+}

commons/src/main/java/net/swofty/commons/skywars/SkywarsLeaderboardMode.java

@@ -0,0 +1,67 @@
+package net.swofty.commons.skywars;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+public enum SkywarsLeaderboardMode {
+    ALL("all", "All Modes"),
+    SOLO_NORMAL("solo_normal", "Solo Normal"),
+    SOLO_INSANE("solo_insane", "Solo Insane"),
+    DOUBLES("doubles", "Doubles");
+
+    private final String key;
+    private final String displayName;
+
+    SkywarsLeaderboardMode(String key, String displayName) {
+        this.key = key;
+        this.displayName = displayName;
+    }
+
+    private static final List<SkywarsGameType> ACTIVE_MODES = Arrays.asList(
+            SkywarsGameType.SOLO_NORMAL,
+            SkywarsGameType.SOLO_INSANE,
+            SkywarsGameType.DOUBLES_NORMAL
+    );
+
+    public boolean includes(SkywarsGameType gameType) {
+        return switch (this) {
+            case ALL -> ACTIVE_MODES.contains(gameType);
+            case SOLO_NORMAL -> gameType == SkywarsGameType.SOLO_NORMAL;
+            case SOLO_INSANE -> gameType == SkywarsGameType.SOLO_INSANE;
+            case DOUBLES -> gameType == SkywarsGameType.DOUBLES_NORMAL;
+        };
+    }
+
+    public SkywarsLeaderboardMode next() {
+        SkywarsLeaderboardMode[] values = values();
+        int nextOrdinal = (this.ordinal() + 1) % values.length;
+        return values[nextOrdinal];
+    }
+
+    public SkywarsLeaderboardMode previous() {
+        SkywarsLeaderboardMode[] values = values();
+        int prevOrdinal = (this.ordinal() - 1 + values.length) % values.length;
+        return values[prevOrdinal];
+    }
+
+    public static SkywarsLeaderboardMode fromKey(String key) {
+        for (SkywarsLeaderboardMode mode : values()) {
+            if (mode.key.equalsIgnoreCase(key)) {
+                return mode;
+            }
+        }
+        return ALL;
+    }
+
+    public static SkywarsLeaderboardMode fromGameType(SkywarsGameType gameType) {
+        return switch (gameType) {
+            case SOLO_NORMAL -> SOLO_NORMAL;
+            case SOLO_INSANE -> SOLO_INSANE;
+            case DOUBLES_NORMAL -> DOUBLES;
+            default -> ALL;
+        };
+    }
+}

commons/src/main/java/net/swofty/commons/skywars/SkywarsLeaderboardPeriod.java

@@ -0,0 +1,42 @@
+package net.swofty.commons.skywars;
+
+import lombok.Getter;
+
+@Getter
+public enum SkywarsLeaderboardPeriod {
+    DAILY("daily", "Daily", 1),
+    WEEKLY("weekly", "Weekly", 7),
+    MONTHLY("monthly", "Monthly", 30),
+    LIFETIME("lifetime", "Lifetime", -1);
+
+    private final String key;
+    private final String displayName;
+    private final int days;
+
+    SkywarsLeaderboardPeriod(String key, String displayName, int days) {
+        this.key = key;
+        this.displayName = displayName;
+        this.days = days;
+    }
+
+    public SkywarsLeaderboardPeriod next() {
+        SkywarsLeaderboardPeriod[] values = values();
+        int nextOrdinal = (this.ordinal() + 1) % values.length;
+        return values[nextOrdinal];
+    }
+
+    public SkywarsLeaderboardPeriod previous() {
+        SkywarsLeaderboardPeriod[] values = values();
+        int prevOrdinal = (this.ordinal() - 1 + values.length) % values.length;
+        return values[prevOrdinal];
+    }
+
+    public static SkywarsLeaderboardPeriod fromKey(String key) {
+        for (SkywarsLeaderboardPeriod period : values()) {
+            if (period.key.equalsIgnoreCase(key)) {
+                return period;
+            }
+        }
+        return LIFETIME;
+    }
+}

commons/src/main/java/net/swofty/commons/skywars/SkywarsLeaderboardPreferences.java

@@ -0,0 +1,17 @@
+package net.swofty.commons.skywars;
+
+public record SkywarsLeaderboardPreferences(
+        SkywarsLeaderboardPeriod period,
+        SkywarsLeaderboardMode mode,
+        SkywarsLeaderboardView view,
+        SkywarsTextAlignment textAlignment
+) {
+    public static SkywarsLeaderboardPreferences defaults() {
+        return new SkywarsLeaderboardPreferences(
+                SkywarsLeaderboardPeriod.WEEKLY,
+                SkywarsLeaderboardMode.ALL,
+                SkywarsLeaderboardView.TOP_10,
+                SkywarsTextAlignment.CENTER
+        );
+    }
+}

commons/src/main/java/net/swofty/commons/skywars/SkywarsLeaderboardView.java

@@ -0,0 +1,38 @@
+package net.swofty.commons.skywars;
+
+import lombok.Getter;
+
+@Getter
+public enum SkywarsLeaderboardView {
+    TOP_10("top_10", "Top 10"),
+    PLAYERS_AROUND_YOU("around_you", "Players Around You");
+
+    private final String key;
+    private final String displayName;
+
+    SkywarsLeaderboardView(String key, String displayName) {
+        this.key = key;
+        this.displayName = displayName;
+    }
+
+    public SkywarsLeaderboardView next() {
+        SkywarsLeaderboardView[] values = values();
+        int nextOrdinal = (this.ordinal() + 1) % values.length;
+        return values[nextOrdinal];
+    }
+
+    public SkywarsLeaderboardView previous() {
+        SkywarsLeaderboardView[] values = values();
+        int prevOrdinal = (this.ordinal() - 1 + values.length) % values.length;
+        return values[prevOrdinal];
+    }
+
+    public static SkywarsLeaderboardView fromKey(String key) {
+        for (SkywarsLeaderboardView view : values()) {
+            if (view.key.equalsIgnoreCase(key)) {
+                return view;
+            }
+        }
+        return TOP_10;
+    }
+}

commons/src/main/java/net/swofty/commons/skywars/SkywarsLevelColor.java

@@ -0,0 +1,83 @@
+package net.swofty.commons.skywars;
+
+import lombok.Getter;
+
+@Getter
+public enum SkywarsLevelColor {
+    NONE(0, "7", "⋆"),
+    IRON(5, "f", "✦"),
+    GOLD(10, "6", "✦"),
+    DIAMOND(15, "b", "✦"),
+    EMERALD(20, "a", "✦"),
+    SAPPHIRE(25, "3", "✦"),
+    RUBY(30, "c", "✦"),
+    CRYSTAL(35, "d", "✦"),
+    OPAL(40, "8", "✦"),
+    AMETHYST(45, "5", "✦"),
+    RAINBOW(50, "f", "✦");
+
+    private final int minimumLevel;
+    private final String colorCode;
+    private final String symbol;
+
+    SkywarsLevelColor(int minimumLevel, String colorCode, String symbol) {
+        this.minimumLevel = minimumLevel;
+        this.colorCode = colorCode;
+        this.symbol = symbol;
+    }
+
+    public static SkywarsLevelColor fromLevel(int level) {
+        SkywarsLevelColor result = NONE;
+        for (SkywarsLevelColor color : values()) {
+            if (level >= color.minimumLevel) {
+                result = color;
+            }
+        }
+        return result;
+    }
+
+    public String constructLevelBrackets(int level) {
+        if (this == RAINBOW) {
+            return constructRainbowBrackets(level);
+        }
+        return "§" + colorCode + "[" + level + symbol + "]";
+    }
+
+    public String constructLevelString(int level) {
+        if (this == RAINBOW) {
+            return constructRainbowString(level);
+        }
+        return "§" + colorCode + level + symbol;
+    }
+
+    private String constructRainbowBrackets(int level) {
+        String levelStr = String.valueOf(level);
+        String[] colors = {"c", "6", "e", "a", "b", "d"};
+        StringBuilder result = new StringBuilder("§" + colors[0] + "[");
+
+        for (int i = 0; i < levelStr.length(); i++) {
+            result.append("§").append(colors[(i + 1) % colors.length]).append(levelStr.charAt(i));
+        }
+
+        result.append("§f").append(symbol).append("§" + colors[0] + "]");
+        return result.toString();
+    }
+
+    private String constructRainbowString(int level) {
+        String levelStr = String.valueOf(level);
+        String[] colors = {"c", "6", "e", "a", "b", "d"};
+        StringBuilder result = new StringBuilder();
+
+        for (int i = 0; i < levelStr.length(); i++) {
+            result.append("§").append(colors[i % colors.length]).append(levelStr.charAt(i));
+        }
+
+        result.append("§f").append(symbol);
+        return result.toString();
+    }
+
+    public static String getLevelDisplay(int level) {
+        SkywarsLevelColor color = fromLevel(level);
+        return color.constructLevelBrackets(level);
+    }
+}