Merge branch 'RELEASE-2023.03-LUCKPERMS' into proper-resultset-retrieval

Moved command loading into a runnable that will execute on the first server tick. This way, we can ensure that all the plugins are loaded before we load our commands, so TFD4J and Shop can both have their respective commands loaded in.

commons/src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java

@@ -17,7 +17,7 @@ import java.util.Random;
 import java.util.function.Consumer;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.command.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.fun.Jumppads;
 import me.totalfreedom.totalfreedommod.player.FPlayer;

commons/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java

@@ -10,7 +10,7 @@ import me.totalfreedom.totalfreedommod.blocking.*;
 import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
 import me.totalfreedom.totalfreedommod.bridge.*;
 import me.totalfreedom.totalfreedommod.caging.Cager;
-import me.totalfreedom.totalfreedommod.command.CommandLoader;
+import me.totalfreedom.totalfreedommod.command.handling.CommandLoader;
 import me.totalfreedom.totalfreedommod.config.MainConfig;
 import me.totalfreedom.totalfreedommod.freeze.Freezer;
 import me.totalfreedom.totalfreedommod.fun.*;

commons/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -4,15 +4,13 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.DisplayableGroup;
 import me.totalfreedom.totalfreedommod.rank.GroupProvider;
-import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.*;
 
 public class Admin
@@ -32,23 +30,22 @@ public class Admin
         this.ips.add(FUtil.getIp(player));
     }
 
-    public Admin(ResultSet resultSet)
+    public Admin(ResultSetProvider resultSet)
     {
-        try
+        if (resultSet.getString("uuid") == null)
         {
-            this.uuid = UUID.fromString(resultSet.getString("uuid"));
+            throw new IllegalArgumentException("Failed to load admin, as the UUID is null.");
-            this.active = resultSet.getBoolean("active");
-            this.rank = GroupProvider.fromArgument(resultSet.getString("rank")).getGroup();
-            this.ips.clear();
-            this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
-            this.lastLogin = new Date(resultSet.getLong("last_login"));
-            this.commandSpy = resultSet.getBoolean("command_spy");
-            this.potionSpy = resultSet.getBoolean("potion_spy");
-            this.acFormat = resultSet.getString("ac_format");
-        } catch (SQLException e)
-        {
-            FLog.severe("Failed to load admin: " + e.getMessage());
         }
+
+        this.uuid = UUID.fromString(resultSet.getString("uuid"));
+        this.active = resultSet.getBoolean("active");
+        this.rank = GroupProvider.fromString(resultSet.getString("rank")).getGroup();
+        this.ips.clear();
+        this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
+        this.lastLogin = new Date(resultSet.getLong("last_login"));
+        this.commandSpy = resultSet.getBoolean("command_spy");
+        this.potionSpy = resultSet.getBoolean("potion_spy");
+        this.acFormat = resultSet.getString("ac_format");
     }
 
     @Override
@@ -70,15 +67,15 @@ public class Admin
     public Map<String, Object> toSQLStorable()
     {
         HashMap<String, Object> map = new HashMap<>();
-            map.put("uuid", uuid.toString());
+        map.put("uuid", uuid.toString());
-            map.put("active", active);
+        map.put("active", active);
-            map.put("rank", rank.toString());
+        map.put("rank", rank.toString());
-            map.put("ips", FUtil.listToString(ips));
+        map.put("ips", FUtil.listToString(ips));
-            map.put("last_login", lastLogin.getTime());
+        map.put("last_login", lastLogin.getTime());
-            map.put("command_spy", commandSpy);
+        map.put("command_spy", commandSpy);
-            map.put("potion_spy", potionSpy);
+        map.put("potion_spy", potionSpy);
-            map.put("ac_format", acFormat);
+        map.put("ac_format", acFormat);
-            return map;
+        return map;
 
     }
 

commons/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

