Version: 210.1.1

This brings default ButtonGroup behavior back to before #4841.

The original comments in the code *did* clearly intend for the other behavior to be the default, but the code was blatantly bugged (whoops) so this didn't happen. Content relied on this A LOT and it's quite sane behavior regardless so just change the default back call it a day.

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

RELEASE-NOTES.md

@@ -54,6 +54,35 @@ END TEMPLATE-->
 *None yet*
 
 
+## 210.1.1
+
+### Bugfixes
+
+* Fixed multiple recent bugs with key binding storage.
+
+### Other
+
+* Change default of `ButtonGroup.IsNoneSetAllowed` to `true`. This makes it default again to the previous (unintentional) behavior.
+
+
+## 210.1.0
+
+### New features
+
+* `NetUserId` implements `ISelfSerialize` so can be used in data fields.
+* `ButtonGroup.IsNoneSetAllowed` to allow a button group to have no buttons pressed by default.
+
+
+## 210.0.3
+
+
+## 210.0.2
+
+### Bugfixes
+
+* Revert changes to `TextureRect` too.
+
+
 ## 210.0.1
 
 ### Bugfixes

Robust.Client/Audio/Midi/MidiManager.cs

@@ -114,7 +114,7 @@ internal sealed partial class MidiManager : IMidiManager
         "/usr/share/sounds/sf2/TimGM6mb.sf2",
     };
 
-    private const string WindowsSoundfont = @"C:\WINDOWS\system32\drivers\gm.dls";
+    private static readonly string WindowsSoundfont = $@"{Environment.GetEnvironmentVariable("SystemRoot")}\system32\drivers\gm.dls";
 
     private const string OsxSoundfont =
         "/System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls";

Robust.Client/Input/IInputManager.cs

@@ -40,7 +40,7 @@ namespace Robust.Client.Input
         void KeyDown(KeyEventArgs e);
         void KeyUp(KeyEventArgs e);
 
-        IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified=true);
+        IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified=true, bool invalid=false);
 
         void RemoveBinding(IKeyBinding binding, bool markModified=true);
 

Robust.Client/Input/InputManager.cs

@@ -523,13 +523,16 @@ namespace Robust.Client.Input
             {
                 var baseKeyRegs = _serialization.Read<KeyBindingRegistration[]>(BaseKeyRegsNode, notNullableOverride: true);
 
+
                 foreach (var reg in baseKeyRegs)
                 {
+                    var invalid = false;
+
                     if (reg.Type != KeyBindingType.Command && !NetworkBindMap.FunctionExists(reg.Function.FunctionName))
                     {
-                        Logger.ErrorS("input", "Key function in {0} does not exist: '{1}'", file,
+                        Logger.DebugS("input", "Key function in {0} does not exist: '{1}'.", file,
                             reg.Function);
-                        continue;
+                        invalid = true;
                     }
 
                     if (defaultRegistration)
@@ -544,7 +547,7 @@ namespace Robust.Client.Input
                         }
                     }
 
-                    RegisterBinding(reg, markModified: defaultRegistration);
+                    RegisterBinding(reg, markModified: !defaultRegistration, invalid);
                 }
             }
 
@@ -552,11 +555,16 @@ namespace Robust.Client.Input
             {
                 var leaveEmpty = _serialization.Read<BoundKeyFunction[]>(node, notNullableOverride: true);
 
-                if (leaveEmpty.Length > 0)
+                foreach (var bind in leaveEmpty)
                 {
                     // Adding to _modifiedKeyFunctions means that these keybinds won't be loaded from the base file.
                     // Because they've been explicitly cleared.
-                    _modifiedKeyFunctions.UnionWith(leaveEmpty);
+                    _modifiedKeyFunctions.Add(bind);
+
+                    // Adding to bindingsByFunction because if the keybind is not valid(For example if it's from another
+                    // server then we will have problems saving the file)
+                    _bindingsByFunction.GetOrNew(bind);
+
                 }
             }
         }
@@ -584,7 +592,7 @@ namespace Robust.Client.Input
             return binding;
         }
 
