Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added bleeding edge info

Browse Source
This commit is contained in:
Anuken
2019-08-29 19:07:00 -04:00
parent 97d1c49a3c
commit 25af0c4302
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -73,6 +73,7 @@ server.kicked.vote = You have been vote-kicked. Goodbye.
server.kicked.clientOutdated = Outdated client! Update your game! server.kicked.clientOutdated = Outdated client! Update your game!
server.kicked.serverOutdated = Outdated server! Ask the host to update! server.kicked.serverOutdated = Outdated server! Ask the host to update!
server.kicked.banned = You are banned on this server. 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.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.nameInUse = There is someone with that name\nalready on this server.
server.kicked.nameEmpty = Your chosen name is invalid. server.kicked.nameEmpty = Your chosen name is invalid.

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -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())){ 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; return;
} }

2
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -14,7 +14,7 @@ public class Packets{
public enum KickReason{ public enum KickReason{
kick, clientOutdated, serverOutdated, banned, gameover(true), recentKick, kick, clientOutdated, serverOutdated, banned, gameover(true), recentKick,
nameInUse, idInUse, nameEmpty, customClient, serverClose, vote; nameInUse, idInUse, nameEmpty, customClient, serverClose, vote, typeMismatch;
public final boolean quiet; public final boolean quiet;

6
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -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 //info icon
if(mobile){ if(mobile){
parent.fill(c -> c.bottom().left().addButton("", "info", ui.about::show).size(84, 45)); 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)); 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) -> { parent.fill((x, y, w, h) -> {
Texture logo = Core.assets.get("sprites/logo.png"); Texture logo = Core.assets.get("sprites/logo.png");