From f98bd57e3107f4ef4df2ffac1b8dfeb5f4f3854f Mon Sep 17 00:00:00 2001 From: Stefan Dollase Date: Tue, 5 Jan 2016 22:34:47 +0100 Subject: [PATCH] added more logging for parameters --- src/main/java/amidst/Amidst.java | 13 ++++++------- .../mojangapi/world/SeedHistoryLogger.java | 1 + .../BiomeColorProfileDirectory.java | 19 +++++++++++++++++-- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main/java/amidst/Amidst.java b/src/main/java/amidst/Amidst.java index 62110549..9ff30f8e 100644 --- a/src/main/java/amidst/Amidst.java +++ b/src/main/java/amidst/Amidst.java @@ -47,7 +47,7 @@ public class Amidst { parser.parseArgument(args); run(metadata, parameters, parser); } catch (CmdLineException e) { - printLongVersionString(metadata); + System.out.println(metadata.getVersion().createLongVersionString()); System.err.println(e.getMessage()); parser.printUsage(System.out); System.exit(2); @@ -63,22 +63,21 @@ public class Amidst { private static void run(AmidstMetaData metadata, CommandLineParameters parameters, CmdLineParser parser) { initFileLogger(parameters.logFile); + String versionString = metadata.getVersion().createLongVersionString(); if (parameters.printHelp) { - printLongVersionString(metadata); + System.out.println(versionString); parser.printUsage(System.out); } else if (parameters.printVersion) { - printLongVersionString(metadata); + System.out.println(versionString); } else { + Log.i(versionString); startApplication(parameters, metadata); } } - private static void printLongVersionString(AmidstMetaData metadata) { - System.out.println(metadata.getVersion().createLongVersionString()); - } - private static void initFileLogger(String filename) { if (filename != null) { + Log.i("using log file: '" + filename + "'"); Log.addListener("file", new FileLogger(new File(filename))); } } diff --git a/src/main/java/amidst/mojangapi/world/SeedHistoryLogger.java b/src/main/java/amidst/mojangapi/world/SeedHistoryLogger.java index bdd2627c..ba0acf3f 100644 --- a/src/main/java/amidst/mojangapi/world/SeedHistoryLogger.java +++ b/src/main/java/amidst/mojangapi/world/SeedHistoryLogger.java @@ -19,6 +19,7 @@ public class SeedHistoryLogger { private File getHistoryFile(String filename) { if (filename != null) { + Log.i("using seed history file: '" + filename + "'"); return new File(filename); } else { return null; diff --git a/src/main/java/amidst/settings/biomecolorprofile/BiomeColorProfileDirectory.java b/src/main/java/amidst/settings/biomecolorprofile/BiomeColorProfileDirectory.java index 7106ef2d..79694593 100644 --- a/src/main/java/amidst/settings/biomecolorprofile/BiomeColorProfileDirectory.java +++ b/src/main/java/amidst/settings/biomecolorprofile/BiomeColorProfileDirectory.java @@ -15,10 +15,17 @@ import com.google.gson.JsonSyntaxException; @Immutable public class BiomeColorProfileDirectory { public static BiomeColorProfileDirectory create(String root) { + BiomeColorProfileDirectory result = new BiomeColorProfileDirectory( + getRoot(root)); + Log.i("using biome color profiles at: '" + result.getRoot() + "'"); + return result; + } + + private static File getRoot(String root) { if (root != null) { - return new BiomeColorProfileDirectory(new File(root)); + return new File(root); } else { - return new BiomeColorProfileDirectory(DEFAULT_ROOT_DIRECTORY); + return DEFAULT_ROOT_DIRECTORY; } } @@ -34,6 +41,14 @@ public class BiomeColorProfileDirectory { this.defaultProfile = new File(root, "default.json"); } + public File getRoot() { + return root; + } + + public File getDefaultProfile() { + return defaultProfile; + } + public boolean isValid() { return root.isDirectory(); }