@@ -5,6 +5,8 @@ import com.google.common.collect.Sets;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;
@@ -12,14 +14,15 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.*;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class AdminList extends FreedomService
 {
     public static final List<UUID> vanished = new ArrayList<>();
+    public static final String SQL_SAVE_FAILED = "Failed to save admin: ";
     private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
     private final Set<Admin> activeAdmins = Sets.newHashSet();
@@ -43,33 +46,37 @@ public class AdminList extends FreedomService
     public void load()
     {
         allAdmins.clear();
-        try
+        plugin.sql.getAdminList().thenAcceptAsync(provider ->
         {
-            ResultSet adminSet = plugin.sql.getAdminList();
+            AtomicInteger row = new AtomicInteger(1);
-            while (adminSet.next())
+            provider.getAllRowsResultSet().forEach(adminSet ->
             {
-                tryAddAdmin(adminSet);
+                try
-            }
+                {
-        } catch (SQLException e)
+                    tryAddAdmin(ResultSetProvider.fromRow(adminSet));
+                    row.set(row.get() + 1);
+                } catch (Throwable e)
+                {
+                    FLog.warning("An error occurred whilst reading the admin entry at row #" + row.get());
+                    throw new CompletionException(e); // handle downstream.
+                }
+            });
+        }).whenComplete((result, throwable) ->
         {
-            FLog.severe("Failed to load admin list: " + e.getMessage());
+            if (throwable != null)
-        }
+            {
-
+                FLog.severe(throwable.getMessage());
-        updateTables();
+                return;
-        FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
+            }
+            updateTables();
+            FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
+        });
     }
 
-    private void tryAddAdmin(ResultSet adminSet) throws SQLException
+    private void tryAddAdmin(ResultSetProvider adminSet)
     {
-        try
+        Admin admin = new Admin(adminSet);
-        {
+        allAdmins.add(admin);
-            Admin admin = new Admin(adminSet);
-            allAdmins.add(admin);
-        } catch (Throwable ex)
-        {
-            FLog.warning("An error occurred whilst reading the admin entry at row #" + adminSet.getRow());
-            FLog.warning(ex);
-        }
     }
 
     public void messageAllAdmins(Component message)
@@ -106,9 +113,10 @@ public class AdminList extends FreedomService
         return admin != null && admin.isActive();
     }
 
-    // Cast to OfflinePlayer
     public boolean isAdmin(Player player)
     {
+        if (Hierarchy.getHierarchy().isUserOnAdminTrack(player)) return true;
+
         return isAdmin((OfflinePlayer) player);
     }
 
@@ -124,19 +132,6 @@ public class AdminList extends FreedomService
         return admin != null && admin.isActive();
     }
 
-    public boolean isSeniorAdmin(CommandSender sender)
-    {
-        Admin admin = getAdmin(sender);
-        if (admin == null)
-        {
-            return false;
-        }
-
-        return admin.getRank().getLuckPermsGroup().getWeight().orElse(0)
-                >= GroupProvider.SENIOR_ADMIN.getGroup().getLuckPermsGroup().getWeight().orElse(1);
-        // We don't want this to return true if there's no group weight available.
-    }
-
     public Admin getAdmin(CommandSender sender)
     {
         if (sender instanceof Player player)
@@ -198,7 +193,13 @@ public class AdminList extends FreedomService
         updateTables();
 
         // Save admin
-        plugin.sql.addAdmin(admin);
+        plugin.sql.addAdmin(admin).whenComplete((result, exception) ->
+        {
+            if (exception != null)
+            {
+                FLog.warning(SQL_SAVE_FAILED + admin.getName() + " to the database.\n" + exception.getMessage());
+            }
+        });
     }
 
     public boolean removeAdmin(Admin admin)
@@ -216,7 +217,13 @@ public class AdminList extends FreedomService
         updateTables();
 
         // Unsave admin
-        plugin.sql.removeAdmin(admin);
+        plugin.sql.removeAdmin(admin).whenComplete((result, exception) ->
+        {
+            if (exception != null)
+            {
+                FLog.warning("Failed to remove admin: " + admin.getName() + " from the database.\n" + exception.getMessage());
+            }
+        });
 
         return true;
     }
