Finish the job

2024-12-28 12:47:36 +00:00 · 2020-09-27 22:17:01 -05:00 · 2020-09-27 22:17:01 -05:00 · 59831ef1f3
commit 59831ef1f3
parent 54e6e2f9b1
91 changed files with 109 additions and 110 deletions
--- a/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/Reddit.java
@ -203,7 +203,7 @@ public class Reddit extends FreedomService
        flairList.put(Title.EXECUTIVE, ConfigEntry.REDDIT_EXECUTIVE_FLAIR_ID.getString());
        flairList.put(Title.DEVELOPER, ConfigEntry.REDDIT_DEVELOPER_FLAIR_ID.getString());
        flairList.put(Rank.SENIOR_ADMIN, ConfigEntry.REDDIT_SENIOR_ADMIN_FLAIR_ID.getString());
-        flairList.put(Rank.NEW_ADMIN, ConfigEntry.REDDIT_NEW_ADMIN_FLAIR_ID.getString());
+        flairList.put(Rank.ADMIN, ConfigEntry.REDDIT_NEW_ADMIN_FLAIR_ID.getString());
        flairList.put(Title.MASTER_BUILDER, ConfigEntry.REDDIT_MASTER_BUILDER_FLAIR_ID.getString());

        // Work around because the current flair ID keeps returning null, either a JRAW bug or a Reddit bug
@ -211,7 +211,7 @@ public class Reddit extends FreedomService
        flairNameList.put(Title.EXECUTIVE, "Executive");
        flairNameList.put(Title.DEVELOPER, "Developer");
        flairNameList.put(Rank.SENIOR_ADMIN, "Senior Admin");
-        flairNameList.put(Rank.NEW_ADMIN, "Admin");
+        flairNameList.put(Rank.ADMIN, "Admin");
        flairNameList.put(Title.MASTER_BUILDER, "Master Builder");
    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java
@ -84,7 +84,7 @@ public class BukkitTelnetBridge extends FreedomService

                isAdmin = active;
                isSeniorAdmin = active && staffMember.getRank() == Rank.SENIOR_ADMIN;
-                isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.NEW_ADMIN);
+                isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.ADMIN);
            }

            playerTags.put("tfm.admin.isAdmin", isAdmin);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java
@ -28,7 +28,7 @@ public class Command_adventure extends FreedomCommand
            return true;
        }

-        checkRank(Rank.NEW_ADMIN);
+        checkRank(Rank.ADMIN);

        if (args[0].equals("-a"))
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java
@ -9,7 +9,7 @@ import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Clears lingering potion area effect clouds.", usage = "/<command>", aliases = "aec")
 public class Command_aeclear extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Make an announcement anonymously to operators.", usage = "/<command> <message>")
 public class Command_announce extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java
@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Toggle whether or not a player has their inventory automatically cleared when they join", usage = "/<command> <player>")
 public class Command_autoclear extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java
@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Toggle whether or not a player is automatically teleported when they join", usage = "/<command> <player>")
 public class Command_autotp extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java
@ -18,7 +18,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@CommandParameters(description = "Bans the specified player.", usage = "/<command> <username> [reason] [-nrb | -q]", aliases = "gtfo")
 public class Command_ban extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java
@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
 public class Command_banip extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java
@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@CommandParameters(description = "Bans the specified name.", usage = "/<command> <name> [reason] [-q]")
 public class Command_banname extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Block all commands for everyone on the server, or a specific player.", usage = "/<command> <-a | purge | <player>>", aliases = "blockcommands,blockcommand,bc,bcmd")
 public class Command_blockcmd extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java
@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Restricts/unrestricts block modification abilities for everyone on the server or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | all]")
 public class Command_blockedit extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java
@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | all]", aliases = "pvpblock,pvpmode")
 public class Command_blockpvp extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java
@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Blocks redstone on the server.", usage = "/<command>", aliases = "bre")
 public class Command_blockredstone extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
