tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove calls to FormattedMessage obsolete methods (#31706)

Browse Source 
* Remove FormattedMessage obsolete methods

* Oops
This commit is contained in:
Winkarst
2024-09-01 14:00:53 +03:00
committed by GitHub
parent ff4c347a21
commit 88dcc831c1
40 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs
View File

@@ -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 sealed partial class AdminMessagePopupMessage : Control
{
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()))));

2
Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
View File

@@ -49,7 +49,7 @@ public sealed partial class AdminMessagePopupWindow : Control
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)

2
Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Client.Administration.UI.Bwoink
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;
}

4
Content.Client/Changelog/ChangelogTab.xaml.cs
View File

@@ -131,13 +131,13 @@ public sealed partial class ChangelogTab : Control
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,

2
Content.Client/Chat/UI/SpeechBubble.cs
View File

@@ -180,7 +180,7 @@ namespace Content.Client.Chat.UI
var msg = new FormattedMessage();
if (fontColor != null)
msg.PushColor(fontColor.Value);
msg.AddMarkup(message);
msg.AddMarkupOrThrow(message);
return msg;
}

2
Content.Client/Credits/CreditsWindow.xaml.cs
View File

@@ -145,7 +145,7 @@ namespace Content.Client.Credits
var text = _resourceManager.ContentFileReadAllText($"/Credits/{path}");
if (markup)
{
label.SetMessage(FormattedMessage.FromMarkup(text.Trim()));
label.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()));
}
else
{

2
Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
View File

@@ -227,7 +227,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
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;

6
Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs
View File

@@ -140,7 +140,7 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
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 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
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 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea
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);
}

2
Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
View File

@@ -155,7 +155,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
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<ReagentPrototype>(product).LocalizedName), ("ratio", amount)));
i++;
if (i < reagentCount)

4
Content.Client/Info/InfoSection.xaml.cs
View File

@@ -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 sealed partial class InfoSection : BoxContainer
{
TitleLabel.Text = title;
if (markup)
Content.SetMessage(FormattedMessage.FromMarkup(text.Trim()));
Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()));
else
Content.SetMessage(text);
}

2
Content.Client/Info/ServerInfo.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Client.Info
}
public void SetInfoBlob(string markup)
{
_richTextLabel.SetMessage(FormattedMessage.FromMarkup(markup));
_richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup));
}
}
}

2
Content.Client/Message/RichTextLabelExt.cs
View File

@@ -15,7 +15,7 @@ public static class RichTextLabelExt
/// </remarks>
public static RichTextLabel SetMarkup(this RichTextLabel label, string markup)
{
label.SetMessage(FormattedMessage.FromMarkup(markup));
label.SetMessage(FormattedMessage.FromMarkupOrThrow(markup));
return label;
}

4
Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
View File

@@ -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 sealed class JobRequirementsManager : ISharedPlaytimeManager
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;
}

4
Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
View File

@@ -309,7 +309,7 @@ public sealed partial class PowerMonitoringWindow
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 @@ public sealed partial class PowerMonitoringWindow
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;
}

10
Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
View File

@@ -128,12 +128,12 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
};
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

4
Content.Client/RoundEnd/RoundEndSummaryWindow.cs
View File

@@ -61,9 +61,9 @@ namespace Content.Client.RoundEnd
//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);

6
Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
View File

@@ -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 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls
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};
}

2
Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
View File

@@ -100,7 +100,7 @@ public partial class ChatBox : UIWidget
{
var formatted = new FormattedMessage(3);
formatted.PushColor(color);
formatted.AddMarkup(message);
formatted.AddMarkupOrThrow(message);
formatted.Pop();
Contents.AddMessage(formatted);
}

10
Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
View File

@@ -139,11 +139,11 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow
{
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 sealed partial class AnalysisConsoleMenu : FancyWindow
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
{

4
Content.Server/Administration/Managers/AdminManager.cs
View File

@@ -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; }

4
Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
View File

@@ -119,12 +119,12 @@ public sealed partial class CargoSystem
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());
}

4
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -495,7 +495,7 @@ public sealed partial class ChatSystem : SharedChatSystem
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 @@ public sealed partial class ChatSystem : SharedChatSystem
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);

