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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ namespace Content.Client.Storage
{
base.OnAdd();
_window = new StorageWindow(this) {Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityName};
_window = new StorageWindow(this) {Title = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityName};
_window.EntityList.GenerateItem += GenerateButton;
_window.EntityList.ItemPressed += Interact;
}
@@ -120,7 +120,7 @@ namespace Content.Client.Storage
if (IoCManager.Resolve<IEntityManager>().TryGetEntity(entityId, out var entity))
{
ReusableAnimations.AnimateEntityPickup(entity, initialPosition, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).LocalPosition);
ReusableAnimations.AnimateEntityPickup(entity, initialPosition, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).LocalPosition);
}
}
}
@@ -181,8 +181,8 @@ namespace Content.Client.Storage
if (!IoCManager.Resolve<IEntityManager>().TryGetEntity(entityUid, out var entity))
return;
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ISpriteComponent? sprite);
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ItemComponent? item);
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite);
IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ItemComponent? item);
button.AddChild(new BoxContainer
{
@@ -202,7 +202,7 @@ namespace Content.Client.Storage
{
HorizontalExpand = true,
ClipText = true,
Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName
Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityName
},
new Label
{
@@ -252,7 +252,7 @@ namespace Content.Client.Storage
{
var controlledEntity = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
if (controlledEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(controlledEntity.Uid, out HandsComponent? hands))
if (controlledEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(controlledEntity, out HandsComponent? hands))
{
#pragma warning disable 618
StorageEntity.SendNetworkMessage(new InsertEntityMessage());