From 97a7a360306153063266052a04c9d7222d306158 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 17 Aug 2023 15:47:31 +0900 Subject: [PATCH] version tag on app configuration --- buildapp/make_assets_release.sh | 0 src/net/torvald/terrarum/App.java | 4 +++- src/net/torvald/terrarum/TerrarumAppConfiguration.kt | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 buildapp/make_assets_release.sh diff --git a/buildapp/make_assets_release.sh b/buildapp/make_assets_release.sh old mode 100644 new mode 100755 diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 8c1c704f5..e6e50a5aa 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -62,9 +62,11 @@ public class App implements ApplicationListener { public static final String GAME_NAME = TerrarumAppConfiguration.GAME_NAME; public static final long VERSION_RAW = TerrarumAppConfiguration.VERSION_RAW; + public static final String VERSION_TAG = TerrarumAppConfiguration.VERSION_TAG; public static final String getVERSION_STRING() { - return String.format("%d.%d.%d", VERSION_RAW >>> 48, (VERSION_RAW & 0xffff000000L) >>> 24, VERSION_RAW & 0xffffffL); + return String.format("%d.%d.%d", VERSION_RAW >>> 48, (VERSION_RAW & 0xffff000000L) >>> 24, VERSION_RAW & 0xffffffL) + + (VERSION_TAG.isBlank() ? "" : "-"+VERSION_TAG); } /** diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index 2d4c12d81..b8104f4c4 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -67,6 +67,8 @@ basegame // Commit counts up to the Release 0.3.1: 2278 // Commit counts up to the Release 0.3.2: 2732 + const val VERSION_TAG: String = "test001" + ////////////////////////////////////////////////////////// // CONFIGURATION FOR TILE MAKER // // MAKE SURE THESE VALUES ARE UNIQUE IN THE SOURCE CODE //