diff --git a/pom.xml b/pom.xml
index ac0d0c5..1a0f15f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
mysql
mysql-connector-java
- 5.1.35
+ 5.1.36
runtime
@@ -62,8 +62,8 @@
- org.bukkit
- bukkit
+ org.spigotmc
+ spigot-api
1.8-R0.1-SNAPSHOT
provided
@@ -87,7 +87,7 @@
2.1.0
compile
-
+
org.mcstats.bukkit
metrics-lite
@@ -103,15 +103,15 @@
- com.sk89q
- worldedit
- 6.0.0-SNAPSHOT
+ com.sk89q.worldedit
+ worldedit-bukkit
+ 6.1
provided
com.sk89q
worldguard
- 6.0.0-SNAPSHOT
+ 6.1
provided
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
index 427a896..35eb849 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
@@ -12,13 +12,13 @@ import ru.simsonic.rscPermissions.API.Settings;
import ru.simsonic.rscPermissions.Bukkit.BukkitDatabaseFetcher;
import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.Matchers;
+import ru.simsonic.rscPermissions.Engine.Phrases;
import ru.simsonic.rscPermissions.Engine.ResolutionResult;
public class BukkitCommands
{
private final BukkitPluginMain rscp;
private final CommandLock cmdLock;
- private final CommandUnlock cmdUnlock;
private final CommandFetch cmdFetch;
private final CommandDebug cmdDebug;
private final CommandReload cmdReload;
@@ -27,7 +27,6 @@ public class BukkitCommands
{
this.rscp = plugin;
cmdLock = new CommandLock(rscp);
- cmdUnlock = new CommandUnlock(rscp);
cmdFetch = new CommandFetch(rscp);
cmdDebug = new CommandDebug(rscp);
cmdReload = new CommandReload(rscp);
@@ -91,46 +90,46 @@ public class BukkitCommands
final ArrayList help = new ArrayList<>(64);
help.add("{_WH}" + rscp.getDescription().getName() + " v" + rscp.getDescription().getVersion()
+ " © " + rscp.getDescription().getAuthors().get(0));
- help.add("{_LS}Perfect permission manager for multiserver environments");
+ help.add(Phrases.HELP_HEADER_1.toString());
help.add("{_LB}{_U}" + rscp.getDescription().getWebsite());
if(args.length == 0)
throw new CommandAnswerException(help);
- help.add("{_LS}Current serverId is \'{_LG}" + rscp.getServer().getServerId() + "{_LS}\' (server.properties)");
+ help.add(Phrases.HELP_HEADER_2.toString().replace("{SERVER-ID}", rscp.getServer().getServerId()));
final String mm = rscp.settings.getMaintenanceMode();
if(sender.hasPermission("rscp.admin.lock") && !"".equals(mm))
help.add("{_LS}Server is in maintenance mode \'{_LG}" + mm + "{_LS}\' now!");
- help.add("Usage of available commands:");
+ help.add(Phrases.HELP_USAGE.toString());
if(sender.hasPermission("rscp.admin"))
{
- help.add("{_YL}/rscp user lp {_LS}-- list user's permissions");
- help.add("{_YL}/rscp user lg {_LS}-- list user's groups");
- help.add("{_YL}/rscp user prefix {_LS}-- show user's prefix");
- help.add("{_YL}/rscp user suffix {_LS}-- show user's suffix");
+ help.add(Phrases.HELP_CMD_USER_LP.toString());
+ help.add(Phrases.HELP_CMD_USER_LG.toString());
+ help.add(Phrases.HELP_CMD_USER_P.toString());
+ help.add(Phrases.HELP_CMD_USER_S.toString());
}
if(sender.hasPermission("rscp.admin.lock"))
{
- help.add("{_YL}/rscp lock [mode] {_LS}-- enable specific maintenance mode");
- help.add("{_YL}/rscp unlock {_LS}-- disable maintenance mode");
+ help.add(Phrases.HELP_CMD_LOCK.toString());
+ help.add(Phrases.HELP_CMD_UNLOCK.toString());
}
if(sender.hasPermission("rscp.admin"))
{
help.add("{_YL}/rscp examplerows {_LS}-- insert some fake rows into database");
help.add("{_YL}/rscp import pex-sql {_LS}-- import data from pex's database (in the same schema)");
- help.add("{_YL}/rscp debug [value] {_LS}-- show/hide some debugging info to you");
- help.add("{_YL}/rscp fetch {_LS}-- reread all permissions from database");
- help.add("{_YL}/rscp reload {_LS}-- reload config and restart the plugin");
+ help.add(Phrases.HELP_CMD_DEBUG.toString());
+ help.add(Phrases.HELP_CMD_FETCH.toString());
+ help.add(Phrases.HELP_CMD_RELOAD.toString());
}
- help.add("{_YL}/rscp help {_LS}-- show this help page");
+ help.add(Phrases.HELP_CMD_HELP.toString());
switch(args[0].toLowerCase())
{
case "user":
onCommandHubUser(sender, args);
break;
case "lock":
- cmdLock.execute(sender, args);
+ cmdLock.executeLock(sender, args);
return;
case "unlock":
- cmdUnlock.execute(sender);
+ cmdLock.executeUnlock(sender);
return;
case "examplerows":
/* rscp examplerows */
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java
index ecc7d93..ed28f47 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java
@@ -11,7 +11,7 @@ public class CommandLock
{
this.rscp = plugin;
}
- public void execute(CommandSender sender, String args[]) throws CommandAnswerException
+ public void executeLock(CommandSender sender, String[] args) throws CommandAnswerException
{
if(sender.hasPermission("rscp.lock"))
{
@@ -23,4 +23,14 @@ public class CommandLock
throw new CommandAnswerException(mmon);
}
}
+ public void executeUnlock(CommandSender sender) throws CommandAnswerException
+ {
+ if(sender.hasPermission("rscp.lock"))
+ {
+ String mmoff = "Maintenance mode disabled";
+ mmoff = rscp.getConfig().getString("language.maintenance.unlocked", mmoff);
+ rscp.bukkitListener.setMaintenanceMode(null);
+ throw new CommandAnswerException(mmoff);
+ }
+ }
}
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java
deleted file mode 100644
index 50d2a80..0000000
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ru.simsonic.rscPermissions.Bukkit.Commands;
-
-import org.bukkit.command.CommandSender;
-import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException;
-import ru.simsonic.rscPermissions.BukkitPluginMain;
-
-public class CommandUnlock
-{
- private final BukkitPluginMain rscp;
- CommandUnlock(BukkitPluginMain plugin)
- {
- this.rscp = plugin;
- }
- public void execute(CommandSender sender) throws CommandAnswerException
- {
- if(sender.hasPermission("rscp.lock"))
- {
- String mmoff = "Maintenance mode disabled";
- mmoff = rscp.getConfig().getString("language.maintenance.unlocked", mmoff);
- rscp.bukkitListener.setMaintenanceMode(null);
- throw new CommandAnswerException(mmoff);
- }
- }
-}
diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
index 0d05e8b..11f33ad 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
@@ -31,6 +31,19 @@ public enum Phrases
FETCHED_ANSWER ("database.command-answer"),
FETCHED_LOCAL_CACHE("database.fetched-local"),
FETCHED_REMOTE_DB ("database.fetched-remote"),
+ HELP_HEADER_1 ("help.header-1"),
+ HELP_HEADER_2 ("help.header-2"),
+ HELP_USAGE ("help.usage"),
+ HELP_CMD_USER_LP ("help.cmd-user-lp"),
+ HELP_CMD_USER_LG ("help.cmd-user-lg"),
+ HELP_CMD_USER_P ("help.cmd-user-p"),
+ HELP_CMD_USER_S ("help.cmd-user-s"),
+ HELP_CMD_LOCK ("help.cmd-lock"),
+ HELP_CMD_UNLOCK ("help.cmd-unlock"),
+ HELP_CMD_DEBUG ("help.cmd-debug"),
+ HELP_CMD_FETCH ("help.cmd-fetch"),
+ HELP_CMD_RELOAD ("help.cmd-reload"),
+ HELP_CMD_HELP ("help.cmd-help"),
;
private final String node;
private String phrase;
diff --git a/src/main/resources/languages/english.yml b/src/main/resources/languages/english.yml
index 6432d6a..958399e 100644
--- a/src/main/resources/languages/english.yml
+++ b/src/main/resources/languages/english.yml
@@ -22,3 +22,17 @@ database:
command-answer: "Tables have been fetched."
fetched-local: "{_LG}Loaded {:E} entity, {:P} permission and {:I} inheritance rows from local cache."
fetched-remote: "{_LG}Fetched {:E} entities, {:P} permissions and {:I} inheritances."
+help:
+ header-1: "{_LS}Perfect permission manager for multiserver environments"
+ header-2: "{_LS}Current serverId is '{_LG}{SERVER-ID}{_LS}' (server.properties)"
+ usage: "Usage of available commands:"
+ cmd-user-lp: "{_YL}/rscp user lp {_LS}-- list user's permissions"
+ cmd-user-lg: "{_YL}/rscp user lg {_LS}-- list user's groups"
+ cmd-user-p: "{_YL}/rscp user prefix {_LS}-- show user's prefix"
+ cmd-user-s: "{_YL}/rscp user suffix {_LS}-- show user's suffix"
+ cmd-lock: "{_YL}/rscp lock [mode] {_LS}-- enable specific maintenance mode"
+ cmd-unlock: "{_YL}/rscp unlock {_LS}-- disable maintenance mode"
+ cmd-debug: "{_YL}/rscp debug [value] {_LS}-- show/hide some debugging info to you"
+ cmd-fetch: "{_YL}/rscp fetch {_LS}-- reread all permissions from database"
+ cmd-reload: "{_YL}/rscp reload {_LS}-- reload config and restart the plugin"
+ cmd-help: "{_YL}/rscp help {_LS}-- show this help page"
diff --git a/src/main/resources/languages/russian.yml b/src/main/resources/languages/russian.yml
index a33eff1..8685f7c 100644
--- a/src/main/resources/languages/russian.yml
+++ b/src/main/resources/languages/russian.yml
@@ -22,3 +22,17 @@ database:
command-answer: "База данных перечитана."
fetched-local: "{_LG}Восстановлено {:E} сущностей, {:P} прав и {:I} наследований."
fetched-remote: "{_LG}Получено {:E} сущностей, {:P} прав и {:I} наследований."
+help:
+ header-1: "{_LS}Идеальный плагин для мультисерверных проектов"
+ header-2: "{_LS}Идентификатор этого сервера установлен в '{_LG}{SERVER-ID}{_LS}' (server.properties)"
+ usage: "Синтаксис доступных команд:"
+ cmd-user-lp: "{_YL}/rscp user lp {_LS}-- получение списка прав игрока"
+ cmd-user-lg: "{_YL}/rscp user lg {_LS}-- получение дерева групп игрока"
+ cmd-user-p: "{_YL}/rscp user prefix {_LS}-- просмотр префикса игрока"
+ cmd-user-s: "{_YL}/rscp user suffix {_LS}-- просмотр суффикса игрока"
+ cmd-lock: "{_YL}/rscp lock [mode] {_LS}-- перевод сервера в режим обслуживания"
+ cmd-unlock: "{_YL}/rscp unlock {_LS}-- отключение режима обслуживания"
+ cmd-debug: "{_YL}/rscp debug [value] {_LS}-- вкл/выкл отладочной информации о Вас"
+ cmd-fetch: "{_YL}/rscp fetch {_LS}-- получение групп и прав из базы банных"
+ cmd-reload: "{_YL}/rscp reload {_LS}-- перезагрузка плагина"
+ cmd-help: "{_YL}/rscp help {_LS}-- эта справка"