From 88dcc831c14f7b59ab2e5b8cf5763cd831635048 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Sun, 1 Sep 2024 14:00:53 +0300 Subject: [PATCH] Remove calls to FormattedMessage obsolete methods (#31706) * Remove FormattedMessage obsolete methods * Oops --- .../AdminMessagePopupMessage.xaml.cs | 4 ++-- .../AdminRemarks/AdminMessagePopupWindow.xaml.cs | 2 +- .../Administration/UI/Bwoink/BwoinkPanel.xaml.cs | 2 +- Content.Client/Changelog/ChangelogTab.xaml.cs | 4 ++-- Content.Client/Chat/UI/SpeechBubble.cs | 2 +- Content.Client/Credits/CreditsWindow.xaml.cs | 2 +- .../CriminalRecordsConsoleWindow.xaml.cs | 2 +- .../Guidebook/Controls/GuideReagentEmbed.xaml.cs | 6 +++--- .../Controls/GuideReagentReaction.xaml.cs | 2 +- Content.Client/Info/InfoSection.xaml.cs | 4 ++-- Content.Client/Info/ServerInfo.cs | 2 +- Content.Client/Message/RichTextLabelExt.cs | 2 +- .../PlayTimeTracking/JobRequirementsManager.cs | 4 ++-- .../Power/PowerMonitoringWindow.xaml.Widgets.cs | 4 ++-- .../Robotics/UI/RoboticsConsoleWindow.xaml.cs | 10 +++++----- Content.Client/RoundEnd/RoundEndSummaryWindow.cs | 4 ++-- .../Systems/Alerts/Controls/AlertControl.cs | 6 +++--- .../Systems/Chat/Widgets/ChatBox.xaml.cs | 2 +- .../Ui/AnalysisConsoleMenu.xaml.cs | 10 +++++----- .../Administration/Managers/AdminManager.cs | 4 ++-- .../Cargo/Systems/CargoSystem.Bounty.cs | 4 ++-- Content.Server/Chat/Systems/ChatSystem.cs | 4 ++-- .../DetailExaminable/DetailExaminableystem.cs | 4 ++-- Content.Server/Dragon/DragonRiftSystem.cs | 2 +- .../Explosion/EntitySystems/TriggerSystem.cs | 2 +- .../Gateway/Systems/GatewayGeneratorSystem.cs | 2 +- Content.Server/Nuke/NukeCodePaperSystem.cs | 2 +- Content.Server/Nuke/NukeSystem.cs | 2 +- Content.Server/Points/PointSystem.cs | 4 ++-- .../Power/EntitySystems/CableMultitoolSystem.cs | 4 ++-- .../Station/Commands/StationCommand.cs | 4 ++-- .../Traitor/Systems/TraitorCodePaperSystem.cs | 2 +- .../Equipment/Systems/ArtifactAnalyzerSystem.cs | 14 +++++++------- .../Examine/ExamineSystemShared.Group.cs | 2 +- Content.Shared/Examine/ExamineSystemShared.cs | 4 ++-- .../HealthExaminable/HealthExaminableSystem.cs | 6 +++--- .../Preferences/HumanoidCharacterProfile.cs | 4 ++-- .../Loadouts/Effects/GroupLoadoutEffect.cs | 2 +- .../Preferences/Loadouts/RoleLoadout.cs | 2 +- .../Research/Systems/SharedResearchSystem.cs | 16 ++++++++-------- 40 files changed, 82 insertions(+), 82 deletions(-) diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs index 7bb425f618e507..c8d7e915a1e8d5 100644 --- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs @@ -1,4 +1,4 @@ -using Content.Shared.Administration.Notes; +using Content.Shared.Administration.Notes; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; @@ -13,7 +13,7 @@ public AdminMessagePopupMessage(AdminMessageEuiState.Message message) { RobustXamlLoader.Load(this); - Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString( + Admin.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString( "admin-notes-message-admin", ("admin", message.AdminName), ("date", message.AddedOn.ToLocalTime())))); diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs index bf2ca9bec410fc..148cbf4e18e248 100644 --- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs @@ -49,7 +49,7 @@ public void SetState(AdminMessageEuiState state) MessageContainer.AddChild(new AdminMessagePopupMessage(message)); } - Description.SetMessage(FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length)))); + Description.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length)))); } private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj) diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml.cs index 7a032d0bbd760f..833514e4aa2425 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml.cs @@ -59,7 +59,7 @@ public void ReceiveLine(SharedBwoinkSystem.BwoinkTextMessage message) Unread++; var formatted = new FormattedMessage(1); - formatted.AddMarkup($"[color=gray]{message.SentAt.ToShortTimeString()}[/color] {message.Text}"); + formatted.AddMarkupOrThrow($"[color=gray]{message.SentAt.ToShortTimeString()}[/color] {message.Text}"); TextOutput.AddMessage(formatted); LastMessage = message.SentAt; } diff --git a/Content.Client/Changelog/ChangelogTab.xaml.cs b/Content.Client/Changelog/ChangelogTab.xaml.cs index 8fbeaab5f40d14..ca86f8a6b2e4cb 100644 --- a/Content.Client/Changelog/ChangelogTab.xaml.cs +++ b/Content.Client/Changelog/ChangelogTab.xaml.cs @@ -131,13 +131,13 @@ public void PopulateChangelog(ChangelogManager.Changelog changelog) Margin = new Thickness(6, 0, 0, 0), }; authorLabel.SetMessage( - FormattedMessage.FromMarkup(Loc.GetString("changelog-author-changed", ("author", author)))); + FormattedMessage.FromMarkupOrThrow(Loc.GetString("changelog-author-changed", ("author", author)))); ChangelogBody.AddChild(authorLabel); foreach (var change in groupedEntry.SelectMany(c => c.Changes)) { var text = new RichTextLabel(); - text.SetMessage(FormattedMessage.FromMarkup(change.Message)); + text.SetMessage(FormattedMessage.FromMarkupOrThrow(change.Message)); ChangelogBody.AddChild(new BoxContainer { Orientation = LayoutOrientation.Horizontal, diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs index adb61d10e62712..32e9f4ae9be530 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -180,7 +180,7 @@ protected FormattedMessage FormatSpeech(string message, Color? fontColor = null) var msg = new FormattedMessage(); if (fontColor != null) msg.PushColor(fontColor.Value); - msg.AddMarkup(message); + msg.AddMarkupOrThrow(message); return msg; } diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs index 60ac57984546e3..ba240209533a2f 100644 --- a/Content.Client/Credits/CreditsWindow.xaml.cs +++ b/Content.Client/Credits/CreditsWindow.xaml.cs @@ -145,7 +145,7 @@ void AddSection(string title, string path, bool markup = false) var text = _resourceManager.ContentFileReadAllText($"/Credits/{path}"); if (markup) { - label.SetMessage(FormattedMessage.FromMarkup(text.Trim())); + label.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim())); } else { diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs index 21aa54c9622f85..7cae290fe1788c 100644 --- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs +++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs @@ -227,7 +227,7 @@ private void PopulateRecordContainer(GeneralStationRecord stationRecord, Crimina StatusOptionButton.SelectId((int) criminalRecord.Status); if (criminalRecord.Reason is {} reason) { - var message = FormattedMessage.FromMarkup(Loc.GetString("criminal-records-console-wanted-reason")); + var message = FormattedMessage.FromMarkupOrThrow(Loc.GetString("criminal-records-console-wanted-reason")); message.AddText($": {reason}"); WantedReason.SetMessage(message); WantedReason.Visible = true; diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs index 87931bf8455994..f8d1c7e9720ef7 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs @@ -140,7 +140,7 @@ private void GenerateControl(ReagentPrototype reagent) var i = 0; foreach (var effectString in effect.EffectDescriptions) { - descMsg.AddMarkup(effectString); + descMsg.AddMarkupOrThrow(effectString); i++; if (i < descriptionsCount) descMsg.PushNewline(); @@ -174,7 +174,7 @@ private void GenerateControl(ReagentPrototype reagent) var i = 0; foreach (var effectString in guideEntryRegistryPlant.PlantMetabolisms) { - descMsg.AddMarkup(effectString); + descMsg.AddMarkupOrThrow(effectString); i++; if (i < descriptionsCount) descMsg.PushNewline(); @@ -195,7 +195,7 @@ private void GenerateControl(ReagentPrototype reagent) FormattedMessage description = new(); description.AddText(reagent.LocalizedDescription); description.PushNewline(); - description.AddMarkup(Loc.GetString("guidebook-reagent-physical-description", + description.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-physical-description", ("description", reagent.LocalizedPhysicalDescription))); ReagentDescription.SetMessage(description); } diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs index 168f352d1ab51c..135dc5522acfd9 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs @@ -155,7 +155,7 @@ private void SetReagents(Dictionary reagents, ref RichTextL var i = 0; foreach (var (product, amount) in reagents.OrderByDescending(p => p.Value)) { - msg.AddMarkup(Loc.GetString("guidebook-reagent-recipes-reagent-display", + msg.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-recipes-reagent-display", ("reagent", protoMan.Index(product).LocalizedName), ("ratio", amount))); i++; if (i < reagentCount) diff --git a/Content.Client/Info/InfoSection.xaml.cs b/Content.Client/Info/InfoSection.xaml.cs index ab9d352d32f822..9e10a4d7b4b717 100644 --- a/Content.Client/Info/InfoSection.xaml.cs +++ b/Content.Client/Info/InfoSection.xaml.cs @@ -1,4 +1,4 @@ -using Robust.Client.AutoGenerated; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Utility; @@ -18,7 +18,7 @@ public void SetText(string title, string text, bool markup = false) { TitleLabel.Text = title; if (markup) - Content.SetMessage(FormattedMessage.FromMarkup(text.Trim())); + Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim())); else Content.SetMessage(text); } diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs index 23be7506267c24..901fc913374143 100644 --- a/Content.Client/Info/ServerInfo.cs +++ b/Content.Client/Info/ServerInfo.cs @@ -24,7 +24,7 @@ public ServerInfo() } public void SetInfoBlob(string markup) { - _richTextLabel.SetMessage(FormattedMessage.FromMarkup(markup)); + _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup)); } } } diff --git a/Content.Client/Message/RichTextLabelExt.cs b/Content.Client/Message/RichTextLabelExt.cs index 7ff6390764b21e..ee3c00fa1b8721 100644 --- a/Content.Client/Message/RichTextLabelExt.cs +++ b/Content.Client/Message/RichTextLabelExt.cs @@ -15,7 +15,7 @@ public static class RichTextLabelExt /// public static RichTextLabel SetMarkup(this RichTextLabel label, string markup) { - label.SetMessage(FormattedMessage.FromMarkup(markup)); + label.SetMessage(FormattedMessage.FromMarkupOrThrow(markup)); return label; } diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs index 8ce22489c7181a..6d52c50290e5bb 100644 --- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs +++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Client.Lobby; using Content.Shared.CCVar; using Content.Shared.Players; @@ -133,7 +133,7 @@ public bool CheckRoleRequirements(HashSet? requirements, Humanoi reasons.Add(jobReason.ToMarkup()); } - reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkup(string.Join('\n', reasons)); + reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkupOrThrow(string.Join('\n', reasons)); return reason == null; } diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs index d995299207051b..3f7ccfb903b753 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs @@ -309,7 +309,7 @@ private void UpdateWarningLabel(PowerMonitoringFlags flags) BorderThickness = new Thickness(2), }; - msg.AddMarkup(Loc.GetString("power-monitoring-window-rogue-power-consumer")); + msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-rogue-power-consumer")); SystemWarningPanel.Visible = true; } @@ -322,7 +322,7 @@ private void UpdateWarningLabel(PowerMonitoringFlags flags) BorderThickness = new Thickness(2), }; - msg.AddMarkup(Loc.GetString("power-monitoring-window-power-net-abnormalities")); + msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-power-net-abnormalities")); SystemWarningPanel.Visible = true; } diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs index 87d7e62c392ba9..06e5674d9cb33b 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs @@ -128,12 +128,12 @@ private void PopulateData() }; var text = new FormattedMessage(); - text.PushMarkup(Loc.GetString("robotics-console-model", ("name", model))); - text.AddMarkup(Loc.GetString("robotics-console-designation")); + text.AddMarkupOrThrow($"{Loc.GetString("robotics-console-model", ("name", model))}\n"); + text.AddMarkupOrThrow(Loc.GetString("robotics-console-designation")); text.AddText($" {data.Name}\n"); // prevent players trolling by naming borg [color=red]satan[/color] - text.PushMarkup(Loc.GetString("robotics-console-battery", ("charge", (int) (data.Charge * 100f)), ("color", batteryColor))); - text.PushMarkup(Loc.GetString("robotics-console-brain", ("brain", data.HasBrain))); - text.AddMarkup(Loc.GetString("robotics-console-modules", ("count", data.ModuleCount))); + text.AddMarkupOrThrow($"{Loc.GetString("robotics-console-battery", ("charge", (int)(data.Charge * 100f)), ("color", batteryColor))}\n"); + text.AddMarkupOrThrow($"{Loc.GetString("robotics-console-brain", ("brain", data.HasBrain))}\n"); + text.AddMarkupOrThrow(Loc.GetString("robotics-console-modules", ("count", data.ModuleCount))); BorgInfo.SetMessage(text); // how the turntables diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs index 9c9f83a4275a65..7108e4cca8f70a 100644 --- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs +++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs @@ -61,9 +61,9 @@ private BoxContainer MakeRoundEndSummaryTab(string gamemode, string roundEnd, Ti //Gamemode Name var gamemodeLabel = new RichTextLabel(); var gamemodeMessage = new FormattedMessage(); - gamemodeMessage.AddMarkup(Loc.GetString("round-end-summary-window-round-id-label", ("roundId", roundId))); + gamemodeMessage.AddMarkupOrThrow(Loc.GetString("round-end-summary-window-round-id-label", ("roundId", roundId))); gamemodeMessage.AddText(" "); - gamemodeMessage.AddMarkup(Loc.GetString("round-end-summary-window-gamemode-name-label", ("gamemode", gamemode))); + gamemodeMessage.AddMarkupOrThrow(Loc.GetString("round-end-summary-window-gamemode-name-label", ("gamemode", gamemode))); gamemodeLabel.SetMessage(gamemodeMessage); roundEndSummaryContainer.AddChild(gamemodeLabel); diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs index 19432cd799242d..b0e2e394833da5 100644 --- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs +++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Content.Client.Actions.UI; using Content.Client.Cooldown; using Content.Shared.Alert; @@ -69,8 +69,8 @@ public AlertControl(AlertPrototype alert, short? severity) private Control SupplyTooltip(Control? sender) { - var msg = FormattedMessage.FromMarkup(Loc.GetString(Alert.Name)); - var desc = FormattedMessage.FromMarkup(Loc.GetString(Alert.Description)); + var msg = FormattedMessage.FromMarkupOrThrow(Loc.GetString(Alert.Name)); + var desc = FormattedMessage.FromMarkupOrThrow(Loc.GetString(Alert.Description)); return new ActionAlertTooltip(msg, desc) {Cooldown = Cooldown}; } diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs index a33bee20f9f9b5..0696ae9d3f99cb 100644 --- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs +++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs @@ -100,7 +100,7 @@ public void AddLine(string message, Color color) { var formatted = new FormattedMessage(3); formatted.PushColor(color); - formatted.AddMarkup(message); + formatted.AddMarkupOrThrow(message); formatted.Pop(); Contents.AddMessage(formatted); } diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs index 2723db1efbf00c..40a6c6a1d9a812 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs @@ -139,11 +139,11 @@ public void UpdateInformationDisplay(AnalysisConsoleUpdateState state) { if (state.Paused) { - message.AddMarkup(Loc.GetString("analysis-console-info-scanner-paused")); + message.AddMarkupOrThrow(Loc.GetString("analysis-console-info-scanner-paused")); } else { - message.AddMarkup(Loc.GetString("analysis-console-info-scanner")); + message.AddMarkupOrThrow(Loc.GetString("analysis-console-info-scanner")); } Information.SetMessage(message); UpdateArtifactIcon(null); //set it to blank @@ -155,11 +155,11 @@ public void UpdateInformationDisplay(AnalysisConsoleUpdateState state) if (state.ScanReport == null) { if (!state.AnalyzerConnected) //no analyzer connected - message.AddMarkup(Loc.GetString("analysis-console-info-no-scanner")); + message.AddMarkupOrThrow(Loc.GetString("analysis-console-info-no-scanner")); else if (!state.CanScan) //no artifact - message.AddMarkup(Loc.GetString("analysis-console-info-no-artifact")); + message.AddMarkupOrThrow(Loc.GetString("analysis-console-info-no-artifact")); else if (state.Artifact == null) //ready to go - message.AddMarkup(Loc.GetString("analysis-console-info-ready")); + message.AddMarkupOrThrow(Loc.GetString("analysis-console-info-ready")); } else { diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 36cea4c156e9a3..4e271009f71cc5 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -658,7 +658,7 @@ public record struct CommandPermissionsUnassignedError(CommandSpec Command) : IC { public FormattedMessage DescribeInner() { - return FormattedMessage.FromMarkup($"The command {Command.FullName()} is missing permission flags and cannot be executed."); + return FormattedMessage.FromMarkupOrThrow($"The command {Command.FullName()} is missing permission flags and cannot be executed."); } public string? Expression { get; set; } @@ -671,7 +671,7 @@ public record struct NoPermissionError(CommandSpec Command) : IConError { public FormattedMessage DescribeInner() { - return FormattedMessage.FromMarkup($"You do not have permission to execute {Command.FullName()}"); + return FormattedMessage.FromMarkupOrThrow($"You do not have permission to execute {Command.FullName()}"); } public string? Expression { get; set; } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs index e118f4936392f4..37d7015fd9f2f0 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs @@ -119,12 +119,12 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData msg.PushNewline(); foreach (var entry in prototype.Entries) { - msg.AddMarkup($"- {Loc.GetString("bounty-console-manifest-entry", + msg.AddMarkupOrThrow($"- {Loc.GetString("bounty-console-manifest-entry", ("amount", entry.Amount), ("item", Loc.GetString(entry.Name)))}"); msg.PushNewline(); } - msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward))); + msg.AddMarkupOrThrow(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward))); _paperSystem.SetContent((uid, paper), msg.ToMarkup()); } diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 4875aba0aa69db..bcbc6a6144c92c 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -495,7 +495,7 @@ private void SendEntityWhisper( if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker) return; - var message = TransformSpeech(source, FormattedMessage.RemoveMarkup(originalMessage)); + var message = TransformSpeech(source, FormattedMessage.RemoveMarkupOrThrow(originalMessage)); if (message.Length == 0) return; @@ -593,7 +593,7 @@ private void SendEntityEmote( var wrappedMessage = Loc.GetString("chat-manager-entity-me-wrap-message", ("entityName", name), ("entity", ent), - ("message", FormattedMessage.RemoveMarkup(action))); + ("message", FormattedMessage.RemoveMarkupOrThrow(action))); if (checkEmote) TryEmoteChatInput(source, action); diff --git a/Content.Server/DetailExaminable/DetailExaminableystem.cs b/Content.Server/DetailExaminable/DetailExaminableystem.cs index c0acd87ca434b5..85ca5326079a59 100644 --- a/Content.Server/DetailExaminable/DetailExaminableystem.cs +++ b/Content.Server/DetailExaminable/DetailExaminableystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Examine; +using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Verbs; using Robust.Shared.Utility; @@ -28,7 +28,7 @@ private void OnGetExamineVerbs(EntityUid uid, DetailExaminableComponent componen Act = () => { var markup = new FormattedMessage(); - markup.AddMarkup(component.Content); + markup.AddMarkupOrThrow(component.Content); _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false); }, Text = Loc.GetString("detail-examinable-verb-text"), diff --git a/Content.Server/Dragon/DragonRiftSystem.cs b/Content.Server/Dragon/DragonRiftSystem.cs index 101f030bfc10d8..998834835effd1 100644 --- a/Content.Server/Dragon/DragonRiftSystem.cs +++ b/Content.Server/Dragon/DragonRiftSystem.cs @@ -71,7 +71,7 @@ public override void Update(float frameTime) Dirty(uid, comp); var msg = Loc.GetString("carp-rift-warning", - ("location", FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((uid, xform))))); + ("location", FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString((uid, xform))))); _chat.DispatchGlobalAnnouncement(msg, playSound: false, colorOverride: Color.Red); _audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), true); _navMap.SetBeaconEnabled(uid, true); diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs index 1208cd1771bf08..98d541996f297d 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs @@ -211,7 +211,7 @@ private void HandleRattleTrigger(EntityUid uid, RattleComponent component, Trigg return; // Gets location of the implant - var posText = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString(uid)); + var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(uid)); var critMessage = Loc.GetString(component.CritMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText)); var deathMessage = Loc.GetString(component.DeathMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText)); diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs index c934fb66bfb061..7dcd42e06fa0f6 100644 --- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs +++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs @@ -138,7 +138,7 @@ private void GenerateDestination(EntityUid uid, GatewayGeneratorComponent? gener // Create the gateway. var gatewayUid = SpawnAtPosition(generator.Proto, originCoords); var gatewayComp = Comp(gatewayUid); - _gateway.SetDestinationName(gatewayUid, FormattedMessage.FromMarkup($"[color=#D381C996]{gatewayName}[/color]"), gatewayComp); + _gateway.SetDestinationName(gatewayUid, FormattedMessage.FromMarkupOrThrow($"[color=#D381C996]{gatewayName}[/color]"), gatewayComp); _gateway.SetEnabled(gatewayUid, true, gatewayComp); generator.Generated.Add(mapUid); } diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs index e890aa0845f80e..aac2d2361d09c1 100644 --- a/Content.Server/Nuke/NukeCodePaperSystem.cs +++ b/Content.Server/Nuke/NukeCodePaperSystem.cs @@ -124,7 +124,7 @@ private bool TryGetRelativeNukeCode( } codesMessage.PushNewline(); - codesMessage.AddMarkup(Loc.GetString("nuke-codes-list", ("name", MetaData(nukeUid).EntityName), ("code", nuke.Code))); + codesMessage.AddMarkupOrThrow(Loc.GetString("nuke-codes-list", ("name", MetaData(nukeUid).EntityName), ("code", nuke.Code))); break; } diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index 3146ce69894e20..109d790be1e975 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -461,7 +461,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null) // warn a crew var announcement = Loc.GetString("nuke-component-announcement-armed", ("time", (int) component.RemainingTime), - ("location", FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((uid, nukeXform))))); + ("location", FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString((uid, nukeXform))))); var sender = Loc.GetString("nuke-component-announcement-sender"); _chatSystem.DispatchStationAnnouncement(stationUid ?? uid, announcement, sender, false, null, Color.Red); diff --git a/Content.Server/Points/PointSystem.cs b/Content.Server/Points/PointSystem.cs index b5f94d097ed6a3..cf33f8e3c634ac 100644 --- a/Content.Server/Points/PointSystem.cs +++ b/Content.Server/Points/PointSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Shared.FixedPoint; using Content.Shared.Points; using JetBrains.Annotations; @@ -76,7 +76,7 @@ public override FormattedMessage GetScoreboard(EntityUid uid, PointManagerCompon if (!_player.TryGetPlayerData(id, out var data)) continue; - msg.AddMarkup(Loc.GetString("point-scoreboard-list", + msg.AddMarkupOrThrow(Loc.GetString("point-scoreboard-list", ("place", place), ("name", data.UserName), ("points", points.Int()))); diff --git a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs index 4a63be894ef2bd..761f274ba5fd47 100644 --- a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs +++ b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs @@ -31,7 +31,7 @@ private void OnAfterInteractUsing(EntityUid uid, CableComponent component, After if (args.Handled || args.Target == null || !args.CanReach || !_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality)) return; - var markup = FormattedMessage.FromMarkup(GenerateCableMarkup(uid)); + var markup = FormattedMessage.FromMarkupOrThrow(GenerateCableMarkup(uid)); _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false); args.Handled = true; } @@ -56,7 +56,7 @@ private void OnGetExamineVerbs(EntityUid uid, CableComponent component, GetVerbs Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/zap.svg.192dpi.png")), Act = () => { - var markup = FormattedMessage.FromMarkup(GenerateCableMarkup(uid)); + var markup = FormattedMessage.FromMarkupOrThrow(GenerateCableMarkup(uid)); _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false); } }; diff --git a/Content.Server/Station/Commands/StationCommand.cs b/Content.Server/Station/Commands/StationCommand.cs index 96e47d63363458..e1013548ac8c61 100644 --- a/Content.Server/Station/Commands/StationCommand.cs +++ b/Content.Server/Station/Commands/StationCommand.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using System.Linq; using Content.Server.Administration; using Content.Server.Cargo.Systems; @@ -128,7 +128,7 @@ public record struct OnlyOneStationsError : IConError { public FormattedMessage DescribeInner() { - return FormattedMessage.FromMarkup("This command doesn't function if there is more than one or no stations, explicitly specify a station with the ent command or similar."); + return FormattedMessage.FromMarkupOrThrow("This command doesn't function if there is more than one or no stations, explicitly specify a station with the ent command or similar."); } public string? Expression { get; set; } diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs index 5a252fc105a5a6..bccbd80bf5a453 100644 --- a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs +++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs @@ -79,7 +79,7 @@ private bool TryGetTraitorCode([NotNullWhen(true)] out string? traitorCode, Trai break; codesMessage.PushNewline(); - codesMessage.AddMarkup(code); + codesMessage.AddMarkupOrThrow(code); } if (!codesMessage.IsEmpty) diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs index 3681e3d402aff4..67c67de57f3bdc 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs @@ -304,15 +304,15 @@ private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, An var n = component.LastAnalyzedNode; - msg.AddMarkup(Loc.GetString("analysis-console-info-id", ("id", n.Id))); + msg.AddMarkupOrThrow(Loc.GetString("analysis-console-info-id", ("id", n.Id))); msg.PushNewline(); - msg.AddMarkup(Loc.GetString("analysis-console-info-depth", ("depth", n.Depth))); + msg.AddMarkupOrThrow(Loc.GetString("analysis-console-info-depth", ("depth", n.Depth))); msg.PushNewline(); var activated = n.Triggered ? "analysis-console-info-triggered-true" : "analysis-console-info-triggered-false"; - msg.AddMarkup(Loc.GetString(activated)); + msg.AddMarkupOrThrow(Loc.GetString(activated)); msg.PushNewline(); msg.PushNewline(); @@ -321,7 +321,7 @@ private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, An var triggerProto = _prototype.Index(n.Trigger); if (triggerProto.TriggerHint != null) { - msg.AddMarkup(Loc.GetString("analysis-console-info-trigger", + msg.AddMarkupOrThrow(Loc.GetString("analysis-console-info-trigger", ("trigger", Loc.GetString(triggerProto.TriggerHint))) + "\n"); needSecondNewline = true; } @@ -329,7 +329,7 @@ private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, An var effectproto = _prototype.Index(n.Effect); if (effectproto.EffectHint != null) { - msg.AddMarkup(Loc.GetString("analysis-console-info-effect", + msg.AddMarkupOrThrow(Loc.GetString("analysis-console-info-effect", ("effect", Loc.GetString(effectproto.EffectHint))) + "\n"); needSecondNewline = true; } @@ -337,11 +337,11 @@ private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, An if (needSecondNewline) msg.PushNewline(); - msg.AddMarkup(Loc.GetString("analysis-console-info-edges", ("edges", n.Edges.Count))); + msg.AddMarkupOrThrow(Loc.GetString("analysis-console-info-edges", ("edges", n.Edges.Count))); msg.PushNewline(); if (component.LastAnalyzerPointValue != null) - msg.AddMarkup(Loc.GetString("analysis-console-info-value", ("value", component.LastAnalyzerPointValue))); + msg.AddMarkupOrThrow(Loc.GetString("analysis-console-info-value", ("value", component.LastAnalyzerPointValue))); return msg; } diff --git a/Content.Shared/Examine/ExamineSystemShared.Group.cs b/Content.Shared/Examine/ExamineSystemShared.Group.cs index 22aeeeeab873fa..aaf850a5d31ab1 100644 --- a/Content.Shared/Examine/ExamineSystemShared.Group.cs +++ b/Content.Shared/Examine/ExamineSystemShared.Group.cs @@ -75,7 +75,7 @@ public void SendExamineGroup(EntityUid user, EntityUid target, ExamineGroup grou if (group.Title != null) { - message.AddMarkup(Loc.GetString(group.Title)); + message.AddMarkupOrThrow(Loc.GetString(group.Title)); message.PushNewline(); } message.AddMessage(GetFormattedMessageFromExamineEntries(group.Entries)); diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 3d83886f2d34ba..1e97e8f3405b15 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -447,7 +447,7 @@ public void PushMessage(FormattedMessage message, int priority=0) /// public void PushMarkup(string markup, int priority=0) { - PushMessage(FormattedMessage.FromMarkup(markup), priority); + PushMessage(FormattedMessage.FromMarkupOrThrow(markup), priority); } /// @@ -495,7 +495,7 @@ public void AddMessage(FormattedMessage message, int priority = 0) /// public void AddMarkup(string markup, int priority=0) { - AddMessage(FormattedMessage.FromMarkup(markup), priority); + AddMessage(FormattedMessage.FromMarkupOrThrow(markup), priority); } /// diff --git a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs index 141f3be51265ef..0645c51a473cd5 100644 --- a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs +++ b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage; using Content.Shared.Examine; using Content.Shared.FixedPoint; using Content.Shared.IdentityManagement; @@ -85,12 +85,12 @@ public FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent co { first = false; } - msg.AddMarkup(chosenLocStr); + msg.AddMarkupOrThrow(chosenLocStr); } if (msg.IsEmpty) { - msg.AddMarkup(Loc.GetString($"health-examinable-{component.LocPrefix}-none")); + msg.AddMarkupOrThrow(Loc.GetString($"health-examinable-{component.LocPrefix}-none")); } // Anything else want to add on to this? diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index c3ebe0d1a38372..54ae8c5788b456 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -541,11 +541,11 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection string flavortext; if (FlavorText.Length > MaxDescLength) { - flavortext = FormattedMessage.RemoveMarkup(FlavorText)[..MaxDescLength]; + flavortext = FormattedMessage.RemoveMarkupOrThrow(FlavorText)[..MaxDescLength]; } else { - flavortext = FormattedMessage.RemoveMarkup(FlavorText); + flavortext = FormattedMessage.RemoveMarkupOrThrow(FlavorText); } var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex); diff --git a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs index 47e3bea7719716..83e6cc08e8ffc1 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs @@ -26,7 +26,7 @@ public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout load reasons.Add(reason.ToMarkup()); } - reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkup(string.Join('\n', reasons)); + reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkupOrThrow(string.Join('\n', reasons)); return reason == null; } } diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs index f943c9ea8a0765..6ba9f9018f2c34 100644 --- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs +++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs @@ -233,7 +233,7 @@ public bool IsValid(HumanoidCharacterProfile profile, ICommonSession? session, P if (!protoManager.TryIndex(loadout, out var loadoutProto)) { // Uhh - reason = FormattedMessage.FromMarkup(""); + reason = FormattedMessage.FromMarkupOrThrow(""); return false; } diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs index d8ce0634d3e29c..06e12e0798acba 100644 --- a/Content.Shared/Research/Systems/SharedResearchSystem.cs +++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Shared.Lathe; using Content.Shared.Research.Components; using Content.Shared.Research.Prototypes; @@ -157,42 +157,42 @@ public FormattedMessage GetTechnologyDescription( if (includeTier) { disciplinePrototype ??= PrototypeManager.Index(technology.Discipline); - description.AddMarkup(Loc.GetString("research-console-tier-discipline-info", + description.AddMarkupOrThrow(Loc.GetString("research-console-tier-discipline-info", ("tier", technology.Tier), ("color", disciplinePrototype.Color), ("discipline", Loc.GetString(disciplinePrototype.Name)))); description.PushNewline(); } if (includeCost) { - description.AddMarkup(Loc.GetString("research-console-cost", ("amount", technology.Cost))); + description.AddMarkupOrThrow(Loc.GetString("research-console-cost", ("amount", technology.Cost))); description.PushNewline(); } if (includePrereqs && technology.TechnologyPrerequisites.Any()) { - description.AddMarkup(Loc.GetString("research-console-prereqs-list-start")); + description.AddMarkupOrThrow(Loc.GetString("research-console-prereqs-list-start")); foreach (var recipe in technology.TechnologyPrerequisites) { var techProto = PrototypeManager.Index(recipe); description.PushNewline(); - description.AddMarkup(Loc.GetString("research-console-prereqs-list-entry", + description.AddMarkupOrThrow(Loc.GetString("research-console-prereqs-list-entry", ("text", Loc.GetString(techProto.Name)))); } description.PushNewline(); } - description.AddMarkup(Loc.GetString("research-console-unlocks-list-start")); + description.AddMarkupOrThrow(Loc.GetString("research-console-unlocks-list-start")); foreach (var recipe in technology.RecipeUnlocks) { var recipeProto = PrototypeManager.Index(recipe); description.PushNewline(); - description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry", + description.AddMarkupOrThrow(Loc.GetString("research-console-unlocks-list-entry", ("name", _lathe.GetRecipeName(recipeProto)))); } foreach (var generic in technology.GenericUnlocks) { description.PushNewline(); - description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry-generic", + description.AddMarkupOrThrow(Loc.GetString("research-console-unlocks-list-entry-generic", ("text", Loc.GetString(generic.UnlockDescription)))); }