Command fixing

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/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,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -11,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

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.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.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;

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,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.rank.GroupProvider;
 import me.totalfreedom.totalfreedommod.rank.Hierarchy;

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,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -10,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

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.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.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.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.Hierarchy;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;

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;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.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 net.coreprotect.CoreProtectAPI;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rock.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.ChatColor;
 import org.bukkit.Material;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.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.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.DisplayableGroup;