diff --git a/build.gradle b/build.gradle index 59a445f5f5..16baf53f6f 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects{ ext{ versionNumber = '4' - versionModifier = 'release' + if(!project.hasProperty("versionModifier")) versionModifier = 'release' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' gdxVersion = '1.9.10' diff --git a/core/src/io/anuke/mindustry/game/Version.java b/core/src/io/anuke/mindustry/game/Version.java index 77a14dac1a..5f94554f39 100644 --- a/core/src/io/anuke/mindustry/game/Version.java +++ b/core/src/io/anuke/mindustry/game/Version.java @@ -1,12 +1,12 @@ package io.anuke.mindustry.game; -import io.anuke.arc.Core; -import io.anuke.arc.collection.ObjectMap; -import io.anuke.arc.files.FileHandle; -import io.anuke.arc.util.Strings; -import io.anuke.arc.util.io.PropertiesUtils; +import io.anuke.arc.Files.*; +import io.anuke.arc.collection.*; +import io.anuke.arc.files.*; +import io.anuke.arc.util.*; +import io.anuke.arc.util.io.*; -import java.io.IOException; +import java.io.*; public class Version{ /** Build type. 'official' for official releases; 'custom' or 'bleeding edge' are also used. */ @@ -26,7 +26,7 @@ public class Version{ if(!enabled) return; try{ - FileHandle file = Core.files.internal("version.properties"); + FileHandle file = new FileHandle("version.properties", FileType.Internal); ObjectMap map = new ObjectMap<>(); PropertiesUtils.load(map, file.reader()); diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 8593c9f49c..4e561de942 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -18,6 +18,7 @@ import io.anuke.mindustry.*; import io.anuke.mindustry.core.GameState.*; import io.anuke.mindustry.desktop.steam.*; import io.anuke.mindustry.game.EventType.*; +import io.anuke.mindustry.game.Version; import io.anuke.mindustry.net.*; import io.anuke.mindustry.net.Net.*; @@ -30,7 +31,7 @@ import static io.anuke.mindustry.Vars.*; public class DesktopLauncher extends ClientLauncher{ private final static String applicationId = "610508934456934412"; - boolean useDiscord = OS.is64Bit, useSteam = true, showConsole = true; + boolean useDiscord = OS.is64Bit, showConsole = true; SteamCoreNetImpl steamCore; public static void main(String[] arg){ @@ -50,6 +51,8 @@ public class DesktopLauncher extends ClientLauncher{ } public DesktopLauncher(String[] args){ + Version.init(); + boolean useSteam = Version.modifier.equals("steam"); testMobile = Array.with(args).contains("-testMobile"); if(useDiscord){ @@ -105,9 +108,10 @@ public class DesktopLauncher extends ClientLauncher{ try{ SteamAPI.loadLibraries(); if(!SteamAPI.init()){ - Log.info("Steam client not running. Make sure Steam is running!"); + Log.err("Steam client not running."); }else{ Vars.steam = true; + steamCore = new SteamCoreNetImpl(new ArcNetImpl()); Events.on(ClientLoadEvent.class, event -> { Core.settings.defaults("name", steamCore.friends.getPersonaName()); //update callbacks @@ -128,10 +132,6 @@ public class DesktopLauncher extends ClientLauncher{ e.printStackTrace(); } } - - if(steam){ - SteamCoreNetImpl net = steamCore = new SteamCoreNetImpl(new ArcNetImpl()); - } } static void handleCrash(Throwable e){