From 5de9c9ba0c8e30ebfadc2368db3a0565fb657394 Mon Sep 17 00:00:00 2001 From: szymon Date: Sat, 15 Aug 2020 21:59:11 +0200 Subject: [PATCH] removed info call from sendInfo method in CustomLogger class --- .../java/net/szum123321/textile_backup/TextileBackup.java | 5 +++-- .../net/szum123321/textile_backup/core/CustomLogger.java | 1 - .../szum123321/textile_backup/core/create/BackupHelper.java | 4 ++-- .../textile_backup/core/create/MakeBackupRunnable.java | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/szum123321/textile_backup/TextileBackup.java b/src/main/java/net/szum123321/textile_backup/TextileBackup.java index 56f68b7..1e675b3 100644 --- a/src/main/java/net/szum123321/textile_backup/TextileBackup.java +++ b/src/main/java/net/szum123321/textile_backup/TextileBackup.java @@ -87,10 +87,11 @@ public class TextileBackup implements ModInitializer { return true; } } - ).then(BlacklistCommand.register()) - .then(CleanupCommand.register()) + ) .then(StartBackupCommand.register()) + .then(CleanupCommand.register()) .then(WhitelistCommand.register()) + .then(BlacklistCommand.register()) .then(RestoreBackupCommand.register()) .then(ListBackupsCommand.register()) .then(KillRestoreCommand.register()) diff --git a/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java b/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java index e02abe3..37cdde6 100644 --- a/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java +++ b/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java @@ -113,7 +113,6 @@ public class CustomLogger { public void sendInfo(ServerCommandSource source, String msg, Object... args) { sendToPlayer(Level.INFO, source, msg, args); - info(msg, args); } public void sendError(ServerCommandSource source, String msg, Object... args) { diff --git a/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java b/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java index 1d27471..a1d7a1d 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java @@ -52,6 +52,7 @@ public class BackupHelper { if (ctx.shouldSave()) { Statics.LOGGER.sendInfo(ctx.getCommandSource(), "Saving server..."); + Statics.LOGGER.info( "Saving server..."); ctx.getServer().save(true, true, false); } @@ -111,6 +112,7 @@ public class BackupHelper { if(f != Statics.untouchableFile) { if(f.delete()) { Statics.LOGGER.sendInfo(ctx, "Deleting: {}", f.getName()); + Statics.LOGGER.info("Deleting: {}", f.getName()); return true; } else { Statics.LOGGER.sendError(ctx, "Something went wrong while deleting: {}.", f.getName()); @@ -119,6 +121,4 @@ public class BackupHelper { return false; } - - private static boolean isFileOk(File f) {return f.exists() && f.isFile(); } } \ No newline at end of file diff --git a/src/main/java/net/szum123321/textile_backup/core/create/MakeBackupRunnable.java b/src/main/java/net/szum123321/textile_backup/core/create/MakeBackupRunnable.java index f68f745..c8d31fc 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/MakeBackupRunnable.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/MakeBackupRunnable.java @@ -36,6 +36,7 @@ public class MakeBackupRunnable implements Runnable { @Override public void run() { Statics.LOGGER.sendInfo(context.getCommandSource(), "Starting backup"); + Statics.LOGGER.info("Starting backup"); File world = Utilities.getWorldFolder(context.getServer()); @@ -98,6 +99,7 @@ public class MakeBackupRunnable implements Runnable { BackupHelper.executeFileLimit(context.getCommandSource(), Utilities.getLevelName(context.getServer())); Statics.LOGGER.sendInfo(context, "Done!"); + Statics.LOGGER.info("Done!"); } private String getFileName(){