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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
View File

@@ -1,7 +1,4 @@

using Content.Shared.Stacks;
using Content.Shared.Storage;
using Content.Shared.Storage.Components;
using Content.Shared.Storage.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
@@ -27,12 +24,14 @@ namespace Content.Client.Storage.Visualizers
}
}
public override void InitializeEntity(IEntity entity)
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
var entities = IoCManager.Resolve<IEntityManager>();
if (_openIcon != null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(entity, out var spriteComponent) &&
entities.TryGetComponent<SpriteComponent?>(entity, out var spriteComponent) &&
spriteComponent.BaseRSI?.Path != null)
{
spriteComponent.LayerMapReserveBlank(OpenIcon);
@@ -45,22 +44,23 @@ namespace Content.Client.Storage.Visualizers
{
base.OnChangeData(component);
if (_openIcon != null
&& component.Owner.TryGetComponent<SpriteComponent>(out var spriteComponent))
{
if (component.TryGetData<SharedBagState>(SharedBagOpenVisuals.BagState, out var bagState))
{
switch (bagState)
{
case SharedBagState.Open:
spriteComponent.LayerSetVisible(OpenIcon, true);
break;
default:
spriteComponent.LayerSetVisible(OpenIcon, false);
break;
}
var entities = IoCManager.Resolve<IEntityManager>();
}
if (_openIcon == null ||
!entities.TryGetComponent(component.Owner, out SpriteComponent spriteComponent))
return;
if (!component.TryGetData<SharedBagState>(SharedBagOpenVisuals.BagState, out var bagState))
return;
switch (bagState)
{
case SharedBagState.Open:
spriteComponent.LayerSetVisible(OpenIcon, true);
break;
default:
spriteComponent.LayerSetVisible(OpenIcon, false);
break;
}
}
}

8
Content.Client/Storage/Visualizers/MappedItemVisualizer.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Storage.Visualizers
[DataField("sprite")] private ResourcePath? _rsiPath;
private List<string> _spriteLayers = new();
public override void InitializeEntity(IEntity entity)
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
@@ -30,14 +30,16 @@ namespace Content.Client.Storage.Visualizers
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
if (component.Owner.TryGetComponent<ISpriteComponent>(out var spriteComponent))
var entities = IoCManager.Resolve<IEntityManager>();
if (entities.TryGetComponent(component.Owner, out ISpriteComponent spriteComponent))
{
if (_spriteLayers.Count == 0)
{
InitLayers(spriteComponent, component);
}
EnableLayers(spriteComponent, component);
EnableLayers(spriteComponent, component);
}
}

5
Content.Client/Storage/Visualizers/StorageVisualizer.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Client.Storage.Visualizers
[DataField("state_closed")]
private string? _stateClosed;
public override void InitializeEntity(IEntity entity)
public override void InitializeEntity(EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite))
{
@@ -34,7 +34,8 @@ namespace Content.Client.Storage.Visualizers
{
base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite))
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
{
return;
}