From 2059fb39f7f08fe3c8d97f5e36397aebb71d06af Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 7 Feb 2018 21:52:00 -0500 Subject: [PATCH] Added version info to main menu --- android/AndroidManifest.xml | 4 ++-- core/src/io/anuke/mindustry/Vars.java | 6 ++++++ core/src/io/anuke/mindustry/core/NetServer.java | 4 ++-- core/src/io/anuke/mindustry/net/Net.java | 2 -- core/src/io/anuke/mindustry/net/Packets.java | 4 +++- .../anuke/mindustry/ui/fragments/BackgroundFragment.java | 3 ++- core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java | 7 +++++++ 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index d585e3ad6e..22b5902ff6 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="71" + android:versionName="3.3b20" > diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 235722b106..941b44b71a 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -22,6 +22,12 @@ import io.anuke.ucore.scene.ui.layout.Unit; import java.util.Locale; public class Vars{ + public static final String versionName = "Mindustry"; + public static final byte versionBuild = 20; + public static final byte versionMajor = 3; + public static final byte versionMinor = 3; + public static final String versionType = "Beta"; + public static final boolean testAndroid = false; //shorthand for whether or not this is running on android public static final boolean android = (Gdx.app.getType() == ApplicationType.Android) || testAndroid; diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 5adf2c7882..3faaa890a6 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -47,8 +47,8 @@ public class NetServer extends Module{ Net.handleServer(ConnectPacket.class, (id, packet) -> { - if(packet.version != Net.version){ - Net.kickConnection(id, packet.version > Net.version ? KickReason.serverOutdated : KickReason.clientOutdated); + if(packet.version != versionBuild){ + Net.kickConnection(id, packet.version > versionBuild ? KickReason.serverOutdated : KickReason.clientOutdated); return; } diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index e0957fa0f6..0d5fbf8ec5 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -25,8 +25,6 @@ import java.io.IOException; import static io.anuke.mindustry.Vars.*; public class Net{ - public static final int version = 20; - private static boolean server; private static boolean active; private static boolean clientLoaded; diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/io/anuke/mindustry/net/Packets.java index 646478c94f..2df3c05475 100644 --- a/core/src/io/anuke/mindustry/net/Packets.java +++ b/core/src/io/anuke/mindustry/net/Packets.java @@ -11,6 +11,8 @@ import io.anuke.ucore.entities.EntityGroup; import java.nio.ByteBuffer; +import static io.anuke.mindustry.Vars.versionBuild; + /**Class for storing all packets.*/ public class Packets { @@ -56,7 +58,7 @@ public class Packets { @Override public void write(ByteBuffer buffer) { - buffer.putInt(Net.version); + buffer.putInt(versionBuild); buffer.put((byte)name.getBytes().length); buffer.put(name.getBytes()); buffer.put(android ? (byte)1 : 0); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java index 94306dd868..f660fe6616 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.ui.fragments; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.core.GameState.State; import io.anuke.ucore.core.Core; @@ -17,7 +18,7 @@ public class BackgroundFragment implements Fragment { Draw.color(); TextureRegion back = Draw.region("background"); - float backscl = Unit.dp.scl(5f); + float backscl = Math.max(Gdx.graphics.getWidth() / (float)back.getRegionWidth() * 1.5f, Unit.dp.scl(5f)); Draw.alpha(0.7f); Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2 +240f, h/2 - back.getRegionHeight()*backscl/2 + 250f, diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 378b88470d..8cc02fed83 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -7,6 +7,7 @@ import io.anuke.mindustry.io.Platform; import io.anuke.mindustry.ui.MenuButton; import io.anuke.mindustry.ui.PressGroup; import io.anuke.ucore.scene.builders.imagebutton; +import io.anuke.ucore.scene.builders.label; import io.anuke.ucore.scene.builders.table; import static io.anuke.mindustry.Vars.*; @@ -93,5 +94,11 @@ public class MenuFragment implements Fragment{ new imagebutton("icon-info", 30f, ui.about::show).margin(14); } }}.end().visible(()->state.is(State.menu)); + + //version info + new table(){{ + abottom().aleft(); + new label(versionName + " " + versionMajor + "." + versionMinor + " " + versionType + " | build " + versionBuild); + }}.end(); } }