Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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 61be228ad0
commit ee4ff9cfe8
97 changed files with 237 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.Access.UI
{
base.Open();
_window = new IdCardConsoleWindow(this, _prototypeManager) {Title = Owner.Owner.Name};
_window = new IdCardConsoleWindow(this, _prototypeManager) {Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner.Uid).EntityName};
_window.OnClose += Close;
_window.OpenCentered();
}

2
Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
_target = target;
var targetName = _entityManager.TryGetEntity(target, out var entity)
? entity.Name
? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName
: string.Empty;
Title = Loc.GetString("admin-solutions-window-title", ("targetName", targetName));

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

@@ -15,11 +15,12 @@ namespace Content.Client.Animations
public static void AnimateEntityPickup(IEntity entity, EntityCoordinates initialPosition, Vector2 finalPosition)
{
var animatableClone = IoCManager.Resolve<IEntityManager>().SpawnEntity("clientsideclone", initialPosition);
animatableClone.Name = entity.Name;
string val = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(animatableClone.Uid).EntityName = val;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SpriteComponent? sprite0))
{
Logger.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", entity.Name, nameof(SpriteComponent));
Logger.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName, nameof(SpriteComponent));
return;
}
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(animatableClone.Uid);

2
Content.Client/Body/UI/BodyScannerDisplay.cs
View File

@@ -147,7 +147,7 @@ namespace Content.Client.Body.UI
private void UpdateBodyPartBox(SharedBodyPartComponent part, string slotName)
{
BodyPartLabel.Text = $"{Loc.GetString(slotName)}: {Loc.GetString(part.Owner.Name)}";
BodyPartLabel.Text = $"{Loc.GetString(slotName)}: {Loc.GetString(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(part.Owner.Uid).EntityName)}";
// TODO BODY Part damage
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(part.Owner.Uid, out DamageableComponent? damageable))

2
Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Client.CharacterInfo.Components
_control.SpriteView.Sprite = spriteComponent;
}
_control.NameLabel.Text = Owner.Name;
_control.NameLabel.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityName;
break;
}
}

4
Content.Client/ContextMenu/UI/EntityMenuElement.cs
View File

@@ -70,9 +70,9 @@ namespace Content.Client.ContextMenu.UI
EntityIcon.Sprite = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ISpriteComponent>(entity.Uid);
if (UserInterfaceManager.DebugMonitors.Visible)
Text = $"{entity!.Name} ({entity.Uid})";
Text = $"{IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity!.Uid).EntityName} ({entity.Uid})";
else
Text = entity!.Name;
Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity!.Uid).EntityName;
}
}
}

2
Content.Client/ContextMenu/UI/EntityMenuPresenter.cs
View File

@@ -250,7 +250,7 @@ namespace Content.Client.ContextMenu.UI
// find the element associated with this entity
if (!Elements.TryGetValue(entity, out var element))
{
Logger.Error($"Attempted to remove unknown entity from the entity menu: {entity.Name} ({entity.Uid})");
Logger.Error($"Attempted to remove unknown entity from the entity menu: {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName} ({entity.Uid})");
return;
}

2
Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.ContextMenu.UI
{
if (GroupingContextMenuType == 0)
{
var newEntities = entities.GroupBy(e => e.Name + (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(e.Uid).EntityPrototype?.ID ?? string.Empty)).ToList();
var newEntities = entities.GroupBy(e => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(e.Uid).EntityName + (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(e.Uid).EntityPrototype?.ID ?? string.Empty)).ToList();
return newEntities.Select(grp => grp.ToList()).ToList();
}
else

2
Content.Client/DragDrop/DragDropSystem.cs
View File

@@ -207,7 +207,7 @@ namespace Content.Client.DragDrop
}
Logger.Warning("Unable to display drag shadow for {0} because it" +
" has no sprite component.", _dragDropHelper.Dragged.Name);
" has no sprite component.", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_dragDropHelper.Dragged.Uid).EntityName);
return false;
}

2
Content.Client/Examine/ExamineSystem.cs
View File

@@ -143,7 +143,7 @@ namespace Content.Client.Examine
hBox.AddChild(new Label
{
Text = entity.Name,
Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName,
HorizontalExpand = true,
});

2
Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Client.Instruments.UI
if (_owner.Instrument != null)
{
_owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded;
Title = _owner.Instrument.Owner.Name;
Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_owner.Instrument.Owner.Uid).EntityName;
LoopButton.Disabled = !_owner.Instrument.IsMidiOpen;
LoopButton.Pressed = _owner.Instrument.LoopMidi;
StopButton.Disabled = !_owner.Instrument.IsMidiOpen;

