From 15623fbe5c9e8d67bb1e4b00ce991d8f8a499bfd Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 18 Jun 2020 19:23:42 -0400 Subject: [PATCH] Support for local server discovery on Steam --- core/src/mindustry/core/UI.java | 2 +- desktop/src/mindustry/desktop/steam/SNet.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index e93d394e05..70b2157d59 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -373,7 +373,7 @@ public class UI implements ApplicationListener, Loadable{ cont.add((text.startsWith("$") ? Core.bundle.get(text.substring(1)) : text) + (message == null ? "" : "\n[lightgray](" + message + ")")).colspan(2).wrap().growX().center().get().setAlignment(Align.center); cont.row(); - Collapser col = new Collapser(base -> base.pane(t -> t.margin(14f).add(Strings.neatError(exc)).color(Color.lightGray).left())); + Collapser col = new Collapser(base -> base.pane(t -> t.margin(14f).add(Strings.neatError(exc)).color(Color.lightGray).left()), true); cont.button("$details", Styles.togglet, col::toggle).size(180f, 50f).checked(b -> !col.isCollapsed()).fillX().right(); cont.button("$ok", this::hide).size(110, 50).fillX().left(); diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java index 0da2fcdfa9..e264932666 100644 --- a/desktop/src/mindustry/desktop/steam/SNet.java +++ b/desktop/src/mindustry/desktop/steam/SNet.java @@ -160,7 +160,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, smat.addRequestLobbyListResultCountFilter(32); smat.requestLobbyList(); lobbyCallback = callback; - lobbyDoneCallback = done; + + //after the steam lobby is done discovering, look for local network servers. + lobbyDoneCallback = () -> provider.discoverServers(callback, done); } @Override