@ -15,7 +15,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Place a cage around someone with certain blocks, or someone's player head.", usage = "/<command> <purge | <partialname> [head | block] [playername | blockname]")
 public class Command_cage extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java
@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "For the people that are still alive - gives a cake to everyone on the server.", usage = "/<command>")
 public class Command_cake extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Clears the chat.", usage = "/<command>", aliases = "cc")
 public class Command_clearchat extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy")
 public class Command_cmdspy extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_CONSOLE)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_CONSOLE)
@CommandParameters(description = "Telnet/Console command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message>", aliases = "csay")
 public class Command_consolesay extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java
@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "For those who have no friends - gives a cookie to everyone on the server.", usage = "/<command>")
 public class Command_cookie extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java
@ -28,7 +28,7 @@ public class Command_creative extends FreedomCommand
            return true;
        }

-        checkRank(Rank.NEW_ADMIN);
+        checkRank(Rank.ADMIN);

        if (args[0].equals("-a"))
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Essentials Interface Command - Remove the nickname of all players on the server.", usage = "/<command>")
 public class Command_denick extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java
@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Deop a player", usage = "/<command> <partialname>")
 public class Command_deop extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@CommandParameters(description = "Deop everyone on the server.", usage = "/<command>")
 public class Command_deopall extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Toggle LibsDisguises for everyone online.", usage = "/<command>", aliases = "dtoggle")
 public class Command_disguisetoggle extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> [name | -a]", aliases = "ew,rd")
 public class Command_entitywipe extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java
@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Push people away from you.", usage = "/<command> [radius] [strength]")
 public class Command_expel extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Make arrows explode", usage = "/<command>", aliases = "ea")
 public class Command_explosivearrows extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Shows all IPs registered to a player", usage = "/<command> <player>", aliases = "showip,listip")
 public class Command_findip extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Freeze/Unfreeze a specified player, or all non-staff on the server.", usage = "/<command> [target | purge]", aliases = "fr")
 public class Command_freeze extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java
@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "View server health, such as ticks-per-second, memory, etc.", usage = "/<command>")
 public class Command_health extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java
@ -12,7 +12,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Kick the specified player.", usage = "/<command> <player> [reason] [-q]")
 public class Command_kick extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Kick all non-staff on server.", usage = "/<command>", aliases = "kickall")
 public class Command_kicknoob extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Show the last command the specified player used.", usage = "/<command> <player>")
 public class Command_lastcmd extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java
@ -47,13 +47,13 @@ public class Command_list extends FreedomCommand
                }
                case "-v":
                {
-                    checkRank(Rank.NEW_ADMIN);
+                    checkRank(Rank.ADMIN);
                    listFilter = ListFilter.VANISHED_STAFF;
                    break;
                }
                case "-t":
                {
-                    checkRank(Rank.NEW_ADMIN);
+                    checkRank(Rank.ADMIN);
                    listFilter = ListFilter.TELNET_SESSIONS;
                    break;
                }
@ -82,7 +82,7 @@ public class Command_list extends FreedomCommand

        List<String> n = new ArrayList<>();

