Revert "Proton (#420)"

This reverts commit 939249a

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml

@@ -16,7 +16,6 @@
                     <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" StyleClasses="OpenBoth" />
                     <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
                     <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" StyleClasses="OpenBoth" />
-                    <Button Visible="False" Name="Screenshot" Text="{Loc 'admin-player-actions-screenshot'}" StyleClasses="OpenBoth"/> <!-- Sunrise edit -->
                     <Button Visible="False" Name="Follow" Text="{Loc 'admin-player-actions-follow'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
             </BoxContainer>

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs

@@ -167,19 +167,6 @@ public BwoinkControl()
                     _console.ExecuteCommand($"kick \"{_currentPlayer.Username}\"");
             };
 
-            // Sunrise-start
-            Screenshot.OnPressed += _ =>
-            {
-                if (!AdminUIHelpers.TryConfirm(Screenshot, _confirmations))
-                {
-                    return;
-                }
-
-                if (_currentPlayer is not null)
-                    _console.ExecuteCommand($"screenshot \"{_currentPlayer.Username}\"");
-            };
-            // Sunrise-end
-
             Follow.OnPressed += _ =>
             {
                 if (_currentPlayer is not null)
@@ -246,11 +233,6 @@ public void UpdateButtons()
             Respawn.Visible = _adminManager.CanCommand("respawn");
             Respawn.Disabled = !Respawn.Visible || disabled;
 
-            // Sunrise-start
-            Screenshot.Visible = _adminManager.CanCommand("kick");
-            Screenshot.Disabled = !Screenshot.Visible || disabled;
-            // Sunrise-end
-
             Follow.Visible = _adminManager.CanCommand("follow");
             Follow.Disabled = !Follow.Visible || disabled;
         }

Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml

@@ -1,6 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:cc="clr-namespace:Content.Client.Administration.UI.Bwoink"
-            SetSize="1000 600"
+            SetSize="900 500"
             HeaderClass="windowHeaderAlert"
             TitleClass="windowTitleAlert"
             Title="{Loc 'bwoink-user-title'}" >

Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml

@@ -13,7 +13,6 @@
             <Button Name="SubmitKickButton" Text="{Loc admin-player-actions-kick}" Disabled="True"/>
             <Button Name="SubmitAHelpButton" Text="{Loc admin-player-actions-ahelp}" Disabled="True"/>
             <Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" Disabled="True"/>
-            <Button Name="ScreenshotButton" Text="{Loc admin-player-actions-get-screenshot}" Disabled="True"/> <!-- Sunrise edit -->
         </BoxContainer>
     </BoxContainer>
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs

@@ -23,7 +23,6 @@ public PlayerActionsWindow()
             SubmitKickButton.OnPressed += SubmitKickButtonOnPressed;
             SubmitAHelpButton.OnPressed += SubmitAhelpButtonOnPressed;
             SubmitRespawnButton.OnPressed += SubmitRespawnButtonOnPressed;
-            ScreenshotButton.OnPressed += ScreenshotButtonOnPressed;  // Sunrise-edit
             PlayerList.OnSelectionChanged += OnListOnOnSelectionChanged;
         }
 
@@ -37,22 +36,8 @@ private void OnListOnOnSelectionChanged(PlayerInfo? obj)
             SubmitKickButton.Disabled = disableButtons;
             SubmitAHelpButton.Disabled = disableButtons;
             SubmitRespawnButton.Disabled = disableButtons;
-            ScreenshotButton.Disabled = disableButtons; // Sunrise-edit
         }
 
-        // Sunrise-start
-        private void ScreenshotButtonOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (_selectedPlayer == null)
-                return;
-
-            if (!AdminUIHelpers.TryConfirm(ScreenshotButton, _confirmations))
-                return;
-
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"screenshot \"{_selectedPlayer.Username}\"");
-        }
-        // Sunrise-end
-
         private void SubmitKickButtonOnPressed(BaseButton.ButtonEventArgs obj)
         {
             if (_selectedPlayer == null)

Content.Client/Entry/EntryPoint.cs

@@ -1,4 +1,3 @@
-using Content.Client._Sunrise.Proton;  // Sunrise-Proton
 using Content.Client._Sunrise.ServersHub;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
@@ -73,7 +72,6 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!;
         [Dependency] private readonly ServersHubManager _serversHubManager = default!; // Sunrise-Hub
-        [Dependency] private readonly ProtonManager _proton = default!; // Sunrise-Proton
 
         public override void Init()
         {
@@ -139,7 +137,6 @@ public override void Init()
             _playbackMan.Initialize();
 
             _serversHubManager.Initialize(); // Sunrise-Hub
-            _proton.Initialize(); // Sunrise-Proton
 
             //AUTOSCALING default Setup!
             _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffX", 1080);

Content.Client/IoC/ClientContentIoC.cs

@@ -1,5 +1,4 @@
-using Content.Client._Sunrise.Proton;  // Sunrise-Proton
-using Content.Client._Sunrise.ServersHub;
+using Content.Client._Sunrise.ServersHub;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -63,7 +62,6 @@ public static void Register()
             // Sunrise
 
             collection.Register<ServersHubManager>(); // Sunrise-Hub
-            collection.Register<ProtonManager>(); // Sunrise-Proton
         }
     }
 }

Content.Server/Entry/EntryPoint.cs

@@ -1,5 +1,4 @@
 using Content.Server._Sunrise.GuideGenerator;
-using Content.Server._Sunrise.Proton;  // Sunrise-Proton
 using Content.Server._Sunrise.ServersHub;
 using Content.Server._Sunrise.TTS;
 using Content.Server.Acz;
@@ -49,7 +48,6 @@ public sealed class EntryPoint : GameServer
         private IVoteManager _voteManager = default!;
         private ServerUpdateManager _updateManager = default!;
         private ServersHubManager _serversHubManager = default!; // Sunrise-Edit
-        private ProtonManager _proton = default!;  // Proton
         private PlayTimeTrackingManager? _playTimeTracking;
         private IEntitySystemManager? _sysMan;
         private IServerDbManager? _dbManager;
@@ -97,7 +95,6 @@ public override void Init()
                 _voteManager = IoCManager.Resolve<IVoteManager>();
                 _updateManager = IoCManager.Resolve<ServerUpdateManager>();
                 _serversHubManager = IoCManager.Resolve<ServersHubManager>(); // Sunrise-Edit
-                _proton = IoCManager.Resolve<ProtonManager>(); // Proton
                 _playTimeTracking = IoCManager.Resolve<PlayTimeTrackingManager>();
                 _sysMan = IoCManager.Resolve<IEntitySystemManager>();
                 _dbManager = IoCManager.Resolve<IServerDbManager>();
@@ -117,7 +114,6 @@ public override void Init()
                 IoCManager.Resolve<ServerApi>().Initialize();
 
                 IoCManager.Resolve<ServersHubManager>().Initialize(); // Sunrise-Hub
-                IoCManager.Resolve<ProtonManager>().Initialize(); // Proton
 
                 _voteManager.Initialize();
                 _updateManager.Initialize();

Content.Server/IoC/ServerContentIoC.cs

@@ -1,4 +1,3 @@
-using Content.Server._Sunrise.Proton;  // Sunrise-Proton
 using Content.Server._Sunrise.ServersHub;
 using Content.Server._Sunrise.TTS;
 using Content.Server.Administration;
@@ -79,7 +78,6 @@ public static void Register()
             IoCManager.Register<MappingManager>();
 
             IoCManager.Register<ServersHubManager>(); // Sunrise-Hub
-            IoCManager.Register<ProtonManager>(); // Sunrise-Proton
         }
     }
 }