diff --git a/MareSynchronos/Interop/Ipc/IpcCallerGlamourer.cs b/MareSynchronos/Interop/Ipc/IpcCallerGlamourer.cs index 3d65d49..6d8b699 100644 --- a/MareSynchronos/Interop/Ipc/IpcCallerGlamourer.cs +++ b/MareSynchronos/Interop/Ipc/IpcCallerGlamourer.cs @@ -109,7 +109,7 @@ public sealed class IpcCallerGlamourer : DisposableMediatorSubscriberBase, IIpcC if (!apiAvailable && !_shownGlamourerUnavailable) { _shownGlamourerUnavailable = true; - _mareMediator.Publish(new NotificationMessage("Glamourer inactive", "Your Glamourer installation is not active or out of date. Update Glamourer to continue to use Elezen. If you just updated Glamourer, ignore this message.", + _mareMediator.Publish(new NotificationMessage("Glamourer inactive", "Your Glamourer installation is not active or out of date. Update Glamourer to continue to use Snowcloak. If you just updated Glamourer, ignore this message.", NotificationType.Error)); } } diff --git a/MareSynchronos/Interop/Ipc/IpcCallerPenumbra.cs b/MareSynchronos/Interop/Ipc/IpcCallerPenumbra.cs index 261f0ec..e6024bb 100644 --- a/MareSynchronos/Interop/Ipc/IpcCallerPenumbra.cs +++ b/MareSynchronos/Interop/Ipc/IpcCallerPenumbra.cs @@ -136,7 +136,7 @@ public sealed class IpcCallerPenumbra : DisposableMediatorSubscriberBase, IIpcCa { _shownPenumbraUnavailable = true; _mareMediator.Publish(new NotificationMessage("Penumbra inactive", - "Your Penumbra installation is not active or out of date. Update Penumbra and/or the Enable Mods setting in Penumbra to continue to use Elezen. If you just updated Penumbra, ignore this message.", + "Your Penumbra installation is not active or out of date. Update Penumbra and/or the Enable Mods setting in Penumbra to continue to use Snowcloak. If you just updated Penumbra, ignore this message.", NotificationType.Error)); } } diff --git a/MareSynchronos/Interop/Ipc/IpcProvider.cs b/MareSynchronos/Interop/Ipc/IpcProvider.cs index 0ed9b4e..f268a2b 100644 --- a/MareSynchronos/Interop/Ipc/IpcProvider.cs +++ b/MareSynchronos/Interop/Ipc/IpcProvider.cs @@ -68,9 +68,9 @@ public class IpcProvider : IHostedService, IMediatorSubscriber _logger.LogDebug("Starting IpcProvider Service"); _loadFileProvider = _pi.GetIpcProvider("ElfSync.LoadMcdf"); _loadFileProvider.RegisterFunc(LoadMcdf); - _loadFileAsyncProvider = _pi.GetIpcProvider>("ElezenSync.LoadMcdfAsync"); + _loadFileAsyncProvider = _pi.GetIpcProvider>("SnowcloakSync.LoadMcdfAsync"); _loadFileAsyncProvider.RegisterFunc(LoadMcdfAsync); - _handledGameAddresses = _pi.GetIpcProvider>("ElezenSync.GetHandledAddresses"); + _handledGameAddresses = _pi.GetIpcProvider>("SnowcloakSync.GetHandledAddresses"); _handledGameAddresses.RegisterFunc(GetHandledAddresses); _loadFileProviderMare = _pi.GetIpcProvider("MareSynchronos.LoadMcdf"); diff --git a/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs b/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs index 5de143d..faa16c1 100644 --- a/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs +++ b/MareSynchronos/MareConfiguration/Configurations/ServerConfig.cs @@ -10,7 +10,7 @@ public class ServerConfig : IMareConfiguration public List ServerStorage { get; set; } = new() { - { new ServerStorage() { ServerName = ApiController.ElezenServer, ServerUri = ApiController.ElezenServiceUri } }, + { new ServerStorage() { ServerName = ApiController.SnowcloakServer, ServerUri = ApiController.SnowcloakServiceUri } }, }; public int Version { get; set; } = 1; diff --git a/MareSynchronos/Plugin.cs b/MareSynchronos/Plugin.cs index dc5bdcf..3e57c3c 100644 --- a/MareSynchronos/Plugin.cs +++ b/MareSynchronos/Plugin.cs @@ -40,7 +40,7 @@ public sealed class Plugin : IDalamudPlugin #pragma warning restore CA2211, CS8618, MA0069, S1104, S2223 public Action? RealOnFrameworkUpdate { get; set; } - // Proxy function in the ElezenSync namespace to avoid confusion in /xlstats + // Proxy function in the SnowcloakSync namespace to avoid confusion in /xlstats public void OnFrameworkUpdate(IFramework framework) { RealOnFrameworkUpdate?.Invoke(framework); diff --git a/MareSynchronos/Services/ChatService.cs b/MareSynchronos/Services/ChatService.cs index 6caf8dc..ce31250 100644 --- a/MareSynchronos/Services/ChatService.cs +++ b/MareSynchronos/Services/ChatService.cs @@ -207,7 +207,7 @@ public class ChatService : DisposableMediatorSubscriberBase } } - _chatGui.PrintError($"[ElezenSync] Syncshell number #{shellNumber} not found"); + _chatGui.PrintError($"[SnowcloakSync] Syncshell number #{shellNumber} not found"); } public void SendChatShell(int shellNumber, byte[] chatBytes) @@ -236,6 +236,6 @@ public class ChatService : DisposableMediatorSubscriberBase } } - _chatGui.PrintError($"[ElezenSync] Syncshell number #{shellNumber} not found"); + _chatGui.PrintError($"[SnowcloakSync] Syncshell number #{shellNumber} not found"); } } \ No newline at end of file diff --git a/MareSynchronos/Services/CommandManagerService.cs b/MareSynchronos/Services/CommandManagerService.cs index 08c85c8..3676a0e 100644 --- a/MareSynchronos/Services/CommandManagerService.cs +++ b/MareSynchronos/Services/CommandManagerService.cs @@ -42,11 +42,11 @@ public sealed class CommandManagerService : IDisposable _mareConfigService = mareConfigService; _commandManager.AddHandler(_commandName, new CommandInfo(OnCommand) { - HelpMessage = "Opens the Elezen UI" + HelpMessage = "Opens the Snowcloak UI" }); _commandManager.AddHandler(_commandName2, new CommandInfo(OnCommand) { - HelpMessage = "Opens the Elezen UI" + HelpMessage = "Opens the Snowcloak UI" }); // Lazy registration of all possible /ss# commands which tbf is what the game does for linkshells anyway @@ -86,7 +86,7 @@ public sealed class CommandManagerService : IDisposable { if (_apiController.ServerState == WebAPI.SignalR.Utils.ServerState.Disconnecting) { - _mediator.Publish(new NotificationMessage("Elezen disconnecting", "Cannot use /toggle while Elezen is still disconnecting", + _mediator.Publish(new NotificationMessage("Snowcloak disconnecting", "Cannot use /toggle while Snowcloak is still disconnecting", NotificationType.Error)); } diff --git a/MareSynchronos/Services/NotificationService.cs b/MareSynchronos/Services/NotificationService.cs index 39ec3d7..11ef63b 100644 --- a/MareSynchronos/Services/NotificationService.cs +++ b/MareSynchronos/Services/NotificationService.cs @@ -41,19 +41,19 @@ public class NotificationService : DisposableMediatorSubscriberBase, IHostedServ private void PrintErrorChat(string? message) { - SeStringBuilder se = new SeStringBuilder().AddText("[ElezenSync] Error: " + message); + SeStringBuilder se = new SeStringBuilder().AddText("[SnowcloakSync] Error: " + message); _chatGui.PrintError(se.BuiltString); } private void PrintInfoChat(string? message) { - SeStringBuilder se = new SeStringBuilder().AddText("[ElezenSync] Info: ").AddItalics(message ?? string.Empty); + SeStringBuilder se = new SeStringBuilder().AddText("[SnowcloakSync] Info: ").AddItalics(message ?? string.Empty); _chatGui.Print(se.BuiltString); } private void PrintWarnChat(string? message) { - SeStringBuilder se = new SeStringBuilder().AddText("[ElezenSync] ").AddUiForeground("Warning: " + (message ?? string.Empty), 31).AddUiForegroundOff(); + SeStringBuilder se = new SeStringBuilder().AddText("[SnowcloakSync] ").AddUiForeground("Warning: " + (message ?? string.Empty), 31).AddUiForegroundOff(); _chatGui.Print(se.BuiltString); } diff --git a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs index b20e0bc..768808e 100644 --- a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs +++ b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs @@ -500,13 +500,13 @@ public class ServerConfigurationManager for (int i = 0; i < _configService.Current.ServerStorage.Count; ++i) { var x = _configService.Current.ServerStorage[i]; - if (x.ServerUri.Equals(ApiController.ElezenServiceUri, StringComparison.OrdinalIgnoreCase)) + if (x.ServerUri.Equals(ApiController.SnowcloakServiceUri, StringComparison.OrdinalIgnoreCase)) elfExists = true; } if (!elfExists) { - _logger.LogDebug("Re-adding missing server {uri}", ApiController.ElezenServiceUri); - _configService.Current.ServerStorage.Insert(0, new ServerStorage() { ServerUri = ApiController.ElezenServiceUri, ServerName = ApiController.ElezenServer }); + _logger.LogDebug("Re-adding missing server {uri}", ApiController.SnowcloakServiceUri); + _configService.Current.ServerStorage.Insert(0, new ServerStorage() { ServerUri = ApiController.SnowcloakServiceUri, ServerName = ApiController.SnowcloakServer }); if (_configService.Current.CurrentServer >= 0) _configService.Current.CurrentServer++; } diff --git a/MareSynchronos/UI/CharaDataHubUi.cs b/MareSynchronos/UI/CharaDataHubUi.cs index 683c28c..bc4da09 100644 --- a/MareSynchronos/UI/CharaDataHubUi.cs +++ b/MareSynchronos/UI/CharaDataHubUi.cs @@ -79,7 +79,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase UiSharedService uiSharedService, ServerConfigurationManager serverConfigurationManager, DalamudUtilService dalamudUtilService, FileDialogManager fileDialogManager, PairManager pairManager, CharaDataGposeTogetherManager charaDataGposeTogetherManager) - : base(logger, mediator, "Elezen Character Data Hub###ElezenCharaDataUI", performanceCollectorService) + : base(logger, mediator, "Snowcloak Character Data Hub###SnowcloakCharaDataUI", performanceCollectorService) { SetWindowSizeConstraints(); diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index a0f419f..dbd2c6d 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -60,7 +60,7 @@ public class CompactUi : WindowMediatorSubscriberBase public CompactUi(ILogger logger, UiSharedService uiShared, MareConfigService configService, ApiController apiController, PairManager pairManager, ChatService chatService, ServerConfigurationManager serverManager, MareMediator mediator, FileUploadManager fileTransferManager, UidDisplayHandler uidDisplayHandler, CharaDataManager charaDataManager, PerformanceCollectorService performanceCollectorService) - : base(logger, mediator, "###ElezenSyncMainUI", performanceCollectorService) + : base(logger, mediator, "###SnowcloakSyncMainUI", performanceCollectorService) { _uiSharedService = uiShared; _configService = configService; @@ -80,11 +80,11 @@ public class CompactUi : WindowMediatorSubscriberBase #if DEBUG string dev = "Dev Build"; var ver = Assembly.GetExecutingAssembly().GetName().Version!; - WindowName = $"Elezen Sync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###ElezenSyncMainUIDev"; + WindowName = $"Snowcloak Sync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###SnowcloakSyncMainUIDev"; Toggle(); #else var ver = Assembly.GetExecutingAssembly().GetName().Version!; - WindowName = "Elezen Sync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###ElezenSyncMainUI"; + WindowName = "Snowcloak Sync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###SnowcloakSyncMainUI"; #endif Mediator.Subscribe(this, (_) => IsOpen = true); Mediator.Subscribe(this, (_) => IsOpen = false); @@ -104,7 +104,7 @@ public class CompactUi : WindowMediatorSubscriberBase protected override void DrawInternal() { - if (_serverManager.CurrentApiUrl.Equals(ApiController.ElezenServiceUri, StringComparison.Ordinal)) + if (_serverManager.CurrentApiUrl.Equals(ApiController.SnowcloakServiceUri, StringComparison.Ordinal)) UiSharedService.AccentColor = new Vector4(1.0f, 0.8666f, 0.06666f, 1.0f); else UiSharedService.AccentColor = ImGuiColors.ParsedGreen; @@ -121,8 +121,8 @@ public class CompactUi : WindowMediatorSubscriberBase ImGui.AlignTextToFramePadding(); ImGui.TextColored(ImGuiColors.DalamudRed, unsupported); } - UiSharedService.ColorTextWrapped($"Your Elezen installation is out of date, the current version is {ver.Major}.{ver.Minor}.{ver.Build}. " + - $"It is highly recommended to keep Elezen up to date. Open /xlplugins and update the plugin.", ImGuiColors.DalamudRed); + UiSharedService.ColorTextWrapped($"Your Snowcloak installation is out of date, the current version is {ver.Major}.{ver.Minor}.{ver.Build}. " + + $"It is highly recommended to keep Snowcloak up to date. Open /xlplugins and update the plugin.", ImGuiColors.DalamudRed); } using (ImRaii.PushId("header")) DrawUIDHeader(); @@ -525,7 +525,7 @@ public class CompactUi : WindowMediatorSubscriberBase { Mediator.Publish(new OpenSettingsUiMessage()); } - UiSharedService.AttachToolTip("Open the Elezen Settings"); + UiSharedService.AttachToolTip("Open the Snowcloak Settings"); ImGui.SameLine(); //Important to draw the uidText consistently ImGui.SetCursorPos(originalPos); diff --git a/MareSynchronos/UI/DownloadUi.cs b/MareSynchronos/UI/DownloadUi.cs index 79a9dc0..4fae8a0 100644 --- a/MareSynchronos/UI/DownloadUi.cs +++ b/MareSynchronos/UI/DownloadUi.cs @@ -23,7 +23,7 @@ public class DownloadUi : WindowMediatorSubscriberBase public DownloadUi(ILogger logger, DalamudUtilService dalamudUtilService, MareConfigService configService, FileUploadManager fileTransferManager, MareMediator mediator, UiSharedService uiShared, PerformanceCollectorService performanceCollectorService) - : base(logger, mediator, "Elezen Downloads", performanceCollectorService) + : base(logger, mediator, "Snowcloak Downloads", performanceCollectorService) { _dalamudUtilService = dalamudUtilService; _configService = configService; diff --git a/MareSynchronos/UI/DtrEntry.cs b/MareSynchronos/UI/DtrEntry.cs index 8932bbf..72b89dc 100644 --- a/MareSynchronos/UI/DtrEntry.cs +++ b/MareSynchronos/UI/DtrEntry.cs @@ -163,19 +163,19 @@ public sealed class DtrEntry : IDisposable, IHostedService .Select(x => string.Format("{0}", _configService.Current.PreferNoteInDtrTooltip ? x.GetNoteOrName() : x.PlayerName)); } - tooltip = $"Elezen: Connected{Environment.NewLine}----------{Environment.NewLine}{string.Join(Environment.NewLine, visiblePairs)}"; + tooltip = $"Snowcloak: Connected{Environment.NewLine}----------{Environment.NewLine}{string.Join(Environment.NewLine, visiblePairs)}"; colors = _configService.Current.DtrColorsPairsInRange; } else { - tooltip = "Elezen: Connected"; + tooltip = "Snowcloak: Connected"; colors = _configService.Current.DtrColorsDefault; } } else { text = RenderDtrStyle(_configService.Current.DtrStyle, "\uE04C"); - tooltip = "Elezen: Not Connected"; + tooltip = "Snowcloak: Not Connected"; colors = _configService.Current.DtrColorsNotConnected; } diff --git a/MareSynchronos/UI/EditProfileUi.cs b/MareSynchronos/UI/EditProfileUi.cs index 62dc896..190aafd 100644 --- a/MareSynchronos/UI/EditProfileUi.cs +++ b/MareSynchronos/UI/EditProfileUi.cs @@ -35,7 +35,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase ApiController apiController, UiSharedService uiSharedService, FileDialogManager fileDialogManager, ServerConfigurationManager serverConfigurationManager, MareProfileManager mareProfileManager, PerformanceCollectorService performanceCollectorService) - : base(logger, mediator, "Elezen Edit Profile###ElezenSyncEditProfileUI", performanceCollectorService) + : base(logger, mediator, "Snowcloak Edit Profile###SnowcloakSyncEditProfileUI", performanceCollectorService) { IsOpen = false; this.SizeConstraints = new() diff --git a/MareSynchronos/UI/IntroUI.cs b/MareSynchronos/UI/IntroUI.cs index 4eec6eb..43fc81b 100644 --- a/MareSynchronos/UI/IntroUI.cs +++ b/MareSynchronos/UI/IntroUI.cs @@ -38,7 +38,7 @@ public partial class IntroUi : WindowMediatorSubscriberBase public IntroUi(ILogger logger, UiSharedService uiShared, MareConfigService configService, CacheMonitor fileCacheManager, ServerConfigurationManager serverConfigurationManager, MareMediator mareMediator, - PerformanceCollectorService performanceCollectorService, DalamudUtilService dalamudUtilService, AccountRegistrationService registerService) : base(logger, mareMediator, "Elezen Setup", performanceCollectorService) + PerformanceCollectorService performanceCollectorService, DalamudUtilService dalamudUtilService, AccountRegistrationService registerService) : base(logger, mareMediator, "Snowcloak Setup", performanceCollectorService) { _uiShared = uiShared; _configService = configService; @@ -108,9 +108,9 @@ public partial class IntroUi : WindowMediatorSubscriberBase if (!_configService.Current.AcceptedAgreement && !_readFirstPage) { - _uiShared.BigText("Welcome to Elezen"); + _uiShared.BigText("Welcome to Snowcloak"); ImGui.Separator(); - UiSharedService.TextWrapped("Elezen is a plugin that will replicate your full current character state including all Penumbra mods to other paired users. " + + UiSharedService.TextWrapped("Snowcloak is a plugin that will replicate your full current character state including all Penumbra mods to other paired users. " + "Note that you will have to have Penumbra as well as Glamourer installed to use this plugin."); UiSharedService.TextWrapped("We will have to setup a few things first before you can start using this plugin. Click on next to continue."); @@ -201,11 +201,11 @@ This service is provided as-is. } else { - UiSharedService.TextWrapped("To not unnecessary download files already present on your computer, Elezen will have to scan your Penumbra mod directory. " + - "Additionally, a local storage folder must be set where Elezen will download other character files to. " + + UiSharedService.TextWrapped("To not unnecessary download files already present on your computer, Snowcloak will have to scan your Penumbra mod directory. " + + "Additionally, a local storage folder must be set where Snowcloak will download other character files to. " + "Once the storage folder is set and the scan complete, this page will automatically forward to registration at a service."); UiSharedService.TextWrapped("Note: The initial scan, depending on the amount of mods you have, might take a while. Please wait until it is completed."); - UiSharedService.ColorTextWrapped("Warning: once past this step you should not delete the FileCache.csv of Elezen in the Plugin Configurations folder of Dalamud. " + + UiSharedService.ColorTextWrapped("Warning: once past this step you should not delete the FileCache.csv of Snowcloak in the Plugin Configurations folder of Dalamud. " + "Otherwise on the next launch a full re-scan of the file cache database will be initiated.", ImGuiColors.DalamudYellow); UiSharedService.ColorTextWrapped("Warning: if the scan is hanging and does nothing for a long time, chances are high your Penumbra folder is not set up properly.", ImGuiColors.DalamudYellow); _uiShared.DrawCacheDirectorySetting(); @@ -230,8 +230,8 @@ This service is provided as-is. _configService.Current.UseCompactor = useFileCompactor; _configService.Save(); } - UiSharedService.ColorTextWrapped("The File Compactor can save a tremendeous amount of space on the hard disk for downloads through Elezen. It will incur a minor CPU penalty on download but can speed up " + - "loading of other characters. It is recommended to keep it enabled. You can change this setting later anytime in the Elezen settings.", ImGuiColors.DalamudYellow); + UiSharedService.ColorTextWrapped("The File Compactor can save a tremendeous amount of space on the hard disk for downloads through Snowcloak. It will incur a minor CPU penalty on download but can speed up " + + "loading of other characters. It is recommended to keep it enabled. You can change this setting later anytime in the Snowcloak settings.", ImGuiColors.DalamudYellow); } } else if (!_uiShared.ApiController.IsConnected) @@ -239,7 +239,7 @@ This service is provided as-is. using (_uiShared.UidFont.Push()) ImGui.TextUnformatted("Service Registration"); ImGui.Separator(); - UiSharedService.TextWrapped("To be able to use Elezen you will have to register an account."); + UiSharedService.TextWrapped("To be able to use Snowcloak you will have to register an account."); UiSharedService.TextWrapped("Refer to the instructions at the location you obtained this plugin for more information or support."); ImGui.Separator(); @@ -251,8 +251,8 @@ This service is provided as-is. { ImGui.BeginDisabled(_registrationInProgress || _registrationSuccess || _secretKey.Length > 0); ImGui.Separator(); - ImGui.TextUnformatted("If you have not used Elezen before, click below to register a new account."); - if (_uiShared.IconTextButton(FontAwesomeIcon.Plus, "Register a new Elezen account")) + ImGui.TextUnformatted("If you have not used Snowcloak before, click below to register a new account."); + if (_uiShared.IconTextButton(FontAwesomeIcon.Plus, "Register a new Snowcloak account")) { _registrationInProgress = true; _ = Task.Run(async () => { diff --git a/MareSynchronos/UI/PermissionWindowUI.cs b/MareSynchronos/UI/PermissionWindowUI.cs index 10825a9..1cb3ad7 100644 --- a/MareSynchronos/UI/PermissionWindowUI.cs +++ b/MareSynchronos/UI/PermissionWindowUI.cs @@ -22,7 +22,7 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase public PermissionWindowUI(ILogger logger, Pair pair, MareMediator mediator, UiSharedService uiSharedService, ApiController apiController, PerformanceCollectorService performanceCollectorService) - : base(logger, mediator, "Permissions for " + pair.UserData.AliasOrUID + "###ElezenSyncPermissions" + pair.UserData.UID, performanceCollectorService) + : base(logger, mediator, "Permissions for " + pair.UserData.AliasOrUID + "###SnowcloakSyncPermissions" + pair.UserData.UID, performanceCollectorService) { Pair = pair; _uiSharedService = uiSharedService; diff --git a/MareSynchronos/UI/PlayerAnalysisUI.cs b/MareSynchronos/UI/PlayerAnalysisUI.cs index 682e602..2c1bc3d 100644 --- a/MareSynchronos/UI/PlayerAnalysisUI.cs +++ b/MareSynchronos/UI/PlayerAnalysisUI.cs @@ -24,7 +24,7 @@ public class PlayerAnalysisUI : WindowMediatorSubscriberBase public PlayerAnalysisUI(ILogger logger, Pair pair, MareMediator mediator, UiSharedService uiSharedService, PerformanceCollectorService performanceCollectorService) - : base(logger, mediator, "Character Data Analysis for " + pair.UserData.AliasOrUID + "###ElezenPairAnalysis" + pair.UserData.UID, performanceCollectorService) + : base(logger, mediator, "Character Data Analysis for " + pair.UserData.AliasOrUID + "###SnowcloakPairAnalysis" + pair.UserData.UID, performanceCollectorService) { Pair = pair; _uiSharedService = uiSharedService; diff --git a/MareSynchronos/UI/PopoutProfileUi.cs b/MareSynchronos/UI/PopoutProfileUi.cs index 66df89a..2c7538f 100644 --- a/MareSynchronos/UI/PopoutProfileUi.cs +++ b/MareSynchronos/UI/PopoutProfileUi.cs @@ -29,7 +29,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase public PopoutProfileUi(ILogger logger, MareMediator mediator, UiSharedService uiSharedService, ServerConfigurationManager serverManager, MareConfigService mareConfigService, - MareProfileManager mareProfileManager, PairManager pairManager, PerformanceCollectorService performanceCollectorService) : base(logger, mediator, "###ElezenSyncPopoutProfileUI", performanceCollectorService) + MareProfileManager mareProfileManager, PairManager pairManager, PerformanceCollectorService performanceCollectorService) : base(logger, mediator, "###SnowcloakSyncPopoutProfileUI", performanceCollectorService) { _uiSharedService = uiSharedService; _serverManager = serverManager; diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs index e5155e1..ec2f703 100644 --- a/MareSynchronos/UI/SettingsUi.cs +++ b/MareSynchronos/UI/SettingsUi.cs @@ -76,7 +76,7 @@ public class SettingsUi : WindowMediatorSubscriberBase FileCacheManager fileCacheManager, FileCompactor fileCompactor, ApiController apiController, IpcManager ipcManager, IpcProvider ipcProvider, CacheMonitor cacheMonitor, - DalamudUtilService dalamudUtilService, AccountRegistrationService registerService) : base(logger, mediator, "Elezen Settings", performanceCollector) + DalamudUtilService dalamudUtilService, AccountRegistrationService registerService) : base(logger, mediator, "Snowcloak Settings", performanceCollector) { _configService = configService; _pairManager = pairManager; @@ -728,7 +728,7 @@ public class SettingsUi : WindowMediatorSubscriberBase _uiShared.BigText("Storage"); - UiSharedService.TextWrapped("Elezen stores downloaded files from paired people permanently. This is to improve loading performance and requiring less downloads. " + + UiSharedService.TextWrapped("Snowcloak stores downloaded files from paired people permanently. This is to improve loading performance and requiring less downloads. " + "The storage governs itself by clearing data beyond the set storage size. Please set the storage size accordingly. It is not necessary to manually clear the storage."); _uiShared.DrawFileScanState(); @@ -745,7 +745,7 @@ public class SettingsUi : WindowMediatorSubscriberBase } ImGui.AlignTextToFramePadding(); - ImGui.TextUnformatted("Monitoring Elezen Storage Folder: " + (_cacheMonitor.MareWatcher?.Path ?? "Not monitoring")); + ImGui.TextUnformatted("Monitoring Snowcloak Storage Folder: " + (_cacheMonitor.MareWatcher?.Path ?? "Not monitoring")); if (string.IsNullOrEmpty(_cacheMonitor.MareWatcher?.Path)) { ImGui.SameLine(); @@ -763,7 +763,7 @@ public class SettingsUi : WindowMediatorSubscriberBase _cacheMonitor.StartPenumbraWatcher(_ipcManager.Penumbra.ModDirectory); _cacheMonitor.InvokeScan(); } - UiSharedService.AttachToolTip("Attempts to resume monitoring for both Penumbra and Elezen Storage. " + UiSharedService.AttachToolTip("Attempts to resume monitoring for both Penumbra and Snowcloak Storage. " + "Resuming the monitoring will also force a full scan to run." + Environment.NewLine + "If the button remains present after clicking it, consult /xllog for errors"); } @@ -776,8 +776,8 @@ public class SettingsUi : WindowMediatorSubscriberBase _cacheMonitor.StopMonitoring(); } } - UiSharedService.AttachToolTip("Stops the monitoring for both Penumbra and Elezen Storage. " - + "Do not stop the monitoring, unless you plan to move the Penumbra and Elezen Storage folders, to ensure correct functionality of Elezen." + Environment.NewLine + UiSharedService.AttachToolTip("Stops the monitoring for both Penumbra and Snowcloak Storage. " + + "Do not stop the monitoring, unless you plan to move the Penumbra and Snowcloak Storage folders, to ensure correct functionality of Snowcloak." + Environment.NewLine + "If you stop the monitoring to move folders around, resume it after you are finished moving the files." + UiSharedService.TooltipSeparator + "Hold CTRL to enable this button"); } @@ -794,7 +794,7 @@ public class SettingsUi : WindowMediatorSubscriberBase bool useFileCompactor = _configService.Current.UseCompactor; if (!useFileCompactor && !isLinux) { - UiSharedService.ColorTextWrapped("Hint: To free up space when using Elezen consider enabling the File Compactor", ImGuiColors.DalamudYellow); + UiSharedService.ColorTextWrapped("Hint: To free up space when using Snowcloak consider enabling the File Compactor", ImGuiColors.DalamudYellow); } if (isLinux || !_cacheMonitor.StorageisNTFS) ImGui.BeginDisabled(); if (ImGui.Checkbox("Use file compactor", ref useFileCompactor)) @@ -903,7 +903,7 @@ public class SettingsUi : WindowMediatorSubscriberBase } UiSharedService.AttachToolTip("You normally do not need to do this. THIS IS NOT SOMETHING YOU SHOULD BE DOING TO TRY TO FIX SYNC ISSUES." + Environment.NewLine + "This will solely remove all downloaded data from all players and will require you to re-download everything again." + Environment.NewLine - + "Elezen's storage is self-clearing and will not surpass the limit you have set it to." + Environment.NewLine + + "Snowcloak's storage is self-clearing and will not surpass the limit you have set it to." + Environment.NewLine + "If you still think you need to do this hold CTRL while pressing the button."); if (!_readClearCache) ImGui.EndDisabled(); @@ -975,14 +975,14 @@ public class SettingsUi : WindowMediatorSubscriberBase _configService.Current.EnableRightClickMenus = enableRightClickMenu; _configService.Save(); } - _uiShared.DrawHelpText("This will add Elezen related right click menu entries in the game UI on paired players."); + _uiShared.DrawHelpText("This will add Snowcloak related right click menu entries in the game UI on paired players."); if (ImGui.Checkbox("Display status and visible pair count in Server Info Bar", ref enableDtrEntry)) { _configService.Current.EnableDtrEntry = enableDtrEntry; _configService.Save(); } - _uiShared.DrawHelpText("This will add Elezen connection status and visible pair count in the Server Info Bar.\nYou can further configure this through your Dalamud Settings."); + _uiShared.DrawHelpText("This will add Snowcloak connection status and visible pair count in the Server Info Bar.\nYou can further configure this through your Dalamud Settings."); using (ImRaii.Disabled(!enableDtrEntry)) { @@ -1744,7 +1744,7 @@ public class SettingsUi : WindowMediatorSubscriberBase if (true) // Enable registration button for all servers { ImGui.SameLine(); - if (_uiShared.IconTextButton(FontAwesomeIcon.Plus, "Register a new Elezen account")) + if (_uiShared.IconTextButton(FontAwesomeIcon.Plus, "Register a new Snowcloak account")) { _registrationInProgress = true; _ = Task.Run(async () => { @@ -1800,7 +1800,7 @@ public class SettingsUi : WindowMediatorSubscriberBase { var serverName = selectedServer.ServerName; var serverUri = selectedServer.ServerUri; - var isMain = string.Equals(serverName, ApiController.ElezenServer, StringComparison.OrdinalIgnoreCase); + var isMain = string.Equals(serverName, ApiController.SnowcloakServer, StringComparison.OrdinalIgnoreCase); var flags = isMain ? ImGuiInputTextFlags.ReadOnly : ImGuiInputTextFlags.None; if (ImGui.InputText("Service URI", ref serverUri, 255, flags)) diff --git a/MareSynchronos/UI/StandaloneProfileUi.cs b/MareSynchronos/UI/StandaloneProfileUi.cs index 3273b3f..707e936 100644 --- a/MareSynchronos/UI/StandaloneProfileUi.cs +++ b/MareSynchronos/UI/StandaloneProfileUi.cs @@ -26,7 +26,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase public StandaloneProfileUi(ILogger logger, MareMediator mediator, UiSharedService uiBuilder, ServerConfigurationManager serverManager, MareProfileManager mareProfileManager, PairManager pairManager, Pair pair, PerformanceCollectorService performanceCollector) - : base(logger, mediator, "Profile of " + pair.UserData.AliasOrUID + "##ElezenSyncStandaloneProfileUI" + pair.UserData.AliasOrUID, performanceCollector) + : base(logger, mediator, "Profile of " + pair.UserData.AliasOrUID + "##SnowcloakSyncStandaloneProfileUI" + pair.UserData.AliasOrUID, performanceCollector) { _uiSharedService = uiBuilder; _serverManager = serverManager; diff --git a/MareSynchronos/WebAPI/AccountRegistrationService.cs b/MareSynchronos/WebAPI/AccountRegistrationService.cs index e3ad686..86fe8ac 100644 --- a/MareSynchronos/WebAPI/AccountRegistrationService.cs +++ b/MareSynchronos/WebAPI/AccountRegistrationService.cs @@ -50,13 +50,13 @@ public sealed class AccountRegistrationService : IDisposable var authApiUrl = _serverManager.CurrentApiUrl; // Override the API URL used for auth from remote config, if one is available - if (authApiUrl.Equals(ApiController.ElezenServiceUri, StringComparison.Ordinal)) + if (authApiUrl.Equals(ApiController.SnowcloakServiceUri, StringComparison.Ordinal)) { var config = await _remoteConfig.GetConfigAsync("mainServer").ConfigureAwait(false) ?? new(); if (!string.IsNullOrEmpty(config.ApiUrl)) authApiUrl = config.ApiUrl; else - authApiUrl = ApiController.ElezenServiceApiUri; + authApiUrl = ApiController.SnowcloakServiceApiUri; } var secretKey = GenerateSecretKey(); diff --git a/MareSynchronos/WebAPI/SignalR/ApiController.cs b/MareSynchronos/WebAPI/SignalR/ApiController.cs index a9978e5..8ddb14a 100644 --- a/MareSynchronos/WebAPI/SignalR/ApiController.cs +++ b/MareSynchronos/WebAPI/SignalR/ApiController.cs @@ -21,10 +21,10 @@ namespace MareSynchronos.WebAPI; #pragma warning disable MA0040 public sealed partial class ApiController : DisposableMediatorSubscriberBase, IMareHubClient { - public const string ElezenServer = "Snowcloak Main Server"; - public const string ElezenServiceUri = "wss://hub.snowcloak-sync.com"; - public const string ElezenServiceApiUri = "wss://hub.snowcloak-sync.com/"; - public const string ElezenServiceHubUri = "wss://hub.snowcloak-sync.com/mare"; + public const string SnowcloakServer = "Snowcloak Main Server"; + public const string SnowcloakServiceUri = "wss://hub.snowcloak-sync.com"; + public const string SnowcloakServiceApiUri = "wss://hub.snowcloak-sync.com/"; + public const string SnowcloakServiceHubUri = "wss://hub.snowcloak-sync.com/mare"; private readonly DalamudUtilService _dalamudUtil; private readonly HubFactory _hubFactory; @@ -194,7 +194,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM Mediator.Publish(new NotificationMessage("Client incompatible", $"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " + $"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}. " + - $"This client version is incompatible and will not be able to connect. Please update your Elezen client.", + $"This client version is incompatible and will not be able to connect. Please update your Snowcloak client.", NotificationType.Error)); } await StopConnection(ServerState.VersionMisMatch).ConfigureAwait(false); @@ -206,7 +206,7 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM Mediator.Publish(new NotificationMessage("Client outdated", $"Your client is outdated ({currentClientVer.Major}.{currentClientVer.Minor}.{currentClientVer.Build}), current is: " + $"{_connectionDto.CurrentClientVersion.Major}.{_connectionDto.CurrentClientVersion.Minor}.{_connectionDto.CurrentClientVersion.Build}. " + - $"Please keep your Elezen client up-to-date.", + $"Please keep your Snowcloak client up-to-date.", NotificationType.Warning, TimeSpan.FromSeconds(15))); } diff --git a/MareSynchronos/WebAPI/SignalR/HubFactory.cs b/MareSynchronos/WebAPI/SignalR/HubFactory.cs index 740fd14..66cb188 100644 --- a/MareSynchronos/WebAPI/SignalR/HubFactory.cs +++ b/MareSynchronos/WebAPI/SignalR/HubFactory.cs @@ -87,14 +87,14 @@ public class HubFactory : MediatorSubscriberBase }; } - if (_serverConfigurationManager.CurrentApiUrl.Equals(ApiController.ElezenServiceUri, StringComparison.Ordinal)) + if (_serverConfigurationManager.CurrentApiUrl.Equals(ApiController.SnowcloakServiceUri, StringComparison.Ordinal)) { var mainServerConfig = await _remoteConfig.GetConfigAsync("mainServer").ConfigureAwait(false) ?? new(); defaultConfig = mainServerConfig; if (string.IsNullOrEmpty(mainServerConfig.ApiUrl)) - defaultConfig.ApiUrl = ApiController.ElezenServiceApiUri; + defaultConfig.ApiUrl = ApiController.SnowcloakServiceApiUri; if (string.IsNullOrEmpty(mainServerConfig.HubUrl)) - defaultConfig.HubUrl = ApiController.ElezenServiceHubUri; + defaultConfig.HubUrl = ApiController.SnowcloakServiceHubUri; } string jsonResponse; diff --git a/MareSynchronos/WebAPI/SignalR/TokenProvider.cs b/MareSynchronos/WebAPI/SignalR/TokenProvider.cs index 7603ebe..db5d598 100644 --- a/MareSynchronos/WebAPI/SignalR/TokenProvider.cs +++ b/MareSynchronos/WebAPI/SignalR/TokenProvider.cs @@ -73,13 +73,13 @@ public sealed class TokenProvider : IDisposable, IMediatorSubscriber var authApiUrl = _serverManager.CurrentApiUrl; // Override the API URL used for auth from remote config, if one is available - if (authApiUrl.Equals(ApiController.ElezenServiceUri, StringComparison.Ordinal)) + if (authApiUrl.Equals(ApiController.SnowcloakServiceUri, StringComparison.Ordinal)) { var config = await _remoteConfig.GetConfigAsync("mainServer").ConfigureAwait(false) ?? new(); if (!string.IsNullOrEmpty(config.ApiUrl)) authApiUrl = config.ApiUrl; else - authApiUrl = ApiController.ElezenServiceApiUri; + authApiUrl = ApiController.SnowcloakServiceApiUri; } try