From a5be8e723e3e5a9a04f461416bbfadf76551f0df Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:59:50 +0200 Subject: [PATCH] Remove some unused obsolete stuff (#2049) --- Robust.Client/Console/Commands/Debug.cs | 3 +- .../DebugGridTileLookupSystem.cs | 1 - Robust.Client/GameStates/NetInterpOverlay.cs | 8 +- .../Graphics/Drawing/StyleBoxTexture.cs | 6 - Robust.Client/Graphics/Font.cs | 9 +- Robust.Client/UserInterface/Control.Layout.cs | 28 ---- .../UserInterface/Controls/GridContainer.cs | 13 +- .../UserInterface/Controls/HSplitContainer.cs | 13 -- .../UserInterface/Controls/LayoutContainer.cs | 6 - .../UserInterface/Controls/VSplitContainer.cs | 13 -- .../CustomControls/SS14Window.xaml.cs | 19 --- Robust.Shared.Maths/Angle.cs | 3 - Robust.Shared/GameObjects/ComponentFactory.cs | 16 +-- .../Components/ITransformComponent.cs | 5 - .../Transform/TransformComponent.cs | 4 - .../GameObjects/EntitySystem.Subscriptions.cs | 30 ---- .../GameObjects/IComponentFactory.cs | 28 +--- .../Localization/ILocalizationManager.cs | 16 --- Robust.Shared/Localization/Loc.cs | 22 --- .../Localization/LocalizationManager.cs | 13 +- Robust.Shared/Map/EntityCoordinates.cs | 16 --- Robust.Shared/Map/MapIndices.cs | 133 ------------------ Robust.Shared/Utility/UsernameHelpers.cs | 26 ---- 23 files changed, 12 insertions(+), 419 deletions(-) delete mode 100644 Robust.Client/UserInterface/Controls/HSplitContainer.cs delete mode 100644 Robust.Client/UserInterface/Controls/VSplitContainer.cs delete mode 100644 Robust.Shared/Map/MapIndices.cs delete mode 100644 Robust.Shared/Utility/UsernameHelpers.cs diff --git a/Robust.Client/Console/Commands/Debug.cs b/Robust.Client/Console/Commands/Debug.cs index 0312441f0..91e49a7fd 100644 --- a/Robust.Client/Console/Commands/Debug.cs +++ b/Robust.Client/Console/Commands/Debug.cs @@ -632,8 +632,9 @@ namespace Robust.Client.Console.Commands } }); - tabContainer.AddChild(new HSplitContainer + tabContainer.AddChild(new SplitContainer { + Orientation = SplitContainer.SplitOrientation.Horizontal, Children = { new PanelContainer diff --git a/Robust.Client/GameObjects/EntitySystems/DebugGridTileLookupSystem.cs b/Robust.Client/GameObjects/EntitySystems/DebugGridTileLookupSystem.cs index f6c18d0ef..073e82fa7 100644 --- a/Robust.Client/GameObjects/EntitySystems/DebugGridTileLookupSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/DebugGridTileLookupSystem.cs @@ -60,7 +60,6 @@ namespace Robust.Client.GameObjects public override void Shutdown() { base.Shutdown(); - UnsubscribeNetworkEvent(); IoCManager.Resolve().StateRoot.RemoveChild(_label); } diff --git a/Robust.Client/GameStates/NetInterpOverlay.cs b/Robust.Client/GameStates/NetInterpOverlay.cs index 95f987f4c..31f54541a 100644 --- a/Robust.Client/GameStates/NetInterpOverlay.cs +++ b/Robust.Client/GameStates/NetInterpOverlay.cs @@ -1,12 +1,12 @@ using Robust.Shared.Enums; -using Robust.Client.Graphics; +using Robust.Client.Graphics; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Prototypes; -using System; +using Robust.Shared.Containers; using Robust.Shared.Timing; namespace Robust.Client.GameStates @@ -35,10 +35,10 @@ namespace Robust.Client.GameStates foreach (var boundingBox in _componentManager.EntityQuery(true)) { // all entities have a TransformComponent - var transform = ((IComponent)boundingBox).Owner.Transform; + var transform = boundingBox.Owner.Transform; // if not on the same map, continue - if (transform.MapID != _eyeManager.CurrentMap || !transform.IsMapTransform) + if (transform.MapID != _eyeManager.CurrentMap || boundingBox.Owner.IsInContainer()) continue; // This entity isn't lerping, no need to draw debug info for it diff --git a/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs b/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs index 29b509e1e..ff84632ed 100644 --- a/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs +++ b/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs @@ -111,12 +111,6 @@ namespace Robust.Client.Graphics public Texture? Texture { get; set; } - [Obsolete("Use SetPatchMargin")] - public void SetMargin(Margin margin, float value) - { - SetPatchMargin(margin, value); - } - public void SetPatchMargin(Margin margin, float value) { if ((margin & Margin.Top) != 0) diff --git a/Robust.Client/Graphics/Font.cs b/Robust.Client/Graphics/Font.cs index 232a00636..37704376c 100644 --- a/Robust.Client/Graphics/Font.cs +++ b/Robust.Client/Graphics/Font.cs @@ -1,5 +1,4 @@ -using System; -using System.Text; +using System.Text; using Robust.Client.ResourceManagement; using Robust.Shared.IoC; using Robust.Shared.Maths; @@ -55,12 +54,6 @@ namespace Robust.Client.Graphics DrawingHandleScreen handle, Rune rune, Vector2 baseline, float scale, Color color, bool fallback=true); - [Obsolete("Use Rune variant instead")] - public float DrawChar(DrawingHandleScreen handle, char chr, Vector2 baseline, float scale, Color color) - { - return DrawChar(handle, (Rune) chr, baseline, scale, color); - } - /// /// Gets metrics describing the dimensions and positioning of a single glyph in the font. /// diff --git a/Robust.Client/UserInterface/Control.Layout.cs b/Robust.Client/UserInterface/Control.Layout.cs index cbbef18c8..8fc8372c0 100644 --- a/Robust.Client/UserInterface/Control.Layout.cs +++ b/Robust.Client/UserInterface/Control.Layout.cs @@ -391,34 +391,6 @@ namespace Robust.Client.UserInterface } } - /// - /// A proxy to . - /// - /// - /// This is in virtual pixels. - /// - /// - [Obsolete("Use DesiredSize and Measure()")] - public Vector2 CombinedMinimumSize => DesiredSize; - - /// - /// The , in physical pixels. - /// - [Obsolete("Use DesiredSize and Measure()")] - public Vector2i CombinedPixelMinimumSize => (Vector2i) (CombinedMinimumSize * UIScale); - - /// - /// A custom minimum size. If the control-calculated size is is smaller than this, this is used instead. - /// - /// - [ViewVariables] - [Obsolete("Use MinSize instead.")] - public Vector2 CustomMinimumSize - { - get => (_minWidth, _minHeight); - set => (MinWidth, MinHeight) = Vector2.ComponentMax(Vector2.Zero, value); - } - /// /// A settable minimum size for this control. /// This is factored into so that this control itself always has at least this size. diff --git a/Robust.Client/UserInterface/Controls/GridContainer.cs b/Robust.Client/UserInterface/Controls/GridContainer.cs index 9c0fc58bd..25b603b90 100644 --- a/Robust.Client/UserInterface/Controls/GridContainer.cs +++ b/Robust.Client/UserInterface/Controls/GridContainer.cs @@ -84,6 +84,7 @@ namespace Robust.Client.UserInterface.Controls get => GetCount(Dimension.Row); set => SetCount(Dimension.Row, value); } + /// /// The max width (in virtual pixels) the grid of elements can have. This dynamically determines /// the number of columns based on the size of the elements. Setting this puts this grid @@ -100,12 +101,6 @@ namespace Robust.Client.UserInterface.Controls /// /// Thrown if the value assigned is less than or equal to 0. /// - [Obsolete("Use MaxGridWidth")] - public new float MaxWidth - { - set => MaxGridWidth = value; - } - public float MaxGridWidth { set => SetMaxSize(Dimension.Column, value); @@ -127,12 +122,6 @@ namespace Robust.Client.UserInterface.Controls /// /// Thrown if the value assigned is less than or equal to 0. /// - [Obsolete("Use MaxGridHeight")] - public new float MaxHeight - { - set => MaxGridHeight = value; - } - public float MaxGridHeight { set => SetMaxSize(Dimension.Row, value); diff --git a/Robust.Client/UserInterface/Controls/HSplitContainer.cs b/Robust.Client/UserInterface/Controls/HSplitContainer.cs deleted file mode 100644 index bc02d1321..000000000 --- a/Robust.Client/UserInterface/Controls/HSplitContainer.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace Robust.Client.UserInterface.Controls -{ - [Obsolete("Use SplitContainer directly and set Orientation")] - public class HSplitContainer : SplitContainer - { - public HSplitContainer() - { - Orientation = SplitOrientation.Horizontal; - } - } -} diff --git a/Robust.Client/UserInterface/Controls/LayoutContainer.cs b/Robust.Client/UserInterface/Controls/LayoutContainer.cs index fe19d45c3..c248755f1 100644 --- a/Robust.Client/UserInterface/Controls/LayoutContainer.cs +++ b/Robust.Client/UserInterface/Controls/LayoutContainer.cs @@ -135,12 +135,6 @@ namespace Robust.Client.UserInterface.Controls SetMarginBottom(control, diffY + control.GetValue(MarginBottomProperty)); } - [Obsolete("Change SetSize on the control instead.")] - public new static void SetSize(Control control, Vector2 size) - { - control.SetSize = size; - } - /// /// Sets an anchor AND a margin preset. This is most likely the method you want. /// diff --git a/Robust.Client/UserInterface/Controls/VSplitContainer.cs b/Robust.Client/UserInterface/Controls/VSplitContainer.cs deleted file mode 100644 index 655c67cca..000000000 --- a/Robust.Client/UserInterface/Controls/VSplitContainer.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace Robust.Client.UserInterface.Controls -{ - [Obsolete("Use SplitContainer directly and set Orientation")] - public class VSplitContainer : SplitContainer - { - public VSplitContainer() - { - Orientation = SplitOrientation.Vertical; - } - } -} diff --git a/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs b/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs index eb424dab3..1689f614e 100644 --- a/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs +++ b/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs @@ -1,4 +1,3 @@ -using System; using System.Collections; using System.Collections.Generic; using Robust.Client.AutoGenerated; @@ -19,9 +18,6 @@ namespace Robust.Client.UserInterface.CustomControls public const string StyleClassWindowHeader = "windowHeader"; public const string StyleClassWindowCloseButton = "windowCloseButton"; - [Obsolete("Set SetSize instead.")] - protected virtual Vector2? CustomSize => null; - public SS14Window() { RobustXamlLoader.Load(this); @@ -36,7 +32,6 @@ namespace Robust.Client.UserInterface.CustomControls } public Control Contents { get; private set; } - //private TextureButton CloseButton; private const int DRAG_MARGIN_SIZE = 7; @@ -52,20 +47,6 @@ namespace Robust.Client.UserInterface.CustomControls base.MeasureOverride(Vector2.ComponentMax(availableSize, ContentsMinimumSize))); } - protected override void Opened() - { - base.Opened(); - -#pragma warning disable 618 - if (_firstTimeOpened && CustomSize != null) - { - SetSize = CustomSize.Value; - } -#pragma warning restore 618 - } - - //private Label TitleLabel; - public string? Title { get => TitleLabel.Text; diff --git a/Robust.Shared.Maths/Angle.cs b/Robust.Shared.Maths/Angle.cs index 34c0d83fe..9da821133 100644 --- a/Robust.Shared.Maths/Angle.cs +++ b/Robust.Shared.Maths/Angle.cs @@ -11,9 +11,6 @@ namespace Robust.Shared.Maths { public static Angle Zero { get; } = new(); - [Obsolete("Use Angle.Zero")] - public static Angle South { get; } = new(-MathHelper.PiOver2); - /// /// Angle in radians. /// diff --git a/Robust.Shared/GameObjects/ComponentFactory.cs b/Robust.Shared/GameObjects/ComponentFactory.cs index 963cabd32..812cc57e5 100644 --- a/Robust.Shared/GameObjects/ComponentFactory.cs +++ b/Robust.Shared/GameObjects/ComponentFactory.cs @@ -74,7 +74,7 @@ namespace Robust.Shared.GameObjects /// public event Action? ComponentIgnoreAdded; - + /// public IEnumerable AllRegisteredTypes => types.Keys; @@ -106,12 +106,6 @@ namespace Robust.Shared.GameObjects }); } - [Obsolete("Use RegisterClass and Attributes instead of the Register/RegisterReference combo")] - public void Register(bool overwrite = false) where T : IComponent, new() - { - Register(typeof(T), overwrite); - } - private void Register(Type type, bool overwrite = false) { if (_networkedComponents is not null) @@ -165,12 +159,6 @@ namespace Robust.Shared.GameObjects ComponentAdded?.Invoke(registration); } - [Obsolete("Use RegisterClass and Attributes instead of the Register/RegisterReference combo")] - public void RegisterReference() where TTarget : TInterface, IComponent, new() - { - RegisterReference(typeof(TTarget), typeof(TInterface)); - } - private void RegisterReference(Type target, Type @interface) { if (_networkedComponents is not null) @@ -217,7 +205,7 @@ namespace Robust.Shared.GameObjects throw new ComponentRegistrationLockException(); var registration = names[name]; - + names.Remove(registration.Name); _lowerCaseNames.Remove(registration.Name.ToLowerInvariant()); types.Remove(registration.Type); diff --git a/Robust.Shared/GameObjects/Components/ITransformComponent.cs b/Robust.Shared/GameObjects/Components/ITransformComponent.cs index 831ad80db..8ad24a58a 100644 --- a/Robust.Shared/GameObjects/Components/ITransformComponent.cs +++ b/Robust.Shared/GameObjects/Components/ITransformComponent.cs @@ -89,11 +89,6 @@ namespace Robust.Shared.GameObjects /// public EntityUid ParentUid { get; set; } - /// - /// Whether or not this entity is on the map, AKA it has no parent. - /// - bool IsMapTransform { get; } - Vector2? LerpDestination { get; } /// diff --git a/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs b/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs index 1b3e01ac4..57dd875c2 100644 --- a/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs +++ b/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Robust.Shared.Animations; -using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.IoC; using Robust.Shared.Map; @@ -219,9 +218,6 @@ namespace Robust.Shared.GameObjects } } - [Obsolete("Use ContainerHelper to check if this entity is inside a container.")] - public bool IsMapTransform => !Owner.IsInContainer(); - /// [ViewVariables(VVAccess.ReadWrite)] [Animatable] diff --git a/Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs b/Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs index 12d8071a6..6a4dd4ed0 100644 --- a/Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs +++ b/Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs @@ -108,20 +108,6 @@ namespace Robust.Shared.GameObjects _subscriptions.Add(new SubBroadcast>(src)); } - [Obsolete("Unsubscribing of entity system events is now automatic")] - protected void UnsubscribeNetworkEvent() - where T : notnull - { - EntityManager.EventBus.UnsubscribeEvent(EventSource.Network, this); - } - - [Obsolete("Unsubscribing of entity system events is now automatic")] - protected void UnsubscribeLocalEvent() - where T : notnull - { - EntityManager.EventBus.UnsubscribeEvent(EventSource.Local, this); - } - protected void SubscribeLocalEvent( ComponentEventHandler handler, Type[]? before = null, Type[]? after = null) @@ -146,22 +132,6 @@ namespace Robust.Shared.GameObjects _subscriptions.Add(new SubLocal()); } - [Obsolete("Unsubscribing of entity system events is now automatic")] - protected void UnsubscribeLocalEvent(ComponentEventHandler handler) - where TComp : IComponent - where TEvent : notnull - { - EntityManager.EventBus.UnsubscribeLocalEvent(); - } - - [Obsolete("Unsubscribing of entity system events is now automatic")] - protected void UnsubscribeLocalEvent() - where TComp : IComponent - where TEvent : notnull - { - EntityManager.EventBus.UnsubscribeLocalEvent(); - } - private void ShutdownSubscriptions() { if (_subscriptions == null) diff --git a/Robust.Shared/GameObjects/IComponentFactory.cs b/Robust.Shared/GameObjects/IComponentFactory.cs index 6462bca01..61bf021bd 100644 --- a/Robust.Shared/GameObjects/IComponentFactory.cs +++ b/Robust.Shared/GameObjects/IComponentFactory.cs @@ -41,7 +41,7 @@ namespace Robust.Shared.GameObjects /// Before a component can be spawned, it must be registered so things such as name, networking ID, type, etc... /// are known to the factory. /// Components are registered into a registry. - /// The relevant methods for writing to this registry are and . + /// The relevant methods for writing to this registry are . /// The data is exposed for reading through and its overloads. /// This data is returned in the form of a , which represents one component's registration. ///

@@ -77,25 +77,10 @@ namespace Robust.Shared.GameObjects /// The availability of the component. ComponentAvailability GetComponentAvailability(string componentName, bool ignoreCase = false); - /// - /// Registers a prototype to be available for spawning. - /// - /// If the component already exists, will this replace it? - /// - /// This implicitly calls - /// with a TTarget and TInterface of . - /// - - [Obsolete("Use RegisterClass and Attributes instead of the Register/RegisterReference combo")] - void Register(bool overwrite = false) where T : IComponent, new(); - /// /// Registers a component class with the factory. /// /// If the component already exists, will this replace it? - /// - /// Unlike , this reads the attributes. No more Register/RegisterReference combos. - /// void RegisterClass(bool overwrite = false) where T : IComponent, new(); /// @@ -105,15 +90,6 @@ namespace Robust.Shared.GameObjects /// Whether to overrde existing settings instead of throwing an exception in the case of duplicates. void RegisterIgnore(string name, bool overwrite = false); - // NOTE: no overwrite here, it'd overcomplicate RegisterReference a LOT. - // If you need to overwrite references for some sick reason overwrite the component too. - /// - /// Registers to be referenced when - /// is used in methods like - /// - [Obsolete("Use RegisterClass and Attributes instead of the Register/RegisterReference combo")] - void RegisterReference() where TTarget : TInterface, IComponent, new(); - /// /// Gets a new component instantiated of the specified type. /// @@ -285,8 +261,6 @@ namespace Robust.Shared.GameObjects /// A list of type references that can be used to get a reference to an instance of this component, /// for methods like . /// These are not unique and can overlap with other components. - /// Unlike the other properties, this data is not gotten from a component instance, - /// instead this data is set with /// IReadOnlyList References { get; } } diff --git a/Robust.Shared/Localization/ILocalizationManager.cs b/Robust.Shared/Localization/ILocalizationManager.cs index a39815d68..1c578cda0 100644 --- a/Robust.Shared/Localization/ILocalizationManager.cs +++ b/Robust.Shared/Localization/ILocalizationManager.cs @@ -60,14 +60,6 @@ namespace Robust.Shared.Localization /// CultureInfo? DefaultCulture { get; set; } - /// - /// Load data for a culture. - /// - /// - /// - [Obsolete("Use LoadCulture without IResourceManager overload instead.")] - void LoadCulture(IResourceManager resourceManager, CultureInfo culture) => LoadCulture(culture); - /// /// Load data for a culture. /// @@ -87,14 +79,6 @@ namespace Robust.Shared.Localization /// The function itself. void AddFunction(CultureInfo culture, string name, LocFunction function); - /// - /// Remnants of the old Localization system. - /// It exists to prevent source errors and allow existing game text to *mostly* work - /// - [Obsolete] - [StringFormatMethod("text")] - string GetString(string text, params object[] args); - /// /// Gets localization data for an entity prototype. /// diff --git a/Robust.Shared/Localization/Loc.cs b/Robust.Shared/Localization/Loc.cs index ffece2534..2e19b6ac6 100644 --- a/Robust.Shared/Localization/Loc.cs +++ b/Robust.Shared/Localization/Loc.cs @@ -56,27 +56,5 @@ namespace Robust.Shared.Localization { return LocalizationManager.TryGetString(messageId, out value, args); } - - /// - /// Load data for a culture. - /// - /// - /// - [Obsolete("Use ILocalizationManager directly for setup methods.")] - public static void LoadCulture(IResourceManager resourceManager, CultureInfo culture) - { - LocalizationManager.LoadCulture(resourceManager, culture); - } - - /// - /// Remnants of the old Localization system. - /// It exists to prevent source errors and allow existing game text to *mostly* work - /// - [Obsolete] - [StringFormatMethod("text")] - public static string GetString(string text, params object[] args) - { - return LocalizationManager.GetString(text, args); - } } } diff --git a/Robust.Shared/Localization/LocalizationManager.cs b/Robust.Shared/Localization/LocalizationManager.cs index 8c62e1205..96dc6488a 100644 --- a/Robust.Shared/Localization/LocalizationManager.cs +++ b/Robust.Shared/Localization/LocalizationManager.cs @@ -155,17 +155,6 @@ namespace Robust.Shared.Localization FlushEntityCache(); } - /// - /// Remnants of the old Localization system. - /// It exists to prevent source errors and allow existing game text to *mostly* work - /// - [Obsolete] - [StringFormatMethod("text")] - public string GetString(string text, params object[] args) - { - return string.Format(text, args); - } - public CultureInfo? DefaultCulture { get => _defaultCulture; @@ -272,4 +261,4 @@ namespace Robust.Shared.Localization } } } -} \ No newline at end of file +} diff --git a/Robust.Shared/Map/EntityCoordinates.cs b/Robust.Shared/Map/EntityCoordinates.cs index 65a2eb297..bc8e7a5ee 100644 --- a/Robust.Shared/Map/EntityCoordinates.cs +++ b/Robust.Shared/Map/EntityCoordinates.cs @@ -125,22 +125,6 @@ namespace Robust.Shared.Map return FromMap(entity, coordinates); } - /// - /// Creates a set of EntityCoordinates given some MapCoordinates. - /// - /// - /// - /// - /// - [Obsolete("Use FromMap(IMapManager mapManager, MapCoordinates coordinates) instead.")] - public static EntityCoordinates FromMap(IEntityManager entityManager, IMapManager mapManager, MapCoordinates coordinates) - { - var mapId = coordinates.MapId; - var mapEntity = mapManager.GetMapEntity(mapId); - - return new EntityCoordinates(mapEntity.Uid, coordinates.Position); - } - /// /// Creates a set of EntityCoordinates given some MapCoordinates. /// diff --git a/Robust.Shared/Map/MapIndices.cs b/Robust.Shared/Map/MapIndices.cs deleted file mode 100644 index d5b4d8e85..000000000 --- a/Robust.Shared/Map/MapIndices.cs +++ /dev/null @@ -1,133 +0,0 @@ -using System; -using JetBrains.Annotations; -using Robust.Shared.Maths; -using Robust.Shared.Serialization; - -namespace Robust.Shared.Map -{ - /// - /// Internal structure to store 2 indices of a chunk or tile. - /// Despite the name, this can refer to a specific tile on a grid. - /// - [PublicAPI] - [Serializable, NetSerializable] - [Obsolete("Use Vector2i instead")] - public readonly struct MapIndices : IEquatable - { - /// - /// The index. - /// - public readonly int X; - - /// - /// The index. - /// - public readonly int Y; - - /// - /// Public constructor. - /// - /// The index. - /// The index. - public MapIndices(int x, int y) - { - X = x; - Y = y; - } - - /// - /// Translates the indices by a given offset. - /// - public static MapIndices operator +(MapIndices left, MapIndices right) - { - return new(left.X + right.X, left.Y + right.Y); - } - - /// - /// Translates the indices by a given offset. - /// - public static MapIndices operator -(MapIndices left, MapIndices right) - { - return new(left.X - right.X, left.Y - right.Y); - } - - /// - /// Returns the opposite indices. - /// - public static MapIndices operator -(MapIndices indices) - { - return new(-indices.X, -indices.Y); - } - - /// - /// Scales the by a scalar amount. - /// - public static MapIndices operator *(MapIndices indices, int multiplier) - { - return new(indices.X * multiplier, indices.Y * multiplier); - } - - /// - /// Tests for value equality between two LocalCoordinates. - /// - public static bool operator ==(MapIndices a, MapIndices b) - { - return a.Equals(b); - } - - /// - /// Tests for value inequality between two LocalCoordinates. - /// - public static bool operator !=(MapIndices a, MapIndices b) - { - return !a.Equals(b); - } - - /// - public override bool Equals(object? obj) - { - return obj is MapIndices idx && Equals(idx); - } - - /// - public bool Equals(MapIndices other) - { - return other.X == X && other.Y == Y; - } - - /// - public override string ToString() - { - return $"{{{X},{Y}}}"; - } - - public EntityCoordinates ToEntityCoordinates(IMapManager mapManager, GridId gridId) - { - var grid = mapManager.GetGrid(gridId); - var tile = grid.TileSize; - - return new EntityCoordinates(grid.GridEntityId, (X * tile, Y * tile)); - } - - /// - public override int GetHashCode() - { - return X ^ (Y * 23011); - } - - public static implicit operator Vector2i(in MapIndices indices) - { - return new(indices.X, indices.Y); - } - - public static implicit operator MapIndices(in Vector2i indices) - { - return new(indices.X, indices.Y); - } - - public static implicit operator Vector2(in MapIndices indices) - { - return new(indices.X, indices.Y); - } - } -} diff --git a/Robust.Shared/Utility/UsernameHelpers.cs b/Robust.Shared/Utility/UsernameHelpers.cs deleted file mode 100644 index 2b8edbd29..000000000 --- a/Robust.Shared/Utility/UsernameHelpers.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using AHelpers = Robust.Shared.AuthLib.UsernameHelpers; - -namespace Robust.Shared.Utility -{ - [Obsolete("Use Robust.Shared.AuthLib.UsernameHelpers instead.")] - public static class UsernameHelpers - { - /// - /// Checks whether a user name is valid. - /// If this is false, feel free to kick the person requesting it. Loudly. - /// - /// The name to check. - /// True if the name is acceptable, false otherwise. - public static (bool, string? reason) IsNameValid(string name) - { - var valid = AHelpers.IsNameValid(name, out var reason); - if (valid) - { - return (true, null); - } - - return (false, reason.ToText()); - } - } -}