Switch to scoreboard-library
This commit is contained in:
NotAlexNoyle committed
1 parent
6e7563fb5a
commit
bcbea6036b
2 files changed
+108
-46
No files matched your search
+2
-1
@@ -48,6 +48,7 @@ repositories {
|
||||
gradlePluginPortal() // Import the Gradle Plugin Portal Maven Repository.
|
||||
maven { url = uri("https://repo.purpurmc.org/snapshots") } // Import the PurpurMC Maven Repository.
|
||||
maven { url = uri("https://repo.hotten.cloud/snapshots") } // Import the ScoreboardLib library.
|
||||
maven { url = uri("https://jitpack.io") } // Import the MegavexNetwork scoreboard-library.
|
||||
maven { url = uri("file://${System.getProperty("user.home")}/.m2/repository") }
|
||||
System.getProperty("SELF_MAVEN_LOCAL_REPO")?.let { // TrueOG Bootstrap mavenLocal().
|
||||
val dir = file(it)
|
||||
@@ -70,7 +71,7 @@ dependencies {
|
||||
compileOnlyApi(project(":libs:DiamondBank-OG")) {
|
||||
attributes { attribute(kotlinAttribute, true) }
|
||||
} // Import TrueOG network DiamondBank-OG Kotlin API (from source).
|
||||
implementation("me.tigerhix.lib:scoreboard:1.0.1-SNAPSHOT")
|
||||
implementation("com.github.MegavexNetwork:scoreboard-library:2.1.0")
|
||||
}
|
||||
|
||||
apply(from = "eclipse.gradle.kts") // Import eclipse classpath support script.
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
// Author: NotAlexNoyle.
|
||||
package plugin;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
@@ -12,12 +14,13 @@ import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.RegisteredServiceProvider;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
import me.tigerhix.lib.scoreboard.ScoreboardLib;
|
||||
import me.tigerhix.lib.scoreboard.common.EntryBuilder;
|
||||
import me.tigerhix.lib.scoreboard.type.Entry;
|
||||
import me.tigerhix.lib.scoreboard.type.Scoreboard;
|
||||
import me.tigerhix.lib.scoreboard.type.ScoreboardHandler;
|
||||
import me.megavex.scoreboardlibrary.api.ScoreboardLibrary;
|
||||
import me.megavex.scoreboardlibrary.api.sidebar.Sidebar;
|
||||
import me.megavex.scoreboardlibrary.api.sidebar.SidebarManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||
import net.luckperms.api.LuckPerms;
|
||||
import net.luckperms.api.cacheddata.CachedMetaData;
|
||||
import net.luckperms.api.model.user.User;
|
||||
@@ -28,10 +31,18 @@ public class ScoreboardOG extends JavaPlugin {
|
||||
private static ScoreboardOG instance;
|
||||
|
||||
private FileConfiguration config;
|
||||
private final Map<UUID, Scoreboard> boards = new HashMap<>();
|
||||
private final Map<UUID, Sidebar> boards = new HashMap<>();
|
||||
|
||||
private final Map<UUID, BukkitTask> updateTasks = new HashMap<>();
|
||||
|
||||
private ScoreboardLibrary scoreboardLibrary;
|
||||
|
||||
private SidebarManager sidebarManager;
|
||||
|
||||
private LuckPerms luckPerms;
|
||||
|
||||
private final LegacyComponentSerializer legacySerializer = LegacyComponentSerializer.legacyAmpersand();
|
||||
|
||||
public static ScoreboardOG getInstance() {
|
||||
|
||||
return instance;
|
||||
@@ -50,7 +61,9 @@ public class ScoreboardOG extends JavaPlugin {
|
||||
|
||||
saveDefaultConfig();
|
||||
this.config = getConfig();
|
||||
ScoreboardLib.setPluginInstance(this);
|
||||
|
||||
scoreboardLibrary = ScoreboardLibrary.loadNative(this);
|
||||
sidebarManager = scoreboardLibrary.createSidebarManager();
|
||||
|
||||
// Hook LuckPerms API.
|
||||
final RegisteredServiceProvider<LuckPerms> provider = Bukkit.getServicesManager()
|
||||
@@ -73,9 +86,24 @@ public class ScoreboardOG extends JavaPlugin {
|
||||
@Override
|
||||
public void onDisable() {
|
||||
|
||||
boards.values().forEach(Scoreboard::deactivate);
|
||||
boards.values().forEach(Sidebar::close);
|
||||
boards.clear();
|
||||
|
||||
updateTasks.values().forEach(BukkitTask::cancel);
|
||||
updateTasks.clear();
|
||||
|
||||
if (sidebarManager != null) {
|
||||
|
||||
sidebarManager.close();
|
||||
|
||||
}
|
||||
|
||||
if (scoreboardLibrary != null) {
|
||||
|
||||
scoreboardLibrary.close();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public FileConfiguration config() {
|
||||
@@ -86,53 +114,86 @@ public class ScoreboardOG extends JavaPlugin {
|
||||
|
||||
public void openBoard(Player player) {
|
||||
|
||||
final Scoreboard board = ScoreboardLib.createScoreboard(player).setHandler(new ScoreboardHandler() {
|
||||
|
||||
@Override
|
||||
public String getTitle(Player p) {
|
||||
|
||||
return "&4♥ &a&lTrue&c&lOG&r&e Network &4♥";
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public java.util.List<Entry> getEntries(Player p) {
|
||||
|
||||
// Fetch LuckPerms prefix with formatting.
|
||||
String lpPrefix = getLuckPermsPrefixLegacy(p);
|
||||
lpPrefix = stripLeadingReset(stripTrailingReset(lpPrefix));
|
||||
|
||||
// Bleed formatting from prefix into name.
|
||||
final String youTail = joinSpace(lpPrefix, p.getName());
|
||||
final String youLine = "&aYou:&r " + youTail + "&r";
|
||||
|
||||
// Independently formatted Union tag.
|
||||
final String unionTag = expandMM(p, "<placeholderapi_player:%simpleclans_clan_color_tag%>");
|
||||
final String unionLine = "&cUnion: &r" + unionTag + "&r";
|
||||
|
||||
return new EntryBuilder().next("&c&m----&6&m----&e&m----&2&m----&9&m----&5&m----").next(youLine).blank()
|
||||
.next("&bDiamonds: " + expandMM(p, "<diamondbankog_balance>")).blank().next(unionLine).blank()
|
||||
.next("&2Kills: " + expandMM(p, "<placeholderapi_player:%statistic_player_kills%>")).blank()
|
||||
.next("&4Deaths: " + expandMM(p, "<placeholderapi_player:%statistic_deaths%>")).blank()
|
||||
.next("&4&m--&0&m--&4> &etrue-og.net &4<&0&m--&4&m--").build();
|
||||
|
||||
}
|
||||
|
||||
}).setUpdateInterval(10L);
|
||||
board.activate();
|
||||
final Sidebar board = sidebarManager.createSidebar();
|
||||
board.title(deserialize("&4♥ &a&lTrue&c&lOG&r&e Network &4♥"));
|
||||
board.lines(buildSidebarLines(player));
|
||||
board.addViewer(player);
|
||||
boards.put(player.getUniqueId(), board);
|
||||
|
||||
final BukkitTask task = Bukkit.getScheduler().runTaskTimer(this, () -> {
|
||||
|
||||
if (!player.isOnline()) {
|
||||
|
||||
closeBoard(player);
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
board.lines(buildSidebarLines(player));
|
||||
|
||||
}, 10L, 10L);
|
||||
|
||||
updateTasks.put(player.getUniqueId(), task);
|
||||
|
||||
}
|
||||
|
||||
public void closeBoard(Player player) {
|
||||
|
||||
final Scoreboard board = boards.remove(player.getUniqueId());
|
||||
if (board != null) {
|
||||
final Sidebar board = boards.remove(player.getUniqueId());
|
||||
final BukkitTask task = updateTasks.remove(player.getUniqueId());
|
||||
|
||||
board.deactivate();
|
||||
if (task != null) {
|
||||
|
||||
task.cancel();
|
||||
|
||||
}
|
||||
|
||||
if (board != null) {
|
||||
|
||||
board.removeViewer(player);
|
||||
board.close();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private List<Component> buildSidebarLines(Player player) {
|
||||
|
||||
final List<Component> lines = new ArrayList<>();
|
||||
|
||||
// Fetch LuckPerms prefix with formatting.
|
||||
String lpPrefix = getLuckPermsPrefixLegacy(player);
|
||||
lpPrefix = stripLeadingReset(stripTrailingReset(lpPrefix));
|
||||
|
||||
// Bleed formatting from prefix into name.
|
||||
final String youTail = joinSpace(lpPrefix, player.getName());
|
||||
final String youLine = "&aYou:&r " + youTail + "&r";
|
||||
|
||||
// Independently formatted Union tag.
|
||||
final String unionTag = expandMM(player, "<placeholderapi_player:%simpleclans_clan_color_tag%>");
|
||||
final String unionLine = "&cUnion: &r" + unionTag + "&r";
|
||||
|
||||
lines.add(deserialize("&c&m----&6&m----&e&m----&2&m----&9&m----&5&m----"));
|
||||
lines.add(deserialize(youLine));
|
||||
lines.add(deserialize(""));
|
||||
lines.add(deserialize("&bDiamonds: " + expandMM(player, "<diamondbankog_balance>")));
|
||||
lines.add(deserialize(""));
|
||||
lines.add(deserialize(unionLine));
|
||||
lines.add(deserialize(""));
|
||||
lines.add(deserialize("&2Kills: " + expandMM(player, "<placeholderapi_player:%statistic_player_kills%>")));
|
||||
lines.add(deserialize(""));
|
||||
lines.add(deserialize("&4Deaths: " + expandMM(player, "<placeholderapi_player:%statistic_deaths%>")));
|
||||
lines.add(deserialize(""));
|
||||
lines.add(deserialize("&4&m--&0&m--&4> &etrue-og.net &4<&0&m--&4&m--"));
|
||||
|
||||
return lines;
|
||||
|
||||
}
|
||||
|
||||
private Component deserialize(String text) {
|
||||
|
||||
return legacySerializer.deserialize(text);
|
||||
|
||||
}
|
||||
|
||||
// Resolve the player's LuckPerms prefix as legacy color codes with any
|
||||
|
||||
Reference in new issue
Block a user