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

Remove usages of obsolete MetaDataComponent setters (#19582)

Browse Source
This commit is contained in:
Visne
2023-08-28 11:20:31 +02:00
committed by GitHub
parent 38c6b4d07a
commit b88c2cbb49
32 changed files with 86 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Animations/ReusableAnimations.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Client.Animations
var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition); var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition);
string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName; string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName;
entMan.GetComponent<MetaDataComponent>(animatableClone).EntityName = val; entMan.System<MetaDataSystem>().SetEntityName(animatableClone, val);
if (!entMan.TryGetComponent(entity, out SpriteComponent? sprite0)) if (!entMan.TryGetComponent(entity, out SpriteComponent? sprite0))
{ {

9
Content.Server/Administration/Commands/AGhost.cs
View File

@@ -35,6 +35,7 @@ namespace Content.Server.Administration.Commands
} }
var mindSystem = _entities.System<MindSystem>(); var mindSystem = _entities.System<MindSystem>();
var metaDataSystem = _entities.System<MetaDataSystem>();
if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent)) if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
{ {
@@ -55,16 +56,16 @@ namespace Content.Server.Administration.Commands
if (canReturn) if (canReturn)
{ {
// TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"... // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
if(!string.IsNullOrWhiteSpace(mind.CharacterName)) if (!string.IsNullOrWhiteSpace(mind.CharacterName))
_entities.GetComponent<MetaDataComponent>(ghost).EntityName = mind.CharacterName; metaDataSystem.SetEntityName(ghost, mind.CharacterName);
else if (!string.IsNullOrWhiteSpace(mind.Session?.Name)) else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
_entities.GetComponent<MetaDataComponent>(ghost).EntityName = mind.Session.Name; metaDataSystem.SetEntityName(ghost, mind.Session.Name);
mindSystem.Visit(mind, ghost); mindSystem.Visit(mind, ghost);
} }
else else
{ {
_entities.GetComponent<MetaDataComponent>(ghost).EntityName = player.Name; metaDataSystem.SetEntityName(ghost, player.Name);
mindSystem.TransferTo(mind, ghost); mindSystem.TransferTo(mind, ghost);
} }

8
Content.Server/Administration/Commands/OwoifyCommand.cs
View File

@@ -34,10 +34,10 @@ public sealed class OwoifyCommand : IConsoleCommand
var meta = entityManager.GetComponent<MetaDataComponent>(eUid); var meta = entityManager.GetComponent<MetaDataComponent>(eUid);
var random = IoCManager.Resolve<IRobustRandom>(); var owoSys = entityManager.System<OwOAccentSystem>();
var owoSys = EntitySystem.Get<OwOAccentSystem>(); var metaDataSys = entityManager.System<MetaDataSystem>();
meta.EntityName = owoSys.Accentuate(meta.EntityName); metaDataSys.SetEntityName(eUid, owoSys.Accentuate(meta.EntityName), meta);
meta.EntityDescription = owoSys.Accentuate(meta.EntityDescription); metaDataSys.SetEntityDescription(eUid, owoSys.Accentuate(meta.EntityDescription), meta);
} }
} }

9
Content.Server/Atmos/EntitySystems/AtmosPlaqueSystem.cs
View File

