Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Zumorica/2021-12-03-remove-IEntity-komm-süsser-todd' into 2021-12-03-remove-IEntity-komm-süsser-todd

Browse Source 
# Conflicts:
#	Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
#	Content.Server/Hands/Systems/HandsSystem.cs
#	Content.Server/Radio/Components/IRadio.cs
#	Content.Server/UserInterface/ActivatableUISystem.cs
This commit is contained in:
DrSmugleaf
2021-12-05 22:10:07 +01:00
parent ab9d0cc6d8 75247b7e2b
commit 2b1fecbe02
25 changed files with 100 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Shared.Conveyor;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
@@ -23,7 +23,7 @@ namespace Content.Client.Conveyor.Visualizers
private void ChangeState(AppearanceComponent appearance)
{
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite))
{
return;
}
@@ -45,8 +45,8 @@ namespace Content.Client.Conveyor.Visualizers
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
var entities = IoCManager.Resolve<IEntityManager>();
var appearance = entities.EnsureComponent<ClientAppearanceComponent>(entity);
ChangeState(appearance);
}

5
Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.Conveyor.Visualizers
private void ChangeState(AppearanceComponent appearance)
{
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite))
{
return;
}
@@ -44,7 +44,8 @@ namespace Content.Client.Conveyor.Visualizers
{
base.InitializeEntity(entity);
var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
var entities = IoCManager.Resolve<IEntityManager>();
var appearance = entities.EnsureComponent<ClientAppearanceComponent>(entity);
ChangeState(appearance);
}

10
Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Client.Disposal.Visualizers
}
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite))
{
return;
}
@@ -90,7 +90,7 @@ namespace Content.Client.Disposal.Visualizers
case VisualState.Flushing:
sprite.LayerSetState(DisposalUnitVisualLayers.Base, _stateAnchored);
var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(appearance.Owner);
var animPlayer = IoCManager.Resolve<IEntityManager>().GetComponent<AnimationPlayerComponent>(appearance.OwnerUid);
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
@@ -148,9 +148,9 @@ namespace Content.Client.Disposal.Visualizers
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
entity.EnsureComponent<AnimationPlayerComponent>();
var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
var entities = IoCManager.Resolve<IEntityManager>();
entities.EnsureComponent<AnimationPlayerComponent>(entity);
var appearance = entities.EnsureComponent<ClientAppearanceComponent>(entity);
ChangeState(appearance);
}

10
Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Client.Disposal.Visualizers
private void ChangeState(AppearanceComponent appearance)
{
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite))
{
return;
}
@@ -48,17 +48,17 @@ namespace Content.Client.Disposal.Visualizers
{
appearance.Owner.EnsureComponent<SubFloorHideComponent>();
}
else if (IoCManager.Resolve<IEntityManager>().HasComponent<SubFloorHideComponent>(appearance.Owner))
else if (IoCManager.Resolve<IEntityManager>().HasComponent<SubFloorHideComponent>(appearance.OwnerUid))
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<SubFloorHideComponent>(appearance.Owner);
IoCManager.Resolve<IEntityManager>().RemoveComponent<SubFloorHideComponent>(appearance.OwnerUid);
}
}
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
var entityManager = IoCManager.Resolve<IEntityManager>();
var appearance = entityManager.EnsureComponent<ClientAppearanceComponent>(entity);
ChangeState(appearance);
}

2
Content.Client/Singularity/SingularityOverlay.cs
View File

@@ -76,7 +76,7 @@ namespace Content.Client.Singularity
var distortions = _entityManager.EntityQuery<SingularityDistortionComponent>();
foreach (var distortion in distortions) //Add all singulos that are not added yet but qualify
{
var singuloEntity = distortion.Owner;
var singuloEntity = distortion.OwnerUid;
if (!_singularities.Keys.Contains(singuloEntity) && SinguloQualifies(singuloEntity, currentEyeLoc))
{

2
Content.Client/StationEvents/RadiationPulseOverlay.cs
View File

@@ -84,7 +84,7 @@ namespace Content.Client.StationEvents
var pulses = _entityManager.EntityQuery<RadiationPulseComponent>();
foreach (var pulse in pulses) //Add all pulses that are not added yet but qualify
{
var pulseEntity = pulse.Owner;
var pulseEntity = pulse.OwnerUid;
if (!_pulses.Keys.Contains(pulseEntity) && PulseQualifies(pulseEntity, currentEyeLoc))
{