From 25af0c4302abc812a692e5316f7b84dbdb7ee5b3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 29 Aug 2019 19:07:00 -0400 Subject: [PATCH] Added bleeding edge info --- core/assets/bundles/bundle.properties | 1 + core/src/io/anuke/mindustry/core/NetServer.java | 2 +- core/src/io/anuke/mindustry/net/Packets.java | 2 +- core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java | 6 +----- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 69d7e93c2f..1d1e6a39fc 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -73,6 +73,7 @@ server.kicked.vote = You have been vote-kicked. Goodbye. server.kicked.clientOutdated = Outdated client! Update your game! server.kicked.serverOutdated = Outdated server! Ask the host to update! server.kicked.banned = You are banned on this server. +server.kicked.typeMismatch = This server is not compatible with your build type. server.kicked.recentKick = You have been kicked recently.\nWait before connecting again. server.kicked.nameInUse = There is someone with that name\nalready on this server. server.kicked.nameEmpty = Your chosen name is invalid. diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 1aff428c1e..5da463a344 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -112,7 +112,7 @@ public class NetServer implements ApplicationListener{ } if(packet.versionType == null || ((packet.version == -1 || !packet.versionType.equals(Version.type)) && Version.build != -1 && !admins.allowsCustomClients())){ - kick(id, KickReason.customClient); + kick(id, !Version.type.equals(packet.versionType) ? KickReason.typeMismatch : KickReason.customClient); return; } diff --git a/core/src/io/anuke/mindustry/net/Packets.java b/core/src/io/anuke/mindustry/net/Packets.java index 1891866494..12d9d75067 100644 --- a/core/src/io/anuke/mindustry/net/Packets.java +++ b/core/src/io/anuke/mindustry/net/Packets.java @@ -14,7 +14,7 @@ public class Packets{ public enum KickReason{ kick, clientOutdated, serverOutdated, banned, gameover(true), recentKick, - nameInUse, idInUse, nameEmpty, customClient, serverClose, vote; + nameInUse, idInUse, nameEmpty, customClient, serverClose, vote, typeMismatch; public final boolean quiet; diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index f2546a43f0..72bc97522b 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -60,17 +60,13 @@ public class MenuFragment extends Fragment{ } }); - //discord icon in top right - //parent.fill(c -> c.top().right().addButton("", "discord", ui.discord::show).size(84, 45) - //.visible(() -> state.is(State.menu))); - //info icon if(mobile){ parent.fill(c -> c.bottom().left().addButton("", "info", ui.about::show).size(84, 45)); parent.fill(c -> c.bottom().right().addButton("", "discord", ui.discord::show).size(84, 45)); } - String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : Version.modifier + " build " + Version.build); + String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : (Version.type.equals("official") ? Version.modifier : Version.type) + " build " + Version.build); parent.fill((x, y, w, h) -> { Texture logo = Core.assets.get("sprites/logo.png");