space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 06:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Inline Name

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:25:51 +01:00
parent c4cd1fb6ee
commit bab37587c5
11 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/Console/Commands/Debug.cs
+1 -1
View File
@@ -246,7 +246,7 @@ namespace Robust.Client.Console.Commands
return;
}
shell.WriteLine($"{entity.Uid}: {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype?.ID}/{entity.Name}");
shell.WriteLine($"{entity.Uid}: {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype?.ID}/{IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName}");
shell.WriteLine($"init/del/lmt: {(!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Initialized}/{(!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted}/{IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLastModifiedTick}");
foreach (var component in IoCManager.Resolve<IEntityManager>().GetComponents(entity.Uid))
{
Robust.Client/Debugging/DebugAnchoringSystem.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace Robust.Client.Debugging
}
else
{
text.AppendLine($"uid: {ent}, {entity.Name}");
text.AppendLine($"uid: {ent}, {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName}");
}
}
Robust.Server/Bql/ForAllCommand.cs
+1 -1
View File
@@ -48,7 +48,7 @@ namespace Robust.Server.Bql
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent.Uid).LocalPosition.X.ToString(CultureInfo.InvariantCulture));
ruleString = ruleString.Replace("$LY",
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent.Uid).LocalPosition.Y.ToString(CultureInfo.InvariantCulture));
ruleString = ruleString.Replace("$NAME", ent.Name);
ruleString = ruleString.Replace("$NAME", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ent.Uid).EntityName);
if (shell.Player is IPlayerSession player)
{
Robust.Server/Console/Commands/AddComponentCommand.cs
+2 -2
View File
@@ -48,7 +48,7 @@ namespace Robust.Server.Console.Commands
if (IoCManager.Resolve<IEntityManager>().HasComponent(entity.Uid, registration.Type))
{
shell.WriteLine($"Entity {entity.Name} already has a {componentName} component.");
shell.WriteLine($"Entity {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(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<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName}.");
}
}
}
Robust.Server/Console/Commands/RemoveComponentCommand.cs
+2 -2
View File
@@ -48,13 +48,13 @@ namespace Robust.Server.Console.Commands
if (!IoCManager.Resolve<IEntityManager>().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<IEntityManager>().GetComponent<MetaDataComponent>(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<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName}.");
}
}
}
Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs
+1 -1
View File
@@ -122,7 +122,7 @@ namespace Robust.Server.GameObjects
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(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<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName}!");
}
if (_lastKnownNodes.TryGetValue(entity, out var nodes))
Robust.Server/Player/PlayerSession.cs
+2 -1
View File
@@ -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<IEntityManager>().GetComponent<MetaDataComponent>(AttachedEntity.Uid).EntityName = Name;
}
}
Robust.Shared/GameObjects/IEntity.cs
-8
View File
@@ -13,14 +13,6 @@ namespace Robust.Shared.GameObjects
[ViewVariables]
public EntityUid Uid { get; }
[ViewVariables(VVAccess.ReadWrite)]
public string Name
{
get => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityName;
set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityName = value;
}
#endregion Members
#region Initialization
Robust.Shared/Localization/LocFunction.cs
+2 -1
View File
@@ -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<IEntityManager>().GetComponent<MetaDataComponent>(Value.Uid).EntityName;
}
}
Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs
+3 -3
View File
@@ -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<IEntityManager>().GetComponent<MetaDataComponent>(node1.Uid).EntityName = "node1_dummy";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(node2.Uid).EntityName = "node2_dummy";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(node3.Uid).EntityName = "node3_dummy";
var node1Trans = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(node1.Uid);
var node2Trans = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(node2.Uid);
Robust.UnitTesting/Shared/Localization/LocalizationTests.cs
+1 -1
View File
@@ -242,7 +242,7 @@ test-message-custom-attrib = { ATTRIB($entity, ""otherAttrib"") }
var entMan = IoCManager.Resolve<IEntityManager>();
var ent = entMan.CreateEntityUninitialized(prototype);
Assert.That(ent.Name, Is.EqualTo("A"));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ent.Uid).EntityName, Is.EqualTo("A"));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ent.Uid).EntityDescription, Is.EqualTo("B"));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ent.Uid).EntityPrototype!.EditorSuffix, Is.EqualTo("C"));