From 0fce08dd62129608d199e36979a50ed0dafc1cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20Ellil=C3=A4?= <antti@antti.codes>
Date: Sun, 30 Apr 2023 11:10:42 +0200
Subject: [PATCH] Add version flag for cli (#414)

* Add version flag for cli, rename mc-version flag

* Change to -V, revert mc-version
---
 .../de/bluecolored/bluemap/cli/BlueMapCLI.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java b/implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
index 4bcddf98..cfe9b463 100644
--- a/implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
+++ b/implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
@@ -41,6 +41,7 @@ import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import de.bluecolored.bluemap.common.web.*;
 import de.bluecolored.bluemap.common.web.http.HttpRequestHandler;
 import de.bluecolored.bluemap.common.web.http.HttpServer;
+import de.bluecolored.bluemap.core.BlueMap;
 import de.bluecolored.bluemap.core.MinecraftVersion;
 import de.bluecolored.bluemap.core.logger.Logger;
 import de.bluecolored.bluemap.core.logger.LoggerLogger;
@@ -272,6 +273,12 @@ public class BlueMapCLI implements ServerInterface {
                 return;
             }
 
+            //version
+            if (cmd.hasOption("V")) {
+                BlueMapCLI.printVersion();
+                return;
+            }
+
             //config folder
             cli.configFolder = Path.of("config");
             if (cmd.hasOption("c")) {
@@ -381,7 +388,7 @@ public class BlueMapCLI implements ServerInterface {
                 Option.builder("v")
                 .longOpt("mc-version")
                 .hasArg()
-                .argName("version")
+                .argName("mc-version")
                 .desc("Sets the minecraft-version, used e.g. to load resource-packs correctly. Defaults to the latest compatible version.")
                 .build()
             );
@@ -407,6 +414,8 @@ public class BlueMapCLI implements ServerInterface {
 
         options.addOption("u", "watch", false, "Watches for file-changes after rendering and updates the map");
 
+        options.addOption("V", "version", false, "Print the current BlueMap version");
+
         return options;
     }
 
@@ -445,4 +454,8 @@ public class BlueMapCLI implements ServerInterface {
 
         formatter.printHelp(command + " [options]", "\nOptions:", createOptions(), "\n" + footer);
     }
+
+    private static void printVersion() {
+        System.out.printf("%s\n%s\n", BlueMap.VERSION, BlueMap.GIT_HASH);        
+    }
 }