ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-21 07:17:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: add staging/beta key

Browse source
This commit is contained in:
goaaats 2022-01-02 21:16:44 +01:00
parent 0200468149
commit 25e01599ec
No known key found for this signature in database
GPG key ID: F18F057873895461
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/Configuration/Internal/DalamudConfiguration.cs
View file

@ -16,6 +16,11 @@ namespace Dalamud.Configuration.Internal
[Serializable] [Serializable]
internal sealed class DalamudConfiguration internal sealed class DalamudConfiguration
{ {
/// <summary>
/// Currently used beta key for Dalamud staging builds.
/// </summary>
public const string DalamudCurrentBetaKey = "Testing6015";
private static readonly JsonSerializerSettings SerializerSettings = new() private static readonly JsonSerializerSettings SerializerSettings = new()
{ {
TypeNameHandling = TypeNameHandling.All, TypeNameHandling = TypeNameHandling.All,
@ -78,9 +83,9 @@ namespace Dalamud.Configuration.Internal
public bool DoPluginTest { get; set; } = false; public bool DoPluginTest { get; set; } = false;
/// <summary> /// <summary>
/// Gets or sets a value indicating whether or not Dalamud testing builds should be used. /// Gets or sets a key to opt into Dalamud staging builds.
/// </summary> /// </summary>
public bool DoDalamudTest { get; set; } = false; public string? DalamudBetaKey { get; set; } = null;
/// <summary> /// <summary>
/// Gets or sets a value indicating whether or not XL should download the Dalamud .NET runtime. /// Gets or sets a value indicating whether or not XL should download the Dalamud .NET runtime.
@ -198,7 +203,7 @@ namespace Dalamud.Configuration.Internal
public bool IsAntiAntiDebugEnabled { get; set; } = false; public bool IsAntiAntiDebugEnabled { get; set; } = false;
/// <summary> /// <summary>
/// Gets or sets the kind of beta to download when <see cref="DoDalamudTest"/> is set to true. /// Gets or sets the kind of beta to download when <see cref="DalamudBetaKey"/> matches the server value.
/// </summary> /// </summary>
public string DalamudBetaKind { get; set; } public string DalamudBetaKind { get; set; }

7
Dalamud/Interface/Internal/DalamudInterface.cs
View file

@ -384,8 +384,10 @@ namespace Dalamud.Interface.Internal
if (config.DoDalamudTest) if (config.DoDalamudTest)
{ {
#endif #endif
#pragma warning disable SA1137
ImGui.SetCursorPos(cursor); ImGui.SetCursorPos(cursor);
ImGui.Image(this.logoTexture.ImGuiHandle, imageSize); ImGui.Image(this.logoTexture.ImGuiHandle, imageSize);
#pragma warning restore SA1137
#if !DEBUG #if !DEBUG
} }
#endif #endif
@ -519,9 +521,10 @@ namespace Dalamud.Interface.Internal
ImGui.Separator(); ImGui.Separator();
if (ImGui.MenuItem("Enable Dalamud testing", string.Empty, configuration.DoDalamudTest)) var isBeta = configuration.DalamudBetaKey == DalamudConfiguration.DalamudCurrentBetaKey;
if (ImGui.MenuItem("Enable Dalamud testing", string.Empty, isBeta))
{ {
configuration.DoDalamudTest ^= true; configuration.DalamudBetaKey = isBeta ? null : DalamudConfiguration.DalamudCurrentBetaKey;
configuration.Save(); configuration.Save();
} }

12
Dalamud/Support/Troubleshooting.cs
View file

@ -70,10 +70,10 @@ namespace Dalamud.Support
DalamudGitHash = Util.GetGitHash(), DalamudGitHash = Util.GetGitHash(),
GameVersion = startInfo.GameVersion.ToString(), GameVersion = startInfo.GameVersion.ToString(),
Language = startInfo.Language.ToString(), Language = startInfo.Language.ToString(),
DoDalamudTest = configuration.DoDalamudTest, BetaKey = configuration.DalamudBetaKey,
DoPluginTest = configuration.DoPluginTest, DoPluginTest = configuration.DoPluginTest,
InterfaceLoaded = interfaceManager?.IsReady ?? false, InterfaceLoaded = interfaceManager?.IsReady ?? false,
ThirdRepo = configuration.ThirdRepoList, HasThirdRepo = configuration.ThirdRepoList is { Count: > 0 },
ForcedMinHook = EnvironmentConfiguration.DalamudForceMinHook, ForcedMinHook = EnvironmentConfiguration.DalamudForceMinHook,
}; };
@ -107,7 +107,9 @@ namespace Dalamud.Support
public string Language { get; set; } public string Language { get; set; }
public bool DoDalamudTest { get; set; } public bool DoDalamudTest => false;
public string? BetaKey { get; set; }
public bool DoPluginTest { get; set; } public bool DoPluginTest { get; set; }
@ -115,7 +117,9 @@ namespace Dalamud.Support
public bool ForcedMinHook { get; set; } public bool ForcedMinHook { get; set; }
public List<ThirdPartyRepoSettings> ThirdRepo { get; set; } public List<ThirdPartyRepoSettings> ThirdRepo => new();
public bool HasThirdRepo { get; set; }
} }
} }
} }