Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix namespaces and optimize imports (#1651)

Browse Source 
* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes
This commit is contained in:
DrSmugleaf
2020-08-13 14:40:27 +02:00
committed by GitHub
parent 05a76d55f7
commit 4a8ed41e3a
500 changed files with 1044 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs
View File

@@ -1,14 +1,9 @@
using Content.Shared.Prototypes.Cargo;
using System;
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.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Content.Shared.GameObjects.Components.Cargo
{

6
Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs
View File

@@ -1,8 +1,8 @@
using Content.Shared.Prototypes.Cargo;
using System;
using System.Collections.Generic;
using Content.Shared.Prototypes.Cargo;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using System;
using System.Collections.Generic;
namespace Content.Shared.GameObjects.Components.Cargo
{

8
Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs
View File

@@ -1,11 +1,11 @@
using Content.Shared.Prototypes.Cargo;
using System;
using System.Collections;
using System.Collections.Generic;
using Content.Shared.Prototypes.Cargo;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using System;
using System.Collections;
using System.Collections.Generic;
namespace Content.Shared.GameObjects.Components.Cargo
{

2
Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs
View File

@@ -6,7 +6,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Chemistry
namespace Content.Shared.GameObjects.Components.Chemistry.ChemMaster
{
/// <summary>

2
Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs
View File

@@ -4,7 +4,7 @@ using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using YamlDotNet.RepresentationModel;
namespace Content.Shared.GameObjects.Components.Chemistry
namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
{
/// <summary>
/// Is simply a list of reagents defined in yaml. This can then be set as a

2
Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs
View File

@@ -5,7 +5,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Chemistry
namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
{
/// <summary>

6
Content.Shared/GameObjects/Components/Chemistry/SharedSolutionComponent.cs
View File

@@ -1,12 +1,6 @@
using System;
using System.Collections.Generic;
using Content.Shared.Chemistry;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Shared.GameObjects.Components.Chemistry
{

2
Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Components.Damage
{
public abstract class SharedDamageableComponent : Component
{

1
Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs
View File

@@ -1,5 +1,4 @@
using System;
using Content.Shared.BodySystem;
using Robust.Shared.Audio.Midi;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;

4
Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
View File

@@ -2,7 +2,7 @@
using JetBrains.Annotations;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Components.Inventory
{
public abstract class Inventory
{
@@ -47,7 +47,7 @@ namespace Content.Shared.GameObjects
public override IReadOnlyList<Slots> SlotMasks { get; } = new List<Slots>()
{
Slots.EYES, Slots.HEAD, Slots.EARS,
Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING,
Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING,
Slots.BACKPACK, Slots.BELT, Slots.GLOVES,
Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2,
Slots.NECK

2
Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
View File

@@ -8,7 +8,7 @@ using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Components.Inventory
{
public abstract class SharedInventoryComponent : Component
{

7
Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs
View File

@@ -1,19 +1,12 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.Serialization;
using System.Threading;
using System.Timers;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using YamlDotNet.RepresentationModel;
using Component = Robust.Shared.GameObjects.Component;
namespace Content.Shared.GameObjects.Components.Mobs
{

3
Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Physics;

3
Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs
View File

@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.PDA

4
Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs
View File

@@ -1,6 +1,4 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.GameObjects;
namespace Content.Shared.GameObjects.Components.Pointing
{

1
Content.Shared/GameObjects/Components/Power/SharedApc.cs
View File

@@ -1,5 +1,4 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;

2
Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs
View File

@@ -1,8 +1,8 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Power
{

2
Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs
View File

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Serialization;

6
Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs
View File

@@ -1,10 +1,8 @@
using Robust.Shared.GameObjects;
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Localization;
using Robust.Shared.Serialization;
using System;
using System.Collections.Generic;
using System.Text;
namespace Content.Shared.GameObjects.Components
{

1
Content.Shared/GameObjects/Components/SharedPaperComponent.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Net.Mime;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.Serialization;

2
Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs
View File

@@ -1,7 +1,7 @@
using System;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Triggers
namespace Content.Shared.GameObjects.Components.Trigger
{
[NetSerializable]
[Serializable]

1
Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs
View File

@@ -1,6 +1,5 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Weapons.Ranged
{

2
Content.Shared/GameObjects/DrawDepth.cs
View File

@@ -1,5 +1,5 @@
using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
using Robust.Shared.Serialization;
using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
namespace Content.Shared.GameObjects
{

2
Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
View File

@@ -1,5 +1,5 @@
using System;
using System.Collections.Generic;
using Content.Shared.GameObjects.Verbs;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;

2
Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Shared.GameObjects.EntitySystems
return false;
}
return EntitySystem.Get<SharedInteractionSystem>()
return Get<SharedInteractionSystem>()
.InRangeUnobstructed(examiner.Transform.MapPosition, examined.Transform.MapPosition,
ExamineRange, predicate: entity => entity == examiner || entity == examined, ignoreInsideBlocker:true);
}

5
Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
View File

@@ -1,12 +1,7 @@
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.Interfaces;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Random;
using Logger = Robust.Shared.Log.Logger;
namespace Content.Shared.GameObjects.EntitySystems
{

1
Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs
View File

@@ -1,6 +1,5 @@
using System;
using Content.Shared.Construction;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.IoC;

1
Content.Shared/GameObjects/EntitySystems/SharedGasTileOverlaySystem.cs
View File

@@ -2,7 +2,6 @@
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.EntitySystems

2
Content.Shared/GameObjects/Verbs/GlobalVerb.cs
View File

@@ -2,7 +2,7 @@
using JetBrains.Annotations;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
/// <summary>
/// A verb is an action in the right click menu of an entity.

4
Content.Shared/GameObjects/Verbs/Verb.cs
View File

@@ -2,7 +2,7 @@
using JetBrains.Annotations;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
/// <summary>
/// A verb is an action in the right click menu of an entity.
@@ -48,7 +48,7 @@ namespace Content.Shared.GameObjects
/// <inheritdoc />
/// <summary>
/// Sub class of <see cref="T:Content.Shared.GameObjects.Verb" /> that works on a specific type of component,
/// Sub class of <see cref="T:Content.Shared.GameObjects.Verbs.Verb" /> that works on a specific type of component,
/// to reduce casting boiler plate for implementations.
/// </summary>
/// <typeparam name="T">The type of component that this verb will run on.</typeparam>

2
Content.Shared/GameObjects/Verbs/VerbCategories.cs
View File

@@ -1,4 +1,4 @@
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
/// <summary>
/// Standard verb categories.

2
Content.Shared/GameObjects/Verbs/VerbCategoryData.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.Utility;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
/// <summary>
/// Contains combined name and icon information for a verb category.

2
Content.Shared/GameObjects/Verbs/VerbData.cs
View File

@@ -2,7 +2,7 @@ using JetBrains.Annotations;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Utility;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
/// <summary>
/// Stores visual data for a verb.

2
Content.Shared/GameObjects/Verbs/VerbUtility.cs
View File

@@ -4,7 +4,7 @@ using System.Reflection;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Utility;
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
public static class VerbUtility
{

2
Content.Shared/GameObjects/Verbs/VerbVisibility.cs
View File

@@ -1,4 +1,4 @@
namespace Content.Shared.GameObjects
namespace Content.Shared.GameObjects.Verbs
{
/// <summary>
/// Possible states of visibility for the verb in the right click menu.