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

Remove some obsolete AppearanceComponent method usages (#13726)

Browse Source
This commit is contained in:
Visne
2023-02-02 17:34:53 +01:00
committed by GitHub
parent 23b90de34d
commit 5a5a3afbb1
111 changed files with 428 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Storage/EntitySystems/StorageFillVisualizerSystem.cs
View File

@@ -1,12 +1,15 @@
using Content.Server.Storage.Components;
using Content.Shared.Rounding;
using Content.Shared.Storage.Components;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
namespace Content.Server.Storage.EntitySystems;
public sealed class StorageFillVisualizerSystem : EntitySystem
{
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
public override void Initialize()
{
base.Initialize();
@@ -40,6 +43,6 @@ public sealed class StorageFillVisualizerSystem : EntitySystem
return;
var level = ContentHelpers.RoundToEqualLevels(storage.StorageUsed, storage.StorageCapacityMax, component.MaxFillLevels);
appearance.SetData(StorageFillVisuals.FillLevel, level);
_appearance.SetData(uid, StorageFillVisuals.FillLevel, level, appearance);
}
}

7
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -53,6 +53,7 @@ namespace Content.Server.Storage.EntitySystems
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
/// <inheritdoc />
public override void Initialize()
@@ -470,11 +471,11 @@ namespace Content.Server.Storage.EntitySystems
if (!TryComp<AppearanceComponent>(uid, out var appearance))
return;
appearance.SetData(StorageVisuals.Open, storageComp.IsOpen);
appearance.SetData(SharedBagOpenVisuals.BagState, storageComp.IsOpen ? SharedBagState.Open : SharedBagState.Closed);
_appearance.SetData(uid, StorageVisuals.Open, storageComp.IsOpen, appearance);
_appearance.SetData(uid, SharedBagOpenVisuals.BagState, storageComp.IsOpen ? SharedBagState.Open : SharedBagState.Closed, appearance);
if (HasComp<ItemCounterComponent>(uid))
appearance.SetData(StackVisuals.Hide, !storageComp.IsOpen);
_appearance.SetData(uid, StackVisuals.Hide, !storageComp.IsOpen, appearance);
}
private void RecalculateStorageUsed(ServerStorageComponent storageComp)