Merge branch 'master' into enhancement/plugin-yml-authors

Iridium-Development · Jul 23, 2024 · 756dd34 · 756dd34
2 parents 700285d + 21e80fb
commit 756dd34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,5 @@
 name: Bug Report
 description: Create a report to help us improve IridiumSkyblock!
-title: "[Bug] "
 labels: ["bug", "unconfirmed"]
 assignees: ["PeachesMLG", "dlsf", "sh0inx"]
 body:
@@ -22,14 +21,14 @@ body:
         1. Do this
         2. Click on this
         3. See error
-  - type: input
+  - type: textarea
     id: expected_behavior
     validations:
       required: true
     attributes:
       label: Expected Behavior
       description: Describe what you expected to happen
-  - type: input
+  - type: textarea
     id: actual_behavior
     validations:
       required: true
@@ -47,15 +46,15 @@ body:
       required: true
     attributes:
       label: Server Software & Minecraft Version
-      description: The server software and Minecraft version you are using ("latest" is not accurate enough)
+      description: Please copy and paste the output of `/version`, "latest" is not helpful
   - type: input
     id: skyblock_version
     validations:
       required: true
     attributes:
       label: IridiumSkyblock version
-      description: The IridiumSkyblock version you are using ("latest" is not accurate enough)
-  - type: textarea
+      description: Please copy and paste the output of `/is version`, "latest" is not helpful
+  - type: input
     id: logs
     attributes:
       label: Server logs

diff --git a/src/main/java/com/iridium/iridiumskyblock/placeholders/IslandPlaceholderBuilder.java b/src/main/java/com/iridium/iridiumskyblock/placeholders/IslandPlaceholderBuilder.java
@@ -56,8 +56,8 @@ public List<Placeholder> getPlaceholders(Island island) {
                     new Placeholder("island_experience", String.valueOf(island.getExperience())),
                     new Placeholder("island_experienceToLevelUp", String.valueOf(IridiumSkyblock.getInstance().getIslandManager().getTeamExperienceForNextLevel(island))),
                     new Placeholder("island_experienceForNextLevel", String.valueOf(IridiumSkyblock.getInstance().getIslandManager().getExperienceForLevel(island.getLevel() + 1))),
-                    new Placeholder("island_value_rank", () -> String.valueOf(IridiumSkyblock.getInstance().getIslandManager().getRank(island, IridiumSkyblock.getInstance().getTop().experienceTeamSort))),
-                    new Placeholder("island_experience_rank", () -> String.valueOf(IridiumSkyblock.getInstance().getIslandManager().getRank(island, IridiumSkyblock.getInstance().getTop().valueTeamSort))),
+                    new Placeholder("island_value_rank", () -> String.valueOf(IridiumSkyblock.getInstance().getIslandManager().getRank(island, IridiumSkyblock.getInstance().getTop().valueTeamSort))),
+                    new Placeholder("island_experience_rank", () -> String.valueOf(IridiumSkyblock.getInstance().getIslandManager().getRank(island, IridiumSkyblock.getInstance().getTop().experienceTeamSort))),
                     new Placeholder("island_members_online", () -> String.join(", ", onlineUsers)),
                     new Placeholder("island_members_online_count", () -> String.valueOf(onlineUsers.size())),
                     new Placeholder("island_members_offline", () -> String.join(", ", offlineUsers)),
@@ -76,9 +76,6 @@ public List<Placeholder> getPlaceholders(Island island) {
             placeholderList.add(new Placeholder("island_visitors", () -> visitingPlayers.stream().map(Player::getName).collect(Collectors.joining(", "))));
             placeholderList.add(new Placeholder("island_visitors_amount", () -> String.valueOf(visitingPlayers.size())));
 
-            placeholderList.add(new Placeholder("island_visitors", () -> visitingPlayers.stream().map(Player::getName).collect(Collectors.joining(", "))));
-            placeholderList.add(new Placeholder("island_visitors_amount", () -> String.valueOf(visitingPlayers.size())));
-
             for (Map.Entry<String, Enhancement<?>> enhancement : IridiumSkyblock.getInstance().getEnhancementList().entrySet()) {
                 if (!enhancement.getValue().enabled) continue;
                 TeamEnhancement teamEnhancement = IridiumSkyblock.getInstance().getIslandManager().getTeamEnhancement(island, enhancement.getKey());
@@ -125,21 +122,11 @@ private List<Placeholder> initializeDefaultPlaceholders() {
         ));
 
         for (Map.Entry<String, Enhancement<?>> enhancement : IridiumSkyblock.getInstance().getEnhancementList().entrySet()) {
-            if (enhancement.getValue().type == EnhancementType.BOOSTER) {
-                placeholderList.add(new Placeholder("island_booster_" + enhancement.getKey() + "_active", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_booster_" + enhancement.getKey() + "_level", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_booster_" + enhancement.getKey() + "_time_hours", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_booster_" + enhancement.getKey() + "_time_minutes", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_booster_" + enhancement.getKey() + "_time_seconds", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-            }
-
-            if (enhancement.getValue().type == EnhancementType.UPGRADE) {
-                placeholderList.add(new Placeholder("island_upgrade_" + enhancement.getKey() + "_active", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_upgrade_" + enhancement.getKey() + "_level", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_upgrade_" + enhancement.getKey() + "_time_hours", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_upgrade_" + enhancement.getKey() + "_time_minutes", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-                placeholderList.add(new Placeholder("island_upgrade_" + enhancement.getKey() + "_time_seconds", IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
-            }
+            placeholderList.add(new Placeholder("island_enhancement_" + enhancement.getKey() + "_active", () -> IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
+            placeholderList.add(new Placeholder("island_enhancement_" + enhancement.getKey() + "_level", () -> IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
+            placeholderList.add(new Placeholder("island_enhancement_" + enhancement.getKey() + "_time_hours", () -> IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
+            placeholderList.add(new Placeholder("island_enhancement_" + enhancement.getKey() + "_time_minutes", () -> IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
+            placeholderList.add(new Placeholder("island_enhancement_" + enhancement.getKey() + "_time_seconds", () -> IridiumSkyblock.getInstance().getMessages().nullPlaceholder));
         }
 
         for (BankItem bankItem : IridiumSkyblock.getInstance().getBankItemList()) {