diff --git a/pom.xml b/pom.xml
index a2483f2..ed1a89a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
org.mcstats.bukkit
metrics-lite
- R7
+ R8-SNAPSHOT
compile
@@ -82,7 +82,7 @@
net.milkbowl.vault
VaultAPI
1.5
- provided
+ compile
@@ -165,6 +165,7 @@
com.google.code.gson:gson
ru.simsonic:rscUtilityLibrary
org.mcstats.bukkit:metrics-lite
+ net.milkbowl.vault:VaultAPI
diff --git a/src/main/java/ru/simsonic/rscPermissions/Backends/BackendDatabase.java b/src/main/java/ru/simsonic/rscPermissions/Backends/BackendDatabase.java
index 969385c..60f377c 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Backends/BackendDatabase.java
+++ b/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();
diff --git a/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java b/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java
index 6825bc4..17d8c6e 100644
--- a/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java
+++ b/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()));
}
}
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
index c4f647e..581fc5c 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
+++ b/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;
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
index 1510cd6..7d84f5c 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
@@ -9,12 +9,14 @@ import ru.simsonic.rscPermissions.BukkitPluginMain;
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 BukkitPluginMain rscp;
+ 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)
{
diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
index 75a0ef5..3a29bf8 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
+++ b/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;
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 59d9c52..2c1b54e 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -16,4 +16,4 @@ settings:
password: pass1
prefixes: rscp_
internal:
- version: 4
+ version: 3
diff --git a/src/main/resources/languages/english.yml b/src/main/resources/languages/english.yml
index 4fd0840..c8db691 100644
--- a/src/main/resources/languages/english.yml
+++ b/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] "
diff --git a/src/main/resources/languages/russian.yml b/src/main/resources/languages/russian.yml
index b525d5c..df24105 100644
--- a/src/main/resources/languages/russian.yml
+++ b/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] "
diff --git a/src/main/resources/sqlt/Cleanup_tables.sqlt b/src/main/resources/sqlt/Cleanup.sqlt
similarity index 100%
rename from src/main/resources/sqlt/Cleanup_tables.sqlt
rename to src/main/resources/sqlt/Cleanup.sqlt
diff --git a/src/main/resources/sqlt/Initialize_main_v1.sqlt b/src/main/resources/sqlt/Deployment.sqlt
similarity index 100%
rename from src/main/resources/sqlt/Initialize_main_v1.sqlt
rename to src/main/resources/sqlt/Deployment.sqlt