@@ -261,21 +268,30 @@ public class AdminList extends FreedomService
 
     public void save(Admin admin)
     {
-        try
+        plugin.sql.getAdminByUuid(admin.getUuid()).thenApplyAsync(result ->
         {
-            ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
             for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
             {
-                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
+                Object storedValue = plugin.sql.getValue(result, entry.getKey(), entry.getValue());
                 if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
                 {
-                    plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
+                    plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue()).whenComplete((result2, exception) ->
+                    {
+                        if (exception != null)
+                        {
+                            throw new CompletionException(exception); // We want to handle downstream in #whenComplete()
+                        }
+                    });
                 }
             }
-        } catch (SQLException e)
+            return null;
+        }).whenComplete((result, exception) ->
         {
-            FLog.severe("Failed to save admin: " + e.getMessage());
+            if (exception != null)
-        }
+            {
+                FLog.severe(SQL_SAVE_FAILED + exception.getMessage());
+            }
+        });
     }
 
     public void deactivateOldEntries(boolean verbose)

commons/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java

@@ -2,17 +2,8 @@ package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.sql.ResultSetProvider;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.Player;
@@ -21,6 +12,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 
+import java.util.*;
+
 public class BanManager extends FreedomService
 {
 
@@ -34,38 +27,38 @@ public class BanManager extends FreedomService
     public void onStart()
     {
         bans.clear();
-        try
+
+        plugin.sql.getBanList().whenComplete((result, throwable) ->
         {
-            ResultSet banSet = plugin.sql.getBanList();
+            if (throwable != null)
             {
-                while (banSet.next())
+                FLog.severe("Failed to load ban list: " + throwable.getMessage());
-                {
+                return;
-                    String name = banSet.getString("name");
-                    UUID uuid = null;
-                    String strUUID = banSet.getString("uuid");
-                    if (strUUID != null)
-                    {
-                        uuid = UUID.fromString(strUUID);
-                    }
-                    List<String> ips = FUtil.stringToList(banSet.getString("ips"));
-                    String by = banSet.getString("by");
-                    Date at = new Date(banSet.getLong("at"));
-                    Date expires = new Date(banSet.getLong("expires"));
-                    String reason = banSet.getString("reason");
-                    Ban ban = new Ban(name, uuid, ips, by, at, expires, reason);
-                    bans.add(ban);
-                }
             }
-        }
-        catch (SQLException e)
-        {
-            FLog.severe("Failed to load ban list: " + e.getMessage());
-        }
             
-        // Remove expired bans, repopulate ipBans and nameBans,
+            result.getAllRowsResultSet().forEach(row ->
-        updateViews();
+            {
+                ResultSetProvider banSet = ResultSetProvider.fromRow(row);
+                String name = banSet.getString("name");
+                UUID uuid = null;
+                String strUUID = banSet.getString("uuid");
+                if (strUUID != null)
+                {
+                    uuid = UUID.fromString(strUUID);
+                }
+                List<String> ips = FUtil.stringToList(banSet.getString("ips"));
+                String by = banSet.getString("by");
+                Date at = new Date(banSet.getLong("at"));
+                Date expires = new Date(banSet.getLong("expires"));
+                String reason = banSet.getString("reason");
+                Ban ban = new Ban(name, uuid, ips, by, at, expires, reason);
+                bans.add(ban);
+                // Remove expired bans, repopulate ipBans and nameBans,
+                updateViews();
 
-        FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
+                FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
+            });
+        });
     }
 
     @Override
@@ -186,8 +179,7 @@ public class BanManager extends FreedomService
         if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
         {
             removeBan(ban);
-        }
+        } else
-        else
         {
 
             for (String ip : ban.getIps())
@@ -202,8 +194,16 @@ public class BanManager extends FreedomService
 
         if (bans.add(ban))
         {
-            plugin.sql.addBan(ban);
+            plugin.sql.addBan(ban).whenComplete((result, ex) ->
-            updateViews();
+            {
+                if (ex != null)
+                {
+                    FLog.severe(ex.getMessage());
+                    return;
+                }
+
+                updateViews();
+            });
         }
 
     }
@@ -212,8 +212,16 @@ public class BanManager extends FreedomService
     {
         if (bans.remove(ban))
         {
-            plugin.sql.removeBan(ban);
+            plugin.sql.removeBan(ban).whenComplete((result, ex) ->
-            updateViews();
+            {
+                if (ex != null)
+                {
+                    FLog.severe(ex.getMessage());
+                    return;
+                }
+
+                updateViews();
+            });
         }
 
     }
