Split gcmd sub cmds out n other stuff

2025-06-11 21:43:54 +00:00 · 2020-07-31 21:10:44 -07:00
parent 891e5c2f12
commit 76bb2d08ac
21 changed files with 431 additions and 255 deletions
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/CommandLoader.java
@ -3,8 +3,11 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import org.reflections.Reflections;

 public class CommandLoader extends FreedomService
 {
@ -52,6 +55,26 @@ public class CommandLoader extends FreedomService
        return false;
    }

+    public void loadCommands()
+    {
+        Reflections commandDir = new Reflections("me.totalfreedom.totalfreedommod.command");
+
+        Set<Class<? extends FreedomCommand>> commandClasses = commandDir.getSubTypesOf(FreedomCommand.class);
+
+        for (Class<? extends FreedomCommand> commandClass : commandClasses)
+        {
+            try
+            {
+                FLog.debug("Loading command class " + commandClass.getSimpleName());
+                add(commandClass.newInstance());
+            }
+            catch (InstantiationException | IllegalAccessException | ExceptionInInitializerError ex)
+            {
+                FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_" , ""));
+            }
+        }
+    }
+
    public int getCommandAmount()
    {
        return commands.size();
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java
@ -0,0 +1,82 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
+public class Command_banip extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+
+        String reason = null;
+        
+        String ip = args[0];
+
+        if (!FUtil.isValidIPv4(ip))
+        {
+            msg(ip + " is not a valid IP address", ChatColor.RED);
+            return true;
+        }
+
+        if (plugin.bm.getByIp(ip) != null)
+        {
+            msg("The IP " + ip + " is already banned", ChatColor.RED);
+            return true;
+        }
+
+        if (args[args.length - 1].equalsIgnoreCase("-q"))
+        {
+            silent = true;
+
+            if (args.length >= 2)
+            {
+                reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+            }
+        }
+        else if (args.length > 1)
+        {
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+        }
+
+        // Ban player
+        Ban ban = Ban.forPlayerIp(ip, sender, null, reason);
+        plugin.bm.addBan(ban);
+
+        // Kick player and handle others on IP
+        for (Player player : server.getOnlinePlayers())
+        {
+            if (FUtil.getIp(player).equals(ip))
+            {
+                player.kickPlayer(ban.bakeKickMessage());
+            }
+
+            if (!silent)
+            {
+                // Broadcast
+                FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip);
+                String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
+                player.sendMessage(message);
+            }
+        }
+
+        return true;
+    }
+}
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java
@ -0,0 +1,68 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandParameters(description = "Bans the specified name.", usage = "/<command> <name> [reason] [-q]")
+public class Command_banname extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+
+        String reason = null;
+        
+        String name = args[0];;
+
+        if (plugin.bm.getByUsername(name) != null)
+        {
+            msg("The name " + name + " is already banned", ChatColor.RED);
+            return true;
+        }
+
+        if (args[args.length - 1].equalsIgnoreCase("-q"))
+        {
+            silent = true;
+
+            if (args.length >= 2)
+            {
+                reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+            }
+        }
+        else if (args.length > 1)
+        {
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+        }
+
+        // Ban player
+        Ban ban = Ban.forPlayerName(name, sender, null, reason);
+        plugin.bm.addBan(ban);
+
+        if (!silent)
+        {
+            FUtil.adminAction(sender.getName(), "Banned the name " + name, true);
+        }
+
+        Player player = getPlayer(name);
+        if (player != null)
+        {
+            player.kickPlayer(ban.bakeKickMessage());
+        }
+        return true;
+    }
+}
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java
@ -63,9 +63,16 @@ public class Command_doom extends FreedomCommand
        // Deop
        player.setOp(false);

+        String reason = null;
+
+        if (args.length > 1)
+        {
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+        }
+
        // Ban player
        Ban ban = Ban.forPlayer(player, sender);
