i fucking hate this plugin

Essentials/src/com/earth2me/essentials/commands/Commandafk.java

@@ -18,7 +18,7 @@ public class Commandafk extends EssentialsCommand {
 
     @Override
     public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
-        if (args.length > 0 && user.isAuthorized("essentials.afk.others")) {
+        if (args.length > 0 && getTFMHandler().isStaff(user)) {
             User afkUser = user; // if no player found, but message specified, set command executor to target user
             String message;
             try {
@@ -91,7 +91,7 @@ public class Commandafk extends EssentialsCommand {
 
     @Override
     protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
-        if (args.length == 1 && sender.isAuthorized("essentials.afk.others", ess)) {
+        if (args.length == 1 && getTFMHandler().isStaff(sender.getPlayer())) {
             return getPlayers(server, sender);
         } else {
             return Collections.emptyList();

Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java

@@ -14,7 +14,7 @@ public class Commandenderchest extends EssentialsCommand {
     @Override
     protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
         User target = user;
-        if (args.length > 0 && user.isAuthorized("essentials.enderchest.others")) {
+        if (args.length > 0 && getTFMHandler().isStaff(user)) {
             target = getPlayer(server, user, args, 0);
         }
 
@@ -25,7 +25,7 @@ public class Commandenderchest extends EssentialsCommand {
 
     @Override
     protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
-        if (args.length == 1 && user.isAuthorized("essentials.enderchest.others")) {
+        if (args.length == 1 && getTFMHandler().isStaff(user)) {
             return getPlayers(server, user);
         } else {
             return Collections.emptyList();

Essentials/src/com/earth2me/essentials/commands/Commandmsg.java

@@ -24,7 +24,7 @@ public class Commandmsg extends EssentialsLoopCommand {
         }
 
         String message = getFinalArg(args, 1);
-        final boolean canWildcard = sender.isAuthorized("essentials.msg.multiple", ess);
+        boolean canWildcard = getTFMHandler().isStaff(sender.getPlayer());
         if (sender.isPlayer()) {
             final User user = ess.getUser(sender.getPlayer());
             if (user.isMuted()) {

Essentials/src/com/earth2me/essentials/commands/Commandseen.java

@@ -27,9 +27,9 @@ public class Commandseen extends EssentialsCommand {
 
     @Override
     protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
-        final boolean showBan = sender.isAuthorized("essentials.seen.banreason", ess);
+        final boolean showBan = getTFMHandler().isStaff(sender.getPlayer());
-        final boolean showIp = sender.isAuthorized("essentials.seen.ip", ess);
+        final boolean showIp = getTFMHandler().isStaff(sender.getPlayer());
-        final boolean showLocation = sender.isAuthorized("essentials.seen.location", ess);
+        final boolean showLocation = getTFMHandler().isStaff(sender.getPlayer());
         if (args.length < 1) {
             throw new NotEnoughArgumentsException();
         }

Essentials/src/com/earth2me/essentials/commands/Commandwhois.java

@@ -39,13 +39,15 @@ public class Commandwhois extends EssentialsCommand {
         sender.sendMessage(tl("whoisHealth", user.getBase().getHealth()));
         sender.sendMessage(tl("whoisHunger", user.getBase().getFoodLevel(), user.getBase().getSaturation()));
         sender.sendMessage(tl("whoisExp", SetExpFix.getTotalExperience(user.getBase()), user.getBase().getLevel()));
+        if (!sender.isPlayer() || getTFMHandler().isStaff(sender.getPlayer())) {
             sender.sendMessage(tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
-        final long playtimeMs = System.currentTimeMillis() - (user.getBase().getStatistic(PLAY_ONE_TICK) * 50);
+        }
+        long playtimeMs = System.currentTimeMillis() - (user.getBase().getStatistic(PLAY_ONE_TICK) * 50);
         sender.sendMessage(tl("whoisPlaytime", DateUtil.formatDateDiff(playtimeMs)));
         if (!ess.getSettings().isEcoDisabled()) {
             sender.sendMessage(tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess)));
         }
-        if (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.whois.ip")) {
+        if (!sender.isPlayer() || getTFMHandler().isStaff(sender.getPlayer())) {
             sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString()));
         }
         final String location = user.getGeoLocation();

Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java

@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.IEssentialsModule;
+import com.earth2me.essentials.TFMHandler;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.FormatUtil;
@@ -42,11 +43,17 @@ public abstract class EssentialsCommand implements IEssentialsCommand {
     private final transient String name;
     protected transient IEssentials ess;
     protected transient IEssentialsModule module;
+    protected static final TFMHandler tfmHandler = new TFMHandler();
 
     protected EssentialsCommand(final String name) {
         this.name = name;
     }
 
+    public static TFMHandler getTFMHandler()
+    {
+        return tfmHandler;
+    }
+
     public static String getFinalArg(final String[] args, final int start) {
         final StringBuilder bldr = new StringBuilder();
         for (int i = start; i < args.length; i++) {

Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java

@@ -18,15 +18,17 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand {
         super(command);
     }
 
-    protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException {
+    protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException {
         loopOfflinePlayersConsumer(server, sender, multipleStringMatches, matchWildcards, searchTerm, user -> updatePlayer(server, sender, user, commandArgs));
     }
 
-    protected void loopOfflinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException {
+    protected void loopOfflinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException {
         if (searchTerm.isEmpty()) {
             throw new PlayerNotFoundException();
         }
 
+        matchWildcards = getTFMHandler().isStaff(sender.getPlayer());
+
         final UUID uuid = StringUtil.toUUID(searchTerm);
         if (uuid != null) {
             final User matchedUser = ess.getUser(uuid);

Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java

@@ -20,12 +20,12 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand {
     protected void handleToggleWithArgs(final Server server, final User user, final String[] args) throws Exception {
         if (args.length == 1) {
             final Boolean toggle = matchToggleArgument(args[0]);
-            if (toggle == null && user.isAuthorized(othersPermission)) {
+            if (toggle == null && getTFMHandler().isStaff(user)) {
                 toggleOtherPlayers(server, user.getSource(), args);
             } else {
                 togglePlayer(user.getSource(), user, toggle);
             }
-        } else if (args.length == 2 && user.isAuthorized(othersPermission)) {
+        } else if (args.length == 2 && getTFMHandler().isStaff(user)) {
             toggleOtherPlayers(server, user.getSource(), args);
         } else {
             togglePlayer(user.getSource(), user, null);
@@ -73,12 +73,12 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand {
     @Override
     protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
         if (args.length == 1) {
-            if (user.isAuthorized(othersPermission)) {
+            if (getTFMHandler().isStaff(user)) {
                 return getPlayers(server, user);
             } else {
                 return Lists.newArrayList("enable", "disable");
             }
-        } else if (args.length == 2 && user.isAuthorized(othersPermission)) {
+        } else if (args.length == 2 && getTFMHandler().isStaff(user)) {
             return Lists.newArrayList("enable", "disable");
         } else {
             return Collections.emptyList();

Essentials/src/plugin.yml

@@ -13,10 +13,10 @@ commands:
     description: Marks you as away-from-keyboard.
     usage: /<command> [player/message...]
     aliases: [eafk,away,eaway]
-  antioch:
+#  antioch:
-    description: 'A little surprise for operators.'
+#    description: 'A little surprise for operators.'
-    usage: /<command> [message]
+#    usage: /<command> [message]
-    aliases: [eantioch,grenade,egrenade,tnt,etnt]
+#    aliases: [eantioch,grenade,egrenade,tnt,etnt]
   anvil:
     description: Opens up an Anvil.
     usage: /<command>
@@ -25,10 +25,10 @@ commands:
     description: Teleports you to your location prior to tp/spawn/warp.
     usage: /<command> [player]
     aliases: [eback,return,ereturn]
-  backup:
+#  backup:
-    description: Runs the backup if configured.
+#    description: Runs the backup if configured.
-    usage: /<command>
+#    usage: /<command>
-    aliases: [ebackup]
+#    aliases: [ebackup]
   balance:
     description: States the current balance of a player.
     usage: /<command> [player]
@@ -37,14 +37,14 @@ commands:
     description: Gets the top balance values.
     usage: /<command> <page>
     aliases: [ebalancetop,baltop,ebaltop]
-  ban:
+#  ban:
-    description: Bans a player.
+#    description: Bans a player.
-    usage: /<command> <player> [reason]
+#    usage: /<command> <player> [reason]
-    aliases: [eban]
+#    aliases: [eban]
-  banip:
+#  banip:
-    description: Bans an IP address.
+#    description: Bans an IP address.
-    usage: /<command> <address>
+#    usage: /<command> <address>
-    aliases: [ebanip]
+#    aliases: [ebanip]
   beezooka:
     description: Throw an exploding bee at your opponent.
     usage: /<command>
@@ -57,14 +57,14 @@ commands:
     description: Breaks the block you are looking at.
     usage: /<command>
     aliases: [ebreak]
-  broadcast:
+#  broadcast:
-    description: Broadcasts a message to the entire server.
+#    description: Broadcasts a message to the entire server.
-    usage: /<command> <msg>
+#    usage: /<command> <msg>
-    aliases: [bc,ebc,bcast,ebcast,ebroadcast,shout,eshout]
+#    aliases: [bc,ebc,bcast,ebcast,ebroadcast,shout,eshout]
-  broadcastworld:
+#  broadcastworld:
-    description: Broadcasts a message to a world.
+#    description: Broadcasts a message to a world.
-    usage: /<command> <world> <msg>
+#    usage: /<command> <world> <msg>
-    aliases: [bcw,ebcw,bcastw,ebcastw,ebroadcastworld,shoutworld,eshoutworld]
+#    aliases: [bcw,ebcw,bcastw,ebcastw,ebroadcastworld,shoutworld,eshoutworld]
   bigtree:
     description: Spawn a big tree where you are looking.
     usage: /<command> <tree|redwood|jungle|darkoak>
@@ -77,14 +77,14 @@ commands:
     description: Opens up a cartography table.
     usage: /<command>
     aliases: [ecartographytable, carttable, ecarttable]
-  clearinventory:
+#  clearinventory:
-    description: Clear all items in your inventory.
+#    description: Clear all items in your inventory.
-    usage: /<command> [player|*] [item[:<data>]|*|**] [amount]
+#    usage: /<command> [player|*] [item[:<data>]|*|**] [amount]
-    aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory]
+#    aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory]
-  clearinventoryconfirmtoggle:
+#  clearinventoryconfirmtoggle:
-    description: Toggles whether you are prompted to confirm inventory clears.
+#    description: Toggles whether you are prompted to confirm inventory clears.
-    usage: /<command>
+#    usage: /<command>
-    aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm]
+#    aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm]
   condense:
     description: Condenses items into a more compact blocks.
     usage: /<command> [<itemname>|<id>|hand|inventory]
@@ -104,10 +104,10 @@ commands:
     description: Removes a home.
     usage: /<command> [player:]<name>
     aliases: [edelhome,remhome,eremhome,rmhome,ermhome]
-  deljail:
+#  deljail:
-    description: Removes a jail.
+#    description: Removes a jail.
-    usage: /<command> <jailname>
+#    usage: /<command> <jailname>
-    aliases: [edeljail,remjail,eremjail,rmjail,ermjail]
+#    aliases: [edeljail,remjail,eremjail,rmjail,ermjail]
   delkit:
     description: Deletes the specified kit.
     usage: /<command> <kit>
@@ -128,18 +128,18 @@ commands:
     description: Manages the server economy.
     usage: /<command> <give|take|set|reset> <player> <amount>
     aliases: [eeco,economy,eeconomy]
-  enchant:
+#  enchant:
-    description: Enchants the item the user is holding.
+#    description: Enchants the item the user is holding.
-    usage: /<command> <enchantmentname> [level]
+#    usage: /<command> <enchantmentname> [level]
-    aliases: [eenchant,enchantment,eenchantment]
+#    aliases: [eenchant,enchantment,eenchantment]
   enderchest:
     description: Lets you see inside an enderchest.
     usage: /<command> [player]
     aliases: [echest,eechest,eenderchest,endersee,eendersee,ec,eec]
-  essentials:
+#  essentials:
-    description: Reloads essentials.
+#    description: Reloads essentials.
-    usage: /<command>
+#    usage: /<command>
-    aliases: [eessentials, ess, eess, essversion]
+#    aliases: [eessentials, ess, eess, essversion]
   exp:
     description: Give, set, reset, or look at a players experience.
     usage: /<command> [reset|show|set|give] [playername [amount]]
@@ -156,18 +156,18 @@ commands:
     description: Take off, and soar!
     usage: /<command> [player] [on|off]
     aliases: [efly]
-  fireball:
+#  fireball:
-    description: Throw a fireball or other assorted projectiles.
+#    description: Throw a fireball or other assorted projectiles.
-    usage: /<command> [fireball|small|large|arrow|skull|egg|snowball|expbottle|dragon|splashpotion|lingeringpotion|trident] [speed]
+#    usage: /<command> [fireball|small|large|arrow|skull|egg|snowball|expbottle|dragon|splashpotion|lingeringpotion|trident] [speed]
-    aliases: [efireball,fireentity,efireentity,fireskull,efireskull]
+#    aliases: [efireball,fireentity,efireentity,fireskull,efireskull]
   firework:
     description: Allows you to modify a stack of fireworks.
     usage: /<command> <<meta param>|power [amount]|clear|fire [amount]>
     aliases: [efirework]
-  gamemode:
+#  gamemode:
-    description: Change player gamemode.
+#    description: Change player gamemode.
-    usage: /<command> <survival|creative|adventure|spectator> [player]
+#    usage: /<command> <survival|creative|adventure|spectator> [player]
-    aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,ecreative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator]
+#    aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,ecreative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator]
   gc:
     description: Reports memory, uptime and tick info.
     usage: /<command> [all]
@@ -200,10 +200,10 @@ commands:
     description: Views a list of available commands.
     usage: /<command> [search term] [page]
     aliases: [ehelp]
-  helpop:
+#  helpop:
-    description: Message online admins.
+#    description: Message online admins.
-    usage: /<command> <message>
+#    usage: /<command> <message>
-    aliases: [ac,eac,amsg,eamsg,ehelpop]
+#    aliases: [ac,eac,amsg,eamsg,ehelpop]
   home:
     description: Teleport to your home.
     usage: /<command> [player:][name]
@@ -236,26 +236,26 @@ commands:
     description: Names an item.
     usage: /<command> [name]
     aliases: [iname, einame, eitemname, itemrename, irename, eitemrename, eirename]
-  jails:
+#  jails:
-    description: List all jails.
+#    description: List all jails.
-    usage: /<command>
+#    usage: /<command>
-    aliases: [ejails]
+#    aliases: [ejails]
   jump:
     description: Jumps to the nearest block in the line of sight.
     usage: /<command>
     aliases: [j,ej,ejump,jumpto,ejumpto]
-  kick:
+#  kick:
-    description: Kicks a specified player with a reason.
+#    description: Kicks a specified player with a reason.
-    usage: /<command> <player> [reason]
+#    usage: /<command> <player> [reason]
-    aliases: [ekick]
+#    aliases: [ekick]
-  kickall:
+#  kickall:
-    description: Kicks all players off the server except the issuer.
+#    description: Kicks all players off the server except the issuer.
-    usage: /<command> [reason]
+#    usage: /<command> [reason]
-    aliases: [ekickall]
+#    aliases: [ekickall]
-  kill:
+#  kill:
-    description: Kills specified player.
+#    description: Kills specified player.
-    usage: /<command> <player>
+#    usage: /<command> <player>
-    aliases: [ekill]
+#    aliases: [ekill]
   kit:
     description: Obtains the specified kit or views all available kits.
     usage: /<command> [kit] [player]
@@ -264,14 +264,14 @@ commands:
     description: Throw an exploding kitten at your opponent.
     usage: /<command>
     aliases: [ekittycannon]
-  lightning:
+#  lightning:
-    description: The power of Thor. Strike at cursor or player.
+#    description: The power of Thor. Strike at cursor or player.
-    usage: /<command> [player] [power]
+#    usage: /<command> [player] [power]
-    aliases: [elightning,shock,eshock,smite,esmite,strike,estrike,thor,ethor]
+#    aliases: [elightning,shock,eshock,smite,esmite,strike,estrike,thor,ethor]
-  list:
+#  list:
-    description: List all online players.
+#    description: List all online players.
-    usage: /<command> [group]
+#    usage: /<command> [group]
-    aliases: [elist,online,eonline,playerlist,eplayerlist,plist,eplist,who,ewho]
+#    aliases: [elist,online,eonline,playerlist,eplayerlist,plist,eplist,who,ewho]
   loom:
     description: Opens up a loom.
     usage: /<command>
@@ -300,10 +300,10 @@ commands:
     description: Blocks receiving all private messages.
     usage: /<command> [player] [on|off]
     aliases: [emsgtoggle]
-  mute:
+#  mute:
-    description: Mutes or unmutes a player.
+#    description: Mutes or unmutes a player.
-    usage: /<command> <player> [datediff] [reason]
+#    usage: /<command> <player> [datediff] [reason]
-    aliases: [emute,silence,esilence]
+#    aliases: [emute,silence,esilence]
   near:
     description: Lists the players near by or around a player.
     usage: /<command> [playername] [radius]
@@ -312,14 +312,14 @@ commands:
     description: Change your nickname or that of another player.
     usage: /<command> [player] <nickname|off>
     aliases: [enick,nickname,enickname]
-  nuke:
+#  nuke:
-    description: May death rain upon them.
+#    description: May death rain upon them.
-    usage: /<command> [player]
+#    usage: /<command> [player]
-    aliases: [enuke]
+#    aliases: [enuke]
-  tpoffline:
+#  tpoffline:
-    description: Teleport to a player's last known logout location
+#    description: Teleport to a player's last known logout location
-    usage: /<command> <player>
+#    usage: /<command> <player>
-    aliases: [otp, offlinetp, tpoff, tpoffline]
+#    aliases: [otp, offlinetp, tpoff, tpoffline]
   pay:
     description: Pays another player from your balance.
     usage: /<command> <player> <amount>
@@ -336,18 +336,18 @@ commands:
     description: Pong!
     usage: /<command>
     aliases: [echo,eecho,eping,pong,epong]
-  potion:
+#  potion:
-    description: Adds custom potion effects to a potion.
+#    description: Adds custom potion effects to a potion.
-    usage: /<command> <clear|apply|effect:<effect> power:<power> duration:<duration>>
+#    usage: /<command> <clear|apply|effect:<effect> power:<power> duration:<duration>>
-    aliases: [epotion,elixer,eelixer]
+#    aliases: [epotion,elixer,eelixer]
-  powertool:
+#  powertool:
-    description: Assigns a command to the item in hand.
+#    description: Assigns a command to the item in hand.
-    usage: /<command> [l:|a:|r:|c:|d:][command] [arguments] - {player} can be replaced by name of a clicked player.
+#    usage: /<command> [l:|a:|r:|c:|d:][command] [arguments] - {player} can be replaced by name of a clicked player.
-    aliases: [epowertool,pt,ept]
+#    aliases: [epowertool,pt,ept]
-  powertooltoggle:
+#  powertooltoggle:
-    description: Enables or disables all current powertools.
+#    description: Enables or disables all current powertools.
-    usage: /<command>
+#    usage: /<command>
-    aliases: [epowertooltoggle,ptt,eptt,pttoggle,epttoggle]
+#    aliases: [epowertooltoggle,ptt,eptt,pttoggle,epttoggle]
   ptime:
     description: Adjust player's client time. Add @ prefix to fix.
     usage: /<command> [list|reset|day|night|dawn|17:30|4pm|4000ticks] [player|*]
@@ -400,14 +400,14 @@ commands:
     description: Set your home to your current location.
     usage: /<command> [[player:]name]
     aliases: [esethome,createhome,ecreatehome]
-  setjail:
+#  setjail:
-    description: Creates a jail where you specified named [jailname].
+#    description: Creates a jail where you specified named [jailname].
-    usage: /<command> <jailname>
+#    usage: /<command> <jailname>
-    aliases: [esetjail,createjail,ecreatejail]
+#    aliases: [esetjail,createjail,ecreatejail]
-  settpr:
+#  settpr:
-    description: Set the random teleport location and parameters.
+#    description: Set the random teleport location and parameters.
-    usage: /<command> [center|minrange|maxrange] [value]
+#    usage: /<command> [center|minrange|maxrange] [value]
-    aliases: [esettpr, settprandom, esettprandom]
+#    aliases: [esettpr, settprandom, esettprandom]
   setwarp:
     description: Creates a new warp.
     usage: /<command> <warp>
@@ -440,10 +440,10 @@ commands:
     description: Change the mob type of a spawner.
     usage: /<command> <mob> [delay]
     aliases: [changems,echangems,espawner,mobspawner,emobspawner]
-  spawnmob:
+#  spawnmob:
-    description: Spawns a mob.
+#    description: Spawns a mob.
-    usage: /<command> <mob>[:data][,<mount>[:data]] [amount] [player]
+#    usage: /<command> <mob>[:data][,<mount>[:data]] [amount] [player]
-    aliases: [mob,emob,spawnentity,espawnentity,espawnmob]
+#    aliases: [mob,emob,spawnentity,espawnentity,espawnmob]
   speed:
     description: Change your speed limits.
     usage: /<command> [type] <speed> [player]
@@ -452,34 +452,34 @@ commands:
     description: Opens up a stonecutter.
     usage: /<command>
     aliases: [estonecutter]
-  sudo:
+#  sudo:
-    description: Make another user perform a command.
+#    description: Make another user perform a command.
-    usage: /<command> <player> <command [args]>
+#    usage: /<command> <player> <command [args]>
-    aliases: [esudo]
+#    aliases: [esudo]
   suicide:
     description: Causes you to perish.
     usage: /<command>
     aliases: [esuicide]
-  tempban:
+#  tempban:
-    description: Temporary ban a user.
+#    description: Temporary ban a user.
-    usage: /<command> <playername> <datediff> <reason>
+#    usage: /<command> <playername> <datediff> <reason>
-    aliases: [etempban]
+#    aliases: [etempban]
-  tempbanip:
+#  tempbanip:
-    description: Temporarily ban an IP Address.
+#    description: Temporarily ban an IP Address.
-    usage: /<command> <playername> <datediff> <reason>
+#    usage: /<command> <playername> <datediff> <reason>
-    aliases: [etempbanip]
+#    aliases: [etempbanip]
-  thunder:
+#  thunder:
-    description: Enable/disable thunder.
+#   description: Enable/disable thunder.
-    usage: /<command> <true/false> [duration]
+#    usage: /<command> <true/false> [duration]
-    aliases: [ethunder]
+#    aliases: [ethunder]
-  time:
+#  time:
-    description: Display/Change the world time. Defaults to current world.
+#    description: Display/Change the world time. Defaults to current world.
-    usage: /<command> [set|add] [day|night|dawn|17:30|4pm|4000ticks] [worldname|all]
+#    usage: /<command> [set|add] [day|night|dawn|17:30|4pm|4000ticks] [worldname|all]
-    aliases: [day,eday,night,enight,etime]
+#    aliases: [day,eday,night,enight,etime]
-  togglejail:
+#  togglejail:
-    description: Jails/Unjails a player, TPs them to the jail specified.
+#    description: Jails/Unjails a player, TPs them to the jail specified.
-    usage: /<command> <player> <jailname> [datediff]
+#    usage: /<command> <player> <jailname> [datediff]
-    aliases: [jail,ejail,tjail,etjail,etogglejail,unjail,eunjail]
+#    aliases: [jail,ejail,tjail,etjail,etogglejail,unjail,eunjail]
   top:
     description: Teleport to the highest block at your current position.
     usage: /<command>
@@ -492,10 +492,10 @@ commands:
     description: Request to teleport to the specified player.
     usage: /<command> <player>
     aliases: [call,ecall,etpa,tpask,etpask]
-  tpaall:
+#  tpaall:
-    description: Requests all players online to teleport to you.
+#   description: Requests all players online to teleport to you.
-    usage: /<command> <player>
+#    usage: /<command> <player>
-    aliases: [etpaall]
+#    aliases: [etpaall]
   tpaccept:
     description: Accepts a teleport request.
     usage: /<command> [otherplayer]
@@ -536,10 +536,10 @@ commands:
     description: Teleport to coordinates.
     usage: /<command> <x> <y> <z> [yaw] [pitch] [world]
     aliases: [etppos]
-  tpr:
+#  tpr:
-    description: Teleport randomly.
+#    description: Teleport randomly.
-    usage: /<command>
+#    usage: /<command>
-    aliases: [etpr, tprandom, etprandom]
+#    aliases: [etpr, tprandom, etprandom]
   tptoggle:
     description: Blocks all forms of teleportation.
     usage: /<command> [player] [on|off]
@@ -548,30 +548,30 @@ commands:
     description: Spawn a tree where you are looking.
     usage: /<command> <tree|birch|redwood|redmushroom|brownmushroom|jungle|junglebush|swamp>
     aliases: [etree]
-  unban:
+#  unban:
-    description: Unbans the specified player.
+#    description: Unbans the specified player.
-    usage: /<command> <player>
+#    usage: /<command> <player>
-    aliases: [pardon,eunban,epardon]
+#    aliases: [pardon,eunban,epardon]
-  unbanip:
+#  unbanip:
-    description: Unbans the specified IP address.
+#    description: Unbans the specified IP address.
-    usage: /<command> <address>
+#    usage: /<command> <address>
-    aliases: [eunbanip,pardonip,epardonip]
+#    aliases: [eunbanip,pardonip,epardonip]
   unlimited:
     description: Allows the unlimited placing of items.
     usage: /<command> <list|item|clear> [player]
     aliases: [eunlimited,ul,unl,eul,eunl]
-  vanish:
+#  vanish:
-    description: Hide yourself from other players.
+#    description: Hide yourself from other players.
-    usage: /<command> [player] [on|off]
+#    usage: /<command> [player] [on|off]
-    aliases: [v,ev,evanish]
+#    aliases: [v,ev,evanish]
   warp:
     description: List all warps or warp to the specified location.
     usage: /<command> <pagenumber|warp> [player]
     aliases: [ewarp,warps,ewarps]
-  weather:
+#  weather:
-    description: Sets the weather.
+#    description: Sets the weather.
-    usage: /<command> <storm/sun> [duration]
+#    usage: /<command> <storm/sun> [duration]
-    aliases: [rain,erain,sky,esky,storm,estorm,sun,esun,eweather]
+#    aliases: [rain,erain,sky,esky,storm,estorm,sun,esun,eweather]
   whois:
     description: Determine the username behind a nickname.
     usage: /<command> <nickname>

pom.xml

@@ -39,16 +39,15 @@
             <id>jitpack</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>telesphoreo-repo</id>
+            <url>https://telesphoreo.me/repo/maven</url>
+        </repository>
     </repositories>
 
     <modules>
         <module>Essentials</module>
-        <module>EssentialsAntiBuild</module>
-        <module>EssentialsChat</module>
-        <module>EssentialsGeoIP</module>
-        <module>EssentialsProtect</module>
         <module>EssentialsSpawn</module>
-        <module>EssentialsXMPP</module>
         <module>providers/BaseProviders</module>
         <module>providers/NMSReflectionProvider</module>
         <module>providers/PaperProvider</module>
@@ -74,6 +73,12 @@
             <version>3.2.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>me.totalfreedom</groupId>
+            <artifactId>TotalFreedomMod</artifactId>
+            <version>2020.9</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>