Move versions to manifest file

diff --git a/build.gradle b/build.gradle
index 895654adffe27e5fd422e54a73d4e5146464d52b..b9d018879edbd87d653fc8418f5da053df7526dd 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -44,12 +44,6 @@ minecraft {
     tweakClass = 'com.irtimaled.bbor.launch.ClientTweaker'
     makeObfSourceJar = false
     clientJvmArgs = ['-XstartOnFirstThread']
-
-    replace "@VERSION@", project.version
-    replaceIn "com/irtimaled/bbor/Main.java"
-
-    replace "@MC_VERSION@", project.mcVersion
-    replaceIn "com/irtimaled/bbor/Main.java"
 }
 
 mixin {
@@ -80,9 +74,18 @@ processResources {
 
 jar {
     finalizedBy reobfJar
-    manifest.attributes(
-            'Main-Class': 'com.irtimaled.bbor.Main'
-    )
+    manifest {
+        attributes([
+                "Main-Class": "com.irtimaled.bbor.Main",
+                "Specification-Title": "bbor",
+                "Specification-Vendor": "Irtimaled",
+                "Specification-Version": "1", // We are version 1 of ourselves
+                "Implementation-Title": project.name,
+                "Implementation-Version": "${version}",
+                "Implementation-Vendor": "Irtimaled",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
+    }
 
     classifier = 'vanilla'
 }

diff --git a/src/main/java/com/irtimaled/bbor/Main.java b/src/main/java/com/irtimaled/bbor/Main.java
index 4d706b6cd6ca9805b056d6f4561f09d1c6bf8516..c9e09a30affa1afdf8f60294437c412efa2f031c 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/Main.java
+++ b/src/main/java/com/irtimaled/bbor/Main.java
@@ -9,9 +9,9 @@ import java.util.Arrays;
 public class Main {
     public static void main(String... args) throws IOException {
         if (args.length > 0 && args[0].equals("--server")) {
-            ServerRunner.run("@MC_VERSION@", Arrays.asList(args).subList(1, args.length));
+            ServerRunner.run(Arrays.asList(args).subList(1, args.length));
         } else {
-            Installer.install("@VERSION@", "@MC_VERSION@");
+            Installer.install();
         }
     }
 }

diff --git a/src/main/java/com/irtimaled/bbor/Versions.java b/src/main/java/com/irtimaled/bbor/Versions.java
new file mode 100644 (file)
index 0000000..be71c7d
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/Versions.java
@@ -0,0 +1,16 @@
+package com.irtimaled.bbor;
+
+public class Versions {
+    public static final String minecraft;
+    public static final String build;
+
+    static {
+        String version = Versions.class.getPackage().getImplementationVersion();
+
+        if (version == null) version = "dev-dev";
+        String[] versionParts = version.split("-");
+
+        build = versionParts[0];
+        minecraft = versionParts[1];
+    }
+}

diff --git a/src/main/java/com/irtimaled/bbor/install/Installer.java b/src/main/java/com/irtimaled/bbor/install/Installer.java
index 327a81334781dd612a05bcf766d682e2367ffdf6..6d79fc540551452d52e79396a7a5515221e34445 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/install/Installer.java
+++ b/src/main/java/com/irtimaled/bbor/install/Installer.java
@@ -1,5 +1,7 @@
 package com.irtimaled.bbor.install;
 
+import com.irtimaled.bbor.Versions;
+
 import javax.swing.*;
 import java.io.File;
 import java.io.PrintWriter;
@@ -12,7 +14,9 @@ import java.util.Date;
 import java.util.Locale;
 
 public class Installer {
-    public static void install(final String version, final String mcVersion) {
+    public static void install() {
+        String version = Versions.build;
+        String mcVersion = Versions.minecraft;
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         } catch (Throwable t) {

diff --git a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
index 5924988c34c5a94f3094df3709b4ce7a624e5a29..b6a1cab9d5377aee6f3921ffc108171fc4721790 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
+++ b/src/main/java/com/irtimaled/bbor/server/ServerRunner.java
@@ -1,5 +1,6 @@
 package com.irtimaled.bbor.server;
 
+import com.irtimaled.bbor.Versions;
 import net.minecraft.launchwrapper.Launch;
 
 import java.io.File;
@@ -46,8 +47,8 @@ public class ServerRunner {
         addURL.accept(file.toURI().toURL());
     }
 
-    public static void run(String version, List<String> args) throws IOException {
-        String serverJarUrl = VANILLA_SERVER_JARS.get(version);
+    public static void run(List<String> args) throws IOException {
+        String serverJarUrl = VANILLA_SERVER_JARS.get(Versions.minecraft);
 
         addURLToClasspath(getOrDownload(new File("."), serverJarUrl));
         for (String url : LIBRARIES) {