From 3545ed100c5213de3ce7a5f9c2f2ec33ce62aa85 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 12 Oct 2024 11:06:11 -0400 Subject: [PATCH] More descriptive address in use error --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/ui/dialogs/HostDialog.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2bc00ea32f..ad5ffd6797 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -305,8 +305,8 @@ connecting = [accent]Connecting... reconnecting = [accent]Reconnecting... connecting.data = [accent]Loading world data... server.port = Port: -server.addressinuse = Address already in use! server.invalidport = Invalid port number! +server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network! server.error = [scarlet]Error hosting server. save.new = New Save save.overwrite = Are you sure you want to overwrite\nthis save slot? diff --git a/core/src/mindustry/ui/dialogs/HostDialog.java b/core/src/mindustry/ui/dialogs/HostDialog.java index 6abba5784e..5f8f143498 100644 --- a/core/src/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/mindustry/ui/dialogs/HostDialog.java @@ -9,7 +9,7 @@ import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.ui.*; -import java.io.*; +import java.util.*; import static mindustry.Vars.*; @@ -90,8 +90,8 @@ public class HostDialog extends BaseDialog{ } - }catch(IOException e){ - ui.showException("@server.error", e); + }catch(Exception e){ + ui.showException(e.getMessage() != null && e.getMessage().toLowerCase(Locale.ROOT).contains("address already in use") ? "@server.error.addressinuse" : "@server.error", e); } ui.loadfrag.hide(); hide();