Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-27 20:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Enhanced console messages

Browse Source
This commit is contained in:
Gabriele C 2015-07-16 21:16:58 +02:00
parent 0ab801daa7
commit 5f5c1b19f0
4 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -121,7 +121,7 @@ public class AuthMe extends JavaPlugin {
settings = new Settings(this); settings = new Settings(this);
settings.loadConfigOptions(); settings.loadConfigOptions();
} catch (Exception e) { } catch (Exception e) {
ConsoleLogger.showError("Can't load config file... Something goes wrong, for prevent security issues, server will shutdown"); ConsoleLogger.showError("Can't load the configuration file... Something went wrong, to avoid security issues the server will shutdown!");
this.getServer().shutdown(); this.getServer().shutdown();
return; return;
} }
@ -131,7 +131,7 @@ public class AuthMe extends JavaPlugin {
metrics.start(); metrics.start();
ConsoleLogger.info("Metrics started successfully!"); ConsoleLogger.info("Metrics started successfully!");
} catch (IOException e) { } catch (IOException e) {
// Failed to submit the stats :-( // Failed to submit the metrics data
ConsoleLogger.showError("Can't start Metrics! The plugin will work anyway..."); ConsoleLogger.showError("Can't start Metrics! The plugin will work anyway...");
} }
@ -167,9 +167,9 @@ public class AuthMe extends JavaPlugin {
Class.forName("org.apache.logging.log4j.core.Filter"); Class.forName("org.apache.logging.log4j.core.Filter");
setLog4JFilter(); setLog4JFilter();
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
ConsoleLogger.info("You're using Minecraft 1.6.x or older, Log4J support is disabled"); ConsoleLogger.info("You're using Minecraft 1.6.x or older, Log4J support will be disabled");
} catch (NoClassDefFoundError e) { } catch (NoClassDefFoundError e) {
ConsoleLogger.info("You're using Minecraft 1.6.x or older, Log4J support is disabled"); ConsoleLogger.info("You're using Minecraft 1.6.x or older, Log4J support will be disabled");
} }
} }
@ -198,8 +198,8 @@ public class AuthMe extends JavaPlugin {
if (Settings.isBackupActivated && Settings.isBackupOnStart) { if (Settings.isBackupActivated && Settings.isBackupOnStart) {
Boolean Backup = new PerformBackup(this).DoBackup(); Boolean Backup = new PerformBackup(this).DoBackup();
if (Backup) if (Backup)
ConsoleLogger.info("Backup Complete"); ConsoleLogger.info("Backup performed correctly");
else ConsoleLogger.showError("Error while making Backup"); else ConsoleLogger.showError("Error while performing the backup!");
} }
setupDatabase(); setupDatabase();
@ -225,7 +225,7 @@ public class AuthMe extends JavaPlugin {
pm.registerEvents(new AuthMeServerListener(this), this); pm.registerEvents(new AuthMeServerListener(this), this);
if (ChestShop != 0) { if (ChestShop != 0) {
pm.registerEvents(new AuthMeChestShopListener(this), this); pm.registerEvents(new AuthMeChestShopListener(this), this);
ConsoleLogger.info("Successfully hook with ChestShop!"); ConsoleLogger.info("Hooked successfully with ChestShop!");
} }
this.getCommand("authme").setExecutor(new AdminCommand(this)); this.getCommand("authme").setExecutor(new AdminCommand(this));
@ -240,7 +240,7 @@ public class AuthMe extends JavaPlugin {
this.getCommand("converter").setExecutor(new ConverterCommand(this)); this.getCommand("converter").setExecutor(new ConverterCommand(this));
if (!Settings.isForceSingleSessionEnabled) { if (!Settings.isForceSingleSessionEnabled) {
ConsoleLogger.showError("BECAREFUL !!! By disabling ForceSingleSession, your server protection is set to LOW"); ConsoleLogger.showError("WARNING!!! By disabling ForceSingleSession, your server protection is inadequate!");
} }
PlayersLogs.getInstance(); PlayersLogs.getInstance();
@ -273,9 +273,9 @@ public class AuthMe extends JavaPlugin {
recallEmail(); recallEmail();
// Sponsor message // Sponsor message
ConsoleLogger.info("AuthMe hook perfectly with server hosting VERYGAMES"); ConsoleLogger.info("AuthMe hooks perfectly with the VERYGAMES server hosting!");
ConsoleLogger.info("Authme " + this.getDescription().getVersion() + " enabled"); ConsoleLogger.info("AuthMe " + this.getDescription().getVersion() + " correctly enabled!");
} }
private void setLog4JFilter() { private void setLog4JFilter() {
@ -294,9 +294,9 @@ public class AuthMe extends JavaPlugin {
RegisteredServiceProvider<Permission> permissionProvider = getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class); RegisteredServiceProvider<Permission> permissionProvider = getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
if (permissionProvider != null) { if (permissionProvider != null) {
permission = permissionProvider.getProvider(); permission = permissionProvider.getProvider();
ConsoleLogger.info("Vault plugin detected, hook with " + permission.getName() + " system"); ConsoleLogger.info("Vault detected, hooking with the " + permission.getName() + " permissions system...");
} else { } else {
ConsoleLogger.showError("Vault plugin is detected but not the permissions plugin!"); ConsoleLogger.showError("Vault detected, but I can't find any permissions plugin to hook with!");
} }
} else { } else {
permission = null; permission = null;
@ -316,7 +316,7 @@ public class AuthMe extends JavaPlugin {
if (version >= 3.50) { if (version >= 3.50) {
this.ChestShop = version; this.ChestShop = version;
} else { } else {
ConsoleLogger.showError("Please Update your ChestShop version!"); ConsoleLogger.showError("Please Update your ChestShop version! Bugs may occur!");
} }
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
try { try {
@ -324,7 +324,7 @@ public class AuthMe extends JavaPlugin {
if (version >= 3.50) { if (version >= 3.50) {
this.ChestShop = version; this.ChestShop = version;
} else { } else {
ConsoleLogger.showError("Please Update your ChestShop version!"); ConsoleLogger.showError("Please Update your ChestShop version! Bugs may occur!");
} }
} catch (NumberFormatException nfee) { } catch (NumberFormatException nfee) {
} }
@ -344,7 +344,7 @@ public class AuthMe extends JavaPlugin {
if (this.getServer().getPluginManager().getPlugin("Multiverse-Core") != null && this.getServer().getPluginManager().getPlugin("Multiverse-Core").isEnabled()) { if (this.getServer().getPluginManager().getPlugin("Multiverse-Core") != null && this.getServer().getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
try { try {
multiverse = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core"); multiverse = (MultiverseCore) this.getServer().getPluginManager().getPlugin("Multiverse-Core");
ConsoleLogger.info("Hook with Multiverse-Core for SpawnLocations"); ConsoleLogger.info("Hooked correctly with Multiverse-Core");
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
multiverse = null; multiverse = null;
} catch (ClassCastException cce) { } catch (ClassCastException cce) {
@ -361,7 +361,7 @@ public class AuthMe extends JavaPlugin {
if (this.getServer().getPluginManager().getPlugin("Essentials") != null && this.getServer().getPluginManager().getPlugin("Essentials").isEnabled()) { if (this.getServer().getPluginManager().getPlugin("Essentials") != null && this.getServer().getPluginManager().getPlugin("Essentials").isEnabled()) {
try { try {
ess = (Essentials) this.getServer().getPluginManager().getPlugin("Essentials"); ess = (Essentials) this.getServer().getPluginManager().getPlugin("Essentials");
ConsoleLogger.info("Hook with Essentials plugin"); ConsoleLogger.info("Hooked correctly with Essentials");
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
ess = null; ess = null;
} catch (ClassCastException cce) { } catch (ClassCastException cce) {
@ -375,10 +375,10 @@ public class AuthMe extends JavaPlugin {
if (this.getServer().getPluginManager().getPlugin("EssentialsSpawn") != null && this.getServer().getPluginManager().getPlugin("EssentialsSpawn").isEnabled()) { if (this.getServer().getPluginManager().getPlugin("EssentialsSpawn") != null && this.getServer().getPluginManager().getPlugin("EssentialsSpawn").isEnabled()) {
try { try {
essentialsSpawn = new EssSpawn().getLocation(); essentialsSpawn = new EssSpawn().getLocation();
ConsoleLogger.info("Hook with EssentialsSpawn plugin"); ConsoleLogger.info("Hooked correctly with EssentialsSpawn");
} catch (Exception e) { } catch (Exception e) {
essentialsSpawn = null; essentialsSpawn = null;
ConsoleLogger.showError("Error while reading /plugins/Essentials/spawn.yml file "); ConsoleLogger.showError("Can't read the /plugins/Essentials/spawn.yml file!");
} }
} else { } else {
essentialsSpawn = null; essentialsSpawn = null;
@ -424,10 +424,10 @@ public class AuthMe extends JavaPlugin {
if (Settings.isBackupActivated && Settings.isBackupOnStop) { if (Settings.isBackupActivated && Settings.isBackupOnStop) {
Boolean Backup = new PerformBackup(this).DoBackup(); Boolean Backup = new PerformBackup(this).DoBackup();
if (Backup) if (Backup)
ConsoleLogger.info("Backup Complete"); ConsoleLogger.info("Backup performed correctly.");
else ConsoleLogger.showError("Error while making Backup"); else ConsoleLogger.showError("Error while performing the backup!");
} }
ConsoleLogger.info("Authme " + this.getDescription().getVersion() + " disabled"); ConsoleLogger.info("AuthMe " + this.getDescription().getVersion() + " disabled!");
} }
public static AuthMe getInstance() { public static AuthMe getInstance() {
@ -524,7 +524,7 @@ public class AuthMe extends JavaPlugin {
return; return;
if (cleared.isEmpty()) if (cleared.isEmpty())
return; return;
ConsoleLogger.info("AutoPurgeDatabase : " + cleared.size() + " accounts removed."); ConsoleLogger.info("AutoPurging the Database: " + cleared.size() + " accounts removed!");
if (Settings.purgeEssentialsFile && this.ess != null) if (Settings.purgeEssentialsFile && this.ess != null)
dataManager.purgeEssentials(cleared); dataManager.purgeEssentials(cleared);
if (Settings.purgePlayerDat) if (Settings.purgePlayerDat)
@ -588,7 +588,7 @@ public class AuthMe extends JavaPlugin {
} }
public void downloadGeoIp() { public void downloadGeoIp() {
ConsoleLogger.info("[LICENSE] This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com"); ConsoleLogger.info("[LICENSE] This product uses data from the GeoLite API created by MaxMind, available at http://www.maxmind.com");
File file = new File(getDataFolder(), "GeoIP.dat"); File file = new File(getDataFolder(), "GeoIP.dat");
if (!file.exists()) { if (!file.exists()) {
try { try {
@ -759,8 +759,7 @@ public class AuthMe extends JavaPlugin {
case FILE: case FILE:
database = new FlatFile(); database = new FlatFile();
final int a = database.getAccountsRegistered(); final int a = database.getAccountsRegistered();
if (a >= 1000) ConsoleLogger.showError("YOU'RE USING THE FILE BACKEND WITH " + a + "+ ACCOUNTS, YOU SHOULD NEVER USE THIS, PLEASE UPGRADE TO SQLITE!!!");
ConsoleLogger.showError("YOU'RE USING FILE DATABASE WITH " + a + "+ ACCOUNTS, FOR BETTER PERFORMANCES, PLEASE USE MYSQL!!");
break; break;
case MYSQL: case MYSQL:
database = new MySQL(); database = new MySQL();
@ -768,8 +767,8 @@ public class AuthMe extends JavaPlugin {
case SQLITE: case SQLITE:
database = new SQLite(); database = new SQLite();
final int b = database.getAccountsRegistered(); final int b = database.getAccountsRegistered();
if (b >= 2000) if (b >= 4000)
ConsoleLogger.showError("YOU'RE USING SQLITE DATABASE WITH " + b + "+ ACCOUNTS, FOR BETTER PERFORMANCES, PLEASE USE MYSQL!!"); ConsoleLogger.showError("YOU'RE USING THE SQLITE DATABASE WITH " + b + "+ ACCOUNTS, FOR BETTER PERFORMANCES, PLEASE UPGRADE TO MYSQL!!");
break; break;
} }

8
src/main/java/fr/xephi/authme/PerformBackup.java
View File

@ -59,10 +59,10 @@ public class PerformBackup {
runtimeProcess = Runtime.getRuntime().exec(executeCmd); runtimeProcess = Runtime.getRuntime().exec(executeCmd);
int processComplete = runtimeProcess.waitFor(); int processComplete = runtimeProcess.waitFor();
if (processComplete == 0) { if (processComplete == 0) {
ConsoleLogger.info("Backup created successfully"); ConsoleLogger.info("Backup created successfully.");
return true; return true;
} else { } else {
ConsoleLogger.info("Could not create the backup"); ConsoleLogger.showError("Could not create the backup!");
} }
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
@ -74,10 +74,10 @@ public class PerformBackup {
runtimeProcess = Runtime.getRuntime().exec(executeCmd); runtimeProcess = Runtime.getRuntime().exec(executeCmd);
int processComplete = runtimeProcess.waitFor(); int processComplete = runtimeProcess.waitFor();
if (processComplete == 0) { if (processComplete == 0) {
ConsoleLogger.info("Backup created successfully"); ConsoleLogger.info("Backup created successfully.");
return true; return true;
} else { } else {
ConsoleLogger.info("Could not create the backup"); ConsoleLogger.showError("Could not create the backup!");
} }
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();

2
src/main/java/fr/xephi/authme/SendMailSSL.java
View File

@ -100,7 +100,7 @@ public class SendMailSSL {
file.delete(); file.delete();
} catch (Exception e) { } catch (Exception e) {
System.out.println("Some error occured while trying to send a mail to " + mail); console.showError("Some error occured while trying to send a mail to " + mail);
} }
} }

2
src/main/java/fr/xephi/authme/Utils.java
View File

@ -43,7 +43,7 @@ public class Utils {
World world = null; World world = null;
currentGroup = plugin.permission.getPrimaryGroup(world, name); currentGroup = plugin.permission.getPrimaryGroup(world, name);
} catch (UnsupportedOperationException e) { } catch (UnsupportedOperationException e) {
ConsoleLogger.showError("Your permission system (" + plugin.permission.getName() + ") do not support Group system with that config... unhook!"); ConsoleLogger.showError("Your permission plugin (" + plugin.permission.getName() + ") doesn't support the Group system... unhook!");
plugin.permission = null; plugin.permission = null;
return; return;
} }