From 372ba97bef466c5838f18468f8d8363b71cdf8d7 Mon Sep 17 00:00:00 2001 From: Ivan Date: Mon, 30 Mar 2020 19:43:57 -0400 Subject: [PATCH] Change command descriptions, as well as simplify some commands --- .../totalfreedommod/ChatManager.java | 14 ++ .../totalfreedommod/CommandSpy.java | 1 + .../command/Command_adminchat.java | 6 +- .../command/Command_admininfo.java | 2 +- .../command/Command_adminmode.java | 2 +- .../command/Command_adminworld.java | 2 +- .../command/Command_adventure.java | 5 +- .../command/Command_announce.java | 2 +- .../command/Command_autoclear.java | 3 +- .../command/Command_autotp.java | 3 +- .../command/Command_banlist.java | 5 +- .../totalfreedommod/command/Command_bird.java | 2 +- .../command/Command_blockcmd.java | 2 +- .../command/Command_blockedit.java | 2 +- .../command/Command_blockpvp.java | 2 +- .../totalfreedommod/command/Command_cage.java | 8 +- .../totalfreedommod/command/Command_cake.java | 2 +- .../command/Command_campfire.java | 2 +- .../command/Command_clearchat.java | 2 +- .../command/Command_cleardiscordqueue.java | 2 +- .../command/Command_clearinventory.java | 10 +- .../command/Command_colorme.java | 2 +- .../command/Command_consolesay.java | 4 +- .../command/Command_cookie.java | 2 +- .../command/Command_creative.java | 5 +- .../totalfreedommod/command/Command_cuck.java | 2 +- .../command/Command_curse.java | 2 +- .../command/Command_deafen.java | 2 +- .../command/Command_disguisetoggle.java | 2 +- .../totalfreedommod/command/Command_doom.java | 4 +- .../command/Command_eject.java | 2 +- .../command/Command_ender.java | 2 +- .../command/Command_executive.java | 5 +- .../command/Command_explode.java | 52 +++++ .../command/Command_findip.java | 2 +- .../command/Command_flatlands.java | 2 +- .../command/Command_forcekill.java | 2 +- .../command/Command_freeze.java | 2 +- .../command/Command_fuckoff.java | 2 +- .../command/Command_gchat.java | 2 +- .../totalfreedommod/command/Command_gcmd.java | 2 +- .../command/Command_glist.java | 2 +- .../command/Command_gravity.java | 2 +- .../totalfreedommod/command/Command_gtfo.java | 4 +- .../command/Command_health.java | 2 +- .../command/Command_hubworld.java | 207 ------------------ .../command/Command_invsee.java | 2 +- .../command/Command_jumppads.java | 2 +- .../totalfreedommod/command/Command_kick.java | 2 +- .../command/Command_kicknoob.java | 2 +- .../command/Command_lastcmd.java | 2 +- .../command/Command_links.java | 2 +- .../command/Command_localspawn.java | 2 +- .../command/Command_lockup.java | 2 +- .../command/Command_makeopregion.java | 2 +- .../command/Command_manageshop.java | 12 +- .../command/Command_masterbuilderinfo.java | 2 +- .../command/Command_masterbuilderworld.java | 2 +- .../command/Command_mbconfig.java | 2 +- .../command/Command_moblimiter.java | 2 +- .../command/Command_modifyitem.java | 2 +- .../command/Command_myadmin.java | 2 +- .../command/Command_mymasterbuilder.java | 2 +- .../command/Command_namehistory.java | 2 +- .../command/Command_nether.java | 2 +- .../command/Command_nickclean.java | 2 +- .../command/Command_nicknyan.java | 2 +- .../command/Command_onlinemode.java | 2 +- .../totalfreedommod/command/Command_op.java | 4 +- .../command/Command_opall.java | 2 +- .../totalfreedommod/command/Command_opme.java | 2 +- .../command/Command_orbit.java | 2 +- .../command/Command_permban.java | 2 +- .../command/Command_plugincontrol.java | 2 +- .../command/Command_potion.java | 2 +- .../command/Command_potionspy.java | 2 +- .../command/Command_premium.java | 2 +- .../command/Command_protectarea.java | 4 +- .../command/Command_purgeall.java | 2 +- .../command/Command_qdeop.java | 2 +- .../totalfreedommod/command/Command_qop.java | 2 +- .../totalfreedommod/command/Command_rank.java | 2 +- .../command/Command_realtime.java | 2 +- .../command/Command_report.java | 2 +- .../command/Command_restart.java | 2 +- .../totalfreedommod/command/Command_ride.java | 2 +- .../command/Command_saconfig.java | 2 +- .../totalfreedommod/command/Command_say.java | 4 +- .../command/Command_scare.java | 2 +- .../command/Command_serverstats.java | 2 +- .../command/Command_setcompass.java | 2 +- .../command/Command_setlevel.java | 4 +- .../command/Command_setspawnworld.java | 2 +- .../totalfreedommod/command/Command_shop.java | 2 +- .../command/Command_spawnmob.java | 2 +- .../command/Command_spectator.java | 2 +- .../command/Command_status.java | 2 +- .../totalfreedommod/command/Command_stop.java | 2 +- .../command/Command_stopsound.java | 2 +- .../command/Command_survival.java | 3 +- .../totalfreedommod/command/Command_tag.java | 2 +- .../command/Command_tagnyan.java | 2 +- .../command/Command_tagrainbow.java | 2 +- .../command/Command_togglechat.java | 2 +- .../command/Command_tprandom.java | 2 +- .../command/Command_trail.java | 2 +- .../command/Command_unban.java | 2 +- .../command/Command_undisguiseall.java | 2 +- .../command/Command_unlinkdiscord.java | 2 +- .../command/Command_verifynoadmin.java | 4 +- .../totalfreedommod/command/Command_vote.java | 2 +- .../command/Command_vpnbanlist.java | 2 +- .../totalfreedommod/command/Command_warn.java | 2 +- .../command/Command_whohas.java | 2 +- .../command/Command_wipeuserdata.java | 2 +- .../command/Command_wipewarps.java | 2 +- 116 files changed, 204 insertions(+), 353 deletions(-) create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java index 67706239..89afe07a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java @@ -74,6 +74,20 @@ public class ChatManager extends FreedomService return; } + if (message.contains("nigger") || message.contains("nigga")) + { + event.setCancelled(true); + player.sendMessage(ChatColor.RED + "This is racist and therefore is prohibited."); + return; + } + + if (message.contains("dyke") || message.contains("fag") || message.contains("kike")) + { + event.setCancelled(true); + player.sendMessage(ChatColor.RED + "This is homophobic and therefore is prohibited."); + return; + } + // Truncate messages that are too long - 256 characters is vanilla client max if (message.length() > 256) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index 2ed134c3..db9a157a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.ChatColor; public class CommandSpy extends FreedomService { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java index 2c895ce2..20431c73 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java @@ -9,7 +9,7 @@ import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) @CommandParameters( - description = "AdminChat - Talk privately with other admins. Using itself will toggle AdminChat on and off for all messages.", + description = "Talk privately with other administrators on the server.", usage = "/ [message...]", aliases = "o,ac") public class Command_adminchat extends FreedomCommand @@ -22,13 +22,13 @@ public class Command_adminchat extends FreedomCommand { if (senderIsConsole) { - msg("Only in-game players can toggle AdminChat."); + msg("You must be in-game to toggle admin chat, it cannot be toggled via CONSOLE or Telnet."); return true; } FPlayer userinfo = plugin.pl.getPlayer(playerSender); userinfo.setAdminChat(!userinfo.inAdminChat()); - msg("Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + "."); + msg("Toggled your admin chat " + (userinfo.inAdminChat() ? "on" : "off") + "."); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java index a388593b..f3f05af6 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java @@ -22,7 +22,7 @@ public class Command_admininfo extends FreedomCommand if (adminInfo.isEmpty()) { - msg("There is no admin information set in the config.", ChatColor.RED); + msg("The admin information section of the config.yml file has not been configured.", ChatColor.RED); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java index 4a29bfff..ae6647d4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java @@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.TELNET_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Close server to non-admins.", usage = "/ [on | off]") +@CommandParameters(description = "Denies joining of operators and only allows admins to join.", usage = "/ [on | off]") public class Command_adminmode extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java index a13e82d2..120c1570 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java @@ -14,7 +14,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Go to the AdminWorld.", +@CommandParameters(description = "Allows for admins to configure guests, time, and weather of the AdminWorld, and allows for admins and guests to go to the AdminWorld.", usage = "/ [guest < list | purge | add | remove > | time | weather ]", aliases = "aw") public class Command_adminworld extends FreedomCommand diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java index 0c8f6ca1..1252dce1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Quickly change your own gamemode to adventure, or define someone's username to change theirs.", usage = "/ <[partialname] | -a>", aliases = "gma") +@CommandParameters(description = "Quickly change your own gamemode to adventure, define someone's username to change theirs, or change everyone's gamemode on the server.", usage = "/ <[partialname] | -a>", aliases = "gma") public class Command_adventure extends FreedomCommand { @@ -24,7 +24,7 @@ public class Command_adventure extends FreedomCommand } playerSender.setGameMode(GameMode.ADVENTURE); - msg("Gamemode set to adventure."); + msg("Your gamemode has been set to adventure."); return true; } @@ -38,6 +38,7 @@ public class Command_adventure extends FreedomCommand } FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false); + msg("Your gamemode has been set to adventure."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java index d4ee0c99..d22fb4f7 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Make an announcement", usage = "/ ") +@CommandParameters(description = "Make an announcement anonymously to operators.", usage = "/ ") public class Command_announce extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java index d0e84630..66aa34f5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -30,7 +29,7 @@ public class Command_autoclear extends FreedomCommand plugin.lp.CLEAR_ON_JOIN.add(args[0]); } - msg(args[0] + " will " + (enabled ? "no longer" : "now") + " have their inventory cleared when they join", ChatColor.GREEN); + msg(args[0] + " will " + (enabled ? "no longer" : "now") + " have their inventory cleared when they join."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java index a4b3d0d1..f52e82b5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -30,7 +29,7 @@ public class Command_autotp extends FreedomCommand plugin.lp.TELEPORT_ON_JOIN.add(args[0]); } - msg(args[0] + " will " + (enabled ? "no longer" : "now") + " be automatically teleported when they join", ChatColor.GREEN); + msg(args[0] + " will " + (enabled ? "no longer" : "now") + " be automatically teleported when they join."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java index 66dcab1b..b16883a2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java @@ -2,13 +2,12 @@ package me.totalfreedom.totalfreedommod.command; 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.OP, source = SourceType.BOTH) -@CommandParameters(description = "Shows all banned player names. Superadmins may optionally use 'purge' to clear the list.", usage = "/ [purge]") +@CommandParameters(description = "Shows all banned player names. Senior Admins may optionally use 'purge' to clear the list.", usage = "/ [purge]") public class Command_banlist extends FreedomCommand { @@ -23,7 +22,7 @@ public class Command_banlist extends FreedomCommand FUtil.adminAction(sender.getName(), "Purging the ban list", true); int amount = plugin.bm.purge(); - sender.sendMessage(ChatColor.GRAY + "Purged " + amount + " player bans."); + msg("Purged " + amount + " player bans."); return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java index ce573103..83125968 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; import java.util.Random; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = ":goodbird:", usage = "/") +@CommandParameters(description = "Spawns a random type of fish at your location.", usage = "/") public class Command_bird extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java index 45aeb662..50328c99 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java @@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Block all commands for a specific player.", usage = "/ <-a | purge | >", aliases = "blockcommands,blockcommand,bc,bcmd") +@CommandParameters(description = "Block all commands for everyone on the server, or a specific player.", usage = "/ <-a | purge | >", aliases = "blockcommands,blockcommand,bc,bcmd") public class Command_blockcmd extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java index 743a7e10..ff095e9b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java @@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Restricts/unrestricts block modification abilities", usage = "/ [[-s] [reason] | list | purge | all]") +@CommandParameters(description = "Restricts/unrestricts block modification abilities for everyone on the server or a certain player.", usage = "/ [[-s] [reason] | list | purge | all]") public class Command_blockedit extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java index df8609d7..d9393dcb 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java @@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Toggle PVP mode for players.", usage = "/ [[-s] [reason] | list | purge | all]", aliases = "pvpblock,pvpmode") +@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/ [[-s] [reason] | list | purge | all]", aliases = "pvpblock,pvpmode") public class Command_blockpvp extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java index e3cc3d09..d881e298 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java @@ -16,7 +16,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Place a cage around someone.", usage = "/ [skull | block] [playername | blockname]") +@CommandParameters(description = "Place a cage around someone with certain blocks, or someone's player head.", usage = "/ [head | block] [playername | blockname]") public class Command_cage extends FreedomCommand { @@ -64,7 +64,7 @@ public class Command_cage extends FreedomCommand fPlayer.getCageData().setCaged(false); return true; } - case "skull": + case "head": { outerMaterial = Material.PLAYER_HEAD; if (args.length >= 3) @@ -130,7 +130,7 @@ public class Command_cage extends FreedomCommand { if (!args[0].equals("purge")) { - return Arrays.asList("off", "skull", "block"); + return Arrays.asList("off", "head", "block"); } } else if (args.length == 3) @@ -139,7 +139,7 @@ public class Command_cage extends FreedomCommand { return FUtil.getAllMaterialNames(); } - else if (args[1].equals("skull")) + else if (args[1].equals("head")) { return FUtil.getPlayerList(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java index d7f87720..9b38f804 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "For the people that are still alive.", usage = "/") +@CommandParameters(description = "For the people that are still alive - gives a cake to everyone on the server.", usage = "/") public class Command_cake extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_campfire.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_campfire.java index e4406e60..d35c7b6a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_campfire.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_campfire.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "You know the words.", usage = "/") +@CommandParameters(description = "You know the words - gives a campfire to everyone on the server.", usage = "/") public class Command_campfire extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java index 08ff67a0..3db4e552 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java @@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Clear chat", usage = "/", aliases = "cc") +@CommandParameters(description = "Clears the chat for players who are not opt-out.", usage = "/", aliases = "cc") public class Command_clearchat extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java index 8e3260d9..8346fb70 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE) -@CommandParameters(description = "Clear the discord message queue", usage = "/") +@CommandParameters(description = "Clear the discord message queue.", usage = "/") public class Command_cleardiscordqueue extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java index 6a4b225c..1c22b100 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java @@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Clear your inventory", usage = "/ [player]", aliases = "ci,clear") +@CommandParameters(description = "Clear your inventory.", usage = "/ [player]", aliases = "ci,clear") public class Command_clearinventory extends FreedomCommand { @@ -25,7 +25,7 @@ public class Command_clearinventory extends FreedomCommand } playerSender.getInventory().clear(); - msg("Cleared your inventory"); + msg("Your inventory has been cleared."); } else { @@ -38,7 +38,7 @@ public class Command_clearinventory extends FreedomCommand { player.getInventory().clear(); } - msg("Cleared everyone's inventory"); + msg("Sucessfully cleared everyone's inventory."); } else { @@ -51,8 +51,8 @@ public class Command_clearinventory extends FreedomCommand } player.getInventory().clear(); - msg("Cleared " + player.getName() + "'s inventory"); - player.sendMessage(sender.getName() + " has cleared your inventory"); + msg("Cleared " + player.getName() + "'s inventory."); + player.sendMessage(sender.getName() + " has cleared your inventory."); } } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java index 01a8df94..97b3ef7e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java @@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Essentials Interface Command - Color your current nickname.", usage = "/ ") +@CommandParameters(description = "Essentials Interface Command - Set your nickname to a certain color.", usage = "/ ") public class Command_colorme extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java index 95f5ffc4..3c697b1b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java @@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_CONSOLE) -@CommandParameters(description = "Telnet command - Send a chat message with chat formatting over telnet.", usage = "/ ", aliases = "csay") +@CommandParameters(description = "Telnet/Console ommand - Send a chat message with chat formatting over telnet.", usage = "/ ", aliases = "csay") public class Command_consolesay extends FreedomCommand { @@ -24,7 +24,7 @@ public class Command_consolesay extends FreedomCommand } String message = StringUtils.join(args, " "); - FUtil.bcastMsg(String.format("§7[CONSOLE] §f<§c%s§f> %s", sender.getName(), StringUtils.join(args, " "))); + FUtil.bcastMsg(String.format("§7[CONSOLE] §c%s §8» §f%s", sender.getName(), StringUtils.join(args, " "))); // Send the message to Discord if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist()) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java index 1896a641..764981f4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "For those who have no friends", usage = "/") +@CommandParameters(description = "For those who have no friends - gives a cookie to everyone on the server.", usage = "/") public class Command_cookie extends FreedomCommand { public static final String COOKIE_LYRICS = "Imagine that you have zero cookies and you split them evenly among zero friends. How many cookies does each person get? See? It doesn't make sense. And Cookie Monster is sad that there are no cookies, and you are sad that you have no friends."; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java index 1bed3abf..c81edfab 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Quickly change your own gamemode to creative, or define someone's username to change theirs.", usage = "/ <-a | [partialname]>", aliases = "gmc") +@CommandParameters(description = "Quickly change your own gamemode to creative, define someone's username to change theirs, or change everyone's gamemode on the server.", usage = "/ <-a | [partialname]>", aliases = "gmc") public class Command_creative extends FreedomCommand { @@ -24,7 +24,7 @@ public class Command_creative extends FreedomCommand } playerSender.setGameMode(GameMode.CREATIVE); - msg("Gamemode set to creative."); + msg("Your gamemode has been set to creative."); return true; } @@ -38,6 +38,7 @@ public class Command_creative extends FreedomCommand } FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to creative", false); + msg("Your gamemode has been set to creative."); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cuck.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cuck.java index 9692e2f6..ea1598b5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cuck.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cuck.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.ChatColor; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Cuck someone", usage = "/ ") +@CommandParameters(description = "Cuck someone - sends an unclearable title to the specified player.", usage = "/ ") public class Command_cuck extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java index cdcaa7d1..a8bdfa74 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.ChatColor; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Curse someone", usage = "/ ") +@CommandParameters(description = "Curse someone - sends a cursed texture pack to the specified player.", usage = "/ ") public class Command_curse extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deafen.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deafen.java index d3cbd1ed..d538271b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deafen.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deafen.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Make some noise.", usage = "/") +@CommandParameters(description = "Makes random sounds to everyone online.", usage = "/") public class Command_deafen extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java index fd676975..99482fdf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Toggle the disguise plugin", usage = "/", aliases = "dtoggle") +@CommandParameters(description = "Toggle LibsDisguises for everyone online.", usage = "/", aliases = "dtoggle") public class Command_disguisetoggle extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java index 5f8549ad..2ed1ee36 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java @@ -19,7 +19,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true) -@CommandParameters(description = "For the bad admins", usage = "/ ") +@CommandParameters(description = "Sends the specified player to their doom.", usage = "/ ") public class Command_doom extends FreedomCommand { @@ -112,7 +112,7 @@ public class Command_doom extends FreedomCommand { // message FUtil.adminAction(sender.getName(), "Banning " + player.getName(), true); - playerMsg(sender, ChatColor.GRAY + player.getName() + " has been banned and IP is: " + ip); + msg(sender, player.getName() + " has been banned and IP is: " + ip); // generate explosion player.getWorld().createExplosion(player.getLocation(), 0F, false); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java index e6e35053..aa67df4e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Eject everything off of you.", usage = "/") +@CommandParameters(description = "Eject players that are riding you.", usage = "/") public class Command_eject extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ender.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ender.java index 0fb29733..da502273 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ender.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ender.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Go to \"The End\".", usage = "/") +@CommandParameters(description = "Go to \"The End\".", usage = "/", aliases = "end") public class Command_ender extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_executive.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_executive.java index 9cd58ae6..5991d02c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_executive.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_executive.java @@ -23,7 +23,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Executive things...", usage = "/ [hell: ]", aliases = "exec") +@CommandParameters(description = "Executive only commands - more items will be added shortly!", usage = "/ [hell: ]", aliases = "exec") public class Command_executive extends FreedomCommand { @@ -131,7 +131,8 @@ public class Command_executive extends FreedomCommand username = playerName; if (!silent) { - FUtil.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ips, ", "), true); + FUtil.adminAction(sender.getName(), "Banning " + username, true); + msg(sender, player.getName() + " has been banned and IP is: " + ips); } Ban ban = Ban.forPlayerName(username, sender, null, reason); for (String ip : ips) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java new file mode 100644 index 00000000..2c6e9a99 --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_explode.java @@ -0,0 +1,52 @@ +package me.totalfreedom.totalfreedommod.command; + +import java.util.Collections; +import java.util.List; +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.bukkit.ChatColor; +import org.bukkit.Particle; +import org.bukkit.Sound; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) +@CommandParameters(description = "Surprise someone.", usage = "/ ") +public class Command_explode extends FreedomCommand +{ + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + + if (args.length == 0) + { + return false; + } + + final Player player = getPlayer(args[0]); + + if (player == null) + { + msg(FreedomCommand.PLAYER_NOT_FOUND); + return true; + } + + msg("Exploded " + player.getName()); + player.setHealth(0.0); + player.getWorld().createExplosion(player.getLocation(), 0F, false); + + + return true; + } + + @Override + public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) + { + if (args.length == 1 && plugin.al.isAdmin(sender)) + { + return FUtil.getPlayerList(); + } + return Collections.emptyList(); + } +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java index c1e4d4c8..b374f569 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_findip.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Shows all IPs registered to a player", usage = "/ ") +@CommandParameters(description = "Shows all IPs registered to a player", usage = "/ ", aliases = "showip,listip") public class Command_findip extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java index 9d6b0d37..e768bc7f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java @@ -20,7 +20,7 @@ public class Command_flatlands extends FreedomCommand } else { - msg("Flatlands is currently disabled."); + msg("Flatlands is currently disabled in the TotalFreedomMod configuration."); } return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java index ccea226d..4877457f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_forcekill.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Kill someone with force, for those who REALLY need to die.", usage = "/ ") +@CommandParameters(description = "Forcefully kill someone - for those who REALLY need to die.", usage = "/ ") public class Command_forcekill extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java index 055c145d..8c50aec3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java @@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Freeze players (toggles on and off).", usage = "/ [target | purge]", aliases = "fr") +@CommandParameters(description = "Freeze/Unfreeze a specified player, or all non-admins on the server.", usage = "/ [target | purge]", aliases = "fr") public class Command_freeze extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java index a931bf2a..ab5cb382 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fuckoff.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "You'll never even see it coming.", usage = "/ ") +@CommandParameters(description = "You'll never even see it coming - repeatedly push players away from you until command is untoggled.", usage = "/ ") public class Command_fuckoff extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gchat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gchat.java index 68cb1664..da1c8e77 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gchat.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gchat.java @@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true) -@CommandParameters(description = "Send a chat message as someone else.", usage = "/ ") +@CommandParameters(description = "Send a chat message as the specified player.", usage = "/ ") public class Command_gchat extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java index 0981dd7d..033591e8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java @@ -9,7 +9,7 @@ import org.bukkit.entity.Player; import org.bukkit.ChatColor; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true) -@CommandParameters(description = "Send a command as someone else.", usage = "/ ") +@CommandParameters(description = "Send a command as the specified player.", usage = "/ ") public class Command_gcmd extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java index cc8b5c4e..1412df89 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_glist.java @@ -18,7 +18,7 @@ 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, even those who are not logged in anymore.", usage = "/ [reason] | unban | banip | unbanip | nameban | unbanname >") +@CommandParameters(description = "Bans or unbans any player, including those offline.", usage = "/ [reason] | unban | banip | unbanip | nameban | unbanname >") public class Command_glist extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java index 1fc5126d..f4f24fc2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gravity.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Make other people your bitch.", usage = "/") +@CommandParameters(description = "Toggles player gravity on/off.", usage = "/") public class Command_gravity extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java index 9ec432cb..2e1bfb99 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java @@ -23,7 +23,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true) -@CommandParameters(description = "Bans a player", usage = "/ [reason] [-nrb]", aliases = "ban") +@CommandParameters(description = "Bans the specified player.", usage = "/ [reason] [-nrb]", aliases = "ban") public class Command_gtfo extends FreedomCommand { @@ -174,7 +174,7 @@ public class Command_gtfo extends FreedomCommand { bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason); } - playerMsg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", ")); + msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", ")); FUtil.adminAction(sender.getName(), String.format(bcast.toString()), true); // Kick player and handle others on IP diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java index 4d7e1819..f17867b8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_health.java @@ -14,7 +14,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "View ticks-per-second", usage = "/") +@CommandParameters(description = "View server health, such as ticks-per-second, memory, etc.", usage = "/") public class Command_health extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java deleted file mode 100644 index 60238c3c..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java +++ /dev/null @@ -1,207 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import me.totalfreedom.totalfreedommod.world.WorldTime; -import me.totalfreedom.totalfreedommod.world.WorldWeather; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Go to the HubWorld.", - usage = "/ [time | weather ]", - aliases = "hw,hworld") -public class Command_hubworld extends FreedomCommand -{ - - private enum CommandMode - { - TELEPORT, TIME, WEATHER - } - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - msg(UNKNOWN_COMMAND); - return true; - } - /*CommandMode commandMode = null; - - if (args.length == 0) - { - commandMode = CommandMode.TELEPORT; - } - else if (args.length >= 2) - { - if ("time".equalsIgnoreCase(args[0])) - { - commandMode = CommandMode.TIME; - } - else if ("weather".equalsIgnoreCase(args[0])) - { - commandMode = CommandMode.WEATHER; - } - } - - if (commandMode == null) - { - return false; - } - - try - { - switch (commandMode) - { - case TELEPORT: - { - if (!(sender instanceof Player) || playerSender == null) - { - return true; - } - - World masterBuilderWorld = null; - try - { - masterBuilderWorld = plugin.wm.hubworld.getWorld(); - } - catch (Exception ex) - { - } - - if (masterBuilderWorld == null || playerSender.getWorld() == masterBuilderWorld) - { - msg("Going to the main world."); - playerSender.teleport(server.getWorlds().get(0).getSpawnLocation()); - } - else - { - msg("Going to the Hub"); - plugin.wm.hubworld.sendToWorld(playerSender); - } - - break; - } - case TIME: - { - assertCommandPerms(sender, playerSender); - - if (args.length == 2) - { - WorldTime timeOfDay = WorldTime.getByAlias(args[1]); - if (timeOfDay != null) - { - plugin.wm.hubworld.setTimeOfDay(timeOfDay); - msg("Hub time set to: " + timeOfDay.name()); - } - else - { - msg("Invalid time of day. Can be: sunrise, noon, sunset, midnight"); - } - } - else - { - return false; - } - - break; - } - case WEATHER: - { - assertCommandPerms(sender, playerSender); - - if (args.length == 2) - { - WorldWeather weatherMode = WorldWeather.getByAlias(args[1]); - if (weatherMode != null) - { - plugin.wm.hubworld.setWeatherMode(weatherMode); - msg("Hub weather set to: " + weatherMode.name()); - } - else - { - msg("Invalid weather mode. Can be: off, rain, storm"); - } - } - else - { - return false; - } - - break; - } - default: - { - return false; - } - } - } - catch (PermissionDeniedException ex) - { - if (ex.getMessage().isEmpty()) - { - return noPerms(); - } - sender.sendMessage(ex.getMessage()); - return true; - } - - return true; - } - - @Override - public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) - { - if (!plugin.al.isAdmin(sender)) - { - return Collections.emptyList(); - } - if (args.length == 1) - { - return Arrays.asList("time", "weather"); - } - else if (args.length == 2) - { - if (args[0].equals("time")) - { - return Arrays.asList("morning", "noon", "evening", "night"); - } - else if (args[0].equals("weather")) - { - return Arrays.asList("off", "rain", "storm"); - } - } - return Collections.emptyList(); - } - - // TODO: Redo this properly - private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException - { - if (!(sender instanceof Player) || playerSender == null || !plugin.al.isSeniorAdmin(playerSender)) - { - throw new PermissionDeniedException(); - } - } - - private class PermissionDeniedException extends Exception - { - - private static final long serialVersionUID = 1L; - - private PermissionDeniedException() - { - super(""); - } - - private PermissionDeniedException(String string) - { - super(string); - } - }*/ - - -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java index 141c8cfb..6e892c80 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java @@ -9,7 +9,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Look into another player's inventory, optionally take items out.", usage = "/ [offhand | armor]", aliases = "inv,insee") +@CommandParameters(description = "Look into another player's inventory, or optionally take items out.", usage = "/ [offhand | armor]", aliases = "inv,insee") public class Command_invsee extends FreedomCommand { @Override diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java index 0c167566..596780a9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_jumppads.java @@ -17,7 +17,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Manage jumppads", usage = "/ >", aliases = "launchpads,jp") +@CommandParameters(description = "Toggles jumppads on/off, view the status of jumppads, or make them sideways.", usage = "/ >", aliases = "launchpads,jp") public class Command_jumppads extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java index 64dd5cfd..c5515873 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kick.java @@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Kick a player.", usage = "/ [reason]", aliases = "k") +@CommandParameters(description = "Kick the specified player.", usage = "/ [reason]", aliases = "k") public class Command_kick extends FreedomCommand { @Override diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java index 0064ef87..b8b8c810 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_kicknoob.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.TELNET_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Kick all non-admins on server.", usage = "/") +@CommandParameters(description = "Kick all non-admins on server.", usage = "/", aliases = "kickall") public class Command_kicknoob extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java index f8d26a55..34600c1a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lastcmd.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Show the last command that someone used.", usage = "/ ") +@CommandParameters(description = "Show the last command the specified player used.", usage = "/ ") public class Command_lastcmd extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_links.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_links.java index b8fa1c82..c1d2efa0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_links.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_links.java @@ -12,7 +12,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Get social media links.", usage = "/", aliases = "link") +@CommandParameters(description = "See TotalFreedom's social media links.", usage = "/", aliases = "link") public class Command_links extends FreedomCommand { @Override diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_localspawn.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_localspawn.java index bbbce8f4..4246c932 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_localspawn.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_localspawn.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Teleport to the spawn point for the current world.", usage = "/", aliases = "worldspawn,gotospawn") +@CommandParameters(description = "Teleport to the spawn point for the current world, instead of the Essentials spawn point.", usage = "/", aliases = "worldspawn,gotospawn") public class Command_localspawn extends FreedomCommand { @Override diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java index fd31fa11..e8a97816 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java @@ -10,7 +10,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH, blockHostConsole = true) -@CommandParameters(description = "Block a player's Minecraft input. This is evil, and I never should have wrote it.", usage = "/ on | off>>") +@CommandParameters(description = "This is evil, and I never should have wrote it - blocks specified player's input.", usage = "/ on | off>>") public class Command_lockup extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java index 3a0a27e0..4d2a6f49 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java @@ -19,7 +19,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Make a region for an OP.", usage = "/ ", aliases = "mor") +@CommandParameters(description = "Make a WorldGuard region for an OP.", usage = "/ ", aliases = "mor") public class Command_makeopregion extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java index 9549e075..5040e976 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java @@ -11,23 +11,13 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) +@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE) @CommandParameters(description = "Manage the shop", usage = "/ | items: >", aliases = "ms") public class Command_manageshop extends FreedomCommand { @Override public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (!ConfigEntry.SHOP_ENABLED.getBoolean()) - { - msg("The shop is currently disabled!", ChatColor.RED); - return true; - } - if (!FUtil.isExecutive(sender.getName()) && !FUtil.isDeveloper(sender.getName())) - { - msg("Only executives and developers can use this command!", ChatColor.RED); - return true; - } final String prefix = FUtil.colorize(ConfigEntry.SHOP_PREFIX.getString() + " "); if (args.length > 3) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java index c311db16..a22d1e7b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderinfo.java @@ -22,7 +22,7 @@ public class Command_masterbuilderinfo extends FreedomCommand if (masterBuilderInfo.isEmpty()) { - msg("There is no Master Builder information set in the config.", ChatColor.RED); + msg("The master builder information section of the config.yml file has not been configured.", ChatColor.RED); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java index facbdf3f..8a8547ba 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java @@ -13,7 +13,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Go to the MasterBuilderWorld.", +@CommandParameters(description = "Allows for master builders to configure the time, the weather of the MasterBuilder, and allows for players to go to the MasterBuilderWorld.", usage = "/ [time | weather ]", aliases = "mbw,mbworld") public class Command_masterbuilderworld extends FreedomCommand diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java index 68c05696..7e7c6371 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java @@ -17,7 +17,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH, blockHostConsole = true) -@CommandParameters(description = "Manage master builders.", usage = "/ >") +@CommandParameters(description = "List, add, or remove master builders, reload the master builder list, or view the info of master builders.", usage = "/ >") public class Command_mbconfig extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java index 4f48f03b..2f3d1e94 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Control mob rezzing parameters.", usage = "/ |dragon|giant|ghast|slime>") +@CommandParameters(description = "Control mob limiting parameters.", usage = "/ |dragon|giant|ghast|slime>") public class Command_moblimiter extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java index 53c4b91c..8c788dcb 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java @@ -21,7 +21,7 @@ import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffectType; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Modify the current item in your hand", usage = "/ | lore | enchant | potion | attribute | clear>", aliases = "mi") +@CommandParameters(description = "Modify the current item you are holding.", usage = "/ | lore | enchant | potion | attribute | clear>", aliases = "mi") public class Command_modifyitem extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java index 4afd44a7..a31c656c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java @@ -16,7 +16,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Manage my admin entry", usage = "/ [-o ] | setlogin | clearlogin | setacformat | clearacformat> | oldtags | logstick | syncroles | genbackupcodes>") +@CommandParameters(description = "Manage your admin entry.", usage = "/ [-o ] | setlogin | clearlogin | setacformat | clearacformat> | oldtags | logstick | syncroles | genbackupcodes>") public class Command_myadmin extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mymasterbuilder.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mymasterbuilder.java index 8b36f837..0dcea829 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mymasterbuilder.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mymasterbuilder.java @@ -15,7 +15,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Manage my Master Builder entry", usage = "/ [-o ] | genbackupcodes>", aliases = "mymb") +@CommandParameters(description = "Manage your Master Builder entry", usage = "/ [-o ] | genbackupcodes>", aliases = "mymb") public class Command_mymasterbuilder extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_namehistory.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_namehistory.java index 75db1d53..ad854ac2 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_namehistory.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_namehistory.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Check the name history of a username.", usage = "/ ", aliases = "nh") +@CommandParameters(description = "Check the name history of a specified player.", usage = "/ ", aliases = "nh") public class Command_namehistory extends FreedomCommand { @Override diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java index 22b61b2d..6867fb97 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Go to the Nether.", usage = "/") +@CommandParameters(description = "Go to the Nether.", usage = "/", aliases = "hell") public class Command_nether extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java index 628c8252..6e0cf40a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java @@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Essentials Interface Command - Remove distracting things from nicknames of all players on server.", usage = "/", aliases = "nc") +@CommandParameters(description = "Essentials Interface Command - Remove illegal chatcodes from nicknames of all players on server.", usage = "/", aliases = "nc") public class Command_nickclean extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java index 137b754f..c430b66c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nicknyan.java @@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Essentials Interface Command - Nyanify your nickname.", usage = "/ < | off>") +@CommandParameters(description = "Essentials Interface Command - Randomize the colors of your nickname.", usage = "/ < | off>") public class Command_nicknyan extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java index 4b9171dd..4b077da8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java @@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH) -@CommandParameters(description = "Switch server online-mode on and off.", usage = "/ ") +@CommandParameters(description = "Switch server to premium or cracked.", usage = "/ ") public class Command_onlinemode extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java index 1538947c..52789638 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java @@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 5) -@CommandParameters(description = "Makes a player operator", usage = "/ ") +@CommandParameters(description = "OPs the specified player.", usage = "/ ") public class Command_op extends FreedomCommand { @@ -47,7 +47,7 @@ public class Command_op extends FreedomCommand else { msg("That player is not online."); - msg("You don't have permissions to OP offline players.", ChatColor.YELLOW); + msg("You don't have permissions to OP offline players.", ChatColor.RED); return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java index 102be1e1..672f9c43 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 30) -@CommandParameters(description = "Op everyone on the server, optionally change everyone's gamemode at the same time.", usage = "/") +@CommandParameters(description = "OP everyone on the server.", usage = "/") public class Command_opall extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java index a125caa2..9928d769 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Automatically ops user.", usage = "/") +@CommandParameters(description = "OPs the command sender.", usage = "/") public class Command_opme extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java index 3b1c9612..b9aeb7ff 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!", +@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon - Sends the specified player into orbit.", usage = "/ [< | stop>]") public class Command_orbit extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permban.java index 40ff7ab3..893d6864 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_permban.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE) -@CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/ reload") +@CommandParameters(description = "Reload the permban list.", usage = "/ reload", aliases = "pb") public class Command_permban extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java index 18b6b9da..6e4dcf44 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plugincontrol.java @@ -14,7 +14,7 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @CommandPermissions(level = Rank.TELNET_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Manage plugins", usage = "/ < > | list>", aliases = "plc") +@CommandParameters(description = "Enable, disable, or reload a specified plugin, as well as list all plugins on the server.", usage = "/ < > | list>", aliases = "plc") public class Command_plugincontrol extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java index b1297b7e..bf7e1b7f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java @@ -16,7 +16,7 @@ import org.bukkit.potion.PotionEffectType; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) @CommandParameters( - description = "Manipulate potion effects. Duration is measured in server ticks (~20 ticks per second).", + description = "Manipulate your potion effects. Duration is measured in server ticks (~20 ticks per second).", usage = "/ [target name]>") public class Command_potion extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java index 909bb870..70ca2738 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Toggles PotionSpy.", usage = "/", aliases = "potspy") +@CommandParameters(description = "Allows admins to see every time a potion is splashed.", usage = "/", aliases = "potspy") public class Command_potionspy extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java index 3b49e0b5..2e35d00c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java @@ -17,7 +17,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @CommandPermissions(level = Rank.OP, source = SourceType.BOTH) -@CommandParameters(description = "Validates if a given account is premium.", usage = "/ ", aliases = "prem") +@CommandParameters(description = "Validates if a given account is premium, or cracked.", usage = "/ ", aliases = "prem") public class Command_premium extends FreedomCommand { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_protectarea.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_protectarea.java index 2caa548a..1803aba7 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_protectarea.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_protectarea.java @@ -10,8 +10,8 @@ import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) @CommandParameters( - description = "Protect areas so that only superadmins can directly modify blocks in those areas. WorldEdit and other such plugins might bypass this.", - usage = "/ | add