From 75d2ea151966a1be0ffc583cf09cd542070a6c4b Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 28 Nov 2018 17:42:12 -0500 Subject: [PATCH] Added build revision --- core/src/io/anuke/mindustry/game/Version.java | 15 ++++++++++++++- .../mindustry/ui/fragments/MenuFragment.java | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/game/Version.java b/core/src/io/anuke/mindustry/game/Version.java index acc63bcc20..44d4aac4b1 100644 --- a/core/src/io/anuke/mindustry/game/Version.java +++ b/core/src/io/anuke/mindustry/game/Version.java @@ -17,6 +17,8 @@ public class Version{ public static int number; /**Build number, e.g. '43'. set to '-1' for custom builds.*/ public static int build = 0; + /**Revision number. Used for hotfixes. Does not affect server compatibility.*/ + public static int revision = 0; public static void init(){ try{ @@ -28,7 +30,18 @@ public class Version{ type = map.get("type"); number = Integer.parseInt(map.get("number")); modifier = map.get("modifier"); - build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1; + if(map.get("build").contains(".")){ + String[] split = map.get("build").split("\\."); + try{ + build = Integer.parseInt(split[0]); + revision = Integer.parseInt(split[1]); + }catch(Throwable e){ + e.printStackTrace(); + build = -1; + } + }else{ + build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1; + } }catch(IOException e){ throw new RuntimeException(e); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index b50ff4d6db..7272968b4f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -43,7 +43,8 @@ public class MenuFragment extends Fragment{ } //version info - parent.fill(c -> c.bottom().left().add(Strings.formatArgs("Mindustry v{0} {1}-{2} {3}", Version.number, Version.modifier, Version.type, (Version.build == -1 ? "custom build" : "build " + Version.build))) + parent.fill(c -> c.bottom().left().add(Strings.formatArgs("Mindustry v{0} {1}-{2} {3}{4}", Version.number, Version.modifier, Version.type, + (Version.build == -1 ? "custom build" : "build " + Version.build), Version.revision == 0 ? "" : "." + Version.revision)) .visible(() -> state.is(State.menu))); }