Skip to content

Commit

Permalink
use bukkits name of scoreboards to be more in line with their API
Browse files Browse the repository at this point in the history
  • Loading branch information
@FireInstall
FireInstall committed Jul 17, 2024
1 parent 1f0ca50 commit 798964e
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Minigames/src/main/java/au/com/mineauz/minigames/gametypes/MultiplayerType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public boolean joinMinigame(@NotNull MinigamePlayer mgPlayer, @NotNull Minigame
}
}, secondsUntilLateJoin * 20));
}
mgPlayer.getPlayer().setScoreboard(mgm.getScoreboardManager());
mgPlayer.getPlayer().setScoreboard(mgm.getScoreboard());
mgm.setScore(mgPlayer, 1);
mgm.setScore(mgPlayer, 0);
}
Expand Down
6 changes: 3 additions & 3 deletions Minigames/src/main/java/au/com/mineauz/minigames/managers/MinigamePlayerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void joinMinigame(@NotNull MinigamePlayer mgPlayer, @NotNull Minigame min
mgPlayer.updateInventory();

if (minigame.canDisplayScoreboard()) {
mgPlayer.getPlayer().setScoreboard(minigame.getScoreboardManager());
mgPlayer.getPlayer().setScoreboard(minigame.getScoreboard());
minigame.setScore(mgPlayer, 1);
minigame.setScore(mgPlayer, 0);
}
Expand Down Expand Up @@ -275,7 +275,7 @@ public void spectateMinigame(@NotNull MinigamePlayer mgPlayer, @NotNull Minigame
}

if (minigame.canDisplayScoreboard()) {
mgPlayer.getPlayer().setScoreboard(minigame.getScoreboardManager());
mgPlayer.getPlayer().setScoreboard(minigame.getScoreboard());
}

for (PotionEffect potion : mgPlayer.getPlayer().getActivePotionEffects()) {
Expand Down Expand Up @@ -697,7 +697,7 @@ public void quitMinigame(@NotNull MinigamePlayer mgPlayer, boolean forced) {
}
}

minigame.getScoreboardManager().resetScores(mgPlayer.getName());
minigame.getScoreboard().resetScores(mgPlayer.getName());

for (MinigamePlayer pl : minigame.getSpectators()) {
mgPlayer.getPlayer().showPlayer(plugin, pl.getPlayer());
Expand Down
3 changes: 2 additions & 1 deletion ...ames/src/main/java/au/com/mineauz/minigames/managers/language/MinigameMessageManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.nio.charset.StandardCharsets;
import java.security.CodeSource;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
Expand All @@ -43,7 +44,7 @@ public class MinigameMessageManager { // todo cache unformatted // todo clean al
/**
* Stores each prop file with an identifier
*/
private final static @NotNull Hashtable<String, ResourceBundle> propertiesHashMap = new Hashtable<>();
private final static @NotNull ConcurrentHashMap<String, ResourceBundle> propertiesHashMap = new ConcurrentHashMap<>();

public static void registerCoreLanguage() {
CodeSource src = Minigames.class.getProtectionDomain().getCodeSource();
Expand Down
10 changes: 5 additions & 5 deletions Minigames/src/main/java/au/com/mineauz/minigames/mechanics/JuggernautMechanic.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ public void quitMinigame(@NotNull Minigame minigame, @NotNull MinigamePlayer mgP
}

if (minigame.getPlayers().size() == 1) {
if (minigame.getScoreboardManager().getTeam("juggernaut") != null)
minigame.getScoreboardManager().getTeam("juggernaut").unregister();
if (minigame.getScoreboard().getTeam("juggernaut") != null)
minigame.getScoreboard().getTeam("juggernaut").unregister();
}
}

Expand All @@ -93,7 +93,7 @@ public void endMinigame(@NotNull Minigame minigame, @NotNull List<@NotNull Minig
@NotNull List<@NotNull MinigamePlayer> losers) {
JuggernautModule.getMinigameModule(minigame).setJuggernaut(null);

minigame.getScoreboardManager().getTeam("juggernaut").unregister();
minigame.getScoreboard().getTeam("juggernaut").unregister();
}

private MinigamePlayer assignNewJuggernaut(List<MinigamePlayer> players, MinigamePlayer exclude) {
Expand Down Expand Up @@ -121,8 +121,8 @@ private void minigameStart(StartMinigameEvent event) {
if (event.getMinigame().getMechanic() == this) {
Minigame mgm = event.getMinigame();

mgm.getScoreboardManager().registerNewTeam("juggernaut");
mgm.getScoreboardManager().getTeam("juggernaut").setPrefix(ChatColor.RED.toString());
mgm.getScoreboard().registerNewTeam("juggernaut");
mgm.getScoreboard().getTeam("juggernaut").setPrefix(ChatColor.RED.toString());

MinigamePlayer j = assignNewJuggernaut(event.getPlayers(), null);
JuggernautModule.getMinigameModule(event.getMinigame()).setJuggernaut(j);
Expand Down
22 changes: 11 additions & 11 deletions Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public class Minigame implements ScriptObject {
private final Map<String, CTFFlag> droppedFlag = new HashMap<>();
private MinigameState state = MinigameState.IDLE;
private FloorDegenerator sFloorDegen;
private Scoreboard sbManager = Minigames.getPlugin().getServer().getScoreboardManager().getNewScoreboard();
private @NotNull Scoreboard scoreboard = Minigames.getPlugin().getServer().getScoreboardManager().getNewScoreboard();
//Multiplayer
private MultiplayerTimer mpTimer = null;
private MinigameTimer miniTimer = null;
Expand Down Expand Up @@ -148,9 +148,9 @@ private void setup(@NotNull MinigameType minigameType, @Nullable Location start)

if (start != null)
startLocations.getFlag().add(start);
if (sbManager != null) {
sbManager.registerNewObjective(this.name, Criteria.DUMMY, this.name);
sbManager.getObjective(this.name).setDisplaySlot(DisplaySlot.SIDEBAR);
if (scoreboard != null) {
Objective newObjective = scoreboard.registerNewObjective(this.name, Criteria.DUMMY, Component.text(this.name));
newObjective.setDisplaySlot(DisplaySlot.SIDEBAR);
}

for (ModuleFactory factory : Minigames.getPlugin().getMinigameManager().getModules()) {
Expand Down Expand Up @@ -587,14 +587,14 @@ public boolean isSpectator(MinigamePlayer player) {
}

public void setScore(@NotNull MinigamePlayer mgPlayer, int amount) {
if (sbManager == null) {
if (scoreboard == null) {
ScoreboardManager s = Minigames.getPlugin().getServer().getScoreboardManager();
sbManager = s.getNewScoreboard();
scoreboard = s.getNewScoreboard();
Minigames.getCmpnntLogger().info("ScoreBoardManager was null - Created new Scoreboard - for:" + name);
}
Objective o = sbManager.getObjective(getName());
if (o != null) {
o.getScore(mgPlayer.getName()).setScore(amount);
Objective objective = scoreboard.getObjective(getName());
if (objective != null) {
objective.getScore(mgPlayer.getName()).setScore(amount);
}
}

Expand Down Expand Up @@ -1007,8 +1007,8 @@ public void setFlightEnabled(boolean enableFlight) {
this.enableFlight.setFlag(enableFlight);
}

public Scoreboard getScoreboardManager() {
return sbManager;
public @NotNull Scoreboard getScoreboard() {
return scoreboard;
}

public @Nullable Component getObjective() {
Expand Down
14 changes: 7 additions & 7 deletions Minigames/src/main/java/au/com/mineauz/minigames/minigame/Team.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public int getScore() {
*/
public void setScore(int amount) {
score = amount;
Objective obj = mgm.getScoreboardManager().getObjective(mgm.getName());
Objective obj = mgm.getScoreboard().getObjective(mgm.getName());
if (obj != null) {
obj.getScore(getDisplayName()).setScore(score);
}
Expand All @@ -187,7 +187,7 @@ public int addScore() {
*/
public int addScore(int amount) {
score += amount;
Objective obj = mgm.getScoreboardManager().getObjective(mgm.getName());
Objective obj = mgm.getScoreboard().getObjective(mgm.getName());
if (obj != null) {
obj.getScore(getDisplayName()).setScore(score);
}
Expand All @@ -199,7 +199,7 @@ public int addScore(int amount) {
*/
public void resetScore() {
score = 0;
mgm.getScoreboardManager().resetScores(getDisplayName());
mgm.getScoreboard().resetScores(getDisplayName());
}

/**
Expand All @@ -219,8 +219,8 @@ public List<MinigamePlayer> getPlayers() {
public void addPlayer(MinigamePlayer player) {
players.add(player);
player.setTeam(this);
player.getPlayer().setScoreboard(mgm.getScoreboardManager());
org.bukkit.scoreboard.Team team = mgm.getScoreboardManager().getTeam(scoreboardName);
player.getPlayer().setScoreboard(mgm.getScoreboard());
org.bukkit.scoreboard.Team team = mgm.getScoreboard().getTeam(scoreboardName);
if (team != null) {
team.addEntry(player.getDisplayName(mgm.usePlayerDisplayNames()));
}
Expand All @@ -233,7 +233,7 @@ public void addPlayer(MinigamePlayer player) {
*/
public void removePlayer(MinigamePlayer player) {
players.remove(player);
Scoreboard board = mgm.getScoreboardManager();
Scoreboard board = mgm.getScoreboard();
org.bukkit.scoreboard.Team team = board.getTeam(scoreboardName);
if (team != null) {
team.removeEntry(player.getDisplayName(mgm.usePlayerDisplayNames()));
Expand Down Expand Up @@ -346,7 +346,7 @@ public OptionStatus getNameTagVisibility() {

public void setNameTagVisibility(@NotNull OptionStatus vis) {
nametagVisibility.setFlag(vis);
org.bukkit.scoreboard.Team team = mgm.getScoreboardManager().getTeam(color.getUserFriendlyName().toLowerCase());
org.bukkit.scoreboard.Team team = mgm.getScoreboard().getTeam(color.getUserFriendlyName().toLowerCase());
if (team != null) {
team.setOption(Option.NAME_TAG_VISIBILITY, vis);
} else {
Expand Down
9 changes: 5 additions & 4 deletions Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/JuggernautModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.scoreboard.Team;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class JuggernautModule extends MinigameModule {
private MinigamePlayer juggernaut = null;
Expand Down Expand Up @@ -49,16 +50,16 @@ public MinigamePlayer getJuggernaut() {
return juggernaut;
}

public void setJuggernaut(MinigamePlayer player) {
public void setJuggernaut(@Nullable MinigamePlayer player) {
if (juggernaut != null) {
Team team = juggernaut.getMinigame().getScoreboardManager().getTeam("juggernaut");
Team team = juggernaut.getMinigame().getScoreboard().getTeam("juggernaut");
juggernaut.setLoadout(null);
team.removeEntry(team.getColor() + juggernaut.getPlayer().getDisplayName());
team.removeEntry(team.getColor() + juggernaut.getPlayer().getDisplayName()); // todo find modern equivalent
}
juggernaut = player;

if (juggernaut != null) {
Team team = player.getMinigame().getScoreboardManager().getTeam("juggernaut");
Team team = player.getMinigame().getScoreboard().getTeam("juggernaut");
team.addEntry(team.getColor() + player.getPlayer().getDisplayName());

MinigameMessageManager.sendMgMessage(juggernaut, MinigameMessageType.SUCCESS, MgMiscLangKey.PLAYER_JUGGERNAUT_PLAYERMSG);
Expand Down
10 changes: 5 additions & 5 deletions Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/TeamsModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void load(@NotNull FileConfiguration config, @NotNull String path) {
final ConfigurationSection configSection = config.getConfigurationSection(path + config.options().pathSeparator() + "teams");
if (configSection != null) {
Set<String> teamNames = configSection.getKeys(false);
Scoreboard scoreboard = getMinigame().getScoreboardManager();
Scoreboard scoreboard = getMinigame().getScoreboard();

for (String teamName : teamNames) {
TeamFlag tf = new TeamFlag(null, teamName, getMinigame());
Expand Down Expand Up @@ -122,7 +122,7 @@ public void load(@NotNull FileConfiguration config, @NotNull String path) {
if (!hasTeam(color)) {
teams.put(color, new TeamFlag(new Team(color, getMinigame()), color.name(), getMinigame()));
String teamNameString = color.getUserFriendlyName().toLowerCase();
@NotNull org.bukkit.scoreboard.Team bukkitTeam = getMinigame().getScoreboardManager().registerNewTeam(teamNameString);
@NotNull org.bukkit.scoreboard.Team bukkitTeam = getMinigame().getScoreboard().registerNewTeam(teamNameString);
bukkitTeam.setAllowFriendlyFire(false);
bukkitTeam.setCanSeeFriendlyInvisibles(true);
bukkitTeam.color(color.getColor());
Expand All @@ -143,12 +143,12 @@ public void load(@NotNull FileConfiguration config, @NotNull String path) {
public void addTeam(@NotNull TeamColor color, @NotNull Team team) {
teams.put(color, new TeamFlag(team, color.name(), getMinigame()));
String sbTeam = color.getUserFriendlyName().toLowerCase();
Scoreboard scoreboard = getMinigame().getScoreboardManager();
Scoreboard scoreboard = getMinigame().getScoreboard();
org.bukkit.scoreboard.Team bukkitTeam = scoreboard.getTeam(sbTeam);
if (bukkitTeam != null) {
bukkitTeam.unregister();
}
bukkitTeam = getMinigame().getScoreboardManager().registerNewTeam(sbTeam);
bukkitTeam = getMinigame().getScoreboard().registerNewTeam(sbTeam);
bukkitTeam.setAllowFriendlyFire(false);
bukkitTeam.setCanSeeFriendlyInvisibles(true);
bukkitTeam.setDisplayName(team.getDisplayName());
Expand All @@ -174,7 +174,7 @@ public void removeTeam(@NotNull TeamColor color) {
if (hasTeam(color)) {
teams.remove(color);
org.bukkit.scoreboard.Team bukkitTeam =
getMinigame().getScoreboardManager().getTeam(color.getUserFriendlyName().toLowerCase());
getMinigame().getScoreboard().getTeam(color.getUserFriendlyName().toLowerCase());
if (bukkitTeam != null) {
bukkitTeam.unregister();
}
Expand Down

0 comments on commit 798964e

Please sign in to comment.