diff --git a/pom.xml b/pom.xml index dcbb8cd..ac0d0c5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ru.simsonic rscPermissions - 0.9.17b + 0.9.18b jar rscPermissions @@ -77,10 +77,15 @@ ru.simsonic - rscUtilityLibrary - 2.0.5 + rscCommonsLibrary + 2.1.0 + compile + + + ru.simsonic + rscMinecraftLibrary + 2.1.0 compile - jar @@ -168,7 +173,8 @@ com.google.code.gson:gson - ru.simsonic:rscUtilityLibrary + ru.simsonic:rscCommonsLibrary + ru.simsonic:rscMinecraftLibrary org.mcstats.bukkit:metrics-lite net.milkbowl.vault:VaultAPI @@ -179,8 +185,12 @@ ${project.groupId}.${project.artifactId}.com-google-gson-shaded - ru.simsonic.rscUtilityLibrary - ${project.groupId}.${project.artifactId}.ru-simsonic-rscUtilityLibrary-shaded + ru.simsonic.rscCommonsLibrary + ${project.groupId}.${project.artifactId}.rscCommonsLibrary-shaded + + + ru.simsonic.rscMinecraftLibrary + ${project.groupId}.${project.artifactId}.rscMinecraftLibrary-shaded diff --git a/src/main/java/ru/simsonic/rscPermissions/API/Destination.java b/src/main/java/ru/simsonic/rscPermissions/API/Destination.java index 87177f0..ff55413 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/Destination.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/Destination.java @@ -3,7 +3,7 @@ package ru.simsonic.rscPermissions.API; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; public class Destination { diff --git a/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java b/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java index 279b91b..7b02703 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java @@ -2,7 +2,7 @@ package ru.simsonic.rscPermissions.API; import java.sql.Timestamp; import java.util.Arrays; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; public class RowInheritance implements Cloneable, Comparable { diff --git a/src/main/java/ru/simsonic/rscPermissions/API/Settings.java b/src/main/java/ru/simsonic/rscPermissions/API/Settings.java index 0e565af..fad44a1 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/Settings.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/Settings.java @@ -1,7 +1,7 @@ package ru.simsonic.rscPermissions.API; import java.util.Map; -import ru.simsonic.rscUtilityLibrary.ConnectionMySQL.ConnectionParams; +import ru.simsonic.rscCommonsLibrary.ConnectionMySQL.ConnectionParams; public interface Settings { diff --git a/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java b/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java index d1a3812..3736e13 100644 --- a/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java +++ b/src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java @@ -5,13 +5,13 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.ServicePriority; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; +import ru.simsonic.rscMinecraftLibrary.Bukkit.Tools; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.Bukkit.VaultChat; import ru.simsonic.rscPermissions.Bukkit.VaultPermission; import ru.simsonic.rscPermissions.Bukkit.WorldEditPermissions; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.Bukkit.Tools; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class BridgeForBukkitAPI { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java index 23936e3..ad55fc2 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java @@ -2,12 +2,12 @@ package ru.simsonic.rscPermissions.Bukkit; import java.util.Set; import org.bukkit.command.CommandSender; +import ru.simsonic.rscCommonsLibrary.RestartableThread; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents; import ru.simsonic.rscPermissions.BukkitPluginMain; +import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.RestartableThread; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class BukkitDatabaseFetcher extends RestartableThread { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java index 199806a..6eb0d1c 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java @@ -14,10 +14,10 @@ import org.bukkit.event.player.PlayerLevelChangeEvent; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.server.ServerListPingEvent; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; +import ru.simsonic.rscMinecraftLibrary.Bukkit.Tools; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.Engine.ResolutionResult; -import ru.simsonic.rscUtilityLibrary.Bukkit.Tools; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class BukkitEventListener implements Listener { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java index 12031b7..542933f 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java @@ -14,13 +14,13 @@ import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachment; +import ru.simsonic.rscCommonsLibrary.RestartableThread; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; +import ru.simsonic.rscMinecraftLibrary.Bukkit.Tools; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.Engine.ResolutionParams; import ru.simsonic.rscPermissions.Engine.ResolutionResult; -import ru.simsonic.rscUtilityLibrary.Bukkit.Tools; -import ru.simsonic.rscUtilityLibrary.RestartableThread; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class BukkitPermissionManager extends RestartableThread { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java index 42a9eec..22fc02e 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java @@ -6,10 +6,10 @@ import java.util.Map; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import ru.simsonic.rscCommonsLibrary.ConnectionMySQL.ConnectionParams; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.API.TranslationProvider; import ru.simsonic.rscPermissions.BukkitPluginMain; -import ru.simsonic.rscUtilityLibrary.ConnectionMySQL.ConnectionParams; public class BukkitPluginConfiguration implements Settings { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java index 82a9665..31c6c65 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java @@ -18,9 +18,9 @@ import org.bukkit.World; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public final class BukkitRegionProviders { 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 a4b77d9..427a896 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java @@ -1,18 +1,18 @@ package ru.simsonic.rscPermissions.Bukkit.Commands; -import ru.simsonic.rscPermissions.Bukkit.BukkitDatabaseFetcher; import java.util.ArrayList; import java.util.Collections; import java.util.logging.Level; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import ru.simsonic.rscCommonsLibrary.RestartableThread; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; 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.ResolutionResult; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; -import ru.simsonic.rscUtilityLibrary.RestartableThread; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class BukkitCommands { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java index 7d1ed5f..84591ee 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java @@ -1,9 +1,9 @@ package ru.simsonic.rscPermissions.Bukkit.Commands; import org.bukkit.command.CommandSender; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; public class CommandDebug { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java index 7702ca7..1067bf5 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java @@ -1,9 +1,9 @@ package ru.simsonic.rscPermissions.Bukkit.Commands; import org.bukkit.command.CommandSender; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; public class CommandFetch { 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 c309469..ecc7d93 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java @@ -1,8 +1,8 @@ package ru.simsonic.rscPermissions.Bukkit.Commands; import org.bukkit.command.CommandSender; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscPermissions.BukkitPluginMain; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; public class CommandLock { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandReload.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandReload.java index f9ffbbd..aac8b5a 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandReload.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandReload.java @@ -1,9 +1,9 @@ package ru.simsonic.rscPermissions.Bukkit.Commands; import org.bukkit.command.CommandSender; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscPermissions.BukkitPluginMain; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; public class CommandReload { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java index d37c0f7..50d2a80 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java @@ -1,8 +1,8 @@ package ru.simsonic.rscPermissions.Bukkit.Commands; import org.bukkit.command.CommandSender; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscPermissions.BukkitPluginMain; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; public class CommandUnlock { diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java index a401bfb..65d1a6b 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java @@ -1,9 +1,9 @@ package ru.simsonic.rscPermissions.Bukkit; import org.bukkit.entity.Player; +import ru.simsonic.rscCommonsLibrary.RestartableThread; +import ru.simsonic.rscMinecraftLibrary.Bukkit.MovingPlayersCatcher; import ru.simsonic.rscPermissions.BukkitPluginMain; -import ru.simsonic.rscUtilityLibrary.Bukkit.Listeners.MovingPlayersCatcher; -import ru.simsonic.rscUtilityLibrary.RestartableThread; public class RegionUpdateObserver extends RestartableThread { diff --git a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java index 668a9f5..5a1362e 100644 --- a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java +++ b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java @@ -10,20 +10,20 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; import org.mcstats.MetricsLite; +import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.rscPermissions.Engine.Backends.BackendDatabase; -import ru.simsonic.rscPermissions.Engine.Backends.BackendJson; -import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents; import ru.simsonic.rscPermissions.Bukkit.BukkitEventListener; import ru.simsonic.rscPermissions.Bukkit.BukkitPermissionManager; import ru.simsonic.rscPermissions.Bukkit.BukkitPluginConfiguration; import ru.simsonic.rscPermissions.Bukkit.BukkitRegionProviders; import ru.simsonic.rscPermissions.Bukkit.Commands.BukkitCommands; import ru.simsonic.rscPermissions.Bukkit.RegionUpdateObserver; +import ru.simsonic.rscPermissions.Engine.Backends.BackendDatabase; +import ru.simsonic.rscPermissions.Engine.Backends.BackendJson; +import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents; import ru.simsonic.rscPermissions.Engine.InternalCache; import ru.simsonic.rscPermissions.Engine.Phrases; -import ru.simsonic.rscUtilityLibrary.Bukkit.Commands.CommandAnswerException; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public final class BukkitPluginMain extends JavaPlugin { diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java index 528e4d4..4b7ae5a 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java @@ -5,11 +5,11 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; +import ru.simsonic.rscCommonsLibrary.ConnectionMySQL; import ru.simsonic.rscPermissions.API.EntityType; import ru.simsonic.rscPermissions.API.RowEntity; import ru.simsonic.rscPermissions.API.RowInheritance; import ru.simsonic.rscPermissions.API.RowPermission; -import ru.simsonic.rscUtilityLibrary.ConnectionMySQL; public class BackendDatabase extends ConnectionMySQL { diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java index 331e2d7..1719f47 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java @@ -9,6 +9,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; import java.util.Set; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; import ru.simsonic.rscPermissions.API.EntityType; import ru.simsonic.rscPermissions.API.PlayerType; import ru.simsonic.rscPermissions.API.RowEntity; @@ -16,7 +17,6 @@ import ru.simsonic.rscPermissions.API.RowInheritance; import ru.simsonic.rscPermissions.API.RowPermission; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class InternalCache { diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java index a2093df..c47206f 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; import ru.simsonic.rscPermissions.API.Settings; -import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; public class ResolutionResult { diff --git a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java b/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java index b43dd97..a4cfd25 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java +++ b/src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java @@ -1,10 +1,10 @@ package ru.simsonic.rscPermissions.Sponge; import java.util.Map; +import ru.simsonic.rscCommonsLibrary.ConnectionMySQL.ConnectionParams; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.API.TranslationProvider; import ru.simsonic.rscPermissions.SpongePluginMain; -import ru.simsonic.rscUtilityLibrary.ConnectionMySQL.ConnectionParams; public class SpongePluginConfiguration implements Settings {