-        if (listFilter == ListFilter.TELNET_SESSIONS && plugin.sl.isStaff(sender) && plugin.sl.getAdmin(playerSender).getRank().isAtLeast(Rank.NEW_ADMIN))
+        if (listFilter == ListFilter.TELNET_SESSIONS && plugin.sl.isStaff(sender) && plugin.sl.getAdmin(playerSender).getRank().isAtLeast(Rank.ADMIN))
        {
            List<StaffMember> connectedStaffMembers = plugin.btb.getConnectedAdmins();
            onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(connectedStaffMembers.size())
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_logs.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_logs.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Register your connection with the TFM logviewer.", usage = "/<command> [off]")
 public class Command_logs extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
@ -19,7 +19,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Make a WorldGuard region for an OP.", usage = "/<command> <playername> <name>", aliases = "mor")
 public class Command_makeopregion extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Manually verify someone", usage = "/<command> <playername>", aliases="mv")
 public class Command_manuallyverify extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Control mob limiting parameters.", usage = "/<command> <on|off|setmax <count>|dragon|giant|ghast|slime>")
 public class Command_moblimiter extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java
@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Purge all mobs in all worlds.", usage = "/<command> [name]", aliases = "mp")
 public class Command_mobpurge extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java
@ -16,7 +16,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Mutes a player with brute force.", usage = "/<command> <[-s | -q] <player> [reason] | list | purge | all>", aliases = "stfu")
 public class Command_mute extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mystaff.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mystaff.java
@ -15,7 +15,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Manage your staff entry.", usage = "/<command> [-o <staff member>] <clearips | clearip <ip> | setlogin <message> | clearlogin | setscformat <format> | clearscformat> | oldtags | logstick | syncroles>")
 public class Command_mystaff extends FreedomCommand
 {
@ -141,7 +141,7 @@ public class Command_mystaff extends FreedomCommand

            case "setlogin":
            {
-                checkRank(Rank.NEW_ADMIN);
+                checkRank(Rank.ADMIN);
                if (args.length < 2)
                {
                    return false;
@ -171,7 +171,7 @@ public class Command_mystaff extends FreedomCommand

            case "clearlogin":
            {
-                checkRank(Rank.NEW_ADMIN);
+                checkRank(Rank.ADMIN);
                FUtil.staffAction(sender.getName(), "Clearing personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false);
                target.setLoginMessage(null);
                plugin.sl.save(target);
@ -186,7 +186,7 @@ public class Command_mystaff extends FreedomCommand
                plugin.sl.save(target);
                plugin.sl.updateTables();
                msg("Set staff chat format to \"" + format + "\".", ChatColor.GRAY);
-                String example = format.replace("%name%", "ExampleStaff").replace("%rank%", Rank.NEW_ADMIN.getAbbr()).replace("%rankcolor%", Rank.NEW_ADMIN.getColor().toString()).replace("%msg%", "The quick brown fox jumps over the lazy dog.");
+                String example = format.replace("%name%", "ExampleStaff").replace("%rank%", Rank.ADMIN.getAbbr()).replace("%rankcolor%", Rank.ADMIN.getColor().toString()).replace("%msg%", "The quick brown fox jumps over the lazy dog.");
                msg(ChatColor.GRAY + "Example: " + FUtil.colorize(example));
                return true;
            }
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java
@ -16,7 +16,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Essentials Interface Command - Remove illegal chatcodes from nicknames of one or all players on server.", usage = "/<command> [player]", aliases = "nc")
 public class Command_nickclean extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
@ -13,7 +13,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Manage notes for a player", usage = "/<command> <name> <list | add <note> | remove <id> | clear>")
 public class Command_notes extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java
@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon - Sends the specified player into orbit.",
        usage = "/<command> <target> [<<power> | stop>]")
 public class Command_orbit extends FreedomCommand
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_playtime.java
@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Gets your playtime statistics.", usage = "/<command>")
 public class Command_playtime extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java
@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Enable, disable, or reload a specified plugin, as well as list all plugins on the server.", usage = "/<command> <<enable | disable | reload> <pluginname>> | list>", aliases = "plc")
 public class Command_plugincontrol extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java
@ -15,7 +15,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.ThrownPotion;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Allows staff to see potions that are thrown.", usage = "/<command> <enable | on | disable | off> | history [player] <page>", aliases = "potspy")
 public class Command_potionspy extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java
@ -11,7 +11,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Purge current mutes, command blocks, orbits, freezes, potion effects, cages, and entities.", usage = "/<command>")
 public class Command_purgeall extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java
@ -17,7 +17,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Remove all blocks of a certain type in the radius of certain players.", usage = "/<command> <block> [radius (default=50)] [player]")
 public class Command_ro extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rock.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rock.java
@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "You have thrown a rock, but you have also summoned a meteor!", usage = "/<command>")
 public class Command_rock extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Broadcasts the given message as the server, includes sender name.", usage = "/<command> <message>")
 public class Command_say extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Sets everyone's WorldEdit block modification limit to the default limit or to a custom limit.", usage = "/<command> [limit]", aliases = "setl,swl")
 public class Command_setlimit extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Sets a specific player's WorldEdit block modification limit to the default limit or to a custom limit.", usage = "/<command> <player> [limit]", aliases = "setpl,spl")
 public class Command_setplayerlimit extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setspawnworld.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_setspawnworld.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Set the spawn point of the world you are in.", usage = "/<command>")
 public class Command_setspawnworld extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java
@ -83,7 +83,7 @@ public class Command_slconfig extends FreedomCommand
                    return true;
                }

-                if (!rank.isAtLeast(Rank.NEW_ADMIN))
+                if (!rank.isAtLeast(Rank.ADMIN))
                {
                    msg("Rank must be Trial Mod or higher.", ChatColor.RED);
                    return true;
@ -125,7 +125,7 @@ public class Command_slconfig extends FreedomCommand
                    return false;
                }

-                checkRank(Rank.NEW_ADMIN);
+                checkRank(Rank.ADMIN);

                StaffMember staffMember = plugin.sl.getEntryByName(args[1]);

@ -158,7 +158,7 @@ public class Command_slconfig extends FreedomCommand
                }

                checkConsole();
-                checkRank(Rank.NEW_ADMIN);
+                checkRank(Rank.ADMIN);

                // Player already staff?
                final Player player = getPlayer(args[1]);
@ -272,7 +272,7 @@ public class Command_slconfig extends FreedomCommand
                }

                checkConsole();
