Moves HumanoidAppearanceComponent to ECS (#4855)

* Moves HumanoidCharacterAppearance to ECS * Makes HumanoidAppearanceSystem work over networks * Makes HumanoidAppearanceSystem more efficient * Cleans up the files * Updates privacy on a couple of functions * Fixes a few using references, renames a file * Makes HumanoidAppearanceSystem more cleaner * Fixes Magic Mirror * Cleanup * HumanoidAppearanceComponent now has a friend SharedHumanoidAppearanceSystem is only allowed to act on this, now * Fixes the Body-HumanoidAppearance ECS scaffolding * a little cleanup never hurt anybody * quick fix for magic mirror appearance access * Replaces a networked event with a local one This one was... causing bugs
2021-10-16 15:28:02 -07:00
parent f69575e15a
commit 7dc6b95a10
17 changed files with 275 additions and 240 deletions
--- a/Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs
@@ -0,0 +1,120 @@
+using System;
+using Content.Shared.Body.Part;
+using Content.Shared.CharacterAppearance.Components;
+using Content.Shared.Preferences;
+using Robust.Shared.Enums;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CharacterAppearance.Systems
+{
+    public abstract class SharedHumanoidAppearanceSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            SubscribeLocalEvent<HumanoidAppearanceComponent, ComponentGetState>(OnAppearanceGetState);
+            SubscribeLocalEvent<HumanoidAppearanceComponent, ComponentHandleState>(OnAppearanceHandleState);
+        }
+
+        public void UpdateFromProfile(EntityUid uid, ICharacterProfile profile)
+        {
+            var humanoid = (HumanoidCharacterProfile) profile;
+            UpdateAppearance(uid, humanoid.Appearance, humanoid.Sex, humanoid.Gender);
+        }
+
+        // The magic mirror otherwise wouldn't work. (it directly modifies the component server-side)
+        public void ForceAppearanceUpdate(EntityUid uid, HumanoidAppearanceComponent? component = null)
+        {
+            if (!Resolve(uid, ref component)) return;
+            component.Dirty();
+        }
+
+        private void UpdateAppearance(EntityUid uid, HumanoidCharacterAppearance appearance, Sex sex, Gender gender, HumanoidAppearanceComponent? component = null)
+        {
+            if (!Resolve(uid, ref component)) return;
+
+            component.Appearance = appearance;
+            component.Sex = sex;
+            component.Gender = gender;
+
+            component.Dirty();
+
+            RaiseLocalEvent(uid, new ChangedHumanoidAppearanceEvent(appearance, sex, gender));
+        }
+
+        private void OnAppearanceGetState(EntityUid uid, HumanoidAppearanceComponent component, ref ComponentGetState args)
+        {
+            args.State = new HumanoidAppearanceComponentState(component.Appearance, component.Sex, component.Gender);
+        }
+
+        private void OnAppearanceHandleState(EntityUid uid, HumanoidAppearanceComponent component, ref ComponentHandleState args)
+        {
+            if (args.Current is not HumanoidAppearanceComponentState state)
+                return;
+
+            UpdateAppearance(uid, state.Appearance, state.Sex, state.Gender);
+        }
+
+        // Scaffolding until Body is moved to ECS.
+        public void BodyPartAdded(EntityUid uid, BodyPartAddedEventArgs args)
+        {
+            RaiseLocalEvent(new HumanoidAppearanceBodyPartAddedEvent(uid, args));
+        }
+
+        public void BodyPartRemoved(EntityUid uid, BodyPartRemovedEventArgs args)
+        {
+            RaiseLocalEvent(new HumanoidAppearanceBodyPartRemovedEvent(uid, args));
+        }
+
+        // Scaffolding until Body is moved to ECS.
+        [Serializable, NetSerializable]
+        public class HumanoidAppearanceBodyPartAddedEvent : EntityEventArgs
+        {
+            public EntityUid Uid { get; }
+            public BodyPartAddedEventArgs Args { get; }
+
+            public HumanoidAppearanceBodyPartAddedEvent(EntityUid uid, BodyPartAddedEventArgs args)
+            {
+                Uid = uid;
+                Args = args;
+            }
+        }
+
+        [Serializable, NetSerializable]
+        public class HumanoidAppearanceBodyPartRemovedEvent : EntityEventArgs
+        {
+            public EntityUid Uid { get; }
+            public BodyPartRemovedEventArgs Args { get; }
+
+            public HumanoidAppearanceBodyPartRemovedEvent(EntityUid uid, BodyPartRemovedEventArgs args)
+            {
+                Uid = uid;
+                Args = args;
+            }
+
+        }
+
+        [Serializable, NetSerializable]
+        public class ChangedHumanoidAppearanceEvent : EntityEventArgs
+        {
+            public HumanoidCharacterAppearance Appearance { get; }
+            public Sex Sex { get; }
+            public Gender Gender { get; }
+
+            public ChangedHumanoidAppearanceEvent(HumanoidCharacterProfile profile)
+            {
+                Appearance = profile.Appearance;
+                Sex = profile.Sex;
+                Gender = profile.Gender;
+            }
+
+            public ChangedHumanoidAppearanceEvent(HumanoidCharacterAppearance appearance, Sex sex, Gender gender)
+            {
+                Appearance = appearance;
+                Sex = sex;
+                Gender = gender;
+            }
+        }
+    }
+}