From d2ce2734d1cccaabb7115e0c1f6c94104122265a Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 26 Jul 2019 20:29:12 +1000 Subject: [PATCH] Actually hook up the version --- worldedit-cli/build.gradle.kts | 2 +- .../main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/worldedit-cli/build.gradle.kts b/worldedit-cli/build.gradle.kts index 95d931177f..ea047b6418 100644 --- a/worldedit-cli/build.gradle.kts +++ b/worldedit-cli/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { tasks.named("jar") { manifest { attributes( - "WorldEdit-Version" to project.version, + "Implementation-Version" to project.version, "Main-Class" to "com.sk89q.worldedit.cli.CLIWorldEdit" ) } diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java index 32e72fe824..1b81e406d5 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java @@ -56,11 +56,14 @@ import java.io.InputStream; import java.io.SequenceInputStream; import java.io.UncheckedIOException; +import java.net.URL; +import java.net.URLClassLoader; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Map; import java.util.Scanner; +import java.util.jar.Manifest; /** * The CLI implementation of WorldEdit. @@ -74,6 +77,7 @@ public class CLIWorldEdit { private CLIPlatform platform; private CLIConfiguration config; private Path workingDir; + private String version; private Actor commandSender; @@ -220,7 +224,10 @@ public File getWorkingDir() { * @return a version string */ String getInternalVersion() { - return ":shrug:"; + if (version == null) { + version = getClass().getPackage().getImplementationVersion(); + } + return version; } public void run(InputStream inputStream) {