Browse Source

Better console output, added two additional translation strings.

master
SimSonic 10 years ago
parent
commit
2925c7c139
  1. 11
      src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java
  2. 14
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java
  3. 24
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
  4. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandFetch.java
  5. 14
      src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java
  6. 4
      src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
  7. 6
      src/main/resources/languages/english.yml
  8. 6
      src/main/resources/languages/russian.yml

11
src/main/java/ru/simsonic/rscPermissions/BridgeForBukkitAPI.java

@ -1,6 +1,7 @@
package ru.simsonic.rscPermissions;
import com.sk89q.wepif.PermissionsResolverManager;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.ServicePriority;
@ -58,6 +59,7 @@ public class BridgeForBukkitAPI
}
protected void setupVault()
{
final ConsoleCommandSender console = rscp.getServer().getConsoleSender();
final Plugin plugin = rscp.getServer().getPluginManager().getPlugin("Vault");
if(plugin != null)
{
@ -69,12 +71,13 @@ public class BridgeForBukkitAPI
rscp.getServer().getServicesManager().register(
net.milkbowl.vault.permission.Permission.class, vaultPermission,
rscp, ServicePriority.Highest);
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_V_Y.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_V_Y.toString()));
} else
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_V_N.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_V_N.toString()));
}
protected void setupWEPIF()
{
final ConsoleCommandSender console = rscp.getServer().getConsoleSender();
final Plugin plugin = rscp.getServer().getPluginManager().getPlugin("WorldEdit");
if(plugin != null)
{
@ -84,9 +87,9 @@ public class BridgeForBukkitAPI
prm.setPluginPermissionsResolver(wepif);
else
PermissionsResolverManager.initialize(wepif);
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WE_Y.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WE_Y.toString()));
} else
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WE_N.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WE_N.toString()));
}
public void printDebugString(String info)
{

14
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitDatabaseFetcher.java

@ -1,11 +1,11 @@
package ru.simsonic.rscPermissions.Bukkit;
import java.util.Set;
import java.util.logging.Level;
import org.bukkit.command.CommandSender;
import ru.simsonic.rscPermissions.API.Settings;
import ru.simsonic.rscPermissions.Engine.Backends.DatabaseContents;
import ru.simsonic.rscPermissions.BukkitPluginMain;
import ru.simsonic.rscPermissions.Engine.Phrases;
import ru.simsonic.rscUtilityLibrary.RestartableThread;
import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes;
@ -42,13 +42,11 @@ public class BukkitDatabaseFetcher extends RestartableThread
@Override
public synchronized void run()
{
BukkitPluginMain.consoleLog.log(Level.INFO, "[rscp] Fetched {0} entities, {1} permissions and {2} inheritances",
new Integer[]
{
contents.entities.length,
contents.permissions.length,
contents.inheritance.length
});
rscp.getServer().getConsoleSender().sendMessage(GenericChatCodes.processStringStatic(
(Settings.chatPrefix + Phrases.FETCHED_REMOTE_DB.toString())
.replace("{:E}", String.valueOf(contents.entities.length))
.replace("{:P}", String.valueOf(contents.permissions.length))
.replace("{:I}", String.valueOf(contents.inheritance.length))));
rscp.permissionManager.recalculateOnlinePlayers();
notify();
}

24
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java

@ -15,6 +15,7 @@ import net.t00thpick1.residence.api.ResidenceManager;
import net.t00thpick1.residence.api.areas.ResidenceArea;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import ru.simsonic.rscPermissions.BukkitPluginMain;
@ -23,7 +24,7 @@ import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes;
public final class BukkitRegionProviders
{
private final BukkitPluginMain plugin;
private final BukkitPluginMain rscp;
private Plugin worldguard;
private Plugin residence;
private final Map<Player, Set<String>> regionsByPlayer = new HashMap<>();
@ -31,35 +32,36 @@ public final class BukkitRegionProviders
private final Map<Player, World> playerLastWorld = new HashMap<>();
public BukkitRegionProviders(BukkitPluginMain rscp)
{
this.plugin = rscp;
this.rscp = rscp;
}
public synchronized void integrate()
{
final ConsoleCommandSender console = rscp.getServer().getConsoleSender();
// WorldGuard
if(plugin.settings.isUseWorldGuard())
if(rscp.settings.isUseWorldGuard())
{
final Plugin pluginWG = plugin.getServer().getPluginManager().getPlugin("WorldGuard");
final Plugin pluginWG = rscp.getServer().getPluginManager().getPlugin("WorldGuard");
if(pluginWG != null && pluginWG instanceof WorldGuardPlugin)
{
this.worldguard = pluginWG;
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_Y.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_Y.toString()));
} else {
this.worldguard = null;
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_N.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_N.toString()));
}
} else
this.worldguard = null;
// Residence
if(plugin.settings.isUseResidence())
if(rscp.settings.isUseResidence())
{
final Plugin pluginR = plugin.getServer().getPluginManager().getPlugin("Residence");
final Plugin pluginR = rscp.getServer().getPluginManager().getPlugin("Residence");
if(pluginR != null && pluginR instanceof Residence)
{
this.residence = pluginR;
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_R_Y.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_R_Y.toString()));
} else {
this.residence = null;
BukkitPluginMain.consoleLog.warning(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_R_N.toString()));
console.sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_R_N.toString()));
}
} else
this.residence = null;
@ -91,7 +93,7 @@ public final class BukkitRegionProviders
playerRegions.add(region.getId());
} catch(RuntimeException | IncompatibleClassChangeError ex) {
worldguard = null;
BukkitPluginMain.consoleLog.info(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_OLD.toString()));
rscp.getServer().getConsoleSender().sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_OLD.toString()));
}
// Residence
if(residence != null && residence.isEnabled())

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

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