4
Content.Server/DetailExaminable/DetailExaminableystem.cs
View File

@@ -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 @@ namespace Content.Server.DetailExaminable
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"),

2
Content.Server/Dragon/DragonRiftSystem.cs
View File

@@ -71,7 +71,7 @@ public sealed class DragonRiftSystem : EntitySystem
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);

2
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -211,7 +211,7 @@ namespace Content.Server.Explosion.EntitySystems
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));

2
Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
View File

@@ -138,7 +138,7 @@ public sealed class GatewayGeneratorSystem : EntitySystem
// Create the gateway.
var gatewayUid = SpawnAtPosition(generator.Proto, originCoords);
var gatewayComp = Comp<GatewayComponent>(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);
}

2
Content.Server/Nuke/NukeCodePaperSystem.cs
View File

@@ -124,7 +124,7 @@ namespace Content.Server.Nuke
}
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;
}

2
Content.Server/Nuke/NukeSystem.cs
View File

@@ -461,7 +461,7 @@ public sealed class NukeSystem : EntitySystem
// 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);

4
Content.Server/Points/PointSystem.cs
View File

@@ -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 sealed class PointSystem : SharedPointSystem
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())));

4
Content.Server/Power/EntitySystems/CableMultitoolSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Power.EntitySystems
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 @@ namespace Content.Server.Power.EntitySystems
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);
}
};

4
Content.Server/Station/Commands/StationCommand.cs
View File

@@ -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; }

2
Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
View File

@@ -79,7 +79,7 @@ public sealed class TraitorCodePaperSystem : EntitySystem
break;
codesMessage.PushNewline();
codesMessage.AddMarkup(code);
codesMessage.AddMarkupOrThrow(code);
}
if (!codesMessage.IsEmpty)

14
Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
View File

@@ -304,15 +304,15 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
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 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
var triggerProto = _prototype.Index<ArtifactTriggerPrototype>(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 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
var effectproto = _prototype.Index<ArtifactEffectPrototype>(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 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
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;
}

2
Content.Shared/Examine/ExamineSystemShared.Group.cs
View File

@@ -75,7 +75,7 @@ namespace Content.Shared.Examine
if (group.Title != null)
{
message.AddMarkup(Loc.GetString(group.Title));
message.AddMarkupOrThrow(Loc.GetString(group.Title));
message.PushNewline();
}
message.AddMessage(GetFormattedMessageFromExamineEntries(group.Entries));

4
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -447,7 +447,7 @@ namespace Content.Shared.Examine
/// <seealso cref="PushMessage"/>
public void PushMarkup(string markup, int priority=0)
{
PushMessage(FormattedMessage.FromMarkup(markup), priority);
PushMessage(FormattedMessage.FromMarkupOrThrow(markup), priority);
}
/// <summary>
@@ -495,7 +495,7 @@ namespace Content.Shared.Examine
/// <seealso cref="AddMessage"/>
public void AddMarkup(string markup, int priority=0)
{
AddMessage(FormattedMessage.FromMarkup(markup), priority);
AddMessage(FormattedMessage.FromMarkupOrThrow(markup), priority);
}
/// <summary>

6
Content.Shared/HealthExaminable/HealthExaminableSystem.cs
View File

@@ -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 sealed class HealthExaminableSystem : EntitySystem
{
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?

4
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View File

@@ -541,11 +541,11 @@ namespace Content.Shared.Preferences
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);

2
Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
View File

@@ -26,7 +26,7 @@ public sealed partial class GroupLoadoutEffect : LoadoutEffect
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;
}
}

2
Content.Shared/Preferences/Loadouts/RoleLoadout.cs
View File

@@ -233,7 +233,7 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
if (!protoManager.TryIndex(loadout, out var loadoutProto))
{
// Uhh
reason = FormattedMessage.FromMarkup("");
reason = FormattedMessage.FromMarkupOrThrow("");
return false;
}

16
Content.Shared/Research/Systems/SharedResearchSystem.cs
View File

@@ -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 abstract class SharedResearchSystem : EntitySystem
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))));
}