-                checkRank(Rank.NEW_ADMIN);
+                checkRank(Rank.ADMIN);

                Player player = getPlayer(args[1]);
                StaffMember staffMember = player != null ? plugin.sl.getAdmin(player) : plugin.sl.getEntryByName(args[1]);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_smite.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_smite.java
@ -14,7 +14,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Someone being a little bitch? Smite them down...", usage = "/<command> <player> [reason] [-q]")
 public class Command_smite extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectate.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectate.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Quickly spectate someone.", usage = "/<command> <playername>", aliases = "spec")
 public class Command_spectate extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Quickly change your own gamemode to spectator, or define someone's username to change theirs.", usage = "/<command> <[partialname]>", aliases = "gmsp")
 public class Command_spectator extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffchat.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffchat.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Talk privately with other staff on the server.", usage = "/<command> [message]", aliases = "o,sc")
 public class Command_staffchat extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffmode.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffmode.java
@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Denies joining of operators and only allows staff members to join.", usage = "/<command> [on | off]")
 public class Command_staffmode extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_stop.java
@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Kicks everyone and stops the server.", usage = "/<command> [reason]")
 public class Command_stop extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java
@ -28,7 +28,7 @@ public class Command_survival extends FreedomCommand
            return true;
        }

-        checkRank(Rank.NEW_ADMIN);
+        checkRank(Rank.ADMIN);

        if (args[0].equals("-a"))
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java
@ -15,7 +15,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> [-q] <username> [reason]", aliases = "noob")
 public class Command_tban extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java
@ -17,7 +17,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [-q] <username> [duration] [reason]")
 public class Command_tempban extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Toggles TotalFreedomMod settings", usage = "/<command> [option] [value] [value]")
 public class Command_toggle extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglechat.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_togglechat.java
@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Toggle online players' ability to chat.", usage = "/<command>", aliases = "tc")
 public class Command_togglechat extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java
