diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a61e7d4ec5..7a491a8f38 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -101,7 +101,7 @@ server.hostname = Host: {0} server.edit = Edit Server server.outdated = [crimson]Outdated Server![] server.outdated.client = [crimson]Outdated Client![] -server.version = [lightgray]Version: {0} {1} +server.version = [gray]v{0} {1} server.custombuild = [yellow]Custom Build confirmban = Are you sure you want to ban this player? confirmkick = Are you sure you want to kick this player? diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index 2ec5521f1c..0145f80be3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -97,7 +97,7 @@ public class JoinDialog extends FloatingDialog{ if(!buttons[0].childrenPressed()){ connect(server.ip, server.port); } - }).width(targetWidth()).height(155f).pad(4f).get(); + }).width(targetWidth()).height(130f).pad(4f).get(); button.getLabel().setWrap(true); @@ -190,14 +190,11 @@ public class JoinDialog extends FloatingDialog{ server.content.clear(); server.content.table(t -> { - t.add("[lightgray]" + host.name).width(targetWidth() - 10f).left().get().setEllipsis(true); + t.add("[lightgray]" + host.name + " " + versionString).width(targetWidth() - 10f).left().get().setEllipsis(true); t.row(); - t.add(versionString).left(); + t.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("players", host.players == 0 ? host.players : "[accent]" + host.players + "[lightgray]") : Core.bundle.format("players.single", "[accent]" + host.players + "[lightgray]"))).left(); t.row(); - t.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("players", host.players) : - Core.bundle.format("players.single", host.players))).left(); - t.row(); - t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + "[] / " + Core.bundle.format("save.wave", host.wave)).width(targetWidth() - 10f).left().get().setEllipsis(true); + t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + "[lightgray] / " + Core.bundle.format("save.wave", host.wave)).width(targetWidth() - 10f).left().get().setEllipsis(true); }).expand().left().bottom().padLeft(12f).padBottom(8); }