@@ -9,6 +9,7 @@ public sealed class AtmosPlaqueSystem : EntitySystem
{ {
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -34,7 +35,7 @@ public sealed class AtmosPlaqueSystem : EntitySystem
public void UpdateSign(EntityUid uid, AtmosPlaqueComponent component) public void UpdateSign(EntityUid uid, AtmosPlaqueComponent component)
{ {
var metaData = MetaData(component.Owner); var metaData = MetaData(uid);
var val = component.Type switch var val = component.Type switch
{ {
@@ -50,7 +51,7 @@ public sealed class AtmosPlaqueSystem : EntitySystem
_ => Loc.GetString("atmos-plaque-component-desc-unset"), _ => Loc.GetString("atmos-plaque-component-desc-unset"),
}; };
metaData.EntityDescription = val; _metaData.SetEntityDescription(uid, val, metaData);
var val1 = component.Type switch var val1 = component.Type switch
{ {
@@ -66,9 +67,9 @@ public sealed class AtmosPlaqueSystem : EntitySystem
_ => Loc.GetString("atmos-plaque-component-name-unset"), _ => Loc.GetString("atmos-plaque-component-name-unset"),
}; };
metaData.EntityName = val1; _metaData.SetEntityName(uid, val1, metaData);
if (TryComp<AppearanceComponent>(component.Owner, out var appearance)) if (TryComp<AppearanceComponent>(uid, out var appearance))
{ {
var state = component.Type == PlaqueType.Zumos ? "zumosplaque" : "atmosplaque"; var state = component.Type == PlaqueType.Zumos ? "zumosplaque" : "atmosplaque";

5
Content.Server/BarSign/Systems/BarSignSystem.cs
View File

@@ -10,6 +10,7 @@ namespace Content.Server.BarSign.Systems
{ {
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -36,8 +37,8 @@ namespace Content.Server.BarSign.Systems
var meta = Comp<MetaDataComponent>(uid); var meta = Comp<MetaDataComponent>(uid);
var name = newPrototype.Name != string.Empty ? newPrototype.Name : "barsign-component-name"; var name = newPrototype.Name != string.Empty ? newPrototype.Name : "barsign-component-name";
meta.EntityName = Loc.GetString(name); _metaData.SetEntityName(uid, Loc.GetString(name), meta);
meta.EntityDescription = Loc.GetString(newPrototype.Description); _metaData.SetEntityDescription(uid, Loc.GetString(newPrototype.Description), meta);
component.CurrentSign = newPrototype.ID; component.CurrentSign = newPrototype.ID;
Dirty(component); Dirty(component);

8
Content.Server/Botany/Systems/BotanySystem.Seed.cs
View File

@@ -28,6 +28,7 @@ public sealed partial class BotanySystem : EntitySystem
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -102,7 +103,7 @@ public sealed partial class BotanySystem : EntitySystem
var name = Loc.GetString(proto.Name); var name = Loc.GetString(proto.Name);
var noun = Loc.GetString(proto.Noun); var noun = Loc.GetString(proto.Noun);
var val = Loc.GetString("botany-seed-packet-name", ("seedName", name), ("seedNoun", noun)); var val = Loc.GetString("botany-seed-packet-name", ("seedName", name), ("seedNoun", noun));
MetaData(seed).EntityName = val; _metaData.SetEntityName(seed, val);
// try to automatically place in user's other hand // try to automatically place in user's other hand
_hands.TryPickupAnyHand(user, seed); _hands.TryPickupAnyHand(user, seed);
@@ -167,8 +168,9 @@ public sealed partial class BotanySystem : EntitySystem
if (proto.Mysterious) if (proto.Mysterious)
{ {
var metaData = MetaData(entity); var metaData = MetaData(entity);
metaData.EntityName += "?"; _metaData.SetEntityName(entity, metaData.EntityName + "?", metaData);
metaData.EntityDescription += " " + Loc.GetString("botany-mysterious-description-addon"); _metaData.SetEntityDescription(entity,
metaData.EntityDescription + " " + Loc.GetString("botany-mysterious-description-addon"), metaData);
} }
if (proto.Bioluminescent) if (proto.Bioluminescent)

3
Content.Server/Cluwne/CluwneSystem.cs
View File

@@ -27,6 +27,7 @@ public sealed class CluwneSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly ChatSystem _chat = default!;
[Dependency] private readonly AutoEmoteSystem _autoEmote = default!; [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -74,7 +75,7 @@ public sealed class CluwneSystem : EntitySystem
_popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution); _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution);
_audio.PlayPvs(component.SpawnSound, uid); _audio.PlayPvs(component.SpawnSound, uid);
meta.EntityName = Loc.GetString("cluwne-name-prefix", ("target", name)); _metaData.SetEntityName(uid, Loc.GetString("cluwne-name-prefix", ("target", name)), meta);
SetOutfitCommand.SetOutfit(uid, "CluwneGear", EntityManager); SetOutfitCommand.SetOutfit(uid, "CluwneGear", EntityManager);
} }

3
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@@ -51,6 +51,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
[Dependency] private readonly SharedStunSystem _stun = default!; [Dependency] private readonly SharedStunSystem _stun = default!;
[Dependency] private readonly SharedStutteringSystem _stuttering = default!; [Dependency] private readonly SharedStutteringSystem _stuttering = default!;
[Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly TagSystem _tag = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[ValidatePrototypeId<StatusEffectPrototype>] [ValidatePrototypeId<StatusEffectPrototype>]
private const string StatusEffectKey = "Electrocution"; private const string StatusEffectKey = "Electrocution";
@@ -358,7 +359,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
// This shows up in the power monitor. // This shows up in the power monitor.
// Yes. Yes exactly. // Yes. Yes exactly.
MetaData(electrocutionEntity).EntityName = MetaData(uid).EntityName; _metaData.SetEntityName(electrocutionEntity, MetaData(uid).EntityName);
electrocutionNode.CableEntity = sourceUid; electrocutionNode.CableEntity = sourceUid;
electrocutionNode.NodeName = node.Name; electrocutionNode.NodeName = node.Name;

5
Content.Server/Fax/FaxSystem.cs
View File

@@ -38,6 +38,7 @@ public sealed class FaxSystem : EntitySystem
[Dependency] private readonly QuickDialogSystem _quickDialog = default!; [Dependency] private readonly QuickDialogSystem _quickDialog = default!;
[Dependency] private readonly UserInterfaceSystem _userInterface = default!; [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private const string PaperSlotId = "Paper"; private const string PaperSlotId = "Paper";
@@ -469,9 +470,7 @@ public sealed class FaxSystem : EntitySystem
} }
} }
if (TryComp<MetaDataComponent>(printed, out var metadata)) _metaData.SetEntityName(printed, printout.Name);
metadata.EntityName = printout.Name;
_adminLogger.Add(LogType.Action, LogImpact.Low, $"\"{component.FaxName}\" {ToPrettyString(uid)} printed {ToPrettyString(printed)}: {printout.Content}"); _adminLogger.Add(LogType.Action, LogImpact.Low, $"\"{component.FaxName}\" {ToPrettyString(uid)} printed {ToPrettyString(printed)}: {printout.Content}");
} }

9
Content.Server/Forensics/Systems/ForensicPadSystem.cs
View File

@@ -16,6 +16,7 @@ namespace Content.Server.Forensics
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -99,10 +100,10 @@ namespace Content.Server.Forensics
if (args.Args.Target != null) if (args.Args.Target != null)
{ {
if (HasComp<FingerprintComponent>(args.Args.Target)) var name = HasComp<FingerprintComponent>(args.Args.Target)
MetaData(uid).EntityName = Loc.GetString("forensic-pad-fingerprint-name", ("entity", args.Args.Target)); ? "forensic-pad-fingerprint-name"
else : "forensic-pad-gloves-name";
MetaData(uid).EntityName = Loc.GetString("forensic-pad-gloves-name", ("entity", args.Args.Target)); _metaData.SetEntityName(uid, Loc.GetString(name, ("entity", args.Args.Target)));
} }
padComponent.Sample = args.Sample; padComponent.Sample = args.Sample;

3
Content.Server/Forensics/Systems/ForensicScannerSystem.cs
View File

@@ -23,6 +23,7 @@ namespace Content.Server.Forensics
[Dependency] private readonly PaperSystem _paperSystem = default!; [Dependency] private readonly PaperSystem _paperSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private ISawmill _sawmill = default!; private ISawmill _sawmill = default!;
@@ -197,7 +198,7 @@ namespace Content.Server.Forensics
return; return;
} }
MetaData(printed).EntityName = Loc.GetString("forensic-scanner-report-title", ("entity", component.LastScannedName)); _metaData.SetEntityName(printed, Loc.GetString("forensic-scanner-report-title", ("entity", component.LastScannedName)));
var text = new StringBuilder(); var text = new StringBuilder();

