Skip to content

Allow TC Mode to alter Nebula text regarding 'Download' and 'Up-to-Date' messages #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wookieejedi merged 2 commits into from
Jan 27, 2025
Merged

Allow TC Mode to alter Nebula text regarding 'Download' and 'Up-to-Date' messages #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62a819f
Allow TC Mode to alter Nebula Download and Up-to-Date Text
wookieejedi Jan 25, 2025
35d7210
Merge branch 'KnossosNET:main' into nebula-text-tc-options
wookieejedi Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Knossos.NET/Models/CustomLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,24 @@ public static class CustomLauncher
/// </summary>
public static string WindowTitle { get; private set; } = "Knet Launcher";

/// <summary>
/// Custom text for the message that states when Nebula is downloading the repo_minimal.json on the Home Screen.
/// By default this is "Nebula: repo_minimal.json is up to date!"
/// </summary>
public static string NebulaTextDownloading { get; private set; } = "Downloading repo_minimal.json";

/// <summary>
/// Custom text for the message that states when Nebula is up-to-date for the repo_minimal.json on the Home Screen.
/// By default this is "Nebula: repo_minimal.json is up to date!"
/// </summary>
public static string NebulaTextUpToDate { get; private set; } = "Nebula: repo_minimal.json is up to date!";

/// <summary>
/// Custom text for the tool tip that shows when hovering over the Nebula status on the Home Screen.
/// By default this is "The repo_minimal.json file contains info on all the mods available in Nebula, without this you will not be able to install new mods or engine builds"
/// </summary>
public static string NebulaTextToolTip { get; private set; } = "The repo_minimal.json file contains info on all the mods available in Nebula, without this you will not be able to install new mods or engine builds";

/// <summary>
/// Starting width size of the launcher window
/// This is also the min width
Expand Down Expand Up @@ -250,6 +268,15 @@ private static void ReadCustomFile()
if (customData.WindowTitle != null)
WindowTitle = customData.WindowTitle;

if (customData.NebulaTextDownloading != null)
NebulaTextDownloading = customData.NebulaTextDownloading;

if (customData.NebulaTextUpToDate != null)
NebulaTextUpToDate = customData.NebulaTextUpToDate;

if (customData.NebulaTextToolTip != null)
NebulaTextToolTip = customData.NebulaTextToolTip;

if (customData.WindowWidth != null)
WindowWidth = customData.WindowWidth;

