Browse Source

Updated:

* VaultAPI interfaces are shaded into to stop problems during Vault integration when it is absent.
* Using Metrics R8-SNAPSHOT.
* Added Vault/WG/Residence intergation translatable notifications.
* Renamed two .sqlt files.
master
Stanislav Usenkov 10 years ago
parent
commit
032aa224c6
  1. 5
      pom.xml
  2. 4
      src/main/java/ru/simsonic/rscPermissions/Backends/BackendDatabase.java
  3. 6
      src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java
  4. 14
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
  5. 66
      src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
  6. 6
      src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
  7. 2
      src/main/resources/config.yml
  8. 7
      src/main/resources/languages/english.yml
  9. 7
      src/main/resources/languages/russian.yml
  10. 0
      src/main/resources/sqlt/Cleanup.sqlt
  11. 0
      src/main/resources/sqlt/Deployment.sqlt

5
pom.xml

@ -74,7 +74,7 @@
<dependency>
<groupId>org.mcstats.bukkit</groupId>
<artifactId>metrics-lite</artifactId>
<version>R7</version>
<version>R8-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Стандарт подключения менеджера прав и чата к Bukkit -->
@ -82,7 +82,7 @@
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.5</version>
<scope>provided</scope>
<scope>compile</scope>
</dependency>
<!-- Зависимости для провайдеров регионов -->
<dependency>
@ -165,6 +165,7 @@
<include>com.google.code.gson:gson</include>
<include>ru.simsonic:rscUtilityLibrary</include>
<include>org.mcstats.bukkit:metrics-lite</include>
<include>net.milkbowl.vault:VaultAPI</include>
</includes>
</artifactSet>
<relocations>

4
src/main/java/ru/simsonic/rscPermissions/Backends/BackendDatabase.java

@ -19,11 +19,11 @@ public class BackendDatabase extends ConnectionMySQL
@Override
public synchronized boolean connect()
{
return super.connect() && executeUpdateT("Initialize_main_v1");
return super.connect() && executeUpdateT("Deployment");
}
public synchronized DatabaseContents retrieveContents()
{
executeUpdateT("Cleanup_tables");
executeUpdateT("Cleanup");
final DatabaseContents contents = new DatabaseContents();
contents.entities = fetchEntities();
contents.permissions = fetchPermissions();

6
src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java

@ -4,6 +4,8 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.ServicePriority;
import ru.simsonic.rscPermissions.Bukkit.VaultChat;
import ru.simsonic.rscPermissions.Bukkit.VaultPermission;
import ru.simsonic.rscPermissions.Engine.Phrases;
import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes;
public class BridgeForBukkitAPI
{
@ -62,8 +64,8 @@ public class BridgeForBukkitAPI
rscp.getServer().getServicesManager().register(
net.milkbowl.vault.permission.Permission.class, vaultPermission,
rscp, ServicePriority.Highest);
BukkitPluginMain.consoleLog.info("[rscp] Vault was found and integrated.");
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_V_Y.toString()));
} else
BukkitPluginMain.consoleLog.info("[rscp] Sorry, I cannot find Vault...");
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_V_N.toString()));
}
}

14
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java

@ -17,6 +17,8 @@ import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.Phrases;
import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes;
public final class BukkitRegionProviders
{
@ -36,13 +38,13 @@ public final class BukkitRegionProviders
if(plugin.settings.isUseWorldGuard())
{
final Plugin pluginWG = plugin.getServer().getPluginManager().getPlugin("WorldGuard");
if((pluginWG != null) && (pluginWG instanceof WorldGuardPlugin))
if(pluginWG != null && pluginWG instanceof WorldGuardPlugin)
{
this.worldguard = pluginWG;
BukkitPluginMain.consoleLog.info("[rscp] WorldGuard was found and integrated.");
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_Y.toString()));
} else {
this.worldguard = null;
BukkitPluginMain.consoleLog.info("[rscp] WorldGuard was not found.");
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_N.toString()));
}
} else
this.worldguard = null;
@ -50,13 +52,13 @@ public final class BukkitRegionProviders
if(plugin.settings.isUseResidence())
{
final Plugin pluginR = plugin.getServer().getPluginManager().getPlugin("Residence");
if((pluginR != null) && (pluginR instanceof Residence))
if(pluginR != null && pluginR instanceof Residence)
{
this.residence = pluginR;
BukkitPluginMain.consoleLog.info("[rscp] Residence was found and integrated.");
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_R_Y.toString()));
} else {
this.residence = null;
BukkitPluginMain.consoleLog.info("[rscp] Residence was not found.");
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_R_N.toString()));
}
} else
this.residence = null;

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

