fix: Escape Markup with MarkupLineInterpolated, because we're not stu…

…pid (any longer)
CurseForgeCommunity · Jul 21, 2022 · c8f5132 · c8f5132
1 parent 279323b
commit c8f5132
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/CurseForge.Minecraft.Serverpack.Launcher/Dependencies.cs b/CurseForge.Minecraft.Serverpack.Launcher/Dependencies.cs
@@ -1,4 +1,7 @@
-using System;
+using CurseForge.APIClient;
+using CurseForge.APIClient.Models.Mods;
+using Spectre.Console;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -7,9 +10,6 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Threading.Tasks;
-using CurseForge.APIClient;
-using CurseForge.APIClient.Models.Mods;
-using Spectre.Console;
 
 namespace CurseForge.Minecraft.Serverpack.Launcher
 {
@@ -79,7 +79,7 @@ private static async Task DownloadMinecraftLibraries(ApiClient cfApiClient, stri
 				{
 					var modData = await cfApiClient.GetModAsync(file.ProjectId);
 					manualInstall.Add((modData.Data, mod.Data));
-					AnsiConsole.MarkupLine($"[red]Could not find a download URL for the mod {modData.Data.Name} ({mod.Data.DisplayName}), needs a manual install[/]");
+					AnsiConsole.MarkupLineInterpolated($"[red]Could not find a download URL for the mod {modData.Data.Name} ({mod.Data.DisplayName}), needs a manual install[/]");
 					continue;
 				}
 
@@ -173,7 +173,7 @@ private static async Task DownloadLoaderDependencies<T>(HttpClient _client, stri
 
 					if (!await CheckIfEndpointExists(_client, forgeDlUrl))
 					{
-						AnsiConsole.MarkupLine($"[red]Could not find an installer for the version of Forge that we need ({info.NonMapped["forgeVersion"]}) for Minecraft {info.NonMapped["minecraftVersion"]}[/]");
+						AnsiConsole.MarkupLineInterpolated($"[red]Could not find an installer for the version of Forge that we need ({info.NonMapped["forgeVersion"]}) for Minecraft {info.NonMapped["minecraftVersion"]}[/]");
 						throw new Exception("Missing Forge installer");
 					}
 

diff --git a/CurseForge.Minecraft.Serverpack.Launcher/Program.cs b/CurseForge.Minecraft.Serverpack.Launcher/Program.cs
@@ -1,3 +1,6 @@
+using CurseForge.APIClient;
+using CurseForge.APIClient.Models.Mods;
+using Spectre.Console;
 using System;
 using System.CommandLine;
 using System.Diagnostics;
@@ -8,9 +11,6 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Threading.Tasks;
-using CurseForge.APIClient;
-using CurseForge.APIClient.Models.Mods;
-using Spectre.Console;
 
 namespace CurseForge.Minecraft.Serverpack.Launcher
 {