7
Content.Server/GameTicking/GameTicker.GamePreset.cs
View File

@@ -263,11 +263,10 @@ namespace Content.Server.GameTicking
// Try setting the ghost entity name to either the character name or the player name. // Try setting the ghost entity name to either the character name or the player name.
// If all else fails, it'll default to the default entity prototype name, "observer". // If all else fails, it'll default to the default entity prototype name, "observer".
// However, that should rarely happen. // However, that should rarely happen.
var meta = MetaData(ghost); if (!string.IsNullOrWhiteSpace(mind.CharacterName))
if(!string.IsNullOrWhiteSpace(mind.CharacterName)) _metaData.SetEntityName(ghost, mind.CharacterName);
meta.EntityName = mind.CharacterName;
else if (!string.IsNullOrWhiteSpace(mind.Session?.Name)) else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
meta.EntityName = mind.Session.Name; _metaData.SetEntityName(ghost, mind.Session.Name);
var ghostComponent = Comp<GhostComponent>(ghost); var ghostComponent = Comp<GhostComponent>(ghost);

2
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -311,7 +311,7 @@ namespace Content.Server.GameTicking
var name = GetPlayerProfile(player).Name; var name = GetPlayerProfile(player).Name;
var ghost = SpawnObserverMob(); var ghost = SpawnObserverMob();
MetaData(ghost).EntityName = name; _metaData.SetEntityName(ghost, name);
_ghost.SetCanReturnToBody(ghost, false); _ghost.SetCanReturnToBody(ghost, false);
_mind.TransferTo(mind, ghost); _mind.TransferTo(mind, ghost);
} }