@ -10,11 +10,13 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
{
private final BridgeForBukkitAPI bridge;
private final BukkitPluginMain rscp;
public VaultChat(BridgeForBukkitAPI bridge, net.milkbowl.vault.permission.Permission perms)
private final VaultPermission permissions;
public VaultChat(BridgeForBukkitAPI bridge, VaultPermission permissions)
{
super(perms);
super(permissions);
this.bridge = bridge;
this.rscp = (BukkitPluginMain)bridge.getPlugin();
this.permissions = permissions;
}
@Override
public String getName()
@ -26,6 +28,7 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
{
return bridge.isEnabled();
}
// ***** GET PLAYER PREFIX *****
@Override
public String getPlayerPrefix(String world, String player)
{
@ -33,93 +36,100 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
return online != null ? rscp.permissionManager.getPlayerPrefix(online) : null;
}
@Override
public String getPlayerSuffix(String world, String player)
public String getPlayerPrefix(String world, OfflinePlayer player)
{
final Player online = bridge.findPlayer(player);
return online != null ? rscp.permissionManager.getPlayerSuffix(online) : null;
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setPlayerPrefix(String world, String player, String prefix)
public String getPlayerPrefix(Player player)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
return rscp.permissionManager.getPlayerPrefix(player);
}
// ***** GET PLAYER SUFFIX *****
@Override
public void setPlayerSuffix(String world, String player, String suffix)
public String getPlayerSuffix(String world, String player)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
final Player online = bridge.findPlayer(player);
return online != null ? rscp.permissionManager.getPlayerSuffix(online) : null;
}
@Override
public String getGroupPrefix(String world, String group)
public String getPlayerSuffix(String world, OfflinePlayer player)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setGroupPrefix(String world, String group, String prefix)
public String getPlayerSuffix(Player player)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
return rscp.permissionManager.getPlayerSuffix(player);
}
// ***** SET PLAYER PREFIX *****
@Override
public String getGroupSuffix(String world, String group)
public void setPlayerPrefix(String world, String player, String prefix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setGroupSuffix(String world, String group, String suffix)
public void setPlayerPrefix(String world, OfflinePlayer player, String prefix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public String getPlayerPrefix(String world, OfflinePlayer player)
public void setPlayerPrefix(Player player, String prefix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** SET PLAYER SUFFIX *****
@Override
public String getPlayerPrefix(Player player)
public void setPlayerSuffix(String world, String player, String suffix)
{
return rscp.permissionManager.getPlayerPrefix(player);
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setPlayerPrefix(String world, OfflinePlayer player, String prefix)
public void setPlayerSuffix(String world, OfflinePlayer player, String suffix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setPlayerPrefix(Player player, String prefix)
public void setPlayerSuffix(Player player, String suffix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** GET GROUP PREFIX *****
@Override
public String getPlayerSuffix(String world, OfflinePlayer player)
public String getGroupPrefix(String world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public String getPlayerSuffix(Player player)
public String getGroupPrefix(World world, String group)
{
return rscp.permissionManager.getPlayerSuffix(player);
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** GET GROUP SUFFIX *****
@Override
public void setPlayerSuffix(String world, OfflinePlayer player, String suffix)
public String getGroupSuffix(String world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setPlayerSuffix(Player player, String suffix)
public String getGroupSuffix(World world, String group)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** SET GROUP PREFIX *****
@Override
public String getGroupPrefix(World world, String group)
public void setGroupPrefix(World world, String group, String prefix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setGroupPrefix(World world, String group, String prefix)
public void setGroupPrefix(String world, String group, String prefix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** SET GROUP SUFFIX *****
@Override
public String getGroupSuffix(World world, String group)
public void setGroupSuffix(String world, String group, String suffix)
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@ -128,6 +138,7 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***********************************************************
@Override
public boolean playerInGroup(String world, OfflinePlayer player, String group)
{
@ -164,6 +175,7 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
{
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** THIS IS TRASH FOR ME :) *****
@Override
public int getPlayerInfoInteger(String world, String player, String node, int defaultValue)
{

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

@ -14,6 +14,12 @@ public enum Phrases
PLUGIN_DISABLED ("generic.disabled"),
PLUGIN_METRICS ("generic.metrics"),
PLUGIN_RELOADED ("generic.reloaded"),
INTEGRATION_V_Y ("integration.vault-yes"),
INTEGRATION_V_N ("integration.vault-no"),
INTEGRATION_WG_Y ("integration.worldguard-yes"),
INTEGRATION_WG_N ("integration.worldguard-no"),
INTEGRATION_R_Y ("integration.residence-yes"),
INTEGRATION_R_N ("integration.residence-no"),
MYSQL_FETCHED ("mysql.fetched"),
;
private final String node;

2
src/main/resources/config.yml

@ -16,4 +16,4 @@ settings:
password: pass1
prefixes: rscp_
internal:
version: 4
version: 3

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

@ -3,5 +3,12 @@ generic:
disabled: "[rscp] rscPermissions has been disabled."
reloaded: "[rscp] rscPermissions has been reloaded."
metrics: "[rscp] Metrics enabled."
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."
worldguard-yes: "{_LG}WorldGuard was found and integrated."
worldguard-no: "{_YL}WorldGuard was not found."
residence-yes: "{_LG}Residence was found and integrated."
residence-no: "{_YL}Residence was not found."
mysql:
fetched: "[rscp] "

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

@ -3,5 +3,12 @@ generic:
disabled: "[rscp] Плагин rscPermissions выключен."
reloaded: "[rscp] Плагин rscPermissions перезапущен, конфигурация перечитана."
metrics: "[rscp] Включён сбор метрики (mcstats.org)."
integration:
vault-yes: "{_LG}Vault обнаружён и подключён."
vault-no: "{_LR}Не удаётся найти плагин Vault. Рекомендуется его скорейшая установка."
worldguard-yes: "{_LG}WorldGuard обнаружён и подключён."
worldguard-no: "{_YL}WorldGuard не обнаружен."
residence-yes: "{_LG}Residence обнаружён и подключён."
residence-no: "{_YL}Residence не обнаружен."
mysql:
fetched: "[rscp] "

0
src/main/resources/sqlt/Cleanup_tables.sqlt → src/main/resources/sqlt/Cleanup.sqlt

0
src/main/resources/sqlt/Initialize_main_v1.sqlt → src/main/resources/sqlt/Deployment.sqlt

Loading…
Cancel
Save