@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Trails rainbow wool behind you as you walk/fly.", usage = "/<command>")
 public class Command_trail extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Unbans the specified player.", usage = "/<command> <username> [-r]")
 public class Command_unban extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Unbans the specified ip.", usage = "/<command> <ip> [-q]")
 public class Command_unbanip extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Unbans the specified name.", usage = "/<command> <name> [-q]")
 public class Command_unbanname extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Unblocks commands for a player.", usage = "/<command> <player>", aliases = "unblockcommand,unblockcommands,ubcmds,unblockcmds,ubc")
 public class Command_unblockcmd extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Uncage a player", usage = "/<command> <name>")
 public class Command_uncage extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Undisguise all online players on the server", usage = "/<command> [-a]", aliases = "uall")
 public class Command_undisguiseall extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java
@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Unmutes a player", usage = "/<command> [-q] <player>")
 public class Command_unmute extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
@ -14,7 +14,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Vanish/unvanish yourself.", usage = "/<command> [-s[ilent]]", aliases = "v")
 public class Command_vanish extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynostaff.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynostaff.java
@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Verify a staff member without giving them staff permissions.", usage = "/<command> <player>", aliases = "vns")
 public class Command_verifynostaff extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java
@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Warns the specified player.", usage = "/<command> [-q] <player> <reason>")
 public class Command_warn extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java
@ -63,7 +63,7 @@ public class Command_whitelist extends FreedomCommand
        }

        // Commands below are restricted to staff
-        checkRank(Rank.NEW_ADMIN);
+        checkRank(Rank.ADMIN);

        // on
        if (args[0].equalsIgnoreCase("on"))
@ -153,7 +153,7 @@ public class Command_whitelist extends FreedomCommand

        // Telnet only
        checkConsole();
-        checkRank(Rank.NEW_ADMIN);
+        checkRank(Rank.ADMIN);

        // purge
        if (args[0].equalsIgnoreCase("purge"))
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wildcard.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wildcard.java
@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@CommandParameters(description = "Run any command on all users, username placeholder = ?.", usage = "/<command> [fluff] ? [fluff] ?")
 public class Command_wildcard extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java
@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

-@CommandPermissions(level = Rank.NEW_ADMIN, source = SourceType.ONLY_CONSOLE)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_CONSOLE)
@CommandParameters(description = "Wipes the CoreProtect data for the flatlands", usage = "/<command>")
 public class Command_wipecoreprotectdata extends FreedomCommand
 {
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@ -455,7 +455,7 @@ public class Discord extends FreedomService
            return true;
        }

-        if (staffMember.getRank().equals(Rank.NEW_ADMIN))
+        if (staffMember.getRank().equals(Rank.ADMIN))
        {
            if (!member.getRoles().contains(adminRole))
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java
@ -68,7 +68,7 @@ public class DiscordToMinecraftListener extends ListenerAdapter
        // Admins
        else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_NEW_ADMIN_ROLE_ID.getString())))
        {
-            return Rank.NEW_ADMIN.getColoredTag();
+            return Rank.ADMIN.getColoredTag();
        }
        // Master Builders
        else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_MASTER_BUILDER_ROLE_ID.getString())))
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
@ -78,7 +78,7 @@ public class Module_list extends HTTPDModule
                    StaffMember staffMember = plugin.sl.getAdmin(player);
                    switch (staffMember.getRank())
                    {
-                        case NEW_ADMIN:
+                        case ADMIN:
                            admins.add(player.getName());
                            break;
                        case SENIOR_ADMIN:
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
@ -52,7 +52,7 @@ public class Module_players extends HTTPDModule

            switch (staffMember.getRank())
            {
-                case NEW_ADMIN:
+                case ADMIN:
                    admins.add(username);
                    break;
                case SENIOR_ADMIN:
--- a/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java
@ -52,7 +52,7 @@ public class PermissionManager extends FreedomService

        adminPermissions = PermissionEntry.ADMINS.getEntry();
        adminPermissions.addAll(masterBuilderPermissions);
-        permissions.put(Rank.NEW_ADMIN, adminPermissions);
+        permissions.put(Rank.ADMIN, adminPermissions);

        senioradminPermissions = PermissionEntry.SENIOR_ADMINS.getEntry();
        senioradminPermissions.addAll(adminPermissions);
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
@ -111,7 +111,7 @@ public class PlayerList extends FreedomService
    public boolean isTelnetMasterBuilder(PlayerData playerData)
    {
        StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
-        if (staffMember != null && staffMember.getRank().isAtLeast(Rank.NEW_ADMIN) && playerData.isMasterBuilder())
+        if (staffMember != null && staffMember.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder())
        {
            return true;
        }
--- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java
@ -8,9 +8,9 @@ public enum Rank implements Displayable
    IMPOSTOR("an", "Impostor", Type.PLAYER, "Imp", ChatColor.YELLOW, null, false),
    NON_OP("a", "Non-Op", Type.PLAYER, "", ChatColor.WHITE, null, false),
    OP("an", "Operator", Type.PLAYER, "OP", ChatColor.GREEN, null, false),
-    NEW_ADMIN("a", "Moderator", Type.STAFF, "Mod", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true),
-    SENIOR_ADMIN("an", "Administrator", Type.STAFF, "Admin", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true),
-    NEW_ADMIN_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false),
+    ADMIN("an", "Admin", Type.STAFF, "Admin", ChatColor.GREEN, org.bukkit.ChatColor.GREEN, true),
+    SENIOR_ADMIN("a", "Senior Admin", Type.STAFF, "SrA", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true),
+    ADMIN_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false),
    SENIOR_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false);
    @Getter
    private final Type type;
