tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ISpriteComponent (#13458)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-15 13:38:53 +11:00
committed by GitHub
parent cd10d6fb5e
commit 02aef68dff
40 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Animations/AnimationsTestComponent.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Client.Animations
},
new AnimationTrackComponentProperty
{
ComponentType = typeof(ISpriteComponent),
ComponentType = typeof(SpriteComponent),
Property = "layer/0/texture",
KeyFrames =
{

4
Content.Client/CharacterInfo/CharacterInfoSystem.cs
View File

@@ -42,7 +42,7 @@ public sealed class CharacterInfoSystem : EntitySystem
private void OnCharacterInfoEvent(CharacterInfoEvent msg, EntitySessionEventArgs args)
{
var sprite = CompOrNull<ISpriteComponent>(msg.EntityUid);
var sprite = CompOrNull<SpriteComponent>(msg.EntityUid);
var data = new CharacterData(msg.JobTitle, msg.Objectives, msg.Briefing, sprite, Name(msg.EntityUid));
OnCharacterUpdate?.Invoke(data);
@@ -52,7 +52,7 @@ public sealed class CharacterInfoSystem : EntitySystem
string Job,
Dictionary<string, List<ConditionInfo>> Objectives,
string Briefing,
ISpriteComponent? Sprite,
SpriteComponent? Sprite,
string EntityName
);
}

2
Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Client.Chemistry.Visualizers
if (component.TryGetData<Color>(FoamVisuals.Color, out var color))
{
if (entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
if (entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
{
sprite.Color = color;
}

2
Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Chemistry.Visualizers
var entities = IoCManager.Resolve<IEntityManager>();
if (component.TryGetData<Color>(SmokeVisuals.Color, out var color))
{
if (entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
if (entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
{
sprite.Color = color;
}

2
Content.Client/Chemistry/Visualizers/VaporVisualizer.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Client.Chemistry.Visualizers
private void SetColor(AppearanceComponent component, Color color)
{
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
sprite.Color = color;
}

2
Content.Client/Clickable/ClickableComponent.cs
View File

@@ -98,7 +98,7 @@ namespace Content.Client.Clickable
return false;
}
public bool CheckDirBound(ISpriteComponent sprite, Angle relativeRotation, Vector2 localPos)
public bool CheckDirBound(SpriteComponent sprite, Angle relativeRotation, Vector2 localPos)
{
if (Bounds == null)
return false;

2
Content.Client/ContextMenu/UI/EntityMenuElement.cs
View File

@@ -85,7 +85,7 @@ namespace Content.Client.ContextMenu.UI
return;
}
EntityIcon.Sprite = _entityManager.GetComponentOrNull<ISpriteComponent>(entity);
EntityIcon.Sprite = _entityManager.GetComponentOrNull<SpriteComponent>(entity);
if (_adminManager.HasFlag(AdminFlags.Admin | AdminFlags.Debug))
{

6
Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
View File

@@ -36,8 +36,8 @@ namespace Content.Client.ContextMenu.UI
(a, b, entMan) => entMan.GetComponent<MetaDataComponent>(a).EntityPrototype!.ID == entMan.GetComponent<MetaDataComponent>(b).EntityPrototype!.ID,
(a, b, entMan) =>
{
entMan.TryGetComponent<ISpriteComponent?>(a, out var spriteA);
entMan.TryGetComponent<ISpriteComponent?>(b, out var spriteB);
entMan.TryGetComponent<SpriteComponent?>(a, out var spriteA);
entMan.TryGetComponent<SpriteComponent?>(b, out var spriteB);
if (spriteA == null || spriteB == null)
return spriteA == spriteB;
@@ -54,7 +54,7 @@ namespace Content.Client.ContextMenu.UI
(e, entMan) =>
{
var hash = 0;
foreach (var element in entMan.GetComponent<ISpriteComponent>(e).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
foreach (var element in entMan.GetComponent<SpriteComponent>(e).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
{
hash ^= EqualityComparer<string>.Default.GetHashCode(element!);
}

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

@@ -67,7 +67,7 @@ namespace Content.Client.Disposal.Visualizers
}
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(appearance.Owner, out SpriteComponent? sprite))
{
return;
}

2
Content.Client/Doors/AirlockVisualizer.cs
View File

@@ -152,7 +152,7 @@ namespace Content.Client.Doors
base.OnChangeData(component);
var sprite = _entMan.GetComponent<ISpriteComponent>(component.Owner);
var sprite = _entMan.GetComponent<SpriteComponent>(component.Owner);
var animPlayer = _entMan.GetComponent<AnimationPlayerComponent>(component.Owner);
if (!component.TryGetData(DoorVisuals.State, out DoorState state))
{

2
Content.Client/Examine/ExamineSystem.cs
View File

@@ -193,7 +193,7 @@ namespace Content.Client.Examine
vBox.AddChild(hBox);
if (EntityManager.TryGetComponent(target, out ISpriteComponent? sprite))
if (EntityManager.TryGetComponent(target, out SpriteComponent? sprite))
{
hBox.AddChild(new SpriteView
{

2
Content.Client/Explosion/ClusterGrenadeVisualizer.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Client.Explosion
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent<ISpriteComponent>(component.Owner, out var sprite))
if (!entities.TryGetComponent<SpriteComponent>(component.Owner, out var sprite))
{
return;
}

2
Content.Client/Hands/ShowHandItemOverlay.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Client.Hands
var handEntity = EntityOverride ?? EntitySystem.Get<HandsSystem>().GetActiveHandEntity();
if (handEntity == null || !_entMan.HasComponent<ISpriteComponent>(handEntity))
if (handEntity == null || !_entMan.HasComponent<SpriteComponent>(handEntity))
return;
var halfSize = _renderBackbuffer.Size / 2;

4
Content.Client/Inventory/ClientInventorySystem.cs
View File

@@ -101,7 +101,7 @@ namespace Content.Client.Inventory
UpdateSlot(args.Equipee, component, args.Slot);
if (args.Equipee != _playerManager.LocalPlayer?.ControlledEntity)
return;
var sprite = EntityManager.GetComponentOrNull<ISpriteComponent>(args.Equipment);
var sprite = EntityManager.GetComponentOrNull<SpriteComponent>(args.Equipment);
var update = new SlotSpriteUpdate(args.SlotGroup, args.Slot, sprite,
HasComp<ClientStorageComponent>(args.Equipment));
OnSpriteUpdate?.Invoke(update);
@@ -340,7 +340,7 @@ namespace Content.Client.Inventory
public readonly record struct SlotSpriteUpdate(
string Group,
string Name,
ISpriteComponent? Sprite,
SpriteComponent? Sprite,
bool ShowStorage
);
}

10
Content.Client/Jittering/JitteringSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Client.Jittering
private void OnStartup(EntityUid uid, JitteringComponent jittering, ComponentStartup args)
{
if (!EntityManager.TryGetComponent(uid, out ISpriteComponent? sprite))
if (!EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
return;
var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
@@ -52,11 +52,11 @@ namespace Content.Client.Jittering
return;
if(EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer)
&& EntityManager.TryGetComponent(uid, out ISpriteComponent? sprite))
&& EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
animationPlayer.Play(GetAnimation(jittering, sprite), _jitterAnimationKey);
}
private Animation GetAnimation(JitteringComponent jittering, ISpriteComponent sprite)
private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite)
{
var amplitude = MathF.Min(4f, jittering.Amplitude / 100f + 1f) / 10f;
var offset = new Vector2(_random.NextFloat(amplitude/4f, amplitude),
@@ -88,8 +88,8 @@ namespace Content.Client.Jittering
{
new AnimationTrackComponentProperty()
{
ComponentType = typeof(ISpriteComponent),
Property = nameof(ISpriteComponent.Offset),
ComponentType = typeof(SpriteComponent),
Property = nameof(SpriteComponent.Offset),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),

2
Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Client.Kitchen.Visualizers
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
component.TryGetData(ReagentGrinderVisualState.BeakerAttached, out bool hasBeaker);
sprite.LayerSetState(0, $"juicer{(hasBeaker ? "1" : "0")}");
}

2
Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Client.Light.Visualizers
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
if (!component.TryGetData(PoweredLightVisuals.BulbState, out PoweredLightState state)) return;
switch (state)

2
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
View File

@@ -94,7 +94,7 @@ namespace Content.Client.Lobby.UI
{
return new()
{
Sprite = _entityManager.GetComponent<ISpriteComponent>(entity),
Sprite = _entityManager.GetComponent<SpriteComponent>(entity),
OverrideDirection = direction,
Scale = (2, 2)
};

2
Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.MedicalScanner
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
if (!component.TryGetData(MedicalScannerVisuals.Status, out MedicalScannerStatus status)) return;
sprite.LayerSetState(MedicalScannerVisualLayers.Machine, StatusToMachineStateId(status));
sprite.LayerSetState(MedicalScannerVisualLayers.Terminal, StatusToTerminalStateId(status));

4
Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Nutrition.Visualizers
{
base.InitializeEntity(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
sprite.LayerMapReserveBlank(CreamPiedVisualLayers.Pie);
sprite.LayerSetRSI(CreamPiedVisualLayers.Pie, "Effects/creampie.rsi");
@@ -38,7 +38,7 @@ namespace Content.Client.Nutrition.Visualizers
private void SetPied(AppearanceComponent component, bool pied)
{
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
sprite.LayerSetVisible(CreamPiedVisualLayers.Pie, pied);
sprite.LayerSetState(CreamPiedVisualLayers.Pie, _state);

2
Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.Nutrition.Visualizers
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
{
return;
}

12
Content.Client/Orbit/OrbitVisualsSystem.cs
View File

@@ -71,7 +71,7 @@ public sealed class OrbitVisualsSystem : EntitySystem
{
base.FrameUpdate(frameTime);
foreach (var (orbit, sprite) in EntityManager.EntityQuery<OrbitVisualsComponent, ISpriteComponent>())
foreach (var (orbit, sprite) in EntityManager.EntityQuery<OrbitVisualsComponent, SpriteComponent>())
{
var angle = new Angle(Math.PI * 2 * orbit.Orbit);
var vec = angle.RotateVec(new Vector2(orbit.OrbitDistance, 0));
@@ -114,7 +114,7 @@ public sealed class OrbitVisualsSystem : EntitySystem
};
}
private Animation GetStopAnimation(OrbitVisualsComponent component, ISpriteComponent sprite)
private Animation GetStopAnimation(OrbitVisualsComponent component, SpriteComponent sprite)
{
var length = component.OrbitStopLength;
@@ -125,8 +125,8 @@ public sealed class OrbitVisualsSystem : EntitySystem
{
new AnimationTrackComponentProperty()
{
ComponentType = typeof(ISpriteComponent),
Property = nameof(ISpriteComponent.Offset),
ComponentType = typeof(SpriteComponent),
Property = nameof(SpriteComponent.Offset),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),
@@ -136,8 +136,8 @@ public sealed class OrbitVisualsSystem : EntitySystem
},
new AnimationTrackComponentProperty()
{
ComponentType = typeof(ISpriteComponent),
Property = nameof(ISpriteComponent.Rotation),
ComponentType = typeof(SpriteComponent),
Property = nameof(SpriteComponent.Rotation),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(sprite.Rotation.Reduced(), 0f),

4
Content.Client/PDA/PDAVisualizer.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Client.PDA
{
base.InitializeEntity(entity);
var entityManager = IoCManager.Resolve<IEntityManager>();
var sprite = entityManager.GetComponent<ISpriteComponent>(entity);
var sprite = entityManager.GetComponent<SpriteComponent>(entity);
if (_state != null)
{
@@ -50,7 +50,7 @@ namespace Content.Client.PDA
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
sprite.LayerSetVisible(PDAVisualLayers.Flashlight, false);
if (component.TryGetData(UnpoweredFlashlightVisuals.LightOn, out bool isFlashlightOn))
{

4
Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Client.ParticleAccelerator
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(entity, out var sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(entity, out var sprite))
{
throw new EntityCreationException("No sprite component found in entity that has ParticleAcceleratorPartVisualizer");
}
@@ -42,7 +42,7 @@ namespace Content.Client.ParticleAccelerator
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
if (!component.TryGetData(ParticleAcceleratorVisuals.VisualState, out ParticleAcceleratorVisualState state))
{
state = ParticleAcceleratorVisualState.Unpowered;

4
Content.Client/Power/APC/ApcVisualizer.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Client.Power.APC
{
base.InitializeEntity(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
sprite.LayerMapSet(Layers.Panel, sprite.AddLayerState("apc0"));
@@ -47,7 +47,7 @@ namespace Content.Client.Power.APC
base.OnChangeData(component);
var ent = IoCManager.Resolve<IEntityManager>();
var sprite = ent.GetComponent<ISpriteComponent>(component.Owner);
var sprite = ent.GetComponent<SpriteComponent>(component.Owner);
if (component.TryGetData<ApcPanelState>(ApcVisuals.PanelState, out var panelState))
{
switch (panelState)

4
Content.Client/Power/SMES/SmesVisualizer.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Client.Power.SMES
{
base.InitializeEntity(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
sprite.LayerMapSet(Layers.Input, sprite.AddLayerState("smes-oc0"));
sprite.LayerSetShader(Layers.Input, "unshaded");
@@ -31,7 +31,7 @@ namespace Content.Client.Power.SMES
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
if (!component.TryGetData<int>(SmesVisuals.LastChargeLevel, out var level) || level == 0)
{
sprite.LayerSetVisible(Layers.Charge, false);

2
Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Power
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
var powered = component.TryGetData(PowerDeviceVisuals.Powered, out bool poweredVar) && poweredVar;
sprite.LayerSetVisible(PowerDeviceVisualLayers.Powered, powered);
}

4
Content.Client/PowerCell/PowerChargerVisualizer.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.PowerCell
{
base.InitializeEntity(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
// Base item
sprite.LayerMapSet(Layers.Base, sprite.AddLayerState("empty"));
@@ -29,7 +29,7 @@ namespace Content.Client.PowerCell
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
// Update base item
if (component.TryGetData(CellVisual.Occupied, out bool occupied))

6
Content.Client/Recycling/RecyclerVisualizer.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Client.Recycling
base.InitializeEntity(entity);
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(entity, out ISpriteComponent? sprite) ||
if (!entMan.TryGetComponent(entity, out SpriteComponent? sprite) ||
!entMan.TryGetComponent(entity, out AppearanceComponent? appearance))
{
return;
@@ -38,7 +38,7 @@ namespace Content.Client.Recycling
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
{
return;
}
@@ -46,7 +46,7 @@ namespace Content.Client.Recycling
UpdateAppearance(component, sprite);
}
private void UpdateAppearance(AppearanceComponent component, ISpriteComponent sprite)
private void UpdateAppearance(AppearanceComponent component, SpriteComponent sprite)
{
var state = _stateOff;
if (component.TryGetData(ConveyorVisuals.State, out ConveyorState conveyorState) && conveyorState != ConveyorState.Off)

4
Content.Client/Rotation/RotationVisualizerSystem.cs
View File

@@ -54,8 +54,8 @@ public sealed class RotationVisualizerSystem : VisualizerSystem<RotationVisualsC
{
new AnimationTrackComponentProperty
{
ComponentType = typeof(ISpriteComponent),
Property = nameof(ISpriteComponent.Rotation),
ComponentType = typeof(SpriteComponent),
Property = nameof(SpriteComponent.Rotation),
InterpolationMode = AnimationInterpolationMode.Linear,
KeyFrames =
{

2
Content.Client/RoundEnd/RoundEndSummaryWindow.cs
View File

@@ -120,7 +120,7 @@ namespace Content.Client.RoundEnd
VerticalExpand = true,
};
if (_entityManager.TryGetComponent(playerInfo.PlayerEntityUid, out ISpriteComponent? sprite))
if (_entityManager.TryGetComponent(playerInfo.PlayerEntityUid, out SpriteComponent? sprite))
{
hBox.AddChild(new SpriteView
{

2
Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Client.Singularity.Visualizers
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
if (!entities.TryGetComponent(component.Owner, out AnimationPlayerComponent? animPlayer)) return;
if (!component.TryGetData(RadiationCollectorVisuals.VisualState, out RadiationCollectorVisualState state))
{

8
Content.Client/Stack/StackVisualizer.cs
View File

@@ -85,7 +85,7 @@ namespace Content.Client.Stack
if (_isComposite
&& _spriteLayers.Count > 0
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(entity, out var spriteComponent))
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<SpriteComponent?>(entity, out var spriteComponent))
{
var spritePath = _spritePath ?? spriteComponent.BaseRSI!.Path!;
@@ -104,7 +104,7 @@ namespace Content.Client.Stack
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (entities.TryGetComponent(component.Owner, out ISpriteComponent? spriteComponent))
if (entities.TryGetComponent(component.Owner, out SpriteComponent? spriteComponent))
{
if (_isComposite)
{
@@ -117,7 +117,7 @@ namespace Content.Client.Stack
}
}
private void ProcessOpaqueSprites(AppearanceComponent component, ISpriteComponent spriteComponent)
private void ProcessOpaqueSprites(AppearanceComponent component, SpriteComponent spriteComponent)
{
// Skip processing if no actual
if (!component.TryGetData<int>(StackVisuals.Actual, out var actual)) return;
@@ -130,7 +130,7 @@ namespace Content.Client.Stack
spriteComponent.LayerSetState(IconLayer, _spriteLayers[activeLayer]);
}
private void ProcessCompositeSprites(AppearanceComponent component, ISpriteComponent spriteComponent)
private void ProcessCompositeSprites(AppearanceComponent component, SpriteComponent spriteComponent)
{
// If hidden, don't render any sprites
if (component.TryGetData<bool>(StackVisuals.Hide, out var hide)

2
Content.Client/Storage/UI/StorageWindow.cs
View File

@@ -110,7 +110,7 @@ namespace Content.Client.Storage.UI
|| !_entityManager.EntityExists(entity))
return;
_entityManager.TryGetComponent(entity, out ISpriteComponent? sprite);
_entityManager.TryGetComponent(entity, out SpriteComponent? sprite);
_entityManager.TryGetComponent(entity, out ItemComponent? item);
button.AddChild(new BoxContainer

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

@@ -25,7 +25,7 @@ namespace Content.Client.Storage.Visualizers
[Obsolete("Subscribe to your component being initialised instead.")]
public override void InitializeEntity(EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SpriteComponent? sprite))
{
return;
}
@@ -47,7 +47,7 @@ namespace Content.Client.Storage.Visualizers
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite))
{
return;
}

2
Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Tabletop.Visualizers
public override void OnChangeData(AppearanceComponent appearance)
{
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent<ISpriteComponent>(appearance.Owner, out var sprite))
if (!entities.TryGetComponent<SpriteComponent>(appearance.Owner, out var sprite))
{
return;
}

2
Content.Client/Trigger/TimerTriggerVisualizer.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Client.Trigger
public override void OnChangeData(AppearanceComponent component)
{
var entMan = IoCManager.Resolve<IEntityManager>();
var sprite = entMan.GetComponent<ISpriteComponent>(component.Owner);
var sprite = entMan.GetComponent<SpriteComponent>(component.Owner);
var animPlayer = entMan.GetComponent<AnimationPlayerComponent>(component.Owner);
if (!component.TryGetData(TriggerVisuals.VisualState, out TriggerVisualState state))
{

2
Content.Client/Verbs/UI/VerbMenuElement.cs
View File

@@ -48,7 +48,7 @@ namespace Content.Client.Verbs.UI
var spriteView = new SpriteView()
{
OverrideDirection = Direction.South,
Sprite = entManager.GetComponentOrNull<ISpriteComponent>(verb.IconEntity.Value)
Sprite = entManager.GetComponentOrNull<SpriteComponent>(verb.IconEntity.Value)
};
Icon.AddChild(spriteView);

2
Content.Client/Visualizer/GenericEnumVisualizer.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Client.Visualizer
base.OnChangeData(component);
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite)) return;
if (!entities.TryGetComponent(component.Owner, out SpriteComponent? sprite)) return;
if (!component.TryGetData(Key, out object status)) return;
if (!States.TryGetValue(status, out var val)) return;
sprite.LayerSetState(Layer, val);

2
Content.Client/Wall/ReinforcedWallVisualizer.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Client.Wall
var entity = component.Owner;
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(entity, out ISpriteComponent? sprite)) return;
if (!entities.TryGetComponent(entity, out SpriteComponent? sprite)) return;
var index = sprite.LayerMapReserveBlank(ReinforcedWallVisualLayers.Deconstruction);