-        public IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified = true)
+        public IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified = true, bool invalid = false)
         {
             var binding = new KeyBinding(this, reg.Function.FunctionName, reg.Type, reg.BaseKey, reg.CanFocus, reg.CanRepeat,
                 reg.AllowSubCombs, reg.Priority, reg.Mod1, reg.Mod2, reg.Mod3);
@@ -615,7 +623,7 @@ namespace Robust.Client.Input
 
         public void InputModeChanged() => OnInputModeChanged?.Invoke();
 
-        private void RegisterBinding(KeyBinding binding, bool markModified = true)
+        private void RegisterBinding(KeyBinding binding, bool markModified = true, bool invalid = false)
         {
             // we sort larger combos first so they take priority over smaller (single key) combos,
             // so they get processed first in KeyDown and such.
@@ -630,7 +638,8 @@ namespace Robust.Client.Input
                 _modifiedKeyFunctions.Add(binding.Function);
             }
 
-            _bindings.Insert(pos, binding);
+            if (!invalid)
+                _bindings.Insert(pos, binding);
             _bindingsByFunction.GetOrNew(binding.Function).Add(binding);
             OnKeyBindingAdded?.Invoke(binding);
         }

Robust.Client/UserInterface/Controls/BaseButton.cs

@@ -53,8 +53,17 @@ namespace Robust.Client.UserInterface.Controls
                 value.InternalButtons.Add(this);
                 ToggleMode = true;
 
-                // Set us to pressed if we're the first button. Doesn't go through the setter to avoid setting off our own error check.
-                _pressed = value.InternalButtons.Count == 1;
+                if (value.IsNoneSetAllowed)
+                {
+                    // Still UNPRESS if there's another pressed button, but don't PRESS it otherwise.
+                    if (value.Pressed != this)
+                        _pressed = false;
+                }
+                else
+                {
+                    // Set us to pressed if we're the first button. Doesn't go through the setter to avoid setting off our own error check.
+                    _pressed = value.InternalButtons.Count == 1;
+                }
                 DrawModeChanged();
             }
         }
@@ -99,7 +108,7 @@ namespace Robust.Client.UserInterface.Controls
                     return;
                 }
 
-                if (!value && Group != null)
+                if (!value && Group is { IsNoneSetAllowed: false })
                 {
                     throw new InvalidOperationException("Cannot directly unset a grouped button. Set another button in the group instead.");
                 }
@@ -444,6 +453,26 @@ namespace Robust.Client.UserInterface.Controls
     /// </remarks>
     public sealed class ButtonGroup
     {
+        /// <summary>
+        /// Whether it is legal for this button group to have no selected button.
+        /// </summary>
+        /// <remarks>
+        /// If true, it's legal for no button in the group to be active.
+        /// This is then the initial state of a new group of buttons (no button is automatically selected),
+        /// and it becomes legal to manually clear the active button through code.
+        /// The user cannot manually unselect the active button regardless, only by selecting a difference button.
+        /// </remarks>
+        public bool IsNoneSetAllowed { get; }
+
+        /// <summary>
+        /// Create a new <see cref="ButtonGroup"/>
+        /// </summary>
+        /// <param name="isNoneSetAllowed">The value of <see cref="IsNoneSetAllowed"/> on the new button group.</param>
+        public ButtonGroup(bool isNoneSetAllowed = true)
+        {
+            IsNoneSetAllowed = isNoneSetAllowed;
+        }
+
         internal readonly List<BaseButton> InternalButtons = new();
         public IReadOnlyList<BaseButton> Buttons => InternalButtons;
 

Robust.Shared/Network/NetUserId.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Serialization;
 namespace Robust.Shared.Network
 {
     [Serializable, NetSerializable]
-    public struct NetUserId : IEquatable<NetUserId>
+    public struct NetUserId : IEquatable<NetUserId>, ISelfSerialize
     {
         public readonly Guid UserId;
 
@@ -32,5 +32,15 @@ namespace Robust.Shared.Network
 
         public static implicit operator Guid(NetUserId id) => id.UserId;
         public static explicit operator NetUserId(Guid id) => new(id);
+
+        void ISelfSerialize.Deserialize(string value)
+        {
+            this = (NetUserId) Guid.Parse(value);
+        }
+
+        string ISelfSerialize.Serialize()
+        {
+            return ToString();
+        }
     }
 }