Revert "277.2.1 leak"

.github/workflows/publish-client.yml

@@ -33,10 +33,10 @@ jobs:
           mkdir "release/${{ steps.parse_version.outputs.version }}"
           mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
 
-      - name: Upload files to Dropwig
+      - name: Upload files to Suns
         uses: appleboy/scp-action@master
         with:
-          host: dropwig.playss14.com
+          host: suns.spacestation14.com
           username: robust-build-push
           key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
           source: "release/${{ steps.parse_version.outputs.version }}"
@@ -46,7 +46,7 @@ jobs:
       - name: Update manifest JSON
         uses: appleboy/ssh-action@master
         with:
-          host: dropwig.playss14.com
+          host: suns.spacestation14.com
           username: robust-build-push
           key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
           script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}

.gitignore

@@ -78,6 +78,3 @@ MSBuild/Robust.Custom.targets
 release/
 Robust.Docfx/*-site
 Robust.Docfx/api
-
-# C# Dev Kit cache file
-*.lscache

Directory.Packages.props

@@ -48,7 +48,7 @@
     <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
     <PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
     <PackageVersion Include="Pidgin" Version="3.5.1" />
-    <PackageVersion Include="Robust.Natives" Version="0.2.5" />
+    <PackageVersion Include="Robust.Natives" Version="0.2.3" />
     <PackageVersion Include="Robust.Natives.Zstd" Version="0.1.1-zstd1.5.7" />
     <PackageVersion Include="Robust.Natives.Cef.win-x64" Version="$(CefNativeVersion)" />
     <PackageVersion Include="Robust.Natives.Cef.linux-x64" Version="$(CefNativeVersion)" />

MSBuild/Robust.Engine.Version.props

@@ -1,8 +1,4 @@
-<Project>
-
-    <!-- This file automatically reset by Tools/version.py -->
-
-    <PropertyGroup><Version>277.2.1-leak</Version></PropertyGroup>
-
-</Project>
-
+<Project>
+    <!-- This file automatically reset by Tools/version.py -->
+    <PropertyGroup><Version>277.0.0</Version></PropertyGroup>
+</Project>

RELEASE-NOTES.md

@@ -53,63 +53,6 @@ END TEMPLATE-->
 
 *None yet*
 
-## 277.2.1-leak
-
-## 277.2.1
-
-### Bugfixes
-
-* Fixed a bug in Lidgren.Network HandleReleasedFragment that could cause out of memory errors.
-
-
-## 277.2.0
-
-### New features
-
-* Local and guest trust scores are now assigned via the `auth.localtrust` and `auth.guesttrust` CVars.
-
-### Bugfixes
-
-* Fixed exceptions related to WebSocket transfer system.
-
-
-## 277.1.0
-
-### New features
-
-* Console commands can now be "hidden" by prefixing them with `_`.
-* Add `ESCAPE()` and `ESCAPE-PARAM()` localization functions, for escaping text for markup formatting.
-* The `[cmdlink /]` tag can now have a tooltip specified with the optional "title" attribute.
-* Added `CommandParsing.EscapeCommand()` for *formatting* command strings easily.
-* Added `IUserInterfaceManager.GetRootForMouse()`.
-* Added `Popup.OpenAtCursor()`.
-* Added `FormattedStringBuilder` for safely constructing markup with code.
-* Added `VBox` and `HBox` convenience types for more concisely construct `BoxContainer`s.
-* Added `IsLocal` to `NetUserData`.
-* Add `SharedMapSystem.GetFilledTileCount()`
-* Add a `track` style property for scroll bars.
-* Added `ScrollLock` key.
-
-### Bugfixes
-
-* Fixes override properties in `WrapContainer` not being respected properly.
-* Fix `BoxContainer.SeparationOverride` not being respected properly and not invalidating layout.
-* Fixed swapped arguments being passed through in various `FindGridsIntersecting` overloads.
-* Fixed a doc comment in `LocalizationManager`.
-
-### Other
-
-* Add Pure attributes to the EntityLookup bounds methods
-* Bump `Robust.Natives` to `0.2.5`.
-* Minor performance improvement in `IsHardCollidable()`.
-* Remove an outdated paragraph from `[DependencyAttribute]` documentation related to `readonly` fields.
-* More stock controls use alternative cursor shapes where appropriate.
-* Minor performance improvement to audio loading.
-
-### Internal
-
-* Added `.lscache` to `.gitignore`.
-
 
 ## 277.0.0
 

Resources/Locale/en-US/input.ftl

@@ -69,7 +69,6 @@ input-key-MouseButton7 = Mouse 7
 input-key-MouseButton8 = Mouse 8
 input-key-MouseButton9 = Mouse 9
 input-key-CapsLock = Caps Lock
-input-key-ScrollLock = Scroll Lock
 
 input-key-LSystem-win = Left Win
 input-key-RSystem-win = Right Win

Resources/Locale/pt-BR/input.ftl

@@ -44,7 +44,6 @@ input-key-MouseButton7 = Mouse 7
 input-key-MouseButton8 = Mouse 8
 input-key-MouseButton9 = Mouse 9
 input-key-CapsLock = Caps Lock
-input-key-ScrollLock = Scroll Lock
 
 input-key-LSystem-win = Left Win
 input-key-RSystem-win = Right Win

Robust.Client/Console/ClientConsoleHost.Completions.cs

@@ -34,7 +34,7 @@ private Task<CompletionResult> CalcCompletions(List<string> args, string argStr,
             // Typing out command name, handle this ourselves.
             var cmdOptions = CompletionResult.FromOptions(
                 AvailableCommands.Values
-                    .Where(c => CanExecute(c.Command) && !IsCommandHidden(c))
+                    .Where(c => CanExecute(c.Command))
                     .OrderBy(c => c.Command)
                     .Select(c => new CompletionOption(c.Command, c.Description)));
 

Robust.Client/Graphics/Clyde/Windowing/Sdl3.Key.cs

@@ -204,7 +204,6 @@ static Sdl3WindowingImpl()
             MapKey(SC.SDL_SCANCODE_F24, Key.F24);
             MapKey(SC.SDL_SCANCODE_PAUSE, Key.Pause);
             MapKey(SC.SDL_SCANCODE_CAPSLOCK, Key.CapsLock);
-            MapKey(SC.SDL_SCANCODE_SCROLLLOCK, Key.ScrollLock);
 
             var keyMapReverse = new Dictionary<Key, SC>();
 

Robust.Client/Input/InputDevices.cs

@@ -174,7 +174,6 @@ public enum Key : byte
             Pause,
             World1,
             CapsLock,
-            ScrollLock
         }
 
         public static bool IsMouseKey(this Key key)

Robust.Client/Network/Transfer/ClientTransferManager.cs

@@ -46,13 +46,6 @@ public void Initialize()
         _netManager.RegisterNetMessage<MsgTransferInit>(RxTransferInit, NetMessageAccept.Client | NetMessageAccept.Handshake);
         _netManager.RegisterNetMessage<MsgTransferAckInit>();
         _netManager.RegisterNetMessage<MsgTransferData>(RxTransferData, NetMessageAccept.Client | NetMessageAccept.Handshake);
-        _netManager.Disconnect += OnNetDisconnect;
-    }
-
-    private void OnNetDisconnect(object? sender, NetDisconnectedArgs e)
-    {
-        _transferImpl?.Dispose();
-        _transferImpl = null;
     }
 
     private async void RxTransferInit(MsgTransferInit message)

Robust.Client/ResourceManagement/ResourceTypes/AudioResource.cs

@@ -40,12 +40,12 @@ public override void Load(IDependencyCollection dependencies, ResPath path)
         seekableStream.Seek(0, SeekOrigin.Begin);
 
         var audioManager = dependencies.Resolve<IAudioInternal>();
-        if (signature.AsSpan()[..OggSignature.Length].SequenceEqual(OggSignature))
+        if (signature[..OggSignature.Length].SequenceEqual(OggSignature))
         {
             AudioStream = audioManager.LoadAudioOggVorbis(seekableStream, path.ToString());
         }
-        else if (signature.AsSpan()[..RiffSignature.Length].SequenceEqual(RiffSignature)
-                 && signature.AsSpan()[WavSignatureStart..MaxSignatureLength].SequenceEqual(WavSignature))
+        else if (signature[..RiffSignature.Length].SequenceEqual(RiffSignature)
+                 && signature[WavSignatureStart..MaxSignatureLength].SequenceEqual(WavSignature))
         {
             AudioStream = audioManager.LoadAudioWav(seekableStream, path.ToString());
         }

Robust.Client/UserInterface/Controls/BaseButton.cs

@@ -90,7 +90,6 @@ public bool Disabled
 
                 if (old != value)
                 {
-                    DefaultCursorShape = Disabled ? CursorShape.NotAllowed : CursorShape.Pointer;
                     DrawModeChanged();
                 }
             }
@@ -235,7 +234,6 @@ public bool MuteSounds
         protected BaseButton()
         {
             MouseFilter = MouseFilterMode.Stop;
-            DefaultCursorShape = Disabled ? CursorShape.NotAllowed : CursorShape.Pointer;
         }
 
         protected virtual void DrawModeChanged()

Robust.Client/UserInterface/Controls/ItemList.cs

@@ -595,42 +595,16 @@ protected internal override void MouseMove(GUIMouseMoveEventArgs args)
         {
             base.MouseMove(args);
 
-            DefaultCursorShape = CursorShape.Arrow;
-
             for (var idx = 0; idx < _itemList.Count; idx++)
             {
                 var item = _itemList[idx];
                 if (item.Region == null) continue;
                 if (!item.Region.Value.Contains(args.RelativePosition)) continue;
-
-                if (SelectMode != ItemListSelectMode.None)
-                {
-                    if (item.Disabled)
-                    {
-                        DefaultCursorShape = CursorShape.NotAllowed;
-                    }
-                    else if (item.Selectable)
-                    {
-                        DefaultCursorShape = CursorShape.Pointer;
-                    }
-                    else
-                    {
-                        DefaultCursorShape = CursorShape.Arrow;
-                    }
-                }
-
                 OnItemHover?.Invoke(new ItemListHoverEventArgs(idx, this));
                 break;
             }
         }
 
-        protected internal override void MouseExited()
-        {
-            base.MouseExited();
-
-            DefaultCursorShape = CursorShape.Arrow;
-        }
-
         protected internal override void MouseWheel(GUIMouseWheelEventArgs args)
         {
             base.MouseWheel(args);

Robust.Client/UserInterface/Controls/MenuBar.cs

@@ -235,7 +235,6 @@ public abstract class MenuTopButton : PanelContainer
             public MenuTopButton(Menu menu)
             {
                 MouseFilter = MouseFilterMode.Pass;
-                DefaultCursorShape = CursorShape.Pointer;
                 ChildMenu = menu;
             }
 

Robust.Client/UserInterface/Controls/Popup.cs

@@ -30,29 +30,6 @@ public Popup()
 
         public bool CloseOnEscape { get; set; } = true;
 
-        private bool _autoOrphan;
-
-        /// <summary>
-        /// Opens the popup at the location of the mouse.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// The popup is placed in the modal root, and is automatically sized.
-        /// </para>
-        /// <para>
-        /// The popup *automatically* gets removed from the popup root when it is hidden again.
-        /// Do not remove it manually!
-        /// </para>
-        /// </remarks>
-        public void OpenAtMouse()
-        {
-            _autoOrphan = true;
-            var root = UserInterfaceManager.GetRootForMouse();
-            root.ModalRoot.AddChild(this);
-
-            Open(UIBox2.FromDimensions(UserInterfaceManager.MousePositionScaled.Position, Vector2.One));
-        }
-
         public virtual void Open(UIBox2? box = null, Vector2? altPos = null, Vector2? altPosUp = null)
         {
             if (Visible)
@@ -95,12 +72,6 @@ protected internal override void ModalRemoved()
 
             Visible = false;
             OnPopupHide?.Invoke();
-
-            if (_autoOrphan)
-            {
-                Orphan();
-                _autoOrphan = false;
-            }
         }
 
         protected override Vector2 MeasureOverride(Vector2 availableSize)

Robust.Client/UserInterface/Controls/ScrollBar.cs

@@ -9,7 +9,6 @@ namespace Robust.Client.UserInterface.Controls
 {
     public abstract class ScrollBar : Range
     {
-        public const string StylePropertyTrack = "track";
         public const string StylePropertyGrabber = "grabber";
         public const string StylePseudoClassHover = "hover";
         public const string StylePseudoClassGrabbed = "grabbed";
@@ -46,7 +45,6 @@ protected ScrollBar(OrientationMode orientation)
             ReservesSpace = true;
 
             _orientation = orientation;
-            DefaultCursorShape = CursorShape.Pointer;
         }
 
         public bool IsAtEnd
@@ -82,9 +80,6 @@ protected override void FrameUpdate(FrameEventArgs args)
 
         protected internal override void Draw(DrawingHandleScreen handle)
         {
-            var trackStyle = _getTrackStyleBox();
-            trackStyle?.Draw(handle, PixelSizeBox, UIScale);
-
             var styleBox = _getGrabberStyleBox();
             styleBox?.Draw(handle, _getGrabberBox(), UIScale);
         }
@@ -132,19 +127,11 @@ protected internal override void KeyBindUp(GUIBoundKeyEventArgs args)
 
         protected internal override void MouseMove(GUIMouseMoveEventArgs args)
         {
-            DefaultCursorShape = CursorShape.Arrow;
-
-            if (_isHovered || _grabData != null)
-            {
-                DefaultCursorShape = CursorShape.Pointer;
-            }
-
             if (_grabData == null)
             {
                 var box = _getGrabberBox();
                 _isHovered = box.Contains(args.RelativePixelPosition);
                 _updatePseudoClass();
-
                 return;
             }
 
@@ -206,12 +193,6 @@ private float _getGrabberBoxMinSize()
             return null;
         }
 
-        [System.Diagnostics.Contracts.Pure]
-        private StyleBox? _getTrackStyleBox()
-        {
-            return StylePropertyDefault<StyleBox?>(StylePropertyTrack, null);
-        }
-
         [System.Diagnostics.Contracts.Pure]
         private float _getOrientationSize()
         {

Robust.Client/UserInterface/Controls/Slider.cs

@@ -81,7 +81,6 @@ public StyleBox? GrabberStyleBoxOverride
         public Slider()
         {
             MouseFilter = MouseFilterMode.Stop;
-            DefaultCursorShape = CursorShape.Pointer;
 
             AddChild(new LayoutContainer
             {

Robust.Client/UserInterface/Controls/SplitContainer.cs

@@ -176,7 +176,6 @@ public SplitOrientation Orientation
             set
             {
                 _orientation = value;
-                _splitDragArea.DefaultCursorShape = Vertical ? CursorShape.VResize : CursorShape.HResize;
                 InvalidateMeasure();
             }
         }
@@ -186,7 +185,7 @@ public SplitContainer()
             MouseFilter = MouseFilterMode.Stop;
             AddChild(_splitDragArea);
             _splitDragArea.Visible = _resizeMode != SplitResizeMode.NotResizable;
-            _splitDragArea.DefaultCursorShape = Vertical ? CursorShape.VResize : CursorShape.HResize;
+            _splitDragArea.DefaultCursorShape =  Vertical ? CursorShape.VResize : CursorShape.HResize;
             _splitDragArea.OnMouseUp += StopDragging;
             _splitDragArea.OnMouseDown += StartDragging;
             _splitDragArea.OnMouseMove += OnMove;