t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add multi chracter key checks

Browse Source
This commit is contained in:
Stanley Dimant
2024-07-19 11:45:38 +02:00
committed by Loporrit
parent d9d10c42de
commit 0228c2343b
7 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MareSynchronos/UI/CompactUI.cs
View File

@@ -598,6 +598,7 @@ public class CompactUi : WindowMediatorSubscriberBase
ServerState.RateLimited => "You are rate limited for (re)connecting too often. Disconnect, wait 10 minutes and try again.",
ServerState.Connected => string.Empty,
ServerState.NoSecretKey => "You have no secret key set for this current character. Use the button below or open the settings and set a secret key for the current character. You can reuse the same secret key for multiple characters.",
ServerState.MultiChara => "Your Character Configuration has multiple characters configured with same name and world. You will not be able to connect until you fix this issue. Remove the duplicates from the configuration in Settings -> Service Settings -> Character Management and reconnect manually after.",
_ => string.Empty
};
}
@@ -616,6 +617,7 @@ public class CompactUi : WindowMediatorSubscriberBase
ServerState.Offline => ImGuiColors.DalamudRed,
ServerState.RateLimited => ImGuiColors.DalamudYellow,
ServerState.NoSecretKey => ImGuiColors.DalamudYellow,
ServerState.MultiChara => ImGuiColors.DalamudYellow,
_ => ImGuiColors.DalamudRed
};
}
@@ -633,6 +635,7 @@ public class CompactUi : WindowMediatorSubscriberBase
ServerState.Offline => "Unavailable",
ServerState.RateLimited => "Rate Limited",
ServerState.NoSecretKey => "No Secret Key",
ServerState.MultiChara => "Duplicate Characters",
ServerState.Connected => _apiController.DisplayName,
_ => string.Empty
};

8
MareSynchronos/UI/SettingsUi.cs
View File

@@ -1273,7 +1273,13 @@ public class SettingsUi : WindowMediatorSubscriberBase
}
var friendlyName = secretKey.FriendlyName;
if (ImGui.TreeNode($"chara", $"Character: {item.CharacterName}, World: {worldPreview}, Secret Key: {friendlyName}"))
bool thisIsYou = false;
if (string.Equals(_dalamudUtilService.GetPlayerName(), item.CharacterName, StringComparison.OrdinalIgnoreCase)
&& _dalamudUtilService.GetWorldId() == worldIdx)
{
thisIsYou = true;
}
if (ImGui.TreeNode($"chara", (thisIsYou ? "[CURRENT] " : "") + $"Character: {item.CharacterName}, World: {worldPreview}, Secret Key: {friendlyName}"))
{
var charaName = item.CharacterName;
if (ImGui.InputText("Character Name", ref charaName, 64))

15
MareSynchronos/UI/UISharedService.cs
View File

@@ -911,16 +911,13 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
ImGui.EndCombo();
}
if (_serverConfigurationManager.GetSecretKey(_serverSelectionIndex) != null)
ImGui.SameLine();
var text = "Connect";
if (_serverSelectionIndex == _serverConfigurationManager.CurrentServerIndex) text = "Reconnect";
if (NormalizedIconTextButton(FontAwesomeIcon.Link, text))
{
ImGui.SameLine();
var text = "Connect";
if (_serverSelectionIndex == _serverConfigurationManager.CurrentServerIndex) text = "Reconnect";
if (NormalizedIconTextButton(FontAwesomeIcon.Link, text))
{
_serverConfigurationManager.SelectServer(_serverSelectionIndex);
_ = _apiController.CreateConnections();
}
_serverConfigurationManager.SelectServer(_serverSelectionIndex);
_ = _apiController.CreateConnections();
}
if (ImGui.TreeNode("Add Custom Service"))