From ce8c8fbd66b16d004eaaa6eb6a7e3830cb1bc5c2 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Tue, 13 Oct 2015 13:31:12 +0800 Subject: [PATCH] update some class... Signed-off-by: 502647092 --- pom.xml | 2 +- .../bekvon/bukkit/residence/commandsub/CommandArea.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandBank.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandCheck.java | 8 ++++---- .../bukkit/residence/commandsub/CommandClearFlags.java | 2 +- .../bukkit/residence/commandsub/CommandCompass.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandCreate.java | 2 +- .../bukkit/residence/commandsub/CommandDefault.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandGive.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandGset.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandLease.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandLset.java | 2 +- .../bukkit/residence/commandsub/CommandMaterial.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandMirror.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandPset.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandRename.java | 2 +- .../bukkit/residence/commandsub/CommandRenameArea.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandSelect.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandServer.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandSet.java | 2 +- .../bukkit/residence/commandsub/CommandSubZone.java | 2 +- .../com/bekvon/bukkit/residence/commandsub/CommandTp.java | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index c609886..9d6fdb8 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ cn.citycraft.PluginHelper - ${project.groupId}.${project.artifactId} + com.bekvon.bukkit.residence diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java index 9b99757..59e30b6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandArea.java @@ -23,8 +23,8 @@ public class CommandArea extends BaseCommand { public CommandArea(final ResidenceMain plugin) { super("area"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(3); + setOnlyPlayerExecutable(); setPossibleArguments(" <领地名称> [区域名称]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java index bf4c66f..db294cc 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandBank.java @@ -19,8 +19,8 @@ public class CommandBank extends BaseCommand { public CommandBank(final ResidenceMain plugin) { super("bank"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments("[deposit(存入)|withdraw(取出)] 金额"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java index 4919d01..cb4a067 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCheck.java @@ -19,8 +19,8 @@ public class CommandCheck extends BaseCommand { public CommandCheck(final ResidenceMain plugin) { super("check"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名称> <权限> [玩家]"); } @@ -44,9 +44,9 @@ public class CommandCheck extends BaseCommand { player.sendMessage(language.getPhrase("FlagCheckFalse", ChatColor.YELLOW + args[0] + ChatColor.RED + "." + ChatColor.YELLOW + pname + ChatColor.RED + "." + ChatColor.YELLOW + args[0] + ChatColor.RED)); } else { - player.sendMessage( - language.getPhrase("FlagCheckTrue", ChatColor.GREEN + args[0] + ChatColor.YELLOW + "." + ChatColor.GREEN + pname + ChatColor.YELLOW + "." + ChatColor.YELLOW + args[0] - + ChatColor.RED + "." + (res.getPermissions().playerHas(pname, res.getPermissions().getWorld(), args[1], false) ? ChatColor.GREEN + "TRUE" : ChatColor.RED + "FALSE"))); + player.sendMessage(language.getPhrase("FlagCheckTrue", + ChatColor.GREEN + args[0] + ChatColor.YELLOW + "." + ChatColor.GREEN + pname + ChatColor.YELLOW + "." + ChatColor.YELLOW + args[0] + ChatColor.RED + "." + + (res.getPermissions().playerHas(pname, res.getPermissions().getWorld(), args[1], false) ? ChatColor.GREEN + "TRUE" : ChatColor.RED + "FALSE"))); } } } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java index af918d3..92300ef 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandClearFlags.java @@ -19,8 +19,8 @@ public class CommandClearFlags extends BaseCommand { public CommandClearFlags(final ResidenceMain plugin) { super("clearflags"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名称>"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java index 685fd15..20424e7 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCompass.java @@ -19,8 +19,8 @@ public class CommandCompass extends BaseCommand { public CommandCompass(final ResidenceMain plugin) { super("compass", "cp"); this.plugin = plugin; - setDescription("切换指南针方向"); setOnlyPlayerExecutable(); + setDescription("切换指南针方向"); setPossibleArguments("[领地名称]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java index ad42fec..4b7764a 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandCreate.java @@ -20,8 +20,8 @@ public class CommandCreate extends BaseCommand { public CommandCreate(final ResidenceMain plugin) { super("create", "new"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名称>"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java index 4a4e13a..dfc6058 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandDefault.java @@ -17,8 +17,8 @@ public class CommandDefault extends BaseCommand { public CommandDefault(final ResidenceMain plugin) { super("default"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名称>"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java index 8d464f5..fc687b0 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGive.java @@ -16,8 +16,8 @@ public class CommandGive extends BaseCommand { public CommandGive(final ResidenceMain plugin) { super("give"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments("<目标玩家> <赠送的领地>"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java index 6aecfc4..d7e0f01 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandGset.java @@ -19,8 +19,8 @@ public class CommandGset extends BaseCommand { public CommandGset(final ResidenceMain plugin) { super("gset"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(3); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名称(不写则为所在领地)> <组名称> <权限> <权限状态>"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java index 835f944..ae39a5b 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLease.java @@ -20,8 +20,8 @@ public class CommandLease extends BaseCommand { public CommandLease(final ResidenceMain plugin) { super("lease"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments("[renew/cost] [领地名]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java index 1456eb2..13d89c6 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandLset.java @@ -20,8 +20,8 @@ public class CommandLset extends BaseCommand { public CommandLset(final ResidenceMain plugin) { super("lset"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名称> [blacklist(bl)/ignorelist(il)||info] [material]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java index 3f06364..016c0b9 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMaterial.java @@ -18,8 +18,8 @@ public class CommandMaterial extends BaseCommand { public CommandMaterial(final ResidenceMain plugin) { super("material"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); } @SuppressWarnings("deprecation") diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java index 223ec9d..7eaf392 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMirror.java @@ -16,8 +16,8 @@ public class CommandMirror extends BaseCommand { public CommandMirror(final ResidenceMain plugin) { super("mirror"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); } @Override diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java index 4c28109..470f220 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandPset.java @@ -19,8 +19,8 @@ public class CommandPset extends BaseCommand { public CommandPset(final ResidenceMain plugin) { super("pset"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments(" [player] [flag|removeall] [true/false/remove]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java index 6331e21..94c0222 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRename.java @@ -16,8 +16,8 @@ public class CommandRename extends BaseCommand { public CommandRename(final ResidenceMain plugin) { super("rename"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); } @Override diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java index c69fe13..fa3732f 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandRenameArea.java @@ -19,8 +19,8 @@ public class CommandRenameArea extends BaseCommand { public CommandRenameArea(final ResidenceMain plugin) { super("renamearea"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(3); + setOnlyPlayerExecutable(); } @Override diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java index c8e06f8..89d4874 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSelect.java @@ -28,8 +28,8 @@ public class CommandSelect extends BaseCommand { this.plugin = plugin; setMinimumArguments(1); setOnlyPlayerExecutable(); - setPossibleArguments("请使用/res select ? 查看帮助"); setPermission("residence.select"); + setPossibleArguments("请使用/res select ? 查看帮助"); } @Override diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java index 8582ce0..d967ea3 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandServer.java @@ -19,8 +19,8 @@ public class CommandServer extends BaseCommand { public CommandServer(final ResidenceMain plugin) { super("server"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); } @Override diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java index 2b0bd43..bbda4cc 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSet.java @@ -19,8 +19,8 @@ public class CommandSet extends BaseCommand { public CommandSet(final ResidenceMain plugin) { super("set"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(2); + setOnlyPlayerExecutable(); setPossibleArguments(" [flag] [true/false/remove]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java index cd6be35..2e4c4cf 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandSubZone.java @@ -22,8 +22,8 @@ public class CommandSubZone extends BaseCommand { public CommandSubZone(final ResidenceMain plugin) { super("subzone", "sz"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); setPossibleArguments("<领地名> [附属领地名]"); } diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java index 1bc11f3..517301b 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTp.java @@ -19,8 +19,8 @@ public class CommandTp extends BaseCommand { public CommandTp(final ResidenceMain plugin) { super("tp"); this.plugin = plugin; - setOnlyPlayerExecutable(); setMinimumArguments(1); + setOnlyPlayerExecutable(); } @Override