1
Content.Server/GameTicking/GameTicker.cs
View File

@@ -66,6 +66,7 @@ namespace Content.Server.GameTicking
[Dependency] private readonly StationSpawningSystem _stationSpawning = default!; [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly UserDbDataManager _userDb = default!; [Dependency] private readonly UserDbDataManager _userDb = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[ViewVariables] private bool _initialized; [ViewVariables] private bool _initialized;
[ViewVariables] private bool _postInitialized; [ViewVariables] private bool _postInitialized;

3
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -58,6 +58,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
[Dependency] private readonly MapLoaderSystem _map = default!; [Dependency] private readonly MapLoaderSystem _map = default!;
[Dependency] private readonly ShuttleSystem _shuttle = default!; [Dependency] private readonly ShuttleSystem _shuttle = default!;
[Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly MindSystem _mindSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -717,7 +718,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
/// </summary> /// </summary>
private void SetupOperativeEntity(EntityUid mob, string name, string gear, HumanoidCharacterProfile? profile, NukeopsRuleComponent component) private void SetupOperativeEntity(EntityUid mob, string name, string gear, HumanoidCharacterProfile? profile, NukeopsRuleComponent component)
{ {
MetaData(mob).EntityName = name; _metaData.SetEntityName(mob, name);
EnsureComp<NukeOperativeComponent>(mob); EnsureComp<NukeOperativeComponent>(mob);
if (profile != null) if (profile != null)

3
Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
View File

@@ -44,6 +44,7 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
[Dependency] private readonly NamingSystem _namingSystem = default!; [Dependency] private readonly NamingSystem _namingSystem = default!;
[Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly MindSystem _mindSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
/// <inheritdoc/> /// <inheritdoc/>
public override void Initialize() public override void Initialize()
@@ -215,7 +216,7 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
_mindSystem.SetUserId(newMind, session.UserId); _mindSystem.SetUserId(newMind, session.UserId);
var mob = Spawn("MobHuman", _random.Pick(spawns)); var mob = Spawn("MobHuman", _random.Pick(spawns));
MetaData(mob).EntityName = name; _metaData.SetEntityName(mob, name);
_mindSystem.TransferTo(newMind, mob); _mindSystem.TransferTo(newMind, mob);
var profile = _prefs.GetPreferences(session.UserId).SelectedCharacter as HumanoidCharacterProfile; var profile = _prefs.GetPreferences(session.UserId).SelectedCharacter as HumanoidCharacterProfile;

6
Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
View File

@@ -7,6 +7,7 @@ namespace Content.Server.Humanoid.Systems;
public sealed class RandomHumanoidAppearanceSystem : EntitySystem public sealed class RandomHumanoidAppearanceSystem : EntitySystem
{ {
[Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -28,9 +29,6 @@ public sealed class RandomHumanoidAppearanceSystem : EntitySystem
_humanoid.LoadProfile(uid, profile, humanoid); _humanoid.LoadProfile(uid, profile, humanoid);
if (component.RandomizeName) if (component.RandomizeName)
{ _metaData.SetEntityName(uid, profile.Name);
var meta = MetaData(uid);
meta.EntityName = profile.Name;
}
} }
} }

3
Content.Server/IdentityManagement/IdentitySystem.cs
View File

@@ -19,6 +19,7 @@ public class IdentitySystem : SharedIdentitySystem
{ {
[Dependency] private readonly IdCardSystem _idCard = default!; [Dependency] private readonly IdCardSystem _idCard = default!;
[Dependency] private readonly IAdminLogManager _adminLog = default!; [Dependency] private readonly IAdminLogManager _adminLog = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private HashSet<EntityUid> _queuedIdentityUpdates = new(); private HashSet<EntityUid> _queuedIdentityUpdates = new();
@@ -98,7 +99,7 @@ public class IdentitySystem : SharedIdentitySystem
if (name == Name(ident)) if (name == Name(ident))
return; return;
MetaData(ident).EntityName = name; _metaData.SetEntityName(ident, name);
_adminLog.Add(LogType.Identity, LogImpact.Medium, $"{ToPrettyString(uid)} changed identity to {name}"); _adminLog.Add(LogType.Identity, LogImpact.Medium, $"{ToPrettyString(uid)} changed identity to {name}");
RaiseLocalEvent(new IdentityChangedEvent(uid, ident)); RaiseLocalEvent(new IdentityChangedEvent(uid, ident));

5
Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
View File

@@ -33,6 +33,7 @@ namespace Content.Server.Kitchen.EntitySystems
[Dependency] private readonly BodySystem _bodySystem = default!; [Dependency] private readonly BodySystem _bodySystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -170,8 +171,8 @@ namespace Content.Server.Kitchen.EntitySystems
var item = _random.PickAndTake(component.PrototypesToSpawn); var item = _random.PickAndTake(component.PrototypesToSpawn);
var ent = Spawn(item, Transform(uid).Coordinates); var ent = Spawn(item, Transform(uid).Coordinates);
MetaData(ent).EntityName = _metaData.SetEntityName(ent,
Loc.GetString("comp-kitchen-spike-meat-name", ("name", Name(ent)), ("victim", component.Victim)); Loc.GetString("comp-kitchen-spike-meat-name", ("name", Name(ent)), ("victim", component.Victim)));
if (component.PrototypesToSpawn.Count != 0) if (component.PrototypesToSpawn.Count != 0)
_popupSystem.PopupEntity(component.MeatSource1p, uid, user, PopupType.MediumCaution); _popupSystem.PopupEntity(component.MeatSource1p, uid, user, PopupType.MediumCaution);

5
Content.Server/Labels/Label/LabelSystem.cs
View File

@@ -18,6 +18,7 @@ namespace Content.Server.Labels
{ {
[Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public const string ContainerName = "paper_label"; public const string ContainerName = "paper_label";
@@ -53,7 +54,7 @@ namespace Content.Server.Labels
return; return;
// Remove label // Remove label
metadata.EntityName = label.OriginalName; _metaData.SetEntityName(uid, label.OriginalName, metadata);
label.CurrentLabel = null; label.CurrentLabel = null;
label.OriginalName = null; label.OriginalName = null;
@@ -63,7 +64,7 @@ namespace Content.Server.Labels
// Update label // Update label
label.OriginalName ??= metadata.EntityName; label.OriginalName ??= metadata.EntityName;
label.CurrentLabel = text; label.CurrentLabel = text;
metadata.EntityName = $"{label.OriginalName} ({text})"; _metaData.SetEntityName(uid, $"{label.OriginalName} ({text})", metadata);
} }
private void OnComponentInit(EntityUid uid, PaperLabelComponent component, ComponentInit args) private void OnComponentInit(EntityUid uid, PaperLabelComponent component, ComponentInit args)

5
Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
View File

@@ -23,6 +23,7 @@ namespace Content.Server.Light.EntitySystems
[Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -63,8 +64,8 @@ namespace Content.Server.Light.EntitySystems
case ExpendableLightState.Fading: case ExpendableLightState.Fading:
component.CurrentState = ExpendableLightState.Dead; component.CurrentState = ExpendableLightState.Dead;
var meta = MetaData(component.Owner); var meta = MetaData(component.Owner);
meta.EntityName = Loc.GetString(component.SpentName); _metaData.SetEntityName(component.Owner, Loc.GetString(component.SpentName), meta);
meta.EntityDescription = Loc.GetString(component.SpentDesc); _metaData.SetEntityDescription(component.Owner, Loc.GetString(component.SpentDesc), meta);
_tagSystem.AddTag(component.Owner, "Trash"); _tagSystem.AddTag(component.Owner, "Trash");

2
Content.Server/Mind/Commands/RenameCommand.cs
View File

@@ -44,7 +44,7 @@ public sealed class RenameCommand : IConsoleCommand
// Metadata // Metadata
var metadata = entMan.GetComponent<MetaDataComponent>(entityUid); var metadata = entMan.GetComponent<MetaDataComponent>(entityUid);
var oldName = metadata.EntityName; var oldName = metadata.EntityName;
metadata.EntityName = name; entMan.System<MetaDataSystem>().SetEntityName(entityUid, name, metadata);
var entSysMan = IoCManager.Resolve<IEntitySystemManager>(); var entSysMan = IoCManager.Resolve<IEntitySystemManager>();

3
Content.Server/Mind/MindSystem.cs
View File

@@ -33,6 +33,7 @@ public sealed class MindSystem : EntitySystem
[Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
// This is dictionary is required to track the minds of disconnected players that may have had their entity deleted. // This is dictionary is required to track the minds of disconnected players that may have had their entity deleted.
private readonly Dictionary<NetUserId, Mind> _userMinds = new(); private readonly Dictionary<NetUserId, Mind> _userMinds = new();
@@ -198,7 +199,7 @@ public sealed class MindSystem : EntitySystem
Log.Debug($"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, spawned \"{ToPrettyString(ghost)}\"."); Log.Debug($"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, spawned \"{ToPrettyString(ghost)}\".");
var val = mind.CharacterName ?? string.Empty; var val = mind.CharacterName ?? string.Empty;
MetaData(ghost).EntityName = val; _metaData.SetEntityName(ghost, val);
TransferTo(mind, ghost); TransferTo(mind, ghost);
}); });
} }

4
Content.Server/Nuke/NukeLabelSystem.cs
View File

@@ -6,6 +6,8 @@ namespace Content.Server.Nuke;
public sealed class NukeLabelSystem : EntitySystem public sealed class NukeLabelSystem : EntitySystem
{ {
[Dependency] private readonly NukeSystem _nuke = default!; [Dependency] private readonly NukeSystem _nuke = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
/// <inheritdoc/> /// <inheritdoc/>
public override void Initialize() public override void Initialize()
{ {
@@ -16,6 +18,6 @@ public sealed class NukeLabelSystem : EntitySystem
{ {
var label = Loc.GetString(nuke.NukeLabel, ("serial", _nuke.GenerateRandomNumberString(nuke.SerialLength))); var label = Loc.GetString(nuke.NukeLabel, ("serial", _nuke.GenerateRandomNumberString(nuke.SerialLength)));
var meta = MetaData(uid); var meta = MetaData(uid);
meta.EntityName = $"{meta.EntityName} ({label})"; _metaData.SetEntityName(uid, $"{meta.EntityName} ({label})", meta);
} }
} }

9
Content.Server/Polymorph/Systems/PolymorphSystem.cs
View File

@@ -43,6 +43,7 @@ namespace Content.Server.Polymorph.Systems
[Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly MindSystem _mindSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private ISawmill _sawmill = default!; private ISawmill _sawmill = default!;
@@ -220,12 +221,8 @@ namespace Content.Server.Polymorph.Systems
} }
} }
if (proto.TransferName && if (proto.TransferName && TryComp<MetaDataComponent>(uid, out var targetMeta))
TryComp<MetaDataComponent>(uid, out var targetMeta) && _metaData.SetEntityName(child, targetMeta.EntityName);
TryComp<MetaDataComponent>(child, out var childMeta))
{
childMeta.EntityName = targetMeta.EntityName;
}
if (proto.TransferHumanoidAppearance) if (proto.TransferHumanoidAppearance)
{ {

6
Content.Server/RandomMetadata/RandomMetadataSystem.cs
View File

@@ -9,6 +9,7 @@ public sealed class RandomMetadataSystem : EntitySystem
{ {
[Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -24,12 +25,13 @@ public sealed class RandomMetadataSystem : EntitySystem
if (component.NameSegments != null) if (component.NameSegments != null)
{ {
meta.EntityName = GetRandomFromSegments(component.NameSegments, component.NameSeparator); _metaData.SetEntityName(uid, GetRandomFromSegments(component.NameSegments, component.NameSeparator), meta);
} }
if (component.DescriptionSegments != null) if (component.DescriptionSegments != null)
{ {
meta.EntityDescription = GetRandomFromSegments(component.DescriptionSegments, component.DescriptionSeparator); _metaData.SetEntityDescription(uid,
GetRandomFromSegments(component.DescriptionSegments, component.DescriptionSeparator), meta);
} }
} }

1
Content.Server/Salvage/SalvageSystem.Expeditions.cs
View File

@@ -276,6 +276,7 @@ public sealed partial class SalvageSystem
_anchorable, _anchorable,
_biome, _biome,
_dungeon, _dungeon,
_metaData,
this, this,
station, station,
missionParams, missionParams,

1
Content.Server/Salvage/SalvageSystem.cs
View File

@@ -53,6 +53,7 @@ namespace Content.Server.Salvage
[Dependency] private readonly ShuttleConsoleSystem _shuttleConsoles = default!; [Dependency] private readonly ShuttleConsoleSystem _shuttleConsoles = default!;
[Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly StationSystem _station = default!;
[Dependency] private readonly UserInterfaceSystem _ui = default!; [Dependency] private readonly UserInterfaceSystem _ui = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private const int SalvageLocationPlaceAttempts = 25; private const int SalvageLocationPlaceAttempts = 25;

5
Content.Server/Salvage/SpawnSalvageMissionJob.cs
View File

@@ -41,6 +41,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
private readonly AnchorableSystem _anchorable; private readonly AnchorableSystem _anchorable;
private readonly BiomeSystem _biome; private readonly BiomeSystem _biome;
private readonly DungeonSystem _dungeon; private readonly DungeonSystem _dungeon;
private readonly MetaDataSystem _metaData;
private readonly SalvageSystem _salvage; private readonly SalvageSystem _salvage;
public readonly EntityUid Station; public readonly EntityUid Station;
@@ -55,6 +56,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
AnchorableSystem anchorable, AnchorableSystem anchorable,
BiomeSystem biome, BiomeSystem biome,
DungeonSystem dungeon, DungeonSystem dungeon,
MetaDataSystem metaData,
SalvageSystem salvage, SalvageSystem salvage,
EntityUid station, EntityUid station,
SalvageMissionParams missionParams, SalvageMissionParams missionParams,
@@ -67,6 +69,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
_anchorable = anchorable; _anchorable = anchorable;
_biome = biome; _biome = biome;
_dungeon = dungeon; _dungeon = dungeon;
_metaData = metaData;
_salvage = salvage; _salvage = salvage;
Station = station; Station = station;
_missionParams = missionParams; _missionParams = missionParams;
@@ -139,7 +142,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
// Don't want consoles to have the incorrect name until refreshed. // Don't want consoles to have the incorrect name until refreshed.
var ftlUid = _entManager.CreateEntityUninitialized("FTLPoint", new EntityCoordinates(mapUid, grid.TileSizeHalfVector)); var ftlUid = _entManager.CreateEntityUninitialized("FTLPoint", new EntityCoordinates(mapUid, grid.TileSizeHalfVector));
_entManager.GetComponent<MetaDataComponent>(ftlUid).EntityName = SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed); _metaData.SetEntityName(ftlUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
_entManager.InitializeAndStartEntity(ftlUid); _entManager.InitializeAndStartEntity(ftlUid);
var landingPadRadius = 24; var landingPadRadius = 24;

5
Content.Server/Station/Systems/StationSystem.cs
View File

@@ -34,6 +34,7 @@ public sealed class StationSystem : EntitySystem
[Dependency] private readonly ChatSystem _chatSystem = default!; [Dependency] private readonly ChatSystem _chatSystem = default!;
[Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private ISawmill _sawmill = default!; private ISawmill _sawmill = default!;
@@ -328,7 +329,7 @@ public sealed class StationSystem : EntitySystem
throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station)); throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
if (!string.IsNullOrEmpty(name)) if (!string.IsNullOrEmpty(name))
MetaData(mapGrid).EntityName = name; _metaData.SetEntityName(mapGrid, name);
var stationMember = AddComp<StationMemberComponent>(mapGrid); var stationMember = AddComp<StationMemberComponent>(mapGrid);
stationMember.Station = station; stationMember.Station = station;
@@ -376,7 +377,7 @@ public sealed class StationSystem : EntitySystem
throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station)); throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
var oldName = metaData.EntityName; var oldName = metaData.EntityName;
metaData.EntityName = name; _metaData.SetEntityName(station, name, metaData);
if (loud) if (loud)
{ {

4
Content.Server/Worldgen/Systems/WorldControllerSystem.cs
View File

@@ -17,6 +17,7 @@ public sealed class WorldControllerSystem : EntitySystem
[Dependency] private readonly TransformSystem _xformSys = default!; [Dependency] private readonly TransformSystem _xformSys = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private const int PlayerLoadRadius = 2; private const int PlayerLoadRadius = 2;
@@ -231,8 +232,7 @@ public sealed class WorldControllerSystem : EntitySystem
{ {
var chunk = Spawn(controller.ChunkProto, MapCoordinates.Nullspace); var chunk = Spawn(controller.ChunkProto, MapCoordinates.Nullspace);
StartupChunkEntity(chunk, chunkCoords, map, controller); StartupChunkEntity(chunk, chunkCoords, map, controller);
var md = MetaData(chunk); _metaData.SetEntityName(chunk, $"Chunk {chunkCoords.X}/{chunkCoords.Y}");
md.EntityName = $"Chunk {chunkCoords.X}/{chunkCoords.Y}";
return chunk; return chunk;
} }

5
Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
View File

@@ -13,6 +13,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly SharedItemSystem _itemSystem = default!; [Dependency] private readonly SharedItemSystem _itemSystem = default!;
[Dependency] private readonly ClothingSystem _clothingSystem = default!; [Dependency] private readonly ClothingSystem _clothingSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -46,8 +47,8 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
// copy name and description // copy name and description
var meta = MetaData(uid); var meta = MetaData(uid);
meta.EntityName = proto.Name; _metaData.SetEntityName(uid, proto.Name, meta);
meta.EntityDescription = proto.Description; _metaData.SetEntityDescription(uid, proto.Description, meta);
// item sprite logic // item sprite logic
if (TryComp(uid, out ItemComponent? item) && if (TryComp(uid, out ItemComponent? item) &&