Better fix for getting the commit timestamp

This commit is contained in:
Melledy
2023-12-17 09:25:08 -08:00
parent f659662c70
commit f67e300495
2 changed files with 5 additions and 6 deletions

View File

@@ -192,7 +192,7 @@ package emu.lunarcore;
public final class BuildConfig { public final class BuildConfig {
public static final String VERSION = \"${version}\"; public static final String VERSION = \"${version}\";
public static final String GIT_HASH = \"${gitCommitHash()}\"; public static final String GIT_HASH = \"${gitCommitHash()}\";
public static final long COMMIT_TIMESTAMP = ${gitCommitTime()}; public static final String GIT_TIMESTAMP = \"${gitCommitTime()}\";
} }
""" """
} }

View File

@@ -228,16 +228,15 @@ public class LunarCore {
String hash = buildConfig.getField("GIT_HASH").get(null).toString(); String hash = buildConfig.getField("GIT_HASH").get(null).toString();
builder.append(hash); builder.append(hash);
long timestamp = buildConfig.getField("COMMIT_TIMESTAMP").getLong(null); String timestamp = buildConfig.getField("GIT_TIMESTAMP").get(null).toString();
if (timestamp > 0) { long time = Long.parseLong(timestamp) * 1000;
builder.append(" (" + sf.format(new Date(timestamp * 1000)) + ")"); builder.append(" (" + sf.format(new Date(time)) + ")");
}
} catch (Exception e) { } catch (Exception e) {
// Ignored // Ignored
} }
if (builder.isEmpty()) { if (builder.isEmpty()) {
return "Unknown"; return "";
} else { } else {
return builder.toString(); return builder.toString();
} }