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

AppearanceComponent API Changes (#5446)

Browse Source
This commit is contained in:
Acruid
2021-11-22 23:22:59 -08:00
committed by GitHub
parent c8acba0ba7
commit fa0ec5cbd9
116 changed files with 87 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Damage/Systems/DamageableSystem.cs
View File

@@ -119,7 +119,7 @@ namespace Content.Shared.Damage
SetTotalDamage(component, component.Damage.Total);
component.Dirty();
if (EntityManager.TryGetComponent<SharedAppearanceComponent>(component.OwnerUid, out var appearance) && damageDelta != null)
if (EntityManager.TryGetComponent<AppearanceComponent>(component.OwnerUid, out var appearance) && damageDelta != null)
appearance.SetData(DamageVisualizerKeys.DamageUpdateGroups, damageDelta.GetDamagePerGroup().Keys.ToList());
RaiseLocalEvent(component.OwnerUid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters), false);
}

2
Content.Shared/Doors/SharedDoorComponent.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Shared.Doors
public override string Name => "Door";
[ComponentDependency]
protected readonly SharedAppearanceComponent? AppearanceComponent = null;
protected readonly AppearanceComponent? AppearanceComponent = null;
[ComponentDependency]
protected readonly IPhysBody? PhysicsComponent = null;

2
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@@ -100,7 +100,7 @@ namespace Content.Shared.Hands.Components
public void UpdateHandVisualizer()
{
if (!Owner.TryGetComponent(out SharedAppearanceComponent? appearance))
if (!Owner.TryGetComponent(out AppearanceComponent? appearance))
return;
var hands = new List<HandVisualState>();

2
Content.Shared/MobState/State/SharedCriticalMobState.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Shared.MobState.State
EntitySystem.Get<StandingStateSystem>().Down(uid);
if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance))
if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
{
appearance.SetData(DamageStateVisuals.State, DamageState.Critical);
}

2
Content.Shared/MobState/State/SharedDeadMobState.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Shared.MobState.State
physics.CanCollide = false;
}
if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance))
if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
{
appearance.SetData(DamageStateVisuals.State, DamageState.Dead);
}

2
Content.Shared/MobState/State/SharedNormalMobState.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Shared.MobState.State
base.EnterState(uid, entityManager);
EntitySystem.Get<StandingStateSystem>().Stand(uid);
if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance))
if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
{
appearance.SetData(DamageStateVisuals.State, DamageState.Alive);
}

2
Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Shared.Nutrition.EntitySystems
creamPied.CreamPied = value;
if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance))
if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
{
appearance.SetData(CreamPiedVisuals.Creamed, value);
}

2
Content.Shared/Singularity/SharedSingularitySystem.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Shared.Singularity
pulse.RadsPerSecond = 10 * value;
}
if (singularity.Owner.TryGetComponent(out SharedAppearanceComponent? appearance))
if (singularity.Owner.TryGetComponent(out AppearanceComponent? appearance))
{
appearance.SetData(SingularityVisuals.Level, value);
}

4
Content.Shared/Stacks/SharedStackSystem.cs
View File

@@ -51,7 +51,7 @@ namespace Content.Shared.Stacks
EntityManager.QueueDeleteEntity(uid);
// Change appearance data.
if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance))
if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
appearance.SetData(StackVisuals.Actual, component.Count);
RaiseLocalEvent(uid, new StackCountChangedEvent(old, component.Count), false);
@@ -83,7 +83,7 @@ namespace Content.Shared.Stacks
private void OnStackStarted(EntityUid uid, SharedStackComponent component, ComponentStartup args)
{
if (!EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance))
if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
return;
appearance.SetData(StackVisuals.Actual, component.Count);

4
Content.Shared/Standing/StandingStateSystem.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Shared.Standing
public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
StandingStateComponent? standingState = null,
SharedAppearanceComponent? appearance = null,
AppearanceComponent? appearance = null,
SharedHandsComponent? hands = null)
{
// TODO: This should actually log missing comps...
@@ -70,7 +70,7 @@ namespace Content.Shared.Standing
public bool Stand(EntityUid uid,
StandingStateComponent? standingState = null,
SharedAppearanceComponent? appearance = null)
AppearanceComponent? appearance = null)
{
// TODO: This should actually log missing comps...
if (!Resolve(uid, ref standingState, false))

4
Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Shared.Storage.EntitySystems
private void CounterEntityInserted(EntityUid uid, ItemCounterComponent itemCounter,
EntInsertedIntoContainerMessage args)
{
if (!itemCounter.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)) return;
if (!itemCounter.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return;
var count = GetCount(args, itemCounter);
if (count == null)
@@ -35,7 +35,7 @@ namespace Content.Shared.Storage.EntitySystems
private void CounterEntityRemoved(EntityUid uid, ItemCounterComponent itemCounter,
EntRemovedFromContainerMessage args)
{
if (!itemCounter.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)) return;
if (!itemCounter.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return;
var count = GetCount(args, itemCounter);
if (count == null)

6
Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Shared.Storage.EntitySystems
private void InitLayers(EntityUid uid, ItemMapperComponent component, ComponentInit args)
{
if (component.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent))
if (component.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent))
{
var list = new List<string>(component.MapLayers.Keys);
appearanceComponent.SetData(StorageMapVisuals.InitLayers, new ShowLayerData(list));
@@ -30,7 +30,7 @@ namespace Content.Shared.Storage.EntitySystems
private void MapperEntityRemoved(EntityUid uid, ItemMapperComponent itemMapper,
EntRemovedFromContainerMessage args)
{
if (itemMapper.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)
if (itemMapper.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)
&& TryGetLayers(args, itemMapper, out var containedLayers))
{
appearanceComponent.SetData(StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers));
@@ -40,7 +40,7 @@ namespace Content.Shared.Storage.EntitySystems
private void MapperEntityInserted(EntityUid uid, ItemMapperComponent itemMapper,
EntInsertedIntoContainerMessage args)
{
if (itemMapper.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)
if (itemMapper.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)
&& TryGetLayers(args, itemMapper, out var containedLayers))
{
appearanceComponent.SetData(StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers));

2
Content.Shared/SubFloor/SubFloorHideSystem.cs
View File

@@ -192,7 +192,7 @@ namespace Content.Shared.SubFloor
}
// Set an appearance data value so visualizers can use this as needed.
if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearanceComponent))
if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
{
appearanceComponent.SetData(SubFloorVisuals.SubFloor, subFloorVisible);
}