diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 02c052ec67..f29baa775e 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -256,9 +256,9 @@ public class Vars implements Loadable{ state = new GameState(); data = new GlobalData(); - mobile = Core.app.getType() == ApplicationType.Android || Core.app.getType() == ApplicationType.iOS || testMobile; - ios = Core.app.getType() == ApplicationType.iOS; - android = Core.app.getType() == ApplicationType.Android; + mobile = Core.app.isMobile() || testMobile; + ios = Core.app.isIOS(); + android = Core.app.isAndroid(); modDirectory.mkdirs(); diff --git a/core/src/mindustry/input/Binding.java b/core/src/mindustry/input/Binding.java index 95508dd300..b4bacb68af 100644 --- a/core/src/mindustry/input/Binding.java +++ b/core/src/mindustry/input/Binding.java @@ -1,10 +1,9 @@ package mindustry.input; -import arc.Application.ApplicationType; -import arc.Core; +import arc.*; import arc.KeyBinds.*; -import arc.input.InputDevice.DeviceType; -import arc.input.KeyCode; +import arc.input.InputDevice.*; +import arc.input.*; public enum Binding implements KeyBind{ move_x(new Axis(KeyCode.a, KeyCode.d), "general"), @@ -54,7 +53,7 @@ public enum Binding implements KeyBind{ block_select_10(KeyCode.num0), zoom(new Axis(KeyCode.scroll), "view"), - menu(Core.app.getType() == ApplicationType.Android ? KeyCode.back : KeyCode.escape), + menu(Core.app.isAndroid() ? KeyCode.back : KeyCode.escape), fullscreen(KeyCode.f11), pause(KeyCode.space), minimap(KeyCode.m), diff --git a/gradle.properties b/gradle.properties index 103bb23a42..dff7027b91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=db822fce837c326b28f091138bf6b34839767b51 +archash=53dae7fe3363a33793daa1d7036cc77f4e0e2797