Skip to content

Commit

Permalink
Rebranding + Hub Changes (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
DEATHB4DEFEAT authored Dec 18, 2024
1 parent 9ab5567 commit 7c74a52
Show file tree
Hide file tree
Showing 37 changed files with 88 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ cmake-build*
publish_test
Dependencies
SS14.Launcher/FodyWeavers.xsd
!PublishFiles/Space Station 14 Launcher.app/Contents/Resources/bin/
!PublishFiles/SimpleStation14 Launcher.app/Contents/Resources/bin/
.direnv
2 changes: 1 addition & 1 deletion PublishFiles/SS14.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Encoding=UTF-8
Version=1.0
Type=Application
Exec=env ./SS14.Launcher %u
Name=Space Station 14
Name=SimpleStation14 Launcher
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleName</key>
<string>SS14L</string>
<key>CFBundleDisplayName</key>
<string>Space Station 14 Launcher</string>
<string>SimpleStation14 Launcher</string>
<key>CFBundleExecutable</key>
<string>SS14</string>
<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ BASEDIR=$(dirname "$0")
echo "$BASEDIR"
cd "$BASEDIR"

mkdir -p "$HOME/Library/Application Support/Space Station 14"
mkdir -p "$HOME/Library/Application Support/SimpleStation14"

export DOTNET_ROOT="$(pwd)/../Resources/dotnet"

exec ../Resources/bin/SS14.Launcher "$@" > "$HOME/Library/Application Support/Space Station 14/launcher.log"
exec ../Resources/bin/SS14.Launcher "$@" > "$HOME/Library/Application Support/SimpleStation14/launcher.log"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleName</key>
<string>SS14LO</string>
<key>CFBundleDisplayName</key>
<string>Space Station 14</string>
<string>SimpleStation14</string>
<key>CFBundleExecutable</key>
<string>SS14</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net45</TargetFramework>
<TargetName>Space Station 14 Launcher</TargetName>
<TargetName>SimpleStation14 Launcher</TargetName>
<ApplicationIcon>../SS14.Launcher/Assets/icon.ico</ApplicationIcon>
<LangVersion>11</LangVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher.FakeRobustToolbox/server/run
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ cp ../Robust.Client/bin/Debug/*/Robust.Client.dll ./
zip client.zip Robust.Client.dll
echo WARNING: Copying in "meme" engine version
echo You will still need to formally add the engine version into your launcher config!
cp client.zip ~/".local/share/Space Station 14/launcher/engines/meme.zip"
cp client.zip ~/".local/share/SimpleStation14/launcher/engines/meme.zip"
python3 -m http.server 1212

2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/cs/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ login-confirmation-button-cancel = Zrušit
# Strings for the "register confirmation" view on login
login-confirmation-busy = Přihlašování…
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 spouštěč
main-window-title = SimpleStation14 spouštěč
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/de/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ login-login-busy-logging-in = Anmelden…
# Strings for the "login" view on login
login-login-error-title = Anmeldung fehlgeschlagen
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the "connecting" menu that appears when connecting to a server.
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/el/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ login-forgot-success-title = Το email επαναφοράς έχει σταλε
# Strings for the "login" view on login
login-login-busy-logging-in = Γίνετε σύνδεση…
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Long region names for server tag filters (shown in tooltip)
region-asia-south-east = Νοτιοανατολική Ασία
# Long region names for server tag filters (shown in tooltip)
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/en-US/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ login-confirmation-busy = Logging in…
## Strings for the general main window layout of the launcher

main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
main-window-header-link-discord = Discord
main-window-header-link-website = Website
main-window-out-of-date = Launcher out of date
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/es/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ login-login-busy-logging-in = Accediendo…
# Strings for the "login" view on login
login-login-error-title = No se ha podido acceder
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/et/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ login-confirmation-button-cancel = Tühista
# Strings for the "register confirmation" view on login
login-confirmation-busy = Sisselogimine…
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Käivitusprogramm
main-window-title = SimpleStation14 Käivitusprogramm
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/fi/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ main-window-error-unknown = Tunematon virhe
# Strings for the general main window layout of the launcher
main-window-drag-drop-prompt = Pudota käynnistääksesi pelin
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Long region names for server tag filters (shown in tooltip)
region-middle-east = Lähi-Itä
# Long region names for server tag filters (shown in tooltip)
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/fr/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ login-confirmation-button-cancel = Annuler
# Strings for the "register confirmation" view on login
login-confirmation-busy = Connexion…
# Strings for the general main window layout of the launcher
main-window-title = Launcher de Space Station 14
main-window-title = Launcher de SimpleStation14
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/ja/text.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
main-window-title = Space Station 14 ランチャー
main-window-title = SimpleStation14 ランチャー
main-window-out-of-date-desc-steam =
このランチャーは古いものです。
Steamによるアップデートを許可してください。
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/nl/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ filters-18-no = Nee
# Strings for the server filters menu
filters-18-no-desc = Nee
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/pl/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ main-window-out-of-date-exit = Wyjście
# Strings for the general main window layout of the launcher
main-window-header-link-website = Strona internetowa
# Strings for the general main window layout of the launcher
main-window-title = Program uruchamiający Space Station 14
main-window-title = Program uruchamiający SimpleStation14
# Strings for the "register confirmation" view on login
login-confirmation-busy = Logowanie…
# Strings for the "login" view on login
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/pt_BR/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ login-login-busy-logging-in = Conectando…
# Strings for the "login" view on login
login-login-error-title = Falha ao conectar
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/ru/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ login-login-busy-logging-in = Вход…
# Strings for the "login" view on login
login-login-error-title = Не удалось войти
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-website = Веб-сайт
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/sv/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ login-login-busy-logging-in = Loggar in…
# Strings for the "login" view on login
login-login-error-title = Kunde inte logga in
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/tr/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ login-login-busy-logging-in = Giriş yapılıyor…
# Strings for the "login" view on login
login-login-error-title = Giriş yapılamıyor
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the general main window layout of the launcher
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Assets/Locale/uk/text.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ login-login-busy-logging-in = Вхід…
# Strings for the "login" view on login
login-login-error-title = Не вдалося увійти
# Strings for the general main window layout of the launcher
main-window-title = Space Station 14 Launcher
main-window-title = SimpleStation14 Launcher
# Strings for the general main window layout of the launcher
main-window-header-link-discord = Discord
# Strings for the "hub settings" dialog window.
Expand Down
Binary file modified SS14.Launcher/Assets/icon.ico
Binary file not shown.
Binary file modified SS14.Launcher/Assets/logo-long.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 11 additions & 5 deletions SS14.Launcher/ConfigConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,31 @@ public static class ConfigConstants
public const int LauncherCommandsRedialWaitTimeout = 1000;

public static readonly string AuthUrl = "https://auth.spacestation14.com/";
public static readonly Uri[] DefaultHubUrls = { new("https://hub.spacestation14.com/") };
public const string DiscordUrl = "https://discord.ss14.io/";
public static readonly Uri[] DefaultHubUrls =
{
new("https://cdn.spacestationmultiverse.com/hub/"),
new("https://web.networkgamez.com/"),
new("https://hub.singularity14.co.uk/"),
new("https://hub.spacestation14.com/"),
};
public const string DiscordUrl = "https://discord.gg/49KeKwXc8g/";
public const string AccountBaseUrl = "https://account.spacestation14.com/Identity/Account/";
public const string AccountManagementUrl = $"{AccountBaseUrl}Manage";
public const string AccountRegisterUrl = $"{AccountBaseUrl}Register";
public const string AccountResendConfirmationUrl = $"{AccountBaseUrl}ResendEmailConfirmation";
public const string WebsiteUrl = "https://spacestation14.com";
public const string WebsiteUrl = "https://simplestation.org";
public const string DownloadUrl = "https://spacestation14.com/about/nightlies/";
public const string NewsFeedUrl = "https://spacestation14.com/post/index.xml";
public const string TranslateUrl = "https://docs.spacestation14.com/en/general-development/contributing-translations.html";

private static readonly UrlFallbackSet RobustBuildsBaseUrl = new([
"https://robust-builds.cdn.spacestation14.com/",
"https://robust-builds.fallback.cdn.spacestation14.com/"
"https://robust-builds.fallback.cdn.spacestation14.com/",
]);

private static readonly UrlFallbackSet LauncherDataBaseUrl = new([
"https://launcher-data.cdn.spacestation14.com/",
"https://launcher-data.fallback.cdn.spacestation14.com/"
"https://launcher-data.fallback.cdn.spacestation14.com/",
]);

public static readonly UrlFallbackSet RobustBuildsManifest = RobustBuildsBaseUrl + "manifest.json";
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/LauncherPaths.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace SS14.Launcher;
/// </summary>
public static class LauncherPaths
{
public static readonly string AppDataPath = Path.Combine("Space Station 14", GetAppDataName());
public static readonly string AppDataPath = Path.Combine("SimpleStation14", GetAppDataName());
public static readonly string EngineInstallationsDirName = "engines";
public static readonly string EngineModulesDirName = "modules";
public static readonly string ServerContentDirName = "server content";
Expand Down
2 changes: 1 addition & 1 deletion SS14.Launcher/Models/Connector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
{
if (release)
{
var appPath = Path.Combine(basePath, "Space Station 14.app");
var appPath = Path.Combine(basePath, "SimpleStation14.app");
Log.Debug("Using app bundle: {appPath}", appPath);

Log.Debug("Clearing quarantine on loader.");
Expand Down
5 changes: 0 additions & 5 deletions SS14.Launcher/Models/ServerStatus/ServerListCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ public async void RefreshServerList(CancellationToken cancel)
var allSucceeded = true;

// Queue requests
foreach (var hub in ConfigConstants.DefaultHubUrls)
{
requests.Add((_hubApi.GetServers(hub, cancel), hub));
}

foreach (var hub in _dataManager.Hubs.OrderBy(h => h.Priority))
{
requests.Add((_hubApi.GetServers(hub.Address, cancel), hub.Address));
Expand Down
45 changes: 22 additions & 23 deletions SS14.Launcher/ViewModels/HubSettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,23 @@ public void Add()
HubList.Add(new HubViewModel("", this));
}

private void Reset()
public void Reset()
{
HubList.Clear();
HubList.AddRange(DefaultHubs.Select(h => new HubViewModel(h.AbsoluteUri, this)));
}

public void HardReset()
{
_dataManager.SetHubs(DefaultHubs.Select(h => new Hub(new Uri(h.OriginalString), 0)).ToList());
Reset();
}

public List<string> GetDupes()
{
return DefaultHubs
.Select(h => h.AbsoluteUri)
.Concat(HubList.Select(h => NormalizeHubUri(h.Address))).GroupBy(h => h)
return HubList
.Select(h => NormalizeHubUri(h.Address))
.GroupBy(h => h)
.Where(group => group.Count() > 1)
.Select(x => x.Key)
.ToList();
Expand Down Expand Up @@ -86,43 +93,35 @@ public static bool IsValidHubUri(string? url)
}
}

public class HubViewModel : ViewModelBase
public class HubViewModel(string address, HubSettingsViewModel parentVm, bool canRemove = true) : ViewModelBase
{
public string Address { get; set; }
private readonly HubSettingsViewModel _parentVm;
private bool IsNotDefault { get; }

public HubViewModel(string address, HubSettingsViewModel parentVm, bool isNotDefault = true)
{
Address = address;
_parentVm = parentVm;
IsNotDefault = isNotDefault;
}
public string Address { get; set; } = address;
private bool CanRemove { get; } = canRemove;

public void Remove()
{
_parentVm.HubList.Remove(this);
parentVm.HubList.Remove(this);
}

public void Up()
{
var i = _parentVm.HubList.IndexOf(this);
var i = parentVm.HubList.IndexOf(this);

if (i == 0)
return;

_parentVm.HubList[i] = _parentVm.HubList[i - 1];
_parentVm.HubList[i - 1] = this;
parentVm.HubList[i] = parentVm.HubList[i - 1];
parentVm.HubList[i - 1] = this;
}

public void Down()
{
var i = _parentVm.HubList.IndexOf(this);
var i = parentVm.HubList.IndexOf(this);

if (i == _parentVm.HubList.Count - 1)
if (i == parentVm.HubList.Count - 1)
return;

_parentVm.HubList[i] = _parentVm.HubList[i + 1];
_parentVm.HubList[i + 1] = this;
parentVm.HubList[i] = parentVm.HubList[i + 1];
parentVm.HubList[i + 1] = this;
}
}
14 changes: 3 additions & 11 deletions SS14.Launcher/Views/HubSettingsDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<DockPanel Height="30" Margin="0 4 0 0" DockPanel.Dock="Bottom" LastChildFill="False">
<Button DockPanel.Dock="Right" Name="DoneButton" Click="Done" Content="{loc:Loc hub-settings-button-done}" Classes="OpenLeft" />
<Button DockPanel.Dock="Right" Click="Cancel" Content="{loc:Loc hub-settings-button-cancel}" Classes="OpenBoth" />
<Button DockPanel.Dock="Right" Command="{Binding Reset}" Content="{loc:Loc hub-settings-button-reset}" Classes="OpenRight"
<Button DockPanel.Dock="Right" Click="Reset" Content="{loc:Loc hub-settings-button-reset}" Classes="OpenRight"
ToolTip.Tip="{loc:Loc hub-settings-button-reset-tooltip}" />
<Button DockPanel.Dock="Left" Command="{Binding Add}" Classes="OpenRight" Padding="0 9 10 9" ToolTip.Tip="{loc:Loc hub-settings-button-add-tooltip}">
<Path Fill="{DynamicResource ThemeForegroundBrush}"
Expand All @@ -63,14 +63,6 @@
</DockPanel>
<ScrollViewer DockPanel.Dock="Top">
<StackPanel Spacing="2">
<TextBlock DockPanel.Dock="Left" Text="{loc:Loc hub-settings-heading-default}" Classes="NanoHeadingSmall" />
<ItemsControl ItemsSource="{Binding DefaultHubs}" Classes="Spaced">
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBox Text="{Binding}" IsEnabled="False" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<TextBlock DockPanel.Dock="Left" Text="{loc:Loc hub-settings-heading-custom}" Classes="NanoHeadingSmall" />
<ItemsControl ItemsSource="{Binding HubList}" Name="Hubs" Classes="Spaced">
<ItemsControl.ItemTemplate>
Expand All @@ -82,7 +74,7 @@
Width="30"
Padding="8 0 0 0"
Command="{Binding Remove}"
IsEnabled="{Binding IsNotDefault}"
IsEnabled="{Binding CanRemove}"
ToolTip.Tip="{loc:Loc hub-settings-button-remove-tooltip}">
<Path Fill="{DynamicResource ThemeForegroundBrush}"
HorizontalAlignment="Center"
Expand Down Expand Up @@ -124,7 +116,7 @@
<TextBox Text="{Binding Address}"
PropertyChanged="HubTextChanged"
Watermark="https://example.com/hub/"
IsEnabled="{Binding IsNotDefault}" />
IsEnabled="{Binding CanRemove}" />
</DockPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
Expand Down
Loading

0 comments on commit 7c74a52

Please sign in to comment.