Expand Down Expand Up @@ -318,6 +345,9 @@ struct CustomFileData
public bool? UseCustomFSODataFolder { get; set; }
public bool? AllowLauncherUpdates { get; set; }
public string? WindowTitle { get; set; }
public string? NebulaTextDownloading { get; set; }
public string? NebulaTextUpToDate { get; set; }
public string? NebulaTextToolTip { get; set; }
public int? WindowWidth { get; set; }
public int? WindowHeight { get; set; }
public bool? MenuTaskButtonAtTheEnd { get; set; }
Expand Down
11 changes: 7 additions & 4 deletions Knossos.NET/Models/Nebula.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,15 @@ public static async Task Trinity()
{
bool displayUpdates = settings.NewerModsVersions.Any() && !CustomLauncher.IsCustomMode ? true : false;
var webEtag = await KnUtils.GetUrlFileEtag(repoUrl).ConfigureAwait(false);
var neb_text_downloading = CustomLauncher.IsCustomMode ? CustomLauncher.NebulaTextDownloading : "Downloading repo_minimal.json";
var neb_text_uptodate = CustomLauncher.IsCustomMode ? CustomLauncher.NebulaTextUpToDate : "Nebula: repo_minimal.json is up to date!";
var neb_text_tooltip = CustomLauncher.IsCustomMode ? CustomLauncher.NebulaTextToolTip : "The repo_minimal.json file contains info on all the mods available in Nebula, without this you will not be able to install new mods or engine builds";
if (!File.Exists(KnUtils.GetKnossosDataFolderPath() + Path.DirectorySeparatorChar + "repo_minimal.json") || settings.etag != webEtag)
{
//Download the repo_minimal.json
if (TaskViewModel.Instance != null)
{
var result = await Dispatcher.UIThread.InvokeAsync(async()=>await TaskViewModel.Instance.AddFileDownloadTask(repoUrl, KnUtils.GetKnossosDataFolderPath() + Path.DirectorySeparatorChar + "repo_minimal_temp.json", "Downloading repo_minimal.json", true, "The repo_minimal.json file contains info on all the mods available in Nebula, without this you will not be able to install new mods or engine builds"), DispatcherPriority.Background).ConfigureAwait(false);
var result = await Dispatcher.UIThread.InvokeAsync(async()=>await TaskViewModel.Instance.AddFileDownloadTask(repoUrl, KnUtils.GetKnossosDataFolderPath() + Path.DirectorySeparatorChar + "repo_minimal_temp.json", neb_text_downloading, true, neb_text_tooltip), DispatcherPriority.Background).ConfigureAwait(false);

if (cancellationToken!.IsCancellationRequested)
{
Expand Down Expand Up @@ -162,7 +165,7 @@ public static async Task Trinity()
else
{
//No update is needed
Dispatcher.UIThread.Invoke(() => TaskViewModel.Instance?.AddMessageTask("Nebula: repo_minimal.json is up to date!"), DispatcherPriority.Background);
Dispatcher.UIThread.Invoke(() => TaskViewModel.Instance?.AddMessageTask(neb_text_uptodate, neb_text_tooltip), DispatcherPriority.Background);
Log.Add(Log.LogSeverity.Information, "Nebula.Trinity()", "repo_minimal.json is up to date!");
displayUpdates = false;
repoLoaded = true;
Expand Down Expand Up @@ -880,7 +883,7 @@ public static async Task<bool> UploadLog(string logString)
}
else
{
Log.Add(Log.LogSeverity.Error, "Nebula.UploadLog", "Error uploading log to nebula, reason: " + reply.Value.reason);
Log.Add(Log.LogSeverity.Error, "Nebula.UploadLog", "Error uploading log to Nebula, reason: " + reply.Value.reason);
}
}
}
Expand Down Expand Up @@ -1248,7 +1251,7 @@ public static async Task<bool> IsModEditable(string id)
{
members += item.user + "(" + item.role.ToString() + ") ";
}
Log.Add(Log.LogSeverity.Information, "Nebula.GetTeamMembers", "Mod id: " + modid + " members: " + members);
Log.Add(Log.LogSeverity.Information, "Nebula.GetTeamMembers", "Mod ID: " + modid + " members: " + members);
}
}
else
Expand Down
8 changes: 4 additions & 4 deletions Knossos.NET/ViewModels/Windows/DevModCreateNewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,22 @@ private async Task<bool> Verify()
//ID
if (ModId.Replace(" ", "").Length <= 2)
{
await MessageBox.Show(MainWindow.instance, "Mod id cant be empty or be less than 3 characters: " + ModId, "Validation error", MessageBox.MessageBoxButtons.OK);
await MessageBox.Show(MainWindow.instance, "Mod ID cant be empty or be less than 3 characters: " + ModId, "Validation error", MessageBox.MessageBoxButtons.OK);
return false;
}
if (ModId.ToLower() == "tools" || ModId.ToLower() == "fso")
{
await MessageBox.Show(MainWindow.instance, "Mod id: " + ModId+" is a reserved value", "Validation error", MessageBox.MessageBoxButtons.OK);
await MessageBox.Show(MainWindow.instance, "Mod ID: " + ModId+" is a reserved value", "Validation error", MessageBox.MessageBoxButtons.OK);
return false;
}
if (await Nebula.IsModIdInNebula(ModId))
{
await MessageBox.Show(MainWindow.instance, "Mod id already exist in Nebula: " + ModId, "Validation error", MessageBox.MessageBoxButtons.OK);
await MessageBox.Show(MainWindow.instance, "Mod ID already exist in Nebula: " + ModId, "Validation error", MessageBox.MessageBoxButtons.OK);
return false;
}
if (Knossos.GetInstalledModList(ModId).Any() || Knossos.GetInstalledBuildsList(ModId).Any())
{
await MessageBox.Show(MainWindow.instance, "Mod id already exist locally: " + ModId, "Validation error", MessageBox.MessageBoxButtons.OK);
await MessageBox.Show(MainWindow.instance, "Mod ID already exist locally: " + ModId, "Validation error", MessageBox.MessageBoxButtons.OK);
return false;
}
//If modtype = Mod it has to have a parent mod
Expand Down
2 changes: 1 addition & 1 deletion Knossos.NET/Views/CustomHomeView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
Margin="0,2,0,0" Height="50" Width="150" FontSize="24"
IsVisible="{Binding !Installing}" IsEnabled="{Binding NebulaServices}"></Button>
<Button Command="{Binding HardcodedButtonCommand}" Name="ButtonInfo" CommandParameter="details"
Content="More info" Classes="Quaternary" HorizontalAlignment="Center"
Content="More Info" Classes="Quaternary" HorizontalAlignment="Center"
Margin="0,2,0,0" Height="30" Width="150"
IsVisible="{Binding !Installing}" IsEnabled="{Binding NebulaServices}"></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="cancel"
Expand Down