From bab37587c5db43a85808a6720f2d54b18e69392d Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 3 Dec 2021 15:25:51 +0100 Subject: [PATCH] Inline Name --- Robust.Client/Console/Commands/Debug.cs | 2 +- Robust.Client/Debugging/DebugAnchoringSystem.cs | 2 +- Robust.Server/Bql/ForAllCommand.cs | 2 +- Robust.Server/Console/Commands/AddComponentCommand.cs | 4 ++-- Robust.Server/Console/Commands/RemoveComponentCommand.cs | 4 ++-- .../EntitySystems/TileLookup/GridTileLookupSystem.cs | 2 +- Robust.Server/Player/PlayerSession.cs | 3 ++- Robust.Shared/GameObjects/IEntity.cs | 8 -------- Robust.Shared/Localization/LocFunction.cs | 3 ++- .../GameObjects/Components/TransformComponentTests.cs | 6 +++--- .../Shared/Localization/LocalizationTests.cs | 2 +- 11 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Robust.Client/Console/Commands/Debug.cs b/Robust.Client/Console/Commands/Debug.cs index e90e3aa9da..e2b44f3828 100644 --- a/Robust.Client/Console/Commands/Debug.cs +++ b/Robust.Client/Console/Commands/Debug.cs @@ -246,7 +246,7 @@ namespace Robust.Client.Console.Commands return; } - shell.WriteLine($"{entity.Uid}: {IoCManager.Resolve().GetComponent(entity.Uid).EntityPrototype?.ID}/{entity.Name}"); + shell.WriteLine($"{entity.Uid}: {IoCManager.Resolve().GetComponent(entity.Uid).EntityPrototype?.ID}/{IoCManager.Resolve().GetComponent(entity.Uid).EntityName}"); shell.WriteLine($"init/del/lmt: {(!IoCManager.Resolve().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(entity.Uid).EntityLifeStage) >= EntityLifeStage.Initialized}/{(!IoCManager.Resolve().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted}/{IoCManager.Resolve().GetComponent(entity.Uid).EntityLastModifiedTick}"); foreach (var component in IoCManager.Resolve().GetComponents(entity.Uid)) { diff --git a/Robust.Client/Debugging/DebugAnchoringSystem.cs b/Robust.Client/Debugging/DebugAnchoringSystem.cs index ef56f39096..3b6a53547c 100644 --- a/Robust.Client/Debugging/DebugAnchoringSystem.cs +++ b/Robust.Client/Debugging/DebugAnchoringSystem.cs @@ -85,7 +85,7 @@ namespace Robust.Client.Debugging } else { - text.AppendLine($"uid: {ent}, {entity.Name}"); + text.AppendLine($"uid: {ent}, {IoCManager.Resolve().GetComponent(entity.Uid).EntityName}"); } } diff --git a/Robust.Server/Bql/ForAllCommand.cs b/Robust.Server/Bql/ForAllCommand.cs index b5e5a557a8..df185d7d7e 100644 --- a/Robust.Server/Bql/ForAllCommand.cs +++ b/Robust.Server/Bql/ForAllCommand.cs @@ -48,7 +48,7 @@ namespace Robust.Server.Bql IoCManager.Resolve().GetComponent(ent.Uid).LocalPosition.X.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$LY", IoCManager.Resolve().GetComponent(ent.Uid).LocalPosition.Y.ToString(CultureInfo.InvariantCulture)); - ruleString = ruleString.Replace("$NAME", ent.Name); + ruleString = ruleString.Replace("$NAME", IoCManager.Resolve().GetComponent(ent.Uid).EntityName); if (shell.Player is IPlayerSession player) { diff --git a/Robust.Server/Console/Commands/AddComponentCommand.cs b/Robust.Server/Console/Commands/AddComponentCommand.cs index 7b29bc6099..4cfb6faf2f 100644 --- a/Robust.Server/Console/Commands/AddComponentCommand.cs +++ b/Robust.Server/Console/Commands/AddComponentCommand.cs @@ -48,7 +48,7 @@ namespace Robust.Server.Console.Commands if (IoCManager.Resolve().HasComponent(entity.Uid, registration.Type)) { - shell.WriteLine($"Entity {entity.Name} already has a {componentName} component."); + shell.WriteLine($"Entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} already has a {componentName} component."); } var component = (Component) compFactory.GetComponent(registration.Type); @@ -56,7 +56,7 @@ namespace Robust.Server.Console.Commands component.Owner = entity; entManager.AddComponent(entity, component); - shell.WriteLine($"Added {componentName} component to entity {entity.Name}."); + shell.WriteLine($"Added {componentName} component to entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName}."); } } } diff --git a/Robust.Server/Console/Commands/RemoveComponentCommand.cs b/Robust.Server/Console/Commands/RemoveComponentCommand.cs index 1912fef1e3..d08ec552b1 100644 --- a/Robust.Server/Console/Commands/RemoveComponentCommand.cs +++ b/Robust.Server/Console/Commands/RemoveComponentCommand.cs @@ -48,13 +48,13 @@ namespace Robust.Server.Console.Commands if (!IoCManager.Resolve().HasComponent(entity.Uid, registration.Type)) { - shell.WriteLine($"No {componentName} component found on entity {entity.Name}."); + shell.WriteLine($"No {componentName} component found on entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName}."); return; } entManager.RemoveComponent(uid, registration.Type); - shell.WriteLine($"Removed {componentName} component from entity {entity.Name}."); + shell.WriteLine($"Removed {componentName} component from entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName}."); } } } diff --git a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs index e21439e4f6..bb71b76e56 100644 --- a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs @@ -122,7 +122,7 @@ namespace Robust.Server.GameObjects { if ((!IoCManager.Resolve().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted) { - throw new InvalidOperationException($"Can't get nodes for deleted entity {entity.Name}!"); + throw new InvalidOperationException($"Can't get nodes for deleted entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName}!"); } if (_lastKnownNodes.TryGetValue(entity, out var nodes)) diff --git a/Robust.Server/Player/PlayerSession.cs b/Robust.Server/Player/PlayerSession.cs index 4c91c4206e..e98716d1a6 100644 --- a/Robust.Server/Player/PlayerSession.cs +++ b/Robust.Server/Player/PlayerSession.cs @@ -4,6 +4,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Enums; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.ViewVariables; @@ -179,7 +180,7 @@ namespace Robust.Server.Player { if (Name != null && AttachedEntity != null) { - AttachedEntity.Name = Name; + IoCManager.Resolve().GetComponent(AttachedEntity.Uid).EntityName = Name; } } diff --git a/Robust.Shared/GameObjects/IEntity.cs b/Robust.Shared/GameObjects/IEntity.cs index 5d7d3d54ba..df365c0903 100644 --- a/Robust.Shared/GameObjects/IEntity.cs +++ b/Robust.Shared/GameObjects/IEntity.cs @@ -13,14 +13,6 @@ namespace Robust.Shared.GameObjects [ViewVariables] public EntityUid Uid { get; } - - [ViewVariables(VVAccess.ReadWrite)] - public string Name - { - get => IoCManager.Resolve().GetComponent(Uid).EntityName; - set => IoCManager.Resolve().GetComponent(Uid).EntityName = value; - } - #endregion Members #region Initialization diff --git a/Robust.Shared/Localization/LocFunction.cs b/Robust.Shared/Localization/LocFunction.cs index 06d3cea77c..27190bd5ab 100644 --- a/Robust.Shared/Localization/LocFunction.cs +++ b/Robust.Shared/Localization/LocFunction.cs @@ -4,6 +4,7 @@ using System.Globalization; using JetBrains.Annotations; using Linguini.Bundle; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; namespace Robust.Shared.Localization { @@ -174,7 +175,7 @@ namespace Robust.Shared.Localization { public override string Format(LocContext ctx) { - return Value.Name; + return IoCManager.Resolve().GetComponent(Value.Uid).EntityName; } } diff --git a/Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs b/Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs index 09797208dd..602adecf2c 100644 --- a/Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs +++ b/Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs @@ -91,9 +91,9 @@ namespace Robust.UnitTesting.Client.GameObjects.Components var node2 = entMan.SpawnEntity(null, initalPos); var node3 = entMan.SpawnEntity(null, initalPos); - node1.Name = "node1_dummy"; - node2.Name = "node2_dummy"; - node3.Name = "node3_dummy"; + IoCManager.Resolve().GetComponent(node1.Uid).EntityName = "node1_dummy"; + IoCManager.Resolve().GetComponent(node2.Uid).EntityName = "node2_dummy"; + IoCManager.Resolve().GetComponent(node3.Uid).EntityName = "node3_dummy"; var node1Trans = IoCManager.Resolve().GetComponent(node1.Uid); var node2Trans = IoCManager.Resolve().GetComponent(node2.Uid); diff --git a/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs b/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs index 8abdf15925..12d566c9e6 100644 --- a/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs +++ b/Robust.UnitTesting/Shared/Localization/LocalizationTests.cs @@ -242,7 +242,7 @@ test-message-custom-attrib = { ATTRIB($entity, ""otherAttrib"") } var entMan = IoCManager.Resolve(); var ent = entMan.CreateEntityUninitialized(prototype); - Assert.That(ent.Name, Is.EqualTo("A")); + Assert.That(IoCManager.Resolve().GetComponent(ent.Uid).EntityName, Is.EqualTo("A")); Assert.That(IoCManager.Resolve().GetComponent(ent.Uid).EntityDescription, Is.EqualTo("B")); Assert.That(IoCManager.Resolve().GetComponent(ent.Uid).EntityPrototype!.EditorSuffix, Is.EqualTo("C"));