Browse Source

A little bit functional code with Vault.

master
Stanislav Usenkov 10 years ago
parent
commit
45bbad963d
  1. 6
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
  2. 8
      src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
  3. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultPermission.java
  4. 10
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java
  5. 2
      src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
  6. 4
      src/main/resources/languages/english.yml
  7. 4
      src/main/resources/languages/russian.yml
  8. 8
      src/main/resources/plugin.yml

6
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java

@ -230,7 +230,7 @@ public class BukkitCommands
if(sender.hasPermission("rscp.admin.reload"))
{
threadFetchDatabaseContents.startDeamon();
throw new CommandAnswerException("Tables have been fetched.");
throw new CommandAnswerException(Phrases.MYSQL_FETCHED.toString());
}
return;
case "reload":
@ -239,13 +239,13 @@ public class BukkitCommands
{
rscp.getServer().getPluginManager().disablePlugin(rscp);
rscp.getServer().getPluginManager().enablePlugin(rscp);
throw new CommandAnswerException("Plugin has been reloaded.");
throw new CommandAnswerException(Phrases.PLUGIN_RELOADED.toString());
}
return;
case "debug":
/* rscp debug [yes|on|no|off|toggle] */
if(sender instanceof ConsoleCommandSender)
throw new CommandAnswerException("{_LR}This command cannot be run from console.");
throw new CommandAnswerException(Phrases.PLUGIN_PLAYER_ONLY.toString());
if(sender.hasPermission("rscp.admin"))
{
final Player player = (Player)sender;

8
src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java

@ -101,23 +101,23 @@ public final class VaultChat extends VaultDeprecatedChat
@Override
public String getGroupPrefix(String world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
return rscp.internalCache.getGroup(group).prefix;
}
@Override
public String getGroupPrefix(World world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
return rscp.internalCache.getGroup(group).prefix;
}
// ***** GET GROUP SUFFIX *****
@Override
public String getGroupSuffix(String world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
return rscp.internalCache.getGroup(group).suffix;
}
@Override
public String getGroupSuffix(World world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
return rscp.internalCache.getGroup(group).suffix;
}
// ***** SET GROUP PREFIX *****
@Override

4
src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultPermission.java

@ -254,6 +254,8 @@ public final class VaultPermission extends net.milkbowl.vault.permission.Permiss
@Override
public String getPrimaryGroup(Player player)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
final Set<String> result = rscp.permissionManager.getPlayerGroups(player);
final String[] array = result.toArray(new String[result.size()]);
return array.length > 0 ? array[array.length - 1] : rscp.settings.getDefaultGroup();
}
}

10
src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java

@ -283,6 +283,16 @@ public class InternalCache
? row.destination.isRegionApplicable(params.destRegions, params.instantiator)
: false;
}
public RowEntity getGroup(String group)
{
if(group != null && !"".equals(group))
{
final RowEntity row = entities_g.get(group.toLowerCase());
if(row != null)
return row;
}
return new RowEntity();
}
public synchronized void clear()
{
entities_g.clear();

2
src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java

@ -14,6 +14,8 @@ public enum Phrases
PLUGIN_DISABLED ("generic.disabled"),
PLUGIN_METRICS ("generic.metrics"),
PLUGIN_RELOADED ("generic.reloaded"),
PLUGIN_PLAYER_ONLY ("generic.player-only"),
PLUGIN_CONSOLE_ONLY("generic.console-only"),
INTEGRATION_V_Y ("integration.vault-yes"),
INTEGRATION_V_N ("integration.vault-no"),
INTEGRATION_WG_Y ("integration.worldguard-yes"),

4
src/main/resources/languages/english.yml

@ -3,6 +3,8 @@ generic:
disabled: "[rscp] rscPermissions has been disabled."
reloaded: "[rscp] rscPermissions has been reloaded."
metrics: "[rscp] Metrics enabled."
player-only: "{_LR}This command cannot be run from console."
console-only: "{_LR}This command should be run from console."
integration:
vault-yes: "{_LG}Vault was found and integrated."
vault-no: "{_LR}There is no Vault found. Vault is highly recommended to be installed on your server."
@ -14,4 +16,4 @@ debug:
enable: "{_LS}You will see a lot of debugging information now."
disable: "{_LS}Debugging information is now hidden for you."
mysql:
fetched: "[rscp] "
fetched: "Tables have been fetched."

4
src/main/resources/languages/russian.yml

@ -3,6 +3,8 @@ generic:
disabled: "[rscp] Плагин rscPermissions выключен."
reloaded: "[rscp] Плагин rscPermissions перезапущен, конфигурация перечитана."
metrics: "[rscp] Включён сбор метрики (mcstats.org)."
player-only: "[rscp] Эта команда не может быть использована из консоли."
console-only: "[rscp] Эта команда может быть использована только из консоли."
integration:
vault-yes: "{_LG}Vault обнаружён и подключён."
vault-no: "{_LR}Не удаётся найти плагин Vault. Рекомендуется его скорейшая установка."
@ -14,4 +16,4 @@ debug:
enable: "{_LS}Теперь Вы будете видеть отладочную информацию."
disable: "{_LS}Отладочная информация теперь скрыта от Вас."
mysql:
fetched: "[rscp] "
fetched: "База данных перечитана."

8
src/main/resources/plugin.yml

@ -4,10 +4,10 @@ website: ${project.url}
main: ${project.groupId}.${project.artifactId}.BukkitPluginMain
author: SimSonic
softdepend:
- Vault
- WorldEdit
- WorldGuard
- Residence
- Vault
- WorldEdit
- WorldGuard
- Residence
commands:
rscp:
description: rscPermissions command hub

Loading…
Cancel
Save