Return to new appearances being events

OpenDreamClient/EntryPoint.cs

@@ -6,6 +6,7 @@
 using OpenDreamClient.States;
 using OpenDreamShared;
 using OpenDreamShared.Network.Messages;
+using Robust.Client;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Map;
@@ -85,7 +86,6 @@
         IoCManager.Resolve<IDreamSoundEngine>().Initialize();
 
         _netManager.RegisterNetMessage<MsgAllAppearances>(RxAllAppearances);
-        _netManager.RegisterNetMessage<MsgNewAppearance>(RxNewAppearance);
 
         if (_configurationManager.GetCVar(CVars.DisplayCompat))
             _dreamInterface.OpenAlert(
@@ -113,15 +113,6 @@
         clientAppearanceSystem.SetAllAppearances(message.AllAppearances);
     }
 
-    private void RxNewAppearance(MsgNewAppearance message) {
-        if (!_entitySystemManager.TryGetEntitySystem<ClientAppearanceSystem>(out var clientAppearanceSystem)) {
-            Logger.GetSawmill("opendream").Error("Received MsgNewAppearance before initializing entity systems");
-            return;
-        }
-
-        clientAppearanceSystem.OnNewAppearance(message);
-    }
-
     // As of RobustToolbox v0.90.0.0 there's a TileEdgeOverlay that breaks our rendering
     // because we don't have an ITileDefinition for each tile.
     // This removes that overlay immediately after MapSystem adds it.

OpenDreamClient/Interface/DummyDreamInterfaceManager.cs

@@ -1,5 +1,4 @@
 using OpenDreamClient.Interface.Controls;
-using OpenDreamClient.Interface.Descriptors;
 using OpenDreamShared.Dream;
 using OpenDreamShared.Network.Messages;
 using Robust.Shared.Network;
@@ -20,6 +19,7 @@ public sealed class DummyDreamInterfaceManager : IDreamInterfaceManager {
     public ControlMap? DefaultMap => null;
     public ViewRange View => new(5);
     public bool ShowPopupMenus => true;
+
     [Dependency] private readonly IClientNetManager _netManager = default!;
 
     public void Initialize() {

OpenDreamClient/Rendering/ClientAppearanceSystem.cs

@@ -6,7 +6,6 @@
 using OpenDreamClient.Resources;
 using OpenDreamClient.Resources.ResourceTypes;
 using Robust.Shared.Timing;
-using OpenDreamShared.Network.Messages;
 
 namespace OpenDreamClient.Rendering;
 
@@ -25,6 +24,7 @@ internal sealed class ClientAppearanceSystem : SharedAppearanceSystem {
     [Dependency] private readonly DMISpriteSystem _spriteSystem = default!;
 
     public override void Initialize() {
+        SubscribeNetworkEvent<NewAppearanceEvent>(OnNewAppearance);
         SubscribeNetworkEvent<RemoveAppearanceEvent>(e => _appearances.Remove(e.AppearanceId));
         SubscribeNetworkEvent<AnimationEvent>(OnAnimation);
         SubscribeLocalEvent<DMISpriteComponent, WorldAABBEvent>(OnWorldAABB);
@@ -75,7 +75,7 @@ public DreamIcon GetTurfIcon(uint turfId) {
         return icon;
     }
 
-    public void OnNewAppearance(MsgNewAppearance e) {
+    public void OnNewAppearance(NewAppearanceEvent e) {
         uint appearanceId = e.Appearance.MustGetId();
         _appearances[appearanceId] = e.Appearance;
 

OpenDreamRuntime/DreamManager.Connections.cs

@@ -72,7 +72,6 @@ private void InitializeConnectionManager() {
             _netManager.RegisterNetMessage<MsgSound>();
             _netManager.RegisterNetMessage<MsgUpdateClientInfo>();
             _netManager.RegisterNetMessage<MsgAllAppearances>();
-            _netManager.RegisterNetMessage<MsgNewAppearance>();
 
             var topicPort = _config.GetCVar(OpenDreamCVars.TopicPort);
             var worldTopicAddress = new IPEndPoint(IPAddress.Loopback, topicPort);

OpenDreamRuntime/Rendering/ServerAppearanceSystem.cs

@@ -75,7 +75,8 @@ private void RegisterAppearance(ImmutableAppearance immutableAppearance) {
         ProxyWeakRef proxyWeakRef = new(immutableAppearance);
         _appearanceLookup.Add(proxyWeakRef);
         _idToAppearance.Add(immutableAppearance.MustGetId(), proxyWeakRef);
-        _networkManager.ServerSendToAll(new MsgNewAppearance(immutableAppearance));
+
+        RaiseNetworkEvent(new NewAppearanceEvent(immutableAppearance));
     }
 
     public ImmutableAppearance AddAppearance(MutableAppearance appearance, bool registerAppearance = true) {

OpenDreamShared/Rendering/SharedAppearanceSystem.cs

@@ -10,9 +10,8 @@ public abstract class SharedAppearanceSystem : EntitySystem {
     public abstract void RemoveAppearance(ImmutableAppearance appearance);
 
     [Serializable, NetSerializable]
-    public sealed class NewAppearanceEvent(uint appearanceId, MutableAppearance appearance) : EntityEventArgs {
-        public uint AppearanceId { get; } = appearanceId;
-        public MutableAppearance Appearance { get; } = appearance;
+    public sealed class NewAppearanceEvent(ImmutableAppearance appearance) : EntityEventArgs {
+        public ImmutableAppearance Appearance { get; } = appearance;
     }
 
     [Serializable, NetSerializable]