3
Content.Client/Inventory/StrippableBoundUserInterface.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Strip.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.ViewVariables;
using static Content.Shared.Inventory.EquipmentSlotDefines;
@@ -28,7 +29,7 @@ namespace Content.Client.Inventory
{
base.Open();
_strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", Owner.Owner.Name))}");
_strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner.Uid).EntityName))}");
_strippingMenu.OnClose += Close;
_strippingMenu.OpenCentered();

4
Content.Client/Items/UI/ItemStatusPanel.cs
View File

@@ -159,11 +159,11 @@ namespace Content.Client.Items.UI
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(_entity.Uid, out HandVirtualItemComponent? virtualItem)
&& _entityManager.TryGetEntity(virtualItem.BlockingEntity, out var blockEnt))
{
_itemNameLabel.Text = blockEnt.Name;
_itemNameLabel.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(blockEnt.Uid).EntityName;
}
else
{
_itemNameLabel.Text = _entity.Name;
_itemNameLabel.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_entity.Uid).EntityName;
}
}

2
Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
View File

@@ -101,7 +101,7 @@ namespace Content.Client.Kitchen.UI
}
var texture = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity.Uid).Icon?.Default;
var solidItem = ChamberContentBox.BoxContents.AddItem(entity.Name, texture);
var solidItem = ChamberContentBox.BoxContents.AddItem(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName, texture);
var solidIndex = ChamberContentBox.BoxContents.IndexOf(solidItem);
_chamberVisualContents.Add(solidIndex, uid);
}

2
Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
View File

@@ -134,7 +134,7 @@ namespace Content.Client.Kitchen.UI
continue;
}
var solidItem = _menu.IngredientsList.AddItem(entity.Name, texture);
var solidItem = _menu.IngredientsList.AddItem(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName, texture);
var solidIndex = _menu.IngredientsList.IndexOf(solidItem);
_solids.Add(solidIndex, t);
}

2
Content.Client/Light/Components/LightBehaviourComponent.cs
View File

@@ -452,7 +452,7 @@ namespace Content.Client.Light.Components
}
else
{
Logger.Warning($"{Owner.Name} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!");
Logger.Warning($"{IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!");
}
}

3
Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs
View File

@@ -1,6 +1,7 @@
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
namespace Content.Client.MedicalScanner.UI
@@ -19,7 +20,7 @@ namespace Content.Client.MedicalScanner.UI
base.Open();
_window = new MedicalScannerWindow
{
Title = Owner.Owner.Name,
Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner.Uid).EntityName,
};
_window.OnClose += Close;
_window.ScanButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.ScanDNA));

2
Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Client.MedicalScanner.UI
}
else
{
text.Append($"{Loc.GetString("medical-scanner-window-entity-health-text", ("entityName", entity.Name))}\n");
text.Append($"{Loc.GetString("medical-scanner-window-entity-health-text", ("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName))}\n");
var totalDamage = state.DamagePerType.Values.Sum();

3
Content.Client/Paper/UI/PaperBoundUserInterface.cs
View File

@@ -2,6 +2,7 @@ using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using static Content.Shared.Paper.SharedPaperComponent;
namespace Content.Client.Paper.UI
@@ -20,7 +21,7 @@ namespace Content.Client.Paper.UI
base.Open();
_window = new PaperWindow
{
Title = Owner.Owner.Name,
Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner.Uid).EntityName,
};
_window.OnClose += Close;
_window.Input.OnTextEntered += Input_OnTextEntered;

4
Content.Client/Storage/ClientStorageComponent.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.Storage
{
base.OnAdd();
_window = new StorageWindow(this) {Title = Owner.Name};
_window = new StorageWindow(this) {Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityName};
_window.EntityList.GenerateItem += GenerateButton;
_window.EntityList.ItemPressed += Interact;
}
@@ -202,7 +202,7 @@ namespace Content.Client.Storage
{
HorizontalExpand = true,
ClipText = true,
Text = entity.Name
Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName
},
new Label
{

2
Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Client.VendingMachines
VendingMachine = vendingMachine;
_menu = new VendingMachineMenu(this) {Title = Owner.Owner.Name};
_menu = new VendingMachineMenu(this) {Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner.Uid).EntityName};
_menu.Populate(VendingMachine.Inventory);
_menu.OnClose += Close;