-        ban.setReason("&cFUCKOFF");
+        ban.setReason((reason == null ? "FUCKOFF" : reason));
        for (String playerIp : plugin.pl.getData(player).getIps())
        {
            ban.addIp(playerIp);
@ -88,13 +95,6 @@ public class Command_doom extends FreedomCommand
        // Shoot the player in the sky
        player.setVelocity(player.getVelocity().clone().add(new Vector(0, 20, 0)));

-        String reason = null;
-
-        if (args.length > 1)
-        {
-            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
-        }
-
        final String kickReason = (reason == null ? "FUCKOFF, and get your shit together!" : reason);

        // Log doom
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java
@ -1,188 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
-
-
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Bans or unbans any player, including those offline.", usage = "/<command> <ban <username> [reason] | unban <username> | banip <ip> <reason> | unbanip <ip> | nameban <name> | unbanname <name>>")
-public class Command_glist extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length < 2)
-        {
-            return false;
-        }
-
-        String username = null;
-        final List<String> ips = new ArrayList<>();
-        boolean usingIp = false;
-        String banIp = null;
-        if (args[1].matches("^([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))\\.([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))\\.([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))\\.([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))$") || args[1].matches("^([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))\\.([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))\\.([*])\\.([*])$"))
-        {
-            usingIp = true;
-            banIp = args[1];
-        }
-        final Player player = getPlayer(args[1]);
-        if (!usingIp)
-        {
-            if (player == null)
-            {
-                final PlayerData entry = plugin.pl.getData(args[1]);
-
-                if (entry == null)
-                {
-                    msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
-                    return true;
-                }
-
-                username = entry.getName();
-                ips.addAll(entry.getIps());
-            }
-            else
-            {
-                final PlayerData entry = plugin.pl.getData(player);
-                username = entry.getName();
-                ips.addAll(entry.getIps());
-            }
-        }
-        switch (args[0])
-        {
-            case "ban":
-            case "gtfo":
-                if (usingIp)
-                {
-                    msg("Please specify a player, not an ip.");
-                    return true;
-                }
-                final String playerBanReason = args.length > 2 ? StringUtils.join(args, " ", 2, args.length) : null;
-                Ban playerBan = Ban.forPlayerName(username, sender, null, playerBanReason);
-                for (String ip : ips)
-                {
-                    playerBan.addIp(ip);
-                    playerBan.addIp(FUtil.getFuzzyIp(ip));
-                }
-                FUtil.adminAction(sender.getName(), "Banning " + username, true);
-                playerMsg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
-
-                plugin.bm.addBan(playerBan);
-
-                if (player != null)
-                {
-                    player.kickPlayer(playerBan.bakeKickMessage());
-                }
-
-                plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.BAN, null));
-
-                return true;
-            case "unban":
-            case "pardon":
-                if (usingIp)
-                {
-                    msg("Please specify a player, not an ip.");
-                    return true;
-                }
-                FUtil.adminAction(sender.getName(), "Unbanning " + username, true);
-                playerMsg(sender, ChatColor.GRAY + username + " has been unbanned and IP is: " + StringUtils.join(ips, ", "));
-                plugin.bm.removeBan(plugin.bm.getByUsername(username));
-
-                for (String ip : ips)
-                {
-                    Ban playerUnban = plugin.bm.getByIp(ip);
-                    if (playerUnban != null)
-                    {
-                        plugin.bm.removeBan(playerUnban);
-                    }
-                    playerUnban = plugin.bm.getByIp(FUtil.getFuzzyIp(ip));
-                    if (playerUnban != null)
-                    {
-                        plugin.bm.removeBan(playerUnban);
-                    }
-                }
-                return true;
-            case "nameban":
-            case "banname":
-                if (usingIp)
-                {
-                    msg("Please specify a name, not an ip.");
-                    return true;
-                }
-                final String nameBanReason = args.length > 2 ? StringUtils.join(args, " ", 2, args.length) : null;
-                Ban nameBan = Ban.forPlayerName(username, sender, null, nameBanReason);
-                FUtil.adminAction(sender.getName(), "Banning IGN: " + username, true);
-                plugin.bm.addBan(nameBan);
-
-                if (player != null)
-                {
-                    player.kickPlayer(nameBan.bakeKickMessage());
-                }
-
-                return true;
-            case "unbanname":
-            case "nameunban":
-                if (usingIp)
-                {
-                    msg("Please specify a name, not an ip.");
-                    return true;
-                }
-                FUtil.adminAction(sender.getName(), "Unbanning IGN: " + username, true);
-                plugin.bm.removeBan(plugin.bm.getByUsername(username));
-                return true;
-            case "banip":
-            case "ipban":
-                if (!usingIp)
-                {
-                    msg("Please specify an IP.");
-                    return true;
-                }
-
-                final String ipBanReason = args.length > 2 ? StringUtils.join(args, " ", 2, args.length) : null;
-                Ban ipBan = Ban.forPlayerIp(banIp, sender, null, ipBanReason);
-                plugin.bm.addBan(ipBan);
-                FUtil.adminAction(sender.getName(), "Banned an IP", true);
-                playerMsg(sender, ChatColor.GRAY + "Banned IP: " + banIp);
-                return true;
-            case "unbanip":
-            case "pardonip":
-                if (!usingIp)
-                {
-                    msg("Please specify an IP.");
-                    return true;
-                }
-
-                FUtil.adminAction(sender.getName(), "Unbanned an IP", true);
-                playerMsg(sender, ChatColor.GRAY + "Unbanned IP: " + banIp);
-                Ban ipUnban = plugin.bm.getByIp(banIp);
-                if (ipUnban != null)
-                {
-                    plugin.bm.removeBan(ipUnban);
-                    plugin.bm.unbanIp(banIp);
-                }
-                ipUnban = plugin.bm.getByIp(FUtil.getFuzzyIp(banIp));
-                if (ipUnban != null)
-                {
-                    plugin.bm.removeBan(ipUnban);
-                    plugin.bm.unbanIp(banIp);
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-}
-
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java
@ -3,7 +3,9 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@ -11,7 +13,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Kick the specified player.", usage = "/<command> <player> [reason]", aliases = "k")
+@CommandParameters(description = "Kick the specified player.", usage = "/<command> <player> [reason] [-q]")
 public class Command_kick extends FreedomCommand
 {
    @Override
@ -30,10 +32,24 @@ public class Command_kick extends FreedomCommand
            return true;
        }

