Revert "Update submodule to 0.34.0.0 (#10356)" (#10359)

Content.Server/Arcade/ArcadeSystem.cs

@@ -1,10 +1,10 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Arcade.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Arcade;
 using Robust.Shared.Utility;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
+
 
 namespace Content.Server.Arcade
 {
@@ -19,7 +19,6 @@ namespace Content.Server.Arcade
             base.Initialize();
             SubscribeLocalEvent<BlockGameArcadeComponent, AfterActivatableUIOpenEvent>(OnAfterUIOpen);
             SubscribeLocalEvent<SpaceVillainArcadeComponent, AfterActivatableUIOpenEvent>(OnAfterUIOpenSV);
-            SubscribeLocalEvent<BlockGameArcadeComponent, BoundUIClosedEvent>((_,c,args) => c.UnRegisterPlayerSession((IPlayerSession)args.Session));
             InitializeBlockGame();
             InitializeSpaceVillain();
         }

Content.Server/Arcade/Components/BlockGameArcadeComponent.cs

@@ -48,7 +48,7 @@ namespace Content.Server.Arcade.Components
             UpdatePlayerStatus(temp);
         }
 
-        public void UnRegisterPlayerSession(IPlayerSession session)
+        private void UnRegisterPlayerSession(IPlayerSession session)
         {
             if (_player == session)
             {
@@ -72,6 +72,7 @@ namespace Content.Server.Arcade.Components
             if (UserInterface != null)
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;
+                UserInterface.OnClosed += UnRegisterPlayerSession;
             }
             _game = new BlockGame(this);
         }

Content.Server/Atmos/Components/GasAnalyzerComponent.cs

@@ -35,6 +35,7 @@ namespace Content.Server.Atmos.Components
             if (UserInterface != null)
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnReceiveMessage;
+                UserInterface.OnClosed += UserInterfaceOnClose;
             }
 
             _entities.TryGetComponent(Owner, out _appearance);
@@ -95,7 +96,12 @@ namespace Content.Server.Atmos.Components
             Resync();
         }
 
-        public void UpdateAppearance(bool open)
+        private void UserInterfaceOnClose(IPlayerSession obj)
+        {
+            UpdateAppearance(false);
+        }
+
+        private void UpdateAppearance(bool open)
         {
             _appearance?.SetData(GasAnalyzerVisuals.VisualState,
                 open ? GasAnalyzerVisualState.Working : GasAnalyzerVisualState.Off);

Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs

@@ -21,7 +21,6 @@ namespace Content.Server.Atmos.EntitySystems
             base.Initialize();
 
             SubscribeLocalEvent<GasAnalyzableComponent, GetVerbsEvent<ExamineVerb>>(OnGetExamineVerbs);
-            SubscribeLocalEvent<GasAnalyzerComponent, BoundUIClosedEvent>((_,c,_) => c.UpdateAppearance(false));
         }
 
         private void OnGetExamineVerbs(EntityUid uid, GasAnalyzableComponent component, GetVerbsEvent<ExamineVerb> args)

Content.Server/Storage/EntitySystems/StorageSystem.cs

@@ -645,12 +645,12 @@ namespace Content.Server.Storage.EntitySystems
                     DebugTools.Assert(storedStorageComp != storageComp, $"Storage component contains itself!? Entity: {uid}");
                 }
 
-                if (!TryComp(entity, out ServerUserInterfaceComponent? ui))
-                    continue;
-
-                foreach (var bui in ui.Interfaces.Values)
+                if (TryComp(entity, out ServerUserInterfaceComponent? uiComponent))
                 {
-                    _uiSystem.TryClose(uid, bui.UiKey, session, ui);
+                    foreach (var ui in uiComponent.Interfaces)
+                    {
+                        ui.Close(session);
+                    }
                 }
             }
         }

Content.Server/UserInterface/ActivatableUISystem.cs

@@ -17,7 +17,6 @@ namespace Content.Server.UserInterface
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly ActionBlockerSystem _blockerSystem = default!;
-        [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
         public override void Initialize()
         {
@@ -57,7 +56,11 @@ namespace Content.Server.UserInterface
             if (!TryComp(args.Performer, out ActorComponent? actor))
                 return;
 
-            args.Handled = _uiSystem.TryToggleUi(uid, args.Key, actor.PlayerSession);
+            if (!component.TryGetBoundUserInterface(args.Key, out var bui))
+                return;
+
+            bui.Toggle(actor.PlayerSession);
+            args.Handled = true;
         }
 
         private void AddOpenUiVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEvent<ActivationVerb> args)

Content.Server/UserInterface/UserInterfaceHelpers.cs

@@ -4,10 +4,9 @@ namespace Content.Server.UserInterface
 {
     public static class UserInterfaceHelpers
     {
-        [Obsolete("Use UserInterfaceSystem")]
-        public static BoundUserInterface? GetUIOrNull(this EntityUid entity, Enum uiKey)
+        public static BoundUserInterface? GetUIOrNull(this EntityUid entity, object uiKey)
         {
-            return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<UserInterfaceSystem>().GetUiOrNull(entity, uiKey);
+            return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ServerUserInterfaceComponent>(entity)?.GetBoundUserInterfaceOrNull(uiKey);
         }
     }
 }