Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

26
Content.Server/Access/Components/IdCardConsoleComponent.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.Access.Components
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(IdCardConsoleUiKey.Key);
[ViewVariables] private bool Powered => !IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
[ViewVariables] private bool Powered => !IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
protected override void Initialize()
{
@@ -70,14 +70,14 @@ namespace Content.Server.Access.Components
/// </summary>
private bool PrivilegedIdIsAuthorized()
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out AccessReader? reader))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AccessReader? reader))
{
return true;
}
var privilegedIdEntity = PrivilegedIdSlot.Item;
var accessSystem = EntitySystem.Get<AccessReaderSystem>();
return privilegedIdEntity != null && accessSystem.IsAllowed(reader, privilegedIdEntity.Uid);
return privilegedIdEntity != null && accessSystem.IsAllowed(reader, privilegedIdEntity);
}
/// <summary>
@@ -91,8 +91,8 @@ namespace Content.Server.Access.Components
return;
var cardSystem = EntitySystem.Get<IdCardSystem>();
cardSystem.TryChangeFullName(targetIdEntity.Uid, newFullName);
cardSystem.TryChangeJobTitle(targetIdEntity.Uid, newJobTitle);
cardSystem.TryChangeFullName(targetIdEntity, newFullName);
cardSystem.TryChangeJobTitle(targetIdEntity, newJobTitle);
if (!newAccessList.TrueForAll(x => _prototypeManager.HasIndex<AccessLevelPrototype>(x)))
{
@@ -101,7 +101,7 @@ namespace Content.Server.Access.Components
}
var accessSystem = EntitySystem.Get<AccessSystem>();
accessSystem.TrySetTags(targetIdEntity.Uid, newAccessList);
accessSystem.TrySetTags(targetIdEntity, newAccessList);
}
/// <summary>
@@ -110,9 +110,9 @@ namespace Content.Server.Access.Components
private void HandleIdButton(IEntity user, ItemSlot slot)
{
if (slot.HasItem)
EntitySystem.Get<ItemSlotsSystem>().TryEjectToHands(OwnerUid, slot, user.Uid);
EntitySystem.Get<ItemSlotsSystem>().TryEjectToHands(OwnerUid, slot, user);
else
EntitySystem.Get<ItemSlotsSystem>().TryInsertFromHand(OwnerUid, slot, user.Uid);
EntitySystem.Get<ItemSlotsSystem>().TryInsertFromHand(OwnerUid, slot, user);
}
public void UpdateUserInterface()
@@ -130,16 +130,16 @@ namespace Content.Server.Access.Components
null,
null,
null,
(tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(tempQualifier.Uid).EntityName : null) ?? string.Empty,
(tempQualifier != null ? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(tempQualifier).EntityName : null) ?? string.Empty,
string.Empty);
}
else
{
var targetIdComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(targetIdEntity.Uid);
var targetAccessComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(targetIdEntity.Uid);
var targetIdComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(targetIdEntity);
var targetAccessComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(targetIdEntity);
var name = string.Empty;
if(PrivilegedIdSlot.Item != null)
name = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(PrivilegedIdSlot.Item.Uid).EntityName;
name = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(PrivilegedIdSlot.Item).EntityName;
newState = new IdCardConsoleBoundUserInterfaceState(
PrivilegedIdSlot.HasItem,
PrivilegedIdIsAuthorized(),
@@ -148,7 +148,7 @@ namespace Content.Server.Access.Components
targetIdComponent.JobTitle,
targetAccessComponent.Tags.ToArray(),
name,
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(targetIdEntity.Uid).EntityName);
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(targetIdEntity).EntityName);
}
UserInterface?.SetState(newState);
}

6
Content.Server/Access/Systems/AccessReaderSystem.cs
View File

@@ -73,7 +73,7 @@ namespace Content.Server.Access.Systems
if (EntityManager.TryGetComponent(uid, out SharedHandsComponent? hands))
{
if (hands.TryGetActiveHeldEntity(out var heldItem) &&
FindAccessTagsItem(heldItem.Uid, out tags))
FindAccessTagsItem(heldItem, out tags))
{
return tags;
}
@@ -84,7 +84,7 @@ namespace Content.Server.Access.Systems
{
if (inventoryComponent.HasSlot(EquipmentSlotDefines.Slots.IDCARD) &&
inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent? item) &&
FindAccessTagsItem(item.Owner.Uid, out tags)
FindAccessTagsItem(item.Owner, out tags)
)
{
return tags;
@@ -111,7 +111,7 @@ namespace Content.Server.Access.Systems
IEntity tempQualifier = pda?.ContainedID?.Owner;
if (tempQualifier != null)
{
IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(tempQualifier.Uid);
IoCManager.Resolve<IEntityManager>().GetComponent<AccessComponent>(tempQualifier);
}
tags = RETURNED_VALUE?.Tags;

10
Content.Server/Access/Systems/IdCardSystem.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Server.Access.Systems
private void OnInit(EntityUid uid, IdCardComponent id, ComponentInit args)
{
id.OriginalOwnerName ??= IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner.Uid).EntityName;
id.OriginalOwnerName ??= IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityName;
UpdateEntityName(uid, id);
}
@@ -67,7 +67,7 @@ namespace Content.Server.Access.Systems
if (string.IsNullOrWhiteSpace(id.FullName) && string.IsNullOrWhiteSpace(id.JobTitle))
{
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner.Uid).EntityName = id.OriginalOwnerName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityName = id.OriginalOwnerName;
return;
}
@@ -80,7 +80,7 @@ namespace Content.Server.Access.Systems
: Loc.GetString("access-id-card-component-owner-full-name-job-title-text",
("fullName", id.FullName),
("jobSuffix", jobSuffix));
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner.Uid).EntityName = val;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityName = val;
}
/// <summary>
@@ -92,7 +92,7 @@ namespace Content.Server.Access.Systems
// check held item?
if (EntityManager.TryGetComponent(uid, out SharedHandsComponent? hands) &&
hands.TryGetActiveHeldEntity(out var heldItem) &&
TryGetIdCard(heldItem.Uid, out idCard))
TryGetIdCard(heldItem, out idCard))
{
return true;
}
@@ -105,7 +105,7 @@ namespace Content.Server.Access.Systems
if (EntityManager.TryGetComponent(uid, out InventoryComponent? inventoryComponent) &&
inventoryComponent.HasSlot(EquipmentSlotDefines.Slots.IDCARD) &&
inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent? item) &&
TryGetIdCard(item.Owner.Uid, out idCard))
TryGetIdCard(item.Owner, out idCard))
{
return true;
}