diff --git a/Content.Benchmarks/ColorInterpolateBenchmark.cs b/Content.Benchmarks/ColorInterpolateBenchmark.cs index f45b91363d..7005970a00 100644 --- a/Content.Benchmarks/ColorInterpolateBenchmark.cs +++ b/Content.Benchmarks/ColorInterpolateBenchmark.cs @@ -1,12 +1,10 @@ -using System; -using System.Runtime.CompilerServices; #if NETCOREAPP using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; #endif +using System; +using System.Runtime.CompilerServices; using BenchmarkDotNet.Attributes; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; using SysVector4 = System.Numerics.Vector4; diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs index 638c19e99d..95063ba8d0 100644 --- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs +++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs @@ -29,7 +29,7 @@ namespace Content.Benchmarks dummyReg.SetupGet(p => p.Type).Returns(typeof(DummyComponent)); dummyReg.SetupGet(p => p.NetID).Returns((uint?) null); dummyReg.SetupGet(p => p.NetworkSynchronizeExistence).Returns(false); - dummyReg.SetupGet(p => p.References).Returns(new Type[] {typeof(DummyComponent)}); + dummyReg.SetupGet(p => p.References).Returns(new [] {typeof(DummyComponent)}); var componentFactory = new Mock(); componentFactory.Setup(p => p.GetComponent()).Returns(new DummyComponent()); diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs index c0c5e46488..b63977d08c 100644 --- a/Content.Client/Chat/ChatBox.cs +++ b/Content.Client/Chat/ChatBox.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; using Content.Shared.Chat; using Robust.Client.Graphics.Drawing; -using Robust.Client.Input; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared.Input; +using Robust.Shared.IoC; +using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Utility; -using Robust.Shared.Localization; -using Robust.Shared.IoC; -using Robust.Shared.Input; namespace Content.Client.Chat { diff --git a/Content.Client/ClientNotifyManager.cs b/Content.Client/ClientNotifyManager.cs index cbd3d0de01..81a2d199b1 100644 --- a/Content.Client/ClientNotifyManager.cs +++ b/Content.Client/ClientNotifyManager.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using Content.Client.Interfaces; using Content.Shared; -using Robust.Client; using Robust.Client.Interfaces.Console; using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Input; diff --git a/Content.Client/Construction/ConstructionMenu.cs b/Content.Client/Construction/ConstructionMenu.cs index 5d7c59e872..5e0c359b02 100644 --- a/Content.Client/Construction/ConstructionMenu.cs +++ b/Content.Client/Construction/ConstructionMenu.cs @@ -225,7 +225,7 @@ namespace Content.Client.Construction PopulateTree(string.IsNullOrWhiteSpace(str) ? null : str.ToLowerInvariant()); } - void OnBuildPressed(Button.ButtonEventArgs args) + void OnBuildPressed(BaseButton.ButtonEventArgs args) { var prototype = (ConstructionPrototype) RecipeList.Selected.Metadata; if (prototype == null) @@ -332,7 +332,7 @@ namespace Content.Client.Construction { var found = false; // TODO: don't run ToLowerInvariant() constantly. - if (prototype.Name.ToLowerInvariant().IndexOf(searchTerm) != -1) + if (prototype.Name.ToLowerInvariant().IndexOf(searchTerm, StringComparison.Ordinal) != -1) { found = true; } @@ -341,7 +341,7 @@ namespace Content.Client.Construction foreach (var keyw in prototype.Keywords.Concat(prototype.CategorySegments)) { // TODO: don't run ToLowerInvariant() constantly. - if (keyw.ToLowerInvariant().IndexOf(searchTerm) != -1) + if (keyw.ToLowerInvariant().IndexOf(searchTerm, StringComparison.Ordinal) != -1) { found = true; break; @@ -369,7 +369,7 @@ namespace Content.Client.Construction private static int ComparePrototype(ConstructionPrototype x, ConstructionPrototype y) { - return x.Name.CompareTo(y.Name); + return String.Compare(x.Name, y.Name, StringComparison.Ordinal); } class CategoryNode diff --git a/Content.Client/Construction/ConstructionPlacementHijack.cs b/Content.Client/Construction/ConstructionPlacementHijack.cs index bf1abe4ee1..5a4f56859f 100644 --- a/Content.Client/Construction/ConstructionPlacementHijack.cs +++ b/Content.Client/Construction/ConstructionPlacementHijack.cs @@ -1,14 +1,11 @@ using Content.Client.GameObjects.Components.Construction; using Content.Shared.Construction; -using Robust.Client.Graphics; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Placement; -using Robust.Client.ResourceManagement; using Robust.Client.Utility; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; namespace Content.Client.Construction { @@ -46,7 +43,6 @@ namespace Content.Client.Construction { base.StartHijack(manager); - var res = IoCManager.Resolve(); manager.CurrentBaseSprite = Prototype.Icon.DirFrame0(); } } diff --git a/Content.Client/EscapeMenuOwner.cs b/Content.Client/EscapeMenuOwner.cs index 54c6f53cb5..c4b8d89cf4 100644 --- a/Content.Client/EscapeMenuOwner.cs +++ b/Content.Client/EscapeMenuOwner.cs @@ -10,7 +10,6 @@ using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Players; using Robust.Shared.Prototypes; namespace Content.Client diff --git a/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs b/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs index d6a1e5ce9a..39418747ba 100644 --- a/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs +++ b/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs @@ -1,3 +1,6 @@ +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; using System.Collections.Generic; using System.Linq; using Content.Shared.Access; @@ -6,7 +9,6 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Robust.Shared.Utility; using static Content.Shared.GameObjects.Components.Access.SharedIdCardConsoleComponent; namespace Content.Client.GameObjects.Components.Access diff --git a/Content.Client/GameObjects/Components/DamageableComponent.cs b/Content.Client/GameObjects/Components/DamageableComponent.cs index bde34e4d96..e19de318d3 100644 --- a/Content.Client/GameObjects/Components/DamageableComponent.cs +++ b/Content.Client/GameObjects/Components/DamageableComponent.cs @@ -20,9 +20,8 @@ namespace Content.Client.GameObjects { base.HandleComponentState(curState, nextState); - if(curState is DamageComponentState) + if(curState is DamageComponentState damagestate) { - var damagestate = (DamageComponentState)curState; CurrentDamage = damagestate.CurrentDamage; } } diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs index 4a7819589e..5be5766808 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs @@ -1,17 +1,16 @@ -using System; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.Clothing; using Content.Shared.GameObjects; -using Content.Shared.GameObjects.Components.Inventory; -using Content.Shared.GameObjects.Components.Storage; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs index dbd487aa25..f77e7f113e 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs @@ -1,4 +1,6 @@ -using System.Collections.Generic; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility;using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.Storage; using Content.Client.Utility; @@ -12,7 +14,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Robust.Shared.Utility; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; namespace Content.Client.GameObjects @@ -55,7 +56,7 @@ namespace Content.Client.GameObjects void AddButton(out InventoryButton variable, Slots slot, string textureName) { var texture = _resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png"); - var storageTexture = _resourceCache.GetTexture($"/Textures/UserInterface/Inventory/back.png"); + var storageTexture = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png"); variable = new InventoryButton(slot, texture, storageTexture) { OnPressed = AddToInventory, @@ -170,7 +171,7 @@ namespace Content.Client.GameObjects void AddButton(Slots slot, string textureName, Vector2 position) { var texture = resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png"); - var storageTexture = resourceCache.GetTexture($"/Textures/UserInterface/Inventory/back.png"); + var storageTexture = resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png"); var button = new InventoryButton(slot, texture, storageTexture) { Position = position diff --git a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs index 4e0899724c..af81271e4f 100644 --- a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; +using System.Collections.Generic; using System.Linq; using Content.Client.Interfaces.GameObjects; using Content.Client.UserInterface; @@ -10,7 +13,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects diff --git a/Content.Client/GameObjects/Components/LowWallComponent.cs b/Content.Client/GameObjects/Components/LowWallComponent.cs index 02f541a09f..3fb8cbf525 100644 --- a/Content.Client/GameObjects/Components/LowWallComponent.cs +++ b/Content.Client/GameObjects/Components/LowWallComponent.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.Contracts; using Content.Client.GameObjects.Components.IconSmoothing; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -179,7 +180,7 @@ namespace Content.Client.GameObjects.Components } } - [System.Diagnostics.Contracts.Pure] + [Pure] private (bool connected, bool lowWall) MatchingWall(IEnumerable candidates) { foreach (var entity in candidates) diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs index 652280a5f0..604442693d 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs @@ -1,18 +1,15 @@ -using System.Collections.Generic; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; using System.Text; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Utility; using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent; namespace Content.Client.GameObjects.Components.MedicalScanner { public class MedicalScannerWindow : SS14Window { - public MedicalScannerWindow() - { - } - public void Populate(MedicalScannerBoundUserInterfaceState state) { Contents.RemoveAllChildren(); diff --git a/Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs b/Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs index ed7cb3dcdf..b661dd3999 100644 --- a/Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using Content.Client.UserInterface; @@ -14,7 +13,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; -using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Mobs { diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs index 63a9363763..9c4400588d 100644 --- a/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs @@ -1,18 +1,12 @@ using Content.Shared.GameObjects.Components.Mobs; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Mobs { public class SpeciesVisualizer2D : AppearanceVisualizer { - public override void InitializeEntity(IEntity entity) - { - base.InitializeEntity(entity); - } - public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); @@ -20,7 +14,7 @@ namespace Content.Client.GameObjects.Components.Mobs var sprite = component.Owner.GetComponent(); if (component.TryGetData(SharedSpeciesComponent.MobVisuals.RotationState, out var state)) { - switch (state) + switch (state) { case SharedSpeciesComponent.MobState.Stand: sprite.Rotation = 0; @@ -32,4 +26,4 @@ namespace Content.Client.GameObjects.Components.Mobs } } } -} \ No newline at end of file +} diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs index b212534946..3e2baceccb 100644 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs @@ -35,7 +35,7 @@ namespace Content.Client.GameObjects.Components.Nutrition } else { - sprite.LayerSetState(0, $"icon-0"); + sprite.LayerSetState(0, "icon-0"); } } } diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs index 70988ff320..54aae8fd56 100644 --- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Client.UserInterface; using Content.Shared.GameObjects.Components.Power; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.Graphics.Drawing; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects.Components.UserInterface; @@ -153,7 +152,7 @@ namespace Content.Client.GameObjects.Components.Power var chargeLabel = new Label {Text = "Charge:"}; ChargeBar = new ProgressBar { - SizeFlagsHorizontal = Control.SizeFlags.FillExpand, + SizeFlagsHorizontal = SizeFlags.FillExpand, MinValue = 0.0f, MaxValue = 1.0f, Page = 0.0f, diff --git a/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs index 98c08abc1c..710b113cf7 100644 --- a/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs @@ -2,11 +2,6 @@ using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs index 85582a6a0d..3273cb79f3 100644 --- a/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs @@ -87,7 +87,7 @@ namespace Content.Client.GameObjects.Components.Research if (!_prototypeManager.TryIndex(msg.ID, out LatheRecipePrototype recipe)) break; queueMenu?.SetInfo(recipe); break; - case SharedLatheComponent.LatheStoppedProducingRecipeMessage msg: + case SharedLatheComponent.LatheStoppedProducingRecipeMessage _: queueMenu?.ClearInfo(); break; case SharedLatheComponent.LatheFullQueueMessage msg: diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs index 544418a123..45794400b1 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.GameObjects.Components.Research; using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects.Components.UserInterface; namespace Content.Client.GameObjects.Components.Research diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs b/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs index b0a08f8e7d..df23f7be5c 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs +++ b/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs @@ -1,6 +1,4 @@ -using System; -using Content.Shared.GameObjects.Components.Research; -using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs index fbcee21c34..77741e1c94 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs @@ -2,9 +2,7 @@ using Content.Client.Research; using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Log; namespace Content.Client.GameObjects.Components.Research { diff --git a/Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs b/Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs index 98efd87227..691b7edbfd 100644 --- a/Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs +++ b/Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs @@ -4,7 +4,6 @@ using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; -using SixLabors.ImageSharp.Processing; namespace Content.Client.GameObjects.Components.Research { diff --git a/Content.Client/GameObjects/Components/Sound/SoundComponent.cs b/Content.Client/GameObjects/Components/Sound/SoundComponent.cs index 9b46924eb0..e5579e3b80 100644 --- a/Content.Client/GameObjects/Components/Sound/SoundComponent.cs +++ b/Content.Client/GameObjects/Components/Sound/SoundComponent.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Sound; using Robust.Client.GameObjects.EntitySystems; @@ -82,7 +81,7 @@ namespace Content.Client.GameObjects.Components.Sound StopScheduledSound(msg.Filename); break; - case StopAllSoundsMessage msg: + case StopAllSoundsMessage _: StopAllSounds(); break; } diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs index aed0ca9c1c..b9686d45b7 100644 --- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs +++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs @@ -10,7 +10,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Maths; -using Robust.Shared.Serialization; namespace Content.Client.GameObjects.Components.Storage { @@ -39,11 +38,6 @@ namespace Content.Client.GameObjects.Components.Storage base.OnRemove(); } - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - } - public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null) { @@ -54,10 +48,10 @@ namespace Content.Client.GameObjects.Components.Storage HandleStorageMessage(msg); break; //Opens the UI - case OpenStorageUIMessage msg: + case OpenStorageUIMessage _: OpenUI(); break; - case CloseStorageUIMessage msg: + case CloseStorageUIMessage _: CloseUI(); break; } diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs index 089c8497f8..5666c01155 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs @@ -2,14 +2,7 @@ using Content.Shared.GameObjects.Components.VendingMachines; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Client.GameObjects.Components.VendingMachines { diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs index f69f711ac7..1833b86953 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs @@ -1,5 +1,4 @@ using System; -using Content.Client.GameObjects.Components.Doors; using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Client.GameObjects.Components.Animations; diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs index 782af8e469..0b34b2859b 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs @@ -1,9 +1,7 @@ -using System; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Utility; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Log; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs index 408362fd30..ce80b05a89 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs @@ -2,7 +2,6 @@ using Content.Shared.Utility; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs index 2e73659f2d..18d3661f9f 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs @@ -1,7 +1,5 @@ -using System.Collections.Generic; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using static Content.Shared.GameObjects.Components.SharedWiresComponent; diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs index d31b9169e4..d907cc65e3 100644 --- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs @@ -1,4 +1,3 @@ -using System.Linq; using Content.Client.GameObjects.Components.Mobs; using Content.Client.GameObjects.Components.Weapons.Melee; using Content.Shared.GameObjects.Components.Weapons.Melee; diff --git a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs index 11216aa891..8ffa35f5bd 100644 --- a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs @@ -1,6 +1,5 @@ using Content.Client.GameObjects.Components.Weapons.Ranged; using Content.Client.Interfaces.GameObjects; -using Content.Shared.Input; using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Input; diff --git a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs index 73b33afb10..30fc6a15a0 100644 --- a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs @@ -1,12 +1,9 @@ using System.Collections.Generic; using Content.Client.GameObjects.Components; -using Content.Client.GameObjects.Components.IconSmoothing; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs index 1f9afb34ea..6ebf290452 100644 --- a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs +++ b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs @@ -2,7 +2,6 @@ using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Shaders; using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Client/Graphics/Overlays/GradientCircleMask.cs b/Content.Client/Graphics/Overlays/GradientCircleMask.cs index ffb4ce8695..45c4d7c45a 100644 --- a/Content.Client/Graphics/Overlays/GradientCircleMask.cs +++ b/Content.Client/Graphics/Overlays/GradientCircleMask.cs @@ -2,7 +2,6 @@ using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Shaders; using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Client/Interfaces/Chat/IChatManager.cs b/Content.Client/Interfaces/Chat/IChatManager.cs index 0af1ab85ee..814fc18b75 100644 --- a/Content.Client/Interfaces/Chat/IChatManager.cs +++ b/Content.Client/Interfaces/Chat/IChatManager.cs @@ -1,5 +1,4 @@ using Content.Client.Chat; -using Robust.Client; using Robust.Shared.GameObjects; using Robust.Shared.Timing; diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/Interfaces/IClientGameTicker.cs index 2d97b93a31..02ccd8a367 100644 --- a/Content.Client/Interfaces/IClientGameTicker.cs +++ b/Content.Client/Interfaces/IClientGameTicker.cs @@ -1,5 +1,3 @@ -using Content.Client.UserInterface; -using Robust.Client; using Robust.Shared.Timing; namespace Content.Client.Interfaces diff --git a/Content.Client/Interfaces/IClientNotifyManager.cs b/Content.Client/Interfaces/IClientNotifyManager.cs index 03d587301f..b7dbaf36d0 100644 --- a/Content.Client/Interfaces/IClientNotifyManager.cs +++ b/Content.Client/Interfaces/IClientNotifyManager.cs @@ -1,5 +1,4 @@ using Content.Shared.Interfaces; -using Robust.Client; using Robust.Shared.Map; using Robust.Shared.Timing; diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs index 76e2d76e9a..aa5b39aca1 100644 --- a/Content.Client/Parallax/ParallaxGenerator.cs +++ b/Content.Client/Parallax/ParallaxGenerator.cs @@ -3,16 +3,15 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using Nett; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; -using SixLabors.Primitives; using Robust.Client.Utility; using Robust.Shared.Interfaces.Log; using Robust.Shared.Maths; using Robust.Shared.Noise; using Robust.Shared.Random; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Advanced; -using BlendFactor = Robust.Shared.Maths.Color.BlendFactor; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.Primitives; namespace Content.Client.Parallax { @@ -84,8 +83,8 @@ namespace Content.Client.Parallax private readonly uint Octaves = 3; private readonly float Threshold; private readonly float Power = 1; - private readonly BlendFactor SrcFactor = BlendFactor.One; - private readonly BlendFactor DstFactor = BlendFactor.One; + private readonly Color.BlendFactor SrcFactor = Color.BlendFactor.One; + private readonly Color.BlendFactor DstFactor = Color.BlendFactor.One; public LayerNoise(TomlTable table) { @@ -131,12 +130,12 @@ namespace Content.Client.Parallax if (table.TryGetValue("sourcefactor", out tomlObject)) { - SrcFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get()); + SrcFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get()); } if (table.TryGetValue("destfactor", out tomlObject)) { - DstFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get()); + DstFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get()); } if (table.TryGetValue("power", out tomlObject)) @@ -208,8 +207,8 @@ namespace Content.Client.Parallax private readonly Color CloseColor = Color.White; private readonly Color FarColor = Color.Black; - private readonly BlendFactor SrcFactor = BlendFactor.One; - private readonly BlendFactor DstFactor = BlendFactor.One; + private readonly Color.BlendFactor SrcFactor = Color.BlendFactor.One; + private readonly Color.BlendFactor DstFactor = Color.BlendFactor.One; // Noise mask stuff. private readonly bool Masked; @@ -238,12 +237,12 @@ namespace Content.Client.Parallax if (table.TryGetValue("sourcefactor", out tomlObject)) { - SrcFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get()); + SrcFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get()); } if (table.TryGetValue("destfactor", out tomlObject)) { - DstFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get()); + DstFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get()); } if (table.TryGetValue("farcolor", out tomlObject)) diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs index 11fd6c419b..9cf22e0dfa 100644 --- a/Content.Client/Parallax/ParallaxOverlay.cs +++ b/Content.Client/Parallax/ParallaxOverlay.cs @@ -4,7 +4,6 @@ using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Shaders; using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Client/Research/LatheMenu.cs b/Content.Client/Research/LatheMenu.cs index 1cd4eba94e..4e99c875bc 100644 --- a/Content.Client/Research/LatheMenu.cs +++ b/Content.Client/Research/LatheMenu.cs @@ -1,6 +1,8 @@ +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; using System.Collections.Generic; using Content.Client.GameObjects.Components.Research; -using Content.Shared.GameObjects.Components.Research; using Content.Shared.Materials; using Content.Shared.Research; using Robust.Client.UserInterface; @@ -10,8 +12,6 @@ using Robust.Client.Utility; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; -using Robust.Shared.Timers; -using Robust.Shared.Utility; namespace Content.Client.Research { @@ -219,9 +219,8 @@ namespace Content.Client.Research public void PopulateList() { Items.Clear(); - for (var i = 0; i < _shownRecipes.Count; i++) + foreach (var prototype in _shownRecipes) { - var prototype = _shownRecipes[i]; Items.AddItem(prototype.Name, prototype.Icon.Frame0()); } diff --git a/Content.Client/Research/ResearchConsoleMenu.cs b/Content.Client/Research/ResearchConsoleMenu.cs index aa74b64f0b..5ece8da8f7 100644 --- a/Content.Client/Research/ResearchConsoleMenu.cs +++ b/Content.Client/Research/ResearchConsoleMenu.cs @@ -2,13 +2,11 @@ using System.Collections.Generic; using Content.Client.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Client.Graphics; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.Utility; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Client/UserInterface/EscapeMenu.cs b/Content.Client/UserInterface/EscapeMenu.cs index 7e27b2702e..87d7c8509e 100644 --- a/Content.Client/UserInterface/EscapeMenu.cs +++ b/Content.Client/UserInterface/EscapeMenu.cs @@ -1,8 +1,6 @@ using Robust.Client.Console; -using Robust.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Placement; using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Interfaces.Configuration; diff --git a/Content.Client/UserInterface/StatusEffectsUI.cs b/Content.Client/UserInterface/StatusEffectsUI.cs index ce32c8f6e6..5df9c190aa 100644 --- a/Content.Client/UserInterface/StatusEffectsUI.cs +++ b/Content.Client/UserInterface/StatusEffectsUI.cs @@ -1,9 +1,5 @@ -using Content.Client.Utility; -using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.IoC; namespace Content.Client.UserInterface { diff --git a/Content.Client/VendingMachines/VendingMachineMenu.cs b/Content.Client/VendingMachines/VendingMachineMenu.cs index fa8cb8ac18..4d279144d1 100644 --- a/Content.Client/VendingMachines/VendingMachineMenu.cs +++ b/Content.Client/VendingMachines/VendingMachineMenu.cs @@ -1,13 +1,13 @@ -using Content.Client.GameObjects.Components.VendingMachines; -using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.IoC; -using Robust.Shared.Maths; -using System.Collections.Generic; +using System.Collections.Generic; +using Content.Client.GameObjects.Components.VendingMachines; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Maths; using Robust.Shared.Prototypes; using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent; diff --git a/Content.IntegrationTests/ConnectTest.cs b/Content.IntegrationTests/ConnectTest.cs index 5a71a03339..6dabb5ebaa 100644 --- a/Content.IntegrationTests/ConnectTest.cs +++ b/Content.IntegrationTests/ConnectTest.cs @@ -6,7 +6,6 @@ using Robust.Shared.Enums; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; -using Robust.UnitTesting; namespace Content.IntegrationTests { diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index 209829dc89..ed7a98f57c 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -13,7 +13,7 @@ namespace Content.IntegrationTests { options = options ?? new ClientIntegrationOptions(); // ReSharper disable once RedundantNameQualifier - options.ClientContentAssembly = typeof(Client.EntryPoint).Assembly; + options.ClientContentAssembly = typeof(EntryPoint).Assembly; options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly; options.BeforeStart += () => { diff --git a/Content.IntegrationTests/StartTest.cs b/Content.IntegrationTests/StartTest.cs index 68de733ae8..8de172ddda 100644 --- a/Content.IntegrationTests/StartTest.cs +++ b/Content.IntegrationTests/StartTest.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using NUnit.Framework; using Robust.Shared.Exceptions; -using Robust.UnitTesting; namespace Content.IntegrationTests { diff --git a/Content.Server/AI/StaticBarkerProcessor.cs b/Content.Server/AI/StaticBarkerProcessor.cs index 1b85350810..dcc3debeff 100644 --- a/Content.Server/AI/StaticBarkerProcessor.cs +++ b/Content.Server/AI/StaticBarkerProcessor.cs @@ -1,10 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Content.Server.Interfaces.Chat; -using JetBrains.Annotations; using Robust.Server.AI; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; diff --git a/Content.Server/AI/WanderProcessor.cs b/Content.Server/AI/WanderProcessor.cs index 45764b322d..47422e0472 100644 --- a/Content.Server/AI/WanderProcessor.cs +++ b/Content.Server/AI/WanderProcessor.cs @@ -6,7 +6,6 @@ using Content.Server.Interfaces.Chat; using Content.Shared.Physics; using Robust.Server.AI; using Robust.Server.GameObjects; -using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs index 68863de699..218fc31dcd 100644 --- a/Content.Server/Chat/ChatManager.cs +++ b/Content.Server/Chat/ChatManager.cs @@ -1,5 +1,4 @@ using System.Linq; -using Content.Server.GameObjects; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; diff --git a/Content.Server/Chemistry/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ExplosionReactionEffect.cs index 0efa242f5d..4ab6f5e282 100644 --- a/Content.Server/Chemistry/ExplosionReactionEffect.cs +++ b/Content.Server/Chemistry/ExplosionReactionEffect.cs @@ -1,11 +1,8 @@ using System; using Content.Server.Explosions; -using Content.Server.GameObjects.Components.Explosive; -using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.Components.Chemistry; using Content.Shared.Interfaces; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Server.Chemistry diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosions/ExplosionHelper.cs index a67d1a35da..6c68c3d94a 100644 --- a/Content.Server/Explosions/ExplosionHelper.cs +++ b/Content.Server/Explosions/ExplosionHelper.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Maps; @@ -119,7 +116,7 @@ namespace Content.Server.Explosions entitySystemManager.GetEntitySystem().Play("/Audio/effects/explosion.ogg", coords); // Knock back cameras of all players in the area. - + var playerManager = IoCManager.Resolve(); //var selfPos = Owner.Transform.WorldPosition; //vec2 var selfPos = coords.ToWorld(mapManager).Position; diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index c7783a2c29..a44c4b8e27 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -168,8 +168,8 @@ namespace Content.Server.GameObjects.Components.Construction } } - private static Dictionary StackTypeMap - = new Dictionary + private static Dictionary StackTypeMap + = new Dictionary { { StackType.Cable, MaterialType.Cable }, { StackType.Glass, MaterialType.Glass }, diff --git a/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs b/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs index 56c44178b8..121bbc7ba0 100644 --- a/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects; @@ -7,7 +6,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs b/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs index a7c04238c1..cf9596eef9 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs @@ -1,5 +1,5 @@ -using Content.Shared.GameObjects; -using System; +using System; +using Content.Shared.GameObjects; namespace Content.Server.GameObjects { @@ -21,7 +21,7 @@ namespace Content.Server.GameObjects public override bool Equals(Object obj) { - return obj is DamageThreshold && this == (DamageThreshold)obj; + return obj is DamageThreshold threshold && this == threshold; } public override int GetHashCode() { diff --git a/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs index 6ed3172312..1b4f900872 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs @@ -4,14 +4,13 @@ using System.Linq; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; +using Robust.Server.Console; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Robust.Server.Console; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs index 492d4deeb0..49d51d01d6 100644 --- a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects; @@ -7,7 +6,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs b/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs index f344c84cca..41616c7824 100644 --- a/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs +++ b/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs @@ -1,6 +1,6 @@ -using Content.Shared.GameObjects; -using System; +using System; using System.Collections.Generic; +using Content.Shared.GameObjects; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs index a21a5e8730..f7d5abeea8 100644 --- a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs @@ -1,4 +1,5 @@ -using Content.Server.GameObjects.EntitySystems; +using Content.Server.Explosions; +using Content.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -6,7 +7,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Serialization; -using Content.Server.Explosions; namespace Content.Server.GameObjects.Components.Explosive { diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs index 49a82f609d..43cfa70518 100644 --- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs @@ -1,4 +1,7 @@ -using System; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; +using System; using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.EntitySystems; @@ -11,11 +14,10 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; -using Robust.Shared.Utility; +using Robust.Shared.Map; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; -using IComponent = Robust.Shared.Interfaces.GameObjects.IComponent; namespace Content.Server.GameObjects { @@ -275,7 +277,7 @@ namespace Content.Server.GameObjects if (activeHand != null) { interactionSystem.Interaction(Owner, activeHand.Owner, itemContainedInSlot.Owner, - new Robust.Shared.Map.GridCoordinates()); + new GridCoordinates()); } else if (Unequip(msg.Inventoryslot)) { diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs index f4a1f348be..496e049eb7 100644 --- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs @@ -1,4 +1,7 @@ -using System; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; +using System; using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; @@ -15,7 +18,6 @@ using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs b/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs index dfb871a073..b95e91a537 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs @@ -1,8 +1,9 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective using Robust.Shared.Utility; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Interactable.Tools { diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs b/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs index eb97ac142d..67b2be5047 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs @@ -1,5 +1,4 @@ -using System; -using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Maps; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs index 9360d3860f..12f7dc746d 100644 --- a/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs @@ -4,7 +4,6 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -15,7 +14,7 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools /// Tool used to weld metal together, light things on fire, or melt into constituent parts /// [RegisterComponent] - class WelderComponent : ToolComponent, EntitySystems.IUse, EntitySystems.IExamine + class WelderComponent : ToolComponent, IUse, IExamine { SpriteComponent spriteComponent; diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs index adc6bd78d9..0e879e0f54 100644 --- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs @@ -1,3 +1,6 @@ +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; using System; using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; @@ -5,7 +8,6 @@ using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; namespace Content.Server.GameObjects diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs index f9c3318077..1b53d013fb 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs @@ -1,10 +1,8 @@ -using System; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage.Fill diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs index cc1e90bf62..b3aada08a4 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs @@ -1,10 +1,8 @@ -using System; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage.Fill diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs index 74e2ca260b..656530b974 100644 --- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography.X509Certificates; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Medical; diff --git a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs b/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs index 8cf0c81255..863766c377 100644 --- a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs @@ -1,4 +1,3 @@ -using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs index 3a61c96188..8aa024c13b 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using Content.Shared.GameObjects; -using Content.Shared.GameObjects.Components.Mobs; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs index 07325f98f4..bc99b78b28 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs @@ -1,9 +1,9 @@ -using Content.Shared.GameObjects; +using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; +using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Mobs; using JetBrains.Annotations; -using ScreenEffects = Content.Shared.GameObjects.Components.Mobs.ScreenEffects; namespace Content.Server.GameObjects { @@ -46,7 +46,7 @@ namespace Content.Server.GameObjects var totaldamage = damage.CurrentDamage[DamageType.Total]; if (totaldamage > critvalue) { - throw new System.InvalidOperationException(); //these should all be below the crit value, possibly going over multiple thresholds at once? + throw new InvalidOperationException(); //these should all be below the crit value, possibly going over multiple thresholds at once? } var modifier = totaldamage / (critvalue / normalstates); //integer division floors towards zero statusEffectsComponent?.ChangeStatus(StatusEffect.Health, @@ -70,7 +70,7 @@ namespace Content.Server.GameObjects return; default: - throw new System.InvalidOperationException(); + throw new InvalidOperationException(); } } } diff --git a/Content.Server/GameObjects/Components/Mobs/FootstepSoundComponent.cs b/Content.Server/GameObjects/Components/Mobs/FootstepSoundComponent.cs index 7a6cf43fbb..09abb5ffab 100644 --- a/Content.Server/GameObjects/Components/Mobs/FootstepSoundComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/FootstepSoundComponent.cs @@ -1,12 +1,4 @@ using Robust.Shared.GameObjects; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Content.Server.Mobs; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Mobs { diff --git a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs index cf8f75401e..f290dc2985 100644 --- a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; +using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Mobs; using Robust.Server.GameObjects; using Robust.Shared.ContentPack; @@ -179,8 +180,8 @@ namespace Content.Server.GameObjects bruteDamage += 30; break; } - Owner.GetComponent().TakeDamage(Shared.GameObjects.DamageType.Brute, bruteDamage); - Owner.GetComponent().TakeDamage(Shared.GameObjects.DamageType.Heat, burnDamage); + Owner.GetComponent().TakeDamage(DamageType.Brute, bruteDamage); + Owner.GetComponent().TakeDamage(DamageType.Heat, burnDamage); } } diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs index fe812fbdb8..410789ddac 100644 --- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs @@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Nutrition; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs index 319ac35bd5..d9a1c1bbcf 100644 --- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs @@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Nutrition; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; diff --git a/Content.Server/GameObjects/Components/Power/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcComponent.cs index b3583d7472..5f99481eaf 100644 --- a/Content.Server/GameObjects/Components/Power/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcComponent.cs @@ -6,7 +6,6 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerDevice.cs b/Content.Server/GameObjects/Components/Power/PowerDevice.cs index b1b2a65983..6f12d69222 100644 --- a/Content.Server/GameObjects/Components/Power/PowerDevice.cs +++ b/Content.Server/GameObjects/Components/Power/PowerDevice.cs @@ -9,8 +9,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; -using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -21,7 +19,7 @@ namespace Content.Server.GameObjects.Components.Power /// Component that requires power to function /// [RegisterComponent] - public class PowerDeviceComponent : Component, EntitySystems.IExamine + public class PowerDeviceComponent : Component, IExamine { public override string Name => "PowerDevice"; diff --git a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs index 4bc1ad6eca..a5fdd5c3d2 100644 --- a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; +using System.Collections.Generic; using System.Linq; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; @@ -6,7 +9,6 @@ using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs b/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs index e2d686eddb..d3dea3e93a 100644 --- a/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs @@ -1,16 +1,12 @@ -using Content.Shared.GameObjects.Components.Power; +using System; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Components.Power; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; -using System; -using System.Globalization; -using Content.Server.GameObjects.EntitySystems; -using Robust.Shared.Localization; -using Robust.Shared.Maths; using Robust.Shared.ViewVariables; -using YamlDotNet.RepresentationModel; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/Powernet.cs b/Content.Server/GameObjects/Components/Power/Powernet.cs index 3ee7f3f418..b244ef732b 100644 --- a/Content.Server/GameObjects/Components/Power/Powernet.cs +++ b/Content.Server/GameObjects/Components/Power/Powernet.cs @@ -1,9 +1,9 @@ -using Content.Shared.GameObjects.EntitySystems; +using System; +using System.Collections.Generic; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; -using System; -using System.Collections.Generic; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power diff --git a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs index 7a255ee507..6236c444c7 100644 --- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs @@ -1,12 +1,10 @@ using Content.Server.GameObjects.EntitySystems; -using Content.Shared.Maps; using Robust.Server.GameObjects; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs index 726a6f17b5..380af4f594 100644 --- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems; @@ -9,9 +12,7 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Timers; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Research diff --git a/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs b/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs index d14e953120..3067f03d5f 100644 --- a/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Research { diff --git a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs index 44edca4b83..f80ab8366f 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs @@ -4,9 +4,7 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Systems; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs index f20d45ed51..e3a2d4be72 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs @@ -3,17 +3,14 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; -using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs index 905f2ef8f4..5b50e45182 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs index a196f1a331..27c3f10e2a 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs @@ -1,12 +1,9 @@ -using System.Collections; -using System.Collections.Generic; -using System.Runtime.InteropServices.WindowsRuntime; +using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs b/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs index ccdc0eaf46..4a99a71277 100644 --- a/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs @@ -1,9 +1,6 @@ using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Prototypes; namespace Content.Server.GameObjects.Components.Research { diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs index eb68beb188..381ead0d5c 100644 --- a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs @@ -1,10 +1,8 @@ -using System; -using Content.Shared.Audio; +using Content.Shared.Audio; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs index 9223f122d4..68ea4979df 100644 --- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs @@ -1,21 +1,21 @@ using System; -using Content.Server.GameObjects.EntitySystems; -using Content.Shared.GameObjects.Components.VendingMachines; -using Content.Shared.VendingMachines; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.Timers; -using Robust.Shared.Utility; using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Power; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Components.VendingMachines; +using Content.Shared.VendingMachines; using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.Timers; +using Robust.Shared.Utility; using static Content.Shared.GameObjects.Components.SharedWiresComponent; namespace Content.Server.GameObjects.Components.VendingMachines diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs index a4657564c4..125f936d8a 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs @@ -1,15 +1,15 @@ using System; -using Content.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.ViewVariables; using System.Collections.Generic; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index ff79ae70b5..a1a5d5fab6 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using Content.Server.GameObjects.Components.Sound; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; @@ -14,7 +13,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs index 9fd97d63b1..670ec9b268 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs @@ -1,11 +1,7 @@ using System; -using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Sound; -using Content.Shared.GameObjects; using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs index 3febf9da4b..e79b680082 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs @@ -1,16 +1,11 @@ -using System; -using Content.Server.GameObjects.Components.Mobs; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Sound; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/ContainerSlot.cs b/Content.Server/GameObjects/ContainerSlot.cs index 939a409a25..0270e725c6 100644 --- a/Content.Server/GameObjects/ContainerSlot.cs +++ b/Content.Server/GameObjects/ContainerSlot.cs @@ -1,8 +1,8 @@ using System; +using System.Collections.Generic; using Robust.Server.GameObjects.Components.Container; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using System.Collections.Generic; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects diff --git a/Content.Server/GameObjects/EntitySystems/ActSystem.cs b/Content.Server/GameObjects/EntitySystems/ActSystem.cs index 9826370d0f..248dcfdd70 100644 --- a/Content.Server/GameObjects/EntitySystems/ActSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ActSystem.cs @@ -3,7 +3,6 @@ using System.Linq; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Content.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 9a33f72319..7493eb7e3b 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -15,7 +15,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; -using Robust.Shared.Maths; using Robust.Shared.Players; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index f20bb0320e..022539dbfc 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -1,31 +1,29 @@ -using System; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; +using Content.Server.GameObjects.Components.Sound; using Content.Server.Interfaces.GameObjects.Components.Movement; using Content.Shared.Audio; +using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Timing; -using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input; using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.Map; +using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; +using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.Prototypes; -using Content.Server.GameObjects.Components.Sound; -using Content.Shared.GameObjects.Components.Inventory; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Log; using Robust.Shared.Random; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/PowerSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerSystem.cs index f165fa865d..4cd2e56b93 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerSystem.cs @@ -1,9 +1,9 @@ -using Content.Server.GameObjects.Components.Power; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Power; +using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using System.Collections.Generic; -using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs index 8214cb9a9f..b3a311dc56 100644 --- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Reflection; using Content.Shared.GameObjects; -using Content.Shared.GameObjects.EntitySystemMessages; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs b/Content.Server/GameTicking/GamePresets/PresetSandbox.cs index f22b58df66..f80b41ebd0 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSandbox.cs @@ -1,4 +1,3 @@ -using Content.Server.Interfaces.GameTicking; using Content.Server.Sandbox; using Robust.Shared.IoC; diff --git a/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs index 193ff683ba..4e4116c92f 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs @@ -1,7 +1,7 @@ -using Content.Server.GameObjects; +using System; +using Content.Server.GameObjects; using Content.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using System; namespace Content.Server.Interfaces.GameObjects { diff --git a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs index df102d2cdc..27a11740f7 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs @@ -1,9 +1,9 @@ using System; -using Content.Server.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using System.Collections.Generic; +using Content.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystemMessages; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; namespace Content.Server.Interfaces.GameObjects diff --git a/Content.Server/Interfaces/GameTicking/IGameTicker.cs b/Content.Server/Interfaces/GameTicking/IGameTicker.cs index cf879f7c32..894d2baebe 100644 --- a/Content.Server/Interfaces/GameTicking/IGameTicker.cs +++ b/Content.Server/Interfaces/GameTicking/IGameTicker.cs @@ -2,8 +2,6 @@ using System; using System.Collections.Generic; using Content.Server.GameTicking; using Robust.Server.Interfaces.Player; -using Robust.Server.Player; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Timing; namespace Content.Server.Interfaces.GameTicking diff --git a/Content.Server/Mobs/Commands.cs b/Content.Server/Mobs/Commands.cs index 8458d89946..88f53476d4 100644 --- a/Content.Server/Mobs/Commands.cs +++ b/Content.Server/Mobs/Commands.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Text; using Content.Server.Players; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/Mobs/Roles/Traitor.cs b/Content.Server/Mobs/Roles/Traitor.cs index 8f89530afd..16804d497f 100644 --- a/Content.Server/Mobs/Roles/Traitor.cs +++ b/Content.Server/Mobs/Roles/Traitor.cs @@ -1,5 +1,4 @@ using Content.Server.Interfaces.Chat; -using Robust.Shared.Console; using Robust.Shared.IoC; namespace Content.Server.Mobs.Roles diff --git a/Content.Server/Placement/SpawnHelpers.cs b/Content.Server/Placement/SpawnHelpers.cs index 0da9f9a700..971d3cd6c3 100644 --- a/Content.Server/Placement/SpawnHelpers.cs +++ b/Content.Server/Placement/SpawnHelpers.cs @@ -1,6 +1,5 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Players/PlayerData.cs b/Content.Server/Players/PlayerData.cs index cf052759e8..8e54cf47f3 100644 --- a/Content.Server/Players/PlayerData.cs +++ b/Content.Server/Players/PlayerData.cs @@ -1,6 +1,5 @@ using Content.Server.Mobs; using Robust.Server.Interfaces.Player; -using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs index 47d88ed1fe..de2a5f980c 100644 --- a/Content.Shared/Chat/MsgChatMessage.cs +++ b/Content.Shared/Chat/MsgChatMessage.cs @@ -1,9 +1,7 @@ -using System; using Lidgren.Network; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; -using Robust.Shared.Network.Messages; namespace Content.Shared.Chat { diff --git a/Content.Shared/Chemistry/Solution.cs b/Content.Shared/Chemistry/Solution.cs index f7530049f6..2e996d3f33 100644 --- a/Content.Shared/Chemistry/Solution.cs +++ b/Content.Shared/Chemistry/Solution.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Diagnostics.CodeAnalysis; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index 1cf9aebed3..a9df20ff2a 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -1,13 +1,12 @@ using System; -using System.Collections.Generic; -using Content.Shared.Maps; -using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Resources; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; + using System.Collections.Generic; + using Content.Shared.Maps; + using Robust.Shared.ContentPack; + using Robust.Shared.Interfaces.Map; + using Robust.Shared.IoC; + using Robust.Shared.Prototypes; -namespace Content.Shared + namespace Content.Shared { public class EntryPoint : GameShared { diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs index 4ed7e192d6..c81e2ae086 100644 --- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs @@ -1,7 +1,7 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects { diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs index 8aa2a8b4eb..29fce724b7 100644 --- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs +++ b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Inventory diff --git a/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs b/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs index 72dcad4466..42994d9193 100644 --- a/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs +++ b/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs @@ -1,6 +1,5 @@ -using Robust.Shared.GameObjects; +using System; using Robust.Shared.Serialization; -using System; namespace Content.Shared.GameObjects.Components.Items { diff --git a/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs b/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs index 2e7c720402..bbcff17cf3 100644 --- a/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs +++ b/Content.Shared/GameObjects/Components/Items/ItemComponentState.cs @@ -1,6 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; namespace Content.Shared.GameObjects.Components.Items { diff --git a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs index 045bd14872..16d77b04d1 100644 --- a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs +++ b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs @@ -1,7 +1,7 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects { diff --git a/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs b/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs index 63e07d9b16..bfe966bd83 100644 --- a/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs +++ b/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs @@ -44,12 +44,10 @@ namespace Content.Shared.GameObjects.Components.Materials if (serializer.TryReadDataField("materials", out List list)) { var protoMan = IoCManager.Resolve(); - int index = 0; foreach (var entry in list) { var proto = protoMan.Index(entry.Value); _materialTypes[entry.Key] = proto.Material; - index++; } } diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedStomachComponent.cs b/Content.Shared/GameObjects/Components/Nutrition/SharedStomachComponent.cs index 4f75f304ae..1333b58744 100644 --- a/Content.Shared/GameObjects/Components/Nutrition/SharedStomachComponent.cs +++ b/Content.Shared/GameObjects/Components/Nutrition/SharedStomachComponent.cs @@ -1,6 +1,4 @@ -using System; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Nutrition { diff --git a/Content.Shared/GameObjects/Components/Power/PowerShared.cs b/Content.Shared/GameObjects/Components/Power/PowerShared.cs index 0d27387467..3ba49bdb58 100644 --- a/Content.Shared/GameObjects/Components/Power/PowerShared.cs +++ b/Content.Shared/GameObjects/Components/Power/PowerShared.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power diff --git a/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs index f19cb432ee..4dd4e5358b 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs @@ -1,9 +1,5 @@ -using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power { diff --git a/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs index fd35b3cffc..dabae088fb 100644 --- a/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs +++ b/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs @@ -1,15 +1,14 @@ +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; using System; using System.Collections.Generic; -using Content.Shared.Materials; using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; namespace Content.Shared.GameObjects.Components.Research { diff --git a/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs index 67e5f56701..3c1e87a0dc 100644 --- a/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs +++ b/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs index 59265a7c75..52fe45880e 100644 --- a/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs +++ b/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs @@ -3,9 +3,7 @@ using System.Collections; using System.Collections.Generic; using Content.Shared.Research; using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs b/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs index 22d33ebb72..e9e3904641 100644 --- a/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs +++ b/Content.Shared/GameObjects/Components/Sound/SharedSoundComponent.cs @@ -1,15 +1,8 @@ using System; -using System.Collections.Generic; -using System.IO; -using Content.Shared.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Serialization; -using Robust.Shared.Timers; namespace Content.Shared.GameObjects.Components.Sound { diff --git a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs index db850840a1..ae68d21a2f 100644 --- a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs +++ b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs @@ -1,7 +1,7 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Storage { diff --git a/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs index 9ddbfa4b49..5e7b2da2b4 100644 --- a/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs +++ b/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs @@ -1,11 +1,8 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; -using System.Collections.Specialized; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.VendingMachines { diff --git a/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs index 9f250b4b24..989defae06 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs index a1f683828e..dcf8d182b8 100644 --- a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs +++ b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Shared/GameObjects/Verbs/Verb.cs b/Content.Shared/GameObjects/Verbs/Verb.cs index d4f88ef12b..b5e213541c 100644 --- a/Content.Shared/GameObjects/Verbs/Verb.cs +++ b/Content.Shared/GameObjects/Verbs/Verb.cs @@ -1,9 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Reflection; +// Only unused on .NET Core due to KeyValuePair.Deconstruct +// ReSharper disable once RedundantUsingDirective +using Robust.Shared.Utility; +using System; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Utility; namespace Content.Shared.GameObjects { diff --git a/Content.Shared/GameObjects/Verbs/VerbUtility.cs b/Content.Shared/GameObjects/Verbs/VerbUtility.cs index aa76c66f77..f4be715169 100644 --- a/Content.Shared/GameObjects/Verbs/VerbUtility.cs +++ b/Content.Shared/GameObjects/Verbs/VerbUtility.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; diff --git a/Content.Shared/Research/LatheRecipePrototype.cs b/Content.Shared/Research/LatheRecipePrototype.cs index 8ae61746e0..4cda6fbd47 100644 --- a/Content.Shared/Research/LatheRecipePrototype.cs +++ b/Content.Shared/Research/LatheRecipePrototype.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Content.Shared.GameObjects.Components.Research; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Shared/SharedGameTicker.cs b/Content.Shared/SharedGameTicker.cs index 0838142fc3..4aca7e12b9 100644 --- a/Content.Shared/SharedGameTicker.cs +++ b/Content.Shared/SharedGameTicker.cs @@ -1,10 +1,6 @@ using System; -using System.IO; using Lidgren.Network; using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Network; namespace Content.Shared diff --git a/Content.Shared/SharedNotifyManager.cs b/Content.Shared/SharedNotifyManager.cs index a928c79aa5..5e4a98786f 100644 --- a/Content.Shared/SharedNotifyManager.cs +++ b/Content.Shared/SharedNotifyManager.cs @@ -4,7 +4,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Map; using Robust.Shared.Network; -using Robust.Shared.Network.Messages; namespace Content.Shared { diff --git a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs index 511615337c..4b3f7063f4 100644 --- a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs +++ b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs @@ -1,10 +1,7 @@ -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; namespace Content.Shared.VendingMachines diff --git a/Content.Tests/Shared/Utility/ContentHelpers_Test.cs b/Content.Tests/Shared/Utility/ContentHelpers_Test.cs index 961accd5b6..cf75f026df 100644 --- a/Content.Tests/Shared/Utility/ContentHelpers_Test.cs +++ b/Content.Tests/Shared/Utility/ContentHelpers_Test.cs @@ -1,10 +1,6 @@ -using Content.Shared.Utility; +using System.Collections.Generic; +using Content.Shared.Utility; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Tests.Shared.Utility { diff --git a/SS14.Launcher/Program.cs b/SS14.Launcher/Program.cs index 682bae4609..92daa67dc1 100644 --- a/SS14.Launcher/Program.cs +++ b/SS14.Launcher/Program.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; +using System.Net; using System.Net.Http; using System.Runtime.InteropServices; using System.Threading.Tasks; @@ -47,7 +48,7 @@ namespace SS14.Launcher [Dependency] private readonly IGameController _gameController; #pragma warning restore 649 - public static void Main(string[] args) + public static void Main() { FixTlsVersions(); @@ -316,7 +317,7 @@ namespace SS14.Launcher // I assume .NET Core does not have this issue being disconnected from the OS and all that. if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - System.Net.ServicePointManager.SecurityProtocol |= System.Net.SecurityProtocolType.Tls12; + ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12; } } @@ -326,7 +327,6 @@ namespace SS14.Launcher [Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly ILocalizationManager _loc; [Dependency] private readonly IUriOpener _uriOpener; - private bool _progressBarVisible; #pragma warning restore 649 public Control RootControl { get; } @@ -336,10 +336,8 @@ namespace SS14.Launcher public bool ProgressBarVisible { - get => _progressBarVisible; set { - _progressBarVisible = value; ProgressBar.Visible = value; StatusLabel.SizeFlagsHorizontal = value ? SizeFlags.Fill : SizeFlags.FillExpand; }