diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandCompass.java b/src/main/java/pw/yumc/Residence/commandsub/CommandCompass.java index ef21bbb..9cfb758 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandCompass.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandCompass.java @@ -17,7 +17,7 @@ public class CommandCompass extends BaseCommand { ResidenceMain plugin; public CommandCompass(final ResidenceMain plugin) { - super("compass", "cp"); + super("cp"); this.plugin = plugin; setOnlyPlayerExecutable(); setDescription("切换指南针方向"); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandCreate.java b/src/main/java/pw/yumc/Residence/commandsub/CommandCreate.java index e41893e..5689a48 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandCreate.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandCreate.java @@ -18,7 +18,7 @@ public class CommandCreate extends BaseCommand { ResidenceMain plugin; public CommandCreate(final ResidenceMain plugin) { - super("c", "new"); + super("create", "new", "c"); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandCurrent.java b/src/main/java/pw/yumc/Residence/commandsub/CommandCurrent.java index ac3016c..ed2a6da 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandCurrent.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandCurrent.java @@ -16,7 +16,7 @@ public class CommandCurrent extends BaseCommand { ResidenceMain plugin; public CommandCurrent(final ResidenceMain plugin) { - super("current"); + super(); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandDefault.java b/src/main/java/pw/yumc/Residence/commandsub/CommandDefault.java index 08c3d3b..9b30c96 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandDefault.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandDefault.java @@ -15,7 +15,7 @@ public class CommandDefault extends BaseCommand { ResidenceMain plugin; public CommandDefault(final ResidenceMain plugin) { - super("default"); + super(); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandGive.java b/src/main/java/pw/yumc/Residence/commandsub/CommandGive.java index 03a482d..acb6a10 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandGive.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandGive.java @@ -14,7 +14,7 @@ public class CommandGive extends BaseCommand { ResidenceMain plugin; public CommandGive(final ResidenceMain plugin) { - super("give"); + super(); this.plugin = plugin; setMinimumArguments(2); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandLease.java b/src/main/java/pw/yumc/Residence/commandsub/CommandLease.java index f118f8d..0f0e845 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandLease.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandLease.java @@ -18,7 +18,7 @@ public class CommandLease extends BaseCommand { ResidenceMain plugin; public CommandLease(final ResidenceMain plugin) { - super("lease"); + super(); this.plugin = plugin; setMinimumArguments(2); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java b/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java index 79c6c65..9772e08 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java @@ -13,7 +13,7 @@ public class CommandLimits extends BaseCommand { ResidenceMain plugin; public CommandLimits(final ResidenceMain plugin) { - super("limits"); + super(); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandListAll.java b/src/main/java/pw/yumc/Residence/commandsub/CommandListAll.java index b845431..dde3dda 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandListAll.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandListAll.java @@ -14,7 +14,7 @@ public class CommandListAll extends BaseCommand { ResidenceMain plugin; public CommandListAll(final ResidenceMain plugin) { - super("listall"); + super("la"); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandListAllHidden.java b/src/main/java/pw/yumc/Residence/commandsub/CommandListAllHidden.java index 0a48ce1..445ee68 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandListAllHidden.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandListAllHidden.java @@ -16,7 +16,7 @@ public class CommandListAllHidden extends BaseCommand { ResidenceMain plugin; public CommandListAllHidden(final ResidenceMain plugin) { - super("listallhidden"); + super("lah"); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandListHidden.java b/src/main/java/pw/yumc/Residence/commandsub/CommandListHidden.java index a1fd698..fb4392d 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandListHidden.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandListHidden.java @@ -16,7 +16,7 @@ public class CommandListHidden extends BaseCommand { ResidenceMain plugin; public CommandListHidden(final ResidenceMain plugin) { - super("listhidden"); + super("lh"); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandLists.java b/src/main/java/pw/yumc/Residence/commandsub/CommandLists.java index 7ef0f10..42c1551 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandLists.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandLists.java @@ -17,7 +17,7 @@ public class CommandLists extends BaseCommand { ResidenceMain plugin; public CommandLists(final ResidenceMain plugin) { - super("lists"); + super(); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandLset.java b/src/main/java/pw/yumc/Residence/commandsub/CommandLset.java index 0eca644..09a3c51 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandLset.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandLset.java @@ -18,7 +18,7 @@ public class CommandLset extends BaseCommand { ResidenceMain plugin; public CommandLset(final ResidenceMain plugin) { - super("lset"); + super(); this.plugin = plugin; setMinimumArguments(2); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java b/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java index eabc86e..81e7cbc 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java @@ -28,7 +28,7 @@ public class CommandMarket extends BaseCommand { TransactionManager tmanager; public CommandMarket(final ResidenceMain plugin) { - super("market"); + super(); this.plugin = plugin; rmanager = plugin.getResidenceManager(); language = plugin.getLanguage(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandMaterial.java b/src/main/java/pw/yumc/Residence/commandsub/CommandMaterial.java index 9e2af95..206f745 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandMaterial.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandMaterial.java @@ -15,7 +15,7 @@ public class CommandMaterial extends BaseCommand { ResidenceMain plugin; public CommandMaterial(final ResidenceMain plugin) { - super("material"); + super(); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandMessage.java b/src/main/java/pw/yumc/Residence/commandsub/CommandMessage.java index 7bf5e89..8405692 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandMessage.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandMessage.java @@ -18,7 +18,7 @@ public class CommandMessage extends BaseCommand { ResidenceMain plugin; public CommandMessage(final ResidenceMain plugin) { - super("message"); + super(); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandMirror.java b/src/main/java/pw/yumc/Residence/commandsub/CommandMirror.java index 7700621..7bc3b1e 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandMirror.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandMirror.java @@ -14,7 +14,7 @@ public class CommandMirror extends BaseCommand { ResidenceMain plugin; public CommandMirror(final ResidenceMain plugin) { - super("mirror"); + super(); this.plugin = plugin; setMinimumArguments(2); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandRemove.java b/src/main/java/pw/yumc/Residence/commandsub/CommandRemove.java index 8ed9c62..14b7ea7 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandRemove.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandRemove.java @@ -20,7 +20,7 @@ public class CommandRemove extends BaseCommand { ResidenceMain plugin; public CommandRemove(final ResidenceMain plugin) { - super("remove", "delete"); + super("delete"); this.plugin = plugin; } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandRemoveAll.java b/src/main/java/pw/yumc/Residence/commandsub/CommandRemoveAll.java index bfbbd24..519f949 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandRemoveAll.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandRemoveAll.java @@ -16,7 +16,7 @@ public class CommandRemoveAll extends BaseCommand { ResidenceMain plugin; public CommandRemoveAll(final ResidenceMain plugin) { - super("removeall"); + super(); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandRename.java b/src/main/java/pw/yumc/Residence/commandsub/CommandRename.java index 7befade..f9dc149 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandRename.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandRename.java @@ -14,7 +14,7 @@ public class CommandRename extends BaseCommand { ResidenceMain plugin; public CommandRename(final ResidenceMain plugin) { - super("rename"); + super("rn"); this.plugin = plugin; setMinimumArguments(2); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandSetOwner.java b/src/main/java/pw/yumc/Residence/commandsub/CommandSetOwner.java index e1e5c21..766ff66 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandSetOwner.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandSetOwner.java @@ -16,7 +16,7 @@ public class CommandSetOwner extends BaseCommand { ResidenceMain plugin; public CommandSetOwner(final ResidenceMain plugin) { - super("setowner"); + super("so"); this.plugin = plugin; setMinimumArguments(2); setPossibleArguments("[领地名] [玩家]"); @@ -35,10 +35,11 @@ public class CommandSetOwner extends BaseCommand { if (area != null) { area.getPermissions().setOwner(args[1], true); if (area.getParent() == null) { - sender.sendMessage(ChatColor.GREEN + language.getPhrase("ResidenceOwnerChange", ChatColor.YELLOW + " " + args[0] + " " + ChatColor.GREEN + "." + ChatColor.YELLOW + args[1] + ChatColor.GREEN)); + sender.sendMessage( + ChatColor.GREEN + language.getPhrase("ResidenceOwnerChange", ChatColor.YELLOW + " " + args[0] + " " + ChatColor.GREEN + "." + ChatColor.YELLOW + args[1] + ChatColor.GREEN)); } else { - sender.sendMessage(ChatColor.GREEN - + language.getPhrase("SubzoneOwnerChange", ChatColor.YELLOW + " " + args[0].split("\\.")[args[1].split("\\.").length - 1] + " " + ChatColor.GREEN + "." + ChatColor.YELLOW + args[1] + ChatColor.GREEN)); + sender.sendMessage(ChatColor.GREEN + language.getPhrase("SubzoneOwnerChange", + ChatColor.YELLOW + " " + args[0].split("\\.")[args[1].split("\\.").length - 1] + " " + ChatColor.GREEN + "." + ChatColor.YELLOW + args[1] + ChatColor.GREEN)); } } else { sender.sendMessage(ChatColor.RED + language.getPhrase("InvalidResidence")); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandTp.java b/src/main/java/pw/yumc/Residence/commandsub/CommandTp.java index 4986f6b..4c957c4 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandTp.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandTp.java @@ -17,7 +17,7 @@ public class CommandTp extends BaseCommand { ResidenceMain plugin; public CommandTp(final ResidenceMain plugin) { - super("tp"); + super(); this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandTpSet.java b/src/main/java/pw/yumc/Residence/commandsub/CommandTpSet.java index d1ba498..b18d3dc 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandTpSet.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandTpSet.java @@ -17,7 +17,7 @@ public class CommandTpSet extends BaseCommand { ResidenceMain plugin; public CommandTpSet(final ResidenceMain plugin) { - super("tpset"); + super(); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java b/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java index ab24b6e..6c5d511 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java @@ -19,7 +19,7 @@ public class CommandUnStuck extends BaseCommand { ResidenceMain plugin; public CommandUnStuck(final ResidenceMain plugin) { - super("unstuck"); + super("us"); this.plugin = plugin; setOnlyPlayerExecutable(); } diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandVersion.java b/src/main/java/pw/yumc/Residence/commandsub/CommandVersion.java index 78bab3c..ffc5c69 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandVersion.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandVersion.java @@ -25,16 +25,8 @@ public class CommandVersion extends BaseCommand { sender.sendMessage(ChatColor.GREEN + "创建者: " + ChatColor.YELLOW + "bekvon"); sender.sendMessage(ChatColor.GREEN + "升级到 1.8 by: " + ChatColor.YELLOW + "DartCZ"); sender.sendMessage(ChatColor.RED + "升级到最新无UUID版本 by: " + ChatColor.YELLOW + "喵♂呜"); - String names = null; final List authlist = plugin.getDescription().getAuthors(); - for (final String auth : authlist) { - if (names == null) { - names = auth; - } else { - names = names + ", " + auth; - } - } - sender.sendMessage(ChatColor.GREEN + "作者: " + ChatColor.YELLOW + names); + sender.sendMessage(ChatColor.GREEN + "作者: " + ChatColor.YELLOW + authlist.toArray().toString()); sender.sendMessage(ChatColor.DARK_AQUA + "插件命令列表,帮助, 请查看wiki:"); sender.sendMessage(ChatColor.GREEN + "http://residencebukkitmod.wikispaces.com/"); sender.sendMessage(ChatColor.AQUA + "重制版本请查看Jenkins:");