mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-28 19:54:44 +02:00
mcMMO - Now with 100% more scoreboards!
mcMMO now allows for the use of scoreboards to display information in several instances. By default, all scoreboards are enabled in the config, and will only display for 10 seconds. After 10 seconds, the scoreboard will go away and revert to the previously displayed scoreboard, if one exists. A global scoreboard now exists for tracking all player stats, and will be displayed when /mctop is used. Your name will be highlighted in gold when looking through the scoreboard. Additionally, the scoreboard will display players in groups of 15, rather than groups of 10 like in chat. Unfortunately, due to the limitations of scoreboards, the player's rank will not be displayed in front of their name. The scoreboard area is now also used for displaying data for /mcrank, /inspect. and /mcstats. Due to the way scoreboards are handled, the power level is not guarenteed to show up at any given location in the scoreboard, but is instead displayed in gold so that it can be easily found. Lastly, the scoreboard area is also now used for displaying current data on skills when the relevant /<skillname> command is used. The effects and ability stats will still be shown in chat, but the current level, xp, and remaining xp will be shown in the scoreboard.
This commit is contained in:
GJ
@ -0,0 +1,312 @@
|
||||
package com.gmail.nossr50.util.scoreboards;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scoreboard.DisplaySlot;
|
||||
import org.bukkit.scoreboard.Objective;
|
||||
import org.bukkit.scoreboard.Scoreboard;
|
||||
|
||||
import com.gmail.nossr50.mcMMO;
|
||||
import com.gmail.nossr50.database.FlatfileDatabaseManager;
|
||||
import com.gmail.nossr50.database.SQLDatabaseManager;
|
||||
import com.gmail.nossr50.config.Config;
|
||||
import com.gmail.nossr50.datatypes.database.PlayerStat;
|
||||
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
|
||||
import com.gmail.nossr50.datatypes.player.PlayerProfile;
|
||||
import com.gmail.nossr50.datatypes.skills.SkillType;
|
||||
import com.gmail.nossr50.runnables.scoreboards.ScoreboardChangeTask;
|
||||
import com.gmail.nossr50.util.Permissions;
|
||||
import com.gmail.nossr50.util.skills.SkillUtils;
|
||||
|
||||
public class ScoreboardManager {
|
||||
private static final Map<String, Scoreboard> PLAYER_SCOREBOARDS = new HashMap<String, Scoreboard>();
|
||||
private static final Scoreboard GLOBAL_STATS_SCOREBOARD = mcMMO.p.getServer().getScoreboardManager().getNewScoreboard();
|
||||
|
||||
private final static String PLAYER_STATS_HEADER = "mcMMO Stats";
|
||||
private final static String PLAYER_RANK_HEADER = "mcMMO Rankings";
|
||||
private final static String PLAYER_INSPECT_HEADER = "mcMMO Stats: ";
|
||||
|
||||
private final static List<String> SCOREBOARD_TASKS = new ArrayList<String>();
|
||||
|
||||
public static void setupPlayerScoreboard(String playerName) {
|
||||
if (PLAYER_SCOREBOARDS.containsKey(playerName)) {
|
||||
return;
|
||||
}
|
||||
|
||||
PLAYER_SCOREBOARDS.put(playerName, mcMMO.p.getServer().getScoreboardManager().getNewScoreboard());
|
||||
}
|
||||
|
||||
public static void enablePlayerSkillScoreboard(McMMOPlayer mcMMOPlayer, SkillType skill) {
|
||||
Player player = mcMMOPlayer.getPlayer();
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
Scoreboard newScoreboard = PLAYER_SCOREBOARDS.get(player.getName());
|
||||
Objective objective = newScoreboard.getObjective(SkillUtils.getSkillName(skill));
|
||||
|
||||
if (objective == null) {
|
||||
objective = newScoreboard.registerNewObjective(SkillUtils.getSkillName(skill), "dummy");
|
||||
}
|
||||
|
||||
updatePlayerSkillScores(mcMMOPlayer.getProfile(), skill, objective);
|
||||
changeScoreboard(player, oldScoreboard, newScoreboard, Config.getInstance().getSkillScoreboardTime());
|
||||
}
|
||||
|
||||
public static void enablePlayerStatsScoreboard(McMMOPlayer mcMMOPlayer) {
|
||||
Player player = mcMMOPlayer.getPlayer();
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
Scoreboard newScoreboard = PLAYER_SCOREBOARDS.get(player.getName());
|
||||
Objective objective = newScoreboard.getObjective(PLAYER_STATS_HEADER);
|
||||
|
||||
if (objective == null) {
|
||||
objective = newScoreboard.registerNewObjective(PLAYER_STATS_HEADER, "dummy");
|
||||
}
|
||||
|
||||
updatePlayerStatsScores(mcMMOPlayer, objective);
|
||||
changeScoreboard(player, oldScoreboard, newScoreboard, Config.getInstance().getMcstatsScoreboardTime());
|
||||
}
|
||||
|
||||
public static void enablePlayerRankScoreboard(Player player) {
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
Scoreboard newScoreboard = PLAYER_SCOREBOARDS.get(player.getName());
|
||||
Objective objective = newScoreboard.getObjective(PLAYER_RANK_HEADER);
|
||||
|
||||
if (objective == null) {
|
||||
objective = newScoreboard.registerNewObjective(PLAYER_RANK_HEADER, "dummy");
|
||||
}
|
||||
|
||||
updatePlayerRankScores(player, objective);
|
||||
changeScoreboard(player, oldScoreboard, newScoreboard, Config.getInstance().getMcrankScoreboardTime());
|
||||
}
|
||||
|
||||
public static void enablePlayerRankScoreboardOthers(Player player, String targetName) {
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
Scoreboard newScoreboard = PLAYER_SCOREBOARDS.get(player.getName());
|
||||
Objective objective = newScoreboard.getObjective(PLAYER_RANK_HEADER);
|
||||
|
||||
if (objective == null) {
|
||||
objective = newScoreboard.registerNewObjective(PLAYER_RANK_HEADER, "dummy");
|
||||
}
|
||||
|
||||
updatePlayerRankOthersScores(targetName, objective);
|
||||
changeScoreboard(player, oldScoreboard, newScoreboard, Config.getInstance().getMcrankScoreboardTime());
|
||||
}
|
||||
|
||||
public static void enablePlayerInspectScoreboardOnline(Player player, McMMOPlayer mcMMOTarget) {
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
Scoreboard newScoreboard = PLAYER_SCOREBOARDS.get(player.getName());
|
||||
Objective objective = newScoreboard.getObjective(PLAYER_INSPECT_HEADER);
|
||||
|
||||
if (objective == null) {
|
||||
objective = newScoreboard.registerNewObjective(PLAYER_INSPECT_HEADER, "dummy");
|
||||
}
|
||||
|
||||
updatePlayerInspectOnlineScores(mcMMOTarget, objective);
|
||||
changeScoreboard(player, oldScoreboard, newScoreboard, Config.getInstance().getInspectScoreboardTime());
|
||||
}
|
||||
|
||||
public static void enablePlayerInspectScoreboardOffline(Player player, PlayerProfile targetProfile) {
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
Scoreboard newScoreboard = PLAYER_SCOREBOARDS.get(player.getName());
|
||||
Objective objective = newScoreboard.getObjective(PLAYER_INSPECT_HEADER);
|
||||
|
||||
if (objective == null) {
|
||||
objective = newScoreboard.registerNewObjective(PLAYER_INSPECT_HEADER, "dummy");
|
||||
}
|
||||
|
||||
updatePlayerInspectOfflineScores(targetProfile, objective);
|
||||
changeScoreboard(player, oldScoreboard, newScoreboard, Config.getInstance().getInspectScoreboardTime());
|
||||
}
|
||||
|
||||
public static void enableGlobalStatsScoreboard(Player player, String skillName, int pageNumber) {
|
||||
Objective oldObjective = GLOBAL_STATS_SCOREBOARD.getObjective(skillName);
|
||||
Scoreboard oldScoreboard = player.getScoreboard();
|
||||
|
||||
if (oldObjective != null) {
|
||||
oldObjective.unregister();
|
||||
}
|
||||
|
||||
Objective newObjective = GLOBAL_STATS_SCOREBOARD.registerNewObjective(skillName, "dummy");
|
||||
newObjective.setDisplayName(ChatColor.GOLD + (skillName.equalsIgnoreCase("all") ? "Power Level" : SkillUtils.getSkillName(SkillType.getSkill(skillName))));
|
||||
|
||||
updateGlobalStatsScores(player, newObjective, skillName, pageNumber);
|
||||
changeScoreboard(player, oldScoreboard, GLOBAL_STATS_SCOREBOARD, Config.getInstance().getMctopScoreboardTime());
|
||||
}
|
||||
|
||||
private static void updatePlayerSkillScores(PlayerProfile profile, SkillType skill, Objective objective) {
|
||||
Server server = mcMMO.p.getServer();
|
||||
|
||||
objective.getScore(server.getOfflinePlayer("Level")).setScore(profile.getSkillLevel(skill));
|
||||
objective.getScore(server.getOfflinePlayer("Current XP")).setScore(profile.getSkillXpLevel(skill));
|
||||
objective.getScore(server.getOfflinePlayer("Remaining XP")).setScore(profile.getXpToLevel(skill));
|
||||
|
||||
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
|
||||
}
|
||||
|
||||
private static void updatePlayerStatsScores(McMMOPlayer mcMMOPlayer, Objective objective) {
|
||||
Player player = mcMMOPlayer.getPlayer();
|
||||
PlayerProfile profile = mcMMOPlayer.getProfile();
|
||||
Server server = mcMMO.p.getServer();
|
||||
|
||||
for (SkillType skill : SkillType.values()) {
|
||||
if (skill.isChildSkill() || !Permissions.skillEnabled(player, skill)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
objective.getScore(server.getOfflinePlayer(SkillUtils.getSkillName(skill))).setScore(profile.getSkillLevel(skill));
|
||||
}
|
||||
|
||||
objective.getScore(server.getOfflinePlayer(ChatColor.GOLD + "Power Level")).setScore(mcMMOPlayer.getPowerLevel());
|
||||
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
|
||||
}
|
||||
|
||||
private static void updatePlayerRankScores(Player player, Objective objective) {
|
||||
String playerName = player.getName();
|
||||
Server server = mcMMO.p.getServer();
|
||||
Integer rank;
|
||||
|
||||
Map<String, Integer> skills = Config.getInstance().getUseMySQL() ? SQLDatabaseManager.readSQLRank(playerName) : FlatfileDatabaseManager.getPlayerRanks(playerName);
|
||||
|
||||
for (SkillType skill : SkillType.values()) {
|
||||
if (skill.isChildSkill() || !Permissions.skillEnabled(player, skill)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
rank = skills.get(skill.name());
|
||||
|
||||
if (rank != null) {
|
||||
objective.getScore(server.getOfflinePlayer(SkillUtils.getSkillName(skill))).setScore(rank);
|
||||
}
|
||||
}
|
||||
|
||||
rank = skills.get("ALL");
|
||||
|
||||
if (rank != null) {
|
||||
objective.getScore(server.getOfflinePlayer(ChatColor.GOLD + "Overall")).setScore(rank);
|
||||
}
|
||||
|
||||
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
|
||||
}
|
||||
|
||||
private static void updatePlayerRankOthersScores(String targetName, Objective objective) {
|
||||
Server server = mcMMO.p.getServer();
|
||||
Integer rank;
|
||||
|
||||
Map<String, Integer> skills = Config.getInstance().getUseMySQL() ? SQLDatabaseManager.readSQLRank(targetName) : FlatfileDatabaseManager.getPlayerRanks(targetName);
|
||||
|
||||
for (SkillType skill : SkillType.values()) {
|
||||
if (skill.isChildSkill()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
rank = skills.get(skill.name());
|
||||
|
||||
if (rank != null) {
|
||||
objective.getScore(server.getOfflinePlayer(SkillUtils.getSkillName(skill))).setScore(rank);
|
||||
}
|
||||
}
|
||||
|
||||
rank = skills.get("ALL");
|
||||
|
||||
if (rank != null) {
|
||||
objective.getScore(server.getOfflinePlayer(ChatColor.GOLD + "Overall")).setScore(rank);
|
||||
}
|
||||
|
||||
objective.setDisplayName(PLAYER_RANK_HEADER + ": " + targetName);
|
||||
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
|
||||
}
|
||||
|
||||
private static void updatePlayerInspectOnlineScores(McMMOPlayer mcMMOTarget, Objective objective) {
|
||||
Player target = mcMMOTarget.getPlayer();
|
||||
PlayerProfile profile = mcMMOTarget.getProfile();
|
||||
Server server = mcMMO.p.getServer();
|
||||
int powerLevel = 0;
|
||||
int skillLevel;
|
||||
|
||||
for (SkillType skill : SkillType.values()) {
|
||||
if (skill.isChildSkill() || !Permissions.skillEnabled(target, skill)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
skillLevel = profile.getSkillLevel(skill);
|
||||
objective.getScore(server.getOfflinePlayer(SkillUtils.getSkillName(skill))).setScore(skillLevel);
|
||||
powerLevel += skillLevel;
|
||||
}
|
||||
|
||||
objective.getScore(server.getOfflinePlayer(ChatColor.GOLD + "Power Level")).setScore(powerLevel);
|
||||
objective.setDisplayName(PLAYER_INSPECT_HEADER + target.getName());
|
||||
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
|
||||
}
|
||||
|
||||
private static void updatePlayerInspectOfflineScores(PlayerProfile targetProfile, Objective objective) {
|
||||
Server server = mcMMO.p.getServer();
|
||||
int powerLevel = 0;
|
||||
int skillLevel;
|
||||
|
||||
for (SkillType skill : SkillType.values()) {
|
||||
if (skill.isChildSkill()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
skillLevel = targetProfile.getSkillLevel(skill);
|
||||
objective.getScore(server.getOfflinePlayer(SkillUtils.getSkillName(skill))).setScore(skillLevel);
|
||||
powerLevel += skillLevel;
|
||||
}
|
||||
|
||||
objective.getScore(server.getOfflinePlayer(ChatColor.GOLD + "Power Level")).setScore(powerLevel);
|
||||
objective.setDisplayName(PLAYER_INSPECT_HEADER + targetProfile.getPlayerName());
|
||||
}
|
||||
|
||||
private static void updateGlobalStatsScores(Player player, Objective objective, String skillName, int pageNumber) {
|
||||
int position = (pageNumber * 15) - 14;
|
||||
String startPosition = ((position < 10) ? "0" : "") + String.valueOf(position);
|
||||
String endPosition = String.valueOf(position + 14);
|
||||
Server server = mcMMO.p.getServer();
|
||||
|
||||
if (Config.getInstance().getUseMySQL()) {
|
||||
String tablePrefix = Config.getInstance().getMySQLTablePrefix();
|
||||
String query = (skillName.equalsIgnoreCase("all") ? "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing" : skillName);
|
||||
final Collection<ArrayList<String>> userStats = SQLDatabaseManager.read("SELECT " + query + ", user, NOW() FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON (user_id = id) WHERE " + query + " > 0 ORDER BY " + query + " DESC, user LIMIT " + ((pageNumber * 15) - 15) + ",15").values();
|
||||
|
||||
for (ArrayList<String> stat : userStats) {
|
||||
String playerName = stat.get(1);
|
||||
playerName = (playerName.equals(player.getName()) ? ChatColor.GOLD : "") + playerName;
|
||||
|
||||
objective.getScore(server.getOfflinePlayer(playerName)).setScore(Integer.valueOf(stat.get(0)));
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (PlayerStat stat : FlatfileDatabaseManager.retrieveInfo(skillName, pageNumber, 15)) {
|
||||
String playerName = stat.name;
|
||||
playerName = (playerName.equals(player.getName()) ? ChatColor.GOLD : "") + playerName;
|
||||
|
||||
objective.getScore(server.getOfflinePlayer(playerName)).setScore(stat.statVal);
|
||||
}
|
||||
}
|
||||
|
||||
objective.setDisplayName(objective.getDisplayName() + " (" + startPosition + " - " + endPosition + ")");
|
||||
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
|
||||
}
|
||||
|
||||
private static void changeScoreboard(Player player, Scoreboard oldScoreboard, Scoreboard newScoreboard, int displayTime) {
|
||||
if (oldScoreboard != newScoreboard) {
|
||||
String playerName = player.getName();
|
||||
|
||||
player.setScoreboard(newScoreboard);
|
||||
|
||||
if (displayTime != -1 && !SCOREBOARD_TASKS.contains(playerName)) {
|
||||
new ScoreboardChangeTask(player, oldScoreboard).runTaskLater(mcMMO.p, displayTime * 20);
|
||||
SCOREBOARD_TASKS.add(playerName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void clearPendingTask(String playerName) {
|
||||
SCOREBOARD_TASKS.remove(playerName);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user