diff --git a/LICENSE.md b/LICENSE.md index 2ba409c..f52c45b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,8 +1,8 @@ # NCSA Open Source License -Copyright (c) 2022 SPT-AKI. All rights reserved. +Copyright (c) 2022 SPT. All rights reserved. -Developed by: SPT-AKI +Developed by: SPT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,7 +18,7 @@ this list of conditions and the following disclaimers. this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. -* Neither the names of SPT-AKI, nor the names of its contributors may be used +* Neither the names of SPT, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. diff --git a/README.md b/README.md index 3ddc257..4c5658d 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ Custom launcher for Escape From Tarkov to start the game in offline mode **Project** | **Function** ------------------ | -------------------------------------------- -Aki.Build | Build script -Aki.ByteBanger | Assembly-CSharp.dll patcher -Aki.Launcher | Launcher frontend -Aki.Launcher.Base | Launcher backend +SPT.Build | Build script +SPT.ByteBanger | Assembly-CSharp.dll patcher +SPT.Launcher | Launcher frontend +SPT.Launcher.Base | Launcher backend ## Privacy SPT is an open source project. Your commit credentials as author of a commit will be visible by anyone. Please make sure you understand this before submitting a PR. diff --git a/project/Aki.Launcher.Base/Models/Aki/AkiData.cs b/project/Aki.Launcher.Base/Models/Aki/AkiData.cs deleted file mode 100644 index 8ed6d3d..0000000 --- a/project/Aki.Launcher.Base/Models/Aki/AkiData.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Aki.Launcher.Models.Aki -{ - public class AkiData - { - public string version { get; set; } - } -} \ No newline at end of file diff --git a/project/Launcher.code-workspace b/project/Launcher.code-workspace index a041b0c..210a141 100644 --- a/project/Launcher.code-workspace +++ b/project/Launcher.code-workspace @@ -5,7 +5,7 @@ } ], "settings": { - "window.title": "SPT-AKI Launcher" + "window.title": "SPT Launcher" }, "extensions": { "recommendations": [ diff --git a/project/Launcher.sln b/project/Launcher.sln index e0aca11..e9b07d6 100644 --- a/project/Launcher.sln +++ b/project/Launcher.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aki.ByteBanger", "Aki.ByteBanger\Aki.ByteBanger.csproj", "{4B1F5C39-92C9-41DC-820C-E0EC3500E400}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SPT.ByteBanger", "SPT.ByteBanger\SPT.ByteBanger.csproj", "{4B1F5C39-92C9-41DC-820C-E0EC3500E400}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aki.Build", "Aki.Build\Aki.Build.csproj", "{A8A96141-291E-44B7-A074-4B240274083C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SPT.Build", "SPT.Build\SPT.Build.csproj", "{A8A96141-291E-44B7-A074-4B240274083C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aki.Launcher.Base", "Aki.Launcher.Base\Aki.Launcher.Base.csproj", "{1DD556B6-45FF-43B6-A1CA-2590F270304C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SPT.Launcher.Base", "SPT.Launcher.Base\SPT.Launcher.Base.csproj", "{1DD556B6-45FF-43B6-A1CA-2590F270304C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aki.Launcher", "Aki.Launcher\Aki.Launcher.csproj", "{C566CA5A-0B68-4F76-A980-8BC0FE701491}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SPT.Launcher", "SPT.Launcher\SPT.Launcher.csproj", "{C566CA5A-0B68-4F76-A980-8BC0FE701491}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/project/Aki.Build/Aki.Build.csproj b/project/SPT.Build/SPT.Build.csproj similarity index 89% rename from project/Aki.Build/Aki.Build.csproj rename to project/SPT.Build/SPT.Build.csproj index f78b6e4..9224836 100644 --- a/project/Aki.Build/Aki.Build.csproj +++ b/project/SPT.Build/SPT.Build.csproj @@ -6,7 +6,7 @@ - + diff --git a/project/Aki.ByteBanger/DiffResult.cs b/project/SPT.ByteBanger/DiffResult.cs similarity index 95% rename from project/Aki.ByteBanger/DiffResult.cs rename to project/SPT.ByteBanger/DiffResult.cs index 1ba7fcf..f902c60 100644 --- a/project/Aki.ByteBanger/DiffResult.cs +++ b/project/SPT.ByteBanger/DiffResult.cs @@ -1,4 +1,4 @@ -namespace Aki.ByteBanger +namespace SPT.ByteBanger { public class DiffResult { diff --git a/project/Aki.ByteBanger/Docs/bpf-layout.md b/project/SPT.ByteBanger/Docs/bpf-layout.md similarity index 100% rename from project/Aki.ByteBanger/Docs/bpf-layout.md rename to project/SPT.ByteBanger/Docs/bpf-layout.md diff --git a/project/Aki.ByteBanger/PatchInfo.cs b/project/SPT.ByteBanger/PatchInfo.cs similarity index 98% rename from project/Aki.ByteBanger/PatchInfo.cs rename to project/SPT.ByteBanger/PatchInfo.cs index 69b6d18..bcc2e3a 100644 --- a/project/Aki.ByteBanger/PatchInfo.cs +++ b/project/SPT.ByteBanger/PatchInfo.cs @@ -1,7 +1,7 @@ /* PatchInfo.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * Basuro */ @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Aki.ByteBanger +namespace SPT.ByteBanger { public class PatchInfo { diff --git a/project/Aki.ByteBanger/PatchItem.cs b/project/SPT.ByteBanger/PatchItem.cs similarity index 93% rename from project/Aki.ByteBanger/PatchItem.cs rename to project/SPT.ByteBanger/PatchItem.cs index 086517a..f09f17a 100644 --- a/project/Aki.ByteBanger/PatchItem.cs +++ b/project/SPT.ByteBanger/PatchItem.cs @@ -1,7 +1,7 @@ /* PatchItem.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * Basuro */ @@ -9,7 +9,7 @@ using System.IO; -namespace Aki.ByteBanger +namespace SPT.ByteBanger { public class PatchItem { diff --git a/project/Aki.ByteBanger/PatchResult.cs b/project/SPT.ByteBanger/PatchResult.cs similarity index 94% rename from project/Aki.ByteBanger/PatchResult.cs rename to project/SPT.ByteBanger/PatchResult.cs index 164b340..99ea252 100644 --- a/project/Aki.ByteBanger/PatchResult.cs +++ b/project/SPT.ByteBanger/PatchResult.cs @@ -1,4 +1,4 @@ -namespace Aki.ByteBanger +namespace SPT.ByteBanger { public class PatchResult { diff --git a/project/Aki.ByteBanger/PatchUtil.cs b/project/SPT.ByteBanger/PatchUtil.cs similarity index 98% rename from project/Aki.ByteBanger/PatchUtil.cs rename to project/SPT.ByteBanger/PatchUtil.cs index e032cf1..0fd5ba2 100644 --- a/project/Aki.ByteBanger/PatchUtil.cs +++ b/project/SPT.ByteBanger/PatchUtil.cs @@ -1,7 +1,7 @@ /* BB.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * Basuro */ @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.IO; using System.Security.Cryptography; -namespace Aki.ByteBanger +namespace SPT.ByteBanger { public static class PatchUtil { diff --git a/project/Aki.ByteBanger/Aki.ByteBanger.csproj b/project/SPT.ByteBanger/SPT.ByteBanger.csproj similarity index 100% rename from project/Aki.ByteBanger/Aki.ByteBanger.csproj rename to project/SPT.ByteBanger/SPT.ByteBanger.csproj diff --git a/project/Aki.Launcher.Base/Controllers/AccountManager.cs b/project/SPT.Launcher.Base/Controllers/AccountManager.cs similarity index 97% rename from project/Aki.Launcher.Base/Controllers/AccountManager.cs rename to project/SPT.Launcher.Base/Controllers/AccountManager.cs index 6e302a4..4b759fc 100644 --- a/project/Aki.Launcher.Base/Controllers/AccountManager.cs +++ b/project/SPT.Launcher.Base/Controllers/AccountManager.cs @@ -1,22 +1,21 @@ /* AccountManager.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord - * Merijn Hendriks */ using System; -using Aki.Launcher.Helpers; -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Aki; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Helpers; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.SPT; +using SPT.Launcher.Models.Launcher; using System.Threading.Tasks; -using Aki.Launcher.Controllers; +using SPT.Launcher.Controllers; -namespace Aki.Launcher +namespace SPT.Launcher { public enum AccountStatus { diff --git a/project/Aki.Launcher.Base/Controllers/GameStarter.cs b/project/SPT.Launcher.Base/Controllers/GameStarter.cs similarity index 94% rename from project/Aki.Launcher.Base/Controllers/GameStarter.cs rename to project/SPT.Launcher.Base/Controllers/GameStarter.cs index de50288..3f1c183 100644 --- a/project/Aki.Launcher.Base/Controllers/GameStarter.cs +++ b/project/SPT.Launcher.Base/Controllers/GameStarter.cs @@ -1,28 +1,27 @@ /* GameStarter.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord * reider123 - * Merijn Hendriks */ -using Aki.Launcher.Helpers; -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Helpers; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.Launcher; using Microsoft.Win32; using System; using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; -using Aki.Launcher.Controllers; -using Aki.Launcher.Interfaces; +using SPT.Launcher.Controllers; +using SPT.Launcher.Interfaces; using System.Runtime.InteropServices; -namespace Aki.Launcher +namespace SPT.Launcher { public class GameStarter { @@ -147,12 +146,9 @@ namespace Aki.Launcher { var files = new FileInfo[] { - // aki files - new FileInfo(Path.Combine(_originalGamePath, @"Aki.Launcher.exe")), - new FileInfo(Path.Combine(_originalGamePath, @"Aki.Server.exe")), - new FileInfo(Path.Combine(_originalGamePath, @"EscapeFromTarkov_Data\Managed\Aki.Build.dll")), - new FileInfo(Path.Combine(_originalGamePath, @"EscapeFromTarkov_Data\Managed\Aki.Common.dll")), - new FileInfo(Path.Combine(_originalGamePath, @"EscapeFromTarkov_Data\Managed\Aki.Reflection.dll")), + // SPT files + new FileInfo(Path.Combine(_originalGamePath, @"SPT.Launcher.exe")), + new FileInfo(Path.Combine(_originalGamePath, @"SPT.Server.exe")), // bepinex files new FileInfo(Path.Combine(_originalGamePath, @"doorstep_config.ini")), @@ -167,7 +163,7 @@ namespace Aki.Launcher }; var directories = new DirectoryInfo[] { - new DirectoryInfo(Path.Combine(_originalGamePath, @"Aki_Data")), + new DirectoryInfo(Path.Combine(_originalGamePath, @"SPT_Data")), new DirectoryInfo(Path.Combine(_originalGamePath, @"BepInEx")) }; diff --git a/project/Aki.Launcher.Base/Controllers/LogManager.cs b/project/SPT.Launcher.Base/Controllers/LogManager.cs similarity index 94% rename from project/Aki.Launcher.Base/Controllers/LogManager.cs rename to project/SPT.Launcher.Base/Controllers/LogManager.cs index 9b9c5e5..34dc624 100644 --- a/project/Aki.Launcher.Base/Controllers/LogManager.cs +++ b/project/SPT.Launcher.Base/Controllers/LogManager.cs @@ -1,16 +1,15 @@ /* LogManager.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ using System; using System.IO; -namespace Aki.Launcher.Controllers +namespace SPT.Launcher.Controllers { /// /// LogManager diff --git a/project/Aki.Launcher.Base/Controllers/RequestHandler.cs b/project/SPT.Launcher.Base/Controllers/RequestHandler.cs similarity index 96% rename from project/Aki.Launcher.Base/Controllers/RequestHandler.cs rename to project/SPT.Launcher.Base/Controllers/RequestHandler.cs index 3aef72d..e67a3f5 100644 --- a/project/Aki.Launcher.Base/Controllers/RequestHandler.cs +++ b/project/SPT.Launcher.Base/Controllers/RequestHandler.cs @@ -1,15 +1,14 @@ /* RequestHandler.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -using Aki.Launcher.MiniCommon; +using SPT.Launcher.MiniCommon; -namespace Aki.Launcher +namespace SPT.Launcher { public static class RequestHandler { diff --git a/project/Aki.Launcher.Base/Controllers/ServerManager.cs b/project/SPT.Launcher.Base/Controllers/ServerManager.cs similarity index 82% rename from project/Aki.Launcher.Base/Controllers/ServerManager.cs rename to project/SPT.Launcher.Base/Controllers/ServerManager.cs index d424d26..5441b21 100644 --- a/project/Aki.Launcher.Base/Controllers/ServerManager.cs +++ b/project/SPT.Launcher.Base/Controllers/ServerManager.cs @@ -1,18 +1,17 @@ /* ServerManager.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Aki; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.SPT; using System.Collections.Generic; using System.Threading.Tasks; -namespace Aki.Launcher +namespace SPT.Launcher { public static class ServerManager { @@ -64,31 +63,31 @@ namespace Aki.Launcher } } - public static Dictionary GetLoadedServerMods() + public static Dictionary GetLoadedServerMods() { try { string json = RequestHandler.RequestLoadedServerMods(); - return Json.Deserialize>(json); + return Json.Deserialize>(json); } catch { - return new Dictionary(); + return new Dictionary(); } } - public static AkiProfileModInfo[] GetProfileMods() + public static SPTProfileModInfo[] GetProfileMods() { try { string json = RequestHandler.RequestProfileMods(); - return Json.Deserialize(json); + return Json.Deserialize(json); } catch { - return new AkiProfileModInfo[] { }; + return new SPTProfileModInfo[] { }; } } diff --git a/project/Aki.Launcher.Base/Extensions/DictionaryExtensions.cs b/project/SPT.Launcher.Base/Extensions/DictionaryExtensions.cs similarity index 95% rename from project/Aki.Launcher.Base/Extensions/DictionaryExtensions.cs rename to project/SPT.Launcher.Base/Extensions/DictionaryExtensions.cs index bb6fb8f..67ecdd7 100644 --- a/project/Aki.Launcher.Base/Extensions/DictionaryExtensions.cs +++ b/project/SPT.Launcher.Base/Extensions/DictionaryExtensions.cs @@ -1,7 +1,7 @@ /* DictionaryExtension.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; -namespace Aki.Launcher.Extensions +namespace SPT.Launcher.Extensions { public static class DictionaryExtensions { diff --git a/project/Aki.Launcher.Base/Helpers/FilePatcher.cs b/project/SPT.Launcher.Base/Helpers/FilePatcher.cs similarity index 95% rename from project/Aki.Launcher.Base/Helpers/FilePatcher.cs rename to project/SPT.Launcher.Base/Helpers/FilePatcher.cs index 34650c9..c175b7a 100644 --- a/project/Aki.Launcher.Base/Helpers/FilePatcher.cs +++ b/project/SPT.Launcher.Base/Helpers/FilePatcher.cs @@ -1,20 +1,19 @@ /* FilePatcher.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks * waffle.lord */ using System; using System.IO; -using Aki.ByteBanger; -using Aki.Launcher.Controllers; -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Launcher; +using SPT.ByteBanger; +using SPT.Launcher.Controllers; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.Launcher; -namespace Aki.Launcher.Helpers +namespace SPT.Launcher.Helpers { public static class FilePatcher { diff --git a/project/Aki.Launcher.Base/Helpers/LauncherSettingsProvider.cs b/project/SPT.Launcher.Base/Helpers/LauncherSettingsProvider.cs similarity index 94% rename from project/Aki.Launcher.Base/Helpers/LauncherSettingsProvider.cs rename to project/SPT.Launcher.Base/Helpers/LauncherSettingsProvider.cs index 1c51e8e..e487448 100644 --- a/project/Aki.Launcher.Base/Helpers/LauncherSettingsProvider.cs +++ b/project/SPT.Launcher.Base/Helpers/LauncherSettingsProvider.cs @@ -1,22 +1,21 @@ /* LauncherSettingsProvider.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord - * Merijn Hendriks */ -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.Launcher; using Newtonsoft.Json; using System; using System.ComponentModel; using System.IO; -using Aki.Launcher.Controllers; +using SPT.Launcher.Controllers; -namespace Aki.Launcher.Helpers +namespace SPT.Launcher.Helpers { public static class LauncherSettingsProvider { @@ -150,7 +149,7 @@ namespace Aki.Launcher.Helpers UseAutoLogin = true; GamePath = Environment.CurrentDirectory; - Server = new ServerSetting { Name = "SPT-AKI", Url = "http://127.0.0.1:6969" }; + Server = new ServerSetting { Name = "SPT", Url = "http://127.0.0.1:6969" }; SaveSettings(); } diff --git a/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs b/project/SPT.Launcher.Base/Helpers/LocalizationProvider.cs similarity index 99% rename from project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs rename to project/SPT.Launcher.Base/Helpers/LocalizationProvider.cs index f469137..20cd41f 100644 --- a/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs +++ b/project/SPT.Launcher.Base/Helpers/LocalizationProvider.cs @@ -1,14 +1,14 @@ /* LocalizationProvider.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.Launcher.Extensions; -using Aki.Launcher.MiniCommon; +using SPT.Launcher.Extensions; +using SPT.Launcher.MiniCommon; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -16,13 +16,13 @@ using System.ComponentModel; using System.Globalization; using System.IO; using System.Linq; -using Aki.Launcher.Controllers; +using SPT.Launcher.Controllers; -namespace Aki.Launcher.Helpers +namespace SPT.Launcher.Helpers { public static class LocalizationProvider { - public static string DefaultLocaleFolderPath = Path.Join(Environment.CurrentDirectory, "Aki_Data", "Launcher", "Locales"); + public static string DefaultLocaleFolderPath = Path.Join(Environment.CurrentDirectory, "SPT_Data", "Launcher", "Locales"); public static Dictionary LocaleNameDictionary = GetLocaleDictionary("native_name"); @@ -118,7 +118,7 @@ namespace Aki.Launcher.Helpers englishLocale.account = "Account"; englishLocale.edit_account = "Edit Account"; englishLocale.start_game = "Start Game"; - englishLocale.installed_in_live_game_warning = "Aki shouldn't be installed into the live game directory. Please install Aki into a copy of the game directory elsewhere on your computer."; + englishLocale.installed_in_live_game_warning = "SPT shouldn't be installed into the live game directory. Please install SPT into a copy of the game directory elsewhere on your computer."; englishLocale.no_official_game_warning = "Escape From Tarkov isn't installed on your computer. Please buy a copy of the game and support the developers!"; englishLocale.eft_exe_not_found_warning = "EscapeFromTarkov.exe not found at game path. Please check that the directory is correct."; englishLocale.account_exist = "Account already exists"; @@ -160,7 +160,7 @@ namespace Aki.Launcher.Helpers englishLocale.level = "Level"; englishLocale.game_path = "Game Path"; englishLocale.patching = "Patching"; - englishLocale.file_mismatch_dialog_message = "The input file hash doesn't match the expected hash. You may be using the wrong version\nof AKI for your client files.\n\nDo you want to continue?"; + englishLocale.file_mismatch_dialog_message = "The input file hash doesn't match the expected hash. You may be using the wrong version\nof SPT for your client files.\n\nDo you want to continue?"; englishLocale.yes = "Yes"; englishLocale.no = "No"; englishLocale.open_folder = "Open Folder"; @@ -169,7 +169,7 @@ namespace Aki.Launcher.Helpers englishLocale.next_level_in = "Next level in"; englishLocale.copied = "Copied"; englishLocale.no_profile_data = "No profile data"; - englishLocale.profile_version_mismath = "Your profile was made using a different version of aki and may have issues"; + englishLocale.profile_version_mismath = "Your profile was made using a different version of SPT and may have issues"; englishLocale.profile_removed = "Profile removed"; englishLocale.profile_removal_failed = "Failed to remove profile"; englishLocale.profile_remove_question_format_1 = "Permanently remove profile '{0}'?"; diff --git a/project/Aki.Launcher.Base/Helpers/ProgressReportingPatchRunner.cs b/project/SPT.Launcher.Base/Helpers/ProgressReportingPatchRunner.cs similarity index 90% rename from project/Aki.Launcher.Base/Helpers/ProgressReportingPatchRunner.cs rename to project/SPT.Launcher.Base/Helpers/ProgressReportingPatchRunner.cs index ce08837..e1a3b54 100644 --- a/project/Aki.Launcher.Base/Helpers/ProgressReportingPatchRunner.cs +++ b/project/SPT.Launcher.Base/Helpers/ProgressReportingPatchRunner.cs @@ -1,18 +1,18 @@ /* ProgressReportingPatchRunner.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.Launcher; using System.Collections.Generic; using System.Threading.Tasks; -using Aki.ByteBanger; +using SPT.ByteBanger; -namespace Aki.Launcher.Helpers +namespace SPT.Launcher.Helpers { public class ProgressReportingPatchRunner { @@ -64,7 +64,7 @@ namespace Aki.Launcher.Helpers private string[] GetCorePatches() { - return VFS.GetDirectories(VFS.Combine(GamePath, "Aki_Data/Launcher/Patches/")); + return VFS.GetDirectories(VFS.Combine(GamePath, "SPT_Data/Launcher/Patches/")); } public ProgressReportingPatchRunner(string GamePath, string[] Patches = null) diff --git a/project/Aki.Launcher.Base/Helpers/ValidationUtil.cs b/project/SPT.Launcher.Base/Helpers/ValidationUtil.cs similarity index 97% rename from project/Aki.Launcher.Base/Helpers/ValidationUtil.cs rename to project/SPT.Launcher.Base/Helpers/ValidationUtil.cs index 2f3d1ac..ba8a196 100644 --- a/project/Aki.Launcher.Base/Helpers/ValidationUtil.cs +++ b/project/SPT.Launcher.Base/Helpers/ValidationUtil.cs @@ -1,7 +1,7 @@ using Microsoft.Win32; using System.IO; -namespace Aki.Launcher.Helpers +namespace SPT.Launcher.Helpers { public static class ValidationUtil { diff --git a/project/Aki.Launcher.Base/Interfaces/IGameStarterFrontend.cs b/project/SPT.Launcher.Base/Interfaces/IGameStarterFrontend.cs similarity index 73% rename from project/Aki.Launcher.Base/Interfaces/IGameStarterFrontend.cs rename to project/SPT.Launcher.Base/Interfaces/IGameStarterFrontend.cs index 19e2c74..8958b77 100644 --- a/project/Aki.Launcher.Base/Interfaces/IGameStarterFrontend.cs +++ b/project/SPT.Launcher.Base/Interfaces/IGameStarterFrontend.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Models.Launcher; -namespace Aki.Launcher.Interfaces +namespace SPT.Launcher.Interfaces { public interface IGameStarterFrontend { diff --git a/project/Aki.Launcher.Base/Interfaces/IUpdateProgress.cs b/project/SPT.Launcher.Base/Interfaces/IUpdateProgress.cs similarity index 88% rename from project/Aki.Launcher.Base/Interfaces/IUpdateProgress.cs rename to project/SPT.Launcher.Base/Interfaces/IUpdateProgress.cs index a203bea..0c94e13 100644 --- a/project/Aki.Launcher.Base/Interfaces/IUpdateProgress.cs +++ b/project/SPT.Launcher.Base/Interfaces/IUpdateProgress.cs @@ -1,15 +1,15 @@ /* IUpdateProgress * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Models.Launcher; using System; -namespace Aki.Launcher.Interfaces +namespace SPT.Launcher.Interfaces { public interface IUpdateProgress { diff --git a/project/Aki.Launcher.Base/MiniCommon/ImageRequest.cs b/project/SPT.Launcher.Base/MiniCommon/ImageRequest.cs similarity index 91% rename from project/Aki.Launcher.Base/MiniCommon/ImageRequest.cs rename to project/SPT.Launcher.Base/MiniCommon/ImageRequest.cs index bfafbb9..ea2f3f5 100644 --- a/project/Aki.Launcher.Base/MiniCommon/ImageRequest.cs +++ b/project/SPT.Launcher.Base/MiniCommon/ImageRequest.cs @@ -1,23 +1,23 @@ /* ImageRequest.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.Launcher.Controllers; -using Aki.Launcher.Helpers; +using SPT.Launcher.Controllers; +using SPT.Launcher.Helpers; using System; using System.Collections.Generic; using System.IO; -namespace Aki.Launcher.MiniCommon +namespace SPT.Launcher.MiniCommon { public static class ImageRequest { - public static string ImageCacheFolder = Path.Join(LauncherSettingsProvider.Instance.GamePath, "Aki_Data", "Launcher", "Image_Cache"); + public static string ImageCacheFolder = Path.Join(LauncherSettingsProvider.Instance.GamePath, "SPT_Data", "Launcher", "Image_Cache"); private static List CachedRoutes = new List(); diff --git a/project/Aki.Launcher.Base/MiniCommon/Json.cs b/project/SPT.Launcher.Base/MiniCommon/Json.cs similarity index 97% rename from project/Aki.Launcher.Base/MiniCommon/Json.cs rename to project/SPT.Launcher.Base/MiniCommon/Json.cs index ac7da63..b7329f4 100644 --- a/project/Aki.Launcher.Base/MiniCommon/Json.cs +++ b/project/SPT.Launcher.Base/MiniCommon/Json.cs @@ -1,10 +1,9 @@ /* Json.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord - * Merijn Hendriks */ @@ -13,7 +12,7 @@ using Newtonsoft.Json.Linq; using System.IO; using System.Linq; -namespace Aki.Launcher.MiniCommon +namespace SPT.Launcher.MiniCommon { public static class Json { diff --git a/project/Aki.Launcher.Base/MiniCommon/ProcessMonitor.cs b/project/SPT.Launcher.Base/MiniCommon/ProcessMonitor.cs similarity index 97% rename from project/Aki.Launcher.Base/MiniCommon/ProcessMonitor.cs rename to project/SPT.Launcher.Base/MiniCommon/ProcessMonitor.cs index 477c7cf..e469eb5 100644 --- a/project/Aki.Launcher.Base/MiniCommon/ProcessMonitor.cs +++ b/project/SPT.Launcher.Base/MiniCommon/ProcessMonitor.cs @@ -11,7 +11,7 @@ using System; using System.Diagnostics; using System.Timers; -namespace Aki.Launcher.MiniCommon +namespace SPT.Launcher.MiniCommon { public class ProcessMonitor { diff --git a/project/Aki.Launcher.Base/MiniCommon/Request.cs b/project/SPT.Launcher.Base/MiniCommon/Request.cs similarity index 98% rename from project/Aki.Launcher.Base/MiniCommon/Request.cs rename to project/SPT.Launcher.Base/MiniCommon/Request.cs index 625efe7..c44aabc 100644 --- a/project/Aki.Launcher.Base/MiniCommon/Request.cs +++ b/project/SPT.Launcher.Base/MiniCommon/Request.cs @@ -13,7 +13,7 @@ using System.IO; using System.Net; using System.Text; -namespace Aki.Launcher.MiniCommon +namespace SPT.Launcher.MiniCommon { public class Request { diff --git a/project/Aki.Launcher.Base/MiniCommon/VFS.cs b/project/SPT.Launcher.Base/MiniCommon/VFS.cs similarity index 99% rename from project/Aki.Launcher.Base/MiniCommon/VFS.cs rename to project/SPT.Launcher.Base/MiniCommon/VFS.cs index 32b3fae..aa90166 100644 --- a/project/Aki.Launcher.Base/MiniCommon/VFS.cs +++ b/project/SPT.Launcher.Base/MiniCommon/VFS.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Aki.Launcher.MiniCommon +namespace SPT.Launcher.MiniCommon { public static class VFS { diff --git a/project/Aki.Launcher.Base/Models/EFT/ClientConfig.cs b/project/SPT.Launcher.Base/Models/EFT/ClientConfig.cs similarity index 86% rename from project/Aki.Launcher.Base/Models/EFT/ClientConfig.cs rename to project/SPT.Launcher.Base/Models/EFT/ClientConfig.cs index 6e87ad1..60deb78 100644 --- a/project/Aki.Launcher.Base/Models/EFT/ClientConfig.cs +++ b/project/SPT.Launcher.Base/Models/EFT/ClientConfig.cs @@ -1,13 +1,12 @@ /* ClientConfig.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher +namespace SPT.Launcher { public class ClientConfig { diff --git a/project/Aki.Launcher.Base/Models/EFT/LoginToken.cs b/project/SPT.Launcher.Base/Models/EFT/LoginToken.cs similarity index 86% rename from project/Aki.Launcher.Base/Models/EFT/LoginToken.cs rename to project/SPT.Launcher.Base/Models/EFT/LoginToken.cs index 7d7a435..96b52dd 100644 --- a/project/Aki.Launcher.Base/Models/EFT/LoginToken.cs +++ b/project/SPT.Launcher.Base/Models/EFT/LoginToken.cs @@ -1,13 +1,12 @@ /* LoginToken.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher +namespace SPT.Launcher { public struct LoginToken { diff --git a/project/Aki.Launcher.Base/Models/Launcher/ConnectServerModel.cs b/project/SPT.Launcher.Base/Models/Launcher/ConnectServerModel.cs similarity index 92% rename from project/Aki.Launcher.Base/Models/Launcher/ConnectServerModel.cs rename to project/SPT.Launcher.Base/Models/Launcher/ConnectServerModel.cs index 6837d96..f3cb936 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/ConnectServerModel.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/ConnectServerModel.cs @@ -1,15 +1,14 @@ /* ConnectServerModel.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class ConnectServerModel : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/EditionCollection.cs b/project/SPT.Launcher.Base/Models/Launcher/EditionCollection.cs similarity index 81% rename from project/Aki.Launcher.Base/Models/Launcher/EditionCollection.cs rename to project/SPT.Launcher.Base/Models/Launcher/EditionCollection.cs index 47ed619..3bbce27 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/EditionCollection.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/EditionCollection.cs @@ -1,17 +1,16 @@ /* EditionCollection.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -using Aki.Launcher.Models.Aki; +using SPT.Launcher.Models.SPT; using System.Collections.ObjectModel; using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class EditionCollection : INotifyPropertyChanged { @@ -42,8 +41,8 @@ namespace Aki.Launcher.Models.Launcher } } - private AkiEdition _SelectedEdition; - public AkiEdition SelectedEdition + private SPTEdition _SelectedEdition; + public SPTEdition SelectedEdition { get => _SelectedEdition; set @@ -56,7 +55,7 @@ namespace Aki.Launcher.Models.Launcher } } } - public ObservableCollection AvailableEditions { get; private set; } = new ObservableCollection(); + public ObservableCollection AvailableEditions { get; private set; } = new ObservableCollection(); public EditionCollection() { @@ -64,7 +63,7 @@ namespace Aki.Launcher.Models.Launcher foreach(var edition in ServerManager.SelectedServer.editions) { - AvailableEditions.Add(new AkiEdition(edition)); + AvailableEditions.Add(new SPTEdition(edition)); } } diff --git a/project/Aki.Launcher.Base/Models/Launcher/GameStarterResult.cs b/project/SPT.Launcher.Base/Models/Launcher/GameStarterResult.cs similarity index 93% rename from project/Aki.Launcher.Base/Models/Launcher/GameStarterResult.cs rename to project/SPT.Launcher.Base/Models/Launcher/GameStarterResult.cs index 912254a..2c6ac9b 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/GameStarterResult.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/GameStarterResult.cs @@ -1,15 +1,14 @@ /* GameStarterResult.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks * waffle.lord */ -using Aki.Launcher.Helpers; +using SPT.Launcher.Helpers; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class GameStarterResult { diff --git a/project/Aki.Launcher.Base/Models/Launcher/LauncherAction.cs b/project/SPT.Launcher.Base/Models/Launcher/LauncherAction.cs similarity index 75% rename from project/Aki.Launcher.Base/Models/Launcher/LauncherAction.cs rename to project/SPT.Launcher.Base/Models/Launcher/LauncherAction.cs index 0fef268..e82334a 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/LauncherAction.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/LauncherAction.cs @@ -1,13 +1,13 @@ /* LauncherAction.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public enum LauncherAction { diff --git a/project/Aki.Launcher.Base/Models/Launcher/LocaleCollection.cs b/project/SPT.Launcher.Base/Models/Launcher/LocaleCollection.cs similarity index 92% rename from project/Aki.Launcher.Base/Models/Launcher/LocaleCollection.cs rename to project/SPT.Launcher.Base/Models/Launcher/LocaleCollection.cs index 9a670bd..d8e47b5 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/LocaleCollection.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/LocaleCollection.cs @@ -1,18 +1,18 @@ /* LocaleCollection.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.Launcher.Helpers; +using SPT.Launcher.Helpers; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class LocaleCollection : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/LocalizedLauncherAction.cs b/project/SPT.Launcher.Base/Models/Launcher/LocalizedLauncherAction.cs similarity index 94% rename from project/Aki.Launcher.Base/Models/Launcher/LocalizedLauncherAction.cs rename to project/SPT.Launcher.Base/Models/Launcher/LocalizedLauncherAction.cs index 7aa3481..d41f025 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/LocalizedLauncherAction.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/LocalizedLauncherAction.cs @@ -1,9 +1,9 @@ -using Aki.Launcher.Helpers; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Helpers; +using SPT.Launcher.Models.Launcher; using System.ComponentModel; using System.Text.RegularExpressions; -namespace Aki.Launcher.Models +namespace SPT.Launcher.Models { public class LocalizedLauncherAction : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/LoginModel.cs b/project/SPT.Launcher.Base/Models/Launcher/LoginModel.cs similarity index 92% rename from project/Aki.Launcher.Base/Models/Launcher/LoginModel.cs rename to project/SPT.Launcher.Base/Models/Launcher/LoginModel.cs index 8bb41d7..d623652 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/LoginModel.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/LoginModel.cs @@ -1,15 +1,14 @@ /* LoginModel.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class LoginModel : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/MenuBarItem.cs b/project/SPT.Launcher.Base/Models/Launcher/MenuBarItem.cs similarity index 95% rename from project/Aki.Launcher.Base/Models/Launcher/MenuBarItem.cs rename to project/SPT.Launcher.Base/Models/Launcher/MenuBarItem.cs index ca26e2c..911d19a 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/MenuBarItem.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/MenuBarItem.cs @@ -1,7 +1,7 @@ /* MenuBarItem.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ @@ -10,7 +10,7 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class MenuBarItem : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/ModInfoCollection.cs b/project/SPT.Launcher.Base/Models/Launcher/ModInfoCollection.cs similarity index 89% rename from project/Aki.Launcher.Base/Models/Launcher/ModInfoCollection.cs rename to project/SPT.Launcher.Base/Models/Launcher/ModInfoCollection.cs index aa6b4c3..eaacfb1 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/ModInfoCollection.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/ModInfoCollection.cs @@ -1,9 +1,9 @@ -using Aki.Launcher.Models.Aki; +using SPT.Launcher.Models.SPT; using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class ModInfoCollection : INotifyPropertyChanged { @@ -49,8 +49,8 @@ namespace Aki.Launcher.Models.Launcher } } - public ObservableCollection ActiveMods { get; private set; } = new ObservableCollection(); - public ObservableCollection InactiveMods { get; private set; } = new ObservableCollection(); + public ObservableCollection ActiveMods { get; private set; } = new ObservableCollection(); + public ObservableCollection InactiveMods { get; private set; } = new ObservableCollection(); public ModInfoCollection() { diff --git a/project/Aki.Launcher.Base/Models/Launcher/Notifications/NotificationItem.cs b/project/SPT.Launcher.Base/Models/Launcher/Notifications/NotificationItem.cs similarity index 95% rename from project/Aki.Launcher.Base/Models/Launcher/Notifications/NotificationItem.cs rename to project/SPT.Launcher.Base/Models/Launcher/Notifications/NotificationItem.cs index 634e754..f42af1d 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/Notifications/NotificationItem.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/Notifications/NotificationItem.cs @@ -1,7 +1,7 @@ /* NotificationItem.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ @@ -10,7 +10,7 @@ using System; using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher.Notifications +namespace SPT.Launcher.Models.Launcher.Notifications { public class NotificationItem : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/Notifications/NotificationQueue.cs b/project/SPT.Launcher.Base/Models/Launcher/Notifications/NotificationQueue.cs similarity index 97% rename from project/Aki.Launcher.Base/Models/Launcher/Notifications/NotificationQueue.cs rename to project/SPT.Launcher.Base/Models/Launcher/Notifications/NotificationQueue.cs index ab4328b..7be7f79 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/Notifications/NotificationQueue.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/Notifications/NotificationQueue.cs @@ -1,20 +1,20 @@ /* NotificationQueue.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.Launcher.Helpers; +using SPT.Launcher.Helpers; using System; using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; using System.Timers; -namespace Aki.Launcher.Models.Launcher.Notifications +namespace SPT.Launcher.Models.Launcher.Notifications { public class NotificationQueue : INotifyPropertyChanged, IDisposable { diff --git a/project/Aki.Launcher.Base/Models/Launcher/PatchResultInfo.cs b/project/SPT.Launcher.Base/Models/Launcher/PatchResultInfo.cs similarity index 88% rename from project/Aki.Launcher.Base/Models/Launcher/PatchResultInfo.cs rename to project/SPT.Launcher.Base/Models/Launcher/PatchResultInfo.cs index 489a318..e04bc32 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/PatchResultInfo.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/PatchResultInfo.cs @@ -1,14 +1,14 @@ /* PatchResultInfo.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -using Aki.ByteBanger; +using SPT.ByteBanger; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class PatchResultInfo { diff --git a/project/Aki.Launcher.Base/Models/Launcher/ProfileInfo.cs b/project/SPT.Launcher.Base/Models/Launcher/ProfileInfo.cs similarity index 90% rename from project/Aki.Launcher.Base/Models/Launcher/ProfileInfo.cs rename to project/SPT.Launcher.Base/Models/Launcher/ProfileInfo.cs index 86de895..5627f7f 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/ProfileInfo.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/ProfileInfo.cs @@ -6,14 +6,14 @@ * waffle.lord */ -using Aki.Launcher.Helpers; -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models.Aki; +using SPT.Launcher.Helpers; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models.SPT; using System; using System.ComponentModel; using System.IO; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class ProfileInfo : INotifyPropertyChanged { @@ -173,16 +173,16 @@ namespace Aki.Launcher.Models.Launcher } } - private AkiData _Aki; - public AkiData Aki + private SPTData _SPT; + public SPTData SPT { - get => _Aki; + get => _SPT; set { - if(_Aki != value) + if(_SPT != value) { - _Aki = value; - RaisePropertyChanged(nameof(Aki)); + _SPT = value; + RaisePropertyChanged(nameof(SPT)); } } } @@ -201,11 +201,11 @@ namespace Aki.Launcher.Models.Launcher RemainingExp = PInfo.RemainingExp; XPLevelProgress = PInfo.XPLevelProgress; - Aki = PInfo.Aki; + SPT = PInfo.SPT; } /// - /// Checks if the aki versions are compatible (non-major changes) + /// Checks if the SPT versions are compatible (non-major changes) /// /// /// @@ -214,8 +214,8 @@ namespace Aki.Launcher.Models.Launcher { if (ExpectedVersion == "") return false; - AkiVersion v1 = new AkiVersion(CurrentVersion); - AkiVersion v2 = new AkiVersion(ExpectedVersion); + SPTVersion v1 = new SPTVersion(CurrentVersion); + SPTVersion v2 = new SPTVersion(ExpectedVersion); // check 'X'.x.x if (v1.Major != v2.Major) return false; @@ -233,11 +233,11 @@ namespace Aki.Launcher.Models.Launcher Nickname = serverProfileInfo.nickname; Side = serverProfileInfo.side; - Aki = serverProfileInfo.akiData; + SPT = serverProfileInfo.SPTData; - if (Aki != null) + if (SPT != null) { - VersionMismatch = !CompareVersions(Aki.version, ServerManager.GetVersion()); + VersionMismatch = !CompareVersions(SPT.version, ServerManager.GetVersion()); } SideImage = Path.Combine(ImageRequest.ImageCacheFolder, $"side_{Side.ToLower()}.png"); diff --git a/project/Aki.Launcher.Base/Models/Launcher/ProgressInfo.cs b/project/SPT.Launcher.Base/Models/Launcher/ProgressInfo.cs similarity index 85% rename from project/Aki.Launcher.Base/Models/Launcher/ProgressInfo.cs rename to project/SPT.Launcher.Base/Models/Launcher/ProgressInfo.cs index 4a238ff..aaf10af 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/ProgressInfo.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/ProgressInfo.cs @@ -1,12 +1,12 @@ /* ProgressInfo.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class ProgressInfo { diff --git a/project/Aki.Launcher.Base/Models/Launcher/RegisterModel.cs b/project/SPT.Launcher.Base/Models/Launcher/RegisterModel.cs similarity index 93% rename from project/Aki.Launcher.Base/Models/Launcher/RegisterModel.cs rename to project/SPT.Launcher.Base/Models/Launcher/RegisterModel.cs index 4482b1e..7b07a2d 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/RegisterModel.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/RegisterModel.cs @@ -1,15 +1,14 @@ /* RegisterModel.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class RegisterModel : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/ServerSetting.cs b/project/SPT.Launcher.Base/Models/Launcher/ServerSetting.cs similarity index 92% rename from project/Aki.Launcher.Base/Models/Launcher/ServerSetting.cs rename to project/SPT.Launcher.Base/Models/Launcher/ServerSetting.cs index 31cf094..1db1f61 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/ServerSetting.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/ServerSetting.cs @@ -1,16 +1,15 @@ /* ServerSetting.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord - * Merijn Hendriks */ using System.ComponentModel; -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class ServerSetting : INotifyPropertyChanged { diff --git a/project/Aki.Launcher.Base/Models/Launcher/WipeProfileModel.cs b/project/SPT.Launcher.Base/Models/Launcher/WipeProfileModel.cs similarity index 71% rename from project/Aki.Launcher.Base/Models/Launcher/WipeProfileModel.cs rename to project/SPT.Launcher.Base/Models/Launcher/WipeProfileModel.cs index e8f7dba..2bc7b18 100644 --- a/project/Aki.Launcher.Base/Models/Launcher/WipeProfileModel.cs +++ b/project/SPT.Launcher.Base/Models/Launcher/WipeProfileModel.cs @@ -1,12 +1,11 @@ /* WipeProfileModel.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher.Models.Launcher +namespace SPT.Launcher.Models.Launcher { public class WipeProfileModel { diff --git a/project/Aki.Launcher.Base/Models/Aki/AccountInfo.cs b/project/SPT.Launcher.Base/Models/SPT/AccountInfo.cs similarity index 87% rename from project/Aki.Launcher.Base/Models/Aki/AccountInfo.cs rename to project/SPT.Launcher.Base/Models/SPT/AccountInfo.cs index 82b119e..0a9d9a7 100644 --- a/project/Aki.Launcher.Base/Models/Aki/AccountInfo.cs +++ b/project/SPT.Launcher.Base/Models/SPT/AccountInfo.cs @@ -1,13 +1,12 @@ /* AccountInfo.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher +namespace SPT.Launcher { public class AccountInfo { diff --git a/project/Aki.Launcher.Base/Models/Aki/ChangeRequestData.cs b/project/SPT.Launcher.Base/Models/SPT/ChangeRequestData.cs similarity index 85% rename from project/Aki.Launcher.Base/Models/Aki/ChangeRequestData.cs rename to project/SPT.Launcher.Base/Models/SPT/ChangeRequestData.cs index 7a1f0fe..39f4224 100644 --- a/project/Aki.Launcher.Base/Models/Aki/ChangeRequestData.cs +++ b/project/SPT.Launcher.Base/Models/SPT/ChangeRequestData.cs @@ -1,13 +1,12 @@ /* ChangeRequestData.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher +namespace SPT.Launcher { public struct ChangeRequestData { diff --git a/project/Aki.Launcher.Base/Models/Aki/DevDependencies.cs b/project/SPT.Launcher.Base/Models/SPT/DevDependencies.cs similarity index 96% rename from project/Aki.Launcher.Base/Models/Aki/DevDependencies.cs rename to project/SPT.Launcher.Base/Models/SPT/DevDependencies.cs index 72d1ef9..846abe8 100644 --- a/project/Aki.Launcher.Base/Models/Aki/DevDependencies.cs +++ b/project/SPT.Launcher.Base/Models/SPT/DevDependencies.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { public class DevDependencies { diff --git a/project/Aki.Launcher.Base/Models/Aki/LoginRequestData.cs b/project/SPT.Launcher.Base/Models/SPT/LoginRequestData.cs similarity index 83% rename from project/Aki.Launcher.Base/Models/Aki/LoginRequestData.cs rename to project/SPT.Launcher.Base/Models/SPT/LoginRequestData.cs index 7132a90..16c4b8a 100644 --- a/project/Aki.Launcher.Base/Models/Aki/LoginRequestData.cs +++ b/project/SPT.Launcher.Base/Models/SPT/LoginRequestData.cs @@ -1,13 +1,12 @@ /* LoginRequestData.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher +namespace SPT.Launcher { public struct LoginRequestData { diff --git a/project/Aki.Launcher.Base/Models/Aki/RegisterRequestData.cs b/project/SPT.Launcher.Base/Models/SPT/RegisterRequestData.cs similarity index 86% rename from project/Aki.Launcher.Base/Models/Aki/RegisterRequestData.cs rename to project/SPT.Launcher.Base/Models/SPT/RegisterRequestData.cs index f0a5abf..8939386 100644 --- a/project/Aki.Launcher.Base/Models/Aki/RegisterRequestData.cs +++ b/project/SPT.Launcher.Base/Models/SPT/RegisterRequestData.cs @@ -1,13 +1,12 @@ /* RegisterRequestData.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ -namespace Aki.Launcher +namespace SPT.Launcher { public struct RegisterRequestData { diff --git a/project/SPT.Launcher.Base/Models/SPT/SPTData.cs b/project/SPT.Launcher.Base/Models/SPT/SPTData.cs new file mode 100644 index 0000000..77fb30e --- /dev/null +++ b/project/SPT.Launcher.Base/Models/SPT/SPTData.cs @@ -0,0 +1,7 @@ +namespace SPT.Launcher.Models.SPT +{ + public class SPTData + { + public string version { get; set; } + } +} \ No newline at end of file diff --git a/project/Aki.Launcher.Base/Models/Aki/AkiEdition.cs b/project/SPT.Launcher.Base/Models/SPT/SPTEdition.cs similarity index 69% rename from project/Aki.Launcher.Base/Models/Aki/AkiEdition.cs rename to project/SPT.Launcher.Base/Models/SPT/SPTEdition.cs index 4a9662d..94c5d44 100644 --- a/project/Aki.Launcher.Base/Models/Aki/AkiEdition.cs +++ b/project/SPT.Launcher.Base/Models/SPT/SPTEdition.cs @@ -1,13 +1,13 @@ -using Aki.Launcher; +using SPT.Launcher; -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { - public class AkiEdition + public class SPTEdition { public string Name { get; set; } public string Description { get; set; } - public AkiEdition(string name) + public SPTEdition(string name) { Name = name; ServerManager.SelectedServer.profileDescriptions.TryGetValue(name, out string desc); diff --git a/project/Aki.Launcher.Base/Models/Aki/AkiMod.cs b/project/SPT.Launcher.Base/Models/SPT/SPTMod.cs similarity index 81% rename from project/Aki.Launcher.Base/Models/Aki/AkiMod.cs rename to project/SPT.Launcher.Base/Models/SPT/SPTMod.cs index 4f0b81d..8df9d14 100644 --- a/project/Aki.Launcher.Base/Models/Aki/AkiMod.cs +++ b/project/SPT.Launcher.Base/Models/SPT/SPTMod.cs @@ -1,6 +1,6 @@ -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { - public class AkiMod + public class SPTMod { public bool InServer { get; set; } public bool InProfile { get; set; } diff --git a/project/Aki.Launcher.Base/Models/Aki/AkiProfileModInfo.cs b/project/SPT.Launcher.Base/Models/SPT/SPTProfileModInfo.cs similarity index 73% rename from project/Aki.Launcher.Base/Models/Aki/AkiProfileModInfo.cs rename to project/SPT.Launcher.Base/Models/SPT/SPTProfileModInfo.cs index 82e8d4c..a716380 100644 --- a/project/Aki.Launcher.Base/Models/Aki/AkiProfileModInfo.cs +++ b/project/SPT.Launcher.Base/Models/SPT/SPTProfileModInfo.cs @@ -1,8 +1,8 @@ using System; -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { - public class AkiProfileModInfo : AkiMod + public class SPTProfileModInfo : SPTMod { public string DateAdded { get; set; } } diff --git a/project/Aki.Launcher.Base/Models/Aki/AkiServerModInfo.cs b/project/SPT.Launcher.Base/Models/SPT/SPTServerModInfo.cs similarity index 86% rename from project/Aki.Launcher.Base/Models/Aki/AkiServerModInfo.cs rename to project/SPT.Launcher.Base/Models/SPT/SPTServerModInfo.cs index d53ac3a..bbf7111 100644 --- a/project/Aki.Launcher.Base/Models/Aki/AkiServerModInfo.cs +++ b/project/SPT.Launcher.Base/Models/SPT/SPTServerModInfo.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { - public class AkiServerModInfo : AkiMod + public class SPTServerModInfo : SPTMod { public string Main { get; set; } public string License { get; set; } - public string AkiVersion { get; set; } + public string SPTVersion { get; set; } public Dictionary Scripts { get; set; } public DevDependencies DevDependencies { get; set; } } @@ -20,7 +20,7 @@ namespace Aki.Launcher.Models.Aki "main": "src/mod.ts", "license": "MIT", "author": "waffle.lord", - "akiVersion": "~3.6", + "SPTVersion": "~3.6", "scripts": { "setup": "npm i", "build": "node ./packageBuild.ts" diff --git a/project/Aki.Launcher.Base/Models/Aki/AkiVersion.cs b/project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs similarity index 73% rename from project/Aki.Launcher.Base/Models/Aki/AkiVersion.cs rename to project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs index 68ba98e..ef7e45f 100644 --- a/project/Aki.Launcher.Base/Models/Aki/AkiVersion.cs +++ b/project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs @@ -1,8 +1,8 @@ using System.ComponentModel; -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { - public class AkiVersion : INotifyPropertyChanged + public class SPTVersion : INotifyPropertyChanged { public int Major; public int Minor; @@ -25,18 +25,18 @@ namespace Aki.Launcher.Models.Aki } } - public void ParseVersionInfo(string AkiVersion) + public void ParseVersionInfo(string SPTVersion) { - if (AkiVersion.Contains('-')) + if (SPTVersion.Contains('-')) { - string[] versionInfo = AkiVersion.Split('-'); + string[] versionInfo = SPTVersion.Split('-'); - AkiVersion = versionInfo[0]; + SPTVersion = versionInfo[0]; Tag = versionInfo[1]; } - string[] splitVersion = AkiVersion.Split('.'); + string[] splitVersion = SPTVersion.Split('.'); if (splitVersion.Length == 3) { @@ -46,11 +46,11 @@ namespace Aki.Launcher.Models.Aki } } - public AkiVersion() { } + public SPTVersion() { } - public AkiVersion(string AkiVersion) + public SPTVersion(string SPTVersion) { - ParseVersionInfo(AkiVersion); + ParseVersionInfo(SPTVersion); } public event PropertyChangedEventHandler PropertyChanged; diff --git a/project/Aki.Launcher.Base/Models/Aki/ServerInfo.cs b/project/SPT.Launcher.Base/Models/SPT/ServerInfo.cs similarity index 81% rename from project/Aki.Launcher.Base/Models/Aki/ServerInfo.cs rename to project/SPT.Launcher.Base/Models/SPT/ServerInfo.cs index efe81ea..b91bfcd 100644 --- a/project/Aki.Launcher.Base/Models/Aki/ServerInfo.cs +++ b/project/SPT.Launcher.Base/Models/SPT/ServerInfo.cs @@ -1,15 +1,14 @@ /* ServerInfo.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: - * Merijn Hendriks */ using System.Collections.Generic; -namespace Aki.Launcher +namespace SPT.Launcher { public class ServerInfo { @@ -21,7 +20,7 @@ namespace Aki.Launcher public ServerInfo() { backendUrl = "http://127.0.0.1:6969"; - name = "Local SPT-AKI Server"; + name = "Local SPT Server"; editions = new string[0]; profileDescriptions = new Dictionary(); } diff --git a/project/Aki.Launcher.Base/Models/Aki/ServerProfileInfo.cs b/project/SPT.Launcher.Base/Models/SPT/ServerProfileInfo.cs similarity index 81% rename from project/Aki.Launcher.Base/Models/Aki/ServerProfileInfo.cs rename to project/SPT.Launcher.Base/Models/SPT/ServerProfileInfo.cs index e974a13..21c45cb 100644 --- a/project/Aki.Launcher.Base/Models/Aki/ServerProfileInfo.cs +++ b/project/SPT.Launcher.Base/Models/SPT/ServerProfileInfo.cs @@ -1,12 +1,12 @@ /* ServerProfileInfo.cs * License: NCSA Open Source License * - * Copyright: Merijn Hendriks + * Copyright: SPT * AUTHORS: * waffle.lord */ -namespace Aki.Launcher.Models.Aki +namespace SPT.Launcher.Models.SPT { public class ServerProfileInfo { @@ -18,6 +18,6 @@ namespace Aki.Launcher.Models.Aki public long prevexp { get; set; } public long nextlvl { get; set; } public int maxlvl { get; set; } - public AkiData akiData { get; set; } + public SPTData SPTData { get; set; } } } diff --git a/project/Aki.Launcher.Base/Aki.Launcher.Base.csproj b/project/SPT.Launcher.Base/SPT.Launcher.Base.csproj similarity index 74% rename from project/Aki.Launcher.Base/Aki.Launcher.Base.csproj rename to project/SPT.Launcher.Base/SPT.Launcher.Base.csproj index 3f9a5fc..5c039d0 100644 --- a/project/Aki.Launcher.Base/Aki.Launcher.Base.csproj +++ b/project/SPT.Launcher.Base/SPT.Launcher.Base.csproj @@ -2,12 +2,12 @@ net8.0 - Aki.Launch + SPT.Launch - ..\Aki.Launcher\References\zlib.net.dll + ..\SPT.Launcher\References\zlib.net.dll @@ -17,7 +17,7 @@ - + diff --git a/project/Aki.Launcher/.gitignore b/project/SPT.Launcher/.gitignore similarity index 100% rename from project/Aki.Launcher/.gitignore rename to project/SPT.Launcher/.gitignore diff --git a/project/Aki.Launcher/App.axaml b/project/SPT.Launcher/App.axaml similarity index 88% rename from project/Aki.Launcher/App.axaml rename to project/SPT.Launcher/App.axaml index 4ecaa8a..5377cca 100644 --- a/project/Aki.Launcher/App.axaml +++ b/project/SPT.Launcher/App.axaml @@ -1,7 +1,7 @@ + xmlns:local="using:SPT.Launcher" + x:Class="SPT.Launcher.App"> @@ -13,19 +13,19 @@ - #121212 - #FFC107 - #FFFFFF - #282828 - #323947 + #121212 + #FFC107 + #FFFFFF + #282828 + #323947 - - - - - - + + + + + + - + diff --git a/project/Aki.Launcher/CustomControls/TitleBar.axaml.cs b/project/SPT.Launcher/CustomControls/TitleBar.axaml.cs similarity index 98% rename from project/Aki.Launcher/CustomControls/TitleBar.axaml.cs rename to project/SPT.Launcher/CustomControls/TitleBar.axaml.cs index 26565c3..0885673 100644 --- a/project/Aki.Launcher/CustomControls/TitleBar.axaml.cs +++ b/project/SPT.Launcher/CustomControls/TitleBar.axaml.cs @@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml; using Avalonia.Media; using System.Windows.Input; -namespace Aki.Launcher.CustomControls +namespace SPT.Launcher.CustomControls { public partial class TitleBar : UserControl { diff --git a/project/Aki.Launcher/Models/GameStarterFrontend.cs b/project/SPT.Launcher/Models/GameStarterFrontend.cs similarity index 79% rename from project/Aki.Launcher/Models/GameStarterFrontend.cs rename to project/SPT.Launcher/Models/GameStarterFrontend.cs index 9e57273..9c0149f 100644 --- a/project/Aki.Launcher/Models/GameStarterFrontend.cs +++ b/project/SPT.Launcher/Models/GameStarterFrontend.cs @@ -1,14 +1,14 @@ -using Aki.Launcher.Helpers; -using Aki.Launcher.Interfaces; -using Aki.Launcher.Models.Launcher; -using Aki.Launcher.ViewModels.Dialogs; -using Aki.Launcher.ViewModels.Notifications; +using SPT.Launcher.Helpers; +using SPT.Launcher.Interfaces; +using SPT.Launcher.Models.Launcher; +using SPT.Launcher.ViewModels.Dialogs; +using SPT.Launcher.ViewModels.Notifications; using Avalonia.Controls.Notifications; using Splat; using System.Collections.Generic; using System.Threading.Tasks; -namespace Aki.Launcher.Models +namespace SPT.Launcher.Models { public class GameStarterFrontend : IGameStarterFrontend { @@ -16,7 +16,7 @@ namespace Aki.Launcher.Models public async Task CompletePatchTask(IAsyncEnumerable task) { - notificationManager.Show(new AkiNotificationViewModel(null, "", $"{LocalizationProvider.Instance.patching} ...")); + notificationManager.Show(new SPTNotificationViewModel(null, "", $"{LocalizationProvider.Instance.patching} ...")); var iter = task.GetAsyncEnumerator(); while (await iter.MoveNextAsync()) @@ -30,13 +30,13 @@ namespace Aki.Launcher.Models if(result != null && result is bool confirmation && !confirmation) { - notificationManager.Show(new AkiNotificationViewModel(null, "", LocalizationProvider.Instance.failed_core_patch, NotificationType.Error)); + notificationManager.Show(new SPTNotificationViewModel(null, "", LocalizationProvider.Instance.failed_core_patch, NotificationType.Error)); throw new TaskCanceledException(); } } else { - notificationManager.Show(new AkiNotificationViewModel(null, "", LocalizationProvider.Instance.failed_core_patch, NotificationType.Error)); + notificationManager.Show(new SPTNotificationViewModel(null, "", LocalizationProvider.Instance.failed_core_patch, NotificationType.Error)); throw new TaskCanceledException(); } } diff --git a/project/Aki.Launcher/Models/ImageHelper.cs b/project/SPT.Launcher/Models/ImageHelper.cs similarity index 94% rename from project/Aki.Launcher/Models/ImageHelper.cs rename to project/SPT.Launcher/Models/ImageHelper.cs index c31e350..2fbbcc0 100644 --- a/project/Aki.Launcher/Models/ImageHelper.cs +++ b/project/SPT.Launcher/Models/ImageHelper.cs @@ -1,6 +1,6 @@ using ReactiveUI; -namespace Aki.Launcher.Models +namespace SPT.Launcher.Models { public class ImageHelper : ReactiveObject { diff --git a/project/Aki.Launcher/Models/NavigationPreConditionResult.cs b/project/SPT.Launcher/Models/NavigationPreConditionResult.cs similarity index 92% rename from project/Aki.Launcher/Models/NavigationPreConditionResult.cs rename to project/SPT.Launcher/Models/NavigationPreConditionResult.cs index 6f15441..affe820 100644 --- a/project/Aki.Launcher/Models/NavigationPreConditionResult.cs +++ b/project/SPT.Launcher/Models/NavigationPreConditionResult.cs @@ -1,6 +1,6 @@ -using Aki.Launcher.ViewModels; +using SPT.Launcher.ViewModels; -namespace Aki.Launcher.Models +namespace SPT.Launcher.Models { public class NavigationPreConditionResult { diff --git a/project/Aki.Launcher/Program.cs b/project/SPT.Launcher/Program.cs similarity index 95% rename from project/Aki.Launcher/Program.cs rename to project/SPT.Launcher/Program.cs index bfd7f34..95d0a2a 100644 --- a/project/Aki.Launcher/Program.cs +++ b/project/SPT.Launcher/Program.cs @@ -1,4 +1,4 @@ -using Aki.Launcher.Controllers; +using SPT.Launcher.Controllers; using Avalonia; using Avalonia.ReactiveUI; using ReactiveUI; @@ -6,7 +6,7 @@ using Splat; using System; using System.Reflection; -namespace Aki.Launcher +namespace SPT.Launcher { internal class Program { diff --git a/project/Aki.Launcher/References/Newtonsoft.Json.dll b/project/SPT.Launcher/References/Newtonsoft.Json.dll similarity index 100% rename from project/Aki.Launcher/References/Newtonsoft.Json.dll rename to project/SPT.Launcher/References/Newtonsoft.Json.dll diff --git a/project/Aki.Launcher/References/zlib.net.dll b/project/SPT.Launcher/References/zlib.net.dll similarity index 100% rename from project/Aki.Launcher/References/zlib.net.dll rename to project/SPT.Launcher/References/zlib.net.dll diff --git a/project/Aki.Launcher/Aki.Launcher.csproj b/project/SPT.Launcher/SPT.Launcher.csproj similarity index 91% rename from project/Aki.Launcher/Aki.Launcher.csproj rename to project/SPT.Launcher/SPT.Launcher.csproj index 357388d..7d100f7 100644 --- a/project/Aki.Launcher/Aki.Launcher.csproj +++ b/project/SPT.Launcher/SPT.Launcher.csproj @@ -15,7 +15,7 @@ - + @@ -30,8 +30,8 @@ - - + + diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Chinese (Simplified).json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Chinese (Simplified).json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Chinese (Traditional).json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Chinese (Traditional).json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/English.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/English.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/French.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/French.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/German.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/German.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Italian.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Italian.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Japanese.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Japanese.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Korean.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Korean.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Polish.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Polish.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Polish.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Polish.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Russian.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Russian.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Spanish.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Spanish.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Turkish.json b/project/SPT.Launcher/SPT_Data/Launcher/Locales/Turkish.json similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Locales/Turkish.json rename to project/SPT.Launcher/SPT_Data/Launcher/Locales/Turkish.json diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Patches/aki-core/EscapeFromTarkov_Data/Managed/Assembly-CSharp.dll.bpf b/project/SPT.Launcher/SPT_Data/Launcher/Patches/SPT-core/EscapeFromTarkov_Data/Managed/Assembly-CSharp.dll.bpf similarity index 100% rename from project/Aki.Launcher/Aki_Data/Launcher/Patches/aki-core/EscapeFromTarkov_Data/Managed/Assembly-CSharp.dll.bpf rename to project/SPT.Launcher/SPT_Data/Launcher/Patches/SPT-core/EscapeFromTarkov_Data/Managed/Assembly-CSharp.dll.bpf diff --git a/project/Aki.Launcher/ViewLocator.cs b/project/SPT.Launcher/ViewLocator.cs similarity index 92% rename from project/Aki.Launcher/ViewLocator.cs rename to project/SPT.Launcher/ViewLocator.cs index 9863f99..54efb46 100644 --- a/project/Aki.Launcher/ViewLocator.cs +++ b/project/SPT.Launcher/ViewLocator.cs @@ -1,9 +1,9 @@ -using Aki.Launcher.ViewModels; +using SPT.Launcher.ViewModels; using Avalonia.Controls; using Avalonia.Controls.Templates; using System; -namespace Aki.Launcher +namespace SPT.Launcher { public class ViewLocator : IDataTemplate { diff --git a/project/Aki.Launcher/ViewModels/ConnectServerViewModel.cs b/project/SPT.Launcher/ViewModels/ConnectServerViewModel.cs similarity index 88% rename from project/Aki.Launcher/ViewModels/ConnectServerViewModel.cs rename to project/SPT.Launcher/ViewModels/ConnectServerViewModel.cs index a3805b3..5561a55 100644 --- a/project/Aki.Launcher/ViewModels/ConnectServerViewModel.cs +++ b/project/SPT.Launcher/ViewModels/ConnectServerViewModel.cs @@ -1,13 +1,13 @@ -using Aki.Launcher.Models.Aki; -using Aki.Launcher.Helpers; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Models.SPT; +using SPT.Launcher.Helpers; +using SPT.Launcher.Models.Launcher; using ReactiveUI; using Splat; using System.Reactive.Disposables; using System.Threading.Tasks; -using Aki.Launcher.Controllers; +using SPT.Launcher.Controllers; -namespace Aki.Launcher.ViewModels +namespace SPT.Launcher.ViewModels { public class ConnectServerViewModel : ViewModelBase { @@ -53,11 +53,11 @@ namespace Aki.Launcher.ViewModels if (connected) { - AkiVersion version = Locator.Current.GetService("akiversion"); + SPTVersion version = Locator.Current.GetService("sptversion"); version.ParseVersionInfo(ServerManager.GetVersion()); - LogManager.Instance.Info($"Connected to server: {ServerManager.SelectedServer.backendUrl} - Aki Version: {version}"); + LogManager.Instance.Info($"Connected to server: {ServerManager.SelectedServer.backendUrl} - SPT Version: {version}"); NavigateTo(new LoginViewModel(HostScreen, noAutoLogin)); } diff --git a/project/Aki.Launcher/ViewModels/Dialogs/ChangeEditionDialogViewModel.cs b/project/SPT.Launcher/ViewModels/Dialogs/ChangeEditionDialogViewModel.cs similarity index 77% rename from project/Aki.Launcher/ViewModels/Dialogs/ChangeEditionDialogViewModel.cs rename to project/SPT.Launcher/ViewModels/Dialogs/ChangeEditionDialogViewModel.cs index 5bf9690..6c73e54 100644 --- a/project/Aki.Launcher/ViewModels/Dialogs/ChangeEditionDialogViewModel.cs +++ b/project/SPT.Launcher/ViewModels/Dialogs/ChangeEditionDialogViewModel.cs @@ -1,7 +1,7 @@ -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Models.Launcher; using ReactiveUI; -namespace Aki.Launcher.ViewModels.Dialogs +namespace SPT.Launcher.ViewModels.Dialogs { public class ChangeEditionDialogViewModel : ViewModelBase { diff --git a/project/Aki.Launcher/ViewModels/Dialogs/ConfirmationDialogViewModel.cs b/project/SPT.Launcher/ViewModels/Dialogs/ConfirmationDialogViewModel.cs similarity index 93% rename from project/Aki.Launcher/ViewModels/Dialogs/ConfirmationDialogViewModel.cs rename to project/SPT.Launcher/ViewModels/Dialogs/ConfirmationDialogViewModel.cs index 8aa8294..ada55ec 100644 --- a/project/Aki.Launcher/ViewModels/Dialogs/ConfirmationDialogViewModel.cs +++ b/project/SPT.Launcher/ViewModels/Dialogs/ConfirmationDialogViewModel.cs @@ -1,7 +1,7 @@ -using Aki.Launcher.Helpers; +using SPT.Launcher.Helpers; using ReactiveUI; -namespace Aki.Launcher.ViewModels.Dialogs +namespace SPT.Launcher.ViewModels.Dialogs { public class ConfirmationDialogViewModel : ViewModelBase { diff --git a/project/Aki.Launcher/ViewModels/Dialogs/RegisterDialogViewModel.cs b/project/SPT.Launcher/ViewModels/Dialogs/RegisterDialogViewModel.cs similarity index 91% rename from project/Aki.Launcher/ViewModels/Dialogs/RegisterDialogViewModel.cs rename to project/SPT.Launcher/ViewModels/Dialogs/RegisterDialogViewModel.cs index 64f84ee..bb90f4f 100644 --- a/project/Aki.Launcher/ViewModels/Dialogs/RegisterDialogViewModel.cs +++ b/project/SPT.Launcher/ViewModels/Dialogs/RegisterDialogViewModel.cs @@ -1,8 +1,8 @@ -using Aki.Launcher.Helpers; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Helpers; +using SPT.Launcher.Models.Launcher; using ReactiveUI; -namespace Aki.Launcher.ViewModels.Dialogs +namespace SPT.Launcher.ViewModels.Dialogs { public class RegisterDialogViewModel : ViewModelBase { diff --git a/project/Aki.Launcher/ViewModels/Dialogs/WarningDialogViewModel.cs b/project/SPT.Launcher/ViewModels/Dialogs/WarningDialogViewModel.cs similarity index 91% rename from project/Aki.Launcher/ViewModels/Dialogs/WarningDialogViewModel.cs rename to project/SPT.Launcher/ViewModels/Dialogs/WarningDialogViewModel.cs index d533bb4..b19ab1c 100644 --- a/project/Aki.Launcher/ViewModels/Dialogs/WarningDialogViewModel.cs +++ b/project/SPT.Launcher/ViewModels/Dialogs/WarningDialogViewModel.cs @@ -1,7 +1,7 @@ -using Aki.Launcher.Helpers; +using SPT.Launcher.Helpers; using ReactiveUI; -namespace Aki.Launcher.ViewModels.Dialogs +namespace SPT.Launcher.ViewModels.Dialogs { public class WarningDialogViewModel : ViewModelBase { diff --git a/project/Aki.Launcher/ViewModels/LoginViewModel.cs b/project/SPT.Launcher/ViewModels/LoginViewModel.cs similarity index 95% rename from project/Aki.Launcher/ViewModels/LoginViewModel.cs rename to project/SPT.Launcher/ViewModels/LoginViewModel.cs index 2db7c41..8376008 100644 --- a/project/Aki.Launcher/ViewModels/LoginViewModel.cs +++ b/project/SPT.Launcher/ViewModels/LoginViewModel.cs @@ -1,10 +1,10 @@ -using Aki.Launcher.Attributes; -using Aki.Launcher.Helpers; -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models; -using Aki.Launcher.Models.Aki; -using Aki.Launcher.Models.Launcher; -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.Attributes; +using SPT.Launcher.Helpers; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models; +using SPT.Launcher.Models.SPT; +using SPT.Launcher.Models.Launcher; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia.Controls.Notifications; using ReactiveUI; using Splat; @@ -13,7 +13,7 @@ using System.Reactive; using System.Threading.Tasks; using Avalonia.Threading; -namespace Aki.Launcher.ViewModels +namespace SPT.Launcher.ViewModels { [RequireServerConnected] public class LoginViewModel : ViewModelBase @@ -51,7 +51,7 @@ namespace Aki.Launcher.ViewModels { var result = await ShowDialog(new RegisterDialogViewModel(null, Login.Username)); - if (result != null && result is AkiEdition edition) + if (result != null && result is SPTEdition edition) { AccountStatus registerResult = await AccountManager.RegisterAsync(Login.Username, Login.Password, edition.Name); diff --git a/project/Aki.Launcher/ViewModels/MainWindowViewModel.cs b/project/SPT.Launcher/ViewModels/MainWindowViewModel.cs similarity index 89% rename from project/Aki.Launcher/ViewModels/MainWindowViewModel.cs rename to project/SPT.Launcher/ViewModels/MainWindowViewModel.cs index c3306b9..6649eca 100644 --- a/project/Aki.Launcher/ViewModels/MainWindowViewModel.cs +++ b/project/SPT.Launcher/ViewModels/MainWindowViewModel.cs @@ -1,22 +1,22 @@ using Avalonia; using ReactiveUI; using System.Reactive.Disposables; -using Aki.Launcher.Models; -using Aki.Launcher.MiniCommon; +using SPT.Launcher.Models; +using SPT.Launcher.MiniCommon; using System.IO; using Splat; -using Aki.Launcher.Models.Aki; -using Aki.Launcher.Helpers; -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.Models.SPT; +using SPT.Launcher.Helpers; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia.Threading; using dialogHost = DialogHost.DialogHost; -namespace Aki.Launcher.ViewModels +namespace SPT.Launcher.ViewModels { public class MainWindowViewModel : ReactiveObject, IActivatableViewModel, IScreen { - public AkiVersion VersionInfo { get; set; } = new AkiVersion(); + public SPTVersion VersionInfo { get; set; } = new SPTVersion(); public RoutingState Router { get; } = new RoutingState(); public ViewModelActivator Activator { get; } = new ViewModelActivator(); @@ -29,7 +29,7 @@ namespace Aki.Launcher.ViewModels { Locator.CurrentMutable.RegisterConstant(Background, "bgimage"); - Locator.CurrentMutable.RegisterConstant(VersionInfo, "akiversion"); + Locator.CurrentMutable.RegisterConstant(VersionInfo, "sptversion"); LauncherSettingsProvider.Instance.AllowSettings = true; diff --git a/project/Aki.Launcher/ViewModels/ModInfoViewModel.cs b/project/SPT.Launcher/ViewModels/ModInfoViewModel.cs similarity index 88% rename from project/Aki.Launcher/ViewModels/ModInfoViewModel.cs rename to project/SPT.Launcher/ViewModels/ModInfoViewModel.cs index 206cbbd..cb8a1bb 100644 --- a/project/Aki.Launcher/ViewModels/ModInfoViewModel.cs +++ b/project/SPT.Launcher/ViewModels/ModInfoViewModel.cs @@ -1,13 +1,13 @@ using System; using System.Diagnostics; using System.Threading.Tasks; -using Aki.Launcher.Controllers; -using Aki.Launcher.Helpers; -using Aki.Launcher.Models.Launcher; -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.Controllers; +using SPT.Launcher.Helpers; +using SPT.Launcher.Models.Launcher; +using SPT.Launcher.ViewModels.Dialogs; using ReactiveUI; -namespace Aki.Launcher.ViewModels; +namespace SPT.Launcher.ViewModels; public class ModInfoViewModel : ViewModelBase { diff --git a/project/Aki.Launcher/ViewModels/Notifications/AkiNotificationViewModel.cs b/project/SPT.Launcher/ViewModels/Notifications/SPTNotificationViewModel.cs similarity index 89% rename from project/Aki.Launcher/ViewModels/Notifications/AkiNotificationViewModel.cs rename to project/SPT.Launcher/ViewModels/Notifications/SPTNotificationViewModel.cs index a50d53d..1e2a702 100644 --- a/project/Aki.Launcher/ViewModels/Notifications/AkiNotificationViewModel.cs +++ b/project/SPT.Launcher/ViewModels/Notifications/SPTNotificationViewModel.cs @@ -2,15 +2,15 @@ using Avalonia.Media; using ReactiveUI; -namespace Aki.Launcher.ViewModels.Notifications +namespace SPT.Launcher.ViewModels.Notifications { - public class AkiNotificationViewModel : ViewModelBase + public class SPTNotificationViewModel : ViewModelBase { public string Title { get; set; } public string Message { get; set; } public IBrush BarColor { get; set; } - public AkiNotificationViewModel(IScreen Host, string Title, string Message, NotificationType Type = NotificationType.Information) : base(Host) + public SPTNotificationViewModel(IScreen Host, string Title, string Message, NotificationType Type = NotificationType.Information) : base(Host) { this.Title = Title; this.Message = Message; diff --git a/project/Aki.Launcher/ViewModels/ProfileViewModel.cs b/project/SPT.Launcher/ViewModels/ProfileViewModel.cs similarity index 97% rename from project/Aki.Launcher/ViewModels/ProfileViewModel.cs rename to project/SPT.Launcher/ViewModels/ProfileViewModel.cs index 134b8c4..2cd4c90 100644 --- a/project/Aki.Launcher/ViewModels/ProfileViewModel.cs +++ b/project/SPT.Launcher/ViewModels/ProfileViewModel.cs @@ -1,18 +1,18 @@ -using Aki.Launcher.Helpers; -using Aki.Launcher.MiniCommon; -using Aki.Launcher.Models; -using Aki.Launcher.Models.Launcher; +using SPT.Launcher.Helpers; +using SPT.Launcher.MiniCommon; +using SPT.Launcher.Models; +using SPT.Launcher.Models.Launcher; using Avalonia; using ReactiveUI; using System.Threading.Tasks; -using Aki.Launcher.Attributes; -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.Attributes; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia.Threading; using System.Diagnostics; using System.IO; -using Aki.Launcher.Models.Aki; +using SPT.Launcher.Models.SPT; -namespace Aki.Launcher.ViewModels +namespace SPT.Launcher.ViewModels { [RequireLoggedIn] public class ProfileViewModel : ViewModelBase @@ -213,7 +213,7 @@ namespace Aki.Launcher.ViewModels { var result = await ShowDialog(new ChangeEditionDialogViewModel(null)); - if(result != null && result is AkiEdition edition) + if(result != null && result is SPTEdition edition) { await WipeProfile(edition.Name); } diff --git a/project/Aki.Launcher/ViewModels/SettingsViewModel.cs b/project/SPT.Launcher/ViewModels/SettingsViewModel.cs similarity index 96% rename from project/Aki.Launcher/ViewModels/SettingsViewModel.cs rename to project/SPT.Launcher/ViewModels/SettingsViewModel.cs index c76c621..da33f57 100644 --- a/project/Aki.Launcher/ViewModels/SettingsViewModel.cs +++ b/project/SPT.Launcher/ViewModels/SettingsViewModel.cs @@ -1,8 +1,8 @@ -using Aki.Launcher.Controllers; -using Aki.Launcher.Helpers; -using Aki.Launcher.Models; -using Aki.Launcher.Models.Launcher; -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.Controllers; +using SPT.Launcher.Helpers; +using SPT.Launcher.Models; +using SPT.Launcher.Models.Launcher; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia; using Avalonia.Controls; using ReactiveUI; @@ -12,7 +12,7 @@ using System.IO; using System.Reflection; using System.Threading.Tasks; -namespace Aki.Launcher.ViewModels +namespace SPT.Launcher.ViewModels { public class SettingsViewModel : ViewModelBase { diff --git a/project/Aki.Launcher/ViewModels/ViewModelBase.cs b/project/SPT.Launcher/ViewModels/ViewModelBase.cs similarity index 96% rename from project/Aki.Launcher/ViewModels/ViewModelBase.cs rename to project/SPT.Launcher/ViewModels/ViewModelBase.cs index 786e8ad..2064f27 100644 --- a/project/Aki.Launcher/ViewModels/ViewModelBase.cs +++ b/project/SPT.Launcher/ViewModels/ViewModelBase.cs @@ -1,7 +1,7 @@ -using Aki.Launcher.Attributes; -using Aki.Launcher.Controllers; -using Aki.Launcher.Models; -using Aki.Launcher.ViewModels.Notifications; +using SPT.Launcher.Attributes; +using SPT.Launcher.Controllers; +using SPT.Launcher.Models; +using SPT.Launcher.ViewModels.Notifications; using Avalonia.Controls.Notifications; using Avalonia.Threading; using ReactiveUI; @@ -10,7 +10,7 @@ using System; using System.Threading.Tasks; using dialogHost = DialogHost.DialogHost; -namespace Aki.Launcher.ViewModels +namespace SPT.Launcher.ViewModels { public class ViewModelBase : ReactiveObject, IActivatableViewModel, IRoutableViewModel { @@ -152,7 +152,7 @@ namespace Aki.Launcher.ViewModels /// public void SendNotification(string Title, string Message, NotificationType Type = NotificationType.Information) { - NotificationManager.Show(new AkiNotificationViewModel(HostScreen, Title, Message, Type)); + NotificationManager.Show(new SPTNotificationViewModel(HostScreen, Title, Message, Type)); } /// diff --git a/project/Aki.Launcher/Views/ConnectServerView.axaml b/project/SPT.Launcher/Views/ConnectServerView.axaml similarity index 90% rename from project/Aki.Launcher/Views/ConnectServerView.axaml rename to project/SPT.Launcher/Views/ConnectServerView.axaml index 9028526..c681149 100644 --- a/project/Aki.Launcher/Views/ConnectServerView.axaml +++ b/project/SPT.Launcher/Views/ConnectServerView.axaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:helpers="using:Aki.Launcher.Helpers" + xmlns:helpers="using:SPT.Launcher.Helpers" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Aki.Launcher.Views.ConnectServerView"> + x:Class="SPT.Launcher.Views.ConnectServerView"> diff --git a/project/Aki.Launcher/Views/ConnectServerView.axaml.cs b/project/SPT.Launcher/Views/ConnectServerView.axaml.cs similarity index 87% rename from project/Aki.Launcher/Views/ConnectServerView.axaml.cs rename to project/SPT.Launcher/Views/ConnectServerView.axaml.cs index c0cf61b..eff91bf 100644 --- a/project/Aki.Launcher/Views/ConnectServerView.axaml.cs +++ b/project/SPT.Launcher/Views/ConnectServerView.axaml.cs @@ -1,9 +1,9 @@ -using Aki.Launcher.ViewModels; +using SPT.Launcher.ViewModels; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; using ReactiveUI; -namespace Aki.Launcher.Views +namespace SPT.Launcher.Views { public partial class ConnectServerView : ReactiveUserControl { diff --git a/project/Aki.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml similarity index 91% rename from project/Aki.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml rename to project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml index 1c228d9..99060c1 100644 --- a/project/Aki.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml +++ b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml @@ -2,12 +2,12 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:helpers="using:Aki.Launcher.Helpers" + xmlns:helpers="using:SPT.Launcher.Helpers" xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" xmlns:s="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Aki.Launcher.Views.Dialogs.ChangeEditionDialogView" - Background="{StaticResource AKI_Background_Dark}"> + x:Class="SPT.Launcher.Views.Dialogs.ChangeEditionDialogView" + Background="{StaticResource SPT_Background_Dark}"> diff --git a/project/Aki.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml.cs b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml.cs similarity index 83% rename from project/Aki.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml.cs rename to project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml.cs index 8064cf2..9c32e98 100644 --- a/project/Aki.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml.cs +++ b/project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml.cs @@ -1,8 +1,8 @@ -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Aki.Launcher.Views.Dialogs +namespace SPT.Launcher.Views.Dialogs { public partial class ChangeEditionDialogView : ReactiveUserControl { diff --git a/project/Aki.Launcher/Views/Dialogs/ConfirmationDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml similarity index 89% rename from project/Aki.Launcher/Views/Dialogs/ConfirmationDialogView.axaml rename to project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml index 62007b2..81b6dab 100644 --- a/project/Aki.Launcher/Views/Dialogs/ConfirmationDialogView.axaml +++ b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml @@ -5,14 +5,14 @@ xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" xmlns:s="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Aki.Launcher.Views.Dialogs.ConfirmationDialogView" - Background="{StaticResource AKI_Background_Dark}" + x:Class="SPT.Launcher.Views.Dialogs.ConfirmationDialogView" + Background="{StaticResource SPT_Background_Dark}" MinWidth="300" MinHeight="100" > diff --git a/project/Aki.Launcher/Views/Dialogs/ConfirmationDialogView.axaml.cs b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml.cs similarity index 90% rename from project/Aki.Launcher/Views/Dialogs/ConfirmationDialogView.axaml.cs rename to project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml.cs index 2429d0f..e6a3f81 100644 --- a/project/Aki.Launcher/Views/Dialogs/ConfirmationDialogView.axaml.cs +++ b/project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml.cs @@ -2,7 +2,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Aki.Launcher.Views.Dialogs +namespace SPT.Launcher.Views.Dialogs { public partial class ConfirmationDialogView : UserControl { diff --git a/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml similarity index 85% rename from project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml rename to project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml index e2b7000..fc5e174 100644 --- a/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml +++ b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml @@ -3,10 +3,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" - xmlns:helpers="using:Aki.Launcher.Helpers" + xmlns:helpers="using:SPT.Launcher.Helpers" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Aki.Launcher.Views.Dialogs.RegisterDialogView" - Background="{StaticResource AKI_Background_Dark}" + x:Class="SPT.Launcher.Views.Dialogs.RegisterDialogView" + Background="{StaticResource SPT_Background_Dark}" MinWidth="300" MinHeight="100" > @@ -15,7 +15,7 @@ @@ -36,7 +36,7 @@ diff --git a/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml.cs b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml.cs similarity index 82% rename from project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml.cs rename to project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml.cs index 283bffb..65ee2b9 100644 --- a/project/Aki.Launcher/Views/Dialogs/RegisterDialogView.axaml.cs +++ b/project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml.cs @@ -1,8 +1,8 @@ -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Aki.Launcher.Views.Dialogs +namespace SPT.Launcher.Views.Dialogs { public partial class RegisterDialogView : ReactiveUserControl { diff --git a/project/Aki.Launcher/Views/Dialogs/WarningDialogView.axaml b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml similarity index 86% rename from project/Aki.Launcher/Views/Dialogs/WarningDialogView.axaml rename to project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml index b0c29ab..95a130c 100644 --- a/project/Aki.Launcher/Views/Dialogs/WarningDialogView.axaml +++ b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml @@ -2,11 +2,11 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:helpers="using:Aki.Launcher.Helpers" + xmlns:helpers="using:SPT.Launcher.Helpers" xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Aki.Launcher.Views.Dialogs.WarningDialogView" - Background="{StaticResource AKI_Background_Dark}" + x:Class="SPT.Launcher.Views.Dialogs.WarningDialogView" + Background="{StaticResource SPT_Background_Dark}" BorderBrush="IndianRed" BorderThickness="1" > diff --git a/project/Aki.Launcher/Views/Dialogs/WarningDialogView.axaml.cs b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml.cs similarity index 82% rename from project/Aki.Launcher/Views/Dialogs/WarningDialogView.axaml.cs rename to project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml.cs index cdf969b..5375022 100644 --- a/project/Aki.Launcher/Views/Dialogs/WarningDialogView.axaml.cs +++ b/project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml.cs @@ -1,8 +1,8 @@ -using Aki.Launcher.ViewModels.Dialogs; +using SPT.Launcher.ViewModels.Dialogs; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Aki.Launcher.Views.Dialogs +namespace SPT.Launcher.Views.Dialogs { public partial class WarningDialogView : ReactiveUserControl { diff --git a/project/Aki.Launcher/Views/LoginView.axaml b/project/SPT.Launcher/Views/LoginView.axaml similarity index 87% rename from project/Aki.Launcher/Views/LoginView.axaml rename to project/SPT.Launcher/Views/LoginView.axaml index d211e23..870f228 100644 --- a/project/Aki.Launcher/Views/LoginView.axaml +++ b/project/SPT.Launcher/Views/LoginView.axaml @@ -2,11 +2,11 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:helpers="using:Aki.Launcher.Helpers" - xmlns:launcher="using:Aki.Launcher.Models.Launcher" - xmlns:cvt="using:Aki.Launcher.Converters" + xmlns:helpers="using:SPT.Launcher.Helpers" + xmlns:launcher="using:SPT.Launcher.Models.Launcher" + xmlns:cvt="using:SPT.Launcher.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Aki.Launcher.Views.LoginView"> + x:Class="SPT.Launcher.Views.LoginView"> @@ -34,16 +34,16 @@