14
src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java

@ -44,7 +44,7 @@ public final class BukkitPluginMain extends JavaPlugin
{
Phrases.extractTranslations(getDataFolder());
settings.onLoad();
consoleLog.log(Level.INFO, "[rscp] This server`s ID is \"{0}\". You can change it in server.properties.", getServer().getServerId());
consoleLog.log(Level.INFO, "[rscp] serverId value is set to \"{0}\". You can change it in server.properties.", getServer().getServerId());
consoleLog.log(Level.INFO, "[rscp] rscPermissions has been loaded.");
}
@Override
@ -61,13 +61,11 @@ public final class BukkitPluginMain extends JavaPlugin
final DatabaseContents contents = localStorage.retrieveContents();
contents.filterServerId(getServer().getServerId()).filterLifetime();
internalCache.fill(contents);
consoleLog.log(Level.INFO,
"[rscp] Loaded {0} entity, {1} permission and {2} inheritance rows from local cache.", new Integer[]
{
contents.entities.length,
contents.permissions.length,
contents.inheritance.length,
});
getServer().getConsoleSender().sendMessage(GenericChatCodes.processStringStatic(
(Settings.chatPrefix + Phrases.FETCHED_LOCAL_CACHE.toString())
.replace("{:E}", String.valueOf(contents.entities.length))
.replace("{:P}", String.valueOf(contents.permissions.length))
.replace("{:I}", String.valueOf(contents.inheritance.length))));
// Integrate Metrics
if(settings.isUseMetrics())
try

4
src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java

@ -28,7 +28,9 @@ public enum Phrases
INTEGRATION_R_N ("integration.residence-no"),
DEBUG_ON ("debug.enable"),
DEBUG_OFF ("debug.disable"),
MYSQL_FETCHED ("mysql.fetched"),
FETCHED_ANSWER ("database.command-answer"),
FETCHED_LOCAL_CACHE("database.fetched-local"),
FETCHED_REMOTE_DB ("database.fetched-remote"),
;
private final String node;
private String phrase;

6
src/main/resources/languages/english.yml

@ -18,5 +18,7 @@ integration:
debug:
enable: "You will see a lot of debugging information now."
disable: "Debugging information is now hidden for you."
mysql:
fetched: "Tables have been fetched."
database:
command-answer: "Tables have been fetched."
fetched-local: "{_LG}Loaded {:E} entity, {:P} permission and {:I} inheritance rows from local cache."
fetched-remote: "{_LG}Fetched {:E} entities, {:P} permissions and {:I} inheritances."

6
src/main/resources/languages/russian.yml

@ -18,5 +18,7 @@ integration:
debug:
enable: "Теперь Вы будете видеть отладочную информацию."
disable: "Отладочная информация теперь скрыта от Вас."
mysql:
fetched: "База данных перечитана."
database:
command-answer: "База данных перечитана."
fetched-local: "{_LG}Восстановлено {:E} сущностей, {:P} прав and {:I} наследований."
fetched-remote: "{_LG}Получено {:E} сущностей, {:P} прав and {:I} наследований."

Loading…
Cancel
Save