DiscordStatus location code cleanup

Fix3dll · Nov 15, 2023 · 827ba3b · 827ba3b
1 parent b90d8fa
commit 827ba3b
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/discordrpc/DiscordStatus.java b/src/main/java/codes/biscuit/skyblockaddons/features/discordrpc/DiscordStatus.java
@@ -23,21 +23,23 @@ public enum DiscordStatus implements ButtonSelect.SelectItem {
     LOCATION("discordStatus.titleLocation", "discordStatus.descriptionLocation",
             () -> {
                 SkyblockAddons main = SkyblockAddons.getInstance();
-                Location location = main.getUtils().getLocation();
 
-                // Don't display "Your Island."
-                if (location.equals(Location.ISLAND)) {
-                    return "\u23E3 ".concat("Private Island");
-                } else if (location.equals(Location.THE_CATACOMBS)) {
-                    return "\u23E3 ".concat(Location.THE_CATACOMBS.getScoreboardName())
-                            .concat(main.getUtils().getDungeonFloor());
-                } else if (location.equals(Location.KUUDRAS_HOLLOW)) {
-                    return "\u23E3 ".concat(Location.KUUDRAS_HOLLOW.getScoreboardName())
-                            .concat(main.getUtils().getDungeonFloor());
-                } else {
-                    return SkyblockAddons.getInstance().getUtils().isOnRift()
-                            ? "\u0444 ".concat(location.getScoreboardName())
-                            : "\u23E3 ".concat(location.getScoreboardName());
+                Location location = main.getUtils().getLocation();
+                String prefix = main.getUtils().isOnRift() ? "\u0444 " : "\u23E3 ";
+
+                switch (location) {
+                    // Don't display "Your Island."
+                    case ISLAND:
+                        return "\u23E3 Private Island";
+                    case THE_CATACOMBS:
+                    case KUUDRAS_HOLLOW:
+                        return prefix.concat(location.getScoreboardName())
+                                .concat(main.getUtils().getDungeonFloor());
+                    case GARDEN_PLOT:
+                        return prefix.concat(location.getScoreboardName())
+                                .concat(main.getUtils().getPlotName());
+                    default:
+                        return prefix.concat(location.getScoreboardName());
                 }
             }),