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

Remove obsolete usages of AnimationPlayerComponent (#20806)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-14 10:28:06 -07:00
committed by GitHub
parent 49a584f12c
commit 9e1ecdea76
8 changed files with 145 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
using System.Numerics;
using Content.Shared.Follower;
using Content.Shared.Follower.Components;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
@@ -11,6 +10,7 @@ namespace Content.Client.Orbit;
public sealed class OrbitVisualsSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly AnimationPlayerSystem _animations = default!;
private readonly string _orbitAnimationKey = "orbiting";
private readonly string _orbitStopKey = "orbiting_stop";
@@ -37,16 +37,16 @@ public sealed class OrbitVisualsSystem : EntitySystem
sprite.DirectionOverride = Direction.South;
}
var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
if (animationPlayer.HasRunningAnimation(_orbitAnimationKey))
var animationPlayer = EnsureComp<AnimationPlayerComponent>(uid);
if (_animations.HasRunningAnimation(uid, animationPlayer, _orbitAnimationKey))
return;
if (animationPlayer.HasRunningAnimation(_orbitStopKey))
if (_animations.HasRunningAnimation(uid, animationPlayer, _orbitStopKey))
{
animationPlayer.Stop(_orbitStopKey);
_animations.Stop(uid, animationPlayer, _orbitStopKey);
}
animationPlayer.Play(GetOrbitAnimation(component), _orbitAnimationKey);
_animations.Play(uid, animationPlayer, GetOrbitAnimation(component), _orbitAnimationKey);
}
private void OnComponentRemove(EntityUid uid, OrbitVisualsComponent component, ComponentRemove args)
@@ -56,15 +56,15 @@ public sealed class OrbitVisualsSystem : EntitySystem
sprite.EnableDirectionOverride = false;
var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
if (animationPlayer.HasRunningAnimation(_orbitAnimationKey))
var animationPlayer = EnsureComp<AnimationPlayerComponent>(uid);
if (_animations.HasRunningAnimation(uid, animationPlayer, _orbitAnimationKey))
{
animationPlayer.Stop(_orbitAnimationKey);
_animations.Stop(uid, animationPlayer, _orbitAnimationKey);
}
if (!animationPlayer.HasRunningAnimation(_orbitStopKey))
if (!_animations.HasRunningAnimation(uid, animationPlayer, _orbitStopKey))
{
animationPlayer.Play(GetStopAnimation(component, sprite), _orbitStopKey);
_animations.Play(uid, animationPlayer, GetStopAnimation(component, sprite), _orbitStopKey);
}
}
@@ -84,10 +84,9 @@ public sealed class OrbitVisualsSystem : EntitySystem
private void OnAnimationCompleted(EntityUid uid, OrbitVisualsComponent component, AnimationCompletedEvent args)
{
if (args.Key == _orbitAnimationKey)
if (args.Key == _orbitAnimationKey && TryComp(uid, out AnimationPlayerComponent? animationPlayer))
{
if(EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer))
animationPlayer.Play(GetOrbitAnimation(component), _orbitAnimationKey);
_animations.Play(uid, animationPlayer, GetOrbitAnimation(component), _orbitAnimationKey);
}
}