Browse Source

Up to 0.9.1 alpha.

Little changes in dependencies.
master
Stanislav Usenkov 11 years ago
parent
commit
f9b5f5a6cf
  1. 32
      pom.xml
  2. 27
      src/main/java/ru/simsonic/rscPermissions/Backends/BackendJson.java
  3. 2
      src/main/java/ru/simsonic/rscPermissions/Backends/BackendMySQL.java
  4. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
  5. 8
      src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java
  6. 2
      src/main/java/ru/simsonic/rscPermissions/CommandHelper.java
  7. 2
      src/main/java/ru/simsonic/rscPermissions/ConnectionHelper.java
  8. 4
      src/main/java/ru/simsonic/rscPermissions/DataTypes/Destination.java
  9. 4
      src/main/java/ru/simsonic/rscPermissions/DataTypes/RowInheritance.java
  10. 6
      src/main/java/ru/simsonic/rscPermissions/InternalCache/LocalCacheTree.java
  11. 8
      src/main/java/ru/simsonic/rscPermissions/MaintenanceMode.java
  12. 2
      src/main/java/ru/simsonic/rscPermissions/RegionUpdateObserver.java

32
pom.xml

@ -4,13 +4,12 @@
<groupId>ru.simsonic</groupId>
<artifactId>rscPermissions</artifactId>
<version>0.9.0a</version>
<version>0.9.1a</version>
<packaging>jar</packaging>
<name>rscPermissions</name>
<url>https://github.com/SimSonic/rscPermissions</url>
<repositories>
<!-- Bukkit / Spigot / Sponge -->
<repository>
@ -25,6 +24,11 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<!-- MC Metrics -->
<repository>
<id>metrics-repo</id>
<url>http://repo.mcstats.org/content/repositories/public/</url>
</repository>
<!-- VaultAPI -->
<repository>
<id>vault-repo</id>
@ -70,6 +74,13 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
<!-- Статистика использование плагинов -->
<dependency>
<groupId>org.mcstats.bukkit</groupId>
<artifactId>metrics-lite</artifactId>
<version>R7</version>
<scope>compile</scope>
</dependency>
<!-- Стандарт подключения менеджера прав и чата к Bukkit -->
<dependency>
<groupId>net.milkbowl.vault</groupId>
@ -99,8 +110,8 @@
<!-- Какие-то временные изыски Reality_SC, в будущем уберуться -->
<dependency>
<groupId>ru.simsonic</groupId>
<artifactId>rscAPI</artifactId>
<version>1.2.3</version>
<artifactId>rscUtilityLibrary</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
@ -116,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@ -150,12 +161,19 @@
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>ru.simsonic:rscAPI</include>
<include>ru.simsonic:rscUtilityLibrary</include>
<include>org.mcstats.bukkit:metrics-lite</include>
</includes>
</artifactSet>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>ru.simsonic.rscUtilityLibrary</pattern>
<shadedPattern>ru.simsonic.rscPermissions.rscUtilityLibraryShaded</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>

27
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;
}
}

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

2
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.");
}
}
}

8
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"})

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

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

4
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(
"<wildcard>" + testing.toLowerCase() + "</wildcard>",
"<wildcard>" + pattern.toLowerCase() + "</wildcard>");
}

4
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<RowInheritance>
{
@ -17,7 +17,7 @@ public class RowInheritance extends ConditionalRow implements Comparable<RowInhe
final String[] splitted = parent.split(Settings.separatorRegExp);
if(splitted.length > 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;
}

6
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;
}

8
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);
}
}

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

Loading…
Cancel
Save