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

A great renaming.

master
SimSonic 9 years ago
parent
e20d253ed8
commit
c7a97c29c9
9 changed files with 61 additions and 62 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. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitFetching.java
  2. 8
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitListener.java
  3. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPermissionManager.java
  4. 6
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
  5. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java
  6. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/RegionUpdateObserver.java
  7. 40
      src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
  8. 48
      src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java
  9. 9
      src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseEditor.java

4
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java → src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitFetching.java
Unescape View File

@ -10,10 +10,10 @@ import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents;
import ru.simsonic.rscPermissions.Engine.Phrases;
public class BukkitDatabaseFetcher extends RestartableThread
public class BukkitFetching extends RestartableThread
{
private final BukkitPluginMain rscp;
public BukkitDatabaseFetcher(BukkitPluginMain plugin)
public BukkitFetching(BukkitPluginMain plugin)
{
this.rscp = plugin;
}

8
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitEventListener.java → src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitListener.java
Unescape View File

@ -21,11 +21,11 @@ import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.Phrases;
import ru.simsonic.rscPermissions.Engine.ResolutionResult;
public class BukkitEventListener implements Listener
public class BukkitListener implements Listener
{
private final BukkitPluginMain rscp;
private Map<String, Integer> slotLimits = Collections.emptyMap();
public BukkitEventListener(BukkitPluginMain plugin)
public BukkitListener(BukkitPluginMain plugin)
{
this.rscp = plugin;
}
@ -85,14 +85,14 @@ public class BukkitEventListener implements Listener
{
final Player player = event.getPlayer();
rscp.permissionManager.removePlayer(player);
rscp.regionListProvider.removePlayer(player);
rscp.regionProviders.removePlayer(player);
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event)
{
final Player player = event.getPlayer();
rscp.permissionManager.removePlayer(player);
rscp.regionListProvider.removePlayer(player);
rscp.regionProviders.removePlayer(player);
}
@org.bukkit.event.EventHandler
public void onServerPing(ServerListPingEvent event)

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

@ -164,9 +164,9 @@ public class BukkitPermissionManager extends RestartableThread
{
final ResolutionParams params = new ResolutionParams();
params.applicableIdentifiers = BukkitUtilities.getPlayerIdentifiers(player);
if(rscp.regionListProvider != null)
if(rscp.regionProviders != null)
{
Set<String> regionSet = rscp.regionListProvider.getPlayerRegions(player);
Set<String> regionSet = rscp.regionProviders.getPlayerRegions(player);
params.destRegions = regionSet.toArray(new String[regionSet.size()]);
}
params.destWorld = player.getLocation().getWorld().getName();

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

@ -9,7 +9,7 @@ import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException;
import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes;
import ru.simsonic.rscMinecraftLibrary.Bukkit.Tools;
import ru.simsonic.rscPermissions.API.Settings;
import ru.simsonic.rscPermissions.Bukkit.BukkitDatabaseFetcher;
import ru.simsonic.rscPermissions.Bukkit.BukkitFetching;
import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.Phrases;
@ -22,7 +22,6 @@ public class BukkitCommands
private final CommandDebug cmdDebug;
private final CommandReload cmdReload;
private final CommandUpdate cmdUpdate;
public final BukkitDatabaseFetcher threadFetchDatabaseContents;
public BukkitCommands(final BukkitPluginMain plugin)
{
this.rscp = plugin;
@ -32,7 +31,6 @@ public class BukkitCommands
cmdDebug = new CommandDebug (rscp);
cmdReload = new CommandReload(rscp);
cmdUpdate = new CommandUpdate(rscp);
threadFetchDatabaseContents = new BukkitDatabaseFetcher(rscp);
}
@Deprecated
public Thread threadMigrateFromPExSQL(final CommandSender sender)
@ -46,7 +44,7 @@ public class BukkitCommands
{
setName("rscp:MigrateFromPermissionsEx-SQL");
rscp.connection.executeUpdateT("Migrate_from_PermissionsEx");
threadFetchDatabaseContents.join();
rscp.fetching.join();
rscp.getServer().getScheduler().runTask(rscp, new Runnable()
{
@Override

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

@ -16,7 +16,7 @@ public class CommandFetch
{
if(sender.hasPermission("rscp.admin.reload"))
{
rscp.commandHelper.threadFetchDatabaseContents.startDeamon();
rscp.fetching.startDeamon();
throw new CommandAnswerException(Phrases.FETCHED_ANSWER.toString());
}
}

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

@ -38,7 +38,7 @@ public class RegionUpdateObserver extends RestartableThread
Thread.sleep(Settings.REGION_UPDATE_SLEEP_INTERVAL);
else
for(Player player : players)
if(rscp.regionListProvider.isRegionListChanged(player))
if(rscp.regionProviders.isRegionListChanged(player))
rscp.permissionManager.recalculatePlayer(player);
}

40
src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
Unescape View File

@ -34,14 +34,14 @@ public final class VaultChat extends VaultDeprecatedChat
@Override
public String getPlayerPrefix(String world, OfflinePlayer player)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final ResolutionResult result = rscp.permissionManager.getResult(player);
return result.getPrefix();
}
@Override
public String getPlayerPrefix(Player player)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final ResolutionResult result = rscp.permissionManager.getResult(player);
return result.getPrefix();
}
@ -49,7 +49,7 @@ public final class VaultChat extends VaultDeprecatedChat
@Deprecated
public String getPlayerPrefix(String world, String player)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final ResolutionResult result = rscp.permissionManager.getResult(player);
return result.getPrefix();
}
@ -57,14 +57,14 @@ public final class VaultChat extends VaultDeprecatedChat
@Override
public String getPlayerSuffix(String world, OfflinePlayer player)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final ResolutionResult result = rscp.permissionManager.getResult(player);
return result.getSuffix();
}
@Override
public String getPlayerSuffix(Player player)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final ResolutionResult result = rscp.permissionManager.getResult(player);
return result.getSuffix();
}
@ -72,7 +72,7 @@ public final class VaultChat extends VaultDeprecatedChat
@Deprecated
public String getPlayerSuffix(String world, String player)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final ResolutionResult result = rscp.permissionManager.getResult(player);
return result.getSuffix();
}
@ -80,54 +80,54 @@ public final class VaultChat extends VaultDeprecatedChat
@Override
public void setPlayerPrefix(String world, OfflinePlayer player, String prefix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setPlayerPrefix(Player player, String prefix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
@Deprecated
public void setPlayerPrefix(String world, String player, String prefix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** SET PLAYER SUFFIX *****
@Override
public void setPlayerSuffix(String world, OfflinePlayer player, String suffix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
public void setPlayerSuffix(Player player, String suffix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
@Override
@Deprecated
public void setPlayerSuffix(String world, String player, String suffix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is unsupported by rscPermissions.");
}
// ***** GET GROUP PREFIX *****
@Override
public String getGroupPrefix(String world, String group)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final RowEntity entity = rscp.internalCache.findGroupEntity(group);
return entity != null ? entity.prefix : null;
}
@Override
public String getGroupPrefix(World world, String group)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final RowEntity entity = rscp.internalCache.findGroupEntity(group);
return entity != null ? entity.prefix : null;
}
@ -135,14 +135,14 @@ public final class VaultChat extends VaultDeprecatedChat
@Override
public String getGroupSuffix(String world, String group)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final RowEntity entity = rscp.internalCache.findGroupEntity(group);
return entity != null ? entity.suffix : null;
}
@Override
public String getGroupSuffix(World world, String group)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
final RowEntity entity = rscp.internalCache.findGroupEntity(group);
return entity != null ? entity.suffix : null;
}
@ -150,26 +150,26 @@ public final class VaultChat extends VaultDeprecatedChat
@Override
public void setGroupPrefix(World world, String group, String prefix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is still unsupported by rscPermissions.");
}
@Override
public void setGroupPrefix(String world, String group, String prefix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is still unsupported by rscPermissions.");
}
// ***** SET GROUP SUFFIX *****
@Override
public void setGroupSuffix(String world, String group, String suffix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is still unsupported by rscPermissions.");
}
@Override
public void setGroupSuffix(World world, String group, String suffix)
{
rscp.bridgeForBukkit.printDebugStackTrace();
rscp.rscpAPIs.printDebugStackTrace();
throw new UnsupportedOperationException("This method is still unsupported by rscPermissions.");
}
// ***** DELEGATED TO PERMISSION *****

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

@ -16,7 +16,8 @@ import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException;
import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes;
import ru.simsonic.rscMinecraftLibrary.Bukkit.Tools;
import ru.simsonic.rscPermissions.API.Settings;
import ru.simsonic.rscPermissions.Bukkit.BukkitEventListener;
import ru.simsonic.rscPermissions.Bukkit.BukkitFetching;
import ru.simsonic.rscPermissions.Bukkit.BukkitListener;
import ru.simsonic.rscPermissions.Bukkit.BukkitPermissionManager;
import ru.simsonic.rscPermissions.Bukkit.BukkitPluginConfiguration;
import ru.simsonic.rscPermissions.Bukkit.BukkitRegionProviders;
@ -30,18 +31,19 @@ import ru.simsonic.rscPermissions.Engine.Phrases;
public final class BukkitPluginMain extends JavaPlugin
{
public final static Logger consoleLog = Bukkit.getLogger();
public final Settings settings = new BukkitPluginConfiguration(this);
public final BukkitUpdater updating = new BukkitUpdater(this, Settings.UPDATER_URL, Settings.CHAT_PREFIX, Settings.UPDATE_CMD);
public final BukkitEventListener listener = new BukkitEventListener(this);
public final BackendJson localStorage = new BackendJson(getDataFolder());
public final DatabaseEditor connection = new DatabaseEditor(this);
public final InternalCache internalCache = new InternalCache();
public final BukkitCommands commandHelper = new BukkitCommands(this);
public final BridgeForBukkitAPI bridgeForBukkit = new BridgeForBukkitAPI(this);
public final BukkitPermissionManager permissionManager = new BukkitPermissionManager(this);
public final BukkitRegionProviders regionListProvider = new BukkitRegionProviders(this);
private final RegionUpdateObserver regionUpdateObserver = new RegionUpdateObserver(this);
public final static Logger consoleLog = Bukkit.getLogger();
public final Settings settings = new BukkitPluginConfiguration(this);
public final BukkitUpdater updating = new BukkitUpdater(this, Settings.UPDATER_URL, Settings.CHAT_PREFIX, Settings.UPDATE_CMD);
public final BridgeForBukkitAPI rscpAPIs = new BridgeForBukkitAPI(this);
public final BukkitListener listener = new BukkitListener(this);
public final BukkitCommands commands = new BukkitCommands(this);
public final BackendJson localStorage = new BackendJson(getDataFolder());
public final DatabaseEditor connection = new DatabaseEditor(this);
public final BukkitFetching fetching = new BukkitFetching(this);
public final InternalCache internalCache = new InternalCache();
public final BukkitPermissionManager permissionManager = new BukkitPermissionManager(this);
public final BukkitRegionProviders regionProviders = new BukkitRegionProviders(this);
private final RegionUpdateObserver regionObserver = new RegionUpdateObserver(this);
private MetricsLite metrics;
public BukkitPluginMain()
{
@ -88,26 +90,26 @@ public final class BukkitPluginMain extends JavaPlugin
}
// Register event's dispatcher
getServer().getPluginManager().registerEvents(listener, this);
regionUpdateObserver.registerListeners();
regionObserver.registerListeners();
// Integrate Vault and WEPIF
bridgeForBukkit.setupVault();
rscpAPIs.setupVault();
getServer().getScheduler().runTask(this, new Runnable()
{
@Override
public void run()
{
bridgeForBukkit.setupWEPIF();
rscpAPIs.setupWEPIF();
}
});
// WorldGuard, Residence and other possible region list providers
regionListProvider.integrate();
regionProviders.integrate();
// Start all needed parallel threads as daemons
permissionManager.startDeamon();
regionUpdateObserver.startDeamon();
regionObserver.startDeamon();
// Connect to database and initiate data fetching
connection.initialize(settings.getConnectionParams());
if(settings.getAutoReloadDelayTicks() > 0)
commandHelper.threadFetchDatabaseContents.startDeamon();
fetching.startDeamon();
// Done
for(Player online : Tools.getOnlinePlayers())
if(online.hasPermission("rscm.admin"))
@ -118,11 +120,11 @@ public final class BukkitPluginMain extends JavaPlugin
public void onDisable()
{
getServer().getServicesManager().unregisterAll(this);
regionUpdateObserver.stop();
regionObserver.stop();
permissionManager.stop();
internalCache.clear();
connection.disconnect();
regionListProvider.deintegrate();
regionProviders.deintegrate();
if(metrics != null)
try
{
@ -145,7 +147,7 @@ public final class BukkitPluginMain extends JavaPlugin
@Override
public void run()
{
commandHelper.threadFetchDatabaseContents.startDeamon();
fetching.startDeamon();
}
}, delay)
: -1;
@ -159,7 +161,7 @@ public final class BukkitPluginMain extends JavaPlugin
switch(cmd.getName().toLowerCase())
{
case "rscp":
commandHelper.onCommandHub(sender, args);
commands.onCommandHub(sender, args);
break;
}
} catch(CommandAnswerException ex) {

9
src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseEditor.java
Unescape View File

@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
import org.bukkit.Bukkit;
import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes;
import ru.simsonic.rscPermissions.API.RowEntity;
import ru.simsonic.rscPermissions.API.RowInheritance;
@ -19,7 +18,7 @@ public class DatabaseEditor extends BackendDatabase
private final Map<String, RowInheritance> inheritance = new HashMap<>();
public DatabaseEditor(BukkitPluginMain rscp)
{
super(Bukkit.getLogger());
super(rscp.getServer().getLogger());
this.plugin = rscp;
}
@Override
@ -60,7 +59,7 @@ public class DatabaseEditor extends BackendDatabase
public void addPermission(RowPermission row)
{
super.insertPermissions(
(row.id != 0 ? Long.valueOf(row.id) : null),
(row.id != 0 ? (long)row.id : null),
row.entity,
row.entityType,
row.permission,
@ -77,7 +76,7 @@ public class DatabaseEditor extends BackendDatabase
plugin.connection.lockTableInheritance();
plugin.connection.transactionStart();
// SELECT FROM DATABASE INTO LOCAL CACHE TO MAKE IT ACTUAL
return plugin.commandHelper.threadFetchDatabaseContents.remoteToLocal();
return plugin.fetching.remoteToLocal();
}
private void finishChanges(boolean commit)
{
@ -87,7 +86,7 @@ public class DatabaseEditor extends BackendDatabase
else
plugin.connection.transactionCommit();
// CALL PLUGIN TO APPLY ALL THIS CHANGES
plugin.commandHelper.threadFetchDatabaseContents.run();
plugin.fetching.run();
}
private RowPermission restorePermissionsAfterDelete(DatabaseContents contents, RowPermission remove)
{

Write Preview
Loading…
Cancel
Save