From b29111b96dc78533e36d57ebba8cf3feea4d4c45 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 16 Aug 2023 09:51:08 +0200 Subject: [PATCH] Drop support for LeaderHeads plugin Last update was in 2020 and it is marked as abandoned. I think users had enough time to find an alternative + I can't find an official maven repository for it, making clean builds hard --- pom.xml | 10 +---- .../admin/RefreshHologramsCommand.java | 1 - .../command/commands/admin/ReloadCommand.java | 1 - .../leaderboard/LeaderboardManager.java | 12 ------ .../skyblock/leaderboard/LeaderboardTask.java | 1 - .../leaderboard/leaderheads/TopBank.java | 43 ------------------- .../leaderboard/leaderheads/TopLevel.java | 40 ----------------- .../leaderboard/leaderheads/TopVotes.java | 43 ------------------- src/main/resources/plugin.yml | 1 - 9 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopBank.java delete mode 100644 src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopLevel.java delete mode 100644 src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopVotes.java diff --git a/pom.xml b/pom.xml index f26a6e8a..86f031f7 100644 --- a/pom.xml +++ b/pom.xml @@ -199,20 +199,12 @@ compile - + com.Zrips Residence provided 4.9.0.6 - - - - me.robin - LeaderHeadsAPI - 1.0 - provided - diff --git a/src/main/java/com/craftaro/skyblock/command/commands/admin/RefreshHologramsCommand.java b/src/main/java/com/craftaro/skyblock/command/commands/admin/RefreshHologramsCommand.java index 0d6779d7..b09fb0cb 100644 --- a/src/main/java/com/craftaro/skyblock/command/commands/admin/RefreshHologramsCommand.java +++ b/src/main/java/com/craftaro/skyblock/command/commands/admin/RefreshHologramsCommand.java @@ -43,7 +43,6 @@ public class RefreshHologramsCommand extends SubCommand { LeaderboardManager leaderboardManager = this.plugin.getLeaderboardManager(); leaderboardManager.clearLeaderboard(); leaderboardManager.resetLeaderboard(); - leaderboardManager.setupLeaderHeads(); Bukkit.getScheduler().runTask(this.plugin, () -> this.plugin.getHologramTask().updateHologram()); }); diff --git a/src/main/java/com/craftaro/skyblock/command/commands/admin/ReloadCommand.java b/src/main/java/com/craftaro/skyblock/command/commands/admin/ReloadCommand.java index e24c1861..f3f21505 100644 --- a/src/main/java/com/craftaro/skyblock/command/commands/admin/ReloadCommand.java +++ b/src/main/java/com/craftaro/skyblock/command/commands/admin/ReloadCommand.java @@ -94,7 +94,6 @@ public class ReloadCommand extends SubCommand { Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> { leaderboardManager.clearLeaderboard(); leaderboardManager.resetLeaderboard(); - leaderboardManager.setupLeaderHeads(); Bukkit.getScheduler().runTask(this.plugin, () -> this.plugin.getHologramTask().updateHologram()); }); diff --git a/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardManager.java b/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardManager.java index d5eeb73e..5f1fe8e2 100644 --- a/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardManager.java +++ b/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardManager.java @@ -2,9 +2,6 @@ package com.craftaro.skyblock.leaderboard; import com.craftaro.skyblock.SkyBlock; import com.craftaro.skyblock.island.IslandWorld; -import com.craftaro.skyblock.leaderboard.leaderheads.TopBank; -import com.craftaro.skyblock.leaderboard.leaderheads.TopLevel; -import com.craftaro.skyblock.leaderboard.leaderheads.TopVotes; import com.craftaro.skyblock.utils.VaultPermissions; import com.craftaro.skyblock.visit.Visit; import com.craftaro.skyblock.visit.VisitManager; @@ -29,7 +26,6 @@ public class LeaderboardManager { new LeaderboardTask(plugin).runTaskTimerAsynchronously(plugin, 0L, this.plugin.getConfiguration().getInt("Island.Leaderboard.Reset.Time") * 20); resetLeaderboard(); - setupLeaderHeads(); } public void resetLeaderboard() { @@ -116,14 +112,6 @@ public class LeaderboardManager { return -1; } - public void setupLeaderHeads() { - if (Bukkit.getServer().getPluginManager().getPlugin("LeaderHeads") != null) { - new TopLevel(this.plugin); - new TopBank(this.plugin); - new TopVotes(this.plugin); - } - } - public void clearLeaderboard() { this.leaderboardStorage.clear(); } diff --git a/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardTask.java b/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardTask.java index 08b68315..302e7d44 100644 --- a/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardTask.java +++ b/src/main/java/com/craftaro/skyblock/leaderboard/LeaderboardTask.java @@ -15,7 +15,6 @@ public class LeaderboardTask extends BukkitRunnable { LeaderboardManager leaderboardManager = this.plugin.getLeaderboardManager(); leaderboardManager.clearLeaderboard(); leaderboardManager.resetLeaderboard(); - leaderboardManager.setupLeaderHeads(); this.plugin.getHologramTask().updateHologram(); } diff --git a/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopBank.java b/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopBank.java deleted file mode 100644 index bb0a2a9b..00000000 --- a/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopBank.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.craftaro.skyblock.leaderboard.leaderheads; - -import com.craftaro.skyblock.SkyBlock; -import com.craftaro.skyblock.leaderboard.Leaderboard; -import com.craftaro.skyblock.leaderboard.Leaderboard.Type; -import com.craftaro.skyblock.visit.Visit; -import me.robin.leaderheads.api.LeaderHeadsAPI; -import me.robin.leaderheads.datacollectors.DataCollector; -import me.robin.leaderheads.objects.BoardType; -import org.bukkit.ChatColor; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - -public class TopBank extends DataCollector { - private final SkyBlock plugin; - - public TopBank(SkyBlock plugin) { - super("topbank", plugin.getDescription().getName(), BoardType.DEFAULT, "&bTop Bank", "topbank", - Arrays.asList(ChatColor.DARK_GRAY + "-=+=-", ChatColor.AQUA + "{name}", - ChatColor.WHITE + "Bal: ${amount}", ChatColor.DARK_GRAY + "-=+=-"), - true, UUID.class); - - this.plugin = plugin; - } - - @Override - public List> requestAll() { - List leaderboards = this.plugin.getLeaderboardManager().getLeaderboard(Type.BANK); - Map topLevels = new HashMap<>(leaderboards.size()); - - for (Leaderboard leaderboard : leaderboards) { - Visit visit = leaderboard.getVisit(); - topLevels.put(visit.getOwnerUUID(), visit.getBankBalance()); - } - - return LeaderHeadsAPI.sortMap(topLevels); - } -} diff --git a/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopLevel.java b/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopLevel.java deleted file mode 100644 index b31ca472..00000000 --- a/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopLevel.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.craftaro.skyblock.leaderboard.leaderheads; - -import com.craftaro.skyblock.SkyBlock; -import com.craftaro.skyblock.leaderboard.Leaderboard; -import com.craftaro.skyblock.visit.Visit; -import me.robin.leaderheads.api.LeaderHeadsAPI; -import me.robin.leaderheads.datacollectors.DataCollector; -import me.robin.leaderheads.objects.BoardType; -import org.bukkit.ChatColor; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - -public class TopLevel extends DataCollector { - private final SkyBlock plugin; - - public TopLevel(SkyBlock plugin) { - super("toplevels", plugin.getDescription().getName(), BoardType.DEFAULT, "&bTop Level", "toplevel", - Arrays.asList(ChatColor.DARK_GRAY + "-=+=-", ChatColor.AQUA + "{name}", ChatColor.WHITE + "{amount} Level", ChatColor.DARK_GRAY + "-=+=-"), true, UUID.class); - - this.plugin = plugin; - } - - @Override - public List> requestAll() { - List leaderboards = this.plugin.getLeaderboardManager().getLeaderboard(Leaderboard.Type.LEVEL); - Map topLevels = new HashMap<>(leaderboards.size()); - - for (Leaderboard leaderboard : leaderboards) { - Visit visit = leaderboard.getVisit(); - topLevels.put(visit.getOwnerUUID(), (double) visit.getLevel().getLevel()); - } - - return LeaderHeadsAPI.sortMap(topLevels); - } -} diff --git a/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopVotes.java b/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopVotes.java deleted file mode 100644 index d1ccab92..00000000 --- a/src/main/java/com/craftaro/skyblock/leaderboard/leaderheads/TopVotes.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.craftaro.skyblock.leaderboard.leaderheads; - -import com.craftaro.skyblock.SkyBlock; -import com.craftaro.skyblock.leaderboard.Leaderboard; -import com.craftaro.skyblock.leaderboard.Leaderboard.Type; -import com.craftaro.skyblock.visit.Visit; -import me.robin.leaderheads.api.LeaderHeadsAPI; -import me.robin.leaderheads.datacollectors.DataCollector; -import me.robin.leaderheads.objects.BoardType; -import org.bukkit.ChatColor; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - -public class TopVotes extends DataCollector { - private final SkyBlock plugin; - - public TopVotes(SkyBlock plugin) { - super("topvotes", plugin.getDescription().getName(), BoardType.DEFAULT, "&bTop Votes", "topvotes", - Arrays.asList(ChatColor.DARK_GRAY + "-=+=-", ChatColor.AQUA + "{name}", - ChatColor.WHITE + "{amount} Votes", ChatColor.DARK_GRAY + "-=+=-"), - true, UUID.class); - - this.plugin = plugin; - } - - @Override - public List> requestAll() { - List leaderboards = this.plugin.getLeaderboardManager().getLeaderboard(Type.VOTES); - Map topLevels = new HashMap<>(leaderboards.size()); - - for (Leaderboard leaderboard : leaderboards) { - Visit visit = leaderboard.getVisit(); - topLevels.put(visit.getOwnerUUID(), (double) visit.getVoters().size()); - } - - return LeaderHeadsAPI.sortMap(topLevels); - } -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e6c088e9..3fe97d68 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -10,7 +10,6 @@ softdepend: - EpicSpawners - Holograms - HolographicDisplays - - LeaderHeads - PlaceholderAPI - PlayerPoints - Reserve