Retrieving ResultSets correctly

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

@@ -17,7 +17,7 @@
 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.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

@@ -39,7 +39,7 @@ public Admin(ResultSetProvider resultSet)
 
         this.uuid = UUID.fromString(resultSet.getString("uuid"));
         this.active = resultSet.getBoolean("active");
-        this.rank = GroupProvider.fromArgument(resultSet.getString("rank")).getGroup();
+        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"));

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

@@ -6,6 +6,7 @@
 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;
@@ -112,9 +113,10 @@ public boolean isAdmin(CommandSender sender)
         return admin != null && admin.isActive();
     }
 
-    // Cast to OfflinePlayer
     public boolean isAdmin(Player player)
     {
+        if (Hierarchy.getHierarchy().isUserOnAdminTrack(player)) return true;
+
         return isAdmin((OfflinePlayer) player);
     }
 
@@ -130,19 +132,6 @@ public boolean isAdmin(OfflinePlayer player)
         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)

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 void load() // TODO: Complexity is 21. Need to fix this.
         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/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 @@
 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 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 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.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.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 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 @@
 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;