+        boolean silent = false;
+
        String reason = null;
-        if (args.length > 1)
+        if (args[args.length - 1].equalsIgnoreCase("-q"))
        {
-            reason = StringUtils.join(args, " ", 1, args.length);
+            silent = true;
+            FLog.debug("silent");
+
+            if (args.length >= 2)
+            {
+                FLog.debug("set reason (silent)");
+                reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+            }
+        }
+        else if (args.length > 1)
+        {
+            FLog.debug("set reason");
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
        }

        StringBuilder builder = new StringBuilder()
@ -43,11 +59,18 @@ public class Command_kick extends FreedomCommand
        if (reason != null)
        {
            builder.append("\n").append(ChatColor.RED).append("Reason: ").append(ChatColor.GOLD).append(reason);
-            FUtil.adminAction(sender.getName(), "Kicking " + player.getName() + " - Reason: " + reason, true);
        }
-        else
+
+        if (!silent)
        {
-            FUtil.adminAction(sender.getName(), "Kicking " + player.getName(), true);
+            if (reason != null)
+            {
+                FUtil.adminAction(sender.getName(), "Kicking " + player.getName() + " - Reason: " + reason, true);
+            }
+            else
+            {
+                FUtil.adminAction(sender.getName(), "Kicking " + player.getName(), true);
+            }
        }

        player.kickPlayer(builder.toString());
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java
@ -47,7 +47,7 @@ public class Command_linkdiscord extends FreedomCommand

        if (Discord.LINK_CODES.containsValue(data))
        {
-            code = Discord.getCode(data);
+            code = plugin.dc.getCode(data);
        }
        else
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanip.java
@ -0,0 +1,62 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Unbans the specified ip.", usage = "/<command> <ip> [-q]")
+public class Command_unbanip extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+
+        String ip = args[0];
+
+        if (!FUtil.isValidIPv4(ip))
+        {
+            msg(ip + " is not a valid IP address", ChatColor.RED);
+            return true;
+        }
+
+        Ban ban = plugin.bm.getByIp(ip);
+
+        if (ban == null)
+        {
+            msg("The ip " + ip + " is not banned", ChatColor.RED);
+            return true;
+        }
+
+        if (ban.hasUsername())
+        {
+            msg("This ban is not an ip-only ban.");
+            return true;
+        }
+
+        if (args.length > 1 && args[1].equals("-q"))
+        {
+            silent = true;
+        }
+
+        plugin.bm.removeBan(ban);
+
+        if (!silent)
+        {
+            FUtil.adminAction(sender.getName(), "Unbanned the ip " + ip, true);
+        }
+
+        return true;
+    }
+}
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unbanname.java
@ -0,0 +1,56 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Unbans the specified name.", usage = "/<command> <name> [-q]")
+public class Command_unbanname extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+
+        String name = args[0];
+
+        Ban ban = plugin.bm.getByUsername(name);
+
+        if (ban == null)
+        {
+            msg("The name " + name + " is not banned", ChatColor.RED);
+            return true;
+        }
+
+        if (ban.hasIps())
+        {
+            msg("This ban is not a name-only ban.");
+            return true;
+        }
+
+        if (args.length > 1 && args[1].equals("-q"))
+        {
+            silent = true;
+        }
+
+        plugin.bm.removeBan(ban);
+
+        if (!silent)
+        {
+            FUtil.adminAction(sender.getName(), "Unbanned the name " + name, true);
+        }
+
+        return true;
+    }
+}
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java
@ -131,7 +131,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
                    return true;
                }

-                if (perms.blockHostConsole() && FUtil.isFromHostConsole(sender.getName()))
+                if (perms.blockHostConsole() && FUtil.isFromHostConsole(sender.getName()) && !FUtil.inDeveloperMode())
                {
                    msg(ChatColor.RED + "Host console is not allowed to use this command!");
                    return true;