From f67e3004953aba63f38d51004842a4950551f8df Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Sun, 17 Dec 2023 09:25:08 -0800 Subject: [PATCH] Better fix for getting the commit timestamp --- build.gradle | 2 +- src/main/java/emu/lunarcore/LunarCore.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 81479c0..e005add 100644 --- a/build.gradle +++ b/build.gradle @@ -192,7 +192,7 @@ package emu.lunarcore; public final class BuildConfig { public static final String VERSION = \"${version}\"; public static final String GIT_HASH = \"${gitCommitHash()}\"; - public static final long COMMIT_TIMESTAMP = ${gitCommitTime()}; + public static final String GIT_TIMESTAMP = \"${gitCommitTime()}\"; } """ } diff --git a/src/main/java/emu/lunarcore/LunarCore.java b/src/main/java/emu/lunarcore/LunarCore.java index 0f7a1ff..7bec1d6 100644 --- a/src/main/java/emu/lunarcore/LunarCore.java +++ b/src/main/java/emu/lunarcore/LunarCore.java @@ -228,16 +228,15 @@ public class LunarCore { String hash = buildConfig.getField("GIT_HASH").get(null).toString(); builder.append(hash); - long timestamp = buildConfig.getField("COMMIT_TIMESTAMP").getLong(null); - if (timestamp > 0) { - builder.append(" (" + sf.format(new Date(timestamp * 1000)) + ")"); - } + String timestamp = buildConfig.getField("GIT_TIMESTAMP").get(null).toString(); + long time = Long.parseLong(timestamp) * 1000; + builder.append(" (" + sf.format(new Date(time)) + ")"); } catch (Exception e) { // Ignored } if (builder.isEmpty()) { - return "Unknown"; + return ""; } else { return builder.toString(); }