0 days without buckle breaking (#1366)

Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs

@@ -1,10 +1,10 @@
 using Content.Client.GameObjects.Components.Strap;
 using Content.Client.Interfaces.GameObjects.Components.Interaction;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.GameObjects.Components.Buckle;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.GameObjects.Components.Buckle
 {
     [RegisterComponent]
     public class BuckleComponent : SharedBuckleComponent, IClientDraggable
@@ -12,7 +12,7 @@ namespace Content.Client.GameObjects.Components.Mobs
         private bool _buckled;
         private int? _originalDrawDepth;
 
-        protected override bool Buckled => _buckled;
+        public override bool Buckled => _buckled;
 
         public override void HandleComponentState(ComponentState curState, ComponentState nextState)
         {

Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs

@@ -0,0 +1,68 @@
+using System;
+using Content.Shared.GameObjects.Components.Buckle;
+using Content.Shared.GameObjects.Components.Strap;
+using JetBrains.Annotations;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Client.GameObjects.Components.Animations;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Shared.Animations;
+using Robust.Shared.Maths;
+
+namespace Content.Client.GameObjects.Components.Buckle
+{
+    [UsedImplicitly]
+    public class BuckleVisualizer : AppearanceVisualizer
+    {
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            if (!component.TryGetData<bool>(BuckleVisuals.Buckled, out var buckled) ||
+                !buckled)
+            {
+                return;
+            }
+
+            if (!component.TryGetData<int>(StrapVisuals.RotationAngle, out var angle))
+            {
+                return;
+            }
+
+            SetRotation(component, Angle.FromDegrees(angle));
+        }
+
+        private void SetRotation(AppearanceComponent component, Angle rotation)
+        {
+            var sprite = component.Owner.GetComponent<ISpriteComponent>();
+
+            if (!sprite.Owner.TryGetComponent(out AnimationPlayerComponent animation))
+            {
+                sprite.Rotation = rotation;
+                return;
+            }
+
+            if (animation.HasRunningAnimation("rotate"))
+            {
+                animation.Stop("rotate");
+            }
+
+            animation.Play(new Animation
+            {
+                Length = TimeSpan.FromSeconds(0.125),
+                AnimationTracks =
+                {
+                    new AnimationTrackComponentProperty
+                    {
+                        ComponentType = typeof(ISpriteComponent),
+                        Property = nameof(ISpriteComponent.Rotation),
+                        InterpolationMode = AnimationInterpolationMode.Linear,
+                        KeyFrames =
+                        {
+                            new AnimationTrackProperty.KeyFrame(sprite.Rotation, 0),
+                            new AnimationTrackProperty.KeyFrame(rotation, 0.125f)
+                        }
+                    }
+                }
+            }, "rotate");
+        }
+    }
+}

Content.Client/GameObjects/Components/Mobs/BuckleVisualizer2D.cs

@@ -1,28 +0,0 @@
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Strap;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.Maths;
-
-namespace Content.Client.GameObjects.Components.Mobs
-{
-    [UsedImplicitly]
-    public class BuckleVisualizer2D : SpeciesVisualizer2D
-    {
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            if (!component.TryGetData<bool>(SharedBuckleComponent.BuckleVisuals.Buckled, out var buckled) ||
-                !buckled)
-            {
-                return;
-            }
-
-            if (!component.TryGetData<int>(StrapVisuals.RotationAngle, out var angle))
-            {
-                return;
-            }
-
-            SetRotation(component, Angle.FromDegrees(angle));
-        }
-    }
-}

Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs

@@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Mobs
             }
         }
 
-        protected void SetRotation(AppearanceComponent component, Angle rotation)
+        private void SetRotation(AppearanceComponent component, Angle rotation)
         {
             var sprite = component.Owner.GetComponent<ISpriteComponent>();
 

Content.Client/GameObjects/Components/Strap/StrapComponent.cs

@@ -7,16 +7,5 @@ namespace Content.Client.GameObjects.Components.Strap
     [RegisterComponent]
     public class StrapComponent : SharedStrapComponent
     {
-        public override StrapPosition Position { get; protected set; }
-
-        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
-        {
-            if (!(curState is StrapComponentState strap))
-            {
-                return;
-            }
-
-            Position = strap.Position;
-        }
     }
 }