From f9b5f5a6cf634fb36f9fb903e65f0e150fcc15ed Mon Sep 17 00:00:00 2001 From: Stanislav Usenkov Date: Wed, 17 Dec 2014 18:11:11 +0600 Subject: [PATCH] Up to 0.9.1 alpha. Little changes in dependencies. --- pom.xml | 32 +++++++++++++++---- .../rscPermissions/Backends/BackendJson.java | 27 ++++++++++++++++ .../rscPermissions/Backends/BackendMySQL.java | 2 +- .../rscPermissions/Bukkit/VaultChat.java | 2 +- .../rscPermissions/BukkitPluginMain.java | 8 ++--- .../rscPermissions/CommandHelper.java | 2 +- .../rscPermissions/ConnectionHelper.java | 2 +- .../rscPermissions/DataTypes/Destination.java | 4 +-- .../DataTypes/RowInheritance.java | 4 +-- .../InternalCache/LocalCacheTree.java | 6 ++-- .../rscPermissions/MaintenanceMode.java | 8 ++--- .../rscPermissions/RegionUpdateObserver.java | 2 +- 12 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 src/main/java/ru/simsonic/rscPermissions/Backends/BackendJson.java diff --git a/pom.xml b/pom.xml index 9cf23f8..63157c6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,12 @@ ru.simsonic rscPermissions - 0.9.0a + 0.9.1a jar rscPermissions https://github.com/SimSonic/rscPermissions - @@ -25,6 +24,11 @@ spigot-repo https://hub.spigotmc.org/nexus/content/groups/public/ + + + metrics-repo + http://repo.mcstats.org/content/repositories/public/ + vault-repo @@ -70,6 +74,13 @@ 1.0 provided + + + org.mcstats.bukkit + metrics-lite + R7 + compile + net.milkbowl.vault @@ -99,8 +110,8 @@ ru.simsonic - rscAPI - 1.2.3 + rscUtilityLibrary + 2.0.0 compile jar @@ -116,7 +127,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.2 1.7 1.7 @@ -150,12 +161,19 @@ true + false - ru.simsonic:rscAPI + ru.simsonic:rscUtilityLibrary + org.mcstats.bukkit:metrics-lite - false + + + ru.simsonic.rscUtilityLibrary + ru.simsonic.rscPermissions.rscUtilityLibraryShaded + + diff --git a/src/main/java/ru/simsonic/rscPermissions/Backends/BackendJson.java b/src/main/java/ru/simsonic/rscPermissions/Backends/BackendJson.java new file mode 100644 index 0000000..db70937 --- /dev/null +++ b/src/main/java/ru/simsonic/rscPermissions/Backends/BackendJson.java @@ -0,0 +1,27 @@ +package ru.simsonic.rscPermissions.Backends; +import com.google.gson.Gson; +import ru.simsonic.rscPermissions.DataTypes.RowEntity; +import ru.simsonic.rscPermissions.DataTypes.RowInheritance; +import ru.simsonic.rscPermissions.DataTypes.RowPermission; + +public class BackendJson +{ + private final static String localEntitiesFile = "entities.json"; + private final static String localPermissionsFile = "permissions.json"; + private final static String localInheritanceFile = "inheritance.json"; + public RowEntity[] fetchEntities() + { + final Gson gson = new Gson(); + return null; + } + public RowPermission[] fetchPermissions() + { + final Gson gson = new Gson(); + return null; + } + public RowInheritance[] fetchInheritance() + { + final Gson gson = new Gson(); + return null; + } +} diff --git a/src/main/java/ru/simsonic/rscPermissions/Backends/BackendMySQL.java b/src/main/java/ru/simsonic/rscPermissions/Backends/BackendMySQL.java index 7f45a92..41b6b6e 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Backends/BackendMySQL.java +++ b/src/main/java/ru/simsonic/rscPermissions/Backends/BackendMySQL.java @@ -10,7 +10,7 @@ import ru.simsonic.rscPermissions.DataTypes.RowInheritance; import ru.simsonic.rscPermissions.DataTypes.RowPermission; import ru.simsonic.rscPermissions.InternalCache.AbstractPermissionsCache; import ru.simsonic.rscPermissions.BukkitPluginMain; -import ru.simsonic.utilities.ConnectionMySQL; +import ru.simsonic.rscUtilityLibrary.ConnectionMySQL; public class BackendMySQL extends ConnectionMySQL implements Backend { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java index 93d5afb..de108b0 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java @@ -358,4 +358,4 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat { throw new UnsupportedOperationException("This method is still unsupported. Sorry."); } -} \ No newline at end of file +} diff --git a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java index 5964851..d3e09e4 100644 --- a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java +++ b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java @@ -12,8 +12,8 @@ import ru.simsonic.rscPermissions.Bukkit.BukkitPermissions; import ru.simsonic.rscPermissions.Bukkit.BukkitPluginConfiguration; import ru.simsonic.rscPermissions.Bukkit.PlayerEventsListener; import ru.simsonic.rscPermissions.InternalCache.BrandNewCache; -import ru.simsonic.utilities.CommandAnswerException; -import ru.simsonic.utilities.LanguageUtility; +import ru.simsonic.rscUtilityLibrary.CommandProcessing.CommandAnswerException; +import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public final class BukkitPluginMain extends JavaPlugin { @@ -109,7 +109,7 @@ public final class BukkitPluginMain extends JavaPlugin commandHelper.onCommand(sender, cmd, label, args); } catch(CommandAnswerException ex) { for(String answer : ex.getMessageArray()) - sender.sendMessage(LanguageUtility.processStringStatic(chatPrefix + answer)); + sender.sendMessage(GenericChatCodes.processStringStatic(chatPrefix + answer)); } catch(NullPointerException ex) { // These will never occur! I hope... } @@ -119,7 +119,7 @@ public final class BukkitPluginMain extends JavaPlugin { if(message == null || "".equals(message)) return; - message = LanguageUtility.processStringStatic(chatPrefix + message); + message = GenericChatCodes.processStringStatic(chatPrefix + message); sender.sendMessage(message); } @SuppressWarnings({"DeadBranch", "UnusedAssignment"}) diff --git a/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java b/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java index 83645f5..66d56b0 100644 --- a/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java +++ b/src/main/java/ru/simsonic/rscPermissions/CommandHelper.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachment; import ru.simsonic.rscPermissions.Importers.PermissionsEx_YAML; -import ru.simsonic.utilities.CommandAnswerException; +import ru.simsonic.rscUtilityLibrary.CommandProcessing.CommandAnswerException; public class CommandHelper { diff --git a/src/main/java/ru/simsonic/rscPermissions/ConnectionHelper.java b/src/main/java/ru/simsonic/rscPermissions/ConnectionHelper.java index 7308032..84eae3e 100644 --- a/src/main/java/ru/simsonic/rscPermissions/ConnectionHelper.java +++ b/src/main/java/ru/simsonic/rscPermissions/ConnectionHelper.java @@ -3,7 +3,7 @@ import java.util.logging.Level; import org.bukkit.command.CommandSender; import org.bukkit.scheduler.BukkitRunnable; import ru.simsonic.rscPermissions.Backends.BackendMySQL; -import ru.simsonic.utilities.ConnectionMySQL; +import ru.simsonic.rscUtilityLibrary.ConnectionMySQL; public class ConnectionHelper extends BackendMySQL { diff --git a/src/main/java/ru/simsonic/rscPermissions/DataTypes/Destination.java b/src/main/java/ru/simsonic/rscPermissions/DataTypes/Destination.java index 3a6945d..9121573 100644 --- a/src/main/java/ru/simsonic/rscPermissions/DataTypes/Destination.java +++ b/src/main/java/ru/simsonic/rscPermissions/DataTypes/Destination.java @@ -6,7 +6,7 @@ import java.util.regex.Pattern; import org.bukkit.Location; import org.bukkit.World; import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.utilities.LanguageUtility; +import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class Destination { @@ -90,7 +90,7 @@ public class Destination return true; if(testing == null || "".equals(testing)) return false; - return LanguageUtility.wildcardMatch( + return GenericChatCodes.wildcardMatch( "" + testing.toLowerCase() + "", "" + pattern.toLowerCase() + ""); } diff --git a/src/main/java/ru/simsonic/rscPermissions/DataTypes/RowInheritance.java b/src/main/java/ru/simsonic/rscPermissions/DataTypes/RowInheritance.java index 959d3c9..f1ab515 100644 --- a/src/main/java/ru/simsonic/rscPermissions/DataTypes/RowInheritance.java +++ b/src/main/java/ru/simsonic/rscPermissions/DataTypes/RowInheritance.java @@ -1,7 +1,7 @@ package ru.simsonic.rscPermissions.DataTypes; import java.util.Arrays; import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.utilities.LanguageUtility; +import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class RowInheritance extends ConditionalRow implements Comparable { @@ -17,7 +17,7 @@ public class RowInheritance extends ConditionalRow implements Comparable 1) { - parent = LanguageUtility.glue(Arrays.copyOf(splitted, splitted.length - 1), Settings.separator); + parent = GenericChatCodes.glue(Arrays.copyOf(splitted, splitted.length - 1), Settings.separator); instance = splitted[splitted.length - 1]; return; } diff --git a/src/main/java/ru/simsonic/rscPermissions/InternalCache/LocalCacheTree.java b/src/main/java/ru/simsonic/rscPermissions/InternalCache/LocalCacheTree.java index 8362d14..92f3901 100644 --- a/src/main/java/ru/simsonic/rscPermissions/InternalCache/LocalCacheTree.java +++ b/src/main/java/ru/simsonic/rscPermissions/InternalCache/LocalCacheTree.java @@ -11,7 +11,7 @@ import ru.simsonic.rscPermissions.DataTypes.RowInheritance; import ru.simsonic.rscPermissions.DataTypes.RowPermission; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.utilities.LanguageUtility; +import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class LocalCacheTree extends LocalCacheData { @@ -123,8 +123,8 @@ public class LocalCacheTree extends LocalCacheData if(entity.suffix != null && !"".equals(entity.suffix)) suffix = entity.suffix.replace("%", suffix); } - prefixes_u.put(p2rc.name, LanguageUtility.processStringStatic(prefix)); - suffixes_u.put(p2rc.name, LanguageUtility.processStringStatic(suffix)); + prefixes_u.put(p2rc.name, GenericChatCodes.processStringStatic(prefix)); + suffixes_u.put(p2rc.name, GenericChatCodes.processStringStatic(suffix)); } return permissions; } diff --git a/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java b/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java index 7c19958..c599d00 100644 --- a/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java +++ b/src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.server.ServerListPingEvent; -import ru.simsonic.utilities.LanguageUtility; +import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class MaintenanceMode implements Listener { @@ -23,7 +23,7 @@ public class MaintenanceMode implements Listener String motd = "Server is under maintenance"; motd = plugin.getConfig().getString("language.maintenance.locked.default.motd", motd); motd = plugin.getConfig().getString("language.maintenance.locked." + plugin.settings.getMaintenanceMode() + ".motd", motd); - motd = LanguageUtility.processStringStatic(motd); + motd = GenericChatCodes.processStringStatic(motd); if(!"".equals(motd)) event.setMotd(motd); } @@ -63,7 +63,7 @@ public class MaintenanceMode implements Listener String kickMsg = "{_YL}Server is in maintenance mode\nPlease try to connect later..."; kickMsg = plugin.getConfig().getString("language.maintenance.locked.default.motd", kickMsg); kickMsg = plugin.getConfig().getString("language.maintenance.locked." + plugin.settings.getMaintenanceMode() + ".motd", kickMsg); - kickMsg = LanguageUtility.processStringStatic(kickMsg); + kickMsg = GenericChatCodes.processStringStatic(kickMsg); event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, kickMsg); } public void setMaintenanceMode(String mMode) @@ -86,7 +86,7 @@ public class MaintenanceMode implements Listener String kick = "{_YL}Server is going into maintenance mode"; kick = plugin.getConfig().getString("language.maintenance.locked.default.kick", kick); kick = plugin.getConfig().getString("language.maintenance.locked." + plugin.settings.getMaintenanceMode() + ".kick", kick); - kick = LanguageUtility.processStringStatic(kick); + kick = GenericChatCodes.processStringStatic(kick); player.kickPlayer(kick); } } diff --git a/src/main/java/ru/simsonic/rscPermissions/RegionUpdateObserver.java b/src/main/java/ru/simsonic/rscPermissions/RegionUpdateObserver.java index a732e2d..b0be6a1 100644 --- a/src/main/java/ru/simsonic/rscPermissions/RegionUpdateObserver.java +++ b/src/main/java/ru/simsonic/rscPermissions/RegionUpdateObserver.java @@ -1,7 +1,7 @@ package ru.simsonic.rscPermissions; import java.util.logging.Level; import org.bukkit.entity.Player; -import ru.simsonic.utilities.MovingPlayersCatcher; +import ru.simsonic.rscUtilityLibrary.BukkitListeners.MovingPlayersCatcher; public class RegionUpdateObserver implements Runnable {