Misterzym
/
rscPermissions-plugin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Dependencies updated.

master
SimSonic 10 years ago
parent
8386e14fd9
commit
54fefccf88
22 changed files with 52 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      pom.xml
  2. 2
      src/main/java/ru/simsonic/rscPermissions/API/Destination.java
  3. 2
      src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java
  4. 2
      src/main/java/ru/simsonic/rscPermissions/API/Settings.java
  5. 4
      src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java
  6. 6
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java
  7. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java
  8. 6
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java
  9. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
  10. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
  11. 8
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
  12. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java
  13. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java
  14. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java
  15. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandReload.java
  16. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java
  17. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java
  18. 10
      src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java
  19. 2
      src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java
  20. 2
      src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java
  21. 2
      src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java
  22. 2
      src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java

24
pom.xml
Unescape View File

@ -4,7 +4,7 @@
<groupId>ru.simsonic</groupId>
<artifactId>rscPermissions</artifactId>
<version>0.9.17b</version>
<version>0.9.18b</version>
<packaging>jar</packaging>
<name>rscPermissions</name>
@ -77,10 +77,15 @@
<!-- Моя собственная библиотека общего кода для разных проектов -->
<dependency>
<groupId>ru.simsonic</groupId>
<artifactId>rscUtilityLibrary</artifactId>
<version>2.0.5</version>
<artifactId>rscCommonsLibrary</artifactId>
<version>2.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.simsonic</groupId>
<artifactId>rscMinecraftLibrary</artifactId>
<version>2.1.0</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
<!-- Статистика использование плагинов -->
<dependency>
@ -168,7 +173,8 @@
<artifactSet>
<includes>
<include>com.google.code.gson:gson</include>
<include>ru.simsonic:rscUtilityLibrary</include>
<include>ru.simsonic:rscCommonsLibrary</include>
<include>ru.simsonic:rscMinecraftLibrary</include>
<include>org.mcstats.bukkit:metrics-lite</include>
<include>net.milkbowl.vault:VaultAPI</include>
</includes>
@ -179,8 +185,12 @@
<shadedPattern>${project.groupId}.${project.artifactId}.com-google-gson-shaded</shadedPattern>
</relocation>
<relocation>
<pattern>ru.simsonic.rscUtilityLibrary</pattern>
<shadedPattern>${project.groupId}.${project.artifactId}.ru-simsonic-rscUtilityLibrary-shaded</shadedPattern>
<pattern>ru.simsonic.rscCommonsLibrary</pattern>
<shadedPattern>${project.groupId}.${project.artifactId}.rscCommonsLibrary-shaded</shadedPattern>
</relocation>
<relocation>
<pattern>ru.simsonic.rscMinecraftLibrary</pattern>
<shadedPattern>${project.groupId}.${project.artifactId}.rscMinecraftLibrary-shaded</shadedPattern>
</relocation>
</relocations>
</configuration>

2
src/main/java/ru/simsonic/rscPermissions/API/Destination.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java
Unescape View File

@ -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<RowInheritance>
{

2
src/main/java/ru/simsonic/rscPermissions/API/Settings.java
Unescape View File

@ -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
{

4
src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java
Unescape View File

@ -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
{

6
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java
Unescape View File

@ -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
{

4
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java
Unescape View File

@ -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
{

6
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
Unescape View File

@ -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
{

8
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandDebug.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandLock.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandReload.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandUnlock.java
Unescape View File

@ -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
{

4
src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java
Unescape View File

@ -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
{

10
src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java
Unescape View File

@ -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
{

2
src/main/java/ru/simsonic/rscPermissions/Sponge/SpongePluginConfiguration.java
Unescape View File

@ -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
{

Write Preview
Loading…
Cancel
Save