diff --git a/src/main/java/dev/plex/command/impl/AdminCMD.java b/src/main/java/dev/plex/command/impl/AdminCMD.java index bdaf267..351cd2a 100644 --- a/src/main/java/dev/plex/command/impl/AdminCMD.java +++ b/src/main/java/dev/plex/command/impl/AdminCMD.java @@ -23,6 +23,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = RequiredCommandSource.ANY) @CommandParameters(name = "admin", usage = "/ [player] [rank]", aliases = "saconfig,slconfig,adminconfig,adminmanage", description = "Manage all admins") @@ -31,7 +32,7 @@ public class AdminCMD extends PlexCommand //TODO: Better return messages @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/AdminworldCMD.java b/src/main/java/dev/plex/command/impl/AdminworldCMD.java index 4fa2bae..279e6ee 100644 --- a/src/main/java/dev/plex/command/impl/AdminworldCMD.java +++ b/src/main/java/dev/plex/command/impl/AdminworldCMD.java @@ -10,13 +10,15 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.ADMIN, permission = "plex.adminworld", source = RequiredCommandSource.IN_GAME) @CommandParameters(name = "adminworld", aliases = "aw", description = "Teleport to the adminworld") public class AdminworldCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { // TODO: Add adminworld settings if (args.length == 0) diff --git a/src/main/java/dev/plex/command/impl/AdventureCMD.java b/src/main/java/dev/plex/command/impl/AdventureCMD.java index d73fcb2..351a332 100644 --- a/src/main/java/dev/plex/command/impl/AdventureCMD.java +++ b/src/main/java/dev/plex/command/impl/AdventureCMD.java @@ -15,6 +15,7 @@ import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.adventure", source = RequiredCommandSource.ANY) @CommandParameters(name = "adventure", aliases = "gma", description = "Set your own or another player's gamemode to adventure mode") @@ -22,7 +23,7 @@ public class AdventureCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/BanCMD.java b/src/main/java/dev/plex/command/impl/BanCMD.java index aee5d88..a03ebb2 100644 --- a/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/src/main/java/dev/plex/command/impl/BanCMD.java @@ -23,6 +23,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "ban", usage = "/ [reason]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online") @CommandPermissions(level = Rank.ADMIN, permission = "plex.ban", source = RequiredCommandSource.ANY) @@ -30,7 +31,7 @@ import org.jetbrains.annotations.NotNull; public class BanCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/CreativeCMD.java b/src/main/java/dev/plex/command/impl/CreativeCMD.java index 124feba..2d96f6a 100644 --- a/src/main/java/dev/plex/command/impl/CreativeCMD.java +++ b/src/main/java/dev/plex/command/impl/CreativeCMD.java @@ -15,13 +15,14 @@ import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.creative", source = RequiredCommandSource.ANY) @CommandParameters(name = "creative", aliases = "gmc", description = "Set your own or another player's gamemode to creative mode") public class CreativeCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/DeopAllCMD.java b/src/main/java/dev/plex/command/impl/DeopAllCMD.java index 7c59839..7b49879 100644 --- a/src/main/java/dev/plex/command/impl/DeopAllCMD.java +++ b/src/main/java/dev/plex/command/impl/DeopAllCMD.java @@ -9,13 +9,15 @@ import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "deopall", description = "Deop everyone on the server", aliases = "deopa") @CommandPermissions(level = Rank.ADMIN) public class DeopAllCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { for (Player player : Bukkit.getOnlinePlayers()) { diff --git a/src/main/java/dev/plex/command/impl/DeopCMD.java b/src/main/java/dev/plex/command/impl/DeopCMD.java index 57c91ba..f4fd461 100644 --- a/src/main/java/dev/plex/command/impl/DeopCMD.java +++ b/src/main/java/dev/plex/command/impl/DeopCMD.java @@ -12,13 +12,14 @@ import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "deop", description = "Deop a player on the server", usage = "/ ") @CommandPermissions(level = Rank.ADMIN, permission = "plex.deop") public class DeopCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length != 1) { diff --git a/src/main/java/dev/plex/command/impl/FlatlandsCMD.java b/src/main/java/dev/plex/command/impl/FlatlandsCMD.java index 8202ab3..bca1204 100644 --- a/src/main/java/dev/plex/command/impl/FlatlandsCMD.java +++ b/src/main/java/dev/plex/command/impl/FlatlandsCMD.java @@ -10,6 +10,8 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.flatlands", source = RequiredCommandSource.IN_GAME) @CommandParameters(name = "flatlands", description = "Teleport to the flatlands") @@ -17,7 +19,7 @@ public class FlatlandsCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/FreezeCMD.java b/src/main/java/dev/plex/command/impl/FreezeCMD.java index 78e52f4..37c5a18 100644 --- a/src/main/java/dev/plex/command/impl/FreezeCMD.java +++ b/src/main/java/dev/plex/command/impl/FreezeCMD.java @@ -19,13 +19,14 @@ import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "freeze", description = "Freeze a player on the server", usage = "/ ") @CommandPermissions(level = Rank.ADMIN, permission = "plex.freeze") public class FreezeCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length != 1) { diff --git a/src/main/java/dev/plex/command/impl/ListCMD.java b/src/main/java/dev/plex/command/impl/ListCMD.java index 34d5afa..410ac1f 100644 --- a/src/main/java/dev/plex/command/impl/ListCMD.java +++ b/src/main/java/dev/plex/command/impl/ListCMD.java @@ -11,13 +11,15 @@ import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "list", description = "Show a list of all online players") @CommandPermissions(level = Rank.OP, permission = "plex.list") public class ListCMD extends PlexCommand { @Override - protected Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { List players = Lists.newArrayList(Bukkit.getOnlinePlayers()); Component component = Component.text("There " + (players.size() == 1 ? "is" : "are") + " currently").color(NamedTextColor.GRAY) diff --git a/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java b/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java index 3f85241..4fc0639 100644 --- a/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java +++ b/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java @@ -3,17 +3,20 @@ package dev.plex.command.impl; import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; +import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "localspawn", description = "Teleport to the spawnpoint of the world you are in") -@CommandPermissions(level = Rank.OP, permission = "plex.spawnpoint") +@CommandPermissions(level = Rank.OP, permission = "plex.spawnpoint", source = RequiredCommandSource.IN_GAME) public class LocalSpawnCMD extends PlexCommand { @Override - protected Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { playerSender.teleportAsync(playerSender.getWorld().getSpawnLocation()); return tl("teleportedToWorldSpawn"); diff --git a/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java b/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java index ec98cf2..dfd73d6 100644 --- a/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java +++ b/src/main/java/dev/plex/command/impl/MasterbuilderworldCMD.java @@ -10,6 +10,8 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.masterbuilderworld", source = RequiredCommandSource.IN_GAME) @CommandParameters(name = "masterbuilderworld", aliases = "mbw", description = "Teleport to the Master Builder world") @@ -17,7 +19,7 @@ public class MasterbuilderworldCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { // TODO: Add adminworld settings if (args.length == 0) diff --git a/src/main/java/dev/plex/command/impl/NameHistoryCMD.java b/src/main/java/dev/plex/command/impl/NameHistoryCMD.java index 42e54a9..14f9e10 100644 --- a/src/main/java/dev/plex/command/impl/NameHistoryCMD.java +++ b/src/main/java/dev/plex/command/impl/NameHistoryCMD.java @@ -23,6 +23,7 @@ import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "namehistory", description = "Get the name history of a player", usage = "/ ", aliases = "nh") @CommandPermissions(level = Rank.OP, permission = "plex.namehistory") @@ -31,7 +32,7 @@ public class NameHistoryCMD extends PlexCommand private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("MM/dd/yyyy 'at' HH:mm:ss"); @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length != 1) { diff --git a/src/main/java/dev/plex/command/impl/OpAllCMD.java b/src/main/java/dev/plex/command/impl/OpAllCMD.java index a733737..4e07831 100644 --- a/src/main/java/dev/plex/command/impl/OpAllCMD.java +++ b/src/main/java/dev/plex/command/impl/OpAllCMD.java @@ -9,13 +9,15 @@ import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "opall", description = "Op everyone on the server", aliases = "opa") @CommandPermissions(level = Rank.ADMIN) public class OpAllCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { for (Player player : Bukkit.getOnlinePlayers()) { diff --git a/src/main/java/dev/plex/command/impl/OpCMD.java b/src/main/java/dev/plex/command/impl/OpCMD.java index cd0814d..7afeb19 100644 --- a/src/main/java/dev/plex/command/impl/OpCMD.java +++ b/src/main/java/dev/plex/command/impl/OpCMD.java @@ -12,13 +12,14 @@ import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "op", description = "Op a player on the server", usage = "/ ") @CommandPermissions(level = Rank.OP) public class OpCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length != 1) { diff --git a/src/main/java/dev/plex/command/impl/PlexCMD.java b/src/main/java/dev/plex/command/impl/PlexCMD.java index 78241a6..de988b3 100644 --- a/src/main/java/dev/plex/command/impl/PlexCMD.java +++ b/src/main/java/dev/plex/command/impl/PlexCMD.java @@ -14,14 +14,14 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.plex", source = RequiredCommandSource.ANY) @CommandParameters(name = "plex", usage = "/ [reload]", aliases = "plexhelp", description = "Show information about Plex or reload it") public class PlexCMD extends PlexCommand { - @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/PunishmentsCMD.java b/src/main/java/dev/plex/command/impl/PunishmentsCMD.java index dc31292..cbce618 100644 --- a/src/main/java/dev/plex/command/impl/PunishmentsCMD.java +++ b/src/main/java/dev/plex/command/impl/PunishmentsCMD.java @@ -13,13 +13,14 @@ import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandParameters(name = "punishments", usage = "/ [player]", description = "Opens the Punishments GUI", aliases = "punishlist,punishes") @CommandPermissions(level = Rank.ADMIN, permission = "plex.punishments", source = RequiredCommandSource.IN_GAME) public class PunishmentsCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { new PunishmentMenu().openInv(((Player)sender), 0); return null; diff --git a/src/main/java/dev/plex/command/impl/RankCMD.java b/src/main/java/dev/plex/command/impl/RankCMD.java index 7239f53..a6534c7 100644 --- a/src/main/java/dev/plex/command/impl/RankCMD.java +++ b/src/main/java/dev/plex/command/impl/RankCMD.java @@ -4,10 +4,13 @@ import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.source.RequiredCommandSource; +import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; // TODO: See ranks of other players @@ -16,8 +19,10 @@ import org.bukkit.entity.Player; public class RankCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { - return tl("yourRank", getPlexPlayer(playerSender).getLoginMSG()); + PlexPlayer plexPlayer = getPlexPlayer(playerSender); + Rank rank = plugin.getRankManager().getRankFromString(plexPlayer.getRank()); + return tl("yourRank", rank.getReadableString()); } } \ No newline at end of file diff --git a/src/main/java/dev/plex/command/impl/SpectatorCMD.java b/src/main/java/dev/plex/command/impl/SpectatorCMD.java index eb012dc..84d6fd9 100644 --- a/src/main/java/dev/plex/command/impl/SpectatorCMD.java +++ b/src/main/java/dev/plex/command/impl/SpectatorCMD.java @@ -15,13 +15,14 @@ import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.ADMIN, permission = "plex.gamemode.spectator", source = RequiredCommandSource.ANY) @CommandParameters(name = "spectator", aliases = "gmsp", description = "Set your own or another player's gamemode to spectator mode") public class SpectatorCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/SurvivalCMD.java b/src/main/java/dev/plex/command/impl/SurvivalCMD.java index 5a6c83d..74fe87f 100644 --- a/src/main/java/dev/plex/command/impl/SurvivalCMD.java +++ b/src/main/java/dev/plex/command/impl/SurvivalCMD.java @@ -15,13 +15,14 @@ import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.survival", source = RequiredCommandSource.ANY) @CommandParameters(name = "survival", aliases = "gms", description = "Set your own or another player's gamemode to survival mode") public class SurvivalCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/UnbanCMD.java b/src/main/java/dev/plex/command/impl/UnbanCMD.java index 71c11e6..f36a8f8 100644 --- a/src/main/java/dev/plex/command/impl/UnbanCMD.java +++ b/src/main/java/dev/plex/command/impl/UnbanCMD.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; public class UnbanCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + public Component execute(@NotNull CommandSender sender, @NotNull Player playerSender, String[] args) { if (args.length == 0) { diff --git a/src/main/java/dev/plex/command/impl/WorldCMD.java b/src/main/java/dev/plex/command/impl/WorldCMD.java index 9c1c709..0d41954 100644 --- a/src/main/java/dev/plex/command/impl/WorldCMD.java +++ b/src/main/java/dev/plex/command/impl/WorldCMD.java @@ -16,13 +16,14 @@ import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @CommandPermissions(level = Rank.OP, permission = "plex.world", source = RequiredCommandSource.IN_GAME) @CommandParameters(name = "world", description = "Teleport to a world.", usage = "/ ") public class WorldCMD extends PlexCommand { @Override - public Component execute(CommandSender sender, Player playerSender, String[] args) + protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) { if (args.length != 1) { diff --git a/src/main/java/dev/plex/rank/DefaultRankObj.java b/src/main/java/dev/plex/rank/DefaultRankObj.java index 2bddcce..926b1e8 100644 --- a/src/main/java/dev/plex/rank/DefaultRankObj.java +++ b/src/main/java/dev/plex/rank/DefaultRankObj.java @@ -10,12 +10,14 @@ public class DefaultRankObj { private final String prefix; private final String loginMSG; + private final String readableName; private final List permissions; public DefaultRankObj(Rank rank) { this.prefix = rank.getPrefix(); this.loginMSG = rank.getLoginMSG(); + this.readableName = rank.getReadableString(); this.permissions = Lists.newArrayList(); permissions.add("example.permission"); } diff --git a/src/main/java/dev/plex/rank/RankManager.java b/src/main/java/dev/plex/rank/RankManager.java index f3ab2f9..94ddc98 100644 --- a/src/main/java/dev/plex/rank/RankManager.java +++ b/src/main/java/dev/plex/rank/RankManager.java @@ -89,8 +89,8 @@ public class RankManager } rank.setLoginMessage(rankObj.getJSONObject(rank.name().toUpperCase()).getString("loginMSG")); rank.setPrefix(rankObj.getJSONObject(rank.name().toUpperCase()).getString("prefix")); //should i even be doing this + rank.setHumanReadableString(rankObj.getJSONObject(rank.name().toUpperCase()).getString("readableName")); // i dont know rank.setPermissions(rankObj.getJSONObject(rank.name().toUpperCase()).getJSONArray("permissions").toList().stream().map(Object::toString).collect(Collectors.toList())); - } } catch (IOException e) diff --git a/src/main/java/dev/plex/rank/enums/Rank.java b/src/main/java/dev/plex/rank/enums/Rank.java index 88b805c..04661f9 100644 --- a/src/main/java/dev/plex/rank/enums/Rank.java +++ b/src/main/java/dev/plex/rank/enums/Rank.java @@ -6,22 +6,24 @@ import org.bukkit.ChatColor; public enum Rank { - IMPOSTOR(-1, ChatColor.AQUA + "an " + ChatColor.YELLOW + "Impostor", ChatColor.YELLOW + "[Imp]"), - NONOP(0, "a " + ChatColor.WHITE + "Non-Op", ChatColor.WHITE + ""), - OP(1, "an " + ChatColor.GREEN + "Operator", ChatColor.GREEN + "[OP]"), - ADMIN(2, "an " + ChatColor.DARK_GREEN + "Admin", ChatColor.DARK_GREEN + "[Admin]"), - SENIOR_ADMIN(3, "a " + ChatColor.GOLD + "Senior Admin", ChatColor.GOLD + "[SrA]"), - EXECUTIVE(4, "an " + ChatColor.RED + "Executive", ChatColor.RED + "[Exec]"); + IMPOSTOR(-1, ChatColor.AQUA + "an " + ChatColor.YELLOW + "Impostor", "Impostor", ChatColor.YELLOW + "[Imp]"), + NONOP(0, "a " + ChatColor.WHITE + "Non-Op", "Non-Op", ChatColor.WHITE + ""), + OP(1, "an " + ChatColor.GREEN + "Operator", "Operator", ChatColor.GREEN + "[OP]"), + ADMIN(2, "an " + ChatColor.DARK_GREEN + "Admin", "Admin", ChatColor.DARK_GREEN + "[Admin]"), + SENIOR_ADMIN(3, "a " + ChatColor.GOLD + "Senior Admin", "Senior Admin", ChatColor.GOLD + "[SrA]"), + EXECUTIVE(4, "an " + ChatColor.RED + "Executive", "Executive", ChatColor.RED + "[Exec]"); + private final int level; private String loginMessage; + private String readable; private String prefix; - private int level; private List permissions; - Rank(int level, String loginMessage, String prefix) + Rank(int level, String loginMessage, String readable, String prefix) { this.level = level; this.loginMessage = loginMessage; + this.readable = readable; this.prefix = prefix; this.permissions = Lists.newArrayList(); } @@ -41,6 +43,11 @@ public enum Rank return level; } + public String getReadableString() + { + return readable; + } + public void setLoginMessage(String msg) { this.loginMessage = msg; @@ -51,6 +58,11 @@ public enum Rank this.prefix = prefix; } + public void setHumanReadableString(String readable) + { + this.readable = readable; + } + public boolean isAtLeast(Rank rank) { return getLevel() >= rank.getLevel(); diff --git a/src/main/java/dev/plex/rank/enums/Title.java b/src/main/java/dev/plex/rank/enums/Title.java index 62a1fb2..b8cebf2 100644 --- a/src/main/java/dev/plex/rank/enums/Title.java +++ b/src/main/java/dev/plex/rank/enums/Title.java @@ -4,18 +4,20 @@ import org.bukkit.ChatColor; public enum Title { - MASTER_BUILDER(0, ChatColor.AQUA + "a " + ChatColor.DARK_AQUA + "Master Builder", ChatColor.DARK_AQUA + "[MB]"), - DEV(1, ChatColor.AQUA + "a " + ChatColor.DARK_PURPLE + "Developer", ChatColor.DARK_PURPLE + "[DEV]"), - OWNER(2, ChatColor.AQUA + "an " + ChatColor.BLUE + "Owner", ChatColor.BLUE + "[Owner]"); + MASTER_BUILDER(0, ChatColor.AQUA + "a " + ChatColor.DARK_AQUA + "Master Builder", "Master Builder", ChatColor.DARK_AQUA + "[MB]"), + DEV(1, ChatColor.AQUA + "a " + ChatColor.DARK_PURPLE + "Developer", "Developer", ChatColor.DARK_PURPLE + "[DEV]"), + OWNER(2, ChatColor.AQUA + "an " + ChatColor.BLUE + "Owner", "Owner", ChatColor.BLUE + "[Owner]"); private int level; private String loginMSG; + private String readable; private String prefix; - Title(int level, String loginMSG, String prefix) + Title(int level, String loginMSG, String readable, String prefix) { this.level = level; this.loginMSG = loginMSG; + this.readable = readable; this.prefix = prefix; } } diff --git a/src/main/java/dev/plex/util/PlexUtils.java b/src/main/java/dev/plex/util/PlexUtils.java index c24c6be..670f34d 100644 --- a/src/main/java/dev/plex/util/PlexUtils.java +++ b/src/main/java/dev/plex/util/PlexUtils.java @@ -1,5 +1,6 @@ package dev.plex.util; +import com.google.common.collect.Lists; import dev.plex.Plex; import dev.plex.PlexBase; import dev.plex.config.Config; @@ -38,6 +39,10 @@ public class PlexUtils extends PlexBase { public static Map CHAT_COLOR_NAMES; public static List CHAT_COLOR_POOL; + public static List DEVELOPERS = + Arrays.asList("78408086-1991-4c33-a571-d8fa325465b2", // Telesphoreo + "f5cd54c4-3a24-4213-9a56-c06c49594dff" // Taahh + ); private static final Random RANDOM; static