@ -106,9 +106,9 @@ public enum Rank implements Displayable
    {
        switch (this)
        {
-            case NEW_ADMIN:
-            case NEW_ADMIN_CONSOLE:
-                return NEW_ADMIN_CONSOLE;
+            case ADMIN:
+            case ADMIN_CONSOLE:
+                return ADMIN_CONSOLE;
            case SENIOR_ADMIN:
            case SENIOR_CONSOLE:
                return SENIOR_CONSOLE;
@ -130,9 +130,8 @@ public enum Rank implements Displayable
        return Rank.NON_OP;
    }

-    public static enum Type
+    public enum Type
    {
-
        PLAYER,
        STAFF,
        STAFF_CONSOLE;
--- a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
@ -109,7 +109,7 @@ public class RankManager extends FreedomService
        // CONSOLE?
        if (sender.getName().equals("CONSOLE"))
        {
-            return ConfigEntry.STAFFLIST_CONSOLE_IS_ADMIN.getBoolean() ? Rank.SENIOR_CONSOLE : Rank.NEW_ADMIN_CONSOLE;
+            return ConfigEntry.STAFFLIST_CONSOLE_IS_ADMIN.getBoolean() ? Rank.SENIOR_CONSOLE : Rank.ADMIN_CONSOLE;
        }

        // Console admin, get by name
--- a/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffList.java
@ -138,7 +138,7 @@ public class StaffList extends FreedomService
            return false;
        }

-        return staffMember.getRank().ordinal() >= Rank.NEW_ADMIN.ordinal();
+        return staffMember.getRank().ordinal() >= Rank.ADMIN.ordinal();
    }

    public boolean isAdmin(CommandSender sender)
@ -283,7 +283,7 @@ public class StaffList extends FreedomService

    public boolean removeAdmin(StaffMember staffMember)
    {
-        if (staffMember.getRank().isAtLeast(Rank.NEW_ADMIN))
+        if (staffMember.getRank().isAtLeast(Rank.ADMIN))
        {
            if (plugin.btb != null)
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffMember.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/staff/StaffMember.java
@ -27,7 +27,7 @@ public class StaffMember
    private boolean active = true;
    @Getter
    @Setter
-    private Rank rank = Rank.NEW_ADMIN;
+    private Rank rank = Rank.ADMIN;
    @Getter
    private final List<String> ips = new ArrayList<>();
    @Getter
@ -156,7 +156,7 @@ public class StaffMember

        if (!active)
        {
-            if (getRank().isAtLeast(Rank.NEW_ADMIN))
+            if (getRank().isAtLeast(Rank.ADMIN))
            {
                if (plugin.btb != null)
                {