From cfedff4a086cc39560b56caea262d5917ff6e6c1 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 22 Feb 2022 15:13:51 +0100
Subject: [PATCH] Remove "join public server" button. (#6839)

:salute:
---
 Content.Client/MainMenu/MainMenu.cs                | 12 ------------
 Content.Client/MainMenu/UI/MainMenuControl.xaml    |  6 ------
 Content.Client/MainMenu/UI/MainMenuControl.xaml.cs |  5 -----
 3 files changed, 23 deletions(-)

diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index 11e0854307..1dd09c0c7f 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text.RegularExpressions;
 using Content.Client.EscapeMenu.UI;
 using Content.Client.MainMenu.UI;
@@ -8,9 +7,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
@@ -23,8 +19,6 @@ namespace Content.Client.MainMenu
     // Instantiated dynamically through the StateManager, Dependencies will be resolved.
     public sealed class MainScreen : Robust.Client.State.State
     {
-        private const string PublicServerAddress = "server.spacestation14.io";
-
         [Dependency] private readonly IBaseClient _client = default!;
         [Dependency] private readonly IClientNetManager _netManager = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
@@ -48,7 +42,6 @@ namespace Content.Client.MainMenu
             _mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;
             _mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed;
             _mainMenuControl.DirectConnectButton.OnPressed += DirectConnectButtonPressed;
-            _mainMenuControl.JoinPublicServerButton.OnPressed += JoinPublicServerButtonPressed;
             _mainMenuControl.AddressBox.OnTextEntered += AddressBoxEntered;
 
             _client.RunLevelChanged += RunLevelChanged;
@@ -82,11 +75,6 @@ namespace Content.Client.MainMenu
             TryConnect(input.Text);
         }
 
-        private void JoinPublicServerButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            TryConnect(PublicServerAddress);
-        }
-
         private void AddressBoxEntered(LineEdit.LineEditEventArgs args)
         {
             if (_isConnecting)
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index 12c82db00c..fe14bff37d 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -16,12 +16,6 @@
                           PlaceHolder="{Loc 'main-menu-username-text'}"
                           HorizontalExpand="True" />
             </BoxContainer>
-            <Button Name="JoinPublicServerButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-join-public-server-button'}"
-                    StyleIdentifier="mainMenu"
-                    TextAlign="Center" />
-            <Control MinSize="0 2" />
             <LineEdit Name="AddressBox"
                       Access="Public"
                       Text="localhost"
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
index 287571fbe3..5216547b92 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
@@ -31,11 +31,6 @@ namespace Content.Client.MainMenu.UI
                 var currentUserName = configMan.GetCVar(CVars.PlayerName);
                 UsernameBox.Text = currentUserName;
 
-#if !FULL_RELEASE
-                JoinPublicServerButton.Disabled = true;
-                JoinPublicServerButton.ToolTip = Loc.GetString("main-menu-join-public-server-button-tooltip");
-#endif
-
                 LayoutContainer.SetAnchorPreset(VersionLabel, LayoutContainer.LayoutPreset.BottomRight);
                 LayoutContainer.SetGrowHorizontal(VersionLabel, LayoutContainer.GrowDirection.Begin);
                 LayoutContainer.SetGrowVertical(VersionLabel, LayoutContainer.GrowDirection.Begin);