@@ -223,7 +231,13 @@ public class BanManager extends FreedomService
         int size = bans.size();
         bans.clear();
         updateViews();
-        plugin.sql.truncate("bans");
+        plugin.sql.truncate("bans").whenComplete((result, ex) ->
+        {
+            if (ex != null)
+            {
+                FLog.severe(ex.getMessage());
+            }
+        });
         return size;
     }
 
@@ -267,8 +281,7 @@ public class BanManager extends FreedomService
         if (ban != null)
         {
             removeBan(ban);
-        }
+        } else
-        else
         {
             ban = getByIp(FUtil.getIp(player));
             if (ban != null)
@@ -286,7 +299,13 @@ public class BanManager extends FreedomService
             if (ban.isExpired())
             {
                 bans.remove(ban);
-                plugin.sql.removeBan(ban);
+                plugin.sql.removeBan(ban).whenComplete((result, ex) ->
+                {
+                    if (ex != null)
+                    {
+                        FLog.severe(ex.getMessage());
+                    }
+                });
             }
         }
 

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java

@@ -30,24 +30,6 @@ public class CommandBlocker extends FreedomService
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
     private final List<String> unknownCommands = Lists.newArrayList();
 
-    public static CommandMap getCommandMap()
-    {
-        try
-        {
-            SimplePluginManager simplePluginManager = (SimplePluginManager)Bukkit.getServer().getPluginManager();
-
-            Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
-            commandMapField.setAccessible(true);
-
-            return (SimpleCommandMap)commandMapField.get(simplePluginManager);
-        }
-        catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
-        {
-            FLog.severe("Failed to get command map field (" + e.getMessage() + ")");
-        }
-        return null;
-    }
-
     @Override
     public void onStart()
     {
@@ -65,7 +47,7 @@ public class CommandBlocker extends FreedomService
         entryList.clear();
         unknownCommands.clear();
 
-        final CommandMap commandMap = getCommandMap();
+        final CommandMap commandMap = Bukkit.getCommandMap();
 
         @SuppressWarnings("unchecked")
         List<String> blockedCommands = (List<String>)ConfigEntry.BLOCKED_COMMANDS.getList();

commons/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java

@@ -1,100 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import org.reflections.Reflections;
-
-public class CommandLoader extends FreedomService
-{
-    private final List<FreedomCommand> commands;
-
-    public CommandLoader()
-    {
-        commands = new ArrayList<>();
-    }
-
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    public void add(FreedomCommand command)
-    {
-        commands.add(command);
-        command.register();
-    }
-
-    public FreedomCommand getByName(String name)
-    {
-        for (FreedomCommand command : commands)
-        {
-            if (name.equals(command.getName()))
-            {
-                return command;
-            }
-        }
-        return null;
-    }
-
-    public boolean isAlias(String alias)
-    {
-        for (FreedomCommand command : commands)
-        {
-            if (Arrays.asList(command.getAliases().split(",")).contains(alias))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void loadCommands()
-    {
-        Reflections commandDir = new Reflections("me.totalfreedom.totalfreedommod.command");
-
-        Set<Class<? extends FreedomCommand>> commandClasses = commandDir.getSubTypesOf(FreedomCommand.class);
-
-        commandLoading:
-        for (Class<? extends FreedomCommand> commandClass : commandClasses)
-        {
-            try
-            {
-                if (commandClass.isAnnotationPresent(CommandDependencies.class))
-                {
-                    String[] dependencies = commandClass.getAnnotation(CommandDependencies.class).value();
-
-                    for (String plugin : dependencies)
-                    {
-                        if (!server.getPluginManager().isPluginEnabled(plugin))
-                        {
-                            FLog.warning("Not loading command due to missing dependency (" + plugin + "): /" + commandClass.getSimpleName().replace("Command_", ""));
-                            continue commandLoading;
-                        }
-                    }
-                }
-
-                add(commandClass.newInstance());
-            }
-            catch (InstantiationException | IllegalAccessException | ExceptionInInitializerError ex)
-            {
-                FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_", ""));
-            }
-        }
-
-        FLog.info("Loaded " + commands.size() + " commands");
-    }
-
-    public List<FreedomCommand> getCommands()
-    {
-        return commands;
-    }
-}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java

@@ -1,5 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.api.event.AdminChatEvent;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java

@@ -1,6 +1,11 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java

@@ -3,6 +3,11 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java

@@ -4,6 +4,11 @@ import io.papermc.lib.PaperLib;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.world.WorldTime;
 import me.totalfreedom.totalfreedommod.world.WorldWeather;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java

@@ -4,6 +4,7 @@ import java.util.Objects;
 
 import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
@@ -18,6 +19,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Intercept("ban")
 @CommandPermissions(permission = "ban", 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

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;
@@ -9,6 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Intercept("banip")
 @CommandPermissions(permission = "banip", source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
 public class Command_banip extends FreedomCommand

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
@@ -9,6 +10,7 @@ import org.bukkit.entity.Player;
 import java.util.Collections;
 import java.util.List;
 
+@Intercept("banlist")
 @CommandPermissions(permission = "banlist", source = SourceType.BOTH)
 @CommandParameters(description = "Shows all banned player names. Admins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
 public class Command_banlist extends FreedomCommand

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java

@@ -3,6 +3,11 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.Arrays;
 import java.util.List;
 import java.util.SplittableRandom;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java

@@ -4,6 +4,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Material;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleanchat.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FUtil;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java

@@ -3,6 +3,10 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.Collections;
 import java.util.Random;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Material;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deafen.java

@@ -1,6 +1,11 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.SplittableRandom;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_debugstick.java

@@ -1,6 +1,11 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.Arrays;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java

@@ -1,10 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.command.handling.*;
-import me.totalfreedom.totalfreedommod.rank.HierarchyProvider;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.luckperms.api.model.user.User;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+@Intercept("deop")
 @CommandPermissions(permission = "deop", source = SourceType.BOTH)
 @CommandParameters(description = "Deop a player", usage = "/<command> <partialname>")
 public class Command_deop extends FreedomCommand
@@ -39,17 +40,22 @@ public class Command_deop extends FreedomCommand
         }
 
         AtomicBoolean atomicBoolean = new AtomicBoolean(silent);
-        User user = GroupProvider.getUser(player);
+        Hierarchy.getHierarchy().demoteUser(Hierarchy.getHierarchy().op(), player).whenComplete((result, throwable) ->
-        HierarchyProvider.OP.getHierarchy().demoteUser(user).whenComplete((result, throwable) ->
         {
             if (throwable != null)
             {
-                FLog.severe("Error while demoting " + player.getName() + " to OP: " + throwable.getMessage());
+                msgNew("<red>Could not demote <player> to non-OP. Check the logs for more details.", player(player));
+                FLog.severe("Error while demoting " + player.getName() + " to non-OP:");
+                FLog.severe(throwable);
+                return;
+            }
+
+            if (result == null || !result.wasSuccessful()) {
+                msgNew("<red><player> is already non-op.", Placeholder.unparsed("player", player.getName()));
                 return;
             }
 
             msg(player, YOU_ARE_NOT_OP);
-            plugin.rm.updateDisplay(player);
 
             if (!atomicBoolean.get())
             {

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java

@@ -1,10 +1,13 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
-import me.totalfreedom.totalfreedommod.rank.HierarchyProvider;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.luckperms.api.model.user.User;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -20,17 +23,23 @@ public class Command_deopall extends FreedomCommand
         FUtil.adminAction(sender.getName(), "De-opping all players on the server", true);
 
         server.getOnlinePlayers().forEach(player ->
-        {
+                Hierarchy.getHierarchy().demoteUser(Hierarchy.getHierarchy().op(), player).whenComplete((result, ex) ->
-            User user = GroupProvider.getUser(player);
+                {
-            HierarchyProvider.OP.getHierarchy().demoteUser(user).whenComplete((result, ex) -> {
+                    if (ex != null)
-                if (ex != null) {
+                    {
-                    FLog.severe("Failed to demote " + player.getName() + " to default rank");
+                        msgNew("<red>Could not demote <player> to non-OP. Check the logs for more details.", player(player));
-                }
+                        FLog.severe("Failed to demote " + player.getName() + " to non-OP:");
+                        FLog.severe(ex);
+                        return;
+                    }
 
-                msg(player, YOU_ARE_NOT_OP);
+                    if (result == null || !result.wasSuccessful()) {
-                plugin.rm.updateDisplay(player);
+                        msgNew("<red><player> is already non-OP.", Placeholder.unparsed("player", player.getName()));
-            });
+                        return;
-        });
+                    }
+
+                    msg(player, YOU_ARE_NOT_OP);
+                }));
 
         return true;
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dispfill.java

@@ -2,6 +2,11 @@ package me.totalfreedom.totalfreedommod.command;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java

@@ -2,6 +2,10 @@ package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_enchant.java

@@ -7,6 +7,10 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.IntStream;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_end.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java

@@ -3,6 +3,11 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java

@@ -2,6 +2,11 @@ package me.totalfreedom.totalfreedommod.command;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java

@@ -2,6 +2,11 @@ package me.totalfreedom.totalfreedommod.command;
 
 import java.util.Collections;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explosivearrows.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.tag.Tag;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fireball.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.freeze.FreezeData;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.apache.commons.lang3.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glow.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_grapplinghook.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java

@@ -3,6 +3,10 @@ package me.totalfreedom.totalfreedommod.command;
 import java.text.DecimalFormat;
 import java.util.concurrent.atomic.AtomicInteger;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.apache.commons.lang.math.DoubleRange;
 import org.bukkit.ChatColor;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_indefban.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_inspect.java

@@ -5,9 +5,12 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.IntStream;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java

@@ -3,6 +3,11 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.fun.Jumppads;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java

@@ -1,8 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
-import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;
@@ -12,6 +12,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Intercept("kick")
 @CommandPermissions(permission = "kick", source = SourceType.BOTH)
 @CommandParameters(description = "Kick the specified player.", usage = "/<command> <player> [reason] [-q]")
 public class Command_kick extends FreedomCommand

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_landmine.java

@@ -1,6 +1,11 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.Iterator;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.fun.Landminer.Landmine;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lightningrod.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_links.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java

@@ -1,19 +1,18 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.JoinConfiguration;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.md_5.bungee.api.ChatColor;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.List;
 
+@Intercept("list")
 @CommandPermissions(permission = "list", source = SourceType.BOTH)
 @CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-a | -v]", aliases = "who,lsit")
 public class Command_list extends FreedomCommand

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_localspawn.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import io.papermc.lib.PaperLib;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import io.papermc.lib.PaperLib;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.world.WorldTime;
 import me.totalfreedom.totalfreedommod.world.WorldWeather;
 import org.bukkit.World;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java

@@ -1,6 +1,13 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -26,13 +33,12 @@ public class Command_mbconfig extends FreedomCommand
 
         switch (args[0])
         {
-            case "list":
+            case "list" ->
             {
                 msg("Master Builders: " + StringUtils.join(plugin.pl.getMasterBuilderNames(), ", "), ChatColor.GOLD);
                 return true;
             }
-
+            case "clearips" ->
-            case "clearips":
             {
                 if (args.length > 1)
                 {
@@ -55,13 +61,23 @@ public class Command_mbconfig extends FreedomCommand
                 int counter = data.getIps().size() - 1;
                 data.clearIps();
                 data.addIp(FUtil.getIp(playerSender));
-                plugin.sql.addPlayer(data);
+                plugin.sql.addPlayer(data).whenComplete((result, ex) ->
-                msg(counter + " IPs removed.");
+                {
-                msg(data.getIps().get(0) + " is now your only IP address");
+                    if (ex != null)
-                FUtil.adminAction(sender.getName(), "Clearing my IPs", true);
+                    {
+                        FLog.severe(ex.getMessage());
+                        msgNew("<red>Failed to clear IPs!");
+                        return;
+                    }
+
+                    msg(counter + " IPs removed.");
+                    msg(data.getIps().get(0) + " is now your only IP address");
+                    FUtil.adminAction(sender.getName(), "Clearing my IPs", true);
+                });
+
                 return true;
             }
-            case "clearip":
+            case "clearip" ->
             {
                 if (args.length < 2)
                 {
@@ -89,12 +105,21 @@ public class Command_mbconfig extends FreedomCommand
                     return true;
                 }
                 data.removeIp(args[1]);
-                plugin.sql.addPlayer(data);
+                plugin.sql.addPlayer(data).whenComplete((result, ex) ->
-                msg("Removed IP " + args[1]);
+                {
-                msg("Current IPs: " + StringUtils.join(data.getIps(), ", "));
+                    if (ex != null)
+                    {
+                        FLog.severe(ex.getMessage());
+                        msgNew("<red>Failed to remove IP!");
+                        return;
+                    }
+
+                    msg("Removed IP " + args[1]);
+                    msg("Current IPs: " + StringUtils.join(data.getIps(), ", "));
+                });
                 return true;
             }
-            case "add":
+            case "add" ->
             {
                 if (args.length < 2)
                 {
@@ -120,18 +145,16 @@ public class Command_mbconfig extends FreedomCommand
                 {
                     FUtil.adminAction(sender.getName(), "Adding " + data.getName() + " to the Master Builder list", true);
                     data.setMasterBuilder(true);
+                    Hierarchy.getHierarchy()
+                            .addUserToGroup(GroupProvider.MASTER_BUILDER.getGroup(), player);
                     plugin.pl.save(data);
-                    if (player != null)
-                    {
-                        plugin.rm.updateDisplay(player);
-                    }
                 } else
                 {
                     msg("That player is already on the Master Builder list.");
                 }
                 return true;
             }
-            case "remove":
+            case "remove" ->
             {
                 if (args.length < 2)
                 {
@@ -144,24 +167,23 @@ public class Command_mbconfig extends FreedomCommand
                 }
 
                 Player player = getPlayer(args[1]);
-                PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]);
+                PlayerData data = plugin.pl.getData(args[1]);
 
-                if (data == null || !data.isMasterBuilder())
+                if (player == null || data == null || !data.isMasterBuilder())
                 {
-                    msg("Master Builder not found: " + args[1]);
+                    msgNew("Master Builder not found: <arg>", arg(args[1]));
                     return true;
                 }
 
                 FUtil.adminAction(sender.getName(), "Removing " + data.getName() + " from the Master Builder list", true);
+                Hierarchy.getHierarchy()
+                        .dropUserFromAll(Hierarchy.getHierarchy().builder(), player);
                 data.setMasterBuilder(false);
                 plugin.pl.save(data);
-                if (player != null)
+
-                {
-                    plugin.rm.updateDisplay(player);
-                }
                 return true;
             }
-            default:
+            default ->
             {
                 return false;
             }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.GameRuleHandler;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mobpurge.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mp44.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import org.bukkit.ChatColor;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -12,6 +13,7 @@ import org.bukkit.entity.Player;
 
 import java.util.*;
 
+@Intercept("mute")
 @CommandPermissions(permission = "mute", source = SourceType.BOTH)
 @CommandParameters(description = "Mutes a player with brute force.", usage = "/<command> <[-q] <player> [reason] | list | purge | all>", aliases = "stfu")
 public class Command_mute extends FreedomCommand

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java

@@ -1,12 +1,15 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.GroupProvider;
 import me.totalfreedom.totalfreedommod.util.FConverter;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myinfo.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickmm.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java

@@ -1,10 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.command.handling.*;
-import me.totalfreedom.totalfreedommod.rank.HierarchyProvider;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.luckperms.api.model.user.User;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -12,6 +11,7 @@ import org.bukkit.entity.Player;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+@Intercept("op")
 @CommandPermissions(permission = "op", source = SourceType.BOTH, cooldown = 5)
 @CommandParameters(description = "OP a player", usage = "/<command> <partialname>")
 public class Command_op extends FreedomCommand
@@ -40,17 +40,27 @@ public class Command_op extends FreedomCommand
         }
 
         AtomicBoolean atomicBoolean = new AtomicBoolean(silent);
-        User user = GroupProvider.getUser(player);
+        Hierarchy.getHierarchy().promoteUser(Hierarchy.getHierarchy().op(), player).whenComplete((result, throwable) ->
-        HierarchyProvider.OP.getHierarchy().promoteUser(user).whenComplete((ignored, throwable) ->
         {
             if (throwable != null)
             {
-                FLog.severe("Failed to promote user " + player.getName());
+                msgNew("<red>Failed to promote <player> to OP. Check logs for more details.", player(player));
+                FLog.severe("Failed to promote " + player.getName() + " to OP:");
+                FLog.severe(throwable);
+                return;
+            }
+
+            if (result == null) {
+                msgNew("<red><player> was not on the track! Added.", player(player));
+            }
+            else if (!result.wasSuccessful())
+            {
+                msgNew("<red><player> is already OP!", player(player));
                 return;
             }
 
             msg(player, YOU_ARE_OP);
-            plugin.rm.updateDisplay(player);
+
             if (!atomicBoolean.get())
             {
                 FUtil.adminAction(sender.getName(), "Opping " + player.getName(), false);

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java

@@ -1,10 +1,12 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
-import me.totalfreedom.totalfreedommod.rank.HierarchyProvider;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.luckperms.api.model.user.User;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,20 +21,25 @@ public class Command_opall extends FreedomCommand
         FUtil.adminAction(sender.getName(), "Opping all players on the server", true);
 
         server.getOnlinePlayers().forEach(player ->
-        {
+                Hierarchy.getHierarchy().promoteUser(Hierarchy.getHierarchy().op(), player).whenComplete((result, throwable) ->
-            User user = GroupProvider.getUser(player);
-            HierarchyProvider.OP.getHierarchy().promoteUser(user).whenComplete((ignored, throwable) ->
-            {
-                if (throwable != null)
                 {
-                    FLog.severe("Failed to promote " + player.getName());
+                    if (throwable != null)
-                    return;
+                    {
-                }
+                        msgNew("<red>Failed to promote <player> to OP. Check the logs for more details.", player(player));
+                        FLog.severe("Failed to promote " + player.getName());
+                        FLog.severe(throwable);
+                        return;
+                    }
 
-                msg(player, YOU_ARE_OP);
+                    if (result == null) {
-                plugin.rm.updateDisplay(player);
+                        msgNew("<red><player> was not present on the track! Added.", player(player));
-            });
+                    } else if (!result.wasSuccessful()) {
-        });
+                        msgNew("<red>Player is already OP!", player(player));
+                        return;
+                    }
+
+                    msg(player, YOU_ARE_OP);
+                }));
 
         return true;
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java

@@ -1,10 +1,12 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.GroupProvider;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
-import me.totalfreedom.totalfreedommod.rank.HierarchyProvider;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.luckperms.api.model.user.User;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -18,15 +20,21 @@ public class Command_opme extends FreedomCommand
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
         FUtil.adminAction(sender.getName(), "Opping " + sender.getName(), false);
-        User user = GroupProvider.getUser(playerSender);
+        Hierarchy.getHierarchy().promoteUser(Hierarchy.getHierarchy().op(), playerSender)
-        HierarchyProvider.OP.getHierarchy().promoteUser(user).whenComplete((result, error) -> {
+                .whenComplete((result, error) ->
-            if (error != null) {
+        {
+            if (error != null)
+            {
                 FLog.severe("Error while promoting " + playerSender.getName() + " to OP: " + error.getMessage());
                 return;
             }
 
+            if (result != null && !result.wasSuccessful()) {
+                msgNew("<red>You are already op!");
+                return;
+            }
+
             msg(YOU_ARE_OP);
-            plugin.rm.updateDisplay(playerSender);
         });
         return true;
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plotworld.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import io.papermc.lib.PaperLib;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -13,6 +14,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+@Intercept("potion")
 @CommandPermissions(permission = "potion", source = SourceType.BOTH)
 @CommandParameters(
         description = "Manipulate your potion effects. Duration is measured in server ticks (~20 ticks per second).",

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.Bukkit;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.rank.Displayable;
 import me.totalfreedom.totalfreedommod.rank.DisplayableGroup;
 import org.bukkit.ChatColor;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rawsay.java

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
@@ -8,6 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Intercept("report")
 @CommandPermissions(permission = "report", source = SourceType.ONLY_IN_GAME, blockHostConsole = true)
 @CommandParameters(description = "Report a player for all admins to see.", usage = "/<command> <player> <reason>")
 public class Command_report extends FreedomCommand

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java

@@ -1,6 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import io.papermc.lib.PaperLib;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FUtil;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rideablepearl.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;