From 2183cd7ca1b2dde947cff1aeb6b493cb30c828aa Mon Sep 17 00:00:00 2001 From: Acruid Date: Wed, 10 Feb 2021 23:27:19 -0800 Subject: [PATCH] Massive Namespace Cleanup (#1544) * Removed the Interfaces folder. * All objects inside the GameObjects subfolders are now in the GameObjects namespace. * Added a Resharper DotSettings file to mark the GameObjects subfolders as not providing namespaces. * Simplified Robust.client.Graphics namespace. * Automated remove redundant using statements. --- Robust.Client/Animations/Animation.cs | 2 +- .../AnimationTrackComponentProperty.cs | 2 +- .../AnimationTrackControlProperty.cs | 3 +- .../Animations/AnimationTrackPlaySound.cs | 7 +- .../Animations/AnimationTrackSpriteFlick.cs | 4 +- Robust.Client/Audio/AudioStream.cs | 1 - Robust.Client/Audio/Midi/MidiManager.cs | 11 +-- Robust.Client/Audio/Midi/MidiRenderer.cs | 6 +- Robust.Client/BaseClient.cs | 14 ++- Robust.Client/ClientIoC.cs | 26 +---- .../Console/Commands/AddCompCommand.cs | 2 - .../Console/Commands/ClientSpawnCommand.cs | 2 +- .../Console/Commands/ConfigurationCommands.cs | 2 - .../Console/Commands/ConsoleCommands.cs | 4 - Robust.Client/Console/Commands/Debug.cs | 22 +---- .../Commands/DumpMetadataMembersCommand.cs | 1 - .../Console/Commands/HelpCommands.cs | 3 +- .../Console/Commands/ListAssembliesCommand.cs | 1 - Robust.Client/Console/Commands/LogCommands.cs | 1 - Robust.Client/Console/Commands/Scripting.cs | 1 - .../Console/Commands/SendGarbageCommand.cs | 1 - .../Commands/SetInputContextCommand.cs | 2 +- .../Console/IClientConGroupController.cs | 4 +- Robust.Client/Console/ScriptClient.cs | 2 +- Robust.Client/Console/ScriptConsoleClient.cs | 2 +- Robust.Client/Console/WatchWindow.cs | 2 +- Robust.Client/Credits/CreditsManager.cs | 2 +- Robust.Client/Debugging/DebugDrawing.cs | 13 +-- .../Debugging/DebugDrawingManager.cs | 10 +- .../Debugging/IDebugDrawing.cs | 2 +- .../Debugging/IDebugDrawingManager.cs | 7 +- Robust.Client/GameController.cs | 29 +++--- .../GameController/GameController.Input.cs | 2 +- .../GameController/GameController.IoC.cs | 60 +----------- .../GameController/GameController.Loader.cs | 4 +- .../GameController.Standalone.cs | 4 +- .../GameObjects/!NO_FOLDER_NAMESPACES | 3 + .../GameObjects/ClientComponentFactory.cs | 16 +--- .../GameObjects/ClientEntityManager.cs | 5 - .../GameObjects/ClientEntityNetworkManager.cs | 8 +- .../Animations/AnimationPlayerComponent.cs | 2 +- .../Appearance/AppearanceComponent.cs | 6 +- ...ntainerManagerComponent.ClientContainer.cs | 5 +- .../Containers/ContainerManagerComponent.cs | 6 +- .../Components/Eye/EyeComponent.cs | 5 +- .../Components/Icon/IconComponent.cs | 2 +- .../Components/IgnorePauseComponent.cs | 3 +- .../Components/Input/InputComponent.cs | 5 +- .../Light/ClientOccluderComponent.cs | 2 - .../Components/Light/PointLightComponent.cs | 5 +- .../Renderable}/IRenderableComponent.cs | 3 +- .../Renderable}/ISpriteComponent.cs | 33 +------ .../Components/Renderable/ISpriteLayer.cs | 30 ++++++ .../Components/Renderable/SpriteComponent.cs | 51 +++++----- .../ClientUserInterfaceComponent.cs | 8 +- Robust.Client/GameObjects/EntityManagerExt.cs | 3 +- .../EntitySystems/AnimationPlayerSystem.cs | 5 +- .../EntitySystems/AppearanceSystem.cs | 4 +- .../EntitySystems/AppearanceTestSystem.cs | 4 +- .../GameObjects/EntitySystems/AudioSystem.cs | 11 +-- .../EntitySystems/ClientOccluderSystem.cs | 6 +- .../EntitySystems/ContainerSystem.cs | 5 +- .../GameObjects/EntitySystems/EffectSystem.cs | 12 +-- .../EntitySystems/EyeUpdateSystem.cs | 6 +- .../GameObjects/EntitySystems/InputSystem.cs | 10 +- .../GameObjects/EntitySystems/MidiSystem.cs | 4 +- .../EntitySystems/RenderingTreeSystem.cs | 7 +- .../GameObjects/EntitySystems/SpriteSystem.cs | 6 +- .../EntitySystems/TransformSystem.cs | 8 +- .../GameObjects/IClientEntityManager.cs | 7 +- .../GameStates/ClientGameStateManager.cs | 14 +-- .../GameStates/GameStateProcessor.cs | 1 - .../GameStates/IClientGameStateManager.cs | 3 +- Robust.Client/GameStates/NetEntityOverlay.cs | 12 +-- Robust.Client/GameStates/NetGraphOverlay.cs | 8 +- Robust.Client/GameStates/NetInterpOverlay.cs | 11 +-- Robust.Client/Graphics/ClientEye/Eye.cs | 5 +- .../Graphics/ClientEye/EyeManager.cs | 6 +- Robust.Client/Graphics/ClientEye/FixedEye.cs | 2 +- .../Graphics/ClientEye/IEye.cs | 2 +- .../Graphics/ClientEye/IEyeManager.cs | 2 +- .../Graphics/Clyde/Audio/Clyde.Audio.cs | 1 - .../Graphics/Clyde/Clyde.Constants.cs | 3 - Robust.Client/Graphics/Clyde/Clyde.Cursor.cs | 1 - Robust.Client/Graphics/Clyde/Clyde.Debug.cs | 2 - .../Graphics/Clyde/Clyde.GridRendering.cs | 3 +- Robust.Client/Graphics/Clyde/Clyde.HLR.cs | 6 -- .../Graphics/Clyde/Clyde.LightRendering.cs | 5 - .../Graphics/Clyde/Clyde.RenderHandle.cs | 6 +- .../Graphics/Clyde/Clyde.RenderTargets.cs | 3 +- .../Graphics/Clyde/Clyde.Rendering.cs | 29 +++--- Robust.Client/Graphics/Clyde/Clyde.Shaders.cs | 7 +- .../Graphics/Clyde/Clyde.Textures.cs | 1 - .../Graphics/Clyde/Clyde.Viewport.cs | 3 - .../Graphics/Clyde/Clyde.Windowing.cs | 3 +- Robust.Client/Graphics/Clyde/Clyde.cs | 17 +--- Robust.Client/Graphics/Clyde/ClydeHeadless.cs | 3 - .../Clyde/GLObjects/Clyde.ShaderProgram.cs | 2 +- .../Clyde/GLObjects/Clyde.UniformBuffer.cs | 3 - Robust.Client/Graphics/ClydeBase.cs | 4 +- .../Graphics/ClydeDebugLayers.cs | 2 +- .../Graphics/ClydeStockTexture.cs | 2 +- .../Graphics/Drawing/DrawPrimitiveTopology.cs | 2 +- .../Graphics/Drawing/DrawingHandleBase.cs | 3 +- .../Graphics/Drawing/DrawingHandleScreen.cs | 2 +- .../Graphics/Drawing/DrawingHandleWorld.cs | 3 +- Robust.Client/Graphics/Drawing/StyleBox.cs | 2 +- .../Graphics/Drawing/StyleBoxEmpty.cs | 2 +- .../Graphics/Drawing/StyleBoxFlat.cs | 2 +- .../Graphics/Drawing/StyleBoxTexture.cs | 2 +- Robust.Client/Graphics/Font.cs | 3 - Robust.Client/Graphics/FontManager.cs | 3 +- .../{Interfaces => }/Graphics/IClyde.cs | 5 +- .../{Interfaces => }/Graphics/IClydeAudio.cs | 2 +- .../Graphics/IClydeAudioSource.cs | 2 +- .../Graphics/IClydeBufferedAudioSource.cs | 2 +- .../Graphics/IClydeDebugInfo.cs | 2 +- .../Graphics/IClydeDebugStats.cs | 4 +- .../Graphics/IClydeInternal.cs | 7 +- .../Graphics/IClydeViewport.cs | 3 +- .../{Interfaces => }/Graphics/ICursor.cs | 2 +- .../Graphics/IDirectionalTextureProvider.cs | 5 - .../{Interfaces => }/Graphics/IFontManager.cs | 3 +- .../Graphics/IRenderHandle.cs | 5 +- .../Graphics/IRenderTarget.cs | 2 +- .../Graphics/IRenderTexture.cs | 4 +- .../Graphics/IRenderWindow.cs | 2 +- .../Graphics/Lighting/ILightManager.cs | 2 +- .../Graphics/Lighting/LightManager.cs | 5 +- .../Graphics/OpenGLVersion.cs | 2 +- .../Graphics/Overlays/IOverlayManager.cs | 3 +- Robust.Client/Graphics/Overlays/Overlay.cs | 11 +-- .../Graphics/Overlays/OverlayManager.cs | 9 +- Robust.Client/Graphics/RSI/RSI.cs | 2 - .../Graphics/RenderTargetColorFormat.cs | 2 +- .../RenderTargetCreationParameters.cs | 2 +- .../Graphics/ScreenshotType.cs | 2 +- Robust.Client/Graphics/Shaders/Params.cs | 2 +- .../Graphics/Shaders/ParsedShader.cs | 2 +- .../Graphics/Shaders/ShaderInstance.cs | 2 +- .../Shaders/ShaderParser.Tokenizer.cs | 2 +- .../Graphics/Shaders/ShaderParser.cs | 4 +- .../Graphics/Shaders/ShaderPrototype.cs | 11 +-- .../Graphics/Shaders/StencilEnums.cs | 2 +- .../Graphics/StandardCursorShape.cs | 2 +- Robust.Client/Graphics/Texture.cs | 5 +- .../Graphics/WindowResizedEventArgs.cs | 2 +- Robust.Client/{Interfaces => }/IBaseClient.cs | 2 +- Robust.Client/IGameController.cs | 9 ++ Robust.Client/IGameControllerInternal.cs | 21 +++++ Robust.Client/InitialLaunchState.cs | 20 ++++ Robust.Client/Input/ClydeInputManager.cs | 2 +- Robust.Client/Input/Events.cs | 4 - .../{Interfaces => }/Input/IInputManager.cs | 7 +- .../{Interfaces => }/Input/IKeyBinding.cs | 3 +- Robust.Client/Input/InputManager.cs | 7 +- .../Input/KeyBindingRegistration.cs | 4 +- Robust.Client/Input/KeyEventAction.cs | 4 + Robust.Client/Interfaces/IGameController.cs | 45 --------- .../Interfaces/State/IStateManager.cs | 29 ------ Robust.Client/Log/DebugConsoleLogHandler.cs | 1 - .../Map/ClydeTileDefinitionManager.cs | 4 +- .../Map/IClydeTileDefinitionManager.cs | 3 +- Robust.Client/Physics/PhysicsSystem.cs | 4 +- .../Placement/IPlacementManager.cs | 6 +- Robust.Client/Placement/Modes/AlignSimilar.cs | 5 +- .../Placement/Modes/AlignSnapgridBorder.cs | 6 +- .../Placement/Modes/AlignSnapgridCenter.cs | 2 +- Robust.Client/Placement/Modes/AlignTileAny.cs | 2 - .../Placement/Modes/AlignTileDense.cs | 4 +- .../Placement/Modes/AlignTileEmpty.cs | 6 +- Robust.Client/Placement/Modes/PlaceNearby.cs | 4 +- Robust.Client/Placement/PlacementHijack.cs | 2 +- Robust.Client/Placement/PlacementManager.cs | 19 +--- Robust.Client/Placement/PlacementMode.cs | 4 - Robust.Client/Placement/PlacementOverlay.cs | 3 +- Robust.Client/Player/IPlayerManager.cs | 2 - Robust.Client/Player/LocalPlayer.cs | 5 +- Robust.Client/Player/PlayerManager.cs | 4 - Robust.Client/Player/PlayerSession.cs | 5 +- .../ResourceManagement/BaseResource.cs | 1 - .../ResourceManagement/IResourceCache.cs | 16 +--- .../IResourceCacheInternal.cs | 14 +++ .../ResourceManagement/ResourceCache.cs | 3 +- .../ResourceTypes/AudioResource.cs | 3 +- .../ResourceTypes/FontResource.cs | 2 - .../ResourceTypes/RSIResource.cs | 1 - .../ResourceTypes/ShaderSourceResource.cs | 3 - .../ResourceTypes/TextureResource.cs | 5 +- .../Robust.Client.csproj.DotSettings | 22 +++++ Robust.Client/State/IStateManager.cs | 17 ++++ Robust.Client/State/StateChangedEventArgs.cs | 16 ++++ Robust.Client/State/StateManager.cs | 3 +- .../UserInterface/Control.Animations.cs | 1 - Robust.Client/UserInterface/Control.Cursor.cs | 2 +- .../UserInterface/Control.Properties.cs | 1 - .../UserInterface/Control.Styling.cs | 1 - Robust.Client/UserInterface/Control.cs | 4 +- .../UserInterface/Controls/Container.cs | 5 +- .../UserInterface/Controls/ContainerButton.cs | 2 +- .../UserInterface/Controls/FloatSpinBox.cs | 1 - .../UserInterface/Controls/HistoryLineEdit.cs | 5 +- .../UserInterface/Controls/ItemList.cs | 5 - Robust.Client/UserInterface/Controls/Label.cs | 1 - .../Controls/LayeredTextureRect.cs | 2 - .../UserInterface/Controls/LineEdit.cs | 2 - .../UserInterface/Controls/OutputPanel.cs | 2 - .../UserInterface/Controls/PanelContainer.cs | 2 +- .../UserInterface/Controls/ProgressBar.cs | 2 +- .../UserInterface/Controls/RadioOptions.cs | 5 +- .../UserInterface/Controls/RichTextLabel.cs | 1 - .../UserInterface/Controls/ScrollBar.cs | 3 +- .../UserInterface/Controls/Slider.cs | 2 +- .../UserInterface/Controls/SpinBox.cs | 1 - .../UserInterface/Controls/SplitContainer.cs | 4 +- .../UserInterface/Controls/SpriteView.cs | 4 +- .../UserInterface/Controls/TabContainer.cs | 2 - .../UserInterface/Controls/TextureButton.cs | 1 - .../UserInterface/Controls/TextureRect.cs | 2 - Robust.Client/UserInterface/Controls/Tree.cs | 1 - .../CustomControls/DebugClydePanel.cs | 3 +- .../CustomControls/DebugConsole.cs | 4 +- .../CustomControls/DebugCoordsPanel.cs | 9 +- .../CustomControls/DebugInputPanel.cs | 4 +- .../CustomControls/DebugMemoryPanel.cs | 2 +- .../CustomControls/DebugMonitors.cs | 16 ++-- .../CustomControls/DebugNetBandwidthPanel.cs | 5 +- .../CustomControls/DebugNetPanel.cs | 8 +- .../CustomControls/DebugTimePanel.cs | 5 +- .../CustomControls/EntitySpawnWindow.cs | 4 - .../CustomControls/FpsCounter.cs | 1 - .../CustomControls/FrameGraph.cs | 3 +- .../CustomControls/SS14Window.xaml.cs | 12 +-- .../CustomControls/ScriptConsole.cs | 2 +- .../CustomControls/TileSpawnWindow.cs | 10 +- .../UserInterface/DummyFileDialogManager.cs | 1 - .../UserInterface/FileDialogFilters.cs | 32 +++++++ .../UserInterface/FileDialogManager.cs | 3 +- .../UserInterface/IClipboardManager.cs | 2 +- .../UserInterface/IDebugMonitors.cs | 2 +- .../UserInterface/IFileDialogManager.cs | 33 +------ .../UserInterface/IUserInterfaceManager.cs | 65 +------------ .../IUserInterfaceManagerInternal.cs | 63 +++++++++++++ Robust.Client/UserInterface/RichTextEntry.cs | 1 - Robust.Client/UserInterface/UITheme.cs | 1 - Robust.Client/UserInterface/UiCommands.cs | 10 +- .../UserInterface/UserInterfaceManager.cs | 15 +-- Robust.Client/Utility/DiscordRichPresence.cs | 6 +- .../Utility/IDiscordRichPresence.cs | 2 +- .../{Interfaces => }/Utility/IRand.cs | 2 +- Robust.Client/Utility/SpriteSpecifierExt.cs | 2 - .../Editors/VVPropEditorColor.cs | 1 - .../Editors/VVPropEditorEntityCoordinates.cs | 2 - .../Editors/VVPropEditorEntityUid.cs | 3 +- .../ViewVariables/Editors/VVPropEditorEnum.cs | 5 - .../Editors/VVPropEditorISelfSerialzable.cs | 2 +- .../Editors/VVPropEditorVector2.cs | 1 - .../ViewVariables/IViewVariablesManager.cs | 1 - .../Instances/ViewVariablesInstanceEntity.cs | 7 +- .../Instances/ViewVariablesInstanceObject.cs | 3 +- .../Traits/ViewVariablesTraitMembers.cs | 5 +- Robust.Client/ViewVariables/VVPropEditor.cs | 2 - .../ViewVariables/ViewVariablesCommand.cs | 5 +- .../ViewVariables/ViewVariablesInstance.cs | 4 +- .../ViewVariables/ViewVariablesManager.cs | 6 +- .../ViewVariablesPropertyControl.cs | 5 +- Robust.Server/AI/AiLogicProcessor.cs | 2 +- Robust.Server/BaseServer.cs | 26 ++--- .../Console/Commands/AddCompCommand.cs | 2 - Robust.Server/Console/Commands/CVarCommand.cs | 2 - .../Console/Commands/DeleteCommand.cs | 3 +- .../Console/Commands/ListAssembliesCommand.cs | 1 - .../Console/Commands/ListCommands.cs | 1 - Robust.Server/Console/Commands/LogCommands.cs | 1 - Robust.Server/Console/Commands/MapCommands.cs | 8 +- .../Console/Commands/PlayerCommands.cs | 5 +- .../Console/Commands/SpawnCommand.cs | 5 +- Robust.Server/Console/Commands/SysCommands.cs | 7 +- Robust.Server/Console/ConGroupController.cs | 2 +- .../IConGroupControllerImplementation.cs | 2 +- Robust.Server/Console/ServerConsoleHost.cs | 5 +- Robust.Server/Console/SystemConsoleManager.cs | 1 - Robust.Server/DataMetrics/MetricsManager.cs | 4 +- .../Debugging/DebugDrawingManager.cs | 7 +- .../Debugging/IDebugDrawingManager.cs | 2 +- .../GameObjects/!NO_FOLDER_NAMESPACES | 3 + .../Components/Actor/BasicActorComponent.cs | 7 +- .../Components/Actor/IActorComponent.cs | 10 ++ .../Appearance/AppearanceComponent.cs | 1 - .../Components/Container/Container.cs | 8 +- .../Container/ContainerManagerComponent.cs | 10 +- .../Components/Eye/EyeComponent.cs | 6 +- .../Components}/IMapInit.cs | 6 +- .../Components/IgnorePauseComponent.cs | 5 +- .../Renderable}/IRenderableComponent.cs | 4 +- .../Renderable}/ISpriteRenderableComponent.cs | 2 +- .../Components/Renderable/SpriteComponent.cs | 4 +- .../ServerUserInterfaceComponent.cs | 10 +- .../Components/VisibilityComponent.cs | 2 +- .../EntRemovedFromContainerMessage.cs | 4 +- .../EntityDeletedMessage.cs | 5 +- .../EntitySystemMessages/EntityTileMessage.cs | 4 +- .../GameObjects/EntitySystems/AudioSystem.cs | 8 +- .../EntitySystems/ContainerSystem.cs | 6 +- .../GameObjects/EntitySystems/EffectSystem.cs | 13 ++- .../GameObjects/EntitySystems/InputSystem.cs | 5 +- .../EntitySystems/PhysicsSystem.cs | 8 +- .../EntitySystems/ServerOccluderSystem.cs | 6 +- .../TileLookup/GridTileLookupChunk.cs | 4 +- .../TileLookup/GridTileLookupNode.cs | 7 +- .../TileLookup/GridTileLookupSystem.cs | 10 +- .../EntitySystems/UserInterfaceSystem.cs | 7 +- .../GameObjects/IServerEntityManager.cs | 10 +- .../IServerEntityManagerInternal.cs | 7 +- .../IServerEntityNetworkManager.cs | 4 +- .../GameObjects/ServerComponentFactory.cs | 15 +-- .../GameObjects/ServerEntityManager.cs | 15 +-- .../GameObjects/ServerEntityNetworkManager.cs | 11 +-- .../IServerGameStateManager.cs | 2 +- .../GameStates/ServerGameStateManager.cs | 18 +--- Robust.Server/{Interfaces => }/IBaseServer.cs | 5 +- .../Interfaces/GameObjects/IActorComponent.cs | 10 -- .../Interfaces/ServerStatus/IStatusHost.cs | 62 ------------ Robust.Server/Log/LokiLogHandler.cs | 1 - .../{Interfaces => }/Maps/IMapLoader.cs | 3 +- Robust.Server/Maps/MapLoader.cs | 10 +- Robust.Server/Maps/YamlGridSerializer.cs | 4 +- .../Placement/IPlacementManager.cs | 4 +- Robust.Server/Placement/PlacementManager.cs | 9 +- .../{Interfaces => }/Player/IPlayerData.cs | 10 +- .../{Interfaces => }/Player/IPlayerInput.cs | 2 +- .../{Interfaces => }/Player/IPlayerManager.cs | 5 +- .../{Interfaces => }/Player/IPlayerSession.cs | 5 +- Robust.Server/Player/PlayerData.cs | 3 +- Robust.Server/Player/PlayerHelpers.cs | 5 +- Robust.Server/Player/PlayerManager.cs | 9 +- Robust.Server/Player/PlayerSession.cs | 5 +- Robust.Server/Program.cs | 8 +- .../Reflection/ServerReflectionManager.cs | 3 +- .../Robust.Server.csproj.DotSettings | 12 +++ Robust.Server/Scripting/ScriptHost.cs | 6 +- Robust.Server/ServerIoC.cs | 15 +-- .../ServerStatus/IStatusHandlerContext.cs | 35 +++++++ Robust.Server/ServerStatus/IStatusHost.cs | 28 ++++++ .../ServerStatus/StatusHost.Handlers.cs | 1 - Robust.Server/ServerStatus/StatusHost.cs | 7 +- .../ServerStatus/StatusHostHandler.cs | 5 + Robust.Server/ServerStatus/WatchdogApi.cs | 7 +- .../{Interfaces => }/Timing/IPauseManager.cs | 18 +--- Robust.Server/Timing/PauseManager.cs | 7 +- Robust.Server/Timing/PauseManagerExt.cs | 16 ++++ .../ViewVariables/IViewVariablesSession.cs | 2 +- .../Traits/ViewVariablesTraitEntity.cs | 2 +- .../ViewVariables/ViewVariablesHost.cs | 10 +- .../ViewVariables/ViewVariablesesSession.cs | 3 +- .../ScriptGlobalsShared.cs | 2 - .../ScriptInstanceShared.cs | 2 +- .../Asynchronous/RobustTaskScheduler.cs | 1 - Robust.Shared/Audio/AudioParams.cs | 1 - Robust.Shared/Audio/Midi/MidiEvent.cs | 2 - .../Configuration/ConfigurationManager.cs | 7 +- .../Configuration/IConfigurationManager.cs | 3 +- .../IConfigurationManagerInternal.cs | 3 +- .../Configuration/NetConfigurationManager.cs | 4 +- Robust.Shared/Console/Commands/ExecCommand.cs | 3 +- Robust.Shared/Console/ConsoleHost.cs | 6 +- Robust.Shared/Console/IConsoleHost.cs | 1 - Robust.Shared/Console/IConsoleShell.cs | 1 - Robust.Shared/Containers/ContainerHelpers.cs | 3 +- .../ContentPack/AssemblyTypeChecker.cs | 3 +- Robust.Shared/ContentPack/BaseModLoader.cs | 2 +- Robust.Shared/ContentPack/DirLoader.cs | 3 +- .../IResourceManager.cs | 67 +------------ .../ContentPack/IResourceManagerInternal.cs | 69 ++++++++++++++ .../ContentPack/IWritableDirProvider.cs | 94 +++++++++++++++++++ Robust.Shared/ContentPack/ModLoader.cs | 2 - Robust.Shared/ContentPack/ResourceManager.cs | 3 +- .../ContentPack/ResourceManagerExt.cs | 1 - .../ContentPack/VirtualWritableDirProvider.cs | 5 +- .../ContentPack/WritableDirProvider.cs | 1 - .../WritableDirProviderExt.cs} | 90 +----------------- Robust.Shared/DllMapHelper.cs | 1 - Robust.Shared/ErrorMessages.cs | 5 - Robust.Shared/Exceptions/RuntimeLog.cs | 2 - .../GameObjects/!NO_FOLDER_NAMESPACES | 3 + Robust.Shared/GameObjects/Component.cs | 3 +- .../ComponentDependencyAttribute.cs | 2 +- .../ComponentDependencyManager.cs | 6 +- .../GameObjects/ComponentEventArgs.cs | 1 - Robust.Shared/GameObjects/ComponentExt.cs | 1 - Robust.Shared/GameObjects/ComponentFactory.cs | 3 +- Robust.Shared/GameObjects/ComponentManager.cs | 5 - .../GameObjects/ComponentMessages/Messages.cs | 1 - .../Appearance/SharedAppearanceComponent.cs | 6 +- .../Components/ClickableComponentState.cs | 6 +- .../Collidable/CollisionChangeMessage.cs | 2 +- .../Collidable/PhysicsComponent.Collision.cs | 4 +- .../Collidable/PhysicsComponent.Physics.cs | 3 +- .../Collidable/PhysicsComponentState.cs | 2 +- .../SharedContainerManagerComponent.cs | 4 +- .../Components/DebugExceptionComponents.cs | 2 +- .../Components/Eye/SharedEyeComponent.cs | 2 +- .../Components/GrammarComponent.cs | 2 +- .../Components/IComponentDependencyManager.cs | 4 +- .../GameObjects/Components/IContainer.cs | 2 +- .../Components/IContainerManager.cs | 2 +- .../Components/ITransformComponent.cs | 3 +- .../Components/Light/OccluderComponent.cs | 1 - .../Components/Map/MapComponent.cs | 4 +- .../Components/Map/MapGridComponent.cs | 4 +- .../Renderable/SharedSpriteComponent.cs | 3 +- .../Components/SharedIgnorePauseComponent.cs | 2 +- .../Components/Timers/TimerComponent.cs | 2 +- .../Components/Timers/TimerExtensions.cs | 3 +- .../Components/Transform/SnapGridComponent.cs | 4 +- .../Transform/TransformComponent.cs | 8 +- .../SharedUserInterfaceComponent.cs | 3 +- Robust.Shared/GameObjects/Entity.cs | 8 +- Robust.Shared/GameObjects/EntityEventBus.cs | 1 - Robust.Shared/GameObjects/EntityManager.cs | 7 -- Robust.Shared/GameObjects/EntityQuery.cs | 4 +- Robust.Shared/GameObjects/EntityState.cs | 1 - .../GameObjects/{Systems => }/EntitySystem.cs | 6 +- .../GameObjects/EntitySystemManager.cs | 5 +- .../EntitySystemMessage.cs | 0 .../EntitySystemMessages/EffectMessage.cs | 4 +- .../EntMapIdChangedMessage.cs | 3 +- .../EntParentChangedMessage.cs | 4 +- .../EntityInitializedMessage.cs | 4 +- .../TransformStartLerpMessage.cs | 4 +- .../GameObjects/IComponent.cs | 6 +- .../GameObjects/IComponentDebug.cs | 2 +- .../GameObjects/IComponentFactory.cs | 6 +- .../GameObjects/IComponentManager.cs | 4 +- .../{Interfaces => }/GameObjects/IEntity.cs | 7 +- .../GameObjects/IEntityLoadContext.cs | 2 +- .../GameObjects/IEntityManager.cs | 3 +- .../GameObjects/IEntityNetworkManager.cs | 3 +- .../GameObjects/IEntityQuery.cs | 2 +- .../Systems => GameObjects}/IEntitySystem.cs | 3 +- .../GameObjects/IEntitySystemManager.cs | 4 +- .../GameObjects/NetworkComponentMessage.cs | 2 +- .../GameObjects/RegisterComponentAttribute.cs | 1 - .../GameObjects/Systems/OccluderSystem.cs | 6 +- .../GameObjects/Systems/SharedInputSystem.cs | 3 +- .../Systems/SharedPhysicsSystem.cs | 11 +-- .../Systems/SharedTransformSystem.cs | 4 +- .../GameObjects/Systems/SnapGridSystem.cs | 4 +- .../GameObjects/Systems/TimerSystem.cs | 3 +- Robust.Shared/GameStates/PlayerState.cs | 1 - .../Input/Binding/CommandBindRegistry.cs | 1 - Robust.Shared/Input/Binding/CommandBinds.cs | 3 - Robust.Shared/Input/BoundKeyMap.cs | 4 +- Robust.Shared/Input/InputCmdMessage.cs | 1 - Robust.Shared/Input/KeyFunctions.cs | 1 - .../InvalidImplementationException.cs | 2 +- Robust.Shared/IoC/IDependencyCollection.cs | 3 +- Robust.Shared/IoC/IoCManager.cs | 3 +- .../Localization/CustomFormatCatalog.cs | 10 +- .../Localization/LocalizationManager.cs | 2 +- .../Localization/Macros/Attributes.cs | 2 +- .../Localization/Macros/GeneralMacros.cs | 2 +- .../Localization/Macros/ITextMacro.cs | 6 +- .../Localization/Macros/ITextMacroFactory.cs | 1 - .../Localization/Macros/TextMacroFactory.cs | 2 +- Robust.Shared/Log/ConsoleLogHandler.cs | 3 +- Robust.Shared/Log/FileLogHandler.cs | 3 +- .../{Interfaces => }/Log/ILogHandler.cs | 2 +- .../{Interfaces => }/Log/ILogManager.cs | 4 +- .../{Interfaces => }/Log/ISawmill.cs | 3 +- Robust.Shared/Log/LogManager.Sawmill.cs | 3 +- Robust.Shared/Log/LogManager.cs | 1 - Robust.Shared/Log/Logger.cs | 2 - Robust.Shared/Log/ProxyLogManager.cs | 2 - Robust.Shared/Map/Coordinates.cs | 4 +- Robust.Shared/Map/CoordinatesExtensions.cs | 3 +- Robust.Shared/Map/GridChunkPartition.cs | 1 - Robust.Shared/Map/GridEventHandler.cs | 4 + Robust.Shared/Map/IMapChunk.cs | 3 +- Robust.Shared/Map/IMapGrid.cs | 1 - .../{Interfaces => }/Map/IMapManager.cs | 14 +-- Robust.Shared/Map/IMapManagerInternal.cs | 5 +- .../{Interfaces => }/Map/ITileDefinition.cs | 2 +- .../Map/ITileDefinitionManager.cs | 3 +- Robust.Shared/Map/MapChunk.cs | 2 +- Robust.Shared/Map/MapGrid.cs | 3 - Robust.Shared/Map/MapIndices.cs | 1 - Robust.Shared/Map/MapManager.Network.cs | 5 +- Robust.Shared/Map/MapManager.cs | 5 - Robust.Shared/Map/PhysShapeGrid.cs | 2 - Robust.Shared/Map/TileChangedEventHandler.cs | 10 ++ Robust.Shared/Map/TileDefinitionManager.cs | 1 - .../Network/ClientConnectionState.cs | 30 ++++++ .../Network/IClientNetManager.cs | 33 +------ .../{Interfaces => }/Network/INetChannel.cs | 3 +- .../{Interfaces => }/Network/INetManager.cs | 3 +- .../Network/IServerNetManager.cs | 6 +- Robust.Shared/Network/Messages/MsgConCmd.cs | 1 - .../Network/Messages/MsgConCmdAck.cs | 1 - .../Network/Messages/MsgConCmdReg.cs | 1 - Robust.Shared/Network/Messages/MsgConVars.cs | 1 - Robust.Shared/Network/Messages/MsgEntity.cs | 3 +- .../Messages/MsgMapStrClientHandshake.cs | 1 - .../Messages/MsgMapStrServerHandshake.cs | 1 - .../Network/Messages/MsgMapStrStrings.cs | 1 - .../Network/Messages/MsgPlacement.cs | 1 - .../Network/Messages/MsgPlayerList.cs | 2 - .../Network/Messages/MsgPlayerListReq.cs | 1 - Robust.Shared/Network/Messages/MsgRay.cs | 1 - .../Network/Messages/MsgScriptEval.cs | 1 - .../Network/Messages/MsgScriptResponse.cs | 3 +- .../Network/Messages/MsgScriptStart.cs | 1 - .../Network/Messages/MsgScriptStartAck.cs | 1 - .../Network/Messages/MsgScriptStop.cs | 1 - Robust.Shared/Network/Messages/MsgState.cs | 3 +- Robust.Shared/Network/Messages/MsgStateAck.cs | 1 - .../Messages/MsgViewVariablesCloseSession.cs | 1 - .../Messages/MsgViewVariablesDenySession.cs | 1 - .../Messages/MsgViewVariablesModifyRemote.cs | 5 +- .../Messages/MsgViewVariablesOpenSession.cs | 1 - .../Messages/MsgViewVariablesRemoteData.cs | 3 +- .../Messages/MsgViewVariablesReqData.cs | 3 +- .../Messages/MsgViewVariablesReqSession.cs | 5 - .../{Interfaces => }/Network/NetApproval.cs | 2 +- .../Network/NetApprovalEventArgs.cs | 2 +- Robust.Shared/Network/NetChannelArgs.cs | 1 - .../Network/NetManager.ClientConnect.cs | 1 - .../Network/NetManager.NetChannel.cs | 1 - .../Network/NetManager.ServerAuth.cs | 1 - Robust.Shared/Network/NetManager.cs | 7 +- Robust.Shared/Network/NetMessage.cs | 1 - .../Network/NetMessageAccept.cs | 2 +- Robust.Shared/Network/StringTable.cs | 1 - Robust.Shared/Physics/B2DynamicTree.cs | 4 +- Robust.Shared/Physics/CollisionRay.cs | 2 - Robust.Shared/Physics/CollisionSolver.cs | 1 - Robust.Shared/Physics/DebugDrawingHandle.cs | 5 +- Robust.Shared/Physics/DebugRayData.cs | 23 +++++ Robust.Shared/Physics/DynamicTree.Proxy.cs | 1 - Robust.Shared/Physics/IPhysBody.cs | 3 +- Robust.Shared/Physics/IPhysShape.cs | 1 - .../Physics/IPhysicsManager.cs | 48 +--------- Robust.Shared/Physics/Manifold.cs | 26 +++++ Robust.Shared/Physics/PhysShapeAabb.cs | 1 - Robust.Shared/Physics/PhysShapeCircle.cs | 1 - Robust.Shared/Physics/PhysShapeRect.cs | 1 - Robust.Shared/Physics/PhysicsManager.cs | 5 +- Robust.Shared/Physics/Ray.cs | 3 +- Robust.Shared/Physics/RayCastResults.cs | 2 +- Robust.Shared/Physics/VirtualController.cs | 2 +- Robust.Shared/Players/IBaseSession.cs | 3 +- Robust.Shared/Players/ICommonSession.cs | 2 +- Robust.Shared/ProgramShared.cs | 1 - Robust.Shared/Prototypes/EntityPrototype.cs | 11 +-- Robust.Shared/Prototypes/IPrototype.cs | 3 +- Robust.Shared/Prototypes/PrototypeManager.cs | 6 +- .../{Interfaces => }/Random/IRobustRandom.cs | 2 +- Robust.Shared/Random/RandomExtensions.cs | 1 - Robust.Shared/Random/RobustRandom.cs | 2 - .../Reflection/IReflectionManager.cs | 19 +--- Robust.Shared/Reflection/ReflectAttribute.cs | 7 +- Robust.Shared/Reflection/ReflectionManager.cs | 1 - .../Reflection/ReflectionUpdateEventArgs.cs | 13 +++ .../Robust.Shared.csproj.DotSettings | 16 +++- .../Serialization/CustomFormatManager.cs | 5 +- .../Serialization/DefaultValueSerializer.cs | 3 - .../Serialization/ICustomFormatManager.cs | 32 +++++++ .../Serialization/IExposeData.cs | 3 +- .../IRobustMappedStringSerializer.cs | 2 +- .../Serialization/IRobustSerializer.cs | 4 +- .../Serialization/ISelfSerialize.cs | 2 +- .../Serialization/ObjectSerializer.cs | 3 +- ...MappedStringSerializer.MappedStringDict.cs | 2 +- .../RobustMappedStringSerializer.cs | 2 - .../RobustSerializer.Handshake.cs | 2 +- .../Serialization/RobustSerializer.cs | 5 +- .../WithFormat.cs} | 38 +------- .../YamlCustomFormatSerializer.cs | 7 +- .../Serialization/YamlFlagSerializer.cs | 6 -- .../Serialization/YamlObjectSerializer.cs | 3 +- Robust.Shared/SharedIoC.cs | 12 --- .../{Interfaces => }/Timers/ITimerManager.cs | 3 +- Robust.Shared/Timers/Timer.cs | 1 - Robust.Shared/Timers/TimerManager.cs | 3 +- Robust.Shared/Timing/GameLoop.cs | 1 - Robust.Shared/Timing/GameTiming.cs | 3 +- .../{Interfaces => }/Timing/IGameTiming.cs | 3 +- .../Timing/PredictionGuard.cs | 2 +- Robust.Shared/Utility/DebugTools.cs | 1 - .../Utility/FormattedMessage.MarkupParser.cs | 1 - .../Internal => Utility}/IUniqueIndex.cs | 2 +- Robust.Shared/Utility/PrettyPrint.cs | 1 - Robust.Shared/Utility/TypeAbbreviation.cs | 3 - Robust.Shared/Utility/UniqueIndex.cs | 1 - Robust.Shared/Utility/UniqueIndexHkm.cs | 1 - .../ViewVariables/ViewVariablesBlob.cs | 2 +- .../ViewVariablesManagerShared.cs | 2 +- .../GameObjects/Components/Transform_Test.cs | 7 +- .../GameStates/GameStateProcessor_Tests.cs | 1 - Robust.UnitTesting/Client/Graphics/EyeTest.cs | 2 +- .../Client/Graphics/StyleBoxTest.cs | 3 +- .../Client/UserInterface/ControlTest.cs | 2 - .../Controls/CenterContainerTest.cs | 5 - .../Controls/GridContainerTest.cs | 5 - .../Controls/MultiselectOptionButtonTest.cs | 2 +- .../Controls/RadioOptionsTest.cs | 2 - .../Client/UserInterface/StylesheetTest.cs | 1 - .../UserInterface/UserInterfaceManagerTest.cs | 2 - Robust.UnitTesting/GameControllerDummy.cs | 7 +- Robust.UnitTesting/Helpers.cs | 2 +- Robust.UnitTesting/LogCatcher.cs | 2 +- .../RobustIntegrationTest.NetManager.cs | 3 +- Robust.UnitTesting/RobustIntegrationTest.cs | 10 +- Robust.UnitTesting/RobustUnitTest.cs | 8 +- .../GameObjects/Components/Container_Test.cs | 7 +- .../GameObjects/Components/Transform_Test.cs | 7 +- .../ServerEntityNetworkManagerTest.cs | 2 +- .../ThrowingEntityDeletion_Test.cs | 4 +- .../Server/Maps/MapLoaderTest.cs | 8 +- .../ViewVariablesTraitMembersTest.cs | 2 +- Robust.UnitTesting/Shared/ColorUtils_Test.cs | 3 +- .../Shared/ContentPack/ResourceManagerTest.cs | 1 - .../ComponentDependencies_Tests.cs | 6 +- .../GameObjects/ComponentFactory_Tests.cs | 2 - .../GameObjects/ComponentManager_Tests.cs | 3 - .../Shared/GameObjects/EntityState_Tests.cs | 8 +- .../EntitySystemManagerOrderTest.cs | 5 +- .../GameObjects/EntitySystemManager_Tests.cs | 2 - .../Input/Binding/CommandBindRegistry_Test.cs | 5 +- .../Shared/Map/EntityCoordinates_Tests.cs | 10 +- .../Shared/Map/MapChunk_Tests.cs | 3 +- .../Shared/Map/MapGrid_Tests.cs | 7 +- .../Shared/Map/MapManager_Tests.cs | 3 - .../Shared/Physics/B2DynamicTree_Test.cs | 2 - .../Shared/Physics/CollisionManager_Test.cs | 5 +- .../Shared/Physics/CollisionSolverTests.cs | 1 - .../Prototypes/PrototypeManager_Test.cs | 1 - .../Reflection/ReflectionManager_Test.cs | 1 - .../Resources/WritableDirProviderTest.cs | 1 - .../NetSerializableAttribute_Test.cs | 2 +- .../YamlConstantSerializer_Test.cs | 7 +- .../Serialization/YamlFlagSerializer_Test.cs | 4 - .../YamlObjectSerializer_Test.cs | 1 - Robust.UnitTesting/Shared/Timers/TimerTest.cs | 4 +- .../Shared/Timing/GameLoop_Test.cs | 1 - .../Shared/Timing/GameTiming_Test.cs | 1 - .../Shared/Utility/NullableHelper_Test.cs | 1 - .../Shared/Utility/PrettyPrint_Test.cs | 1 - Robust.UnitTesting/TestLogHandler.cs | 6 +- 649 files changed, 1409 insertions(+), 2396 deletions(-) rename Robust.Client/{Interfaces => }/Debugging/IDebugDrawing.cs (91%) rename Robust.Client/{Interfaces => }/Debugging/IDebugDrawingManager.cs (52%) create mode 100644 Robust.Client/GameObjects/!NO_FOLDER_NAMESPACES rename Robust.Client/{Interfaces/GameObjects => GameObjects/Components/Renderable}/IRenderableComponent.cs (77%) rename Robust.Client/{Interfaces/GameObjects/Components => GameObjects/Components/Renderable}/ISpriteComponent.cs (91%) create mode 100644 Robust.Client/GameObjects/Components/Renderable/ISpriteLayer.cs rename Robust.Client/{Interfaces => }/GameObjects/IClientEntityManager.cs (64%) rename Robust.Client/{Interfaces => }/GameStates/IClientGameStateManager.cs (97%) rename Robust.Client/{Interfaces => }/Graphics/ClientEye/IEye.cs (96%) rename Robust.Client/{Interfaces => }/Graphics/ClientEye/IEyeManager.cs (98%) rename Robust.Client/{Interfaces => }/Graphics/ClydeDebugLayers.cs (69%) rename Robust.Client/{Interfaces => }/Graphics/ClydeStockTexture.cs (71%) rename Robust.Client/{Interfaces => }/Graphics/IClyde.cs (98%) rename Robust.Client/{Interfaces => }/Graphics/IClydeAudio.cs (91%) rename Robust.Client/{Interfaces => }/Graphics/IClydeAudioSource.cs (92%) rename Robust.Client/{Interfaces => }/Graphics/IClydeBufferedAudioSource.cs (90%) rename Robust.Client/{Interfaces => }/Graphics/IClydeDebugInfo.cs (84%) rename Robust.Client/{Interfaces => }/Graphics/IClydeDebugStats.cs (91%) rename Robust.Client/{Interfaces => }/Graphics/IClydeInternal.cs (88%) rename Robust.Client/{Interfaces => }/Graphics/IClydeViewport.cs (88%) rename Robust.Client/{Interfaces => }/Graphics/ICursor.cs (92%) rename Robust.Client/{Interfaces => }/Graphics/IFontManager.cs (96%) rename Robust.Client/{Interfaces => }/Graphics/IRenderHandle.cs (73%) rename Robust.Client/{Interfaces => }/Graphics/IRenderTarget.cs (88%) rename Robust.Client/{Interfaces => }/Graphics/IRenderTexture.cs (81%) rename Robust.Client/{Interfaces => }/Graphics/IRenderWindow.cs (80%) rename Robust.Client/{Interfaces => }/Graphics/Lighting/ILightManager.cs (95%) rename Robust.Client/{Interfaces => }/Graphics/OpenGLVersion.cs (92%) rename Robust.Client/{Interfaces => }/Graphics/Overlays/IOverlayManager.cs (89%) rename Robust.Client/{Interfaces => }/Graphics/RenderTargetColorFormat.cs (93%) rename Robust.Client/{Interfaces => }/Graphics/RenderTargetCreationParameters.cs (92%) rename Robust.Client/{Interfaces => }/Graphics/ScreenshotType.cs (66%) rename Robust.Client/{Interfaces => }/Graphics/StandardCursorShape.cs (95%) rename Robust.Client/{Interfaces => }/Graphics/WindowResizedEventArgs.cs (88%) rename Robust.Client/{Interfaces => }/IBaseClient.cs (98%) create mode 100644 Robust.Client/IGameController.cs create mode 100644 Robust.Client/IGameControllerInternal.cs create mode 100644 Robust.Client/InitialLaunchState.cs rename Robust.Client/{Interfaces => }/Input/IInputManager.cs (96%) rename Robust.Client/{Interfaces => }/Input/IKeyBinding.cs (90%) rename Robust.Client/{Interfaces => }/Input/KeyBindingRegistration.cs (91%) create mode 100644 Robust.Client/Input/KeyEventAction.cs delete mode 100644 Robust.Client/Interfaces/IGameController.cs delete mode 100644 Robust.Client/Interfaces/State/IStateManager.cs rename Robust.Client/{Interfaces => }/Map/IClydeTileDefinitionManager.cs (90%) rename Robust.Client/{Interfaces => }/Placement/IPlacementManager.cs (83%) rename Robust.Client/{Interfaces => }/ResourceManagement/IResourceCache.cs (75%) create mode 100644 Robust.Client/ResourceManagement/IResourceCacheInternal.cs create mode 100644 Robust.Client/Robust.Client.csproj.DotSettings create mode 100644 Robust.Client/State/IStateManager.cs create mode 100644 Robust.Client/State/StateChangedEventArgs.cs create mode 100644 Robust.Client/UserInterface/FileDialogFilters.cs rename Robust.Client/{Interfaces => }/UserInterface/IClipboardManager.cs (70%) rename Robust.Client/{Interfaces => }/UserInterface/IDebugMonitors.cs (89%) rename Robust.Client/{Interfaces => }/UserInterface/IFileDialogManager.cs (59%) rename Robust.Client/{Interfaces => }/UserInterface/IUserInterfaceManager.cs (67%) create mode 100644 Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs rename Robust.Client/{Interfaces => }/Utility/IDiscordRichPresence.cs (83%) rename Robust.Client/{Interfaces => }/Utility/IRand.cs (81%) rename Robust.Server/{Interfaces => }/Debugging/IDebugDrawingManager.cs (63%) create mode 100644 Robust.Server/GameObjects/!NO_FOLDER_NAMESPACES create mode 100644 Robust.Server/GameObjects/Components/Actor/IActorComponent.cs rename Robust.Server/{Interfaces/GameObjects => GameObjects/Components}/IMapInit.cs (78%) rename Robust.Server/{Interfaces/GameObjects => GameObjects/Components/Renderable}/IRenderableComponent.cs (53%) rename Robust.Server/{Interfaces/GameObjects => GameObjects/Components/Renderable}/ISpriteRenderableComponent.cs (64%) rename Robust.Server/{Interfaces => }/GameObjects/IServerEntityManager.cs (85%) rename Robust.Server/{Interfaces => }/GameObjects/IServerEntityManagerInternal.cs (70%) rename Robust.Server/{Interfaces => }/GameObjects/IServerEntityNetworkManager.cs (68%) rename Robust.Server/{Interfaces/GameState => GameStates}/IServerGameStateManager.cs (90%) rename Robust.Server/{Interfaces => }/IBaseServer.cs (93%) delete mode 100644 Robust.Server/Interfaces/GameObjects/IActorComponent.cs delete mode 100644 Robust.Server/Interfaces/ServerStatus/IStatusHost.cs rename Robust.Server/{Interfaces => }/Maps/IMapLoader.cs (89%) rename Robust.Server/{Interfaces => }/Placement/IPlacementManager.cs (96%) rename Robust.Server/{Interfaces => }/Player/IPlayerData.cs (68%) rename Robust.Server/{Interfaces => }/Player/IPlayerInput.cs (89%) rename Robust.Server/{Interfaces => }/Player/IPlayerManager.cs (95%) rename Robust.Server/{Interfaces => }/Player/IPlayerSession.cs (90%) create mode 100644 Robust.Server/Robust.Server.csproj.DotSettings create mode 100644 Robust.Server/ServerStatus/IStatusHandlerContext.cs create mode 100644 Robust.Server/ServerStatus/IStatusHost.cs create mode 100644 Robust.Server/ServerStatus/StatusHostHandler.cs rename Robust.Server/{Interfaces => }/Timing/IPauseManager.cs (58%) create mode 100644 Robust.Server/Timing/PauseManagerExt.cs rename Robust.Shared/{Interfaces => }/Configuration/IConfigurationManager.cs (96%) rename Robust.Shared/{Interfaces => }/Configuration/IConfigurationManagerInternal.cs (90%) rename Robust.Shared/{Interfaces/Resources => ContentPack}/IResourceManager.cs (70%) create mode 100644 Robust.Shared/ContentPack/IResourceManagerInternal.cs create mode 100644 Robust.Shared/ContentPack/IWritableDirProvider.cs rename Robust.Shared/{Interfaces/Resources/IWritableDirProvider.cs => ContentPack/WritableDirProviderExt.cs} (54%) create mode 100644 Robust.Shared/GameObjects/!NO_FOLDER_NAMESPACES rename Robust.Shared/{Interfaces => }/GameObjects/Components/IComponentDependencyManager.cs (88%) rename Robust.Shared/{Interfaces => }/GameObjects/Components/IContainer.cs (98%) rename Robust.Shared/{Interfaces => }/GameObjects/Components/IContainerManager.cs (98%) rename Robust.Shared/{Interfaces => }/GameObjects/Components/ITransformComponent.cs (97%) rename Robust.Shared/GameObjects/{Systems => }/EntitySystem.cs (97%) rename Robust.Shared/GameObjects/{EntitySystemMessages => }/EntitySystemMessage.cs (100%) rename Robust.Shared/{Interfaces => }/GameObjects/IComponent.cs (97%) rename Robust.Shared/{Interfaces => }/GameObjects/IComponentDebug.cs (67%) rename Robust.Shared/{Interfaces => }/GameObjects/IComponentFactory.cs (98%) rename Robust.Shared/{Interfaces => }/GameObjects/IComponentManager.cs (98%) rename Robust.Shared/{Interfaces => }/GameObjects/IEntity.cs (98%) rename Robust.Shared/{Interfaces => }/GameObjects/IEntityLoadContext.cs (94%) rename Robust.Shared/{Interfaces => }/GameObjects/IEntityManager.cs (99%) rename Robust.Shared/{Interfaces => }/GameObjects/IEntityQuery.cs (95%) rename Robust.Shared/{Interfaces/GameObjects/Systems => GameObjects}/IEntitySystem.cs (92%) rename Robust.Shared/{Interfaces => }/GameObjects/IEntitySystemManager.cs (96%) rename Robust.Shared/{Interfaces => }/Log/ILogHandler.cs (94%) rename Robust.Shared/{Interfaces => }/Log/ILogManager.cs (86%) rename Robust.Shared/{Interfaces => }/Log/ISawmill.cs (98%) create mode 100644 Robust.Shared/Map/GridEventHandler.cs rename Robust.Shared/{Interfaces => }/Map/IMapManager.cs (90%) rename Robust.Shared/{Interfaces => }/Map/ITileDefinition.cs (96%) rename Robust.Shared/{Interfaces => }/Map/ITileDefinitionManager.cs (93%) create mode 100644 Robust.Shared/Map/TileChangedEventHandler.cs create mode 100644 Robust.Shared/Network/ClientConnectionState.cs rename Robust.Shared/{Interfaces => }/Network/IClientNetManager.cs (67%) rename Robust.Shared/{Interfaces => }/Network/INetChannel.cs (96%) rename Robust.Shared/{Interfaces => }/Network/INetManager.cs (98%) rename Robust.Shared/{Interfaces => }/Network/IServerNetManager.cs (89%) rename Robust.Shared/{Interfaces => }/Network/NetApproval.cs (93%) rename Robust.Shared/{Interfaces => }/Network/NetApprovalEventArgs.cs (86%) rename Robust.Shared/{Interfaces => }/Network/NetMessageAccept.cs (94%) create mode 100644 Robust.Shared/Physics/DebugRayData.cs rename Robust.Shared/{Interfaces => }/Physics/IPhysicsManager.cs (80%) create mode 100644 Robust.Shared/Physics/Manifold.cs rename Robust.Shared/{Interfaces => }/Random/IRobustRandom.cs (92%) rename Robust.Shared/{Interfaces => }/Reflection/IReflectionManager.cs (92%) create mode 100644 Robust.Shared/Reflection/ReflectionUpdateEventArgs.cs create mode 100644 Robust.Shared/Serialization/ICustomFormatManager.cs rename Robust.Shared/{Interfaces => }/Serialization/IExposeData.cs (92%) rename Robust.Shared/{Interfaces => }/Serialization/IRobustMappedStringSerializer.cs (98%) rename Robust.Shared/{Interfaces => }/Serialization/IRobustSerializer.cs (94%) rename Robust.Shared/{Interfaces => }/Serialization/ISelfSerialize.cs (69%) rename Robust.Shared/{Interfaces/Serialization/ICustomFormatManager.cs => Serialization/WithFormat.cs} (54%) rename Robust.Shared/{Interfaces => }/Timers/ITimerManager.cs (74%) rename Robust.Shared/{Interfaces => }/Timing/IGameTiming.cs (98%) rename Robust.Shared/{Interfaces => }/Timing/PredictionGuard.cs (89%) rename Robust.Shared/{Interfaces/Utility/Internal => Utility}/IUniqueIndex.cs (99%) diff --git a/Robust.Client/Animations/Animation.cs b/Robust.Client/Animations/Animation.cs index 644755a50..2f477ec9d 100644 --- a/Robust.Client/Animations/Animation.cs +++ b/Robust.Client/Animations/Animation.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Robust.Client.GameObjects.Components.Animations; +using Robust.Client.GameObjects; namespace Robust.Client.Animations { diff --git a/Robust.Client/Animations/AnimationTrackComponentProperty.cs b/Robust.Client/Animations/AnimationTrackComponentProperty.cs index 7acc21421..615b505c8 100644 --- a/Robust.Client/Animations/AnimationTrackComponentProperty.cs +++ b/Robust.Client/Animations/AnimationTrackComponentProperty.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; using Robust.Shared.Animations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Client.Animations { diff --git a/Robust.Client/Animations/AnimationTrackControlProperty.cs b/Robust.Client/Animations/AnimationTrackControlProperty.cs index d1bed0b39..32b9b073a 100644 --- a/Robust.Client/Animations/AnimationTrackControlProperty.cs +++ b/Robust.Client/Animations/AnimationTrackControlProperty.cs @@ -1,8 +1,7 @@ using System; -using Robust.Client.Animations; using Robust.Shared.Animations; -namespace Content.Client.Animations +namespace Robust.Client.Animations { public class AnimationTrackControlProperty : AnimationTrackProperty { diff --git a/Robust.Client/Animations/AnimationTrackPlaySound.cs b/Robust.Client/Animations/AnimationTrackPlaySound.cs index d9822ddd9..7fd23a612 100644 --- a/Robust.Client/Animations/AnimationTrackPlaySound.cs +++ b/Robust.Client/Animations/AnimationTrackPlaySound.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using Robust.Client.GameObjects.EntitySystems; +using Robust.Client.GameObjects; using Robust.Shared.Audio; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Utility; +using Robust.Shared.GameObjects; namespace Robust.Client.Animations { diff --git a/Robust.Client/Animations/AnimationTrackSpriteFlick.cs b/Robust.Client/Animations/AnimationTrackSpriteFlick.cs index a14bb8173..eba3946dd 100644 --- a/Robust.Client/Animations/AnimationTrackSpriteFlick.cs +++ b/Robust.Client/Animations/AnimationTrackSpriteFlick.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; namespace Robust.Client.Animations diff --git a/Robust.Client/Audio/AudioStream.cs b/Robust.Client/Audio/AudioStream.cs index 7c6baaff8..2c8039fa5 100644 --- a/Robust.Client/Audio/AudioStream.cs +++ b/Robust.Client/Audio/AudioStream.cs @@ -1,6 +1,5 @@ using System; using Robust.Client.Graphics; -using Robust.Client.Graphics.Clyde; namespace Robust.Client.Audio { diff --git a/Robust.Client/Audio/Midi/MidiManager.cs b/Robust.Client/Audio/Midi/MidiManager.cs index 6f6fc0f2c..23f659d95 100644 --- a/Robust.Client/Audio/Midi/MidiManager.cs +++ b/Robust.Client/Audio/Midi/MidiManager.cs @@ -4,16 +4,15 @@ using System.IO; using System.Runtime.InteropServices; using System.Threading; using NFluidsynth; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Resources; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; +using Robust.Shared.ContentPack; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Utility; using Logger = Robust.Shared.Log.Logger; diff --git a/Robust.Client/Audio/Midi/MidiRenderer.cs b/Robust.Client/Audio/Midi/MidiRenderer.cs index c653faa27..0e5c355bb 100644 --- a/Robust.Client/Audio/Midi/MidiRenderer.cs +++ b/Robust.Client/Audio/Midi/MidiRenderer.cs @@ -1,11 +1,9 @@ using System; -using System.IO; using System.Runtime.Intrinsics.X86; using NFluidsynth; -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; using Robust.Shared.Asynchronous; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; diff --git a/Robust.Client/BaseClient.cs b/Robust.Client/BaseClient.cs index f31be3139..eddc611a2 100644 --- a/Robust.Client/BaseClient.cs +++ b/Robust.Client/BaseClient.cs @@ -1,20 +1,18 @@ using System; using System.Net; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Debugging; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Utility; +using Robust.Client.Debugging; +using Robust.Client.GameObjects; +using Robust.Client.GameStates; using Robust.Client.Player; +using Robust.Client.Utility; using Robust.Shared; using Robust.Shared.Configuration; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Network; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.Client diff --git a/Robust.Client/ClientIoC.cs b/Robust.Client/ClientIoC.cs index 783b3ae94..06ece7e5c 100644 --- a/Robust.Client/ClientIoC.cs +++ b/Robust.Client/ClientIoC.cs @@ -5,26 +5,8 @@ using Robust.Client.Debugging; using Robust.Client.GameObjects; using Robust.Client.GameStates; using Robust.Client.Graphics; -using Robust.Client.Graphics.ClientEye; using Robust.Client.Graphics.Clyde; -using Robust.Client.Graphics.Lighting; -using Robust.Client.Graphics.Overlays; using Robust.Client.Input; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Debugging; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Lighting; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.Map; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; -using Robust.Client.Interfaces.Utility; using Robust.Client.Map; using Robust.Client.Placement; using Robust.Client.Player; @@ -35,15 +17,13 @@ using Robust.Client.UserInterface; using Robust.Client.Utility; using Robust.Client.ViewVariables; using Robust.Shared; +using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Prototypes; +using Robust.Shared.Reflection; namespace Robust.Client { diff --git a/Robust.Client/Console/Commands/AddCompCommand.cs b/Robust.Client/Console/Commands/AddCompCommand.cs index bf49656e7..6e46e25aa 100644 --- a/Robust.Client/Console/Commands/AddCompCommand.cs +++ b/Robust.Client/Console/Commands/AddCompCommand.cs @@ -1,8 +1,6 @@ using JetBrains.Annotations; -using Robust.Client.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Robust.Client.Console.Commands diff --git a/Robust.Client/Console/Commands/ClientSpawnCommand.cs b/Robust.Client/Console/Commands/ClientSpawnCommand.cs index ce0e1fc1d..455ae810e 100644 --- a/Robust.Client/Console/Commands/ClientSpawnCommand.cs +++ b/Robust.Client/Console/Commands/ClientSpawnCommand.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Robust.Client.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Robust.Client.Console.Commands diff --git a/Robust.Client/Console/Commands/ConfigurationCommands.cs b/Robust.Client/Console/Commands/ConfigurationCommands.cs index 4148b233c..42140c1ba 100644 --- a/Robust.Client/Console/Commands/ConfigurationCommands.cs +++ b/Robust.Client/Console/Commands/ConfigurationCommands.cs @@ -3,9 +3,7 @@ using System.Linq; using JetBrains.Annotations; using Robust.Shared.Configuration; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; -using Robust.Shared.Maths; namespace Robust.Client.Console.Commands { diff --git a/Robust.Client/Console/Commands/ConsoleCommands.cs b/Robust.Client/Console/Commands/ConsoleCommands.cs index 5921caf7d..e41c145ac 100644 --- a/Robust.Client/Console/Commands/ConsoleCommands.cs +++ b/Robust.Client/Console/Commands/ConsoleCommands.cs @@ -2,11 +2,7 @@ // Not some generic console command type. // Couldn't think of a better name sorry. -using System; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Maths; namespace Robust.Client.Console.Commands { diff --git a/Robust.Client/Console/Commands/Debug.cs b/Robust.Client/Console/Commands/Debug.cs index 06077cd31..53a133b2e 100644 --- a/Robust.Client/Console/Commands/Debug.cs +++ b/Robust.Client/Console/Commands/Debug.cs @@ -6,20 +6,12 @@ using System.IO; using System.Linq; using System.Reflection; using System.Runtime; -using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using Robust.Client.Input; -using System.Threading; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Debugging; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Lighting; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Debugging; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.ResourceManagement.ResourceTypes; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -28,15 +20,11 @@ using Robust.Shared.Asynchronous; using Robust.Shared.Console; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/Console/Commands/DumpMetadataMembersCommand.cs b/Robust.Client/Console/Commands/DumpMetadataMembersCommand.cs index 44a740743..0d757ca77 100644 --- a/Robust.Client/Console/Commands/DumpMetadataMembersCommand.cs +++ b/Robust.Client/Console/Commands/DumpMetadataMembersCommand.cs @@ -1,7 +1,6 @@ using System; using Robust.Shared.Console; using Robust.Shared.ContentPack; -using Robust.Shared.Maths; namespace Robust.Client.Console.Commands { diff --git a/Robust.Client/Console/Commands/HelpCommands.cs b/Robust.Client/Console/Commands/HelpCommands.cs index 6a7c87e07..f242035c7 100644 --- a/Robust.Client/Console/Commands/HelpCommands.cs +++ b/Robust.Client/Console/Commands/HelpCommands.cs @@ -1,8 +1,7 @@ using System.Linq; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; -using Robust.Shared.Maths; +using Robust.Shared.Network; namespace Robust.Client.Console.Commands { diff --git a/Robust.Client/Console/Commands/ListAssembliesCommand.cs b/Robust.Client/Console/Commands/ListAssembliesCommand.cs index abcd07e1b..3a9969d4f 100644 --- a/Robust.Client/Console/Commands/ListAssembliesCommand.cs +++ b/Robust.Client/Console/Commands/ListAssembliesCommand.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Runtime.Loader; -using System.Text; using JetBrains.Annotations; using Robust.Shared.Console; diff --git a/Robust.Client/Console/Commands/LogCommands.cs b/Robust.Client/Console/Commands/LogCommands.cs index d81ea8d9d..53952c873 100644 --- a/Robust.Client/Console/Commands/LogCommands.cs +++ b/Robust.Client/Console/Commands/LogCommands.cs @@ -1,5 +1,4 @@ using Robust.Shared.Log; -using Robust.Shared.Maths; using System; using Robust.Shared.Console; diff --git a/Robust.Client/Console/Commands/Scripting.cs b/Robust.Client/Console/Commands/Scripting.cs index 644c4efa6..e14a8c916 100644 --- a/Robust.Client/Console/Commands/Scripting.cs +++ b/Robust.Client/Console/Commands/Scripting.cs @@ -1,7 +1,6 @@ using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Maths; namespace Robust.Client.Console.Commands { diff --git a/Robust.Client/Console/Commands/SendGarbageCommand.cs b/Robust.Client/Console/Commands/SendGarbageCommand.cs index 2ab616777..a7750bb4c 100644 --- a/Robust.Client/Console/Commands/SendGarbageCommand.cs +++ b/Robust.Client/Console/Commands/SendGarbageCommand.cs @@ -1,5 +1,4 @@ using Robust.Shared.Console; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Robust.Client/Console/Commands/SetInputContextCommand.cs b/Robust.Client/Console/Commands/SetInputContextCommand.cs index 0bb8ff497..01e2cfb73 100644 --- a/Robust.Client/Console/Commands/SetInputContextCommand.cs +++ b/Robust.Client/Console/Commands/SetInputContextCommand.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Robust.Client.Interfaces.Input; +using Robust.Client.Input; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Robust.Client/Console/IClientConGroupController.cs b/Robust.Client/Console/IClientConGroupController.cs index 87ce9637a..d43c17256 100644 --- a/Robust.Client/Console/IClientConGroupController.cs +++ b/Robust.Client/Console/IClientConGroupController.cs @@ -1,6 +1,4 @@ -using System; - -namespace Robust.Client.Console +namespace Robust.Client.Console { public interface IClientConGroupController : IClientConGroupImplementation { diff --git a/Robust.Client/Console/ScriptClient.cs b/Robust.Client/Console/ScriptClient.cs index 0d66a0852..6863ae580 100644 --- a/Robust.Client/Console/ScriptClient.cs +++ b/Robust.Client/Console/ScriptClient.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; namespace Robust.Client.Console diff --git a/Robust.Client/Console/ScriptConsoleClient.cs b/Robust.Client/Console/ScriptConsoleClient.cs index 20d94831b..504f6fcaf 100644 --- a/Robust.Client/Console/ScriptConsoleClient.cs +++ b/Robust.Client/Console/ScriptConsoleClient.cs @@ -10,10 +10,10 @@ using Microsoft.CodeAnalysis.Scripting; using Microsoft.CodeAnalysis.Text; using Robust.Client.UserInterface.CustomControls; using Robust.Client.ViewVariables; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.Scripting; using Robust.Shared.Utility; diff --git a/Robust.Client/Console/WatchWindow.cs b/Robust.Client/Console/WatchWindow.cs index d5f9450fb..af3f77680 100644 --- a/Robust.Client/Console/WatchWindow.cs +++ b/Robust.Client/Console/WatchWindow.cs @@ -7,10 +7,10 @@ using Microsoft.CodeAnalysis.Scripting; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.Scripting; using Robust.Shared.Timing; diff --git a/Robust.Client/Credits/CreditsManager.cs b/Robust.Client/Credits/CreditsManager.cs index 0bb35a6eb..7cb224705 100644 --- a/Robust.Client/Credits/CreditsManager.cs +++ b/Robust.Client/Credits/CreditsManager.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.IO; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Robust.Client/Debugging/DebugDrawing.cs b/Robust.Client/Debugging/DebugDrawing.cs index fa9c6e473..8bc9b2352 100644 --- a/Robust.Client/Debugging/DebugDrawing.cs +++ b/Robust.Client/Debugging/DebugDrawing.cs @@ -1,18 +1,9 @@ using System; using System.Collections.Generic; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Debugging; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Input; using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Robust.Client/Debugging/DebugDrawingManager.cs b/Robust.Client/Debugging/DebugDrawingManager.cs index 0d61ac2e9..c9808b1fc 100644 --- a/Robust.Client/Debugging/DebugDrawingManager.cs +++ b/Robust.Client/Debugging/DebugDrawingManager.cs @@ -1,15 +1,11 @@ -using Robust.Client.Interfaces.Debugging; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.IoC; +using Robust.Shared.IoC; using Robust.Shared.Network.Messages; using System; using System.Collections.Generic; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Shared.Maths; -using Robust.Client.Interfaces.Graphics.Overlays; using Robust.Shared.Timing; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Network; namespace Robust.Client.Debugging { diff --git a/Robust.Client/Interfaces/Debugging/IDebugDrawing.cs b/Robust.Client/Debugging/IDebugDrawing.cs similarity index 91% rename from Robust.Client/Interfaces/Debugging/IDebugDrawing.cs rename to Robust.Client/Debugging/IDebugDrawing.cs index d3d67b295..ecbd0abb0 100644 --- a/Robust.Client/Interfaces/Debugging/IDebugDrawing.cs +++ b/Robust.Client/Debugging/IDebugDrawing.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Debugging +namespace Robust.Client.Debugging { /// /// A collection of visual debug overlays for the client game. diff --git a/Robust.Client/Interfaces/Debugging/IDebugDrawingManager.cs b/Robust.Client/Debugging/IDebugDrawingManager.cs similarity index 52% rename from Robust.Client/Interfaces/Debugging/IDebugDrawingManager.cs rename to Robust.Client/Debugging/IDebugDrawingManager.cs index c316a094a..4ff2625bc 100644 --- a/Robust.Client/Interfaces/Debugging/IDebugDrawingManager.cs +++ b/Robust.Client/Debugging/IDebugDrawingManager.cs @@ -1,11 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Robust.Shared.Timing; -namespace Robust.Client.Interfaces.Debugging +namespace Robust.Client.Debugging { public interface IDebugDrawingManager { diff --git a/Robust.Client/GameController.cs b/Robust.Client/GameController.cs index 9a2357f33..d25b4a85a 100644 --- a/Robust.Client/GameController.cs +++ b/Robust.Client/GameController.cs @@ -3,18 +3,15 @@ using System.IO; using System.Net; using System.Threading.Tasks; using Robust.Client.Console; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; -using Robust.Client.Interfaces.Utility; +using Robust.Client.GameObjects; +using Robust.Client.GameStates; +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Client.Placement; using Robust.Client.Player; +using Robust.Client.ResourceManagement; +using Robust.Client.State; +using Robust.Client.UserInterface; using Robust.Client.Utility; using Robust.Client.ViewVariables; using Robust.LoaderApi; @@ -22,18 +19,14 @@ using Robust.Shared; using Robust.Shared.Asynchronous; using Robust.Shared.Configuration; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Interfaces.Timers; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; +using Robust.Shared.Timers; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Client/GameController/GameController.Input.cs b/Robust.Client/GameController/GameController.Input.cs index 1c179f988..2bd1037bb 100644 --- a/Robust.Client/GameController/GameController.Input.cs +++ b/Robust.Client/GameController/GameController.Input.cs @@ -1,4 +1,4 @@ -using Robust.Client.Input; +using Robust.Client.Input; namespace Robust.Client { diff --git a/Robust.Client/GameController/GameController.IoC.cs b/Robust.Client/GameController/GameController.IoC.cs index 159899cf3..490b1bfce 100644 --- a/Robust.Client/GameController/GameController.IoC.cs +++ b/Robust.Client/GameController/GameController.IoC.cs @@ -1,67 +1,9 @@ using System; using System.Collections.Generic; using System.Reflection; -using Robust.Client.Graphics.Clyde; -using Robust.Client.Console; -using Robust.Client.Debugging; -using Robust.Client.GameObjects; -using Robust.Client.GameStates; -using Robust.Client.Graphics; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Lighting; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Input; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Debugging; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Lighting; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.Map; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; -using Robust.Client.Interfaces.Utility; -using Robust.Client.Map; -using Robust.Client.Placement; -using Robust.Client.Player; -using Robust.Client.Reflection; -using Robust.Client.ResourceManagement; -using Robust.Client.State; -using Robust.Client.UserInterface; -using Robust.Client.Utility; -using Robust.Client.ViewVariables; -using Robust.Shared; -using Robust.Shared.Asynchronous; -using Robust.Shared.Configuration; using Robust.Shared.ContentPack; -using Robust.Shared.Exceptions; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Interfaces.Timers; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Log; -using Robust.Shared.Map; -using Robust.Shared.Network; -using Robust.Shared.Physics; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.Timers; -using Robust.Shared.Timing; +using Robust.Shared.Reflection; namespace Robust.Client { diff --git a/Robust.Client/GameController/GameController.Loader.cs b/Robust.Client/GameController/GameController.Loader.cs index 62014b4c1..69ef8e03b 100644 --- a/Robust.Client/GameController/GameController.Loader.cs +++ b/Robust.Client/GameController/GameController.Loader.cs @@ -1,4 +1,4 @@ -using Robust.Client; +using Robust.Client; using Robust.LoaderApi; [assembly: LoaderEntryPoint(typeof(GameController.LoaderEntryPoint))] @@ -11,7 +11,7 @@ namespace Robust.Client { public void Main(IMainArgs args) { - GameController.Start(args.Args, contentStart: false, args); + Start(args.Args, contentStart: false, args); } } } diff --git a/Robust.Client/GameController/GameController.Standalone.cs b/Robust.Client/GameController/GameController.Standalone.cs index f28e59002..5c0c7433e 100644 --- a/Robust.Client/GameController/GameController.Standalone.cs +++ b/Robust.Client/GameController/GameController.Standalone.cs @@ -1,7 +1,5 @@ -using System; -using Robust.Client.Interfaces; +using System; using Robust.LoaderApi; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Timing; diff --git a/Robust.Client/GameObjects/!NO_FOLDER_NAMESPACES b/Robust.Client/GameObjects/!NO_FOLDER_NAMESPACES new file mode 100644 index 000000000..fa62a9e33 --- /dev/null +++ b/Robust.Client/GameObjects/!NO_FOLDER_NAMESPACES @@ -0,0 +1,3 @@ +Everything in this folder and subfolders needs to be in: + +Robust.Client.GameObjects diff --git a/Robust.Client/GameObjects/ClientComponentFactory.cs b/Robust.Client/GameObjects/ClientComponentFactory.cs index 69f7e32bc..333979f1d 100644 --- a/Robust.Client/GameObjects/ClientComponentFactory.cs +++ b/Robust.Client/GameObjects/ClientComponentFactory.cs @@ -1,18 +1,4 @@ -using Robust.Client.GameObjects.Components; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.GameObjects.Components.Containers; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Appearance; -using Robust.Shared.GameObjects.Components.Eye; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Physics; namespace Robust.Client.GameObjects diff --git a/Robust.Client/GameObjects/ClientEntityManager.cs b/Robust.Client/GameObjects/ClientEntityManager.cs index 128b992f2..1cbe34d10 100644 --- a/Robust.Client/GameObjects/ClientEntityManager.cs +++ b/Robust.Client/GameObjects/ClientEntityManager.cs @@ -1,13 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Client.Interfaces.GameObjects; -using Robust.Shared.Exceptions; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Robust.Client/GameObjects/ClientEntityNetworkManager.cs b/Robust.Client/GameObjects/ClientEntityNetworkManager.cs index 7286345a4..4d5b2d3ec 100644 --- a/Robust.Client/GameObjects/ClientEntityNetworkManager.cs +++ b/Robust.Client/GameObjects/ClientEntityNetworkManager.cs @@ -1,13 +1,11 @@ using System; using System.Collections.Generic; -using Robust.Client.Interfaces.GameStates; +using Robust.Client.GameStates; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.Client.GameObjects diff --git a/Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs b/Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs index dc50afe17..ca86a127d 100644 --- a/Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs +++ b/Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs @@ -5,7 +5,7 @@ using Robust.Client.Animations; using Robust.Shared.GameObjects; using static Robust.Client.Animations.AnimationPlaybackShared; -namespace Robust.Client.GameObjects.Components.Animations +namespace Robust.Client.GameObjects { /// /// Plays back s on entities. diff --git a/Robust.Client/GameObjects/Components/Appearance/AppearanceComponent.cs b/Robust.Client/GameObjects/Components/Appearance/AppearanceComponent.cs index 67dea1146..435a017e8 100644 --- a/Robust.Client/GameObjects/Components/Appearance/AppearanceComponent.cs +++ b/Robust.Client/GameObjects/Components/Appearance/AppearanceComponent.cs @@ -1,13 +1,9 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Client.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Appearance; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.ClientContainer.cs b/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.ClientContainer.cs index ad5424c5b..96a467b0d 100644 --- a/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.ClientContainer.cs +++ b/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.ClientContainer.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using Robust.Client.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.ViewVariables; -namespace Robust.Client.GameObjects.Components.Containers +namespace Robust.Client.GameObjects { public sealed partial class ContainerManagerComponent { diff --git a/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.cs b/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.cs index a91abcf66..7ae8a3a60 100644 --- a/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.cs +++ b/Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.cs @@ -2,14 +2,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using Robust.Client.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Containers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.ViewVariables; -namespace Robust.Client.GameObjects.Components.Containers +namespace Robust.Client.GameObjects { public sealed partial class ContainerManagerComponent : SharedContainerManagerComponent { diff --git a/Robust.Client/GameObjects/Components/Eye/EyeComponent.cs b/Robust.Client/GameObjects/Components/Eye/EyeComponent.cs index 43bf7a15e..19fb83b61 100644 --- a/Robust.Client/GameObjects/Components/Eye/EyeComponent.cs +++ b/Robust.Client/GameObjects/Components/Eye/EyeComponent.cs @@ -1,8 +1,5 @@ -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Graphics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Eye; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Client/GameObjects/Components/Icon/IconComponent.cs b/Robust.Client/GameObjects/Components/Icon/IconComponent.cs index 754c54163..7814a44d1 100644 --- a/Robust.Client/GameObjects/Components/Icon/IconComponent.cs +++ b/Robust.Client/GameObjects/Components/Icon/IconComponent.cs @@ -1,9 +1,9 @@ using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Robust.Client/GameObjects/Components/IgnorePauseComponent.cs b/Robust.Client/GameObjects/Components/IgnorePauseComponent.cs index f839ec320..adcc6e91f 100644 --- a/Robust.Client/GameObjects/Components/IgnorePauseComponent.cs +++ b/Robust.Client/GameObjects/Components/IgnorePauseComponent.cs @@ -1,7 +1,6 @@ using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -namespace Robust.Client.GameObjects.Components +namespace Robust.Client.GameObjects { [RegisterComponent] [ComponentReference(typeof(SharedIgnorePauseComponent))] diff --git a/Robust.Client/GameObjects/Components/Input/InputComponent.cs b/Robust.Client/GameObjects/Components/Input/InputComponent.cs index d3cb5fa00..4ad37b7de 100644 --- a/Robust.Client/GameObjects/Components/Input/InputComponent.cs +++ b/Robust.Client/GameObjects/Components/Input/InputComponent.cs @@ -1,10 +1,9 @@ -using Robust.Client.GameObjects.EntitySystems; -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Client.GameObjects.Components +namespace Robust.Client.GameObjects { /// /// Defines data fields used in the . diff --git a/Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs b/Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs index 07cf020dc..b30da7e6f 100644 --- a/Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs +++ b/Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs @@ -1,7 +1,5 @@ using System; -using Robust.Client.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs b/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs index 08a1974ff..ad757b56e 100644 --- a/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs +++ b/Robust.Client/GameObjects/Components/Light/PointLightComponent.cs @@ -1,16 +1,13 @@ -using Robust.Client.GameObjects.EntitySystems; +using System; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; namespace Robust.Client.GameObjects { diff --git a/Robust.Client/Interfaces/GameObjects/IRenderableComponent.cs b/Robust.Client/GameObjects/Components/Renderable/IRenderableComponent.cs similarity index 77% rename from Robust.Client/Interfaces/GameObjects/IRenderableComponent.cs rename to Robust.Client/GameObjects/Components/Renderable/IRenderableComponent.cs index 5c245b1b7..d3b45cb1b 100644 --- a/Robust.Client/Interfaces/GameObjects/IRenderableComponent.cs +++ b/Robust.Client/GameObjects/Components/Renderable/IRenderableComponent.cs @@ -1,9 +1,8 @@ using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.GameObjects +namespace Robust.Client.GameObjects { public interface IRenderableComponent : IComponent { diff --git a/Robust.Client/Interfaces/GameObjects/Components/ISpriteComponent.cs b/Robust.Client/GameObjects/Components/Renderable/ISpriteComponent.cs similarity index 91% rename from Robust.Client/Interfaces/GameObjects/Components/ISpriteComponent.cs rename to Robust.Client/GameObjects/Components/Renderable/ISpriteComponent.cs index 6b170a5ca..2d03969b9 100644 --- a/Robust.Client/Interfaces/GameObjects/Components/ISpriteComponent.cs +++ b/Robust.Client/GameObjects/Components/Renderable/ISpriteComponent.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; -using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Graphics.Shaders; using Robust.Shared.Animations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Utility; -namespace Robust.Client.Interfaces.GameObjects.Components +namespace Robust.Client.GameObjects { public interface ISpriteComponent : IComponent, IAnimationProperties { @@ -205,29 +203,4 @@ namespace Robust.Client.Interfaces.GameObjects.Components IEnumerable AllLayers { get; } } - - public interface ISpriteLayer - { - SpriteComponent.DirectionOffset DirOffset { get; set; } - - RSI? Rsi { get; set; } - RSI.StateId RsiState { get; set; } - RSI? ActualRsi { get; } - - Texture? Texture { get; set; } - - Angle Rotation { get; set; } - Vector2 Scale { get; set; } - - bool Visible { get; set; } - Color Color { get; set; } - - float AnimationTime { get; set; } - int AnimationFrame { get; } - bool AutoAnimated { get; set; } - - RSI.State.Direction EffectiveDirection(Angle worldRotation); - - Vector2 LocalToLayer(Vector2 localPos); - } -} +} \ No newline at end of file diff --git a/Robust.Client/GameObjects/Components/Renderable/ISpriteLayer.cs b/Robust.Client/GameObjects/Components/Renderable/ISpriteLayer.cs new file mode 100644 index 000000000..d1e011c7e --- /dev/null +++ b/Robust.Client/GameObjects/Components/Renderable/ISpriteLayer.cs @@ -0,0 +1,30 @@ +using Robust.Client.Graphics; +using Robust.Shared.Maths; + +namespace Robust.Client.GameObjects +{ + public interface ISpriteLayer + { + SpriteComponent.DirectionOffset DirOffset { get; set; } + + RSI? Rsi { get; set; } + RSI.StateId RsiState { get; set; } + RSI? ActualRsi { get; } + + Texture? Texture { get; set; } + + Angle Rotation { get; set; } + Vector2 Scale { get; set; } + + bool Visible { get; set; } + Color Color { get; set; } + + float AnimationTime { get; set; } + int AnimationFrame { get; } + bool AutoAnimated { get; set; } + + RSI.State.Direction EffectiveDirection(Angle worldRotation); + + Vector2 LocalToLayer(Vector2 localPos); + } +} diff --git a/Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs b/Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs index c4359c531..58e1968be 100644 --- a/Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs +++ b/Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs @@ -1,33 +1,24 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; +using System.Linq; using System.Text; -using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Graphics; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Client.Utility; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Prototypes; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; -using Robust.Shared.Utility; -using System.Linq; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Timing; +using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth; @@ -197,34 +188,34 @@ namespace Robust.Client.GameObjects public void CopyFrom(SpriteComponent other) { //deep copying things to avoid entanglement - this._baseRsi = other._baseRsi; - this._directional = other._directional; - this._visible = other._visible; - this._layerMapShared = other._layerMapShared; - this.color = other.color; - this.offset = other.offset; - this.rotation = other.rotation; - this.scale = other.scale; - this.drawDepth = other.drawDepth; - this.Layers = new List(other.Layers.Count); + _baseRsi = other._baseRsi; + _directional = other._directional; + _visible = other._visible; + _layerMapShared = other._layerMapShared; + color = other.color; + offset = other.offset; + rotation = other.rotation; + scale = other.scale; + drawDepth = other.drawDepth; + Layers = new List(other.Layers.Count); foreach (var otherLayer in other.Layers) { - this.Layers.Add(new Layer(otherLayer, this)); + Layers.Add(new Layer(otherLayer, this)); } - this.IsInert = other.IsInert; - this.LayerMap = other.LayerMap.ToDictionary(entry => entry.Key, + IsInert = other.IsInert; + LayerMap = other.LayerMap.ToDictionary(entry => entry.Key, entry => entry.Value); if (other.PostShader != null) { // only need to copy the shader if it's mutable - this.PostShader = other.PostShader.Mutable ? other.PostShader.Duplicate() : other.PostShader; + PostShader = other.PostShader.Mutable ? other.PostShader.Duplicate() : other.PostShader; } else { - this.PostShader = null; + PostShader = null; } - this.RenderOrder = other.RenderOrder; + RenderOrder = other.RenderOrder; } /// diff --git a/Robust.Client/GameObjects/Components/UserInterface/ClientUserInterfaceComponent.cs b/Robust.Client/GameObjects/Components/UserInterface/ClientUserInterfaceComponent.cs index 075ac22c4..d1250eea8 100644 --- a/Robust.Client/GameObjects/Components/UserInterface/ClientUserInterfaceComponent.cs +++ b/Robust.Client/GameObjects/Components/UserInterface/ClientUserInterfaceComponent.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Players; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; -using IComponent = Robust.Shared.Interfaces.GameObjects.IComponent; -namespace Robust.Client.GameObjects.Components.UserInterface +namespace Robust.Client.GameObjects { public class ClientUserInterfaceComponent : SharedUserInterfaceComponent { diff --git a/Robust.Client/GameObjects/EntityManagerExt.cs b/Robust.Client/GameObjects/EntityManagerExt.cs index ecbbe2fa7..e79933806 100644 --- a/Robust.Client/GameObjects/EntityManagerExt.cs +++ b/Robust.Client/GameObjects/EntityManagerExt.cs @@ -1,7 +1,6 @@ -using Robust.Client.Interfaces.GameStates; +using Robust.Client.GameStates; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Utility; diff --git a/Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs b/Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs index d87156c5b..5b2ad5fb6 100644 --- a/Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs @@ -1,7 +1,6 @@ -using Robust.Client.GameObjects.Components.Animations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { internal sealed class AnimationPlayerSystem : EntitySystem { diff --git a/Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs b/Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs index fb396a91f..25e8b230e 100644 --- a/Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { internal sealed class AppearanceSystem : EntitySystem { diff --git a/Robust.Client/GameObjects/EntitySystems/AppearanceTestSystem.cs b/Robust.Client/GameObjects/EntitySystems/AppearanceTestSystem.cs index bb7b83ecf..68bf03f80 100644 --- a/Robust.Client/GameObjects/EntitySystems/AppearanceTestSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/AppearanceTestSystem.cs @@ -1,6 +1,6 @@ -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { class AppearanceTestSystem : EntitySystem { diff --git a/Robust.Client/GameObjects/EntitySystems/AudioSystem.cs b/Robust.Client/GameObjects/EntitySystems/AudioSystem.cs index 375167ee0..1ffdd21e2 100644 --- a/Robust.Client/GameObjects/EntitySystems/AudioSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/AudioSystem.cs @@ -2,23 +2,18 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Audio; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Utility; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { [UsedImplicitly] public class AudioSystem : EntitySystem diff --git a/Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs b/Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs index fdef5b5b5..f671fcf67 100644 --- a/Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs @@ -3,15 +3,11 @@ using System.Linq; using JetBrains.Annotations; using Robust.Client.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { // NOTE: this class handles both snap grid updates of occluders, as well as occluder tree updates (via its parent). // This seems like it's doing somewhat double work because it already has an update queue for occluders but... diff --git a/Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs b/Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs index 825810b4f..8ffe68b54 100644 --- a/Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { public class ContainerSystem : EntitySystem { diff --git a/Robust.Client/GameObjects/EntitySystems/EffectSystem.cs b/Robust.Client/GameObjects/EntitySystems/EffectSystem.cs index d2775419d..a5017c1f4 100644 --- a/Robust.Client/GameObjects/EntitySystems/EffectSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/EffectSystem.cs @@ -1,25 +1,15 @@ using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using System; using System.Collections.Generic; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics.Overlays; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Log; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.Client.GameObjects diff --git a/Robust.Client/GameObjects/EntitySystems/EyeUpdateSystem.cs b/Robust.Client/GameObjects/EntitySystems/EyeUpdateSystem.cs index ebfa66589..98e895d63 100644 --- a/Robust.Client/GameObjects/EntitySystems/EyeUpdateSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/EyeUpdateSystem.cs @@ -1,8 +1,8 @@ using System; using JetBrains.Annotations; -using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Graphics; using Robust.Client.Physics; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; @@ -10,7 +10,7 @@ using Robust.Shared.Maths; #nullable enable -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { /// /// Updates the position of every Eye every frame, so that the camera follows the player around. diff --git a/Robust.Client/GameObjects/EntitySystems/InputSystem.cs b/Robust.Client/GameObjects/EntitySystems/InputSystem.cs index 28e4294e7..c927a0ba0 100644 --- a/Robust.Client/GameObjects/EntitySystems/InputSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/InputSystem.cs @@ -1,19 +1,15 @@ using System; -using Robust.Client.GameObjects.Components; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Input; +using Robust.Client.GameStates; +using Robust.Client.Input; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input; -using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Players; using Robust.Shared.Utility; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { /// /// Client-side processing of all input commands through the simulation. diff --git a/Robust.Client/GameObjects/EntitySystems/MidiSystem.cs b/Robust.Client/GameObjects/EntitySystems/MidiSystem.cs index 7d457ef83..24f87bfb5 100644 --- a/Robust.Client/GameObjects/EntitySystems/MidiSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/MidiSystem.cs @@ -1,8 +1,8 @@ using Robust.Client.Audio.Midi; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { public class MidiSystem : EntitySystem { diff --git a/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs b/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs index 1fa725e9e..a5cdbf713 100644 --- a/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs @@ -1,16 +1,13 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Physics; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { /// /// Keeps track of s for various rendering-related components. diff --git a/Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs b/Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs index f51ed3382..f0abcdfab 100644 --- a/Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs @@ -1,10 +1,10 @@ using JetBrains.Annotations; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Shared.GameObjects.Systems; +using Robust.Client.Graphics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { /// /// Updates the layer animation for every visible sprite. diff --git a/Robust.Client/GameObjects/EntitySystems/TransformSystem.cs b/Robust.Client/GameObjects/EntitySystems/TransformSystem.cs index 8ff58ef2e..2f9e831cc 100644 --- a/Robust.Client/GameObjects/EntitySystems/TransformSystem.cs +++ b/Robust.Client/GameObjects/EntitySystems/TransformSystem.cs @@ -1,16 +1,14 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -namespace Robust.Client.GameObjects.EntitySystems +namespace Robust.Client.GameObjects { /// /// Handles interpolation of transform positions. diff --git a/Robust.Client/Interfaces/GameObjects/IClientEntityManager.cs b/Robust.Client/GameObjects/IClientEntityManager.cs similarity index 64% rename from Robust.Client/Interfaces/GameObjects/IClientEntityManager.cs rename to Robust.Client/GameObjects/IClientEntityManager.cs index 3c718f5f7..191349d3d 100644 --- a/Robust.Client/Interfaces/GameObjects/IClientEntityManager.cs +++ b/Robust.Client/GameObjects/IClientEntityManager.cs @@ -1,8 +1,7 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using System.Collections.Generic; +using System.Collections.Generic; +using Robust.Shared.GameObjects; -namespace Robust.Client.Interfaces.GameObjects +namespace Robust.Client.GameObjects { public interface IClientEntityManager : IEntityManager { diff --git a/Robust.Client/GameStates/ClientGameStateManager.cs b/Robust.Client/GameStates/ClientGameStateManager.cs index 7d6371eaa..fe1cdd2fd 100644 --- a/Robust.Client/GameStates/ClientGameStateManager.cs +++ b/Robust.Client/GameStates/ClientGameStateManager.cs @@ -1,12 +1,8 @@ using System; using System.Collections.Generic; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Input; +using Robust.Client.GameObjects; +using Robust.Client.Input; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Network.Messages; using Robust.Client.Player; @@ -14,11 +10,9 @@ using Robust.Shared; using Robust.Shared.Configuration; using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Client/GameStates/GameStateProcessor.cs b/Robust.Client/GameStates/GameStateProcessor.cs index 943ce7b77..4f560428b 100644 --- a/Robust.Client/GameStates/GameStateProcessor.cs +++ b/Robust.Client/GameStates/GameStateProcessor.cs @@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Log; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Client/Interfaces/GameStates/IClientGameStateManager.cs b/Robust.Client/GameStates/IClientGameStateManager.cs similarity index 97% rename from Robust.Client/Interfaces/GameStates/IClientGameStateManager.cs rename to Robust.Client/GameStates/IClientGameStateManager.cs index df2c1973d..ce89fefc9 100644 --- a/Robust.Client/Interfaces/GameStates/IClientGameStateManager.cs +++ b/Robust.Client/GameStates/IClientGameStateManager.cs @@ -1,10 +1,9 @@ using System; -using Robust.Client.GameStates; using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Timing; -namespace Robust.Client.Interfaces.GameStates +namespace Robust.Client.GameStates { /// /// Engine service that provides processing and management of game states. diff --git a/Robust.Client/GameStates/NetEntityOverlay.cs b/Robust.Client/GameStates/NetEntityOverlay.cs index 9099ed6d5..23e1dbfc0 100644 --- a/Robust.Client/GameStates/NetEntityOverlay.cs +++ b/Robust.Client/GameStates/NetEntityOverlay.cs @@ -1,20 +1,12 @@ using System.Collections.Generic; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; +using Robust.Shared.Configuration; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; namespace Robust.Client.GameStates diff --git a/Robust.Client/GameStates/NetGraphOverlay.cs b/Robust.Client/GameStates/NetGraphOverlay.cs index ae95248ff..44c9fb643 100644 --- a/Robust.Client/GameStates/NetGraphOverlay.cs +++ b/Robust.Client/GameStates/NetGraphOverlay.cs @@ -1,16 +1,10 @@ using System.Collections.Generic; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; namespace Robust.Client.GameStates diff --git a/Robust.Client/GameStates/NetInterpOverlay.cs b/Robust.Client/GameStates/NetInterpOverlay.cs index 43e8d49de..3a90e005d 100644 --- a/Robust.Client/GameStates/NetInterpOverlay.cs +++ b/Robust.Client/GameStates/NetInterpOverlay.cs @@ -1,16 +1,11 @@ -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.Client.Graphics; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Robust.Client.GameStates { diff --git a/Robust.Client/Graphics/ClientEye/Eye.cs b/Robust.Client/Graphics/ClientEye/Eye.cs index de1c992b5..e6cc123b6 100644 --- a/Robust.Client/Graphics/ClientEye/Eye.cs +++ b/Robust.Client/Graphics/ClientEye/Eye.cs @@ -1,11 +1,10 @@ -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Shared.Map; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; #nullable enable -namespace Robust.Client.Graphics.ClientEye +namespace Robust.Client.Graphics { /// public class Eye : IEye diff --git a/Robust.Client/Graphics/ClientEye/EyeManager.cs b/Robust.Client/Graphics/ClientEye/EyeManager.cs index 8419b7add..ee28ea36f 100644 --- a/Robust.Client/Graphics/ClientEye/EyeManager.cs +++ b/Robust.Client/Graphics/ClientEye/EyeManager.cs @@ -1,13 +1,11 @@ -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; #nullable enable -namespace Robust.Client.Graphics.ClientEye +namespace Robust.Client.Graphics { /// public sealed class EyeManager : IEyeManager diff --git a/Robust.Client/Graphics/ClientEye/FixedEye.cs b/Robust.Client/Graphics/ClientEye/FixedEye.cs index 50665ba6a..e3c92fbe5 100644 --- a/Robust.Client/Graphics/ClientEye/FixedEye.cs +++ b/Robust.Client/Graphics/ClientEye/FixedEye.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Graphics.ClientEye +namespace Robust.Client.Graphics { /// /// A fixed eye is an eye which is fixed to one point, its position. diff --git a/Robust.Client/Interfaces/Graphics/ClientEye/IEye.cs b/Robust.Client/Graphics/ClientEye/IEye.cs similarity index 96% rename from Robust.Client/Interfaces/Graphics/ClientEye/IEye.cs rename to Robust.Client/Graphics/ClientEye/IEye.cs index f7055e48c..790a195b9 100644 --- a/Robust.Client/Interfaces/Graphics/ClientEye/IEye.cs +++ b/Robust.Client/Graphics/ClientEye/IEye.cs @@ -2,7 +2,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics.ClientEye +namespace Robust.Client.Graphics { /// /// An Eye is a point through which the player can view the world. diff --git a/Robust.Client/Interfaces/Graphics/ClientEye/IEyeManager.cs b/Robust.Client/Graphics/ClientEye/IEyeManager.cs similarity index 98% rename from Robust.Client/Interfaces/Graphics/ClientEye/IEyeManager.cs rename to Robust.Client/Graphics/ClientEye/IEyeManager.cs index 9b43556d0..a800b04f7 100644 --- a/Robust.Client/Interfaces/Graphics/ClientEye/IEyeManager.cs +++ b/Robust.Client/Graphics/ClientEye/IEyeManager.cs @@ -1,7 +1,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics.ClientEye +namespace Robust.Client.Graphics { /// /// Keeps a reference to the current eye (camera) that the client is seeing though, and provides diff --git a/Robust.Client/Graphics/Clyde/Audio/Clyde.Audio.cs b/Robust.Client/Graphics/Clyde/Audio/Clyde.Audio.cs index 2f0f675d3..e605b5f31 100644 --- a/Robust.Client/Graphics/Clyde/Audio/Clyde.Audio.cs +++ b/Robust.Client/Graphics/Clyde/Audio/Clyde.Audio.cs @@ -8,7 +8,6 @@ using System.Threading; using OpenToolkit.Audio.OpenAL; using OpenToolkit.Audio.OpenAL.Extensions.Creative.EFX; using Robust.Client.Audio; -using Robust.Client.Interfaces.Graphics; using Robust.Shared; using Robust.Shared.Log; using Vector2 = Robust.Shared.Maths.Vector2; diff --git a/Robust.Client/Graphics/Clyde/Clyde.Constants.cs b/Robust.Client/Graphics/Clyde/Clyde.Constants.cs index d0d001de6..0b203e566 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Constants.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Constants.cs @@ -1,6 +1,3 @@ -using Robust.Client.Graphics.ClientEye; -using Robust.Shared.Maths; - namespace Robust.Client.Graphics.Clyde { internal sealed partial class Clyde diff --git a/Robust.Client/Graphics/Clyde/Clyde.Cursor.cs b/Robust.Client/Graphics/Clyde/Clyde.Cursor.cs index 2526b4a04..8e7d6320d 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Cursor.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Cursor.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using OpenToolkit.GraphicsLibraryFramework; -using Robust.Client.Interfaces.Graphics; using Robust.Client.Utility; using Robust.Shared.Maths; using SixLabors.ImageSharp; diff --git a/Robust.Client/Graphics/Clyde/Clyde.Debug.cs b/Robust.Client/Graphics/Clyde/Clyde.Debug.cs index 14bcf5134..e9763a08e 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Debug.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Debug.cs @@ -1,5 +1,3 @@ -using Robust.Client.Interfaces.Graphics; - namespace Robust.Client.Graphics.Clyde { internal sealed partial class Clyde diff --git a/Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs b/Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs index fbcc887b4..680a2a8f4 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs @@ -2,8 +2,7 @@ using System.Buffers; using System.Collections.Generic; using OpenToolkit.Graphics.OpenGL4; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Client/Graphics/Clyde/Clyde.HLR.cs b/Robust.Client/Graphics/Clyde/Clyde.HLR.cs index 13b83bf1c..cc7998d14 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.HLR.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.HLR.cs @@ -3,15 +3,9 @@ using System.Buffers; using System.Collections.Generic; using System.Runtime.CompilerServices; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics; using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Physics; using Robust.Shared.Utility; namespace Robust.Client.Graphics.Clyde diff --git a/Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs b/Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs index 4ed88cc6a..f4f0d70c1 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs @@ -3,13 +3,8 @@ using System.Collections.Generic; using System.Buffers; using OpenToolkit.Graphics.OpenGL4; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.ResourceManagement.ResourceTypes; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Client/Graphics/Clyde/Clyde.RenderHandle.cs b/Robust.Client/Graphics/Clyde/Clyde.RenderHandle.cs index 45c0363a7..4727752cf 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.RenderHandle.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.RenderHandle.cs @@ -1,11 +1,7 @@ using System; using System.Runtime.InteropServices; using Robust.Client.GameObjects; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Robust.Client.Graphics.Clyde diff --git a/Robust.Client/Graphics/Clyde/Clyde.RenderTargets.cs b/Robust.Client/Graphics/Clyde/Clyde.RenderTargets.cs index c648ee8a9..2ed849576 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.RenderTargets.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.RenderTargets.cs @@ -3,13 +3,12 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Runtime.CompilerServices; using OpenToolkit.Graphics.OpenGL4; -using Robust.Client.Interfaces.Graphics; using Robust.Shared.Maths; using Robust.Shared.Utility; using Robust.Shared.Log; // ReSharper disable once IdentifierTypo -using RTCF = Robust.Client.Interfaces.Graphics.RenderTargetColorFormat; +using RTCF = Robust.Client.Graphics.RenderTargetColorFormat; using PIF = OpenToolkit.Graphics.OpenGL4.PixelInternalFormat; using PF = OpenToolkit.Graphics.OpenGL4.PixelFormat; using PT = OpenToolkit.Graphics.OpenGL4.PixelType; diff --git a/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs b/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs index c9def5e1d..1c2522a4b 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Rendering.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; @@ -6,11 +6,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using OpenToolkit.Graphics.OpenGL4; using Robust.Client.GameObjects; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Utility; using Robust.Shared.Log; using Robust.Shared.Maths; @@ -18,7 +13,7 @@ using Robust.Shared.Utility; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using Color = Robust.Shared.Maths.Color; -using StencilOp = OpenToolkit.Graphics.OpenGL4.StencilOp; +using TKStencilOp = OpenToolkit.Graphics.OpenGL4.StencilOp; namespace Robust.Client.Graphics.Clyde { @@ -438,7 +433,7 @@ namespace Robust.Client.Graphics.Clyde CheckGlError(); GL.StencilFunc(ToGLStencilFunc(instance.Stencil.Func), instance.Stencil.Ref, instance.Stencil.ReadMask); CheckGlError(); - GL.StencilOp(StencilOp.Keep, StencilOp.Keep, ToGLStencilOp(instance.Stencil.Op)); + GL.StencilOp(TKStencilOp.Keep, TKStencilOp.Keep, ToGLStencilOp(instance.Stencil.Op)); CheckGlError(); } else if (_isStencilling) @@ -716,18 +711,18 @@ namespace Robust.Client.Graphics.Clyde _debugStats.LastBatches += 1; } - private static StencilOp ToGLStencilOp(Shaders.StencilOp op) + private static TKStencilOp ToGLStencilOp(StencilOp op) { return op switch { - Shaders.StencilOp.Keep => StencilOp.Keep, - Shaders.StencilOp.Zero => StencilOp.Zero, - Shaders.StencilOp.Replace => StencilOp.Replace, - Shaders.StencilOp.IncrementClamp => StencilOp.Incr, - Shaders.StencilOp.IncrementWrap => StencilOp.IncrWrap, - Shaders.StencilOp.DecrementClamp => StencilOp.Decr, - Shaders.StencilOp.DecrementWrap => StencilOp.DecrWrap, - Shaders.StencilOp.Invert => StencilOp.Invert, + StencilOp.Keep => TKStencilOp.Keep, + StencilOp.Zero => TKStencilOp.Zero, + StencilOp.Replace => TKStencilOp.Replace, + StencilOp.IncrementClamp => TKStencilOp.Incr, + StencilOp.IncrementWrap => TKStencilOp.IncrWrap, + StencilOp.DecrementClamp => TKStencilOp.Decr, + StencilOp.DecrementWrap => TKStencilOp.DecrWrap, + StencilOp.Invert => TKStencilOp.Invert, _ => throw new NotSupportedException() }; } diff --git a/Robust.Client/Graphics/Clyde/Clyde.Shaders.cs b/Robust.Client/Graphics/Clyde/Clyde.Shaders.cs index 74bbf81a7..2f2a82c82 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Shaders.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Shaders.cs @@ -4,11 +4,10 @@ using System.Collections.Generic; using System.IO; using System.Text; using OpenToolkit.Graphics.OpenGL4; -using Robust.Client.Graphics.Shaders; using Robust.Client.ResourceManagement.ResourceTypes; using Robust.Shared.Maths; using Robust.Shared.Utility; -using StencilOp = Robust.Client.Graphics.Shaders.StencilOp; +using StencilOp = Robust.Client.Graphics.StencilOp; namespace Robust.Client.Graphics.Clyde { @@ -184,7 +183,7 @@ namespace Robust.Client.Graphics.Clyde } catch (ShaderCompilationException e) { - System.IO.File.WriteAllText("error.glsl", vertexSource); + File.WriteAllText("error.glsl", vertexSource); throw new ShaderCompilationException( "Failed to compile vertex shader, see inner for details (and error.glsl for formatted source).", e); } @@ -195,7 +194,7 @@ namespace Robust.Client.Graphics.Clyde } catch (ShaderCompilationException e) { - System.IO.File.WriteAllText("error.glsl", fragmentSource); + File.WriteAllText("error.glsl", fragmentSource); throw new ShaderCompilationException( "Failed to compile fragment shader, see inner for details (and error.glsl for formatted source).", e); } diff --git a/Robust.Client/Graphics/Clyde/Clyde.Textures.cs b/Robust.Client/Graphics/Clyde/Clyde.Textures.cs index 7510583a6..ab3d3a5fd 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Textures.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Textures.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.IO; using System.Threading; using OpenToolkit.Graphics.OpenGL4; -using Robust.Client.Interfaces.Graphics; using Robust.Client.Utility; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/Graphics/Clyde/Clyde.Viewport.cs b/Robust.Client/Graphics/Clyde/Clyde.Viewport.cs index 38a2c3d68..c723af4ca 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Viewport.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Viewport.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Shared.Maths; namespace Robust.Client.Graphics.Clyde diff --git a/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs b/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs index 37835f175..ea7acd8df 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs @@ -8,8 +8,7 @@ using System.Threading; using OpenToolkit; using OpenToolkit.Graphics.OpenGL4; using Robust.Client.Input; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.UserInterface; using Robust.Client.Utility; using Robust.Shared; using Robust.Shared.Localization; diff --git a/Robust.Client/Graphics/Clyde/Clyde.cs b/Robust.Client/Graphics/Clyde/Clyde.cs index 57a1807b8..fccbd05bd 100644 --- a/Robust.Client/Graphics/Clyde/Clyde.cs +++ b/Robust.Client/Graphics/Clyde/Clyde.cs @@ -4,21 +4,14 @@ using System.Diagnostics; using System.Globalization; using System.Runtime.InteropServices; using OpenToolkit.Graphics.OpenGL4; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Lighting; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Map; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Map; +using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; using Robust.Shared; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Timing; using SixLabors.ImageSharp; diff --git a/Robust.Client/Graphics/Clyde/ClydeHeadless.cs b/Robust.Client/Graphics/Clyde/ClydeHeadless.cs index b39c4cd30..d0ac32288 100644 --- a/Robust.Client/Graphics/Clyde/ClydeHeadless.cs +++ b/Robust.Client/Graphics/Clyde/ClydeHeadless.cs @@ -2,10 +2,7 @@ using System.IO; using JetBrains.Annotations; using Robust.Client.Audio; -using Robust.Client.Graphics.Shaders; using Robust.Client.Input; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Shared.Maths; using Robust.Shared.Timing; using SixLabors.ImageSharp; diff --git a/Robust.Client/Graphics/Clyde/GLObjects/Clyde.ShaderProgram.cs b/Robust.Client/Graphics/Clyde/GLObjects/Clyde.ShaderProgram.cs index 168e621de..c8d49e147 100644 --- a/Robust.Client/Graphics/Clyde/GLObjects/Clyde.ShaderProgram.cs +++ b/Robust.Client/Graphics/Clyde/GLObjects/Clyde.ShaderProgram.cs @@ -16,7 +16,7 @@ namespace Robust.Client.Graphics.Clyde /// private class GLShaderProgram { - private readonly sbyte?[] _uniformIntCache = new sbyte?[Clyde.UniCount]; + private readonly sbyte?[] _uniformIntCache = new sbyte?[UniCount]; private readonly Dictionary _uniformCache = new(); private uint _handle = 0; private GLShader? _fragmentShader; diff --git a/Robust.Client/Graphics/Clyde/GLObjects/Clyde.UniformBuffer.cs b/Robust.Client/Graphics/Clyde/GLObjects/Clyde.UniformBuffer.cs index fe3e4a6b8..dca2088d4 100644 --- a/Robust.Client/Graphics/Clyde/GLObjects/Clyde.UniformBuffer.cs +++ b/Robust.Client/Graphics/Clyde/GLObjects/Clyde.UniformBuffer.cs @@ -1,8 +1,5 @@ -using System; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; using OpenToolkit.Graphics.OpenGL4; -using Robust.Shared.Utility; namespace Robust.Client.Graphics.Clyde { diff --git a/Robust.Client/Graphics/ClydeBase.cs b/Robust.Client/Graphics/ClydeBase.cs index a02787ffa..a8ddb0e2e 100644 --- a/Robust.Client/Graphics/ClydeBase.cs +++ b/Robust.Client/Graphics/ClydeBase.cs @@ -1,8 +1,6 @@ using System; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Graphics; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Robust.Client/Interfaces/Graphics/ClydeDebugLayers.cs b/Robust.Client/Graphics/ClydeDebugLayers.cs similarity index 69% rename from Robust.Client/Interfaces/Graphics/ClydeDebugLayers.cs rename to Robust.Client/Graphics/ClydeDebugLayers.cs index c5e6cea1b..b7719c659 100644 --- a/Robust.Client/Interfaces/Graphics/ClydeDebugLayers.cs +++ b/Robust.Client/Graphics/ClydeDebugLayers.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { internal enum ClydeDebugLayers : byte { diff --git a/Robust.Client/Interfaces/Graphics/ClydeStockTexture.cs b/Robust.Client/Graphics/ClydeStockTexture.cs similarity index 71% rename from Robust.Client/Interfaces/Graphics/ClydeStockTexture.cs rename to Robust.Client/Graphics/ClydeStockTexture.cs index 021a24694..0a93a3e11 100644 --- a/Robust.Client/Interfaces/Graphics/ClydeStockTexture.cs +++ b/Robust.Client/Graphics/ClydeStockTexture.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { internal enum ClydeStockTexture : byte { diff --git a/Robust.Client/Graphics/Drawing/DrawPrimitiveTopology.cs b/Robust.Client/Graphics/Drawing/DrawPrimitiveTopology.cs index 788993325..c8fb023d1 100644 --- a/Robust.Client/Graphics/Drawing/DrawPrimitiveTopology.cs +++ b/Robust.Client/Graphics/Drawing/DrawPrimitiveTopology.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { /// /// Determines the type of primitives drawn and how they are laid out from vertices. diff --git a/Robust.Client/Graphics/Drawing/DrawingHandleBase.cs b/Robust.Client/Graphics/Drawing/DrawingHandleBase.cs index 77f0e04e3..c4e7ffe13 100644 --- a/Robust.Client/Graphics/Drawing/DrawingHandleBase.cs +++ b/Robust.Client/Graphics/Drawing/DrawingHandleBase.cs @@ -1,9 +1,8 @@ using System; using System.Diagnostics; -using Robust.Client.Graphics.Shaders; using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { /// /// Used for doing direct drawing without sprite components, existing GUI controls, etc... diff --git a/Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs b/Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs index 6c33d39e9..d52cb0f47 100644 --- a/Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs +++ b/Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs @@ -1,7 +1,7 @@ using System; using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { public abstract class DrawingHandleScreen : DrawingHandleBase { diff --git a/Robust.Client/Graphics/Drawing/DrawingHandleWorld.cs b/Robust.Client/Graphics/Drawing/DrawingHandleWorld.cs index 15d87fe5c..d35051458 100644 --- a/Robust.Client/Graphics/Drawing/DrawingHandleWorld.cs +++ b/Robust.Client/Graphics/Drawing/DrawingHandleWorld.cs @@ -1,7 +1,6 @@ -using Robust.Client.Graphics.ClientEye; using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { public abstract class DrawingHandleWorld : DrawingHandleBase { diff --git a/Robust.Client/Graphics/Drawing/StyleBox.cs b/Robust.Client/Graphics/Drawing/StyleBox.cs index 76cd16213..cbb50645d 100644 --- a/Robust.Client/Graphics/Drawing/StyleBox.cs +++ b/Robust.Client/Graphics/Drawing/StyleBox.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { /// /// This is for drawing modestly fancy boxes using minimal code. diff --git a/Robust.Client/Graphics/Drawing/StyleBoxEmpty.cs b/Robust.Client/Graphics/Drawing/StyleBoxEmpty.cs index 2f4cbf277..17b3cf067 100644 --- a/Robust.Client/Graphics/Drawing/StyleBoxEmpty.cs +++ b/Robust.Client/Graphics/Drawing/StyleBoxEmpty.cs @@ -1,6 +1,6 @@ using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { public class StyleBoxEmpty : StyleBox { diff --git a/Robust.Client/Graphics/Drawing/StyleBoxFlat.cs b/Robust.Client/Graphics/Drawing/StyleBoxFlat.cs index bfc5014b8..632afb7e6 100644 --- a/Robust.Client/Graphics/Drawing/StyleBoxFlat.cs +++ b/Robust.Client/Graphics/Drawing/StyleBoxFlat.cs @@ -1,6 +1,6 @@ using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { public class StyleBoxFlat : StyleBox { diff --git a/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs b/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs index 50c87a495..29b509e1e 100644 --- a/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs +++ b/Robust.Client/Graphics/Drawing/StyleBoxTexture.cs @@ -2,7 +2,7 @@ using System; using Robust.Shared.Maths; using Robust.Shared.Utility; -namespace Robust.Client.Graphics.Drawing +namespace Robust.Client.Graphics { /// /// Style box based on a 9-patch texture. diff --git a/Robust.Client/Graphics/Font.cs b/Robust.Client/Graphics/Font.cs index eeaabf7df..11c0ec5f3 100644 --- a/Robust.Client/Graphics/Font.cs +++ b/Robust.Client/Graphics/Font.cs @@ -1,10 +1,7 @@ using System; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Graphics; using Robust.Client.ResourceManagement; using Robust.Shared.IoC; using Robust.Shared.Maths; -using Robust.Shared.Utility; namespace Robust.Client.Graphics { diff --git a/Robust.Client/Graphics/FontManager.cs b/Robust.Client/Graphics/FontManager.cs index 9318c1794..d497f6559 100644 --- a/Robust.Client/Graphics/FontManager.cs +++ b/Robust.Client/Graphics/FontManager.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.IO; using System.Text; using JetBrains.Annotations; -using Robust.Client.Interfaces.Graphics; using Robust.Client.Utility; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/Interfaces/Graphics/IClyde.cs b/Robust.Client/Graphics/IClyde.cs similarity index 98% rename from Robust.Client/Interfaces/Graphics/IClyde.cs rename to Robust.Client/Graphics/IClyde.cs index 240a5925d..389bb1525 100644 --- a/Robust.Client/Interfaces/Graphics/IClyde.cs +++ b/Robust.Client/Graphics/IClyde.cs @@ -1,12 +1,11 @@ using System; using System.IO; using System.Threading.Tasks; +using Robust.Shared.Maths; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; -using Robust.Client.Graphics; -using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public interface IClyde { diff --git a/Robust.Client/Interfaces/Graphics/IClydeAudio.cs b/Robust.Client/Graphics/IClydeAudio.cs similarity index 91% rename from Robust.Client/Interfaces/Graphics/IClydeAudio.cs rename to Robust.Client/Graphics/IClydeAudio.cs index 705c8cc32..03cb1ec05 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeAudio.cs +++ b/Robust.Client/Graphics/IClydeAudio.cs @@ -1,7 +1,7 @@ using System.IO; using Robust.Client.Audio; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public interface IClydeAudio { diff --git a/Robust.Client/Interfaces/Graphics/IClydeAudioSource.cs b/Robust.Client/Graphics/IClydeAudioSource.cs similarity index 92% rename from Robust.Client/Interfaces/Graphics/IClydeAudioSource.cs rename to Robust.Client/Graphics/IClydeAudioSource.cs index 1fa7ea2d0..be253a20e 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeAudioSource.cs +++ b/Robust.Client/Graphics/IClydeAudioSource.cs @@ -2,7 +2,7 @@ using System; using JetBrains.Annotations; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public interface IClydeAudioSource : IDisposable { diff --git a/Robust.Client/Interfaces/Graphics/IClydeBufferedAudioSource.cs b/Robust.Client/Graphics/IClydeBufferedAudioSource.cs similarity index 90% rename from Robust.Client/Interfaces/Graphics/IClydeBufferedAudioSource.cs rename to Robust.Client/Graphics/IClydeBufferedAudioSource.cs index a83bc698c..eccda3dc7 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeBufferedAudioSource.cs +++ b/Robust.Client/Graphics/IClydeBufferedAudioSource.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public interface IClydeBufferedAudioSource : IClydeAudioSource { diff --git a/Robust.Client/Interfaces/Graphics/IClydeDebugInfo.cs b/Robust.Client/Graphics/IClydeDebugInfo.cs similarity index 84% rename from Robust.Client/Interfaces/Graphics/IClydeDebugInfo.cs rename to Robust.Client/Graphics/IClydeDebugInfo.cs index 509f34f25..e0301fd3f 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeDebugInfo.cs +++ b/Robust.Client/Graphics/IClydeDebugInfo.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { internal interface IClydeDebugInfo { diff --git a/Robust.Client/Interfaces/Graphics/IClydeDebugStats.cs b/Robust.Client/Graphics/IClydeDebugStats.cs similarity index 91% rename from Robust.Client/Interfaces/Graphics/IClydeDebugStats.cs rename to Robust.Client/Graphics/IClydeDebugStats.cs index f24279cbb..57d4e6ce5 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeDebugStats.cs +++ b/Robust.Client/Graphics/IClydeDebugStats.cs @@ -1,6 +1,4 @@ -using Robust.Client.Graphics.Drawing; - -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// Provides frame statistics about rendering. diff --git a/Robust.Client/Interfaces/Graphics/IClydeInternal.cs b/Robust.Client/Graphics/IClydeInternal.cs similarity index 88% rename from Robust.Client/Interfaces/Graphics/IClydeInternal.cs rename to Robust.Client/Graphics/IClydeInternal.cs index af2d39a83..c69ce2385 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeInternal.cs +++ b/Robust.Client/Graphics/IClydeInternal.cs @@ -1,12 +1,9 @@ -using Robust.Client.Graphics; -using Robust.Client.Graphics.Shaders; using Robust.Client.Input; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.UserInterface; using Robust.Shared.Maths; using Robust.Shared.Timing; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { internal interface IClydeInternal : IClyde, IClipboardManager { diff --git a/Robust.Client/Interfaces/Graphics/IClydeViewport.cs b/Robust.Client/Graphics/IClydeViewport.cs similarity index 88% rename from Robust.Client/Interfaces/Graphics/IClydeViewport.cs rename to Robust.Client/Graphics/IClydeViewport.cs index 64a5b6ecd..50519be76 100644 --- a/Robust.Client/Interfaces/Graphics/IClydeViewport.cs +++ b/Robust.Client/Graphics/IClydeViewport.cs @@ -1,8 +1,7 @@ using System; -using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// A viewport is an API for rendering a section of the game map centered around an eye, diff --git a/Robust.Client/Interfaces/Graphics/ICursor.cs b/Robust.Client/Graphics/ICursor.cs similarity index 92% rename from Robust.Client/Interfaces/Graphics/ICursor.cs rename to Robust.Client/Graphics/ICursor.cs index 5d6bb3bd3..54a0ed3a0 100644 --- a/Robust.Client/Interfaces/Graphics/ICursor.cs +++ b/Robust.Client/Graphics/ICursor.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// Represents a handle to a cursor object. diff --git a/Robust.Client/Graphics/IDirectionalTextureProvider.cs b/Robust.Client/Graphics/IDirectionalTextureProvider.cs index dd88f7c16..113be9a14 100644 --- a/Robust.Client/Graphics/IDirectionalTextureProvider.cs +++ b/Robust.Client/Graphics/IDirectionalTextureProvider.cs @@ -1,9 +1,4 @@ using Robust.Shared.Maths; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Robust.Client.Graphics { diff --git a/Robust.Client/Interfaces/Graphics/IFontManager.cs b/Robust.Client/Graphics/IFontManager.cs similarity index 96% rename from Robust.Client/Interfaces/Graphics/IFontManager.cs rename to Robust.Client/Graphics/IFontManager.cs index bae426d74..b9dd469d9 100644 --- a/Robust.Client/Interfaces/Graphics/IFontManager.cs +++ b/Robust.Client/Graphics/IFontManager.cs @@ -1,8 +1,7 @@ using System.IO; using System.Text; -using Robust.Client.Graphics; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public interface IFontManager { diff --git a/Robust.Client/Interfaces/Graphics/IRenderHandle.cs b/Robust.Client/Graphics/IRenderHandle.cs similarity index 73% rename from Robust.Client/Interfaces/Graphics/IRenderHandle.cs rename to Robust.Client/Graphics/IRenderHandle.cs index 8d9ace669..a75f65d81 100644 --- a/Robust.Client/Interfaces/Graphics/IRenderHandle.cs +++ b/Robust.Client/Graphics/IRenderHandle.cs @@ -1,8 +1,7 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { internal interface IRenderHandle { diff --git a/Robust.Client/Interfaces/Graphics/IRenderTarget.cs b/Robust.Client/Graphics/IRenderTarget.cs similarity index 88% rename from Robust.Client/Interfaces/Graphics/IRenderTarget.cs rename to Robust.Client/Graphics/IRenderTarget.cs index 59e2ef88a..140e05e2f 100644 --- a/Robust.Client/Interfaces/Graphics/IRenderTarget.cs +++ b/Robust.Client/Graphics/IRenderTarget.cs @@ -1,7 +1,7 @@ using System; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// Represents something that can be rendered to. diff --git a/Robust.Client/Interfaces/Graphics/IRenderTexture.cs b/Robust.Client/Graphics/IRenderTexture.cs similarity index 81% rename from Robust.Client/Interfaces/Graphics/IRenderTexture.cs rename to Robust.Client/Graphics/IRenderTexture.cs index 81b53e7bf..f6c0b6ce4 100644 --- a/Robust.Client/Interfaces/Graphics/IRenderTexture.cs +++ b/Robust.Client/Graphics/IRenderTexture.cs @@ -1,6 +1,4 @@ -using Robust.Client.Graphics; - -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// A render target that renders into a texture that can be re-used later. diff --git a/Robust.Client/Interfaces/Graphics/IRenderWindow.cs b/Robust.Client/Graphics/IRenderWindow.cs similarity index 80% rename from Robust.Client/Interfaces/Graphics/IRenderWindow.cs rename to Robust.Client/Graphics/IRenderWindow.cs index 7a8bb560f..216690594 100644 --- a/Robust.Client/Interfaces/Graphics/IRenderWindow.cs +++ b/Robust.Client/Graphics/IRenderWindow.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// A render target that represents the contents of an OS window. diff --git a/Robust.Client/Interfaces/Graphics/Lighting/ILightManager.cs b/Robust.Client/Graphics/Lighting/ILightManager.cs similarity index 95% rename from Robust.Client/Interfaces/Graphics/Lighting/ILightManager.cs rename to Robust.Client/Graphics/Lighting/ILightManager.cs index 20622a23a..785cdf670 100644 --- a/Robust.Client/Interfaces/Graphics/Lighting/ILightManager.cs +++ b/Robust.Client/Graphics/Lighting/ILightManager.cs @@ -1,6 +1,6 @@ using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics.Lighting +namespace Robust.Client.Graphics { public interface ILightManager { diff --git a/Robust.Client/Graphics/Lighting/LightManager.cs b/Robust.Client/Graphics/Lighting/LightManager.cs index 200fcc655..19bb4c498 100644 --- a/Robust.Client/Graphics/Lighting/LightManager.cs +++ b/Robust.Client/Graphics/Lighting/LightManager.cs @@ -1,7 +1,6 @@ -using Robust.Client.Interfaces.Graphics.Lighting; -using Robust.Shared.Maths; +using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Lighting +namespace Robust.Client.Graphics { public sealed class LightManager : ILightManager { diff --git a/Robust.Client/Interfaces/Graphics/OpenGLVersion.cs b/Robust.Client/Graphics/OpenGLVersion.cs similarity index 92% rename from Robust.Client/Interfaces/Graphics/OpenGLVersion.cs rename to Robust.Client/Graphics/OpenGLVersion.cs index 738920463..66bfec921 100644 --- a/Robust.Client/Interfaces/Graphics/OpenGLVersion.cs +++ b/Robust.Client/Graphics/OpenGLVersion.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public readonly struct OpenGLVersion { diff --git a/Robust.Client/Interfaces/Graphics/Overlays/IOverlayManager.cs b/Robust.Client/Graphics/Overlays/IOverlayManager.cs similarity index 89% rename from Robust.Client/Interfaces/Graphics/Overlays/IOverlayManager.cs rename to Robust.Client/Graphics/Overlays/IOverlayManager.cs index f891a2daa..7f02dbdb7 100644 --- a/Robust.Client/Interfaces/Graphics/Overlays/IOverlayManager.cs +++ b/Robust.Client/Graphics/Overlays/IOverlayManager.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; -using Robust.Client.Graphics.Overlays; using Robust.Shared.Timing; -namespace Robust.Client.Interfaces.Graphics.Overlays +namespace Robust.Client.Graphics { [PublicAPI] public interface IOverlayManager diff --git a/Robust.Client/Graphics/Overlays/Overlay.cs b/Robust.Client/Graphics/Overlays/Overlay.cs index 2f458cd3a..eed034e2f 100644 --- a/Robust.Client/Graphics/Overlays/Overlay.cs +++ b/Robust.Client/Graphics/Overlays/Overlay.cs @@ -1,15 +1,10 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Shared.IoC; -using System; +using System; using System.Collections.Generic; using JetBrains.Annotations; -using Robust.Client.Graphics.Clyde; -using Robust.Client.Interfaces.Graphics; +using Robust.Shared.IoC; using Robust.Shared.Timing; -namespace Robust.Client.Graphics.Overlays +namespace Robust.Client.Graphics { /// /// An overlay is used for fullscreen drawing in the game, for example parallax. diff --git a/Robust.Client/Graphics/Overlays/OverlayManager.cs b/Robust.Client/Graphics/Overlays/OverlayManager.cs index 069ce59f4..ebfddb1c9 100644 --- a/Robust.Client/Graphics/Overlays/OverlayManager.cs +++ b/Robust.Client/Graphics/Overlays/OverlayManager.cs @@ -1,14 +1,9 @@ -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using System; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Robust.Shared.Timing; -using Robust.Shared.Utility; -namespace Robust.Client.Graphics.Overlays +namespace Robust.Client.Graphics { internal class OverlayManager : IOverlayManagerInternal { diff --git a/Robust.Client/Graphics/RSI/RSI.cs b/Robust.Client/Graphics/RSI/RSI.cs index 02dcb019c..4856588bb 100644 --- a/Robust.Client/Graphics/RSI/RSI.cs +++ b/Robust.Client/Graphics/RSI/RSI.cs @@ -2,11 +2,9 @@ using System.Collections.Generic; using System.Collections; using System.Diagnostics.CodeAnalysis; -using System.Linq; using Robust.Shared.Maths; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using SixLabors.ImageSharp.Processing.Processors.Dithering; namespace Robust.Client.Graphics { diff --git a/Robust.Client/Interfaces/Graphics/RenderTargetColorFormat.cs b/Robust.Client/Graphics/RenderTargetColorFormat.cs similarity index 93% rename from Robust.Client/Interfaces/Graphics/RenderTargetColorFormat.cs rename to Robust.Client/Graphics/RenderTargetColorFormat.cs index fdf202301..3aeebb266 100644 --- a/Robust.Client/Interfaces/Graphics/RenderTargetColorFormat.cs +++ b/Robust.Client/Graphics/RenderTargetColorFormat.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// Formats for the color component of a render target. diff --git a/Robust.Client/Interfaces/Graphics/RenderTargetCreationParameters.cs b/Robust.Client/Graphics/RenderTargetCreationParameters.cs similarity index 92% rename from Robust.Client/Interfaces/Graphics/RenderTargetCreationParameters.cs rename to Robust.Client/Graphics/RenderTargetCreationParameters.cs index 0325ed18a..6b7ab9cbd 100644 --- a/Robust.Client/Interfaces/Graphics/RenderTargetCreationParameters.cs +++ b/Robust.Client/Graphics/RenderTargetCreationParameters.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public struct RenderTargetFormatParameters { diff --git a/Robust.Client/Interfaces/Graphics/ScreenshotType.cs b/Robust.Client/Graphics/ScreenshotType.cs similarity index 66% rename from Robust.Client/Interfaces/Graphics/ScreenshotType.cs rename to Robust.Client/Graphics/ScreenshotType.cs index fc825e4df..94cc5f759 100644 --- a/Robust.Client/Interfaces/Graphics/ScreenshotType.cs +++ b/Robust.Client/Graphics/ScreenshotType.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public enum ScreenshotType : byte { diff --git a/Robust.Client/Graphics/Shaders/Params.cs b/Robust.Client/Graphics/Shaders/Params.cs index 9552ad240..315e17379 100644 --- a/Robust.Client/Graphics/Shaders/Params.cs +++ b/Robust.Client/Graphics/Shaders/Params.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { public enum ShaderParamType : byte { diff --git a/Robust.Client/Graphics/Shaders/ParsedShader.cs b/Robust.Client/Graphics/Shaders/ParsedShader.cs index 1d9875e1a..69a0ce878 100644 --- a/Robust.Client/Graphics/Shaders/ParsedShader.cs +++ b/Robust.Client/Graphics/Shaders/ParsedShader.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Robust.Shared.Utility; -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { internal sealed class ParsedShader { diff --git a/Robust.Client/Graphics/Shaders/ShaderInstance.cs b/Robust.Client/Graphics/Shaders/ShaderInstance.cs index df478a30b..ad196bcd3 100644 --- a/Robust.Client/Graphics/Shaders/ShaderInstance.cs +++ b/Robust.Client/Graphics/Shaders/ShaderInstance.cs @@ -1,7 +1,7 @@ using System; using Robust.Shared.Maths; -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { /// /// A shader instance is a wrapper around a shader that can be used for rendering. diff --git a/Robust.Client/Graphics/Shaders/ShaderParser.Tokenizer.cs b/Robust.Client/Graphics/Shaders/ShaderParser.Tokenizer.cs index 7e73767be..4040a7baa 100644 --- a/Robust.Client/Graphics/Shaders/ShaderParser.Tokenizer.cs +++ b/Robust.Client/Graphics/Shaders/ShaderParser.Tokenizer.cs @@ -4,7 +4,7 @@ using System.IO; using System.Text; using Robust.Shared.Utility; -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { internal partial class ShaderParser { diff --git a/Robust.Client/Graphics/Shaders/ShaderParser.cs b/Robust.Client/Graphics/Shaders/ShaderParser.cs index 61db19ebc..4598ce0a7 100644 --- a/Robust.Client/Graphics/Shaders/ShaderParser.cs +++ b/Robust.Client/Graphics/Shaders/ShaderParser.cs @@ -4,10 +4,10 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.Utility; -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { internal sealed partial class ShaderParser { diff --git a/Robust.Client/Graphics/Shaders/ShaderPrototype.cs b/Robust.Client/Graphics/Shaders/ShaderPrototype.cs index b2bbbe5a3..d8ad5ab76 100644 --- a/Robust.Client/Graphics/Shaders/ShaderPrototype.cs +++ b/Robust.Client/Graphics/Shaders/ShaderPrototype.cs @@ -1,16 +1,15 @@ -using Robust.Client.Interfaces.ResourceManagement; +using System; +using System.Collections.Generic; +using Robust.Client.ResourceManagement; using Robust.Client.ResourceManagement.ResourceTypes; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using System; -using System.Collections.Generic; -using Robust.Client.Interfaces.Graphics; -using Robust.Shared.Maths; using YamlDotNet.RepresentationModel; -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { [Prototype("shader")] public sealed class ShaderPrototype : IPrototype, IIndexedPrototype diff --git a/Robust.Client/Graphics/Shaders/StencilEnums.cs b/Robust.Client/Graphics/Shaders/StencilEnums.cs index 3579a69a9..cfab6abe1 100644 --- a/Robust.Client/Graphics/Shaders/StencilEnums.cs +++ b/Robust.Client/Graphics/Shaders/StencilEnums.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Graphics.Shaders +namespace Robust.Client.Graphics { public enum StencilFunc : byte { diff --git a/Robust.Client/Interfaces/Graphics/StandardCursorShape.cs b/Robust.Client/Graphics/StandardCursorShape.cs similarity index 95% rename from Robust.Client/Interfaces/Graphics/StandardCursorShape.cs rename to Robust.Client/Graphics/StandardCursorShape.cs index 9cfc30111..dba73b6f6 100644 --- a/Robust.Client/Interfaces/Graphics/StandardCursorShape.cs +++ b/Robust.Client/Graphics/StandardCursorShape.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { /// /// OS-standard cursor shapes. diff --git a/Robust.Client/Graphics/Texture.cs b/Robust.Client/Graphics/Texture.cs index 7412544e6..ee1a4c552 100644 --- a/Robust.Client/Graphics/Texture.cs +++ b/Robust.Client/Graphics/Texture.cs @@ -1,7 +1,6 @@ -using System; +using System; using System.IO; using JetBrains.Annotations; -using Robust.Client.Interfaces.Graphics; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Utility; @@ -125,7 +124,7 @@ namespace Robust.Client.Graphics public static TextureLoadParameters FromYaml(YamlMappingNode yaml) { - var loadParams = TextureLoadParameters.Default; + var loadParams = Default; if (yaml.TryGetNode("sample", out YamlMappingNode? sampleNode)) { loadParams.SampleParameters = TextureSampleParameters.FromYaml(sampleNode); diff --git a/Robust.Client/Interfaces/Graphics/WindowResizedEventArgs.cs b/Robust.Client/Graphics/WindowResizedEventArgs.cs similarity index 88% rename from Robust.Client/Interfaces/Graphics/WindowResizedEventArgs.cs rename to Robust.Client/Graphics/WindowResizedEventArgs.cs index 4b06d80fd..2bbc040aa 100644 --- a/Robust.Client/Interfaces/Graphics/WindowResizedEventArgs.cs +++ b/Robust.Client/Graphics/WindowResizedEventArgs.cs @@ -1,7 +1,7 @@ using System; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Graphics +namespace Robust.Client.Graphics { public class WindowResizedEventArgs : EventArgs { diff --git a/Robust.Client/Interfaces/IBaseClient.cs b/Robust.Client/IBaseClient.cs similarity index 98% rename from Robust.Client/Interfaces/IBaseClient.cs rename to Robust.Client/IBaseClient.cs index 0c7548e93..3f91ac449 100644 --- a/Robust.Client/Interfaces/IBaseClient.cs +++ b/Robust.Client/IBaseClient.cs @@ -1,7 +1,7 @@ using System; using System.Net; -namespace Robust.Client.Interfaces +namespace Robust.Client { /// /// Top level class that controls the game logic of the client. diff --git a/Robust.Client/IGameController.cs b/Robust.Client/IGameController.cs new file mode 100644 index 000000000..363358785 --- /dev/null +++ b/Robust.Client/IGameController.cs @@ -0,0 +1,9 @@ +namespace Robust.Client +{ + public interface IGameController + { + InitialLaunchState LaunchState { get; } + + void Shutdown(string? reason=null); + } +} \ No newline at end of file diff --git a/Robust.Client/IGameControllerInternal.cs b/Robust.Client/IGameControllerInternal.cs new file mode 100644 index 000000000..a0cf03c41 --- /dev/null +++ b/Robust.Client/IGameControllerInternal.cs @@ -0,0 +1,21 @@ +using System; +using Robust.Client.Input; +using Robust.Shared.Log; +using Robust.Shared.Timing; + +namespace Robust.Client +{ + internal interface IGameControllerInternal : IGameController + { + void SetCommandLineArgs(CommandLineArgs args); + bool LoadConfigAndUserData { get; set; } + bool Startup(Func? logHandlerFactory = null); + void MainLoop(GameController.DisplayMode mode); + void KeyDown(KeyEventArgs keyEvent); + void KeyUp(KeyEventArgs keyEvent); + void TextEntered(TextEventArgs textEvent); + void MouseMove(MouseMoveEventArgs mouseMoveEventArgs); + void MouseWheel(MouseWheelEventArgs mouseWheelEventArgs); + void OverrideMainLoop(IGameLoop gameLoop); + } +} \ No newline at end of file diff --git a/Robust.Client/InitialLaunchState.cs b/Robust.Client/InitialLaunchState.cs new file mode 100644 index 000000000..92700e9e9 --- /dev/null +++ b/Robust.Client/InitialLaunchState.cs @@ -0,0 +1,20 @@ +using System.Net; + +namespace Robust.Client +{ + public sealed class InitialLaunchState + { + public bool FromLauncher { get; } + public string? ConnectAddress { get; } + public string? Ss14Address { get; } + public DnsEndPoint? ConnectEndpoint { get; } + + public InitialLaunchState(bool fromLauncher, string? connectAddress, string? ss14Address, DnsEndPoint? connectEndpoint) + { + FromLauncher = fromLauncher; + ConnectAddress = connectAddress; + Ss14Address = ss14Address; + ConnectEndpoint = connectEndpoint; + } + } +} diff --git a/Robust.Client/Input/ClydeInputManager.cs b/Robust.Client/Input/ClydeInputManager.cs index 7161dc9db..2258b2983 100644 --- a/Robust.Client/Input/ClydeInputManager.cs +++ b/Robust.Client/Input/ClydeInputManager.cs @@ -1,4 +1,4 @@ -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Robust.Client/Input/Events.cs b/Robust.Client/Input/Events.cs index 9020fcc46..c45788c77 100644 --- a/Robust.Client/Input/Events.cs +++ b/Robust.Client/Input/Events.cs @@ -1,8 +1,4 @@ using System; -using Robust.Client.Interfaces; -using Robust.Client.Utility; -using Robust.Shared.Input; -using Robust.Shared.IoC; using Robust.Shared.Maths; namespace Robust.Client.Input diff --git a/Robust.Client/Interfaces/Input/IInputManager.cs b/Robust.Client/Input/IInputManager.cs similarity index 96% rename from Robust.Client/Interfaces/Input/IInputManager.cs rename to Robust.Client/Input/IInputManager.cs index 8fdf5ee73..6e7af5856 100644 --- a/Robust.Client/Interfaces/Input/IInputManager.cs +++ b/Robust.Client/Input/IInputManager.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Client.Input; -using Robust.Shared.Maths; using Robust.Shared.Input; using Robust.Shared.Input.Binding; +using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Input +namespace Robust.Client.Input { - public delegate void KeyEventAction(KeyEventArgs keyEvent, KeyEventType type); - /// /// Manages key bindings, input commands and other misc. input systems. /// diff --git a/Robust.Client/Interfaces/Input/IKeyBinding.cs b/Robust.Client/Input/IKeyBinding.cs similarity index 90% rename from Robust.Client/Interfaces/Input/IKeyBinding.cs rename to Robust.Client/Input/IKeyBinding.cs index e35ebc961..dc38b1aba 100644 --- a/Robust.Client/Interfaces/Input/IKeyBinding.cs +++ b/Robust.Client/Input/IKeyBinding.cs @@ -1,7 +1,6 @@ -using Robust.Client.Input; using Robust.Shared.Input; -namespace Robust.Client.Interfaces.Input +namespace Robust.Client.Input { public interface IKeyBinding { diff --git a/Robust.Client/Input/InputManager.cs b/Robust.Client/Input/InputManager.cs index 2edd81044..c11c12c4b 100644 --- a/Robust.Client/Input/InputManager.cs +++ b/Robust.Client/Input/InputManager.cs @@ -7,18 +7,17 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using JetBrains.Annotations; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.UserInterface; using Robust.Shared.Console; +using Robust.Shared.ContentPack; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/Interfaces/Input/KeyBindingRegistration.cs b/Robust.Client/Input/KeyBindingRegistration.cs similarity index 91% rename from Robust.Client/Interfaces/Input/KeyBindingRegistration.cs rename to Robust.Client/Input/KeyBindingRegistration.cs index 8a6580485..bbe1c1721 100644 --- a/Robust.Client/Interfaces/Input/KeyBindingRegistration.cs +++ b/Robust.Client/Input/KeyBindingRegistration.cs @@ -1,9 +1,7 @@ -using Robust.Client.Input; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; -namespace Robust.Client.Interfaces.Input +namespace Robust.Client.Input { public struct KeyBindingRegistration : IExposeData { diff --git a/Robust.Client/Input/KeyEventAction.cs b/Robust.Client/Input/KeyEventAction.cs new file mode 100644 index 000000000..dc343625e --- /dev/null +++ b/Robust.Client/Input/KeyEventAction.cs @@ -0,0 +1,4 @@ +namespace Robust.Client.Input +{ + public delegate void KeyEventAction(KeyEventArgs keyEvent, KeyEventType type); +} \ No newline at end of file diff --git a/Robust.Client/Interfaces/IGameController.cs b/Robust.Client/Interfaces/IGameController.cs deleted file mode 100644 index 5388a2d8f..000000000 --- a/Robust.Client/Interfaces/IGameController.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Net; -using Robust.Client.Input; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Timing; - -namespace Robust.Client.Interfaces -{ - public interface IGameController - { - InitialLaunchState LaunchState { get; } - - void Shutdown(string? reason=null); - } - - internal interface IGameControllerInternal : IGameController - { - void SetCommandLineArgs(CommandLineArgs args); - bool LoadConfigAndUserData { get; set; } - bool Startup(Func? logHandlerFactory = null); - void MainLoop(GameController.DisplayMode mode); - void KeyDown(KeyEventArgs keyEvent); - void KeyUp(KeyEventArgs keyEvent); - void TextEntered(TextEventArgs textEvent); - void MouseMove(MouseMoveEventArgs mouseMoveEventArgs); - void MouseWheel(MouseWheelEventArgs mouseWheelEventArgs); - void OverrideMainLoop(IGameLoop gameLoop); - } - - public sealed class InitialLaunchState - { - public bool FromLauncher { get; } - public string? ConnectAddress { get; } - public string? Ss14Address { get; } - public DnsEndPoint? ConnectEndpoint { get; } - - public InitialLaunchState(bool fromLauncher, string? connectAddress, string? ss14Address, DnsEndPoint? connectEndpoint) - { - FromLauncher = fromLauncher; - ConnectAddress = connectAddress; - Ss14Address = ss14Address; - ConnectEndpoint = connectEndpoint; - } - } -} diff --git a/Robust.Client/Interfaces/State/IStateManager.cs b/Robust.Client/Interfaces/State/IStateManager.cs deleted file mode 100644 index 6002dfaae..000000000 --- a/Robust.Client/Interfaces/State/IStateManager.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Robust.Shared.Timing; - -namespace Robust.Client.Interfaces.State -{ - public interface IStateManager - { - event Action OnStateChanged; - - Client.State.State CurrentState { get; } - void RequestStateChange() where T : Client.State.State, new(); - void Update(FrameEventArgs e); - void FrameUpdate(FrameEventArgs e); - void FormResize(); - void RequestStateChange(Type type); - } - - public sealed class StateChangedEventArgs : EventArgs - { - public StateChangedEventArgs(Client.State.State oldState, Client.State.State newState) - { - OldState = oldState; - NewState = newState; - } - - public Client.State.State OldState { get; } - public Client.State.State NewState { get; } - } -} diff --git a/Robust.Client/Log/DebugConsoleLogHandler.cs b/Robust.Client/Log/DebugConsoleLogHandler.cs index 4ea69d487..23c603311 100644 --- a/Robust.Client/Log/DebugConsoleLogHandler.cs +++ b/Robust.Client/Log/DebugConsoleLogHandler.cs @@ -1,5 +1,4 @@ using Robust.Client.Console; -using Robust.Shared.Interfaces.Log; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/Map/ClydeTileDefinitionManager.cs b/Robust.Client/Map/ClydeTileDefinitionManager.cs index 1a5d94c55..1f72ae89d 100644 --- a/Robust.Client/Map/ClydeTileDefinitionManager.cs +++ b/Robust.Client/Map/ClydeTileDefinitionManager.cs @@ -2,9 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using Robust.Client.Graphics; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Interfaces.Map; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.Utility; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Robust.Client/Interfaces/Map/IClydeTileDefinitionManager.cs b/Robust.Client/Map/IClydeTileDefinitionManager.cs similarity index 90% rename from Robust.Client/Interfaces/Map/IClydeTileDefinitionManager.cs rename to Robust.Client/Map/IClydeTileDefinitionManager.cs index d6429d65a..37fef3857 100644 --- a/Robust.Client/Interfaces/Map/IClydeTileDefinitionManager.cs +++ b/Robust.Client/Map/IClydeTileDefinitionManager.cs @@ -1,9 +1,8 @@ using Robust.Client.Graphics; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Client.Interfaces.Map +namespace Robust.Client.Map { /// /// Stores a texture atlas of all the tile definitions for efficient rendering. diff --git a/Robust.Client/Physics/PhysicsSystem.cs b/Robust.Client/Physics/PhysicsSystem.cs index 62c745a52..0a62436e1 100644 --- a/Robust.Client/Physics/PhysicsSystem.cs +++ b/Robust.Client/Physics/PhysicsSystem.cs @@ -1,8 +1,8 @@ using System; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Robust.Client.Physics { diff --git a/Robust.Client/Interfaces/Placement/IPlacementManager.cs b/Robust.Client/Placement/IPlacementManager.cs similarity index 83% rename from Robust.Client/Interfaces/Placement/IPlacementManager.cs rename to Robust.Client/Placement/IPlacementManager.cs index be7dca711..9bef1c917 100644 --- a/Robust.Client/Interfaces/Placement/IPlacementManager.cs +++ b/Robust.Client/Placement/IPlacementManager.cs @@ -1,12 +1,8 @@ using System; -using Robust.Client.Input; -using Robust.Client.Placement; -using Robust.Shared; using Robust.Shared.Enums; -using Robust.Shared.Map; using Robust.Shared.Timing; -namespace Robust.Client.Interfaces.Placement +namespace Robust.Client.Placement { public interface IPlacementManager { diff --git a/Robust.Client/Placement/Modes/AlignSimilar.cs b/Robust.Client/Placement/Modes/AlignSimilar.cs index 709038cf6..f91522f6b 100644 --- a/Robust.Client/Placement/Modes/AlignSimilar.cs +++ b/Robust.Client/Placement/Modes/AlignSimilar.cs @@ -1,8 +1,5 @@ using System.Linq; -using Robust.Client.Input; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.IoC; +using Robust.Client.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Client/Placement/Modes/AlignSnapgridBorder.cs b/Robust.Client/Placement/Modes/AlignSnapgridBorder.cs index 13dfcbf20..2cd47a034 100644 --- a/Robust.Client/Placement/Modes/AlignSnapgridBorder.cs +++ b/Robust.Client/Placement/Modes/AlignSnapgridBorder.cs @@ -1,11 +1,7 @@ using System; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; +using Robust.Client.Graphics; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Utility; namespace Robust.Client.Placement.Modes { diff --git a/Robust.Client/Placement/Modes/AlignSnapgridCenter.cs b/Robust.Client/Placement/Modes/AlignSnapgridCenter.cs index d33edb6cc..200cbf696 100644 --- a/Robust.Client/Placement/Modes/AlignSnapgridCenter.cs +++ b/Robust.Client/Placement/Modes/AlignSnapgridCenter.cs @@ -1,7 +1,7 @@ using System; +using Robust.Client.Graphics; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Client.Graphics.Drawing; namespace Robust.Client.Placement.Modes { diff --git a/Robust.Client/Placement/Modes/AlignTileAny.cs b/Robust.Client/Placement/Modes/AlignTileAny.cs index 6016fa0c5..b93eccdb3 100644 --- a/Robust.Client/Placement/Modes/AlignTileAny.cs +++ b/Robust.Client/Placement/Modes/AlignTileAny.cs @@ -1,6 +1,4 @@ using Robust.Shared.Map; -using Robust.Shared.Maths; -using Robust.Shared.Utility; namespace Robust.Client.Placement.Modes { diff --git a/Robust.Client/Placement/Modes/AlignTileDense.cs b/Robust.Client/Placement/Modes/AlignTileDense.cs index efbe60ce6..9429f73cf 100644 --- a/Robust.Client/Placement/Modes/AlignTileDense.cs +++ b/Robust.Client/Placement/Modes/AlignTileDense.cs @@ -1,6 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; +using Robust.Shared.Map; namespace Robust.Client.Placement.Modes { diff --git a/Robust.Client/Placement/Modes/AlignTileEmpty.cs b/Robust.Client/Placement/Modes/AlignTileEmpty.cs index c9e56ff50..b578dbf8e 100644 --- a/Robust.Client/Placement/Modes/AlignTileEmpty.cs +++ b/Robust.Client/Placement/Modes/AlignTileEmpty.cs @@ -1,8 +1,4 @@ -using Robust.Shared.IoC; -using Robust.Client.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Map; +using Robust.Shared.Map; using Robust.Shared.Maths; namespace Robust.Client.Placement.Modes diff --git a/Robust.Client/Placement/Modes/PlaceNearby.cs b/Robust.Client/Placement/Modes/PlaceNearby.cs index d3b8b1b74..c9f34a29d 100644 --- a/Robust.Client/Placement/Modes/PlaceNearby.cs +++ b/Robust.Client/Placement/Modes/PlaceNearby.cs @@ -1,6 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; +using Robust.Shared.Map; namespace Robust.Client.Placement.Modes { diff --git a/Robust.Client/Placement/PlacementHijack.cs b/Robust.Client/Placement/PlacementHijack.cs index c2e272a18..57584045b 100644 --- a/Robust.Client/Placement/PlacementHijack.cs +++ b/Robust.Client/Placement/PlacementHijack.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Robust.Client.Placement diff --git a/Robust.Client/Placement/PlacementManager.cs b/Robust.Client/Placement/PlacementManager.cs index 7519b6762..a2ac1cc56 100644 --- a/Robust.Client/Placement/PlacementManager.cs +++ b/Robust.Client/Placement/PlacementManager.cs @@ -1,20 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Maths; @@ -22,13 +11,13 @@ using Robust.Shared.Map; using Robust.Shared.Network.Messages; using Robust.Client.Graphics; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Client.Input; using Robust.Client.Player; using Robust.Shared.Input; using Robust.Shared.Input.Binding; +using Robust.Shared.Network; +using Robust.Shared.Physics; +using Robust.Shared.Reflection; using Robust.Shared.Utility; using Robust.Shared.Serialization; using Robust.Shared.Timing; diff --git a/Robust.Client/Placement/PlacementMode.cs b/Robust.Client/Placement/PlacementMode.cs index 290ce3389..7a095a5f0 100644 --- a/Robust.Client/Placement/PlacementMode.cs +++ b/Robust.Client/Placement/PlacementMode.cs @@ -3,11 +3,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Robust.Client.Graphics; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; using Robust.Client.ResourceManagement; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/Placement/PlacementOverlay.cs b/Robust.Client/Placement/PlacementOverlay.cs index efb4e2351..d89457bf7 100644 --- a/Robust.Client/Placement/PlacementOverlay.cs +++ b/Robust.Client/Placement/PlacementOverlay.cs @@ -1,5 +1,4 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; +using Robust.Client.Graphics; namespace Robust.Client.Placement { diff --git a/Robust.Client/Player/IPlayerManager.cs b/Robust.Client/Player/IPlayerManager.cs index 77049551d..34e4664cf 100644 --- a/Robust.Client/Player/IPlayerManager.cs +++ b/Robust.Client/Player/IPlayerManager.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; -using Robust.Shared.Players; namespace Robust.Client.Player { diff --git a/Robust.Client/Player/LocalPlayer.cs b/Robust.Client/Player/LocalPlayer.cs index dd117f0a4..04cba6b8b 100644 --- a/Robust.Client/Player/LocalPlayer.cs +++ b/Robust.Client/Player/LocalPlayer.cs @@ -1,11 +1,8 @@ using System; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; +using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/Player/PlayerManager.cs b/Robust.Client/Player/PlayerManager.cs index 153586ff4..a54d9b54f 100644 --- a/Robust.Client/Player/PlayerManager.cs +++ b/Robust.Client/Player/PlayerManager.cs @@ -1,14 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Client.Interfaces; using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.Network.Messages; diff --git a/Robust.Client/Player/PlayerSession.cs b/Robust.Client/Player/PlayerSession.cs index 4dd6d8467..3ecd73e04 100644 --- a/Robust.Client/Player/PlayerSession.cs +++ b/Robust.Client/Player/PlayerSession.cs @@ -1,6 +1,5 @@ -using System; -using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Enums; +using Robust.Shared.GameObjects; using Robust.Shared.Network; namespace Robust.Client.Player diff --git a/Robust.Client/ResourceManagement/BaseResource.cs b/Robust.Client/ResourceManagement/BaseResource.cs index 26d5e0680..478b89c74 100644 --- a/Robust.Client/ResourceManagement/BaseResource.cs +++ b/Robust.Client/ResourceManagement/BaseResource.cs @@ -1,6 +1,5 @@ using System; using System.Threading; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Shared.Utility; namespace Robust.Client.ResourceManagement diff --git a/Robust.Client/Interfaces/ResourceManagement/IResourceCache.cs b/Robust.Client/ResourceManagement/IResourceCache.cs similarity index 75% rename from Robust.Client/Interfaces/ResourceManagement/IResourceCache.cs rename to Robust.Client/ResourceManagement/IResourceCache.cs index 0e85ccf18..cd1c025b6 100644 --- a/Robust.Client/Interfaces/ResourceManagement/IResourceCache.cs +++ b/Robust.Client/ResourceManagement/IResourceCache.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Client.ResourceManagement; -using Robust.LoaderApi; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.Utility; -namespace Robust.Client.Interfaces.ResourceManagement +namespace Robust.Client.ResourceManagement { public interface IResourceCache : IResourceManager { @@ -43,12 +41,4 @@ namespace Robust.Client.Interfaces.ResourceManagement event Action OnRawTextureLoaded; event Action OnRsiLoaded; } - - internal interface IResourceCacheInternal : IResourceCache, IResourceManagerInternal - { - void TextureLoaded(TextureLoadedEventArgs eventArgs); - void RsiLoaded(RsiLoadedEventArgs eventArgs); - - void MountLoaderApi(IFileApi api, string apiPrefix, ResourcePath? prefix=null); - } -} +} \ No newline at end of file diff --git a/Robust.Client/ResourceManagement/IResourceCacheInternal.cs b/Robust.Client/ResourceManagement/IResourceCacheInternal.cs new file mode 100644 index 000000000..0c03f8c7a --- /dev/null +++ b/Robust.Client/ResourceManagement/IResourceCacheInternal.cs @@ -0,0 +1,14 @@ +using Robust.LoaderApi; +using Robust.Shared.ContentPack; +using Robust.Shared.Utility; + +namespace Robust.Client.ResourceManagement +{ + internal interface IResourceCacheInternal : IResourceCache, IResourceManagerInternal + { + void TextureLoaded(TextureLoadedEventArgs eventArgs); + void RsiLoaded(RsiLoadedEventArgs eventArgs); + + void MountLoaderApi(IFileApi api, string apiPrefix, ResourcePath? prefix=null); + } +} diff --git a/Robust.Client/ResourceManagement/ResourceCache.cs b/Robust.Client/ResourceManagement/ResourceCache.cs index 12b51a221..fa43e968e 100644 --- a/Robust.Client/ResourceManagement/ResourceCache.cs +++ b/Robust.Client/ResourceManagement/ResourceCache.cs @@ -1,5 +1,4 @@ -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Shared.ContentPack; +using Robust.Shared.ContentPack; using Robust.Shared.Log; using Robust.Shared.Utility; using System; diff --git a/Robust.Client/ResourceManagement/ResourceTypes/AudioResource.cs b/Robust.Client/ResourceManagement/ResourceTypes/AudioResource.cs index 0528a3cf5..ae30c7c80 100644 --- a/Robust.Client/ResourceManagement/ResourceTypes/AudioResource.cs +++ b/Robust.Client/ResourceManagement/ResourceTypes/AudioResource.cs @@ -1,9 +1,8 @@ using System; using Robust.Client.Audio; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Shared.Utility; using System.IO; -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; using Robust.Shared.IoC; namespace Robust.Client.ResourceManagement diff --git a/Robust.Client/ResourceManagement/ResourceTypes/FontResource.cs b/Robust.Client/ResourceManagement/ResourceTypes/FontResource.cs index 18a1f5826..9f3b17794 100644 --- a/Robust.Client/ResourceManagement/ResourceTypes/FontResource.cs +++ b/Robust.Client/ResourceManagement/ResourceTypes/FontResource.cs @@ -1,7 +1,5 @@ using System.IO; using Robust.Client.Graphics; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Shared.IoC; using Robust.Shared.Utility; diff --git a/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs b/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs index 7714662c0..bcee884d1 100644 --- a/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs +++ b/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Reflection; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Utility; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Robust.Client/ResourceManagement/ResourceTypes/ShaderSourceResource.cs b/Robust.Client/ResourceManagement/ResourceTypes/ShaderSourceResource.cs index 081ef01e0..b800d389e 100644 --- a/Robust.Client/ResourceManagement/ResourceTypes/ShaderSourceResource.cs +++ b/Robust.Client/ResourceManagement/ResourceTypes/ShaderSourceResource.cs @@ -1,9 +1,6 @@ using System.IO; using System.Threading; using Robust.Client.Graphics; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.Utility; diff --git a/Robust.Client/ResourceManagement/ResourceTypes/TextureResource.cs b/Robust.Client/ResourceManagement/ResourceTypes/TextureResource.cs index fc5ee678e..467613608 100644 --- a/Robust.Client/ResourceManagement/ResourceTypes/TextureResource.cs +++ b/Robust.Client/ResourceManagement/ResourceTypes/TextureResource.cs @@ -1,8 +1,5 @@ -using System.Diagnostics.CodeAnalysis; -using System.IO; +using System.IO; using Robust.Client.Graphics; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Robust.Client/Robust.Client.csproj.DotSettings b/Robust.Client/Robust.Client.csproj.DotSettings new file mode 100644 index 000000000..799d160d3 --- /dev/null +++ b/Robust.Client/Robust.Client.csproj.DotSettings @@ -0,0 +1,22 @@ + + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True \ No newline at end of file diff --git a/Robust.Client/State/IStateManager.cs b/Robust.Client/State/IStateManager.cs new file mode 100644 index 000000000..e3449c7ff --- /dev/null +++ b/Robust.Client/State/IStateManager.cs @@ -0,0 +1,17 @@ +using System; +using Robust.Shared.Timing; + +namespace Robust.Client.State +{ + public interface IStateManager + { + event Action OnStateChanged; + + State CurrentState { get; } + void RequestStateChange() where T : State, new(); + void Update(FrameEventArgs e); + void FrameUpdate(FrameEventArgs e); + void FormResize(); + void RequestStateChange(Type type); + } +} diff --git a/Robust.Client/State/StateChangedEventArgs.cs b/Robust.Client/State/StateChangedEventArgs.cs new file mode 100644 index 000000000..3b050bc49 --- /dev/null +++ b/Robust.Client/State/StateChangedEventArgs.cs @@ -0,0 +1,16 @@ +using System; + +namespace Robust.Client.State +{ + public sealed class StateChangedEventArgs : EventArgs + { + public StateChangedEventArgs(State oldState, State newState) + { + OldState = oldState; + NewState = newState; + } + + public State OldState { get; } + public State NewState { get; } + } +} diff --git a/Robust.Client/State/StateManager.cs b/Robust.Client/State/StateManager.cs index e6419802a..b99324bc4 100644 --- a/Robust.Client/State/StateManager.cs +++ b/Robust.Client/State/StateManager.cs @@ -1,5 +1,4 @@ -using Robust.Client.Interfaces.State; -using Robust.Shared.Log; +using Robust.Shared.Log; using System; using Robust.Shared.IoC; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/Control.Animations.cs b/Robust.Client/UserInterface/Control.Animations.cs index ed229321d..b1c93310b 100644 --- a/Robust.Client/UserInterface/Control.Animations.cs +++ b/Robust.Client/UserInterface/Control.Animations.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Shared.Timing; using static Robust.Client.Animations.AnimationPlaybackShared; diff --git a/Robust.Client/UserInterface/Control.Cursor.cs b/Robust.Client/UserInterface/Control.Cursor.cs index 62358b77c..17a5ce3c9 100644 --- a/Robust.Client/UserInterface/Control.Cursor.cs +++ b/Robust.Client/UserInterface/Control.Cursor.cs @@ -1,5 +1,5 @@ using System; -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; namespace Robust.Client.UserInterface { diff --git a/Robust.Client/UserInterface/Control.Properties.cs b/Robust.Client/UserInterface/Control.Properties.cs index b639cc3cf..523832887 100644 --- a/Robust.Client/UserInterface/Control.Properties.cs +++ b/Robust.Client/UserInterface/Control.Properties.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using JetBrains.Annotations; namespace Robust.Client.UserInterface { diff --git a/Robust.Client/UserInterface/Control.Styling.cs b/Robust.Client/UserInterface/Control.Styling.cs index 67ce3a622..0e353f2cd 100644 --- a/Robust.Client/UserInterface/Control.Styling.cs +++ b/Robust.Client/UserInterface/Control.Styling.cs @@ -1,7 +1,6 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Client.Interfaces.UserInterface; using Robust.Shared.ViewVariables; namespace Robust.Client.UserInterface diff --git a/Robust.Client/UserInterface/Control.cs b/Robust.Client/UserInterface/Control.cs index 228cb6cf3..db1ab31fa 100644 --- a/Robust.Client/UserInterface/Control.cs +++ b/Robust.Client/UserInterface/Control.cs @@ -3,9 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; using Robust.Client.UserInterface.XAML; using Robust.Shared.Animations; using Robust.Shared.IoC; diff --git a/Robust.Client/UserInterface/Controls/Container.cs b/Robust.Client/UserInterface/Controls/Container.cs index 0de05892b..806f61deb 100644 --- a/Robust.Client/UserInterface/Controls/Container.cs +++ b/Robust.Client/UserInterface/Controls/Container.cs @@ -1,7 +1,4 @@ -using Robust.Shared.Maths; -using Robust.Shared.Utility; - -namespace Robust.Client.UserInterface.Controls +namespace Robust.Client.UserInterface.Controls { /// /// A container lays out its children by some implementation-dependent rules. diff --git a/Robust.Client/UserInterface/Controls/ContainerButton.cs b/Robust.Client/UserInterface/Controls/ContainerButton.cs index a8b2d5586..3ee83e452 100644 --- a/Robust.Client/UserInterface/Controls/ContainerButton.cs +++ b/Robust.Client/UserInterface/Controls/ContainerButton.cs @@ -1,5 +1,5 @@ using System; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/FloatSpinBox.cs b/Robust.Client/UserInterface/Controls/FloatSpinBox.cs index bd7581284..5a40e5a6e 100644 --- a/Robust.Client/UserInterface/Controls/FloatSpinBox.cs +++ b/Robust.Client/UserInterface/Controls/FloatSpinBox.cs @@ -1,6 +1,5 @@ using Robust.Shared.Maths; using System; -using System.Collections.Generic; using System.Globalization; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/HistoryLineEdit.cs b/Robust.Client/UserInterface/Controls/HistoryLineEdit.cs index b1afc2dab..a3e6c2738 100644 --- a/Robust.Client/UserInterface/Controls/HistoryLineEdit.cs +++ b/Robust.Client/UserInterface/Controls/HistoryLineEdit.cs @@ -1,6 +1,5 @@ -using System; +using System; using System.Collections.Generic; -using System.Text; using Robust.Shared.Input; namespace Robust.Client.UserInterface.Controls @@ -49,7 +48,7 @@ namespace Robust.Client.UserInterface.Controls { base.KeyBindDown(args); - if (!this.HasKeyboardFocus()) + if (!HasKeyboardFocus()) { return; } diff --git a/Robust.Client/UserInterface/Controls/ItemList.cs b/Robust.Client/UserInterface/Controls/ItemList.cs index 1ada05e9b..e9deebdc7 100644 --- a/Robust.Client/UserInterface/Controls/ItemList.cs +++ b/Robust.Client/UserInterface/Controls/ItemList.cs @@ -2,13 +2,8 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.Contracts; -using System.Threading.Tasks; -using System.Timers; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Input; using Robust.Shared.Input; -using Robust.Shared.Log; using Robust.Shared.Maths; using Timer = Robust.Shared.Timers.Timer; diff --git a/Robust.Client/UserInterface/Controls/Label.cs b/Robust.Client/UserInterface/Controls/Label.cs index 1e49b16e4..57b79982c 100644 --- a/Robust.Client/UserInterface/Controls/Label.cs +++ b/Robust.Client/UserInterface/Controls/Label.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Shared.Animations; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/UserInterface/Controls/LayeredTextureRect.cs b/Robust.Client/UserInterface/Controls/LayeredTextureRect.cs index a634b1811..ad22b6e2b 100644 --- a/Robust.Client/UserInterface/Controls/LayeredTextureRect.cs +++ b/Robust.Client/UserInterface/Controls/LayeredTextureRect.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/LineEdit.cs b/Robust.Client/UserInterface/Controls/LineEdit.cs index 6e6cf058f..217a0a76e 100644 --- a/Robust.Client/UserInterface/Controls/LineEdit.cs +++ b/Robust.Client/UserInterface/Controls/LineEdit.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.UserInterface; using Robust.Shared.Input; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/Controls/OutputPanel.cs b/Robust.Client/UserInterface/Controls/OutputPanel.cs index 0a6da44fe..aefd50a0c 100644 --- a/Robust.Client/UserInterface/Controls/OutputPanel.cs +++ b/Robust.Client/UserInterface/Controls/OutputPanel.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/UserInterface/Controls/PanelContainer.cs b/Robust.Client/UserInterface/Controls/PanelContainer.cs index 5a64e688f..5b6c512dc 100644 --- a/Robust.Client/UserInterface/Controls/PanelContainer.cs +++ b/Robust.Client/UserInterface/Controls/PanelContainer.cs @@ -1,4 +1,4 @@ -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/ProgressBar.cs b/Robust.Client/UserInterface/Controls/ProgressBar.cs index 5b0bd54f3..ce866e6d0 100644 --- a/Robust.Client/UserInterface/Controls/ProgressBar.cs +++ b/Robust.Client/UserInterface/Controls/ProgressBar.cs @@ -1,5 +1,5 @@ using System.Diagnostics.Contracts; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/RadioOptions.cs b/Robust.Client/UserInterface/Controls/RadioOptions.cs index 7d30ece51..bc0ac2e89 100644 --- a/Robust.Client/UserInterface/Controls/RadioOptions.cs +++ b/Robust.Client/UserInterface/Controls/RadioOptions.cs @@ -1,4 +1,3 @@ -using Robust.Client.Graphics; using System; using System.Linq; using System.Collections.Generic; @@ -43,7 +42,7 @@ namespace Robust.Client.UserInterface.Controls break; } - this.AddChild(_container); + AddChild(_container); } public int AddItem(string label, T value, Action>? itemSelectedAction = null) @@ -251,7 +250,7 @@ namespace Robust.Client.UserInterface.Controls public RadioOptionButtonData(string text, T value, Button button) { Text = text; - this.Button = button; + Button = button; Value = value; } public event Action>? OnItemSelected; diff --git a/Robust.Client/UserInterface/Controls/RichTextLabel.cs b/Robust.Client/UserInterface/Controls/RichTextLabel.cs index 069fc5018..60fbf3c9d 100644 --- a/Robust.Client/UserInterface/Controls/RichTextLabel.cs +++ b/Robust.Client/UserInterface/Controls/RichTextLabel.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Robust.Client/UserInterface/Controls/ScrollBar.cs b/Robust.Client/UserInterface/Controls/ScrollBar.cs index 46892caa3..e1bca37e6 100644 --- a/Robust.Client/UserInterface/Controls/ScrollBar.cs +++ b/Robust.Client/UserInterface/Controls/ScrollBar.cs @@ -1,6 +1,5 @@ using System; -using JetBrains.Annotations; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Shared.Input; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/Controls/Slider.cs b/Robust.Client/UserInterface/Controls/Slider.cs index e9130f4bc..dbca9dde4 100644 --- a/Robust.Client/UserInterface/Controls/Slider.cs +++ b/Robust.Client/UserInterface/Controls/Slider.cs @@ -1,4 +1,4 @@ -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Shared.Input; using Robust.Shared.Maths; using static Robust.Client.UserInterface.Controls.LayoutContainer; diff --git a/Robust.Client/UserInterface/Controls/SpinBox.cs b/Robust.Client/UserInterface/Controls/SpinBox.cs index b83a6719c..2a56a2323 100644 --- a/Robust.Client/UserInterface/Controls/SpinBox.cs +++ b/Robust.Client/UserInterface/Controls/SpinBox.cs @@ -1,7 +1,6 @@ using Robust.Shared.Maths; using System; using System.Collections.Generic; -using System.Linq; namespace Robust.Client.UserInterface.Controls { diff --git a/Robust.Client/UserInterface/Controls/SplitContainer.cs b/Robust.Client/UserInterface/Controls/SplitContainer.cs index fe4a297f3..78691fb6a 100644 --- a/Robust.Client/UserInterface/Controls/SplitContainer.cs +++ b/Robust.Client/UserInterface/Controls/SplitContainer.cs @@ -31,8 +31,8 @@ namespace Robust.Client.UserInterface.Controls // min / max x and y extents in relative virtual pixels of where the split can go regardless // of anything else. private float SplitMin => SplitWidth + SplitEdgeSeparation; - private float SplitMax => Vertical ? this.Height - (SplitWidth + SplitEdgeSeparation) : - this.Width - (SplitWidth + SplitEdgeSeparation); + private float SplitMax => Vertical ? Height - (SplitWidth + SplitEdgeSeparation) : + Width - (SplitWidth + SplitEdgeSeparation); public SplitContainer() { diff --git a/Robust.Client/UserInterface/Controls/SpriteView.cs b/Robust.Client/UserInterface/Controls/SpriteView.cs index a9c682cd7..6f9cf6133 100644 --- a/Robust.Client/UserInterface/Controls/SpriteView.cs +++ b/Robust.Client/UserInterface/Controls/SpriteView.cs @@ -1,5 +1,5 @@ -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.Graphics; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/TabContainer.cs b/Robust.Client/UserInterface/Controls/TabContainer.cs index f7c70d42e..e3119ce06 100644 --- a/Robust.Client/UserInterface/Controls/TabContainer.cs +++ b/Robust.Client/UserInterface/Controls/TabContainer.cs @@ -1,7 +1,5 @@ using System; -using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Shared.Input; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/Controls/TextureButton.cs b/Robust.Client/UserInterface/Controls/TextureButton.cs index 38793d2e8..4a7a7a8ec 100644 --- a/Robust.Client/UserInterface/Controls/TextureButton.cs +++ b/Robust.Client/UserInterface/Controls/TextureButton.cs @@ -1,6 +1,5 @@ using System; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/UserInterface/Controls/TextureRect.cs b/Robust.Client/UserInterface/Controls/TextureRect.cs index 9dcd27b08..faf8503f5 100644 --- a/Robust.Client/UserInterface/Controls/TextureRect.cs +++ b/Robust.Client/UserInterface/Controls/TextureRect.cs @@ -1,7 +1,5 @@ using System; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.Controls diff --git a/Robust.Client/UserInterface/Controls/Tree.cs b/Robust.Client/UserInterface/Controls/Tree.cs index a3c4ff5b3..727c620bb 100644 --- a/Robust.Client/UserInterface/Controls/Tree.cs +++ b/Robust.Client/UserInterface/Controls/Tree.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Shared.Input; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/CustomControls/DebugClydePanel.cs b/Robust.Client/UserInterface/CustomControls/DebugClydePanel.cs index 31a53651a..6f959736f 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugClydePanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugClydePanel.cs @@ -1,5 +1,4 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/CustomControls/DebugConsole.cs b/Robust.Client/UserInterface/CustomControls/DebugConsole.cs index 55fd61b37..5c56f3c28 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugConsole.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugConsole.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.IO; using Newtonsoft.Json; using Robust.Client.Console; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; +using Robust.Shared.ContentPack; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Maths; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs index 5ca1bae63..ee64937c5 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugCoordsPanel.cs @@ -1,16 +1,11 @@ using System.Text; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.State; +using Robust.Client.Input; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/CustomControls/DebugInputPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugInputPanel.cs index 06f9771d2..07b82a789 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugInputPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugInputPanel.cs @@ -1,5 +1,5 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Input; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.UserInterface.Controls; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/CustomControls/DebugMemoryPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugMemoryPanel.cs index b048c1a64..f9f8d8089 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugMemoryPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugMemoryPanel.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/CustomControls/DebugMonitors.cs b/Robust.Client/UserInterface/CustomControls/DebugMonitors.cs index b48d63061..645befb6c 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugMonitors.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugMonitors.cs @@ -1,15 +1,13 @@ -using Robust.Client.Interfaces.GameStates; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.GameStates; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.Player; +using Robust.Client.State; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Network; +using Robust.Shared.Timing; namespace Robust.Client.UserInterface.CustomControls { diff --git a/Robust.Client/UserInterface/CustomControls/DebugNetBandwidthPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugNetBandwidthPanel.cs index c84282c43..21afec710 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugNetBandwidthPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugNetBandwidthPanel.cs @@ -1,10 +1,9 @@ using System; using System.Linq; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs b/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs index ac945c78c..49c57f6b2 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugNetPanel.cs @@ -1,13 +1,9 @@ using System; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.ResourceManagement; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; -using Robust.Shared.Utility; namespace Robust.Client.UserInterface.CustomControls { diff --git a/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs b/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs index c61561d53..8bd849d18 100644 --- a/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs +++ b/Robust.Client/UserInterface/CustomControls/DebugTimePanel.cs @@ -1,7 +1,6 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.GameStates; +using Robust.Client.GameStates; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs b/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs index 456fb501f..c533babf6 100644 --- a/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs +++ b/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs @@ -3,15 +3,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Placement; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Shared.Enums; -using Robust.Shared.GameObjects; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/CustomControls/FpsCounter.cs b/Robust.Client/UserInterface/CustomControls/FpsCounter.cs index ae6266799..b16128808 100644 --- a/Robust.Client/UserInterface/CustomControls/FpsCounter.cs +++ b/Robust.Client/UserInterface/CustomControls/FpsCounter.cs @@ -1,5 +1,4 @@ using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/CustomControls/FrameGraph.cs b/Robust.Client/UserInterface/CustomControls/FrameGraph.cs index 10250d68e..00acc8b4a 100644 --- a/Robust.Client/UserInterface/CustomControls/FrameGraph.cs +++ b/Robust.Client/UserInterface/CustomControls/FrameGraph.cs @@ -1,5 +1,4 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Shared.Interfaces.Timing; +using Robust.Client.Graphics; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs b/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs index cd9bb8295..25d78ef94 100644 --- a/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs +++ b/Robust.Client/UserInterface/CustomControls/SS14Window.xaml.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; @@ -105,26 +105,26 @@ namespace Robust.Client.UserInterface.CustomControls if (Resizable) { - if (relativeMousePos.Y < SS14Window.DRAG_MARGIN_SIZE) + if (relativeMousePos.Y < DRAG_MARGIN_SIZE) { mode = DragMode.Top; } - else if (relativeMousePos.Y > Size.Y - SS14Window.DRAG_MARGIN_SIZE) + else if (relativeMousePos.Y > Size.Y - DRAG_MARGIN_SIZE) { mode = DragMode.Bottom; } - if (relativeMousePos.X < SS14Window.DRAG_MARGIN_SIZE) + if (relativeMousePos.X < DRAG_MARGIN_SIZE) { mode |= DragMode.Left; } - else if (relativeMousePos.X > Size.X - SS14Window.DRAG_MARGIN_SIZE) + else if (relativeMousePos.X > Size.X - DRAG_MARGIN_SIZE) { mode |= DragMode.Right; } } - if (mode == DragMode.None && relativeMousePos.Y < SS14Window.HEADER_SIZE_Y) + if (mode == DragMode.None && relativeMousePos.Y < HEADER_SIZE_Y) { mode = DragMode.Move; } diff --git a/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs b/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs index e8f843dd5..34b5b1eff 100644 --- a/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs +++ b/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs @@ -1,4 +1,4 @@ -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/CustomControls/TileSpawnWindow.cs b/Robust.Client/UserInterface/CustomControls/TileSpawnWindow.cs index 6a4b2df6b..225d1cb18 100644 --- a/Robust.Client/UserInterface/CustomControls/TileSpawnWindow.cs +++ b/Robust.Client/UserInterface/CustomControls/TileSpawnWindow.cs @@ -1,17 +1,13 @@ -using Robust.Client.Interfaces.Placement; -using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.Controls; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Map; using System; using System.Collections.Generic; using System.Linq; using Robust.Client.Graphics; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Placement; using Robust.Client.ResourceManagement; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Utility; namespace Robust.Client.UserInterface.CustomControls { diff --git a/Robust.Client/UserInterface/DummyFileDialogManager.cs b/Robust.Client/UserInterface/DummyFileDialogManager.cs index 5c9e89650..9d0c77f44 100644 --- a/Robust.Client/UserInterface/DummyFileDialogManager.cs +++ b/Robust.Client/UserInterface/DummyFileDialogManager.cs @@ -1,6 +1,5 @@ using System.IO; using System.Threading.Tasks; -using Robust.Client.Interfaces.UserInterface; namespace Robust.Client.UserInterface { diff --git a/Robust.Client/UserInterface/FileDialogFilters.cs b/Robust.Client/UserInterface/FileDialogFilters.cs new file mode 100644 index 000000000..8927de014 --- /dev/null +++ b/Robust.Client/UserInterface/FileDialogFilters.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; + +namespace Robust.Client.UserInterface +{ + public class FileDialogFilters + { + public FileDialogFilters(IReadOnlyList groups) + { + Groups = groups; + } + + public FileDialogFilters(params Group[] groups) : this((IReadOnlyList) groups) + { + } + + public IReadOnlyList Groups { get; } + + public class Group + { + public Group(IReadOnlyList extensions) + { + Extensions = extensions; + } + + public Group(params string[] extensions) : this((IReadOnlyList) extensions) + { + } + + public IReadOnlyList Extensions { get; } + } + } +} diff --git a/Robust.Client/UserInterface/FileDialogManager.cs b/Robust.Client/UserInterface/FileDialogManager.cs index a90281b30..c3e39033b 100644 --- a/Robust.Client/UserInterface/FileDialogManager.cs +++ b/Robust.Client/UserInterface/FileDialogManager.cs @@ -6,8 +6,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; using Robust.Shared; using Robust.Shared.IoC; using Robust.Shared.Log; diff --git a/Robust.Client/Interfaces/UserInterface/IClipboardManager.cs b/Robust.Client/UserInterface/IClipboardManager.cs similarity index 70% rename from Robust.Client/Interfaces/UserInterface/IClipboardManager.cs rename to Robust.Client/UserInterface/IClipboardManager.cs index 2437433a1..d17d90278 100644 --- a/Robust.Client/Interfaces/UserInterface/IClipboardManager.cs +++ b/Robust.Client/UserInterface/IClipboardManager.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.UserInterface +namespace Robust.Client.UserInterface { public interface IClipboardManager { diff --git a/Robust.Client/Interfaces/UserInterface/IDebugMonitors.cs b/Robust.Client/UserInterface/IDebugMonitors.cs similarity index 89% rename from Robust.Client/Interfaces/UserInterface/IDebugMonitors.cs rename to Robust.Client/UserInterface/IDebugMonitors.cs index f02a04933..aba2c4d5a 100644 --- a/Robust.Client/Interfaces/UserInterface/IDebugMonitors.cs +++ b/Robust.Client/UserInterface/IDebugMonitors.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.UserInterface +namespace Robust.Client.UserInterface { public interface IDebugMonitors { diff --git a/Robust.Client/Interfaces/UserInterface/IFileDialogManager.cs b/Robust.Client/UserInterface/IFileDialogManager.cs similarity index 59% rename from Robust.Client/Interfaces/UserInterface/IFileDialogManager.cs rename to Robust.Client/UserInterface/IFileDialogManager.cs index 5bbff0ff0..ac5e4a148 100644 --- a/Robust.Client/Interfaces/UserInterface/IFileDialogManager.cs +++ b/Robust.Client/UserInterface/IFileDialogManager.cs @@ -1,8 +1,7 @@ -using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -namespace Robust.Client.Interfaces.UserInterface +namespace Robust.Client.UserInterface { /// /// Manager for opening of file dialogs. @@ -31,32 +30,4 @@ namespace Robust.Client.Interfaces.UserInterface /// Task<(Stream fileStream, bool alreadyExisted)?> SaveFile(); } - - public class FileDialogFilters - { - public FileDialogFilters(IReadOnlyList groups) - { - Groups = groups; - } - - public FileDialogFilters(params Group[] groups) : this((IReadOnlyList) groups) - { - } - - public IReadOnlyList Groups { get; } - - public class Group - { - public Group(IReadOnlyList extensions) - { - Extensions = extensions; - } - - public Group(params string[] extensions) : this((IReadOnlyList) extensions) - { - } - - public IReadOnlyList Extensions { get; } - } - } -} +} \ No newline at end of file diff --git a/Robust.Client/Interfaces/UserInterface/IUserInterfaceManager.cs b/Robust.Client/UserInterface/IUserInterfaceManager.cs similarity index 67% rename from Robust.Client/Interfaces/UserInterface/IUserInterfaceManager.cs rename to Robust.Client/UserInterface/IUserInterfaceManager.cs index b34ebeb3a..7724136ac 100644 --- a/Robust.Client/Interfaces/UserInterface/IUserInterfaceManager.cs +++ b/Robust.Client/UserInterface/IUserInterfaceManager.cs @@ -1,15 +1,11 @@ using System; -using Robust.Client.Input; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.UserInterface; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared; -using Robust.Shared.Input; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Timing; -namespace Robust.Client.Interfaces.UserInterface +namespace Robust.Client.UserInterface { public interface IUserInterfaceManager { @@ -106,59 +102,4 @@ namespace Robust.Client.Interfaces.UserInterface void PushModal(Control modal); } - - internal interface IUserInterfaceManagerInternal : IUserInterfaceManager - { - /// - /// Clears and disposes of all UI components. - /// Highly destructive! - /// - void DisposeAllComponents(); - - void Initialize(); - void InitializeTesting(); - - void Update(FrameEventArgs args); - - void FrameUpdate(FrameEventArgs args); - - /// True if a UI control was hit and the key event should not pass through past UI. - bool HandleCanFocusDown(Vector2 pointerPosition); - - void HandleCanFocusUp(); - - void KeyBindDown(BoundKeyEventArgs args); - - void KeyBindUp(BoundKeyEventArgs args); - - void MouseMove(MouseMoveEventArgs mouseMoveEventArgs); - - void MouseWheel(MouseWheelEventArgs args); - - void TextEntered(TextEventArgs textEvent); - - void ControlHidden(Control control); - - void ControlRemovedFromTree(Control control); - - void RemoveModal(Control modal); - - void Render(IRenderHandle renderHandle); - - void QueueStyleUpdate(Control control); - void QueueLayoutUpdate(Control control); - void CursorChanged(Control control); - /// - /// Hides the tooltip for the indicated control, if tooltip for that control is currently showing. - /// - void HideTooltipFor(Control control); - - /// - /// If the control is currently showing a tooltip, - /// gets the tooltip that was supplied via TooltipSupplier (null if tooltip - /// was not supplied by tooltip supplier or tooltip is not showing for the control). - /// - Control? GetSuppliedTooltipFor(Control control); - } -} - +} \ No newline at end of file diff --git a/Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs b/Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs new file mode 100644 index 000000000..ea1448365 --- /dev/null +++ b/Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs @@ -0,0 +1,63 @@ +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Shared.Input; +using Robust.Shared.Maths; +using Robust.Shared.Timing; + +namespace Robust.Client.UserInterface +{ + internal interface IUserInterfaceManagerInternal : IUserInterfaceManager + { + /// + /// Clears and disposes of all UI components. + /// Highly destructive! + /// + void DisposeAllComponents(); + + void Initialize(); + void InitializeTesting(); + + void Update(FrameEventArgs args); + + void FrameUpdate(FrameEventArgs args); + + /// True if a UI control was hit and the key event should not pass through past UI. + bool HandleCanFocusDown(Vector2 pointerPosition); + + void HandleCanFocusUp(); + + void KeyBindDown(BoundKeyEventArgs args); + + void KeyBindUp(BoundKeyEventArgs args); + + void MouseMove(MouseMoveEventArgs mouseMoveEventArgs); + + void MouseWheel(MouseWheelEventArgs args); + + void TextEntered(TextEventArgs textEvent); + + void ControlHidden(Control control); + + void ControlRemovedFromTree(Control control); + + void RemoveModal(Control modal); + + void Render(IRenderHandle renderHandle); + + void QueueStyleUpdate(Control control); + void QueueLayoutUpdate(Control control); + void CursorChanged(Control control); + /// + /// Hides the tooltip for the indicated control, if tooltip for that control is currently showing. + /// + void HideTooltipFor(Control control); + + /// + /// If the control is currently showing a tooltip, + /// gets the tooltip that was supplied via TooltipSupplier (null if tooltip + /// was not supplied by tooltip supplier or tooltip is not showing for the control). + /// + Control? GetSuppliedTooltipFor(Control control); + } +} + diff --git a/Robust.Client/UserInterface/RichTextEntry.cs b/Robust.Client/UserInterface/RichTextEntry.cs index 0bdb4d498..fba1da0fa 100644 --- a/Robust.Client/UserInterface/RichTextEntry.cs +++ b/Robust.Client/UserInterface/RichTextEntry.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface.Controls; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Robust.Client/UserInterface/UITheme.cs b/Robust.Client/UserInterface/UITheme.cs index 369c6eb4d..def3abe86 100644 --- a/Robust.Client/UserInterface/UITheme.cs +++ b/Robust.Client/UserInterface/UITheme.cs @@ -1,5 +1,4 @@ using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; namespace Robust.Client.UserInterface { diff --git a/Robust.Client/UserInterface/UiCommands.cs b/Robust.Client/UserInterface/UiCommands.cs index 3ab9518db..912376532 100644 --- a/Robust.Client/UserInterface/UiCommands.cs +++ b/Robust.Client/UserInterface/UiCommands.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.State; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; -using Robust.Shared.Maths; +using Robust.Shared.Reflection; namespace Robust.Client.UserInterface { diff --git a/Robust.Client/UserInterface/UserInterfaceManager.cs b/Robust.Client/UserInterface/UserInterfaceManager.cs index 50cb80f6c..9881f0ecd 100644 --- a/Robust.Client/UserInterface/UserInterfaceManager.cs +++ b/Robust.Client/UserInterface/UserInterfaceManager.cs @@ -1,26 +1,21 @@ using System; using System.Collections.Generic; using Robust.Client.Console; +using Robust.Client.Graphics; using Robust.Client.Input; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; +using Robust.Client.State; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared; +using Robust.Shared.Configuration; +using Robust.Shared.ContentPack; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Resources; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; namespace Robust.Client.UserInterface diff --git a/Robust.Client/Utility/DiscordRichPresence.cs b/Robust.Client/Utility/DiscordRichPresence.cs index 141a3faf6..354796235 100644 --- a/Robust.Client/Utility/DiscordRichPresence.cs +++ b/Robust.Client/Utility/DiscordRichPresence.cs @@ -1,10 +1,10 @@ using DiscordRPC; using DiscordRPC.Logging; -using Robust.Client.Interfaces.Utility; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Configuration; using Robust.Shared.IoC; +using Robust.Shared.Log; +using LogLevel = DiscordRPC.Logging.LogLevel; namespace Robust.Client.Utility { diff --git a/Robust.Client/Interfaces/Utility/IDiscordRichPresence.cs b/Robust.Client/Utility/IDiscordRichPresence.cs similarity index 83% rename from Robust.Client/Interfaces/Utility/IDiscordRichPresence.cs rename to Robust.Client/Utility/IDiscordRichPresence.cs index 6a145a20f..65e68eb37 100644 --- a/Robust.Client/Interfaces/Utility/IDiscordRichPresence.cs +++ b/Robust.Client/Utility/IDiscordRichPresence.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Client.Interfaces.Utility +namespace Robust.Client.Utility { public interface IDiscordRichPresence: IDisposable { diff --git a/Robust.Client/Interfaces/Utility/IRand.cs b/Robust.Client/Utility/IRand.cs similarity index 81% rename from Robust.Client/Interfaces/Utility/IRand.cs rename to Robust.Client/Utility/IRand.cs index c3dc17cb0..3de1e299c 100644 --- a/Robust.Client/Interfaces/Utility/IRand.cs +++ b/Robust.Client/Utility/IRand.cs @@ -1,4 +1,4 @@ -namespace Robust.Client.Interfaces.Utility +namespace Robust.Client.Utility { public interface IRand { diff --git a/Robust.Client/Utility/SpriteSpecifierExt.cs b/Robust.Client/Utility/SpriteSpecifierExt.cs index 9889dbb22..906434544 100644 --- a/Robust.Client/Utility/SpriteSpecifierExt.cs +++ b/Robust.Client/Utility/SpriteSpecifierExt.cs @@ -1,10 +1,8 @@ using System; using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Renderable; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Prototypes; diff --git a/Robust.Client/ViewVariables/Editors/VVPropEditorColor.cs b/Robust.Client/ViewVariables/Editors/VVPropEditorColor.cs index f53de956a..5452151b1 100644 --- a/Robust.Client/ViewVariables/Editors/VVPropEditorColor.cs +++ b/Robust.Client/ViewVariables/Editors/VVPropEditorColor.cs @@ -1,4 +1,3 @@ -using System; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Maths; diff --git a/Robust.Client/ViewVariables/Editors/VVPropEditorEntityCoordinates.cs b/Robust.Client/ViewVariables/Editors/VVPropEditorEntityCoordinates.cs index a683ef384..e462d3314 100644 --- a/Robust.Client/ViewVariables/Editors/VVPropEditorEntityCoordinates.cs +++ b/Robust.Client/ViewVariables/Editors/VVPropEditorEntityCoordinates.cs @@ -2,8 +2,6 @@ using System.Globalization; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Client/ViewVariables/Editors/VVPropEditorEntityUid.cs b/Robust.Client/ViewVariables/Editors/VVPropEditorEntityUid.cs index 890be490d..22ee5d536 100644 --- a/Robust.Client/ViewVariables/Editors/VVPropEditorEntityUid.cs +++ b/Robust.Client/ViewVariables/Editors/VVPropEditorEntityUid.cs @@ -1,5 +1,4 @@ -using System.Globalization; -using Robust.Client.UserInterface; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Robust.Client/ViewVariables/Editors/VVPropEditorEnum.cs b/Robust.Client/ViewVariables/Editors/VVPropEditorEnum.cs index 767c2dc68..ed3ef9f66 100644 --- a/Robust.Client/ViewVariables/Editors/VVPropEditorEnum.cs +++ b/Robust.Client/ViewVariables/Editors/VVPropEditorEnum.cs @@ -1,12 +1,7 @@ using System; -using System.Globalization; -using System.Linq.Expressions; -using System.Reflection; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Maths; using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; namespace Robust.Client.ViewVariables.Editors { diff --git a/Robust.Client/ViewVariables/Editors/VVPropEditorISelfSerialzable.cs b/Robust.Client/ViewVariables/Editors/VVPropEditorISelfSerialzable.cs index 2854e71f5..d04866f42 100644 --- a/Robust.Client/ViewVariables/Editors/VVPropEditorISelfSerialzable.cs +++ b/Robust.Client/ViewVariables/Editors/VVPropEditorISelfSerialzable.cs @@ -1,7 +1,7 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Serialization; using System; +using Robust.Shared.Serialization; namespace Robust.Client.ViewVariables.Editors { diff --git a/Robust.Client/ViewVariables/Editors/VVPropEditorVector2.cs b/Robust.Client/ViewVariables/Editors/VVPropEditorVector2.cs index ea71ba321..4208ae992 100644 --- a/Robust.Client/ViewVariables/Editors/VVPropEditorVector2.cs +++ b/Robust.Client/ViewVariables/Editors/VVPropEditorVector2.cs @@ -1,4 +1,3 @@ -using System; using System.Globalization; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Robust.Client/ViewVariables/IViewVariablesManager.cs b/Robust.Client/ViewVariables/IViewVariablesManager.cs index f2d82cd83..0c0f86b50 100644 --- a/Robust.Client/ViewVariables/IViewVariablesManager.cs +++ b/Robust.Client/ViewVariables/IViewVariablesManager.cs @@ -1,4 +1,3 @@ -using System; using Robust.Shared.ViewVariables; namespace Robust.Client.ViewVariables diff --git a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs index f81ba9ef9..43a93b32a 100644 --- a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs +++ b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs @@ -3,20 +3,17 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Robust.Client.Console; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.GameObjects; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.ViewVariables.Traits; -using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; 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; using static Robust.Client.UserInterface.Control; diff --git a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceObject.cs b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceObject.cs index ed3c4ad48..f707ed569 100644 --- a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceObject.cs +++ b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceObject.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.ViewVariables.Traits; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using Robust.Shared.Utility; diff --git a/Robust.Client/ViewVariables/Traits/ViewVariablesTraitMembers.cs b/Robust.Client/ViewVariables/Traits/ViewVariablesTraitMembers.cs index aff97d1fb..02aae6243 100644 --- a/Robust.Client/ViewVariables/Traits/ViewVariablesTraitMembers.cs +++ b/Robust.Client/ViewVariables/Traits/ViewVariablesTraitMembers.cs @@ -1,9 +1,8 @@ -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.UserInterface; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.ViewVariables.Instances; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; +using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/ViewVariables/VVPropEditor.cs b/Robust.Client/ViewVariables/VVPropEditor.cs index 918019c1e..2321a90db 100644 --- a/Robust.Client/ViewVariables/VVPropEditor.cs +++ b/Robust.Client/ViewVariables/VVPropEditor.cs @@ -1,7 +1,5 @@ using System; -using System.ComponentModel; using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; namespace Robust.Client.ViewVariables { diff --git a/Robust.Client/ViewVariables/ViewVariablesCommand.cs b/Robust.Client/ViewVariables/ViewVariablesCommand.cs index 3231a865c..c23b45c82 100644 --- a/Robust.Client/ViewVariables/ViewVariablesCommand.cs +++ b/Robust.Client/ViewVariables/ViewVariablesCommand.cs @@ -1,14 +1,13 @@ using System.Collections; using System.Collections.Generic; using JetBrains.Annotations; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.UserInterface; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.IoC.Exceptions; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.ViewVariables; namespace Robust.Client.ViewVariables diff --git a/Robust.Client/ViewVariables/ViewVariablesInstance.cs b/Robust.Client/ViewVariables/ViewVariablesInstance.cs index 97d56e4f0..78bb742e1 100644 --- a/Robust.Client/ViewVariables/ViewVariablesInstance.cs +++ b/Robust.Client/ViewVariables/ViewVariablesInstance.cs @@ -2,13 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Client.ViewVariables.Traits; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; +using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Client/ViewVariables/ViewVariablesManager.cs b/Robust.Client/ViewVariables/ViewVariablesManager.cs index c462fc387..8e231e10c 100644 --- a/Robust.Client/ViewVariables/ViewVariablesManager.cs +++ b/Robust.Client/ViewVariables/ViewVariablesManager.cs @@ -1,20 +1,18 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.ViewVariables.Editors; using Robust.Client.ViewVariables.Instances; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using NumberType = Robust.Client.ViewVariables.Editors.VVPropEditorNumeric.NumberType; diff --git a/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs b/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs index 023df26b7..1f8d91440 100644 --- a/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs +++ b/Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs @@ -1,14 +1,11 @@ using System; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.ViewVariables.Editors; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; +using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Server/AI/AiLogicProcessor.cs b/Robust.Server/AI/AiLogicProcessor.cs index 8e8d17c66..4e72f517b 100644 --- a/Robust.Server/AI/AiLogicProcessor.cs +++ b/Robust.Server/AI/AiLogicProcessor.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Server.AI { diff --git a/Robust.Server/BaseServer.cs b/Robust.Server/BaseServer.cs index bb4ada431..0ee553a6c 100644 --- a/Robust.Server/BaseServer.cs +++ b/Robust.Server/BaseServer.cs @@ -5,41 +5,33 @@ using System.Runtime.InteropServices; using System.Threading; using Prometheus; using Robust.Server.Console; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.GameState; -using Robust.Server.Interfaces.Placement; -using Robust.Server.Interfaces.Player; using Robust.Shared.Configuration; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.Interfaces.Timers; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Prototypes; -using Robust.Server.Interfaces.ServerStatus; using Robust.Server.ViewVariables; using Robust.Shared.Asynchronous; using Robust.Shared.Timing; using Robust.Shared.Utility; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Exceptions; -using Robust.Server.Interfaces.Debugging; using Robust.Server.Scripting; using Robust.Server.ServerStatus; using Robust.Shared; -using Robust.Shared.Network.Messages; using Robust.Server.DataMetrics; +using Robust.Server.Debugging; +using Robust.Server.GameObjects; +using Robust.Server.GameStates; using Robust.Server.Log; +using Robust.Server.Placement; +using Robust.Server.Player; using Robust.Server.Utility; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.Shared.Serialization; +using Robust.Shared.Timers; using Serilog.Debugging; using Serilog.Sinks.Loki; using Stopwatch = Robust.Shared.Timing.Stopwatch; diff --git a/Robust.Server/Console/Commands/AddCompCommand.cs b/Robust.Server/Console/Commands/AddCompCommand.cs index 2eb27c4d0..094280e62 100644 --- a/Robust.Server/Console/Commands/AddCompCommand.cs +++ b/Robust.Server/Console/Commands/AddCompCommand.cs @@ -1,8 +1,6 @@ using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Robust.Server.Console.Commands diff --git a/Robust.Server/Console/Commands/CVarCommand.cs b/Robust.Server/Console/Commands/CVarCommand.cs index 463c6cfea..578b75e4d 100644 --- a/Robust.Server/Console/Commands/CVarCommand.cs +++ b/Robust.Server/Console/Commands/CVarCommand.cs @@ -1,9 +1,7 @@ using System; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Shared.Configuration; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; namespace Robust.Server.Console.Commands diff --git a/Robust.Server/Console/Commands/DeleteCommand.cs b/Robust.Server/Console/Commands/DeleteCommand.cs index 01df54889..5282c7b2c 100644 --- a/Robust.Server/Console/Commands/DeleteCommand.cs +++ b/Robust.Server/Console/Commands/DeleteCommand.cs @@ -1,5 +1,4 @@ -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Robust.Server/Console/Commands/ListAssembliesCommand.cs b/Robust.Server/Console/Commands/ListAssembliesCommand.cs index 62862b341..8ace8164b 100644 --- a/Robust.Server/Console/Commands/ListAssembliesCommand.cs +++ b/Robust.Server/Console/Commands/ListAssembliesCommand.cs @@ -1,7 +1,6 @@ using System.Runtime.Loader; using System.Text; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; namespace Robust.Server.Console.Commands diff --git a/Robust.Server/Console/Commands/ListCommands.cs b/Robust.Server/Console/Commands/ListCommands.cs index b654d5fed..21744e3eb 100644 --- a/Robust.Server/Console/Commands/ListCommands.cs +++ b/Robust.Server/Console/Commands/ListCommands.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Text; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; namespace Robust.Server.Console.Commands diff --git a/Robust.Server/Console/Commands/LogCommands.cs b/Robust.Server/Console/Commands/LogCommands.cs index ff5fbd0ac..e9118acd4 100644 --- a/Robust.Server/Console/Commands/LogCommands.cs +++ b/Robust.Server/Console/Commands/LogCommands.cs @@ -1,5 +1,4 @@ using System; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.Log; diff --git a/Robust.Server/Console/Commands/MapCommands.cs b/Robust.Server/Console/Commands/MapCommands.cs index 5a6bacf05..8b514e66c 100644 --- a/Robust.Server/Console/Commands/MapCommands.cs +++ b/Robust.Server/Console/Commands/MapCommands.cs @@ -1,13 +1,11 @@ using System.Globalization; using System.Linq; using System.Text; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.Timing; using Robust.Server.Maps; +using Robust.Server.Player; +using Robust.Server.Timing; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Robust.Server/Console/Commands/PlayerCommands.cs b/Robust.Server/Console/Commands/PlayerCommands.cs index 8160821c8..e1ce3afe7 100644 --- a/Robust.Server/Console/Commands/PlayerCommands.cs +++ b/Robust.Server/Console/Commands/PlayerCommands.cs @@ -1,12 +1,9 @@ using System; using System.Linq; using System.Text; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Server/Console/Commands/SpawnCommand.cs b/Robust.Server/Console/Commands/SpawnCommand.cs index 385d850ae..5f4584d97 100644 --- a/Robust.Server/Console/Commands/SpawnCommand.cs +++ b/Robust.Server/Console/Commands/SpawnCommand.cs @@ -1,7 +1,6 @@ -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; namespace Robust.Server.Console.Commands diff --git a/Robust.Server/Console/Commands/SysCommands.cs b/Robust.Server/Console/Commands/SysCommands.cs index 61eb19311..ed56a2f2c 100644 --- a/Robust.Server/Console/Commands/SysCommands.cs +++ b/Robust.Server/Console/Commands/SysCommands.cs @@ -1,15 +1,12 @@ using System; using System.Runtime; using System.Text; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.Player; +using Robust.Shared.Configuration; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.Serialization; +using Robust.Shared.Timing; namespace Robust.Server.Console.Commands { diff --git a/Robust.Server/Console/ConGroupController.cs b/Robust.Server/Console/ConGroupController.cs index 9340b5b89..7a9b6f852 100644 --- a/Robust.Server/Console/ConGroupController.cs +++ b/Robust.Server/Console/ConGroupController.cs @@ -1,4 +1,4 @@ -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; namespace Robust.Server.Console { diff --git a/Robust.Server/Console/IConGroupControllerImplementation.cs b/Robust.Server/Console/IConGroupControllerImplementation.cs index b343a5ac4..dbb27009d 100644 --- a/Robust.Server/Console/IConGroupControllerImplementation.cs +++ b/Robust.Server/Console/IConGroupControllerImplementation.cs @@ -1,4 +1,4 @@ -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; namespace Robust.Server.Console { diff --git a/Robust.Server/Console/ServerConsoleHost.cs b/Robust.Server/Console/ServerConsoleHost.cs index 80f73f469..0efc87d7e 100644 --- a/Robust.Server/Console/ServerConsoleHost.cs +++ b/Robust.Server/Console/ServerConsoleHost.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; using Robust.Shared.Players; using Robust.Shared.Utility; diff --git a/Robust.Server/Console/SystemConsoleManager.cs b/Robust.Server/Console/SystemConsoleManager.cs index 6f81ca60a..ceaf5ccf9 100644 --- a/Robust.Server/Console/SystemConsoleManager.cs +++ b/Robust.Server/Console/SystemConsoleManager.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Server.Interfaces; using Robust.Shared.Asynchronous; using Robust.Shared.IoC; using Con = System.Console; diff --git a/Robust.Server/DataMetrics/MetricsManager.cs b/Robust.Server/DataMetrics/MetricsManager.cs index 318341c90..464c83b72 100644 --- a/Robust.Server/DataMetrics/MetricsManager.cs +++ b/Robust.Server/DataMetrics/MetricsManager.cs @@ -2,8 +2,8 @@ using System; using System.Threading.Tasks; using Prometheus; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Configuration; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; diff --git a/Robust.Server/Debugging/DebugDrawingManager.cs b/Robust.Server/Debugging/DebugDrawingManager.cs index ba965d93d..3cdf9d783 100644 --- a/Robust.Server/Debugging/DebugDrawingManager.cs +++ b/Robust.Server/Debugging/DebugDrawingManager.cs @@ -1,9 +1,8 @@ -using System.Diagnostics; -using Robust.Server.Interfaces.Debugging; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Physics; +using System.Diagnostics; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Physics; namespace Robust.Server.Debugging { diff --git a/Robust.Server/Interfaces/Debugging/IDebugDrawingManager.cs b/Robust.Server/Debugging/IDebugDrawingManager.cs similarity index 63% rename from Robust.Server/Interfaces/Debugging/IDebugDrawingManager.cs rename to Robust.Server/Debugging/IDebugDrawingManager.cs index e46408fba..672f838ed 100644 --- a/Robust.Server/Interfaces/Debugging/IDebugDrawingManager.cs +++ b/Robust.Server/Debugging/IDebugDrawingManager.cs @@ -1,4 +1,4 @@ -namespace Robust.Server.Interfaces.Debugging +namespace Robust.Server.Debugging { public interface IDebugDrawingManager { diff --git a/Robust.Server/GameObjects/!NO_FOLDER_NAMESPACES b/Robust.Server/GameObjects/!NO_FOLDER_NAMESPACES new file mode 100644 index 000000000..3fd42d623 --- /dev/null +++ b/Robust.Server/GameObjects/!NO_FOLDER_NAMESPACES @@ -0,0 +1,3 @@ +Everything in this folder and subfolders needs to be in: + +Robust.Server.GameObjects diff --git a/Robust.Server/GameObjects/Components/Actor/BasicActorComponent.cs b/Robust.Server/GameObjects/Components/Actor/BasicActorComponent.cs index 74282ab47..f392b0362 100644 --- a/Robust.Server/GameObjects/Components/Actor/BasicActorComponent.cs +++ b/Robust.Server/GameObjects/Components/Actor/BasicActorComponent.cs @@ -1,9 +1,6 @@ -using System; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using System; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Robust.Server.GameObjects diff --git a/Robust.Server/GameObjects/Components/Actor/IActorComponent.cs b/Robust.Server/GameObjects/Components/Actor/IActorComponent.cs new file mode 100644 index 000000000..915adbcfa --- /dev/null +++ b/Robust.Server/GameObjects/Components/Actor/IActorComponent.cs @@ -0,0 +1,10 @@ +using Robust.Server.Player; +using Robust.Shared.GameObjects; + +namespace Robust.Server.GameObjects +{ + public interface IActorComponent : IComponent + { + IPlayerSession playerSession { get; } + } +} diff --git a/Robust.Server/GameObjects/Components/Appearance/AppearanceComponent.cs b/Robust.Server/GameObjects/Components/Appearance/AppearanceComponent.cs index ea936ecaa..0cdeccdf8 100644 --- a/Robust.Server/GameObjects/Components/Appearance/AppearanceComponent.cs +++ b/Robust.Server/GameObjects/Components/Appearance/AppearanceComponent.cs @@ -1,5 +1,4 @@ using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Appearance; using Robust.Shared.ViewVariables; using System; using System.Collections.Generic; diff --git a/Robust.Server/GameObjects/Components/Container/Container.cs b/Robust.Server/GameObjects/Components/Container/Container.cs index e6c2efd39..2fed497ef 100644 --- a/Robust.Server/GameObjects/Components/Container/Container.cs +++ b/Robust.Server/GameObjects/Components/Container/Container.cs @@ -1,16 +1,12 @@ -using System.Collections.Generic; +using System.Collections.Generic; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Maths; -using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -namespace Robust.Server.GameObjects.Components.Container +namespace Robust.Server.GameObjects { /// /// Default implementation for containers, diff --git a/Robust.Server/GameObjects/Components/Container/ContainerManagerComponent.cs b/Robust.Server/GameObjects/Components/Container/ContainerManagerComponent.cs index 4cde65bad..26fe48ee2 100644 --- a/Robust.Server/GameObjects/Components/Container/ContainerManagerComponent.cs +++ b/Robust.Server/GameObjects/Components/Container/ContainerManagerComponent.cs @@ -1,19 +1,15 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using Robust.Shared.GameObjects.Components.Containers; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Server.GameObjects.Components.Container +namespace Robust.Server.GameObjects { public sealed class ContainerManagerComponent : SharedContainerManagerComponent { diff --git a/Robust.Server/GameObjects/Components/Eye/EyeComponent.cs b/Robust.Server/GameObjects/Components/Eye/EyeComponent.cs index d15a52403..44d0da8e0 100644 --- a/Robust.Server/GameObjects/Components/Eye/EyeComponent.cs +++ b/Robust.Server/GameObjects/Components/Eye/EyeComponent.cs @@ -1,10 +1,8 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Eye; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -namespace Robust.Server.GameObjects.Components.Eye +namespace Robust.Server.GameObjects { public class EyeComponent : SharedEyeComponent { diff --git a/Robust.Server/Interfaces/GameObjects/IMapInit.cs b/Robust.Server/GameObjects/Components/IMapInit.cs similarity index 78% rename from Robust.Server/Interfaces/GameObjects/IMapInit.cs rename to Robust.Server/GameObjects/Components/IMapInit.cs index 22c3d2a38..236991f6a 100644 --- a/Robust.Server/Interfaces/GameObjects/IMapInit.cs +++ b/Robust.Server/GameObjects/Components/IMapInit.cs @@ -1,8 +1,6 @@ -using System.Linq; -using Robust.Server.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; -namespace Robust.Server.Interfaces.GameObjects +namespace Robust.Server.GameObjects { /// /// Defines a component that has "map initialization" behavior. diff --git a/Robust.Server/GameObjects/Components/IgnorePauseComponent.cs b/Robust.Server/GameObjects/Components/IgnorePauseComponent.cs index 63b075784..f92e448dd 100644 --- a/Robust.Server/GameObjects/Components/IgnorePauseComponent.cs +++ b/Robust.Server/GameObjects/Components/IgnorePauseComponent.cs @@ -1,9 +1,8 @@ -using Robust.Server.Interfaces.Timing; +using Robust.Server.Timing; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.IoC; -namespace Robust.Server.GameObjects.Components +namespace Robust.Server.GameObjects { [RegisterComponent] [ComponentReference(typeof(SharedIgnorePauseComponent))] diff --git a/Robust.Server/Interfaces/GameObjects/IRenderableComponent.cs b/Robust.Server/GameObjects/Components/Renderable/IRenderableComponent.cs similarity index 53% rename from Robust.Server/Interfaces/GameObjects/IRenderableComponent.cs rename to Robust.Server/GameObjects/Components/Renderable/IRenderableComponent.cs index 33ea9d303..b717fef37 100644 --- a/Robust.Server/Interfaces/GameObjects/IRenderableComponent.cs +++ b/Robust.Server/GameObjects/Components/Renderable/IRenderableComponent.cs @@ -1,6 +1,6 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; -namespace Robust.Server.Interfaces.GameObjects +namespace Robust.Server.GameObjects { public interface IRenderableComponent : IComponent { diff --git a/Robust.Server/Interfaces/GameObjects/ISpriteRenderableComponent.cs b/Robust.Server/GameObjects/Components/Renderable/ISpriteRenderableComponent.cs similarity index 64% rename from Robust.Server/Interfaces/GameObjects/ISpriteRenderableComponent.cs rename to Robust.Server/GameObjects/Components/Renderable/ISpriteRenderableComponent.cs index 1fe3566ae..aea1c1de1 100644 --- a/Robust.Server/Interfaces/GameObjects/ISpriteRenderableComponent.cs +++ b/Robust.Server/GameObjects/Components/Renderable/ISpriteRenderableComponent.cs @@ -1,4 +1,4 @@ -namespace Robust.Server.Interfaces.GameObjects +namespace Robust.Server.GameObjects { public interface ISpriteRenderableComponent : IRenderableComponent { diff --git a/Robust.Server/GameObjects/Components/Renderable/SpriteComponent.cs b/Robust.Server/GameObjects/Components/Renderable/SpriteComponent.cs index 1e3fd4aea..26341502b 100644 --- a/Robust.Server/GameObjects/Components/Renderable/SpriteComponent.cs +++ b/Robust.Server/GameObjects/Components/Renderable/SpriteComponent.cs @@ -1,9 +1,7 @@ -using System; +using System; using System.Collections.Generic; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth; -using Robust.Shared.GameObjects.Components.Renderable; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Robust.Server/GameObjects/Components/UserInterface/ServerUserInterfaceComponent.cs b/Robust.Server/GameObjects/Components/UserInterface/ServerUserInterfaceComponent.cs index 240408d87..7daf54019 100644 --- a/Robust.Server/GameObjects/Components/UserInterface/ServerUserInterfaceComponent.cs +++ b/Robust.Server/GameObjects/Components/UserInterface/ServerUserInterfaceComponent.cs @@ -1,21 +1,17 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Serialization; -namespace Robust.Server.GameObjects.Components.UserInterface +namespace Robust.Server.GameObjects { /// /// Contains a collection of entity-bound user interfaces that can be opened per client. diff --git a/Robust.Server/GameObjects/Components/VisibilityComponent.cs b/Robust.Server/GameObjects/Components/VisibilityComponent.cs index 70db4cb3c..092051ba4 100644 --- a/Robust.Server/GameObjects/Components/VisibilityComponent.cs +++ b/Robust.Server/GameObjects/Components/VisibilityComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Server.GameObjects.Components +namespace Robust.Server.GameObjects { [RegisterComponent] public class VisibilityComponent : Component diff --git a/Robust.Server/GameObjects/EntitySystemMessages/EntRemovedFromContainerMessage.cs b/Robust.Server/GameObjects/EntitySystemMessages/EntRemovedFromContainerMessage.cs index a8b1047fc..a4312ac31 100644 --- a/Robust.Server/GameObjects/EntitySystemMessages/EntRemovedFromContainerMessage.cs +++ b/Robust.Server/GameObjects/EntitySystemMessages/EntRemovedFromContainerMessage.cs @@ -1,9 +1,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -namespace Robust.Server.GameObjects.EntitySystemMessages +namespace Robust.Server.GameObjects { [PublicAPI] public abstract class ContainerModifiedMessage : EntitySystemMessage diff --git a/Robust.Server/GameObjects/EntitySystemMessages/EntityDeletedMessage.cs b/Robust.Server/GameObjects/EntitySystemMessages/EntityDeletedMessage.cs index 2636e1857..374dc1ce8 100644 --- a/Robust.Server/GameObjects/EntitySystemMessages/EntityDeletedMessage.cs +++ b/Robust.Server/GameObjects/EntitySystemMessages/EntityDeletedMessage.cs @@ -1,7 +1,6 @@ using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -namespace Robust.Server.GameObjects.EntitySystemMessages +namespace Robust.Server.GameObjects { public sealed class EntityDeletedMessage : EntitySystemMessage { @@ -12,4 +11,4 @@ namespace Robust.Server.GameObjects.EntitySystemMessages Entity = entity; } } -} \ No newline at end of file +} diff --git a/Robust.Server/GameObjects/EntitySystemMessages/EntityTileMessage.cs b/Robust.Server/GameObjects/EntitySystemMessages/EntityTileMessage.cs index 8d8b180b5..c853f8fae 100644 --- a/Robust.Server/GameObjects/EntitySystemMessages/EntityTileMessage.cs +++ b/Robust.Server/GameObjects/EntitySystemMessages/EntityTileMessage.cs @@ -3,7 +3,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Server.GameObjects.EntitySystemMessages +namespace Robust.Server.GameObjects { /// /// Event for when the intersecting Vector2i of an entity changes. @@ -21,4 +21,4 @@ namespace Robust.Server.GameObjects.EntitySystemMessages NewIndices = indices; } } -} \ No newline at end of file +} diff --git a/Robust.Server/GameObjects/EntitySystems/AudioSystem.cs b/Robust.Server/GameObjects/EntitySystems/AudioSystem.cs index e21fb3164..5838b66b3 100644 --- a/Robust.Server/GameObjects/EntitySystems/AudioSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/AudioSystem.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; -using static Robust.Server.GameObjects.EntitySystems.AudioSystem; +using static Robust.Server.GameObjects.AudioSystem; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { public class AudioSystem : EntitySystem { diff --git a/Robust.Server/GameObjects/EntitySystems/ContainerSystem.cs b/Robust.Server/GameObjects/EntitySystems/ContainerSystem.cs index 5a1192de8..2a58997bd 100644 --- a/Robust.Server/GameObjects/EntitySystems/ContainerSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/ContainerSystem.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { internal sealed class ContainerSystem : EntitySystem { diff --git a/Robust.Server/GameObjects/EntitySystems/EffectSystem.cs b/Robust.Server/GameObjects/EntitySystems/EffectSystem.cs index febae52e6..049e3e93a 100644 --- a/Robust.Server/GameObjects/EntitySystems/EffectSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/EffectSystem.cs @@ -1,13 +1,12 @@ -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; -using System.Collections.Generic; -using Robust.Server.Interfaces.Player; +using System.Collections.Generic; +using Robust.Server.Player; using Robust.Shared.Enums; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Timing; using Robust.Shared.Utility; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { /// /// An entity system that displays temporary effects to the user diff --git a/Robust.Server/GameObjects/EntitySystems/InputSystem.cs b/Robust.Server/GameObjects/EntitySystems/InputSystem.cs index 5083b70c7..8356e3ea1 100644 --- a/Robust.Server/GameObjects/EntitySystems/InputSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/InputSystem.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input; -using Robust.Shared.Input.Binding; using Robust.Shared.IoC; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { /// /// Server side processing of incoming user commands. diff --git a/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs b/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs index 34a81069c..b708c9c92 100644 --- a/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs @@ -1,9 +1,7 @@ -using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using System.Linq; -using Robust.Shared.GameObjects.Components; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { [UsedImplicitly] public class PhysicsSystem : SharedPhysicsSystem diff --git a/Robust.Server/GameObjects/EntitySystems/ServerOccluderSystem.cs b/Robust.Server/GameObjects/EntitySystems/ServerOccluderSystem.cs index 9920f7f28..e063109ec 100644 --- a/Robust.Server/GameObjects/EntitySystems/ServerOccluderSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/ServerOccluderSystem.cs @@ -1,7 +1,7 @@ -using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { [UsedImplicitly] public sealed class ServerOccluderSystem : OccluderSystem diff --git a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupChunk.cs b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupChunk.cs index 8ffb89268..1ad9b4c71 100644 --- a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupChunk.cs +++ b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupChunk.cs @@ -1,7 +1,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Server.GameObjects.EntitySystems.TileLookup +namespace Robust.Server.GameObjects { internal sealed class GridTileLookupChunk { @@ -31,4 +31,4 @@ namespace Robust.Server.GameObjects.EntitySystems.TileLookup return _nodes[nodeIndices.X - Indices.X, nodeIndices.Y - Indices.Y]; } } -} \ No newline at end of file +} diff --git a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupNode.cs b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupNode.cs index 099e90bf6..5d4a9eed2 100644 --- a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupNode.cs +++ b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupNode.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; -namespace Robust.Server.GameObjects.EntitySystems.TileLookup +namespace Robust.Server.GameObjects { internal sealed class GridTileLookupNode { @@ -41,4 +40,4 @@ namespace Robust.Server.GameObjects.EntitySystems.TileLookup _entities.Remove(entity); } } -} \ No newline at end of file +} diff --git a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs index 39a979b33..b57d8bd06 100644 --- a/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs @@ -2,20 +2,12 @@ using System; using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystemMessages; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Server.GameObjects.EntitySystems.TileLookup +namespace Robust.Server.GameObjects { /// /// Stores what entities intersect a particular tile. diff --git a/Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs b/Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs index e33a4f19c..ee7b252fa 100644 --- a/Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs +++ b/Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects.Systems; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; -namespace Robust.Server.GameObjects.EntitySystems +namespace Robust.Server.GameObjects { [UsedImplicitly] internal class UserInterfaceSystem : EntitySystem diff --git a/Robust.Server/Interfaces/GameObjects/IServerEntityManager.cs b/Robust.Server/GameObjects/IServerEntityManager.cs similarity index 85% rename from Robust.Server/Interfaces/GameObjects/IServerEntityManager.cs rename to Robust.Server/GameObjects/IServerEntityManager.cs index 4f2a8fa62..7817e8c6b 100644 --- a/Robust.Server/Interfaces/GameObjects/IServerEntityManager.cs +++ b/Robust.Server/GameObjects/IServerEntityManager.cs @@ -1,11 +1,9 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using System.Collections.Generic; -using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; +using System.Collections.Generic; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.Timing; -namespace Robust.Server.Interfaces.GameObjects +namespace Robust.Server.GameObjects { public interface IServerEntityManager : IEntityManager { diff --git a/Robust.Server/Interfaces/GameObjects/IServerEntityManagerInternal.cs b/Robust.Server/GameObjects/IServerEntityManagerInternal.cs similarity index 70% rename from Robust.Server/Interfaces/GameObjects/IServerEntityManagerInternal.cs rename to Robust.Server/GameObjects/IServerEntityManagerInternal.cs index a602b2142..a154ea6e9 100644 --- a/Robust.Server/Interfaces/GameObjects/IServerEntityManagerInternal.cs +++ b/Robust.Server/GameObjects/IServerEntityManagerInternal.cs @@ -1,9 +1,8 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; -namespace Robust.Server.Interfaces.GameObjects +namespace Robust.Server.GameObjects { - interface IServerEntityManagerInternal : IServerEntityManager + internal interface IServerEntityManagerInternal : IServerEntityManager { // These methods are used by the map loader to do multi-stage entity construction during map load. // I would recommend you refer to the MapLoader for usage. diff --git a/Robust.Server/Interfaces/GameObjects/IServerEntityNetworkManager.cs b/Robust.Server/GameObjects/IServerEntityNetworkManager.cs similarity index 68% rename from Robust.Server/Interfaces/GameObjects/IServerEntityNetworkManager.cs rename to Robust.Server/GameObjects/IServerEntityNetworkManager.cs index 3cef31123..988c4774b 100644 --- a/Robust.Server/Interfaces/GameObjects/IServerEntityNetworkManager.cs +++ b/Robust.Server/GameObjects/IServerEntityNetworkManager.cs @@ -1,7 +1,7 @@ -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -namespace Robust.Server.Interfaces.GameObjects +namespace Robust.Server.GameObjects { public interface IServerEntityNetworkManager : IEntityNetworkManager { diff --git a/Robust.Server/GameObjects/ServerComponentFactory.cs b/Robust.Server/GameObjects/ServerComponentFactory.cs index 65db97e2f..8c7bca4d8 100644 --- a/Robust.Server/GameObjects/ServerComponentFactory.cs +++ b/Robust.Server/GameObjects/ServerComponentFactory.cs @@ -1,17 +1,4 @@ -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.Eye; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Appearance; -using Robust.Shared.GameObjects.Components.Eye; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; namespace Robust.Server.GameObjects { diff --git a/Robust.Server/GameObjects/ServerEntityManager.cs b/Robust.Server/GameObjects/ServerEntityManager.cs index 0627be92f..e2530e1b9 100644 --- a/Robust.Server/GameObjects/ServerEntityManager.cs +++ b/Robust.Server/GameObjects/ServerEntityManager.cs @@ -3,21 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using Prometheus; -using Robust.Server.GameObjects.Components; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.Timing; +using Robust.Server.Player; +using Robust.Server.Timing; using Robust.Shared; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Server/GameObjects/ServerEntityNetworkManager.cs b/Robust.Server/GameObjects/ServerEntityNetworkManager.cs index d4ce1fe58..b1bc57a56 100644 --- a/Robust.Server/GameObjects/ServerEntityNetworkManager.cs +++ b/Robust.Server/GameObjects/ServerEntityNetworkManager.cs @@ -1,18 +1,15 @@ using System; using System.Collections.Generic; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared; +using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.Server.GameObjects @@ -39,7 +36,7 @@ namespace Robust.Server.GameObjects new(); private bool _logLateMsgs; - + /// public void SetupNetworking() { diff --git a/Robust.Server/Interfaces/GameState/IServerGameStateManager.cs b/Robust.Server/GameStates/IServerGameStateManager.cs similarity index 90% rename from Robust.Server/Interfaces/GameState/IServerGameStateManager.cs rename to Robust.Server/GameStates/IServerGameStateManager.cs index de3c0034d..9ef393c4e 100644 --- a/Robust.Server/Interfaces/GameState/IServerGameStateManager.cs +++ b/Robust.Server/GameStates/IServerGameStateManager.cs @@ -1,4 +1,4 @@ -namespace Robust.Server.Interfaces.GameState +namespace Robust.Server.GameStates { /// /// Engine service that provides creating and dispatching of game states. diff --git a/Robust.Server/GameStates/ServerGameStateManager.cs b/Robust.Server/GameStates/ServerGameStateManager.cs index 9752a4f5b..d01d42dd0 100644 --- a/Robust.Server/GameStates/ServerGameStateManager.cs +++ b/Robust.Server/GameStates/ServerGameStateManager.cs @@ -1,24 +1,16 @@ -using System; -using System.Collections.Concurrent; +using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.GameState; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared; using Robust.Shared.Configuration; using Robust.Shared.Enums; +using Robust.Shared.GameObjects; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Network.Messages; using Robust.Shared.Timing; diff --git a/Robust.Server/Interfaces/IBaseServer.cs b/Robust.Server/IBaseServer.cs similarity index 93% rename from Robust.Server/Interfaces/IBaseServer.cs rename to Robust.Server/IBaseServer.cs index 06ac9bc37..998f0ffe1 100644 --- a/Robust.Server/Interfaces/IBaseServer.cs +++ b/Robust.Server/IBaseServer.cs @@ -1,9 +1,8 @@ using System; -using Robust.Server.Player; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Log; using Robust.Shared.Timing; -namespace Robust.Server.Interfaces +namespace Robust.Server { /// /// Top level class that controls the game logic of the server. diff --git a/Robust.Server/Interfaces/GameObjects/IActorComponent.cs b/Robust.Server/Interfaces/GameObjects/IActorComponent.cs deleted file mode 100644 index b6ce894be..000000000 --- a/Robust.Server/Interfaces/GameObjects/IActorComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; - -namespace Robust.Server.Interfaces.GameObjects -{ - public interface IActorComponent : IComponent - { - IPlayerSession playerSession { get; } - } -} diff --git a/Robust.Server/Interfaces/ServerStatus/IStatusHost.cs b/Robust.Server/Interfaces/ServerStatus/IStatusHost.cs deleted file mode 100644 index f69ca20ea..000000000 --- a/Robust.Server/Interfaces/ServerStatus/IStatusHost.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Net; -using System.Net.Http; -using Microsoft.Extensions.Primitives; -using Newtonsoft.Json.Linq; - -namespace Robust.Server.Interfaces.ServerStatus -{ - public delegate bool StatusHostHandler( - IStatusHandlerContext context); - - public interface IStatusHost - { - void Start(); - - void AddHandler(StatusHostHandler handler); - - /// - /// Invoked when a client queries a status request from the server. - /// THIS IS INVOKED FROM ANOTHER THREAD. - /// I REPEAT, THIS DOES NOT RUN ON THE MAIN THREAD. - /// MAKE TRIPLE SURE EVERYTHING IN HERE IS THREAD SAFE DEAR GOD. - /// - event Action OnStatusRequest; - - /// - /// Invoked when a client queries an info request from the server. - /// THIS IS INVOKED FROM ANOTHER THREAD. - /// I REPEAT, THIS DOES NOT RUN ON THE MAIN THREAD. - /// MAKE TRIPLE SURE EVERYTHING IN HERE IS THREAD SAFE DEAR GOD. - /// - event Action OnInfoRequest; - } - - public interface IStatusHandlerContext - { - HttpMethod RequestMethod { get; } - IPEndPoint RemoteEndPoint { get; } - Uri Url { get; } - bool IsGetLike { get; } - IReadOnlyDictionary RequestHeaders { get; } - - [return: MaybeNull] - public T RequestBodyJson(); - - void Respond( - string text, - HttpStatusCode code = HttpStatusCode.OK, - string contentType = "text/plain"); - - void Respond( - string text, - int code = 200, - string contentType = "text/plain"); - - void RespondError(HttpStatusCode code); - - void RespondJson(object jsonData, HttpStatusCode code = HttpStatusCode.OK); - } -} diff --git a/Robust.Server/Log/LokiLogHandler.cs b/Robust.Server/Log/LokiLogHandler.cs index ee82ed4f4..e144d13b4 100644 --- a/Robust.Server/Log/LokiLogHandler.cs +++ b/Robust.Server/Log/LokiLogHandler.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Log; using Robust.Shared.Log; using Serilog; using Serilog.Events; diff --git a/Robust.Server/Interfaces/Maps/IMapLoader.cs b/Robust.Server/Maps/IMapLoader.cs similarity index 89% rename from Robust.Server/Interfaces/Maps/IMapLoader.cs rename to Robust.Server/Maps/IMapLoader.cs index 29fe97d02..e50d43615 100644 --- a/Robust.Server/Interfaces/Maps/IMapLoader.cs +++ b/Robust.Server/Maps/IMapLoader.cs @@ -1,9 +1,8 @@ using System; -using Robust.Server.Maps; using Robust.Shared.Map; using YamlDotNet.RepresentationModel; -namespace Robust.Server.Interfaces.Maps +namespace Robust.Server.Maps { public interface IMapLoader { diff --git a/Robust.Server/Maps/MapLoader.cs b/Robust.Server/Maps/MapLoader.cs index 30db80876..7436456de 100644 --- a/Robust.Server/Maps/MapLoader.cs +++ b/Robust.Server/Maps/MapLoader.cs @@ -2,10 +2,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Maps; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; @@ -14,12 +10,10 @@ using Robust.Shared.Utility; using Robust.Shared.Serialization; using Robust.Shared.GameObjects; using System.Globalization; -using Robust.Shared.Interfaces.GameObjects; using System.Linq; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.Timing; +using Robust.Shared.ContentPack; using Robust.Shared.Prototypes; using YamlDotNet.Core; diff --git a/Robust.Server/Maps/YamlGridSerializer.cs b/Robust.Server/Maps/YamlGridSerializer.cs index 11473d89d..0ca6e485e 100644 --- a/Robust.Server/Maps/YamlGridSerializer.cs +++ b/Robust.Server/Maps/YamlGridSerializer.cs @@ -1,11 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Map; -using Robust.Shared.Maths; using Robust.Shared.Utility; using YamlDotNet.Core; using YamlDotNet.RepresentationModel; diff --git a/Robust.Server/Interfaces/Placement/IPlacementManager.cs b/Robust.Server/Placement/IPlacementManager.cs similarity index 96% rename from Robust.Server/Interfaces/Placement/IPlacementManager.cs rename to Robust.Server/Placement/IPlacementManager.cs index 553b65935..3a6d85bac 100644 --- a/Robust.Server/Interfaces/Placement/IPlacementManager.cs +++ b/Robust.Server/Placement/IPlacementManager.cs @@ -1,8 +1,8 @@ using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Network.Messages; -namespace Robust.Server.Interfaces.Placement +namespace Robust.Server.Placement { public interface IPlacementManager { diff --git a/Robust.Server/Placement/PlacementManager.cs b/Robust.Server/Placement/PlacementManager.cs index dd9223f28..087b2a965 100644 --- a/Robust.Server/Placement/PlacementManager.cs +++ b/Robust.Server/Placement/PlacementManager.cs @@ -1,18 +1,15 @@ using System; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Server.Interfaces.Placement; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using System.Collections.Generic; using System.Linq; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; namespace Robust.Server.Placement diff --git a/Robust.Server/Interfaces/Player/IPlayerData.cs b/Robust.Server/Player/IPlayerData.cs similarity index 68% rename from Robust.Server/Interfaces/Player/IPlayerData.cs rename to Robust.Server/Player/IPlayerData.cs index 4ba5c16f8..80b6c42f6 100644 --- a/Robust.Server/Interfaces/Player/IPlayerData.cs +++ b/Robust.Server/Player/IPlayerData.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Robust.Shared.GameObjects; -using Robust.Shared.Network; +using Robust.Shared.Network; -namespace Robust.Server.Interfaces.Player +namespace Robust.Server.Player { /// /// Stores player-specific data that is not lost upon reconnect. diff --git a/Robust.Server/Interfaces/Player/IPlayerInput.cs b/Robust.Server/Player/IPlayerInput.cs similarity index 89% rename from Robust.Server/Interfaces/Player/IPlayerInput.cs rename to Robust.Server/Player/IPlayerInput.cs index 21ffcafdb..0a5ef38ab 100644 --- a/Robust.Server/Interfaces/Player/IPlayerInput.cs +++ b/Robust.Server/Player/IPlayerInput.cs @@ -1,7 +1,7 @@ using Robust.Shared.Input; using Robust.Shared.Input.Binding; -namespace Robust.Server.Interfaces.Player +namespace Robust.Server.Player { public interface IPlayerInput { diff --git a/Robust.Server/Interfaces/Player/IPlayerManager.cs b/Robust.Server/Player/IPlayerManager.cs similarity index 95% rename from Robust.Server/Interfaces/Player/IPlayerManager.cs rename to Robust.Server/Player/IPlayerManager.cs index 0a378b67f..03845b9f2 100644 --- a/Robust.Server/Interfaces/Player/IPlayerManager.cs +++ b/Robust.Server/Player/IPlayerManager.cs @@ -1,17 +1,14 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameStates; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Map; using Robust.Shared.Network; -using Robust.Shared.Players; using Robust.Shared.Timing; -namespace Robust.Server.Interfaces.Player +namespace Robust.Server.Player { /// /// Manages each players session when connected to the server. diff --git a/Robust.Server/Interfaces/Player/IPlayerSession.cs b/Robust.Server/Player/IPlayerSession.cs similarity index 90% rename from Robust.Server/Interfaces/Player/IPlayerSession.cs rename to Robust.Server/Player/IPlayerSession.cs index 7f33461e8..2080e29c9 100644 --- a/Robust.Server/Interfaces/Player/IPlayerSession.cs +++ b/Robust.Server/Player/IPlayerSession.cs @@ -1,12 +1,9 @@ using System; -using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; using Robust.Shared.Players; -namespace Robust.Server.Interfaces.Player +namespace Robust.Server.Player { public interface IPlayerSession : ICommonSession { diff --git a/Robust.Server/Player/PlayerData.cs b/Robust.Server/Player/PlayerData.cs index ad1fdf13b..46431c76d 100644 --- a/Robust.Server/Player/PlayerData.cs +++ b/Robust.Server/Player/PlayerData.cs @@ -1,5 +1,4 @@ -using Robust.Server.Interfaces.Player; -using Robust.Shared.Network; +using Robust.Shared.Network; using Robust.Shared.ViewVariables; namespace Robust.Server.Player diff --git a/Robust.Server/Player/PlayerHelpers.cs b/Robust.Server/Player/PlayerHelpers.cs index 0e11234f0..ceaf8ff60 100644 --- a/Robust.Server/Player/PlayerHelpers.cs +++ b/Robust.Server/Player/PlayerHelpers.cs @@ -1,6 +1,5 @@ -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Server.Player { diff --git a/Robust.Server/Player/PlayerManager.cs b/Robust.Server/Player/PlayerManager.cs index f04dc66ac..8940f4d06 100644 --- a/Robust.Server/Player/PlayerManager.cs +++ b/Robust.Server/Player/PlayerManager.cs @@ -5,21 +5,16 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Prometheus; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.Player; using Robust.Shared.Configuration; using Robust.Shared.Enums; +using Robust.Shared.GameObjects; using Robust.Shared.GameStates; using Robust.Shared.Input; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Reflection; using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Server/Player/PlayerSession.cs b/Robust.Server/Player/PlayerSession.cs index c5af05a9d..d0418a6cf 100644 --- a/Robust.Server/Player/PlayerSession.cs +++ b/Robust.Server/Player/PlayerSession.cs @@ -1,11 +1,8 @@ -using Robust.Server.Interfaces.Player; -using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameStates; using Robust.Server.GameObjects; using System; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Robust.Server/Program.cs b/Robust.Server/Program.cs index f421ce0ab..e20eaf339 100644 --- a/Robust.Server/Program.cs +++ b/Robust.Server/Program.cs @@ -1,19 +1,15 @@ -using System; +using System; using System.Collections.Generic; -using System.Globalization; using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Threading.Tasks; -using Robust.Server.Interfaces; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; -using Robust.Shared; using Robust.Shared.Asynchronous; +using Robust.Shared.Reflection; namespace Robust.Server { diff --git a/Robust.Server/Reflection/ServerReflectionManager.cs b/Robust.Server/Reflection/ServerReflectionManager.cs index 63b95db03..5c8ca540d 100644 --- a/Robust.Server/Reflection/ServerReflectionManager.cs +++ b/Robust.Server/Reflection/ServerReflectionManager.cs @@ -1,5 +1,4 @@ -using Robust.Shared.IoC; -using Robust.Shared.Reflection; +using Robust.Shared.Reflection; using System.Collections.Generic; namespace Robust.Server.Reflection diff --git a/Robust.Server/Robust.Server.csproj.DotSettings b/Robust.Server/Robust.Server.csproj.DotSettings new file mode 100644 index 000000000..a8bc903a3 --- /dev/null +++ b/Robust.Server/Robust.Server.csproj.DotSettings @@ -0,0 +1,12 @@ + + True + True + True + True + True + True + True + True + True + True + True \ No newline at end of file diff --git a/Robust.Server/Scripting/ScriptHost.cs b/Robust.Server/Scripting/ScriptHost.cs index 4f1c50f29..25c5ad375 100644 --- a/Robust.Server/Scripting/ScriptHost.cs +++ b/Robust.Server/Scripting/ScriptHost.cs @@ -9,15 +9,13 @@ using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting; using Microsoft.CodeAnalysis.Scripting; using Microsoft.CodeAnalysis.Text; using Robust.Server.Console; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Reflection; using Robust.Shared.Scripting; using Robust.Shared.Utility; diff --git a/Robust.Server/ServerIoC.cs b/Robust.Server/ServerIoC.cs index 5516cbe17..f13848be7 100644 --- a/Robust.Server/ServerIoC.cs +++ b/Robust.Server/ServerIoC.cs @@ -3,15 +3,6 @@ using Robust.Server.DataMetrics; using Robust.Server.Debugging; using Robust.Server.GameObjects; using Robust.Server.GameStates; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.Debugging; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.GameState; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Placement; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.ServerStatus; -using Robust.Server.Interfaces.Timing; using Robust.Server.Maps; using Robust.Server.Placement; using Robust.Server.Player; @@ -24,15 +15,11 @@ using Robust.Server.ViewVariables; using Robust.Shared; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Prototypes; +using Robust.Shared.Reflection; namespace Robust.Server { diff --git a/Robust.Server/ServerStatus/IStatusHandlerContext.cs b/Robust.Server/ServerStatus/IStatusHandlerContext.cs new file mode 100644 index 000000000..004d06628 --- /dev/null +++ b/Robust.Server/ServerStatus/IStatusHandlerContext.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Net; +using System.Net.Http; +using Microsoft.Extensions.Primitives; + +namespace Robust.Server.ServerStatus +{ + public interface IStatusHandlerContext + { + HttpMethod RequestMethod { get; } + IPEndPoint RemoteEndPoint { get; } + Uri Url { get; } + bool IsGetLike { get; } + IReadOnlyDictionary RequestHeaders { get; } + + [return: MaybeNull] + public T RequestBodyJson(); + + void Respond( + string text, + HttpStatusCode code = HttpStatusCode.OK, + string contentType = "text/plain"); + + void Respond( + string text, + int code = 200, + string contentType = "text/plain"); + + void RespondError(HttpStatusCode code); + + void RespondJson(object jsonData, HttpStatusCode code = HttpStatusCode.OK); + } +} diff --git a/Robust.Server/ServerStatus/IStatusHost.cs b/Robust.Server/ServerStatus/IStatusHost.cs new file mode 100644 index 000000000..964f70c26 --- /dev/null +++ b/Robust.Server/ServerStatus/IStatusHost.cs @@ -0,0 +1,28 @@ +using System; +using Newtonsoft.Json.Linq; + +namespace Robust.Server.ServerStatus +{ + public interface IStatusHost + { + void Start(); + + void AddHandler(StatusHostHandler handler); + + /// + /// Invoked when a client queries a status request from the server. + /// THIS IS INVOKED FROM ANOTHER THREAD. + /// I REPEAT, THIS DOES NOT RUN ON THE MAIN THREAD. + /// MAKE TRIPLE SURE EVERYTHING IN HERE IS THREAD SAFE DEAR GOD. + /// + event Action OnStatusRequest; + + /// + /// Invoked when a client queries an info request from the server. + /// THIS IS INVOKED FROM ANOTHER THREAD. + /// I REPEAT, THIS DOES NOT RUN ON THE MAIN THREAD. + /// MAKE TRIPLE SURE EVERYTHING IN HERE IS THREAD SAFE DEAR GOD. + /// + event Action OnInfoRequest; + } +} \ No newline at end of file diff --git a/Robust.Server/ServerStatus/StatusHost.Handlers.cs b/Robust.Server/ServerStatus/StatusHost.Handlers.cs index d90b7e087..cd1534100 100644 --- a/Robust.Server/ServerStatus/StatusHost.Handlers.cs +++ b/Robust.Server/ServerStatus/StatusHost.Handlers.cs @@ -1,7 +1,6 @@ using System; using System.Net; using Newtonsoft.Json.Linq; -using Robust.Server.Interfaces.ServerStatus; using Robust.Shared; namespace Robust.Server.ServerStatus diff --git a/Robust.Server/ServerStatus/StatusHost.cs b/Robust.Server/ServerStatus/StatusHost.cs index 65e266d18..00abdbc24 100644 --- a/Robust.Server/ServerStatus/StatusHost.cs +++ b/Robust.Server/ServerStatus/StatusHost.cs @@ -10,16 +10,13 @@ using System.Threading.Tasks; using Microsoft.Extensions.Primitives; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.ServerStatus; +using Robust.Server.Player; using Robust.Shared; using Robust.Shared.Configuration; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Utility; using HttpListener = ManagedHttpListener.HttpListener; using HttpListenerContext = ManagedHttpListener.HttpListenerContext; diff --git a/Robust.Server/ServerStatus/StatusHostHandler.cs b/Robust.Server/ServerStatus/StatusHostHandler.cs new file mode 100644 index 000000000..5c3454f25 --- /dev/null +++ b/Robust.Server/ServerStatus/StatusHostHandler.cs @@ -0,0 +1,5 @@ +namespace Robust.Server.ServerStatus +{ + public delegate bool StatusHostHandler( + IStatusHandlerContext context); +} \ No newline at end of file diff --git a/Robust.Server/ServerStatus/WatchdogApi.cs b/Robust.Server/ServerStatus/WatchdogApi.cs index c14d20510..ac9aa6c99 100644 --- a/Robust.Server/ServerStatus/WatchdogApi.cs +++ b/Robust.Server/ServerStatus/WatchdogApi.cs @@ -5,15 +5,12 @@ using System.Net.Http.Headers; using System.Text; using JetBrains.Annotations; using Newtonsoft.Json; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.ServerStatus; using Robust.Shared; using Robust.Shared.Asynchronous; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Timing; #nullable enable diff --git a/Robust.Server/Interfaces/Timing/IPauseManager.cs b/Robust.Server/Timing/IPauseManager.cs similarity index 58% rename from Robust.Server/Interfaces/Timing/IPauseManager.cs rename to Robust.Server/Timing/IPauseManager.cs index 2e6cd01f3..9a294903e 100644 --- a/Robust.Server/Interfaces/Timing/IPauseManager.cs +++ b/Robust.Server/Timing/IPauseManager.cs @@ -1,9 +1,7 @@ -using System; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using JetBrains.Annotations; using Robust.Shared.Map; -namespace Robust.Server.Interfaces.Timing +namespace Robust.Server.Timing { public interface IPauseManager { @@ -28,14 +26,4 @@ namespace Robust.Server.Interfaces.Timing [Pure] bool IsMapInitialized(MapId mapId); } - - public static class PauseManagerExt - { - [Pure] - [Obsolete("Use IEntity.Paused directly")] - public static bool IsEntityPaused(this IPauseManager manager, IEntity entity) - { - return entity.Paused; - } - } -} +} \ No newline at end of file diff --git a/Robust.Server/Timing/PauseManager.cs b/Robust.Server/Timing/PauseManager.cs index 7f614c41e..436b82a8e 100644 --- a/Robust.Server/Timing/PauseManager.cs +++ b/Robust.Server/Timing/PauseManager.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.ViewVariables; diff --git a/Robust.Server/Timing/PauseManagerExt.cs b/Robust.Server/Timing/PauseManagerExt.cs new file mode 100644 index 000000000..d1fad3722 --- /dev/null +++ b/Robust.Server/Timing/PauseManagerExt.cs @@ -0,0 +1,16 @@ +using System; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; + +namespace Robust.Server.Timing +{ + public static class PauseManagerExt + { + [Pure] + [Obsolete("Use IEntity.Paused directly")] + public static bool IsEntityPaused(this IPauseManager manager, IEntity entity) + { + return entity.Paused; + } + } +} diff --git a/Robust.Server/ViewVariables/IViewVariablesSession.cs b/Robust.Server/ViewVariables/IViewVariablesSession.cs index d30e1326d..39c8a5f25 100644 --- a/Robust.Server/ViewVariables/IViewVariablesSession.cs +++ b/Robust.Server/ViewVariables/IViewVariablesSession.cs @@ -1,6 +1,6 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Robust.Server.ViewVariables { diff --git a/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs b/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs index 519ef15ad..3197b1950 100644 --- a/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs +++ b/Robust.Server/ViewVariables/Traits/ViewVariablesTraitEntity.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Server/ViewVariables/ViewVariablesHost.cs b/Robust.Server/ViewVariables/ViewVariablesHost.cs index 63a971ca8..1d01505c0 100644 --- a/Robust.Server/ViewVariables/ViewVariablesHost.cs +++ b/Robust.Server/ViewVariables/ViewVariablesHost.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using Robust.Server.Console; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Reflection; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using DenyReason = Robust.Shared.Network.Messages.MsgViewVariablesDenySession.DenyReason; diff --git a/Robust.Server/ViewVariables/ViewVariablesesSession.cs b/Robust.Server/ViewVariables/ViewVariablesesSession.cs index 8634c022c..a1393c25e 100644 --- a/Robust.Server/ViewVariables/ViewVariablesesSession.cs +++ b/Robust.Server/ViewVariables/ViewVariablesesSession.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using Robust.Server.ViewVariables.Traits; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Network; +using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared.Scripting/ScriptGlobalsShared.cs b/Robust.Shared.Scripting/ScriptGlobalsShared.cs index 86c08361a..04da6265f 100644 --- a/Robust.Shared.Scripting/ScriptGlobalsShared.cs +++ b/Robust.Shared.Scripting/ScriptGlobalsShared.cs @@ -3,8 +3,6 @@ using System.Diagnostics.CodeAnalysis; using System.Reflection; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Robust.Shared.Scripting/ScriptInstanceShared.cs b/Robust.Shared.Scripting/ScriptInstanceShared.cs index ad6c250d7..504550bea 100644 --- a/Robust.Shared.Scripting/ScriptInstanceShared.cs +++ b/Robust.Shared.Scripting/ScriptInstanceShared.cs @@ -10,8 +10,8 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Scripting; using Microsoft.CodeAnalysis.Scripting; using Microsoft.CodeAnalysis.Text; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Robust.Shared/Asynchronous/RobustTaskScheduler.cs b/Robust.Shared/Asynchronous/RobustTaskScheduler.cs index 65e7ba813..d475ce747 100644 --- a/Robust.Shared/Asynchronous/RobustTaskScheduler.cs +++ b/Robust.Shared/Asynchronous/RobustTaskScheduler.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Threading; using System.Threading.Tasks; diff --git a/Robust.Shared/Audio/AudioParams.cs b/Robust.Shared/Audio/AudioParams.cs index 1ebcc8bcf..136ede6ec 100644 --- a/Robust.Shared/Audio/AudioParams.cs +++ b/Robust.Shared/Audio/AudioParams.cs @@ -1,7 +1,6 @@ using Robust.Shared.Serialization; using System; using System.Diagnostics.Contracts; -using Robust.Shared.Interfaces.Serialization; namespace Robust.Shared.Audio { diff --git a/Robust.Shared/Audio/Midi/MidiEvent.cs b/Robust.Shared/Audio/Midi/MidiEvent.cs index 157495716..7ece1427e 100644 --- a/Robust.Shared/Audio/Midi/MidiEvent.cs +++ b/Robust.Shared/Audio/Midi/MidiEvent.cs @@ -1,7 +1,5 @@ using System; using NFluidsynth; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Robust.Shared.Audio.Midi diff --git a/Robust.Shared/Configuration/ConfigurationManager.cs b/Robust.Shared/Configuration/ConfigurationManager.cs index 2743006b9..4dd603226 100644 --- a/Robust.Shared/Configuration/ConfigurationManager.cs +++ b/Robust.Shared/Configuration/ConfigurationManager.cs @@ -1,5 +1,4 @@ using Nett; -using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Log; using System; using System.Collections.Generic; @@ -487,8 +486,8 @@ namespace Robust.Shared.Configuration } } - [System.Serializable] - public class InvalidConfigurationException : System.Exception + [Serializable] + public class InvalidConfigurationException : Exception { public InvalidConfigurationException() { @@ -496,7 +495,7 @@ namespace Robust.Shared.Configuration public InvalidConfigurationException(string message) : base(message) { } - public InvalidConfigurationException(string message, System.Exception inner) : base(message, inner) + public InvalidConfigurationException(string message, Exception inner) : base(message, inner) { } protected InvalidConfigurationException( diff --git a/Robust.Shared/Interfaces/Configuration/IConfigurationManager.cs b/Robust.Shared/Configuration/IConfigurationManager.cs similarity index 96% rename from Robust.Shared/Interfaces/Configuration/IConfigurationManager.cs rename to Robust.Shared/Configuration/IConfigurationManager.cs index 2f453f9e8..182b1cdc3 100644 --- a/Robust.Shared/Interfaces/Configuration/IConfigurationManager.cs +++ b/Robust.Shared/Configuration/IConfigurationManager.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.Configuration; -namespace Robust.Shared.Interfaces.Configuration +namespace Robust.Shared.Configuration { /// /// Stores and manages global configuration variables. diff --git a/Robust.Shared/Interfaces/Configuration/IConfigurationManagerInternal.cs b/Robust.Shared/Configuration/IConfigurationManagerInternal.cs similarity index 90% rename from Robust.Shared/Interfaces/Configuration/IConfigurationManagerInternal.cs rename to Robust.Shared/Configuration/IConfigurationManagerInternal.cs index 9cfa59895..7f1338a75 100644 --- a/Robust.Shared/Interfaces/Configuration/IConfigurationManagerInternal.cs +++ b/Robust.Shared/Configuration/IConfigurationManagerInternal.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Reflection; -using Robust.Shared.Configuration; -namespace Robust.Shared.Interfaces.Configuration +namespace Robust.Shared.Configuration { internal interface IConfigurationManagerInternal : IConfigurationManager { diff --git a/Robust.Shared/Configuration/NetConfigurationManager.cs b/Robust.Shared/Configuration/NetConfigurationManager.cs index f6cd52939..267de630e 100644 --- a/Robust.Shared/Configuration/NetConfigurationManager.cs +++ b/Robust.Shared/Configuration/NetConfigurationManager.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Network; using Robust.Shared.Network.Messages; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.Shared.Configuration diff --git a/Robust.Shared/Console/Commands/ExecCommand.cs b/Robust.Shared/Console/Commands/ExecCommand.cs index 6d6ffe26b..50f887040 100644 --- a/Robust.Shared/Console/Commands/ExecCommand.cs +++ b/Robust.Shared/Console/Commands/ExecCommand.cs @@ -1,9 +1,8 @@ using System.IO; using System.Text.RegularExpressions; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Utility; namespace Robust.Shared.Console.Commands diff --git a/Robust.Shared/Console/ConsoleHost.cs b/Robust.Shared/Console/ConsoleHost.cs index 055322c57..3574d9b93 100644 --- a/Robust.Shared/Console/ConsoleHost.cs +++ b/Robust.Shared/Console/ConsoleHost.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.IoC.Exceptions; -using Robust.Shared.Maths; +using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Reflection; diff --git a/Robust.Shared/Console/IConsoleHost.cs b/Robust.Shared/Console/IConsoleHost.cs index e64220d05..55eda47e4 100644 --- a/Robust.Shared/Console/IConsoleHost.cs +++ b/Robust.Shared/Console/IConsoleHost.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Robust.Shared.Maths; using Robust.Shared.Players; namespace Robust.Shared.Console diff --git a/Robust.Shared/Console/IConsoleShell.cs b/Robust.Shared/Console/IConsoleShell.cs index 234619e43..102b5abda 100644 --- a/Robust.Shared/Console/IConsoleShell.cs +++ b/Robust.Shared/Console/IConsoleShell.cs @@ -1,4 +1,3 @@ -using Robust.Shared.Maths; using Robust.Shared.Players; namespace Robust.Shared.Console diff --git a/Robust.Shared/Containers/ContainerHelpers.cs b/Robust.Shared/Containers/ContainerHelpers.cs index 101a1ffe0..0682aeaf5 100644 --- a/Robust.Shared/Containers/ContainerHelpers.cs +++ b/Robust.Shared/Containers/ContainerHelpers.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Robust.Shared/ContentPack/AssemblyTypeChecker.cs b/Robust.Shared/ContentPack/AssemblyTypeChecker.cs index 0f00ba280..985e09ff4 100644 --- a/Robust.Shared/ContentPack/AssemblyTypeChecker.cs +++ b/Robust.Shared/ContentPack/AssemblyTypeChecker.cs @@ -11,8 +11,7 @@ using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Threading.Tasks; using ILVerify; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.Log; using Robust.Shared.Utility; // psst diff --git a/Robust.Shared/ContentPack/BaseModLoader.cs b/Robust.Shared/ContentPack/BaseModLoader.cs index d824874a0..e1610fdf4 100644 --- a/Robust.Shared/ContentPack/BaseModLoader.cs +++ b/Robust.Shared/ContentPack/BaseModLoader.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Reflection; using Robust.Shared.Timing; namespace Robust.Shared.ContentPack diff --git a/Robust.Shared/ContentPack/DirLoader.cs b/Robust.Shared/ContentPack/DirLoader.cs index a3ce21f07..5d74d8664 100644 --- a/Robust.Shared/ContentPack/DirLoader.cs +++ b/Robust.Shared/ContentPack/DirLoader.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Reflection; using System.Threading.Tasks; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Log; using Robust.Shared.Utility; namespace Robust.Shared.ContentPack diff --git a/Robust.Shared/Interfaces/Resources/IResourceManager.cs b/Robust.Shared/ContentPack/IResourceManager.cs similarity index 70% rename from Robust.Shared/Interfaces/Resources/IResourceManager.cs rename to Robust.Shared/ContentPack/IResourceManager.cs index f007ac346..7129e8371 100644 --- a/Robust.Shared/Interfaces/Resources/IResourceManager.cs +++ b/Robust.Shared/ContentPack/IResourceManager.cs @@ -3,11 +3,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text; -using Robust.Shared.ContentPack; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -namespace Robust.Shared.Interfaces.Resources +namespace Robust.Shared.ContentPack { /// /// Virtual file system for all disk resources. @@ -169,66 +168,4 @@ namespace Robust.Shared.Interfaces.Resources return new StreamReader(stream, encoding); } } - - internal interface IResourceManagerInternal : IResourceManager - { - /// - /// Sets the manager up so that the base game can run. - /// - /// - /// The directory to use for user data. - /// If null, a virtual temporary file system is used instead. - /// - void Initialize(string? userData); - - /// - /// Mounts a single stream as a content file. Useful for unit testing. - /// - /// The stream to mount. - /// The path that the file will be mounted at. - void MountStreamAt(MemoryStream stream, ResourcePath path); - - /// - /// Loads the default content pack from the configuration file into the VFS. - /// - void MountDefaultContentPack(); - - /// - /// Loads a content pack from disk into the VFS. The path is relative to - /// the executable location on disk. - /// - /// The path of the pack to load on disk. - /// The resource path to which all files in the pack will be relative to in the VFS. - /// Thrown if does not exist on disk. - /// Thrown if is not rooted. - /// Thrown if is null. - void MountContentPack(string pack, ResourcePath? prefix = null); - - void MountContentPack(Stream zipStream, ResourcePath? prefix = null); - - /// - /// Adds a directory to search inside of to the VFS. The directory is relative to - /// the executable location on disk. - /// - /// The path of the directory to add to the VFS on disk. - /// The resource path to which all files in the directory will be relative to in the VFS. - /// Thrown if does not exist on disk. - /// Thrown if passed is not rooted. - /// Thrown if is null. - void MountContentDirectory(string path, ResourcePath? prefix = null); - - /// - /// Attempts to get an on-disk path absolute file path for the specified resource path. - /// - /// - /// - /// This only works if the resource is mounted as a direct directory, - /// so this obviously fails if the resource is mounted in another way such as a zip file. - /// - /// - /// This can be used for optimizations such as assembly loading, where an on-disk path is better. - /// - /// - bool TryGetDiskFilePath(ResourcePath path, [NotNullWhen(true)] out string? diskPath); - } -} +} \ No newline at end of file diff --git a/Robust.Shared/ContentPack/IResourceManagerInternal.cs b/Robust.Shared/ContentPack/IResourceManagerInternal.cs new file mode 100644 index 000000000..851a1b330 --- /dev/null +++ b/Robust.Shared/ContentPack/IResourceManagerInternal.cs @@ -0,0 +1,69 @@ +using System; +using System.Diagnostics.CodeAnalysis; +using System.IO; +using Robust.Shared.Utility; + +namespace Robust.Shared.ContentPack +{ + internal interface IResourceManagerInternal : IResourceManager + { + /// + /// Sets the manager up so that the base game can run. + /// + /// + /// The directory to use for user data. + /// If null, a virtual temporary file system is used instead. + /// + void Initialize(string? userData); + + /// + /// Mounts a single stream as a content file. Useful for unit testing. + /// + /// The stream to mount. + /// The path that the file will be mounted at. + void MountStreamAt(MemoryStream stream, ResourcePath path); + + /// + /// Loads the default content pack from the configuration file into the VFS. + /// + void MountDefaultContentPack(); + + /// + /// Loads a content pack from disk into the VFS. The path is relative to + /// the executable location on disk. + /// + /// The path of the pack to load on disk. + /// The resource path to which all files in the pack will be relative to in the VFS. + /// Thrown if does not exist on disk. + /// Thrown if is not rooted. + /// Thrown if is null. + void MountContentPack(string pack, ResourcePath? prefix = null); + + void MountContentPack(Stream zipStream, ResourcePath? prefix = null); + + /// + /// Adds a directory to search inside of to the VFS. The directory is relative to + /// the executable location on disk. + /// + /// The path of the directory to add to the VFS on disk. + /// The resource path to which all files in the directory will be relative to in the VFS. + /// Thrown if does not exist on disk. + /// Thrown if passed is not rooted. + /// Thrown if is null. + void MountContentDirectory(string path, ResourcePath? prefix = null); + + /// + /// Attempts to get an on-disk path absolute file path for the specified resource path. + /// + /// + /// + /// This only works if the resource is mounted as a direct directory, + /// so this obviously fails if the resource is mounted in another way such as a zip file. + /// + /// + /// This can be used for optimizations such as assembly loading, where an on-disk path is better. + /// + /// + bool TryGetDiskFilePath(ResourcePath path, [NotNullWhen(true)] out string? diskPath); + } +} diff --git a/Robust.Shared/ContentPack/IWritableDirProvider.cs b/Robust.Shared/ContentPack/IWritableDirProvider.cs new file mode 100644 index 000000000..77e7326cf --- /dev/null +++ b/Robust.Shared/ContentPack/IWritableDirProvider.cs @@ -0,0 +1,94 @@ +using System.Collections.Generic; +using System.IO; +using JetBrains.Annotations; +using Robust.Shared.Utility; + +namespace Robust.Shared.ContentPack +{ + /// + /// Provides an API for file and directory manipulation inside of a rooted folder. + /// + [PublicAPI] + public interface IWritableDirProvider + { + /// + /// The root path of this provider. + /// Can be null if it's a virtual provider. + /// + string? RootDir { get; } + + /// + /// Creates a directory. If the directory exists, does nothing. + /// + /// Path of directory to create. + void CreateDir(ResourcePath path); + + /// + /// Deletes a file or empty directory. If the file or directory + /// does not exist, does nothing. + /// + /// Path of object to delete. + void Delete(ResourcePath path); + + /// + /// Tests if a file or directory exists. + /// + /// Path to test. + /// If the object exists. + bool Exists(ResourcePath path); + + /// + /// Finds all files and directories that match the expression. This will include empty directories. + /// + /// + /// + /// A tuple that contains collections of files, directories that matched the expression. + (IEnumerable files, IEnumerable directories) Find(string pattern, + bool recursive = true); + + /// + /// Tests if a path is a directory. + /// + /// Path to test. + /// True if it is a directory, false if it is a file. + bool IsDir(ResourcePath path); + + /// + /// Attempts to open a file. + /// + /// Path of file to open. + /// Options on how to open the file. + /// Specifies the operations that can be performed on the file. + /// Specifies the access other threads have to the file. + /// A valid file stream. + /// + /// Thrown if the file does not exist. + /// + Stream Open(ResourcePath path, FileMode fileMode, FileAccess access, FileShare share); + + /// + /// Attempts to open a file. + /// + /// Path of file to open. + /// Options on how to open the file. + /// A valid file stream. + /// + /// Thrown if the file does not exist. + /// + Stream Open(ResourcePath path, FileMode fileMode) + { + return Open(path, + fileMode, + fileMode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite, + FileShare.None); + } + + /// + /// Attempts to rename a file. + /// + /// Path of the file to rename. + /// New name of the file. + /// + void Rename(ResourcePath oldPath, ResourcePath newPath); + } +} \ No newline at end of file diff --git a/Robust.Shared/ContentPack/ModLoader.cs b/Robust.Shared/ContentPack/ModLoader.cs index 64bd648a9..18768dcf5 100644 --- a/Robust.Shared/ContentPack/ModLoader.cs +++ b/Robust.Shared/ContentPack/ModLoader.cs @@ -10,8 +10,6 @@ using System.Runtime.ExceptionServices; using System.Runtime.Loader; using System.Threading; using System.Threading.Tasks; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Robust.Shared/ContentPack/ResourceManager.cs b/Robust.Shared/ContentPack/ResourceManager.cs index dd618f756..ec5c8e993 100644 --- a/Robust.Shared/ContentPack/ResourceManager.cs +++ b/Robust.Shared/ContentPack/ResourceManager.cs @@ -4,8 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text.RegularExpressions; using System.Threading; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Robust.Shared/ContentPack/ResourceManagerExt.cs b/Robust.Shared/ContentPack/ResourceManagerExt.cs index f977a7ca0..66ef168fe 100644 --- a/Robust.Shared/ContentPack/ResourceManagerExt.cs +++ b/Robust.Shared/ContentPack/ResourceManagerExt.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Utility; namespace Robust.Shared.ContentPack diff --git a/Robust.Shared/ContentPack/VirtualWritableDirProvider.cs b/Robust.Shared/ContentPack/VirtualWritableDirProvider.cs index 3e2ce5579..503f78c05 100644 --- a/Robust.Shared/ContentPack/VirtualWritableDirProvider.cs +++ b/Robust.Shared/ContentPack/VirtualWritableDirProvider.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Utility; namespace Robust.Shared.ContentPack @@ -76,7 +75,7 @@ namespace Robust.Shared.ContentPack public (IEnumerable files, IEnumerable directories) Find(string pattern, bool recursive = true) { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } public bool IsDir(ResourcePath path) @@ -190,7 +189,7 @@ namespace Robust.Shared.ContentPack public void Rename(ResourcePath oldPath, ResourcePath newPath) { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } private bool TryGetNodeAt(ResourcePath path, [NotNullWhen(true)] out INode? node) diff --git a/Robust.Shared/ContentPack/WritableDirProvider.cs b/Robust.Shared/ContentPack/WritableDirProvider.cs index 9dec47f80..463bf716d 100644 --- a/Robust.Shared/ContentPack/WritableDirProvider.cs +++ b/Robust.Shared/ContentPack/WritableDirProvider.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Utility; namespace Robust.Shared.ContentPack diff --git a/Robust.Shared/Interfaces/Resources/IWritableDirProvider.cs b/Robust.Shared/ContentPack/WritableDirProviderExt.cs similarity index 54% rename from Robust.Shared/Interfaces/Resources/IWritableDirProvider.cs rename to Robust.Shared/ContentPack/WritableDirProviderExt.cs index ab103653f..433bba7dc 100644 --- a/Robust.Shared/Interfaces/Resources/IWritableDirProvider.cs +++ b/Robust.Shared/ContentPack/WritableDirProviderExt.cs @@ -1,98 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; using JetBrains.Annotations; using Robust.Shared.Utility; -namespace Robust.Shared.Interfaces.Resources +namespace Robust.Shared.ContentPack { - /// - /// Provides an API for file and directory manipulation inside of a rooted folder. - /// - [PublicAPI] - public interface IWritableDirProvider - { - /// - /// The root path of this provider. - /// Can be null if it's a virtual provider. - /// - string? RootDir { get; } - - /// - /// Creates a directory. If the directory exists, does nothing. - /// - /// Path of directory to create. - void CreateDir(ResourcePath path); - - /// - /// Deletes a file or empty directory. If the file or directory - /// does not exist, does nothing. - /// - /// Path of object to delete. - void Delete(ResourcePath path); - - /// - /// Tests if a file or directory exists. - /// - /// Path to test. - /// If the object exists. - bool Exists(ResourcePath path); - - /// - /// Finds all files and directories that match the expression. This will include empty directories. - /// - /// - /// - /// A tuple that contains collections of files, directories that matched the expression. - (IEnumerable files, IEnumerable directories) Find(string pattern, - bool recursive = true); - - /// - /// Tests if a path is a directory. - /// - /// Path to test. - /// True if it is a directory, false if it is a file. - bool IsDir(ResourcePath path); - - /// - /// Attempts to open a file. - /// - /// Path of file to open. - /// Options on how to open the file. - /// Specifies the operations that can be performed on the file. - /// Specifies the access other threads have to the file. - /// A valid file stream. - /// - /// Thrown if the file does not exist. - /// - Stream Open(ResourcePath path, FileMode fileMode, FileAccess access, FileShare share); - - /// - /// Attempts to open a file. - /// - /// Path of file to open. - /// Options on how to open the file. - /// A valid file stream. - /// - /// Thrown if the file does not exist. - /// - Stream Open(ResourcePath path, FileMode fileMode) - { - return Open(path, - fileMode, - fileMode == FileMode.Append ? FileAccess.Write : FileAccess.ReadWrite, - FileShare.None); - } - - /// - /// Attempts to rename a file. - /// - /// Path of the file to rename. - /// New name of the file. - /// - void Rename(ResourcePath oldPath, ResourcePath newPath); - } - [PublicAPI] public static class WritableDirProviderExt { diff --git a/Robust.Shared/DllMapHelper.cs b/Robust.Shared/DllMapHelper.cs index a5289108a..609ef4c77 100644 --- a/Robust.Shared/DllMapHelper.cs +++ b/Robust.Shared/DllMapHelper.cs @@ -1,6 +1,5 @@ using System; using System.Diagnostics; -using System.IO; using System.Reflection; using System.Runtime.InteropServices; diff --git a/Robust.Shared/ErrorMessages.cs b/Robust.Shared/ErrorMessages.cs index 2138bd69c..23766b659 100644 --- a/Robust.Shared/ErrorMessages.cs +++ b/Robust.Shared/ErrorMessages.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - namespace Robust.Shared { public class ErrorMessages diff --git a/Robust.Shared/Exceptions/RuntimeLog.cs b/Robust.Shared/Exceptions/RuntimeLog.cs index 9709bc1e4..4d6a81a20 100644 --- a/Robust.Shared/Exceptions/RuntimeLog.cs +++ b/Robust.Shared/Exceptions/RuntimeLog.cs @@ -5,8 +5,6 @@ using System.Globalization; using System.Linq; using System.Text; using Robust.Shared.Log; -using Robust.Shared.Utility; - namespace Robust.Shared.Exceptions { diff --git a/Robust.Shared/GameObjects/!NO_FOLDER_NAMESPACES b/Robust.Shared/GameObjects/!NO_FOLDER_NAMESPACES new file mode 100644 index 000000000..1a9837a52 --- /dev/null +++ b/Robust.Shared/GameObjects/!NO_FOLDER_NAMESPACES @@ -0,0 +1,3 @@ +Everything in this folder and subfolders needs to be in: + +Robust.Shared.GameObjects diff --git a/Robust.Shared/GameObjects/Component.cs b/Robust.Shared/GameObjects/Component.cs index 093a2e660..e83be109a 100644 --- a/Robust.Shared/GameObjects/Component.cs +++ b/Robust.Shared/GameObjects/Component.cs @@ -1,6 +1,5 @@ using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Reflection; using Robust.Shared.Serialization; diff --git a/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyAttribute.cs b/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyAttribute.cs index 6908941de..ff035db83 100644 --- a/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyAttribute.cs +++ b/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Shared.GameObjects.ComponentDependencies +namespace Robust.Shared.GameObjects { [AttributeUsage(AttributeTargets.Field)] public class ComponentDependencyAttribute : Attribute diff --git a/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyManager.cs b/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyManager.cs index c9d48f293..478378f2c 100644 --- a/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyManager.cs +++ b/Robust.Shared/GameObjects/ComponentDependencies/ComponentDependencyManager.cs @@ -3,15 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Reflection.Emit; -using System.Reflection.Metadata; using System.Runtime.CompilerServices; -using System.Runtime.Serialization; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Utility; -namespace Robust.Shared.GameObjects.ComponentDependencies +namespace Robust.Shared.GameObjects { public class ComponentDependencyManager : IComponentDependencyManager { diff --git a/Robust.Shared/GameObjects/ComponentEventArgs.cs b/Robust.Shared/GameObjects/ComponentEventArgs.cs index f0b48fe3b..0eb1c595e 100644 --- a/Robust.Shared/GameObjects/ComponentEventArgs.cs +++ b/Robust.Shared/GameObjects/ComponentEventArgs.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using Robust.Shared.Interfaces.GameObjects; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/GameObjects/ComponentExt.cs b/Robust.Shared/GameObjects/ComponentExt.cs index 511aa6630..47b4a31f9 100644 --- a/Robust.Shared/GameObjects/ComponentExt.cs +++ b/Robust.Shared/GameObjects/ComponentExt.cs @@ -1,5 +1,4 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; namespace Robust.Shared.GameObjects diff --git a/Robust.Shared/GameObjects/ComponentFactory.cs b/Robust.Shared/GameObjects/ComponentFactory.cs index 56e83af6a..a9c82b548 100644 --- a/Robust.Shared/GameObjects/ComponentFactory.cs +++ b/Robust.Shared/GameObjects/ComponentFactory.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.Serialization; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Reflection; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/GameObjects/ComponentManager.cs b/Robust.Shared/GameObjects/ComponentManager.cs index a1fba6ec8..e2995ef68 100644 --- a/Robust.Shared/GameObjects/ComponentManager.cs +++ b/Robust.Shared/GameObjects/ComponentManager.cs @@ -3,11 +3,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.CompilerServices; -using JetBrains.Annotations; -using Robust.Shared.Exceptions; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Serialization; using Robust.Shared.Utility; using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute; diff --git a/Robust.Shared/GameObjects/ComponentMessages/Messages.cs b/Robust.Shared/GameObjects/ComponentMessages/Messages.cs index f8e763657..93ca56cf8 100644 --- a/Robust.Shared/GameObjects/ComponentMessages/Messages.cs +++ b/Robust.Shared/GameObjects/ComponentMessages/Messages.cs @@ -1,5 +1,4 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/GameObjects/Components/Appearance/SharedAppearanceComponent.cs b/Robust.Shared/GameObjects/Components/Appearance/SharedAppearanceComponent.cs index 639fc3ce1..acb5b7e89 100644 --- a/Robust.Shared/GameObjects/Components/Appearance/SharedAppearanceComponent.cs +++ b/Robust.Shared/GameObjects/Components/Appearance/SharedAppearanceComponent.cs @@ -1,9 +1,9 @@ -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components.Appearance +namespace Robust.Shared.GameObjects { /// /// The appearance component allows game logic to be more detached from the actual visuals of an entity such as 2D sprites, 3D, particles, lights... diff --git a/Robust.Shared/GameObjects/Components/ClickableComponentState.cs b/Robust.Shared/GameObjects/Components/ClickableComponentState.cs index 41e4f358a..270503fe4 100644 --- a/Robust.Shared/GameObjects/Components/ClickableComponentState.cs +++ b/Robust.Shared/GameObjects/Components/ClickableComponentState.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Robust.Shared.Maths; using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { [Serializable, NetSerializable] class ClickableComponentState : ComponentState diff --git a/Robust.Shared/GameObjects/Components/Collidable/CollisionChangeMessage.cs b/Robust.Shared/GameObjects/Components/Collidable/CollisionChangeMessage.cs index 4cd3e1c5e..a97b3e52b 100644 --- a/Robust.Shared/GameObjects/Components/Collidable/CollisionChangeMessage.cs +++ b/Robust.Shared/GameObjects/Components/Collidable/CollisionChangeMessage.cs @@ -1,4 +1,4 @@ -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { public class CollisionChangeMessage : EntitySystemMessage { diff --git a/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Collision.cs b/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Collision.cs index 9dcf003e1..a218eefdf 100644 --- a/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Collision.cs +++ b/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Collision.cs @@ -1,8 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; @@ -10,7 +8,7 @@ using Robust.Shared.Physics; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { public interface ICollideBehavior { diff --git a/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Physics.cs b/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Physics.cs index 37da35913..39b1a549c 100644 --- a/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Physics.cs +++ b/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Physics.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { public partial interface IPhysicsComponent { diff --git a/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponentState.cs b/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponentState.cs index e5650d2ed..832cf4aa3 100644 --- a/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponentState.cs +++ b/Robust.Shared/GameObjects/Components/Collidable/PhysicsComponentState.cs @@ -4,7 +4,7 @@ using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { [Serializable, NetSerializable] public class PhysicsComponentState : ComponentState diff --git a/Robust.Shared/GameObjects/Components/Containers/SharedContainerManagerComponent.cs b/Robust.Shared/GameObjects/Components/Containers/SharedContainerManagerComponent.cs index bec4d9018..7a3ab505f 100644 --- a/Robust.Shared/GameObjects/Components/Containers/SharedContainerManagerComponent.cs +++ b/Robust.Shared/GameObjects/Components/Containers/SharedContainerManagerComponent.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components.Containers +namespace Robust.Shared.GameObjects { public abstract class SharedContainerManagerComponent : Component, IContainerManager { diff --git a/Robust.Shared/GameObjects/Components/DebugExceptionComponents.cs b/Robust.Shared/GameObjects/Components/DebugExceptionComponents.cs index 0e29d1e6d..e8db4fc32 100644 --- a/Robust.Shared/GameObjects/Components/DebugExceptionComponents.cs +++ b/Robust.Shared/GameObjects/Components/DebugExceptionComponents.cs @@ -1,7 +1,7 @@ using System; using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { #if DEBUG // If you wanna use these, add it to some random prototype. diff --git a/Robust.Shared/GameObjects/Components/Eye/SharedEyeComponent.cs b/Robust.Shared/GameObjects/Components/Eye/SharedEyeComponent.cs index e75d5bf21..50154d575 100644 --- a/Robust.Shared/GameObjects/Components/Eye/SharedEyeComponent.cs +++ b/Robust.Shared/GameObjects/Components/Eye/SharedEyeComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components.Eye +namespace Robust.Shared.GameObjects { public class SharedEyeComponent : Component { diff --git a/Robust.Shared/GameObjects/Components/GrammarComponent.cs b/Robust.Shared/GameObjects/Components/GrammarComponent.cs index b785692f6..fe030a080 100644 --- a/Robust.Shared/GameObjects/Components/GrammarComponent.cs +++ b/Robust.Shared/GameObjects/Components/GrammarComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Localization.Macros; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { /// /// Holds the necessary information to generate text related to the entity. diff --git a/Robust.Shared/Interfaces/GameObjects/Components/IComponentDependencyManager.cs b/Robust.Shared/GameObjects/Components/IComponentDependencyManager.cs similarity index 88% rename from Robust.Shared/Interfaces/GameObjects/Components/IComponentDependencyManager.cs rename to Robust.Shared/GameObjects/Components/IComponentDependencyManager.cs index 47392b91d..6ae987bc6 100644 --- a/Robust.Shared/Interfaces/GameObjects/Components/IComponentDependencyManager.cs +++ b/Robust.Shared/GameObjects/Components/IComponentDependencyManager.cs @@ -1,6 +1,4 @@ -using Robust.Shared.GameObjects; - -namespace Robust.Shared.Interfaces.GameObjects.Components +namespace Robust.Shared.GameObjects { public interface IComponentDependencyManager { diff --git a/Robust.Shared/Interfaces/GameObjects/Components/IContainer.cs b/Robust.Shared/GameObjects/Components/IContainer.cs similarity index 98% rename from Robust.Shared/Interfaces/GameObjects/Components/IContainer.cs rename to Robust.Shared/GameObjects/Components/IContainer.cs index f4a55b8bd..9f6f4cc70 100644 --- a/Robust.Shared/Interfaces/GameObjects/Components/IContainer.cs +++ b/Robust.Shared/GameObjects/Components/IContainer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Robust.Shared.Interfaces.GameObjects.Components +namespace Robust.Shared.GameObjects { /// /// A container is a way to "contain" entities inside other entities, in a logical way. diff --git a/Robust.Shared/Interfaces/GameObjects/Components/IContainerManager.cs b/Robust.Shared/GameObjects/Components/IContainerManager.cs similarity index 98% rename from Robust.Shared/Interfaces/GameObjects/Components/IContainerManager.cs rename to Robust.Shared/GameObjects/Components/IContainerManager.cs index 5ca6e1e64..d09cea6f8 100644 --- a/Robust.Shared/Interfaces/GameObjects/Components/IContainerManager.cs +++ b/Robust.Shared/GameObjects/Components/IContainerManager.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Robust.Shared.Interfaces.GameObjects.Components +namespace Robust.Shared.GameObjects { /// /// Manages containers on an entity. diff --git a/Robust.Shared/Interfaces/GameObjects/Components/ITransformComponent.cs b/Robust.Shared/GameObjects/Components/ITransformComponent.cs similarity index 97% rename from Robust.Shared/Interfaces/GameObjects/Components/ITransformComponent.cs rename to Robust.Shared/GameObjects/Components/ITransformComponent.cs index e8ad2edbc..bf3e08efc 100644 --- a/Robust.Shared/Interfaces/GameObjects/Components/ITransformComponent.cs +++ b/Robust.Shared/GameObjects/Components/ITransformComponent.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Shared.Animations; -using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Robust.Shared.Interfaces.GameObjects.Components +namespace Robust.Shared.GameObjects { /// /// Stores the position and orientation of the entity. diff --git a/Robust.Shared/GameObjects/Components/Light/OccluderComponent.cs b/Robust.Shared/GameObjects/Components/Light/OccluderComponent.cs index c0f4d4e3b..b2d7ac600 100644 --- a/Robust.Shared/GameObjects/Components/Light/OccluderComponent.cs +++ b/Robust.Shared/GameObjects/Components/Light/OccluderComponent.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Robust.Shared/GameObjects/Components/Map/MapComponent.cs b/Robust.Shared/GameObjects/Components/Map/MapComponent.cs index f47d72393..c94e301d0 100644 --- a/Robust.Shared/GameObjects/Components/Map/MapComponent.cs +++ b/Robust.Shared/GameObjects/Components/Map/MapComponent.cs @@ -1,11 +1,9 @@ using System; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components.Map +namespace Robust.Shared.GameObjects { /// /// Represents a world map inside the ECS system. diff --git a/Robust.Shared/GameObjects/Components/Map/MapGridComponent.cs b/Robust.Shared/GameObjects/Components/Map/MapGridComponent.cs index 21e5cb7f7..5939892bd 100644 --- a/Robust.Shared/GameObjects/Components/Map/MapGridComponent.cs +++ b/Robust.Shared/GameObjects/Components/Map/MapGridComponent.cs @@ -1,13 +1,11 @@ using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components.Map +namespace Robust.Shared.GameObjects { /// /// Represents a map grid inside the ECS system. diff --git a/Robust.Shared/GameObjects/Components/Renderable/SharedSpriteComponent.cs b/Robust.Shared/GameObjects/Components/Renderable/SharedSpriteComponent.cs index a06b45d43..86cc8ad29 100644 --- a/Robust.Shared/GameObjects/Components/Renderable/SharedSpriteComponent.cs +++ b/Robust.Shared/GameObjects/Components/Renderable/SharedSpriteComponent.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.Utility; -namespace Robust.Shared.GameObjects.Components.Renderable +namespace Robust.Shared.GameObjects { public class SharedSpriteComponent : Component { diff --git a/Robust.Shared/GameObjects/Components/SharedIgnorePauseComponent.cs b/Robust.Shared/GameObjects/Components/SharedIgnorePauseComponent.cs index a2da0cc12..b1778820a 100644 --- a/Robust.Shared/GameObjects/Components/SharedIgnorePauseComponent.cs +++ b/Robust.Shared/GameObjects/Components/SharedIgnorePauseComponent.cs @@ -1,4 +1,4 @@ -namespace Robust.Shared.GameObjects.Components +namespace Robust.Shared.GameObjects { public abstract class SharedIgnorePauseComponent : Component { diff --git a/Robust.Shared/GameObjects/Components/Timers/TimerComponent.cs b/Robust.Shared/GameObjects/Components/Timers/TimerComponent.cs index 4efa14b18..51ada04cb 100644 --- a/Robust.Shared/GameObjects/Components/Timers/TimerComponent.cs +++ b/Robust.Shared/GameObjects/Components/Timers/TimerComponent.cs @@ -6,7 +6,7 @@ using Robust.Shared.Exceptions; using Robust.Shared.IoC; using Timer = Robust.Shared.Timers.Timer; -namespace Robust.Shared.GameObjects.Components.Timers +namespace Robust.Shared.GameObjects { public class TimerComponent : Component { diff --git a/Robust.Shared/GameObjects/Components/Timers/TimerExtensions.cs b/Robust.Shared/GameObjects/Components/Timers/TimerExtensions.cs index 3027c23f4..6fa65d5b3 100644 --- a/Robust.Shared/GameObjects/Components/Timers/TimerExtensions.cs +++ b/Robust.Shared/GameObjects/Components/Timers/TimerExtensions.cs @@ -1,10 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using Robust.Shared.Interfaces.GameObjects; using Timer = Robust.Shared.Timers.Timer; -namespace Robust.Shared.GameObjects.Components.Timers +namespace Robust.Shared.GameObjects { public static class TimerExtensions { diff --git a/Robust.Shared/GameObjects/Components/Transform/SnapGridComponent.cs b/Robust.Shared/GameObjects/Components/Transform/SnapGridComponent.cs index 2e9264cd0..ee7c91a48 100644 --- a/Robust.Shared/GameObjects/Components/Transform/SnapGridComponent.cs +++ b/Robust.Shared/GameObjects/Components/Transform/SnapGridComponent.cs @@ -2,15 +2,13 @@ using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Linq; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components.Transform +namespace Robust.Shared.GameObjects { /// /// Makes it possible to look this entity up with the snap grid. diff --git a/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs b/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs index 12e932771..70aa4b2e9 100644 --- a/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs +++ b/Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs @@ -3,12 +3,6 @@ using System.Collections.Generic; using System.Linq; using Robust.Shared.Animations; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.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; @@ -16,7 +10,7 @@ using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -namespace Robust.Shared.GameObjects.Components.Transform +namespace Robust.Shared.GameObjects { internal class TransformComponent : Component, ITransformComponent, IComponentDebug { diff --git a/Robust.Shared/GameObjects/Components/UserInterface/SharedUserInterfaceComponent.cs b/Robust.Shared/GameObjects/Components/UserInterface/SharedUserInterfaceComponent.cs index ba79de7ef..99ad095aa 100644 --- a/Robust.Shared/GameObjects/Components/UserInterface/SharedUserInterfaceComponent.cs +++ b/Robust.Shared/GameObjects/Components/UserInterface/SharedUserInterfaceComponent.cs @@ -1,8 +1,7 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; -namespace Robust.Shared.GameObjects.Components.UserInterface +namespace Robust.Shared.GameObjects { public abstract class SharedUserInterfaceComponent : Component { diff --git a/Robust.Shared/GameObjects/Entity.cs b/Robust.Shared/GameObjects/Entity.cs index f6f4a8be6..c462b6546 100644 --- a/Robust.Shared/GameObjects/Entity.cs +++ b/Robust.Shared/GameObjects/Entity.cs @@ -2,12 +2,8 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/GameObjects/EntityEventBus.cs b/Robust.Shared/GameObjects/EntityEventBus.cs index 445866352..d8f87ab41 100644 --- a/Robust.Shared/GameObjects/EntityEventBus.cs +++ b/Robust.Shared/GameObjects/EntityEventBus.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; diff --git a/Robust.Shared/GameObjects/EntityManager.cs b/Robust.Shared/GameObjects/EntityManager.cs index a0fd6014f..f52321f26 100644 --- a/Robust.Shared/GameObjects/EntityManager.cs +++ b/Robust.Shared/GameObjects/EntityManager.cs @@ -1,15 +1,8 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Prometheus; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Shared/GameObjects/EntityQuery.cs b/Robust.Shared/GameObjects/EntityQuery.cs index 6fdf7df56..6590f9133 100644 --- a/Robust.Shared/GameObjects/EntityQuery.cs +++ b/Robust.Shared/GameObjects/EntityQuery.cs @@ -1,9 +1,7 @@ -using Robust.Shared.Interfaces.GameObjects; -using System; +using System; using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Utility; namespace Robust.Shared.GameObjects diff --git a/Robust.Shared/GameObjects/EntityState.cs b/Robust.Shared/GameObjects/EntityState.cs index 9ad4004f8..1928231b3 100644 --- a/Robust.Shared/GameObjects/EntityState.cs +++ b/Robust.Shared/GameObjects/EntityState.cs @@ -1,6 +1,5 @@ using Robust.Shared.Serialization; using System; -using JetBrains.Annotations; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/GameObjects/Systems/EntitySystem.cs b/Robust.Shared/GameObjects/EntitySystem.cs similarity index 97% rename from Robust.Shared/GameObjects/Systems/EntitySystem.cs rename to Robust.Shared/GameObjects/EntitySystem.cs index 2ec7c8ce8..fda465476 100644 --- a/Robust.Shared/GameObjects/Systems/EntitySystem.cs +++ b/Robust.Shared/GameObjects/EntitySystem.cs @@ -3,13 +3,11 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Reflection; -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { /// /// A subsystem that acts on all components of a type at once. diff --git a/Robust.Shared/GameObjects/EntitySystemManager.cs b/Robust.Shared/GameObjects/EntitySystemManager.cs index fde9f4f22..fa4315455 100644 --- a/Robust.Shared/GameObjects/EntitySystemManager.cs +++ b/Robust.Shared/GameObjects/EntitySystemManager.cs @@ -4,12 +4,9 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; using Prometheus; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Systems; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Reflection; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/EntitySystemMessage.cs b/Robust.Shared/GameObjects/EntitySystemMessage.cs similarity index 100% rename from Robust.Shared/GameObjects/EntitySystemMessages/EntitySystemMessage.cs rename to Robust.Shared/GameObjects/EntitySystemMessage.cs diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/EffectMessage.cs b/Robust.Shared/GameObjects/EntitySystemMessages/EffectMessage.cs index 754ce68b3..19b80cb93 100644 --- a/Robust.Shared/GameObjects/EntitySystemMessages/EffectMessage.cs +++ b/Robust.Shared/GameObjects/EntitySystemMessages/EffectMessage.cs @@ -1,9 +1,9 @@ +using System; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; -using System; -namespace Robust.Shared.GameObjects.EntitySystemMessages +namespace Robust.Shared.GameObjects { [Serializable, NetSerializable] public class EffectSystemMessage : EntitySystemMessage diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/EntMapIdChangedMessage.cs b/Robust.Shared/GameObjects/EntitySystemMessages/EntMapIdChangedMessage.cs index 414f5b989..0c8e07e44 100644 --- a/Robust.Shared/GameObjects/EntitySystemMessages/EntMapIdChangedMessage.cs +++ b/Robust.Shared/GameObjects/EntitySystemMessages/EntMapIdChangedMessage.cs @@ -1,7 +1,6 @@ -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Robust.Shared.GameObjects.EntitySystemMessages +namespace Robust.Shared.GameObjects { public readonly struct EntMapIdChangedMessage { diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/EntParentChangedMessage.cs b/Robust.Shared/GameObjects/EntitySystemMessages/EntParentChangedMessage.cs index 4905a26fa..9983e7956 100644 --- a/Robust.Shared/GameObjects/EntitySystemMessages/EntParentChangedMessage.cs +++ b/Robust.Shared/GameObjects/EntitySystemMessages/EntParentChangedMessage.cs @@ -1,6 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; - -namespace Robust.Shared.GameObjects.EntitySystemMessages +namespace Robust.Shared.GameObjects { /// /// Raised when an entity parent is changed. diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/EntityInitializedMessage.cs b/Robust.Shared/GameObjects/EntitySystemMessages/EntityInitializedMessage.cs index 098f20bf4..b42473023 100644 --- a/Robust.Shared/GameObjects/EntitySystemMessages/EntityInitializedMessage.cs +++ b/Robust.Shared/GameObjects/EntitySystemMessages/EntityInitializedMessage.cs @@ -1,6 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; - -namespace Robust.Shared.GameObjects.EntitySystemMessages +namespace Robust.Shared.GameObjects { public sealed class EntityInitializedMessage : EntitySystemMessage { diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/TransformStartLerpMessage.cs b/Robust.Shared/GameObjects/EntitySystemMessages/TransformStartLerpMessage.cs index 16efb598b..f963a5a6c 100644 --- a/Robust.Shared/GameObjects/EntitySystemMessages/TransformStartLerpMessage.cs +++ b/Robust.Shared/GameObjects/EntitySystemMessages/TransformStartLerpMessage.cs @@ -1,6 +1,4 @@ -using Robust.Shared.GameObjects.Components.Transform; - -namespace Robust.Shared.GameObjects.EntitySystemMessages +namespace Robust.Shared.GameObjects { internal sealed class TransformStartLerpMessage : EntitySystemMessage { diff --git a/Robust.Shared/Interfaces/GameObjects/IComponent.cs b/Robust.Shared/GameObjects/IComponent.cs similarity index 97% rename from Robust.Shared/Interfaces/GameObjects/IComponent.cs rename to Robust.Shared/GameObjects/IComponent.cs index d80acb71a..dcc8f7832 100644 --- a/Robust.Shared/Interfaces/GameObjects/IComponent.cs +++ b/Robust.Shared/GameObjects/IComponent.cs @@ -1,11 +1,9 @@ -using JetBrains.Annotations; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Timing; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { /// /// Base component for the ECS system. diff --git a/Robust.Shared/Interfaces/GameObjects/IComponentDebug.cs b/Robust.Shared/GameObjects/IComponentDebug.cs similarity index 67% rename from Robust.Shared/Interfaces/GameObjects/IComponentDebug.cs rename to Robust.Shared/GameObjects/IComponentDebug.cs index 9ec28f533..ff9b84e56 100644 --- a/Robust.Shared/Interfaces/GameObjects/IComponentDebug.cs +++ b/Robust.Shared/GameObjects/IComponentDebug.cs @@ -1,4 +1,4 @@ -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { public interface IComponentDebug : IComponent { diff --git a/Robust.Shared/Interfaces/GameObjects/IComponentFactory.cs b/Robust.Shared/GameObjects/IComponentFactory.cs similarity index 98% rename from Robust.Shared/Interfaces/GameObjects/IComponentFactory.cs rename to Robust.Shared/GameObjects/IComponentFactory.cs index 686368e1d..9c62f41c5 100644 --- a/Robust.Shared/Interfaces/GameObjects/IComponentFactory.cs +++ b/Robust.Shared/GameObjects/IComponentFactory.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Shared.GameObjects; +using Robust.Shared.Prototypes; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { /// - /// Used by to determine whether a component is available. + /// Used by to determine whether a component is available. /// This distinction is important because prototypes are shared across client and server, but the two might have different components. /// /// diff --git a/Robust.Shared/Interfaces/GameObjects/IComponentManager.cs b/Robust.Shared/GameObjects/IComponentManager.cs similarity index 98% rename from Robust.Shared/Interfaces/GameObjects/IComponentManager.cs rename to Robust.Shared/GameObjects/IComponentManager.cs index 5f79abc8c..8ca0c709e 100644 --- a/Robust.Shared/Interfaces/GameObjects/IComponentManager.cs +++ b/Robust.Shared/GameObjects/IComponentManager.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { /// /// Holds a collection of ECS components that are attached to entities. diff --git a/Robust.Shared/Interfaces/GameObjects/IEntity.cs b/Robust.Shared/GameObjects/IEntity.cs similarity index 98% rename from Robust.Shared/Interfaces/GameObjects/IEntity.cs rename to Robust.Shared/GameObjects/IEntity.cs index f65ea5f9f..00a787cc3 100644 --- a/Robust.Shared/Interfaces/GameObjects/IEntity.cs +++ b/Robust.Shared/GameObjects/IEntity.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; using Robust.Shared.Timing; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { public interface IEntity { diff --git a/Robust.Shared/Interfaces/GameObjects/IEntityLoadContext.cs b/Robust.Shared/GameObjects/IEntityLoadContext.cs similarity index 94% rename from Robust.Shared/Interfaces/GameObjects/IEntityLoadContext.cs rename to Robust.Shared/GameObjects/IEntityLoadContext.cs index 290a65025..bd1042170 100644 --- a/Robust.Shared/Interfaces/GameObjects/IEntityLoadContext.cs +++ b/Robust.Shared/GameObjects/IEntityLoadContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { /// /// Interface used to allow the map loader to override prototype data with map data. diff --git a/Robust.Shared/Interfaces/GameObjects/IEntityManager.cs b/Robust.Shared/GameObjects/IEntityManager.cs similarity index 99% rename from Robust.Shared/Interfaces/GameObjects/IEntityManager.cs rename to Robust.Shared/GameObjects/IEntityManager.cs index c81b5ffe7..2c2bd237a 100644 --- a/Robust.Shared/Interfaces/GameObjects/IEntityManager.cs +++ b/Robust.Shared/GameObjects/IEntityManager.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Prometheus; -using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Timing; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { public interface IEntityManager { diff --git a/Robust.Shared/GameObjects/IEntityNetworkManager.cs b/Robust.Shared/GameObjects/IEntityNetworkManager.cs index dbbf6fc08..bdcca8d0c 100644 --- a/Robust.Shared/GameObjects/IEntityNetworkManager.cs +++ b/Robust.Shared/GameObjects/IEntityNetworkManager.cs @@ -1,6 +1,5 @@ using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/Interfaces/GameObjects/IEntityQuery.cs b/Robust.Shared/GameObjects/IEntityQuery.cs similarity index 95% rename from Robust.Shared/Interfaces/GameObjects/IEntityQuery.cs rename to Robust.Shared/GameObjects/IEntityQuery.cs index e668e22ab..f896a11e3 100644 --- a/Robust.Shared/Interfaces/GameObjects/IEntityQuery.cs +++ b/Robust.Shared/GameObjects/IEntityQuery.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { /// /// An entity query is a type that can filter entities based on certain criteria, diff --git a/Robust.Shared/Interfaces/GameObjects/Systems/IEntitySystem.cs b/Robust.Shared/GameObjects/IEntitySystem.cs similarity index 92% rename from Robust.Shared/Interfaces/GameObjects/Systems/IEntitySystem.cs rename to Robust.Shared/GameObjects/IEntitySystem.cs index 3b308cf7c..e68e67e2d 100644 --- a/Robust.Shared/Interfaces/GameObjects/Systems/IEntitySystem.cs +++ b/Robust.Shared/GameObjects/IEntitySystem.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.GameObjects; -namespace Robust.Shared.Interfaces.GameObjects.Systems +namespace Robust.Shared.GameObjects { /// /// A subsystem that acts on all components of a type at once. diff --git a/Robust.Shared/Interfaces/GameObjects/IEntitySystemManager.cs b/Robust.Shared/GameObjects/IEntitySystemManager.cs similarity index 96% rename from Robust.Shared/Interfaces/GameObjects/IEntitySystemManager.cs rename to Robust.Shared/GameObjects/IEntitySystemManager.cs index 58baeca54..cf9722794 100644 --- a/Robust.Shared/Interfaces/GameObjects/IEntitySystemManager.cs +++ b/Robust.Shared/GameObjects/IEntitySystemManager.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Systems; -namespace Robust.Shared.Interfaces.GameObjects +namespace Robust.Shared.GameObjects { /// /// Like SS13's master controller. It controls instances. diff --git a/Robust.Shared/GameObjects/NetworkComponentMessage.cs b/Robust.Shared/GameObjects/NetworkComponentMessage.cs index 6d4e527b6..a5618e268 100644 --- a/Robust.Shared/GameObjects/NetworkComponentMessage.cs +++ b/Robust.Shared/GameObjects/NetworkComponentMessage.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; using Robust.Shared.Players; using Robust.Shared.Utility; diff --git a/Robust.Shared/GameObjects/RegisterComponentAttribute.cs b/Robust.Shared/GameObjects/RegisterComponentAttribute.cs index a14d8dde0..22b1986cb 100644 --- a/Robust.Shared/GameObjects/RegisterComponentAttribute.cs +++ b/Robust.Shared/GameObjects/RegisterComponentAttribute.cs @@ -1,6 +1,5 @@ using System; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; namespace Robust.Shared.GameObjects { diff --git a/Robust.Shared/GameObjects/Systems/OccluderSystem.cs b/Robust.Shared/GameObjects/Systems/OccluderSystem.cs index 6bcd3467f..1fffe2f0e 100644 --- a/Robust.Shared/GameObjects/Systems/OccluderSystem.cs +++ b/Robust.Shared/GameObjects/Systems/OccluderSystem.cs @@ -1,16 +1,12 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { public abstract class OccluderSystem : EntitySystem { diff --git a/Robust.Shared/GameObjects/Systems/SharedInputSystem.cs b/Robust.Shared/GameObjects/Systems/SharedInputSystem.cs index 4b0a200bf..e3992548a 100644 --- a/Robust.Shared/GameObjects/Systems/SharedInputSystem.cs +++ b/Robust.Shared/GameObjects/Systems/SharedInputSystem.cs @@ -1,7 +1,6 @@ -using Robust.Shared.Input; using Robust.Shared.Input.Binding; -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { public abstract class SharedInputSystem : EntitySystem { diff --git a/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs b/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs index 7a740ca90..3151bc522 100644 --- a/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs +++ b/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs @@ -1,18 +1,15 @@ using System; -using System.Buffers; using System.Collections.Generic; using System.Linq; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; +using Robust.Shared.Random; +using Robust.Shared.Timing; using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute; -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { public abstract class SharedPhysicsSystem : EntitySystem { diff --git a/Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs b/Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs index b82b22afe..ab5e7a8d0 100644 --- a/Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs +++ b/Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using System.Linq; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Components.Transform; -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { internal class SharedTransformSystem : EntitySystem { diff --git a/Robust.Shared/GameObjects/Systems/SnapGridSystem.cs b/Robust.Shared/GameObjects/Systems/SnapGridSystem.cs index 5c39a5b92..150c2a657 100644 --- a/Robust.Shared/GameObjects/Systems/SnapGridSystem.cs +++ b/Robust.Shared/GameObjects/Systems/SnapGridSystem.cs @@ -1,6 +1,4 @@ -using Robust.Shared.GameObjects.Components.Transform; - -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { public class SnapGridSystem : EntitySystem { diff --git a/Robust.Shared/GameObjects/Systems/TimerSystem.cs b/Robust.Shared/GameObjects/Systems/TimerSystem.cs index b03e3a333..3a9962201 100644 --- a/Robust.Shared/GameObjects/Systems/TimerSystem.cs +++ b/Robust.Shared/GameObjects/Systems/TimerSystem.cs @@ -1,7 +1,6 @@ using System.Linq; -using Robust.Shared.GameObjects.Components.Timers; -namespace Robust.Shared.GameObjects.Systems +namespace Robust.Shared.GameObjects { public class TimerSystem : EntitySystem { diff --git a/Robust.Shared/GameStates/PlayerState.cs b/Robust.Shared/GameStates/PlayerState.cs index b59b725e8..44ca2b38c 100644 --- a/Robust.Shared/GameStates/PlayerState.cs +++ b/Robust.Shared/GameStates/PlayerState.cs @@ -2,7 +2,6 @@ using System; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Players; using Robust.Shared.Network; #nullable disable diff --git a/Robust.Shared/Input/Binding/CommandBindRegistry.cs b/Robust.Shared/Input/Binding/CommandBindRegistry.cs index cb7d58e90..c6cb01800 100644 --- a/Robust.Shared/Input/Binding/CommandBindRegistry.cs +++ b/Robust.Shared/Input/Binding/CommandBindRegistry.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Shared.IoC; using Robust.Shared.Log; namespace Robust.Shared.Input.Binding diff --git a/Robust.Shared/Input/Binding/CommandBinds.cs b/Robust.Shared/Input/Binding/CommandBinds.cs index 94588e36b..881128645 100644 --- a/Robust.Shared/Input/Binding/CommandBinds.cs +++ b/Robust.Shared/Input/Binding/CommandBinds.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Runtime.CompilerServices; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; namespace Robust.Shared.Input.Binding { diff --git a/Robust.Shared/Input/BoundKeyMap.cs b/Robust.Shared/Input/BoundKeyMap.cs index 490d5a688..557cf3069 100644 --- a/Robust.Shared/Input/BoundKeyMap.cs +++ b/Robust.Shared/Input/BoundKeyMap.cs @@ -1,7 +1,7 @@ -using Robust.Shared.Interfaces.Reflection; -using System; +using System; using System.Collections.Generic; using System.Reflection; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; namespace Robust.Shared.Input diff --git a/Robust.Shared/Input/InputCmdMessage.cs b/Robust.Shared/Input/InputCmdMessage.cs index b368f9b9f..bc08a2adc 100644 --- a/Robust.Shared/Input/InputCmdMessage.cs +++ b/Robust.Shared/Input/InputCmdMessage.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Map; using Robust.Shared.Serialization; using Robust.Shared.Timing; diff --git a/Robust.Shared/Input/KeyFunctions.cs b/Robust.Shared/Input/KeyFunctions.cs index 94f57aa9f..f9dc6bc99 100644 --- a/Robust.Shared/Input/KeyFunctions.cs +++ b/Robust.Shared/Input/KeyFunctions.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Robust.Shared.Input diff --git a/Robust.Shared/IoC/Exceptions/InvalidImplementationException.cs b/Robust.Shared/IoC/Exceptions/InvalidImplementationException.cs index 711d30208..f6bd3d1f4 100644 --- a/Robust.Shared/IoC/Exceptions/InvalidImplementationException.cs +++ b/Robust.Shared/IoC/Exceptions/InvalidImplementationException.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.Interfaces.Reflection; +using Robust.Shared.Reflection; namespace Robust.Shared.IoC.Exceptions { diff --git a/Robust.Shared/IoC/IDependencyCollection.cs b/Robust.Shared/IoC/IDependencyCollection.cs index 4a42923da..a55a574dd 100644 --- a/Robust.Shared/IoC/IDependencyCollection.cs +++ b/Robust.Shared/IoC/IDependencyCollection.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics.Contracts; using Robust.Shared.IoC.Exceptions; +using Robust.Shared.Reflection; namespace Robust.Shared.IoC { @@ -23,7 +24,7 @@ namespace Robust.Shared.IoC /// These implementations can then be fetched with , or through field injection with . /// /// - /// + /// public interface IDependencyCollection { /// diff --git a/Robust.Shared/IoC/IoCManager.cs b/Robust.Shared/IoC/IoCManager.cs index 3690f8785..c8939500c 100644 --- a/Robust.Shared/IoC/IoCManager.cs +++ b/Robust.Shared/IoC/IoCManager.cs @@ -3,6 +3,7 @@ using System; using System.Diagnostics.Contracts; using System.Threading; using System.Threading.Tasks; +using Robust.Shared.Reflection; using Robust.Shared.Utility; namespace Robust.Shared.IoC @@ -34,7 +35,7 @@ namespace Robust.Shared.IoC /// (for example, server and client running in the same process, they have a different IoC instance). /// /// - /// + /// public static class IoCManager { private const string NoContextAssert = "IoC has no context on this thread. Are you calling IoC from the wrong thread or did you forget to initialize it?"; diff --git a/Robust.Shared/Localization/CustomFormatCatalog.cs b/Robust.Shared/Localization/CustomFormatCatalog.cs index a57b6244c..dcb6778f0 100644 --- a/Robust.Shared/Localization/CustomFormatCatalog.cs +++ b/Robust.Shared/Localization/CustomFormatCatalog.cs @@ -47,27 +47,27 @@ namespace Robust.Shared.Localization public override string GetString(string text, params object[] args) { - return string.Format(GetFormatProviderOrDefault(), this.GetStringDefault(text, text), args); + return string.Format(GetFormatProviderOrDefault(), GetStringDefault(text, text), args); } public override string GetPluralString(string text, string pluralText, long n, params object[] args) { - return string.Format(GetFormatProviderOrDefault(), this.GetPluralStringDefault(text, text, pluralText, n), args); + return string.Format(GetFormatProviderOrDefault(), GetPluralStringDefault(text, text, pluralText, n), args); } public override string GetParticularString(string context, string text, params object[] args) { - return string.Format(GetFormatProviderOrDefault(), this.GetStringDefault(context + CONTEXT_GLUE + text, text), args); + return string.Format(GetFormatProviderOrDefault(), GetStringDefault(context + CONTEXT_GLUE + text, text), args); } public override string GetParticularPluralString(string context, string text, string pluralText, long n, params object[] args) { - return string.Format(GetFormatProviderOrDefault(), this.GetPluralStringDefault(context + CONTEXT_GLUE + text, text, pluralText, n), args); + return string.Format(GetFormatProviderOrDefault(), GetPluralStringDefault(context + CONTEXT_GLUE + text, text, pluralText, n), args); } private IFormatProvider GetFormatProviderOrDefault() { - return this.CustomFormatProvider ?? this.CultureInfo; + return CustomFormatProvider ?? CultureInfo; } } } diff --git a/Robust.Shared/Localization/LocalizationManager.cs b/Robust.Shared/Localization/LocalizationManager.cs index 220493b3c..26d8dcdc2 100644 --- a/Robust.Shared/Localization/LocalizationManager.cs +++ b/Robust.Shared/Localization/LocalizationManager.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.IO; using System.Linq; using NGettext; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.Localization.Macros; using Robust.Shared.Serialization; diff --git a/Robust.Shared/Localization/Macros/Attributes.cs b/Robust.Shared/Localization/Macros/Attributes.cs index ee98677ab..43031dba2 100644 --- a/Robust.Shared/Localization/Macros/Attributes.cs +++ b/Robust.Shared/Localization/Macros/Attributes.cs @@ -1,5 +1,5 @@ using System.Linq; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Shared.Localization.Macros { diff --git a/Robust.Shared/Localization/Macros/GeneralMacros.cs b/Robust.Shared/Localization/Macros/GeneralMacros.cs index a27c27005..fc3c3740a 100644 --- a/Robust.Shared/Localization/Macros/GeneralMacros.cs +++ b/Robust.Shared/Localization/Macros/GeneralMacros.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Shared.Localization.Macros { diff --git a/Robust.Shared/Localization/Macros/ITextMacro.cs b/Robust.Shared/Localization/Macros/ITextMacro.cs index f54c88e06..0e79ac0eb 100644 --- a/Robust.Shared/Localization/Macros/ITextMacro.cs +++ b/Robust.Shared/Localization/Macros/ITextMacro.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Robust.Shared.Localization.Macros +namespace Robust.Shared.Localization.Macros { public interface ITextMacro { diff --git a/Robust.Shared/Localization/Macros/ITextMacroFactory.cs b/Robust.Shared/Localization/Macros/ITextMacroFactory.cs index 46d64812c..b0e80cdbe 100644 --- a/Robust.Shared/Localization/Macros/ITextMacroFactory.cs +++ b/Robust.Shared/Localization/Macros/ITextMacroFactory.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; namespace Robust.Shared.Localization.Macros { diff --git a/Robust.Shared/Localization/Macros/TextMacroFactory.cs b/Robust.Shared/Localization/Macros/TextMacroFactory.cs index af52d36f9..7cd5c73e8 100644 --- a/Robust.Shared/Localization/Macros/TextMacroFactory.cs +++ b/Robust.Shared/Localization/Macros/TextMacroFactory.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Logger = Robust.Shared.Log.Logger; namespace Robust.Shared.Localization.Macros diff --git a/Robust.Shared/Log/ConsoleLogHandler.cs b/Robust.Shared/Log/ConsoleLogHandler.cs index 6c1a5b697..15050e883 100644 --- a/Robust.Shared/Log/ConsoleLogHandler.cs +++ b/Robust.Shared/Log/ConsoleLogHandler.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.Log; -using System; +using System; using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; diff --git a/Robust.Shared/Log/FileLogHandler.cs b/Robust.Shared/Log/FileLogHandler.cs index aceb28fdd..b796870eb 100644 --- a/Robust.Shared/Log/FileLogHandler.cs +++ b/Robust.Shared/Log/FileLogHandler.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.Log; -using System; +using System; using System.IO; using Robust.Shared.Utility; using Serilog.Events; diff --git a/Robust.Shared/Interfaces/Log/ILogHandler.cs b/Robust.Shared/Log/ILogHandler.cs similarity index 94% rename from Robust.Shared/Interfaces/Log/ILogHandler.cs rename to Robust.Shared/Log/ILogHandler.cs index 25c740f89..a488115c2 100644 --- a/Robust.Shared/Interfaces/Log/ILogHandler.cs +++ b/Robust.Shared/Log/ILogHandler.cs @@ -1,6 +1,6 @@ using Serilog.Events; -namespace Robust.Shared.Interfaces.Log +namespace Robust.Shared.Log { /// /// Formats and prints a log message to an output source. diff --git a/Robust.Shared/Interfaces/Log/ILogManager.cs b/Robust.Shared/Log/ILogManager.cs similarity index 86% rename from Robust.Shared/Interfaces/Log/ILogManager.cs rename to Robust.Shared/Log/ILogManager.cs index 9157d1522..bdc69a79c 100644 --- a/Robust.Shared/Interfaces/Log/ILogManager.cs +++ b/Robust.Shared/Log/ILogManager.cs @@ -1,6 +1,4 @@ -using System.Diagnostics.Contracts; - -namespace Robust.Shared.Interfaces.Log +namespace Robust.Shared.Log { /// /// Manages logging sawmills. diff --git a/Robust.Shared/Interfaces/Log/ISawmill.cs b/Robust.Shared/Log/ISawmill.cs similarity index 98% rename from Robust.Shared/Interfaces/Log/ISawmill.cs rename to Robust.Shared/Log/ISawmill.cs index 8728065a3..ce98df9e5 100644 --- a/Robust.Shared/Interfaces/Log/ISawmill.cs +++ b/Robust.Shared/Log/ISawmill.cs @@ -1,7 +1,6 @@ using System; -using Robust.Shared.Log; -namespace Robust.Shared.Interfaces.Log +namespace Robust.Shared.Log { /// /// A sawmill is an object-oriented logging "category". diff --git a/Robust.Shared/Log/LogManager.Sawmill.cs b/Robust.Shared/Log/LogManager.Sawmill.cs index 6893c03ee..b1c509b21 100644 --- a/Robust.Shared/Log/LogManager.Sawmill.cs +++ b/Robust.Shared/Log/LogManager.Sawmill.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.Log; -using System; +using System; using System.Collections.Generic; using System.Threading; using Serilog; diff --git a/Robust.Shared/Log/LogManager.cs b/Robust.Shared/Log/LogManager.cs index ad8ef7546..1c8b1bc6a 100644 --- a/Robust.Shared/Log/LogManager.cs +++ b/Robust.Shared/Log/LogManager.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Log; using System.Collections.Generic; using System.Threading; diff --git a/Robust.Shared/Log/Logger.cs b/Robust.Shared/Log/Logger.cs index aa5d2f0dd..933465f74 100644 --- a/Robust.Shared/Log/Logger.cs +++ b/Robust.Shared/Log/Logger.cs @@ -1,6 +1,4 @@ using System; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.Log; using Robust.Shared.IoC; namespace Robust.Shared.Log diff --git a/Robust.Shared/Log/ProxyLogManager.cs b/Robust.Shared/Log/ProxyLogManager.cs index ee3c69442..f5880d563 100644 --- a/Robust.Shared/Log/ProxyLogManager.cs +++ b/Robust.Shared/Log/ProxyLogManager.cs @@ -1,5 +1,3 @@ -using Robust.Shared.Interfaces.Log; - namespace Robust.Shared.Log { public sealed class ProxyLogManager : ILogManager diff --git a/Robust.Shared/Map/Coordinates.cs b/Robust.Shared/Map/Coordinates.cs index fcb1f3b67..5c3f4ca7b 100644 --- a/Robust.Shared/Map/Coordinates.cs +++ b/Robust.Shared/Map/Coordinates.cs @@ -1,11 +1,9 @@ -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Maths; +using Robust.Shared.Maths; using Robust.Shared.Serialization; using System; using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Robust.Shared.Map { diff --git a/Robust.Shared/Map/CoordinatesExtensions.cs b/Robust.Shared/Map/CoordinatesExtensions.cs index dcb516c29..ff4c62168 100644 --- a/Robust.Shared/Map/CoordinatesExtensions.cs +++ b/Robust.Shared/Map/CoordinatesExtensions.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Robust.Shared/Map/GridChunkPartition.cs b/Robust.Shared/Map/GridChunkPartition.cs index 23cb7ec7f..a12136ec4 100644 --- a/Robust.Shared/Map/GridChunkPartition.cs +++ b/Robust.Shared/Map/GridChunkPartition.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using Robust.Shared.Maths; diff --git a/Robust.Shared/Map/GridEventHandler.cs b/Robust.Shared/Map/GridEventHandler.cs new file mode 100644 index 000000000..3983d62d2 --- /dev/null +++ b/Robust.Shared/Map/GridEventHandler.cs @@ -0,0 +1,4 @@ +namespace Robust.Shared.Map +{ + public delegate void GridEventHandler(GridId gridId); +} \ No newline at end of file diff --git a/Robust.Shared/Map/IMapChunk.cs b/Robust.Shared/Map/IMapChunk.cs index 77048f250..2c54288b4 100644 --- a/Robust.Shared/Map/IMapChunk.cs +++ b/Robust.Shared/Map/IMapChunk.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Robust.Shared.Map diff --git a/Robust.Shared/Map/IMapGrid.cs b/Robust.Shared/Map/IMapGrid.cs index 4f7344113..14614475c 100644 --- a/Robust.Shared/Map/IMapGrid.cs +++ b/Robust.Shared/Map/IMapGrid.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.Maths; namespace Robust.Shared.Map diff --git a/Robust.Shared/Interfaces/Map/IMapManager.cs b/Robust.Shared/Map/IMapManager.cs similarity index 90% rename from Robust.Shared/Interfaces/Map/IMapManager.cs rename to Robust.Shared/Map/IMapManager.cs index edde153f5..f005ef681 100644 --- a/Robust.Shared/Interfaces/Map/IMapManager.cs +++ b/Robust.Shared/Map/IMapManager.cs @@ -3,23 +3,11 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Timing; -namespace Robust.Shared.Interfaces.Map +namespace Robust.Shared.Map { - /// - /// Event delegate for the OnTileChanged event. - /// - /// The ID of the grid being changed. - /// A reference to the new tile being inserted. - /// The old tile that is being replaced. - public delegate void TileChangedEventHandler(TileRef tileRef, Tile oldTile); - - public delegate void GridEventHandler(GridId gridId); - /// /// This manages all of the grids in the world. /// diff --git a/Robust.Shared/Map/IMapManagerInternal.cs b/Robust.Shared/Map/IMapManagerInternal.cs index 264aa4f22..80efd90a3 100644 --- a/Robust.Shared/Map/IMapManagerInternal.cs +++ b/Robust.Shared/Map/IMapManagerInternal.cs @@ -1,6 +1,5 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; +using Robust.Shared.Timing; namespace Robust.Shared.Map { diff --git a/Robust.Shared/Interfaces/Map/ITileDefinition.cs b/Robust.Shared/Map/ITileDefinition.cs similarity index 96% rename from Robust.Shared/Interfaces/Map/ITileDefinition.cs rename to Robust.Shared/Map/ITileDefinition.cs index 0ebb5f2a3..d237e0752 100644 --- a/Robust.Shared/Interfaces/Map/ITileDefinition.cs +++ b/Robust.Shared/Map/ITileDefinition.cs @@ -1,4 +1,4 @@ -namespace Robust.Shared.Interfaces.Map +namespace Robust.Shared.Map { /// /// The definition (template) for a grid tile. diff --git a/Robust.Shared/Interfaces/Map/ITileDefinitionManager.cs b/Robust.Shared/Map/ITileDefinitionManager.cs similarity index 93% rename from Robust.Shared/Interfaces/Map/ITileDefinitionManager.cs rename to Robust.Shared/Map/ITileDefinitionManager.cs index 981b19650..8e7fa34ea 100644 --- a/Robust.Shared/Interfaces/Map/ITileDefinitionManager.cs +++ b/Robust.Shared/Map/ITileDefinitionManager.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using Robust.Shared.Network.Messages; -namespace Robust.Shared.Interfaces.Map +namespace Robust.Shared.Map { /// /// This manages tile definitions for grid tiles. diff --git a/Robust.Shared/Map/MapChunk.cs b/Robust.Shared/Map/MapChunk.cs index 613520d1e..4fcfcb379 100644 --- a/Robust.Shared/Map/MapChunk.cs +++ b/Robust.Shared/Map/MapChunk.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.Shared/Map/MapGrid.cs b/Robust.Shared/Map/MapGrid.cs index 1486fff52..e2e0fcd77 100644 --- a/Robust.Shared/Map/MapGrid.cs +++ b/Robust.Shared/Map/MapGrid.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Shared/Map/MapIndices.cs b/Robust.Shared/Map/MapIndices.cs index 30744812d..d5b4d8e85 100644 --- a/Robust.Shared/Map/MapIndices.cs +++ b/Robust.Shared/Map/MapIndices.cs @@ -1,6 +1,5 @@ using System; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Robust.Shared/Map/MapManager.Network.cs b/Robust.Shared/Map/MapManager.Network.cs index 4d94fb7e5..2446ceac9 100644 --- a/Robust.Shared/Map/MapManager.Network.cs +++ b/Robust.Shared/Map/MapManager.Network.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Shared.GameObjects.Components.Map; +using Robust.Shared.GameObjects; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.Shared/Map/MapManager.cs b/Robust.Shared/Map/MapManager.cs index 9daede7d6..ac6adb7aa 100644 --- a/Robust.Shared/Map/MapManager.cs +++ b/Robust.Shared/Map/MapManager.cs @@ -3,11 +3,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Robust.Shared/Map/PhysShapeGrid.cs b/Robust.Shared/Map/PhysShapeGrid.cs index f7033cd09..ee5ceea98 100644 --- a/Robust.Shared/Map/PhysShapeGrid.cs +++ b/Robust.Shared/Map/PhysShapeGrid.cs @@ -1,6 +1,4 @@ using System; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Robust.Shared/Map/TileChangedEventHandler.cs b/Robust.Shared/Map/TileChangedEventHandler.cs new file mode 100644 index 000000000..d1b0b369e --- /dev/null +++ b/Robust.Shared/Map/TileChangedEventHandler.cs @@ -0,0 +1,10 @@ +namespace Robust.Shared.Map +{ + /// + /// Event delegate for the OnTileChanged event. + /// + /// The ID of the grid being changed. + /// A reference to the new tile being inserted. + /// The old tile that is being replaced. + public delegate void TileChangedEventHandler(TileRef tileRef, Tile oldTile); +} \ No newline at end of file diff --git a/Robust.Shared/Map/TileDefinitionManager.cs b/Robust.Shared/Map/TileDefinitionManager.cs index 16d65d37e..8cbf45c65 100644 --- a/Robust.Shared/Map/TileDefinitionManager.cs +++ b/Robust.Shared/Map/TileDefinitionManager.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Map; namespace Robust.Shared.Map { diff --git a/Robust.Shared/Network/ClientConnectionState.cs b/Robust.Shared/Network/ClientConnectionState.cs new file mode 100644 index 000000000..4cddd2666 --- /dev/null +++ b/Robust.Shared/Network/ClientConnectionState.cs @@ -0,0 +1,30 @@ +namespace Robust.Shared.Network +{ + public enum ClientConnectionState : byte + { + /// + /// We are not connected and not trying to get connected either. Quite lonely huh. + /// + NotConnecting, + + /// + /// Resolving the DNS query for the address of the server. + /// + ResolvingHost, + + /// + /// Attempting to establish a connection to the server. + /// + EstablishingConnection, + + /// + /// Connection established, going through regular handshake business. + /// + Handshake, + + /// + /// Connection is solid and handshake is done go wild. + /// + Connected + } +} diff --git a/Robust.Shared/Interfaces/Network/IClientNetManager.cs b/Robust.Shared/Network/IClientNetManager.cs similarity index 67% rename from Robust.Shared/Interfaces/Network/IClientNetManager.cs rename to Robust.Shared/Network/IClientNetManager.cs index 599d8d43e..c37ac3fea 100644 --- a/Robust.Shared/Interfaces/Network/IClientNetManager.cs +++ b/Robust.Shared/Network/IClientNetManager.cs @@ -1,7 +1,6 @@ using System; -using Robust.Shared.Network; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { /// /// The Client version of the INetManager. @@ -42,32 +41,4 @@ namespace Robust.Shared.Interfaces.Network /// The reason why disconnect was called. void ClientDisconnect(string reason); } - - public enum ClientConnectionState : byte - { - /// - /// We are not connected and not trying to get connected either. Quite lonely huh. - /// - NotConnecting, - - /// - /// Resolving the DNS query for the address of the server. - /// - ResolvingHost, - - /// - /// Attempting to establish a connection to the server. - /// - EstablishingConnection, - - /// - /// Connection established, going through regular handshake business. - /// - Handshake, - - /// - /// Connection is solid and handshake is done go wild. - /// - Connected - } -} +} \ No newline at end of file diff --git a/Robust.Shared/Interfaces/Network/INetChannel.cs b/Robust.Shared/Network/INetChannel.cs similarity index 96% rename from Robust.Shared/Interfaces/Network/INetChannel.cs rename to Robust.Shared/Network/INetChannel.cs index 72c3c5e8a..a91bb9dd5 100644 --- a/Robust.Shared/Interfaces/Network/INetChannel.cs +++ b/Robust.Shared/Network/INetChannel.cs @@ -1,8 +1,7 @@ using System; using System.Net; -using Robust.Shared.Network; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { /// /// A network channel between this peer and a remote peer. diff --git a/Robust.Shared/Interfaces/Network/INetManager.cs b/Robust.Shared/Network/INetManager.cs similarity index 98% rename from Robust.Shared/Interfaces/Network/INetManager.cs rename to Robust.Shared/Network/INetManager.cs index ad69835a0..0186aca15 100644 --- a/Robust.Shared/Interfaces/Network/INetManager.cs +++ b/Robust.Shared/Network/INetManager.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Robust.Shared.Network; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { /// /// A network server that listens for connections, relays packets, and manages channels. diff --git a/Robust.Shared/Interfaces/Network/IServerNetManager.cs b/Robust.Shared/Network/IServerNetManager.cs similarity index 89% rename from Robust.Shared/Interfaces/Network/IServerNetManager.cs rename to Robust.Shared/Network/IServerNetManager.cs index c1c303cbc..fc3899cf0 100644 --- a/Robust.Shared/Interfaces/Network/IServerNetManager.cs +++ b/Robust.Shared/Network/IServerNetManager.cs @@ -1,9 +1,7 @@ - -using System; +using System; using System.Threading.Tasks; -using Robust.Shared.Network; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { /// /// The server version of the INetManager. diff --git a/Robust.Shared/Network/Messages/MsgConCmd.cs b/Robust.Shared/Network/Messages/MsgConCmd.cs index 8fd4ad5b0..fce513474 100644 --- a/Robust.Shared/Network/Messages/MsgConCmd.cs +++ b/Robust.Shared/Network/Messages/MsgConCmd.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgConCmdAck.cs b/Robust.Shared/Network/Messages/MsgConCmdAck.cs index 7735e8a30..e81d6c9db 100644 --- a/Robust.Shared/Network/Messages/MsgConCmdAck.cs +++ b/Robust.Shared/Network/Messages/MsgConCmdAck.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgConCmdReg.cs b/Robust.Shared/Network/Messages/MsgConCmdReg.cs index 9a697e0df..e1a6f1ea4 100644 --- a/Robust.Shared/Network/Messages/MsgConCmdReg.cs +++ b/Robust.Shared/Network/Messages/MsgConCmdReg.cs @@ -1,6 +1,5 @@ using System; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgConVars.cs b/Robust.Shared/Network/Messages/MsgConVars.cs index 2b5f8886b..c1c8ac9c6 100644 --- a/Robust.Shared/Network/Messages/MsgConVars.cs +++ b/Robust.Shared/Network/Messages/MsgConVars.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Timing; diff --git a/Robust.Shared/Network/Messages/MsgEntity.cs b/Robust.Shared/Network/Messages/MsgEntity.cs index 195a224f4..331a2690c 100644 --- a/Robust.Shared/Network/Messages/MsgEntity.cs +++ b/Robust.Shared/Network/Messages/MsgEntity.cs @@ -1,12 +1,11 @@ using System; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.GameObjects; using System.IO; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using System.Collections.Generic; using Robust.Shared.Enums; +using Robust.Shared.Serialization; using Robust.Shared.Timing; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgMapStrClientHandshake.cs b/Robust.Shared/Network/Messages/MsgMapStrClientHandshake.cs index a975fb655..d86ef25e8 100644 --- a/Robust.Shared/Network/Messages/MsgMapStrClientHandshake.cs +++ b/Robust.Shared/Network/Messages/MsgMapStrClientHandshake.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Serialization; namespace Robust.Shared.Network.Messages diff --git a/Robust.Shared/Network/Messages/MsgMapStrServerHandshake.cs b/Robust.Shared/Network/Messages/MsgMapStrServerHandshake.cs index a98c79658..fa980ef6c 100644 --- a/Robust.Shared/Network/Messages/MsgMapStrServerHandshake.cs +++ b/Robust.Shared/Network/Messages/MsgMapStrServerHandshake.cs @@ -1,7 +1,6 @@ using System; using JetBrains.Annotations; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Serialization; namespace Robust.Shared.Network.Messages diff --git a/Robust.Shared/Network/Messages/MsgMapStrStrings.cs b/Robust.Shared/Network/Messages/MsgMapStrStrings.cs index 63a1260a3..88d68cef2 100644 --- a/Robust.Shared/Network/Messages/MsgMapStrStrings.cs +++ b/Robust.Shared/Network/Messages/MsgMapStrStrings.cs @@ -1,7 +1,6 @@ using System; using JetBrains.Annotations; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Serialization; namespace Robust.Shared.Network.Messages diff --git a/Robust.Shared/Network/Messages/MsgPlacement.cs b/Robust.Shared/Network/Messages/MsgPlacement.cs index ff0833694..69c1f1478 100644 --- a/Robust.Shared/Network/Messages/MsgPlacement.cs +++ b/Robust.Shared/Network/Messages/MsgPlacement.cs @@ -2,7 +2,6 @@ using Lidgren.Network; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Shared/Network/Messages/MsgPlayerList.cs b/Robust.Shared/Network/Messages/MsgPlayerList.cs index 962a1fc2b..ea8fc79a3 100644 --- a/Robust.Shared/Network/Messages/MsgPlayerList.cs +++ b/Robust.Shared/Network/Messages/MsgPlayerList.cs @@ -2,8 +2,6 @@ using Lidgren.Network; using Robust.Shared.Enums; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Players; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgPlayerListReq.cs b/Robust.Shared/Network/Messages/MsgPlayerListReq.cs index c95e2886c..aa73b297b 100644 --- a/Robust.Shared/Network/Messages/MsgPlayerListReq.cs +++ b/Robust.Shared/Network/Messages/MsgPlayerListReq.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgRay.cs b/Robust.Shared/Network/Messages/MsgRay.cs index bb9242eea..c6e93a95d 100644 --- a/Robust.Shared/Network/Messages/MsgRay.cs +++ b/Robust.Shared/Network/Messages/MsgRay.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Maths; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgScriptEval.cs b/Robust.Shared/Network/Messages/MsgScriptEval.cs index 49cd4f469..f8dd806c2 100644 --- a/Robust.Shared/Network/Messages/MsgScriptEval.cs +++ b/Robust.Shared/Network/Messages/MsgScriptEval.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgScriptResponse.cs b/Robust.Shared/Network/Messages/MsgScriptResponse.cs index fc7bf5008..6fe245c61 100644 --- a/Robust.Shared/Network/Messages/MsgScriptResponse.cs +++ b/Robust.Shared/Network/Messages/MsgScriptResponse.cs @@ -1,8 +1,7 @@ using System.IO; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; +using Robust.Shared.Serialization; using Robust.Shared.Utility; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgScriptStart.cs b/Robust.Shared/Network/Messages/MsgScriptStart.cs index 1e6882848..a97570d78 100644 --- a/Robust.Shared/Network/Messages/MsgScriptStart.cs +++ b/Robust.Shared/Network/Messages/MsgScriptStart.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgScriptStartAck.cs b/Robust.Shared/Network/Messages/MsgScriptStartAck.cs index 263cf042f..6d104c6b2 100644 --- a/Robust.Shared/Network/Messages/MsgScriptStartAck.cs +++ b/Robust.Shared/Network/Messages/MsgScriptStartAck.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgScriptStop.cs b/Robust.Shared/Network/Messages/MsgScriptStop.cs index 05b4cd1f5..7ebe91031 100644 --- a/Robust.Shared/Network/Messages/MsgScriptStop.cs +++ b/Robust.Shared/Network/Messages/MsgScriptStop.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgState.cs b/Robust.Shared/Network/Messages/MsgState.cs index 814965b79..e8fd64fb8 100644 --- a/Robust.Shared/Network/Messages/MsgState.cs +++ b/Robust.Shared/Network/Messages/MsgState.cs @@ -1,10 +1,9 @@ using System; using Lidgren.Network; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using System.IO; +using Robust.Shared.Serialization; using Robust.Shared.Utility; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgStateAck.cs b/Robust.Shared/Network/Messages/MsgStateAck.cs index 0fdd5e134..aa691b7e2 100644 --- a/Robust.Shared/Network/Messages/MsgStateAck.cs +++ b/Robust.Shared/Network/Messages/MsgStateAck.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Timing; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesCloseSession.cs b/Robust.Shared/Network/Messages/MsgViewVariablesCloseSession.cs index 8c5b398ff..65aa832ae 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesCloseSession.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesCloseSession.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesDenySession.cs b/Robust.Shared/Network/Messages/MsgViewVariablesDenySession.cs index aedc032f9..5081c9a04 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesDenySession.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesDenySession.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesModifyRemote.cs b/Robust.Shared/Network/Messages/MsgViewVariablesModifyRemote.cs index d976d010f..5e810d821 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesModifyRemote.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesModifyRemote.cs @@ -1,10 +1,7 @@ -using System.Collections.Generic; using System.IO; -using System.Security.Cryptography.X509Certificates; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesOpenSession.cs b/Robust.Shared/Network/Messages/MsgViewVariablesOpenSession.cs index 1095188ba..247764a23 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesOpenSession.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesOpenSession.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesRemoteData.cs b/Robust.Shared/Network/Messages/MsgViewVariablesRemoteData.cs index fb45a30d7..9b0ef0632 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesRemoteData.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesRemoteData.cs @@ -1,8 +1,7 @@ using System.IO; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesReqData.cs b/Robust.Shared/Network/Messages/MsgViewVariablesReqData.cs index 1f940404f..2ab084323 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesReqData.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesReqData.cs @@ -1,8 +1,7 @@ using System.IO; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; #nullable disable diff --git a/Robust.Shared/Network/Messages/MsgViewVariablesReqSession.cs b/Robust.Shared/Network/Messages/MsgViewVariablesReqSession.cs index b647fdbc6..788c43a28 100644 --- a/Robust.Shared/Network/Messages/MsgViewVariablesReqSession.cs +++ b/Robust.Shared/Network/Messages/MsgViewVariablesReqSession.cs @@ -1,12 +1,7 @@ -using System; using System.IO; using Lidgren.Network; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; #nullable disable diff --git a/Robust.Shared/Interfaces/Network/NetApproval.cs b/Robust.Shared/Network/NetApproval.cs similarity index 93% rename from Robust.Shared/Interfaces/Network/NetApproval.cs rename to Robust.Shared/Network/NetApproval.cs index 76945b6e3..5008b2366 100644 --- a/Robust.Shared/Interfaces/Network/NetApproval.cs +++ b/Robust.Shared/Network/NetApproval.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { public struct NetApproval { diff --git a/Robust.Shared/Interfaces/Network/NetApprovalEventArgs.cs b/Robust.Shared/Network/NetApprovalEventArgs.cs similarity index 86% rename from Robust.Shared/Interfaces/Network/NetApprovalEventArgs.cs rename to Robust.Shared/Network/NetApprovalEventArgs.cs index d21631ab9..c5d1444a8 100644 --- a/Robust.Shared/Interfaces/Network/NetApprovalEventArgs.cs +++ b/Robust.Shared/Network/NetApprovalEventArgs.cs @@ -1,7 +1,7 @@ using System; using Lidgren.Network; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { public sealed class NetApprovalEventArgs : EventArgs { diff --git a/Robust.Shared/Network/NetChannelArgs.cs b/Robust.Shared/Network/NetChannelArgs.cs index 0f6fdd472..96765016f 100644 --- a/Robust.Shared/Network/NetChannelArgs.cs +++ b/Robust.Shared/Network/NetChannelArgs.cs @@ -1,6 +1,5 @@ using System; using System.Net; -using Robust.Shared.Interfaces.Network; namespace Robust.Shared.Network { diff --git a/Robust.Shared/Network/NetManager.ClientConnect.cs b/Robust.Shared/Network/NetManager.ClientConnect.cs index 5babc6b78..101d01591 100644 --- a/Robust.Shared/Network/NetManager.ClientConnect.cs +++ b/Robust.Shared/Network/NetManager.ClientConnect.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Threading.Tasks; using Lidgren.Network; using Newtonsoft.Json; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Network.Messages; using Robust.Shared.Utility; diff --git a/Robust.Shared/Network/NetManager.NetChannel.cs b/Robust.Shared/Network/NetManager.NetChannel.cs index dc31f0fa6..f7dd0cafd 100644 --- a/Robust.Shared/Network/NetManager.NetChannel.cs +++ b/Robust.Shared/Network/NetManager.NetChannel.cs @@ -1,7 +1,6 @@ using System; using System.Net; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; namespace Robust.Shared.Network { diff --git a/Robust.Shared/Network/NetManager.ServerAuth.cs b/Robust.Shared/Network/NetManager.ServerAuth.cs index dac055335..8194ffba5 100644 --- a/Robust.Shared/Network/NetManager.ServerAuth.cs +++ b/Robust.Shared/Network/NetManager.ServerAuth.cs @@ -6,7 +6,6 @@ using System.Security.Cryptography; using System.Threading.Tasks; using Lidgren.Network; using Newtonsoft.Json; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Network.Messages; using Robust.Shared.Utility; diff --git a/Robust.Shared/Network/NetManager.cs b/Robust.Shared/Network/NetManager.cs index 34bbb769a..7d4177507 100644 --- a/Robust.Shared/Network/NetManager.cs +++ b/Robust.Shared/Network/NetManager.cs @@ -11,12 +11,11 @@ using System.Threading; using System.Threading.Tasks; using Lidgren.Network; using Prometheus; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.Shared.Network diff --git a/Robust.Shared/Network/NetMessage.cs b/Robust.Shared/Network/NetMessage.cs index 5638f19c6..fa9bcf93f 100644 --- a/Robust.Shared/Network/NetMessage.cs +++ b/Robust.Shared/Network/NetMessage.cs @@ -1,6 +1,5 @@ using System; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; #nullable disable diff --git a/Robust.Shared/Interfaces/Network/NetMessageAccept.cs b/Robust.Shared/Network/NetMessageAccept.cs similarity index 94% rename from Robust.Shared/Interfaces/Network/NetMessageAccept.cs rename to Robust.Shared/Network/NetMessageAccept.cs index e84004061..d408da4e2 100644 --- a/Robust.Shared/Interfaces/Network/NetMessageAccept.cs +++ b/Robust.Shared/Network/NetMessageAccept.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Shared.Interfaces.Network +namespace Robust.Shared.Network { /// /// Defines on which side of the network a net message can be accepted. diff --git a/Robust.Shared/Network/StringTable.cs b/Robust.Shared/Network/StringTable.cs index e3cc38d0d..9cc554d8a 100644 --- a/Robust.Shared/Network/StringTable.cs +++ b/Robust.Shared/Network/StringTable.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Robust.Shared/Physics/B2DynamicTree.cs b/Robust.Shared/Physics/B2DynamicTree.cs index 3af700369..d1f736c6d 100644 --- a/Robust.Shared/Physics/B2DynamicTree.cs +++ b/Robust.Shared/Physics/B2DynamicTree.cs @@ -1,4 +1,4 @@ -/* +/* * Initially based on Box2D by Erin Catto, license follows; * * Copyright (c) 2009 Erin Catto http://www.box2d.org @@ -160,7 +160,7 @@ namespace Robust.Shared.Physics public B2DynamicTree(float aabbExtendSize = 1f / 32, int capacity = 256, Func? growthFunc = null) : base(aabbExtendSize, growthFunc) { - capacity = Math.Max(DynamicTree.MinimumCapacity, capacity); + capacity = Math.Max(MinimumCapacity, capacity); _root = Proxy.Free; _nodes = new Node[capacity]; diff --git a/Robust.Shared/Physics/CollisionRay.cs b/Robust.Shared/Physics/CollisionRay.cs index 5e54e8ad3..66e87b123 100644 --- a/Robust.Shared/Physics/CollisionRay.cs +++ b/Robust.Shared/Physics/CollisionRay.cs @@ -1,5 +1,3 @@ -using Robust.Shared.Map; -using Robust.Shared.Utility; using System; namespace Robust.Shared.Maths diff --git a/Robust.Shared/Physics/CollisionSolver.cs b/Robust.Shared/Physics/CollisionSolver.cs index 92734967c..e5df3b3c0 100644 --- a/Robust.Shared/Physics/CollisionSolver.cs +++ b/Robust.Shared/Physics/CollisionSolver.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Shared/Physics/DebugDrawingHandle.cs b/Robust.Shared/Physics/DebugDrawingHandle.cs index ebb479657..037192e7e 100644 --- a/Robust.Shared/Physics/DebugDrawingHandle.cs +++ b/Robust.Shared/Physics/DebugDrawingHandle.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Robust.Shared.Maths; +using Robust.Shared.Maths; namespace Robust.Shared.Physics { diff --git a/Robust.Shared/Physics/DebugRayData.cs b/Robust.Shared/Physics/DebugRayData.cs new file mode 100644 index 000000000..3f0c30fda --- /dev/null +++ b/Robust.Shared/Physics/DebugRayData.cs @@ -0,0 +1,23 @@ +using JetBrains.Annotations; +using Robust.Shared.Maths; + +namespace Robust.Shared.Physics +{ + public struct DebugRayData + { + public DebugRayData(Ray ray, float maxLength, [CanBeNull] RayCastResults? results) + { + Ray = ray; + MaxLength = maxLength; + Results = results; + } + + public Ray Ray + { + get; + } + + public RayCastResults? Results { get; } + public float MaxLength { get; } + } +} \ No newline at end of file diff --git a/Robust.Shared/Physics/DynamicTree.Proxy.cs b/Robust.Shared/Physics/DynamicTree.Proxy.cs index 99a75aea7..c5a63e7cd 100644 --- a/Robust.Shared/Physics/DynamicTree.Proxy.cs +++ b/Robust.Shared/Physics/DynamicTree.Proxy.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.Runtime.CompilerServices; namespace Robust.Shared.Physics diff --git a/Robust.Shared/Physics/IPhysBody.cs b/Robust.Shared/Physics/IPhysBody.cs index a852df72a..dd56d9fb7 100644 --- a/Robust.Shared/Physics/IPhysBody.cs +++ b/Robust.Shared/Physics/IPhysBody.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.Shared/Physics/IPhysShape.cs b/Robust.Shared/Physics/IPhysShape.cs index c53bc45ba..45c5e4100 100644 --- a/Robust.Shared/Physics/IPhysShape.cs +++ b/Robust.Shared/Physics/IPhysShape.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Robust.Shared/Interfaces/Physics/IPhysicsManager.cs b/Robust.Shared/Physics/IPhysicsManager.cs similarity index 80% rename from Robust.Shared/Interfaces/Physics/IPhysicsManager.cs rename to Robust.Shared/Physics/IPhysicsManager.cs index 456babb86..1b426b007 100644 --- a/Robust.Shared/Interfaces/Physics/IPhysicsManager.cs +++ b/Robust.Shared/Physics/IPhysicsManager.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; -using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Physics; -namespace Robust.Shared.Interfaces.Physics +namespace Robust.Shared.Physics { /// /// This service provides access into the physics system. @@ -101,43 +98,4 @@ namespace Robust.Shared.Interfaces.Physics void AddedToMap(IPhysBody body, MapId mapId); int SleepTimeThreshold { get; set; } } - - public struct DebugRayData - { - public DebugRayData(Ray ray, float maxLength, [CanBeNull] RayCastResults? results) - { - Ray = ray; - MaxLength = maxLength; - Results = results; - } - - public Ray Ray - { - get; - } - - public RayCastResults? Results { get; } - public float MaxLength { get; } - } - - public readonly struct Manifold - { - public readonly IPhysicsComponent A; - public readonly IPhysicsComponent B; - - public readonly Vector2 Normal; - public readonly bool Hard; - - public Vector2 RelativeVelocity => B.LinearVelocity - A.LinearVelocity; - - public bool Unresolved => Vector2.Dot(RelativeVelocity, Normal) < 0 && Hard; - - public Manifold(IPhysicsComponent a, IPhysicsComponent b, bool hard) - { - A = a; - B = b; - Normal = PhysicsManager.CalculateNormal(a, b); - Hard = hard; - } - } -} +} \ No newline at end of file diff --git a/Robust.Shared/Physics/Manifold.cs b/Robust.Shared/Physics/Manifold.cs new file mode 100644 index 000000000..d149164bf --- /dev/null +++ b/Robust.Shared/Physics/Manifold.cs @@ -0,0 +1,26 @@ +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; + +namespace Robust.Shared.Physics +{ + public readonly struct Manifold + { + public readonly IPhysicsComponent A; + public readonly IPhysicsComponent B; + + public readonly Vector2 Normal; + public readonly bool Hard; + + public Vector2 RelativeVelocity => B.LinearVelocity - A.LinearVelocity; + + public bool Unresolved => Vector2.Dot(RelativeVelocity, Normal) < 0 && Hard; + + public Manifold(IPhysicsComponent a, IPhysicsComponent b, bool hard) + { + A = a; + B = b; + Normal = PhysicsManager.CalculateNormal(a, b); + Hard = hard; + } + } +} diff --git a/Robust.Shared/Physics/PhysShapeAabb.cs b/Robust.Shared/Physics/PhysShapeAabb.cs index 80cb1a76e..ba8cbcd0f 100644 --- a/Robust.Shared/Physics/PhysShapeAabb.cs +++ b/Robust.Shared/Physics/PhysShapeAabb.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/Physics/PhysShapeCircle.cs b/Robust.Shared/Physics/PhysShapeCircle.cs index 0af57d3ac..1a845fff7 100644 --- a/Robust.Shared/Physics/PhysShapeCircle.cs +++ b/Robust.Shared/Physics/PhysShapeCircle.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/Physics/PhysShapeRect.cs b/Robust.Shared/Physics/PhysShapeRect.cs index a90ec3ec2..c8c7c9222 100644 --- a/Robust.Shared/Physics/PhysShapeRect.cs +++ b/Robust.Shared/Physics/PhysShapeRect.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/Physics/PhysicsManager.cs b/Robust.Shared/Physics/PhysicsManager.cs index 3270f3b3c..a58cbd7a9 100644 --- a/Robust.Shared/Physics/PhysicsManager.cs +++ b/Robust.Shared/Physics/PhysicsManager.cs @@ -2,10 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Physics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; diff --git a/Robust.Shared/Physics/Ray.cs b/Robust.Shared/Physics/Ray.cs index 64f497624..9f492edde 100644 --- a/Robust.Shared/Physics/Ray.cs +++ b/Robust.Shared/Physics/Ray.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Map; -using Robust.Shared.Utility; +using Robust.Shared.Utility; using System; namespace Robust.Shared.Maths diff --git a/Robust.Shared/Physics/RayCastResults.cs b/Robust.Shared/Physics/RayCastResults.cs index 6a9da64f3..712fb73b6 100644 --- a/Robust.Shared/Physics/RayCastResults.cs +++ b/Robust.Shared/Physics/RayCastResults.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Robust.Shared.Physics diff --git a/Robust.Shared/Physics/VirtualController.cs b/Robust.Shared/Physics/VirtualController.cs index 6c7e9ce19..91c08d1b6 100644 --- a/Robust.Shared/Physics/VirtualController.cs +++ b/Robust.Shared/Physics/VirtualController.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/Players/IBaseSession.cs b/Robust.Shared/Players/IBaseSession.cs index 796351ae1..ed29e076a 100644 --- a/Robust.Shared/Players/IBaseSession.cs +++ b/Robust.Shared/Players/IBaseSession.cs @@ -1,5 +1,4 @@ -using System; -using Robust.Shared.Network; +using Robust.Shared.Network; namespace Robust.Shared.Players { diff --git a/Robust.Shared/Players/ICommonSession.cs b/Robust.Shared/Players/ICommonSession.cs index db6e374c0..8798b68b9 100644 --- a/Robust.Shared/Players/ICommonSession.cs +++ b/Robust.Shared/Players/ICommonSession.cs @@ -1,5 +1,5 @@ using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Shared.Players { diff --git a/Robust.Shared/ProgramShared.cs b/Robust.Shared/ProgramShared.cs index 980f24b9e..c062754c0 100644 --- a/Robust.Shared/ProgramShared.cs +++ b/Robust.Shared/ProgramShared.cs @@ -1,6 +1,5 @@ using System.IO; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Utility; namespace Robust.Shared diff --git a/Robust.Shared/Prototypes/EntityPrototype.cs b/Robust.Shared/Prototypes/EntityPrototype.cs index a94129018..d92819bdf 100644 --- a/Robust.Shared/Prototypes/EntityPrototype.cs +++ b/Robust.Shared/Prototypes/EntityPrototype.cs @@ -1,19 +1,18 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Utility; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using YamlDotNet.RepresentationModel; using Robust.Shared.Serialization; +using Robust.Shared.Utility; using Robust.Shared.ViewVariables; +using YamlDotNet.RepresentationModel; -namespace Robust.Shared.GameObjects +namespace Robust.Shared.Prototypes { /// /// Prototype that represents game entities. diff --git a/Robust.Shared/Prototypes/IPrototype.cs b/Robust.Shared/Prototypes/IPrototype.cs index c11e00c20..f6d138f60 100644 --- a/Robust.Shared/Prototypes/IPrototype.cs +++ b/Robust.Shared/Prototypes/IPrototype.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Localization; -using YamlDotNet.RepresentationModel; +using YamlDotNet.RepresentationModel; namespace Robust.Shared.Prototypes { diff --git a/Robust.Shared/Prototypes/PrototypeManager.cs b/Robust.Shared/Prototypes/PrototypeManager.cs index a47ca9d13..f6eed1e46 100644 --- a/Robust.Shared/Prototypes/PrototypeManager.cs +++ b/Robust.Shared/Prototypes/PrototypeManager.cs @@ -5,13 +5,11 @@ using System.IO; using System.Linq; using System.Runtime.Serialization; using JetBrains.Annotations; -using Robust.Shared.Asynchronous; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.IoC.Exceptions; using Robust.Shared.Log; -using Robust.Shared.Serialization; +using Robust.Shared.Reflection; using Robust.Shared.Utility; using YamlDotNet.Core; using YamlDotNet.RepresentationModel; diff --git a/Robust.Shared/Interfaces/Random/IRobustRandom.cs b/Robust.Shared/Random/IRobustRandom.cs similarity index 92% rename from Robust.Shared/Interfaces/Random/IRobustRandom.cs rename to Robust.Shared/Random/IRobustRandom.cs index b4edd76dc..dbb242b45 100644 --- a/Robust.Shared/Interfaces/Random/IRobustRandom.cs +++ b/Robust.Shared/Random/IRobustRandom.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Robust.Shared.Interfaces.Random +namespace Robust.Shared.Random { public interface IRobustRandom { diff --git a/Robust.Shared/Random/RandomExtensions.cs b/Robust.Shared/Random/RandomExtensions.cs index cd952b74d..95eb3bc7f 100644 --- a/Robust.Shared/Random/RandomExtensions.cs +++ b/Robust.Shared/Random/RandomExtensions.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Random; using Robust.Shared.Utility; namespace Robust.Shared.Random diff --git a/Robust.Shared/Random/RobustRandom.cs b/Robust.Shared/Random/RobustRandom.cs index 239440031..0f75b4e18 100644 --- a/Robust.Shared/Random/RobustRandom.cs +++ b/Robust.Shared/Random/RobustRandom.cs @@ -1,5 +1,3 @@ -using Robust.Shared.Interfaces.Random; - namespace Robust.Shared.Random { public class RobustRandom : IRobustRandom diff --git a/Robust.Shared/Interfaces/Reflection/IReflectionManager.cs b/Robust.Shared/Reflection/IReflectionManager.cs similarity index 92% rename from Robust.Shared/Interfaces/Reflection/IReflectionManager.cs rename to Robust.Shared/Reflection/IReflectionManager.cs index 3c8da0fc4..8132fbb06 100644 --- a/Robust.Shared/Interfaces/Reflection/IReflectionManager.cs +++ b/Robust.Shared/Reflection/IReflectionManager.cs @@ -1,11 +1,9 @@ -using Robust.Shared.IoC; -using Robust.Shared.Reflection; +using System; using System.Collections.Generic; -using System.Reflection; -using System; using System.Diagnostics.CodeAnalysis; +using System.Reflection; -namespace Robust.Shared.Interfaces.Reflection +namespace Robust.Shared.Reflection { /// /// Manages common reflection operations, such as iterating over all subtypes of something. @@ -107,13 +105,4 @@ namespace Robust.Shared.Interfaces.Reflection Type? YamlTypeTagLookup(Type baseType, string typeName); } - - public class ReflectionUpdateEventArgs : EventArgs - { - public readonly IReflectionManager ReflectionManager; - public ReflectionUpdateEventArgs(IReflectionManager reflectionManager) - { - ReflectionManager = reflectionManager; - } - } -} +} \ No newline at end of file diff --git a/Robust.Shared/Reflection/ReflectAttribute.cs b/Robust.Shared/Reflection/ReflectAttribute.cs index 08bc8a2e3..ae6f7ae2a 100644 --- a/Robust.Shared/Reflection/ReflectAttribute.cs +++ b/Robust.Shared/Reflection/ReflectAttribute.cs @@ -1,9 +1,4 @@ -using Robust.Shared.Interfaces.Reflection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; namespace Robust.Shared.Reflection { diff --git a/Robust.Shared/Reflection/ReflectionManager.cs b/Robust.Shared/Reflection/ReflectionManager.cs index d70bf391e..fb0d5d018 100644 --- a/Robust.Shared/Reflection/ReflectionManager.cs +++ b/Robust.Shared/Reflection/ReflectionManager.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.Log; using Robust.Shared.ViewVariables; diff --git a/Robust.Shared/Reflection/ReflectionUpdateEventArgs.cs b/Robust.Shared/Reflection/ReflectionUpdateEventArgs.cs new file mode 100644 index 000000000..d3b5e6dac --- /dev/null +++ b/Robust.Shared/Reflection/ReflectionUpdateEventArgs.cs @@ -0,0 +1,13 @@ +using System; + +namespace Robust.Shared.Reflection +{ + public class ReflectionUpdateEventArgs : EventArgs + { + public readonly IReflectionManager ReflectionManager; + public ReflectionUpdateEventArgs(IReflectionManager reflectionManager) + { + ReflectionManager = reflectionManager; + } + } +} diff --git a/Robust.Shared/Robust.Shared.csproj.DotSettings b/Robust.Shared/Robust.Shared.csproj.DotSettings index bbc14244b..fd0ad2dda 100644 --- a/Robust.Shared/Robust.Shared.csproj.DotSettings +++ b/Robust.Shared/Robust.Shared.csproj.DotSettings @@ -1,3 +1,17 @@  + True + True + True + True True - True \ No newline at end of file + True + True + True + True + True + True + True + True + True + True + True \ No newline at end of file diff --git a/Robust.Shared/Serialization/CustomFormatManager.cs b/Robust.Shared/Serialization/CustomFormatManager.cs index bb0870db7..3ca9ba5be 100644 --- a/Robust.Shared/Serialization/CustomFormatManager.cs +++ b/Robust.Shared/Serialization/CustomFormatManager.cs @@ -1,12 +1,11 @@ -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; +using Robust.Shared.IoC; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; using System.Reflection; +using Robust.Shared.Reflection; namespace Robust.Shared.Serialization { diff --git a/Robust.Shared/Serialization/DefaultValueSerializer.cs b/Robust.Shared/Serialization/DefaultValueSerializer.cs index 4b72a109e..ec862489f 100644 --- a/Robust.Shared/Serialization/DefaultValueSerializer.cs +++ b/Robust.Shared/Serialization/DefaultValueSerializer.cs @@ -1,8 +1,5 @@ -using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; -using Robust.Shared.Interfaces.Serialization; namespace Robust.Shared.Serialization { diff --git a/Robust.Shared/Serialization/ICustomFormatManager.cs b/Robust.Shared/Serialization/ICustomFormatManager.cs new file mode 100644 index 000000000..600b79348 --- /dev/null +++ b/Robust.Shared/Serialization/ICustomFormatManager.cs @@ -0,0 +1,32 @@ +namespace Robust.Shared.Serialization +{ + /// + /// Provides information about custom serialization formats used by certain fields. + /// + public interface ICustomFormatManager + { + /// + /// Get a custom int format in terms of enum flags, chosen by a tag type. + /// + /// + /// The tag type to select the representation with. To understand more about how + /// tag types are used, see the . + /// + /// + /// A custom serialization format for int values, chosen by the tag type. + /// + public WithFormat FlagFormat(); + + /// + /// Get a custom int format in terms of enum constants, chosen by a tag type. + /// + /// + /// The tag type to select the representation with. To understand more about how + /// tag types are used, see the . + /// + /// + /// A custom serialization format for int values, chosen by the tag type. + /// + public WithFormat ConstantFormat(); + } +} \ No newline at end of file diff --git a/Robust.Shared/Interfaces/Serialization/IExposeData.cs b/Robust.Shared/Serialization/IExposeData.cs similarity index 92% rename from Robust.Shared/Interfaces/Serialization/IExposeData.cs rename to Robust.Shared/Serialization/IExposeData.cs index 8d14b0d36..445164b95 100644 --- a/Robust.Shared/Interfaces/Serialization/IExposeData.cs +++ b/Robust.Shared/Serialization/IExposeData.cs @@ -1,7 +1,6 @@ using Robust.Shared.Analyzers; -using Robust.Shared.Serialization; -namespace Robust.Shared.Interfaces.Serialization +namespace Robust.Shared.Serialization { /// /// Interface for the "expose data" system, which is basically our method of handling data serialization. diff --git a/Robust.Shared/Interfaces/Serialization/IRobustMappedStringSerializer.cs b/Robust.Shared/Serialization/IRobustMappedStringSerializer.cs similarity index 98% rename from Robust.Shared/Interfaces/Serialization/IRobustMappedStringSerializer.cs rename to Robust.Shared/Serialization/IRobustMappedStringSerializer.cs index eaf1f862f..c11c6b72f 100644 --- a/Robust.Shared/Interfaces/Serialization/IRobustMappedStringSerializer.cs +++ b/Robust.Shared/Serialization/IRobustMappedStringSerializer.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using JetBrains.Annotations; using NetSerializer; using Newtonsoft.Json.Linq; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; using YamlDotNet.RepresentationModel; diff --git a/Robust.Shared/Interfaces/Serialization/IRobustSerializer.cs b/Robust.Shared/Serialization/IRobustSerializer.cs similarity index 94% rename from Robust.Shared/Interfaces/Serialization/IRobustSerializer.cs rename to Robust.Shared/Serialization/IRobustSerializer.cs index e8be9e894..4ec0e77c6 100644 --- a/Robust.Shared/Interfaces/Serialization/IRobustSerializer.cs +++ b/Robust.Shared/Serialization/IRobustSerializer.cs @@ -1,9 +1,9 @@ using System; using System.IO; using System.Threading.Tasks; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; -namespace Robust.Shared.Interfaces.Serialization +namespace Robust.Shared.Serialization { public interface IRobustSerializer { diff --git a/Robust.Shared/Interfaces/Serialization/ISelfSerialize.cs b/Robust.Shared/Serialization/ISelfSerialize.cs similarity index 69% rename from Robust.Shared/Interfaces/Serialization/ISelfSerialize.cs rename to Robust.Shared/Serialization/ISelfSerialize.cs index ca658fc51..b7c74bb14 100644 --- a/Robust.Shared/Interfaces/Serialization/ISelfSerialize.cs +++ b/Robust.Shared/Serialization/ISelfSerialize.cs @@ -1,4 +1,4 @@ -namespace Robust.Shared.Interfaces.Serialization +namespace Robust.Shared.Serialization { public interface ISelfSerialize { diff --git a/Robust.Shared/Serialization/ObjectSerializer.cs b/Robust.Shared/Serialization/ObjectSerializer.cs index 7a07319ab..803ec965d 100644 --- a/Robust.Shared/Serialization/ObjectSerializer.cs +++ b/Robust.Shared/Serialization/ObjectSerializer.cs @@ -4,9 +4,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; using System.Reflection; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; +using Robust.Shared.Reflection; namespace Robust.Shared.Serialization { diff --git a/Robust.Shared/Serialization/RobustMappedStringSerializer.MappedStringDict.cs b/Robust.Shared/Serialization/RobustMappedStringSerializer.MappedStringDict.cs index f4b1d1c05..6bb59e5ba 100644 --- a/Robust.Shared/Serialization/RobustMappedStringSerializer.MappedStringDict.cs +++ b/Robust.Shared/Serialization/RobustMappedStringSerializer.MappedStringDict.cs @@ -12,7 +12,7 @@ using System.Security.Cryptography; using System.Text; using NetSerializer; using Newtonsoft.Json.Linq; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Log; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Robust.Shared/Serialization/RobustMappedStringSerializer.cs b/Robust.Shared/Serialization/RobustMappedStringSerializer.cs index cf90ed729..440d1e2b5 100644 --- a/Robust.Shared/Serialization/RobustMappedStringSerializer.cs +++ b/Robust.Shared/Serialization/RobustMappedStringSerializer.cs @@ -10,8 +10,6 @@ using System.Threading.Tasks; using NetSerializer; using Newtonsoft.Json.Linq; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Network; diff --git a/Robust.Shared/Serialization/RobustSerializer.Handshake.cs b/Robust.Shared/Serialization/RobustSerializer.Handshake.cs index 7aeb0ef82..951c236e6 100644 --- a/Robust.Shared/Serialization/RobustSerializer.Handshake.cs +++ b/Robust.Shared/Serialization/RobustSerializer.Handshake.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; namespace Robust.Shared.Serialization { diff --git a/Robust.Shared/Serialization/RobustSerializer.cs b/Robust.Shared/Serialization/RobustSerializer.cs index 96bda405a..96de468bc 100644 --- a/Robust.Shared/Serialization/RobustSerializer.cs +++ b/Robust.Shared/Serialization/RobustSerializer.cs @@ -1,15 +1,12 @@ using NetSerializer; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using System; using System.Collections.Generic; using System.IO; using System.Linq; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.Utility; namespace Robust.Shared.Serialization diff --git a/Robust.Shared/Interfaces/Serialization/ICustomFormatManager.cs b/Robust.Shared/Serialization/WithFormat.cs similarity index 54% rename from Robust.Shared/Interfaces/Serialization/ICustomFormatManager.cs rename to Robust.Shared/Serialization/WithFormat.cs index 2ae7d7357..a964a6534 100644 --- a/Robust.Shared/Interfaces/Serialization/ICustomFormatManager.cs +++ b/Robust.Shared/Serialization/WithFormat.cs @@ -1,42 +1,8 @@ -using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; +using System; using System.Diagnostics.CodeAnalysis; -using System.Text; -namespace Robust.Shared.Interfaces.Serialization +namespace Robust.Shared.Serialization { - /// - /// Provides information about custom serialization formats used by certain fields. - /// - public interface ICustomFormatManager - { - /// - /// Get a custom int format in terms of enum flags, chosen by a tag type. - /// - /// - /// The tag type to select the representation with. To understand more about how - /// tag types are used, see the . - /// - /// - /// A custom serialization format for int values, chosen by the tag type. - /// - public WithFormat FlagFormat(); - - /// - /// Get a custom int format in terms of enum constants, chosen by a tag type. - /// - /// - /// The tag type to select the representation with. To understand more about how - /// tag types are used, see the . - /// - /// - /// A custom serialization format for int values, chosen by the tag type. - /// - public WithFormat ConstantFormat(); - } - - /// /// Interface for controlling custom value representation in an abstract storage medium. /// diff --git a/Robust.Shared/Serialization/YamlCustomFormatSerializer.cs b/Robust.Shared/Serialization/YamlCustomFormatSerializer.cs index de0058151..c9d0d4b88 100644 --- a/Robust.Shared/Serialization/YamlCustomFormatSerializer.cs +++ b/Robust.Shared/Serialization/YamlCustomFormatSerializer.cs @@ -1,10 +1,5 @@ -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; +using Robust.Shared.IoC; using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using YamlDotNet.Core; using YamlDotNet.RepresentationModel; namespace Robust.Shared.Serialization diff --git a/Robust.Shared/Serialization/YamlFlagSerializer.cs b/Robust.Shared/Serialization/YamlFlagSerializer.cs index 3f34062ef..ffebc8cb2 100644 --- a/Robust.Shared/Serialization/YamlFlagSerializer.cs +++ b/Robust.Shared/Serialization/YamlFlagSerializer.cs @@ -1,13 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; -using YamlDotNet.Core; using YamlDotNet.RepresentationModel; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; - namespace Robust.Shared.Serialization { /// diff --git a/Robust.Shared/Serialization/YamlObjectSerializer.cs b/Robust.Shared/Serialization/YamlObjectSerializer.cs index 72e7b467f..e9e2334d1 100644 --- a/Robust.Shared/Serialization/YamlObjectSerializer.cs +++ b/Robust.Shared/Serialization/YamlObjectSerializer.cs @@ -5,12 +5,11 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Reflection; using Robust.Shared.Utility; using YamlDotNet.Core; using YamlDotNet.RepresentationModel; diff --git a/Robust.Shared/SharedIoC.cs b/Robust.Shared/SharedIoC.cs index 20c3a46aa..f97acf405 100644 --- a/Robust.Shared/SharedIoC.cs +++ b/Robust.Shared/SharedIoC.cs @@ -3,18 +3,6 @@ using Robust.Shared.Configuration; using Robust.Shared.ContentPack; using Robust.Shared.Exceptions; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Interfaces.Timers; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Localization.Macros; diff --git a/Robust.Shared/Interfaces/Timers/ITimerManager.cs b/Robust.Shared/Timers/ITimerManager.cs similarity index 74% rename from Robust.Shared/Interfaces/Timers/ITimerManager.cs rename to Robust.Shared/Timers/ITimerManager.cs index a98d50aba..a32b846a0 100644 --- a/Robust.Shared/Interfaces/Timers/ITimerManager.cs +++ b/Robust.Shared/Timers/ITimerManager.cs @@ -1,8 +1,7 @@ using System.Threading; using Robust.Shared.Timing; -using Timer = Robust.Shared.Timers.Timer; -namespace Robust.Shared.Interfaces.Timers +namespace Robust.Shared.Timers { public interface ITimerManager { diff --git a/Robust.Shared/Timers/Timer.cs b/Robust.Shared/Timers/Timer.cs index 3884dc92e..bc77db3ae 100644 --- a/Robust.Shared/Timers/Timer.cs +++ b/Robust.Shared/Timers/Timer.cs @@ -2,7 +2,6 @@ using System.Threading; using System.Threading.Tasks; using Robust.Shared.Exceptions; -using Robust.Shared.Interfaces.Timers; using Robust.Shared.IoC; namespace Robust.Shared.Timers diff --git a/Robust.Shared/Timers/TimerManager.cs b/Robust.Shared/Timers/TimerManager.cs index 596cb8915..1d304b5ab 100644 --- a/Robust.Shared/Timers/TimerManager.cs +++ b/Robust.Shared/Timers/TimerManager.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.Timers; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading; using Robust.Shared.Exceptions; using Robust.Shared.IoC; diff --git a/Robust.Shared/Timing/GameLoop.cs b/Robust.Shared/Timing/GameLoop.cs index 53cf77320..a2844b6d2 100644 --- a/Robust.Shared/Timing/GameLoop.cs +++ b/Robust.Shared/Timing/GameLoop.cs @@ -1,6 +1,5 @@ using System; using System.Threading; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Log; using Robust.Shared.Exceptions; using Robust.Shared.IoC; diff --git a/Robust.Shared/Timing/GameTiming.cs b/Robust.Shared/Timing/GameTiming.cs index dcbe38a83..b41ee6418 100644 --- a/Robust.Shared/Timing/GameTiming.cs +++ b/Robust.Shared/Timing/GameTiming.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Utility; namespace Robust.Shared.Timing diff --git a/Robust.Shared/Interfaces/Timing/IGameTiming.cs b/Robust.Shared/Timing/IGameTiming.cs similarity index 98% rename from Robust.Shared/Interfaces/Timing/IGameTiming.cs rename to Robust.Shared/Timing/IGameTiming.cs index 813af2219..9b3246989 100644 --- a/Robust.Shared/Interfaces/Timing/IGameTiming.cs +++ b/Robust.Shared/Timing/IGameTiming.cs @@ -1,9 +1,8 @@ using System; using JetBrains.Annotations; using Robust.Shared.IoC; -using Robust.Shared.Timing; -namespace Robust.Shared.Interfaces.Timing +namespace Robust.Shared.Timing { /// /// This holds main loop timing information and helper functions. diff --git a/Robust.Shared/Interfaces/Timing/PredictionGuard.cs b/Robust.Shared/Timing/PredictionGuard.cs similarity index 89% rename from Robust.Shared/Interfaces/Timing/PredictionGuard.cs rename to Robust.Shared/Timing/PredictionGuard.cs index 71c1137a7..5d10fecda 100644 --- a/Robust.Shared/Interfaces/Timing/PredictionGuard.cs +++ b/Robust.Shared/Timing/PredictionGuard.cs @@ -1,6 +1,6 @@ using System; -namespace Robust.Shared.Interfaces.Timing +namespace Robust.Shared.Timing { public readonly struct PredictionGuard : IDisposable { diff --git a/Robust.Shared/Utility/DebugTools.cs b/Robust.Shared/Utility/DebugTools.cs index 5dbfe5475..d6ffe7dd0 100644 --- a/Robust.Shared/Utility/DebugTools.cs +++ b/Robust.Shared/Utility/DebugTools.cs @@ -1,6 +1,5 @@ using System; using System.Diagnostics; -using System.Diagnostics.Contracts; using JetBrains.Annotations; namespace Robust.Shared.Utility diff --git a/Robust.Shared/Utility/FormattedMessage.MarkupParser.cs b/Robust.Shared/Utility/FormattedMessage.MarkupParser.cs index 9c370313f..7cab28776 100644 --- a/Robust.Shared/Utility/FormattedMessage.MarkupParser.cs +++ b/Robust.Shared/Utility/FormattedMessage.MarkupParser.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using Pidgin; using Robust.Shared.Maths; diff --git a/Robust.Shared/Interfaces/Utility/Internal/IUniqueIndex.cs b/Robust.Shared/Utility/IUniqueIndex.cs similarity index 99% rename from Robust.Shared/Interfaces/Utility/Internal/IUniqueIndex.cs rename to Robust.Shared/Utility/IUniqueIndex.cs index c00eba633..94a61152d 100644 --- a/Robust.Shared/Interfaces/Utility/Internal/IUniqueIndex.cs +++ b/Robust.Shared/Utility/IUniqueIndex.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -namespace Robust.Shared.Utility.Internal +namespace Robust.Shared.Utility { /// diff --git a/Robust.Shared/Utility/PrettyPrint.cs b/Robust.Shared/Utility/PrettyPrint.cs index 622fffb3e..77c0e0978 100644 --- a/Robust.Shared/Utility/PrettyPrint.cs +++ b/Robust.Shared/Utility/PrettyPrint.cs @@ -1,6 +1,5 @@ using System; using System.Reflection; -using System.Runtime.CompilerServices; namespace Robust.Shared.Utility { diff --git a/Robust.Shared/Utility/TypeAbbreviation.cs b/Robust.Shared/Utility/TypeAbbreviation.cs index e0376b204..6be644020 100644 --- a/Robust.Shared/Utility/TypeAbbreviation.cs +++ b/Robust.Shared/Utility/TypeAbbreviation.cs @@ -1,9 +1,6 @@ using System; using System.IO; using System.Text; -using Robust.Shared.IoC; -using Robust.Shared.IoC.Exceptions; -using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; namespace Robust.Shared.Utility diff --git a/Robust.Shared/Utility/UniqueIndex.cs b/Robust.Shared/Utility/UniqueIndex.cs index 6e1fcbbe6..bcbbb4e03 100644 --- a/Robust.Shared/Utility/UniqueIndex.cs +++ b/Robust.Shared/Utility/UniqueIndex.cs @@ -6,7 +6,6 @@ using System.Collections.Immutable; using System.Linq; using System.Runtime.CompilerServices; using JetBrains.Annotations; -using Robust.Shared.Utility.Internal; namespace Robust.Shared.Utility { diff --git a/Robust.Shared/Utility/UniqueIndexHkm.cs b/Robust.Shared/Utility/UniqueIndexHkm.cs index f1b273f86..7f6567f6f 100644 --- a/Robust.Shared/Utility/UniqueIndexHkm.cs +++ b/Robust.Shared/Utility/UniqueIndexHkm.cs @@ -6,7 +6,6 @@ using System.Collections.Immutable; using System.Linq; using System.Runtime.CompilerServices; using JetBrains.Annotations; -using Robust.Shared.Utility.Internal; namespace Robust.Shared.Utility { diff --git a/Robust.Shared/ViewVariables/ViewVariablesBlob.cs b/Robust.Shared/ViewVariables/ViewVariablesBlob.cs index 89bb6921e..5bc240b8d 100644 --- a/Robust.Shared/ViewVariables/ViewVariablesBlob.cs +++ b/Robust.Shared/ViewVariables/ViewVariablesBlob.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; #nullable disable diff --git a/Robust.Shared/ViewVariables/ViewVariablesManagerShared.cs b/Robust.Shared/ViewVariables/ViewVariablesManagerShared.cs index 492f4106f..8f8b1d2a7 100644 --- a/Robust.Shared/ViewVariables/ViewVariablesManagerShared.cs +++ b/Robust.Shared/ViewVariables/ViewVariablesManagerShared.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Robust.Shared.ViewVariables { diff --git a/Robust.UnitTesting/Client/GameObjects/Components/Transform_Test.cs b/Robust.UnitTesting/Client/GameObjects/Components/Transform_Test.cs index 9682ab648..37c72be2d 100644 --- a/Robust.UnitTesting/Client/GameObjects/Components/Transform_Test.cs +++ b/Robust.UnitTesting/Client/GameObjects/Components/Transform_Test.cs @@ -1,11 +1,8 @@ using System.IO; using Moq; using NUnit.Framework; -using Robust.Client.Interfaces.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.UnitTesting/Client/GameStates/GameStateProcessor_Tests.cs b/Robust.UnitTesting/Client/GameStates/GameStateProcessor_Tests.cs index 8d325e3d1..5f80327cd 100644 --- a/Robust.UnitTesting/Client/GameStates/GameStateProcessor_Tests.cs +++ b/Robust.UnitTesting/Client/GameStates/GameStateProcessor_Tests.cs @@ -2,7 +2,6 @@ using NUnit.Framework; using Robust.Client.GameStates; using Robust.Shared.GameStates; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Timing; namespace Robust.UnitTesting.Client.GameStates diff --git a/Robust.UnitTesting/Client/Graphics/EyeTest.cs b/Robust.UnitTesting/Client/Graphics/EyeTest.cs index 16f395a19..329821515 100644 --- a/Robust.UnitTesting/Client/Graphics/EyeTest.cs +++ b/Robust.UnitTesting/Client/Graphics/EyeTest.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using Robust.Client.Graphics.ClientEye; +using Robust.Client.Graphics; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.UnitTesting/Client/Graphics/StyleBoxTest.cs b/Robust.UnitTesting/Client/Graphics/StyleBoxTest.cs index 55ab51254..0d2c31c58 100644 --- a/Robust.UnitTesting/Client/Graphics/StyleBoxTest.cs +++ b/Robust.UnitTesting/Client/Graphics/StyleBoxTest.cs @@ -1,7 +1,6 @@ using NUnit.Framework; +using Robust.Client.Graphics; using Robust.Shared.Maths; -using Robust.Client.Graphics.Drawing; - namespace Robust.UnitTesting.Client.Graphics { diff --git a/Robust.UnitTesting/Client/UserInterface/ControlTest.cs b/Robust.UnitTesting/Client/UserInterface/ControlTest.cs index 448a3749c..acdab9d04 100644 --- a/Robust.UnitTesting/Client/UserInterface/ControlTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/ControlTest.cs @@ -1,8 +1,6 @@ using System; -using Content.Client.Animations; using NUnit.Framework; using Robust.Client.Animations; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface; using Robust.Shared.Animations; using Robust.Shared.IoC; diff --git a/Robust.UnitTesting/Client/UserInterface/Controls/CenterContainerTest.cs b/Robust.UnitTesting/Client/UserInterface/Controls/CenterContainerTest.cs index f3fb740e3..6730d512a 100644 --- a/Robust.UnitTesting/Client/UserInterface/Controls/CenterContainerTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/Controls/CenterContainerTest.cs @@ -1,11 +1,6 @@ using NUnit.Framework; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Client.Utility; -using Robust.Shared.Interfaces.Resources; -using Robust.Shared.IoC; -using Robust.Shared.Utility; using Robust.Shared.Maths; namespace Robust.UnitTesting.Client.UserInterface.Controls diff --git a/Robust.UnitTesting/Client/UserInterface/Controls/GridContainerTest.cs b/Robust.UnitTesting/Client/UserInterface/Controls/GridContainerTest.cs index c328499af..8d82dbdad 100644 --- a/Robust.UnitTesting/Client/UserInterface/Controls/GridContainerTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/Controls/GridContainerTest.cs @@ -1,11 +1,6 @@ using NUnit.Framework; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Client.Utility; -using Robust.Shared.Interfaces.Resources; -using Robust.Shared.IoC; -using Robust.Shared.Utility; using Robust.Shared.Maths; namespace Robust.UnitTesting.Client.UserInterface.Controls diff --git a/Robust.UnitTesting/Client/UserInterface/Controls/MultiselectOptionButtonTest.cs b/Robust.UnitTesting/Client/UserInterface/Controls/MultiselectOptionButtonTest.cs index b78b6697d..3b7f16407 100644 --- a/Robust.UnitTesting/Client/UserInterface/Controls/MultiselectOptionButtonTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/Controls/MultiselectOptionButtonTest.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.IoC; diff --git a/Robust.UnitTesting/Client/UserInterface/Controls/RadioOptionsTest.cs b/Robust.UnitTesting/Client/UserInterface/Controls/RadioOptionsTest.cs index ba09e48b3..5d4e89fdf 100644 --- a/Robust.UnitTesting/Client/UserInterface/Controls/RadioOptionsTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/Controls/RadioOptionsTest.cs @@ -1,7 +1,5 @@ using NUnit.Framework; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Maths; namespace Robust.UnitTesting.Client.UserInterface.Controls { diff --git a/Robust.UnitTesting/Client/UserInterface/StylesheetTest.cs b/Robust.UnitTesting/Client/UserInterface/StylesheetTest.cs index 01225a1cc..cb03df5bd 100644 --- a/Robust.UnitTesting/Client/UserInterface/StylesheetTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/StylesheetTest.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface; using Robust.Shared.IoC; using Robust.Client.UserInterface.Controls; diff --git a/Robust.UnitTesting/Client/UserInterface/UserInterfaceManagerTest.cs b/Robust.UnitTesting/Client/UserInterface/UserInterfaceManagerTest.cs index 07473bed7..0804775fa 100644 --- a/Robust.UnitTesting/Client/UserInterface/UserInterfaceManagerTest.cs +++ b/Robust.UnitTesting/Client/UserInterface/UserInterfaceManagerTest.cs @@ -1,7 +1,5 @@ using System.Diagnostics.CodeAnalysis; using NUnit.Framework; -using Robust.Client.Input; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; diff --git a/Robust.UnitTesting/GameControllerDummy.cs b/Robust.UnitTesting/GameControllerDummy.cs index 42c45ea47..aee1aec75 100644 --- a/Robust.UnitTesting/GameControllerDummy.cs +++ b/Robust.UnitTesting/GameControllerDummy.cs @@ -1,8 +1,7 @@ -using System; +using System; using Robust.Client; using Robust.Client.Input; -using Robust.Client.Interfaces; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Log; using Robust.Shared.Timing; namespace Robust.UnitTesting @@ -54,7 +53,7 @@ namespace Robust.UnitTesting public void OverrideMainLoop(IGameLoop gameLoop) { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } } diff --git a/Robust.UnitTesting/Helpers.cs b/Robust.UnitTesting/Helpers.cs index 0b6cf16c6..70a154bf0 100644 --- a/Robust.UnitTesting/Helpers.cs +++ b/Robust.UnitTesting/Helpers.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Text; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.Utility; namespace Robust.UnitTesting diff --git a/Robust.UnitTesting/LogCatcher.cs b/Robust.UnitTesting/LogCatcher.cs index 44ddd0630..b34a329f1 100644 --- a/Robust.UnitTesting/LogCatcher.cs +++ b/Robust.UnitTesting/LogCatcher.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Log; using Serilog.Events; namespace Robust.UnitTesting diff --git a/Robust.UnitTesting/RobustIntegrationTest.NetManager.cs b/Robust.UnitTesting/RobustIntegrationTest.NetManager.cs index e0df545ee..f626574f7 100644 --- a/Robust.UnitTesting/RobustIntegrationTest.NetManager.cs +++ b/Robust.UnitTesting/RobustIntegrationTest.NetManager.cs @@ -4,10 +4,9 @@ using System.Linq; using System.Net; using System.Threading.Channels; using System.Threading.Tasks; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Robust.UnitTesting diff --git a/Robust.UnitTesting/RobustIntegrationTest.cs b/Robust.UnitTesting/RobustIntegrationTest.cs index f04cdbc38..a9ff47752 100644 --- a/Robust.UnitTesting/RobustIntegrationTest.cs +++ b/Robust.UnitTesting/RobustIntegrationTest.cs @@ -10,18 +10,14 @@ using System.Threading.Tasks; using Moq; using NUnit.Framework; using Robust.Client; -using Robust.Client.Interfaces; using Robust.Server; using Robust.Server.Console; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.ServerStatus; +using Robust.Server.ServerStatus; using Robust.Shared; +using Robust.Shared.Configuration; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Resources; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Timing; using FrameEventArgs = Robust.Shared.Timing.FrameEventArgs; using ServerProgram = Robust.Server.Program; diff --git a/Robust.UnitTesting/RobustUnitTest.cs b/Robust.UnitTesting/RobustUnitTest.cs index 998380f44..f827002fe 100644 --- a/Robust.UnitTesting/RobustUnitTest.cs +++ b/Robust.UnitTesting/RobustUnitTest.cs @@ -1,17 +1,13 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Reflection; using NUnit.Framework; +using Robust.Shared.Configuration; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; -using Robust.Shared.Timing; +using Robust.Shared.Reflection; using Robust.Shared.Utility; namespace Robust.UnitTesting diff --git a/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs b/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs index 168885fa3..74374cdcc 100644 --- a/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs +++ b/Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs @@ -1,13 +1,8 @@ using System.Collections.Generic; using System.IO; using NUnit.Framework; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Containers; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Robust.UnitTesting/Server/GameObjects/Components/Transform_Test.cs b/Robust.UnitTesting/Server/GameObjects/Components/Transform_Test.cs index d9f6b85c8..2d0d015c5 100644 --- a/Robust.UnitTesting/Server/GameObjects/Components/Transform_Test.cs +++ b/Robust.UnitTesting/Server/GameObjects/Components/Transform_Test.cs @@ -1,16 +1,13 @@ using System.IO; using System.Reflection; using NUnit.Framework; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Robust.UnitTesting.Server.GameObjects.Components { diff --git a/Robust.UnitTesting/Server/GameObjects/ServerEntityNetworkManagerTest.cs b/Robust.UnitTesting/Server/GameObjects/ServerEntityNetworkManagerTest.cs index 677e77158..4e4f11656 100644 --- a/Robust.UnitTesting/Server/GameObjects/ServerEntityNetworkManagerTest.cs +++ b/Robust.UnitTesting/Server/GameObjects/ServerEntityNetworkManagerTest.cs @@ -2,7 +2,7 @@ using Moq; using NUnit.Framework; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Network.Messages; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs b/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs index 8e4960830..28cdfc986 100644 --- a/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs +++ b/Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs @@ -2,10 +2,8 @@ using System; using System.IO; using System.Linq; using NUnit.Framework; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs b/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs index 8367080b7..e7060ecf1 100644 --- a/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs +++ b/Robust.UnitTesting/Server/Maps/MapLoaderTest.cs @@ -1,12 +1,10 @@ using System.Linq; -using System.Threading.Tasks; using NUnit.Framework; -using Robust.Server.Interfaces.Maps; +using Robust.Server.Maps; +using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Robust.UnitTesting/Server/ViewVariables/ViewVariablesTraitMembersTest.cs b/Robust.UnitTesting/Server/ViewVariables/ViewVariablesTraitMembersTest.cs index 27d2b3d0e..4ebf885c4 100644 --- a/Robust.UnitTesting/Server/ViewVariables/ViewVariablesTraitMembersTest.cs +++ b/Robust.UnitTesting/Server/ViewVariables/ViewVariablesTraitMembersTest.cs @@ -3,7 +3,7 @@ using Moq; using NUnit.Framework; using Robust.Server.ViewVariables; using Robust.Server.ViewVariables.Traits; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; namespace Robust.UnitTesting.Server.ViewVariables diff --git a/Robust.UnitTesting/Shared/ColorUtils_Test.cs b/Robust.UnitTesting/Shared/ColorUtils_Test.cs index 8d869137c..2dbee231d 100644 --- a/Robust.UnitTesting/Shared/ColorUtils_Test.cs +++ b/Robust.UnitTesting/Shared/ColorUtils_Test.cs @@ -1,5 +1,4 @@ -using System; -using Robust.Shared.Maths; +using Robust.Shared.Maths; using NUnit.Framework; namespace Robust.UnitTesting.Shared diff --git a/Robust.UnitTesting/Shared/ContentPack/ResourceManagerTest.cs b/Robust.UnitTesting/Shared/ContentPack/ResourceManagerTest.cs index 6b6d8e766..d8b8c8e49 100644 --- a/Robust.UnitTesting/Shared/ContentPack/ResourceManagerTest.cs +++ b/Robust.UnitTesting/Shared/ContentPack/ResourceManagerTest.cs @@ -1,7 +1,6 @@ using System.IO; using NUnit.Framework; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Utility; diff --git a/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs index 918e52a59..cea6f2260 100644 --- a/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs +++ b/Robust.UnitTesting/Shared/GameObjects/ComponentDependencies_Tests.cs @@ -1,10 +1,6 @@ -using System; -using System.IO; +using System.IO; using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; // ReSharper disable AccessToStaticMemberViaDerivedType diff --git a/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs index 46716d3e5..441f7a49b 100644 --- a/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs +++ b/Robust.UnitTesting/Shared/GameObjects/ComponentFactory_Tests.cs @@ -1,8 +1,6 @@ using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Reflection; // ReSharper disable AccessToStaticMemberViaDerivedType diff --git a/Robust.UnitTesting/Shared/GameObjects/ComponentManager_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/ComponentManager_Tests.cs index 94b59d758..bc389bb59 100644 --- a/Robust.UnitTesting/Shared/GameObjects/ComponentManager_Tests.cs +++ b/Robust.UnitTesting/Shared/GameObjects/ComponentManager_Tests.cs @@ -5,9 +5,6 @@ using Moq; using NUnit.Framework; using Robust.Shared.Exceptions; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; namespace Robust.UnitTesting.Shared.GameObjects diff --git a/Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs index 7e2fa5195..3ff82068e 100644 --- a/Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs +++ b/Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs @@ -5,17 +5,11 @@ using Robust.Server.Reflection; using Robust.Shared.Configuration; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Network; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.Timing; diff --git a/Robust.UnitTesting/Shared/GameObjects/EntitySystemManagerOrderTest.cs b/Robust.UnitTesting/Shared/GameObjects/EntitySystemManagerOrderTest.cs index 64c178f34..015e95041 100644 --- a/Robust.UnitTesting/Shared/GameObjects/EntitySystemManagerOrderTest.cs +++ b/Robust.UnitTesting/Shared/GameObjects/EntitySystemManagerOrderTest.cs @@ -5,12 +5,9 @@ using Moq; using NUnit.Framework; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Systems; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Reflection; namespace Robust.UnitTesting.Shared.GameObjects { diff --git a/Robust.UnitTesting/Shared/GameObjects/EntitySystemManager_Tests.cs b/Robust.UnitTesting/Shared/GameObjects/EntitySystemManager_Tests.cs index fdf45daf7..f2e408f7f 100644 --- a/Robust.UnitTesting/Shared/GameObjects/EntitySystemManager_Tests.cs +++ b/Robust.UnitTesting/Shared/GameObjects/EntitySystemManager_Tests.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Systems; using Robust.Shared.IoC; namespace Robust.UnitTesting.Shared.GameObjects diff --git a/Robust.UnitTesting/Shared/Input/Binding/CommandBindRegistry_Test.cs b/Robust.UnitTesting/Shared/Input/Binding/CommandBindRegistry_Test.cs index 766087caf..7af861392 100644 --- a/Robust.UnitTesting/Shared/Input/Binding/CommandBindRegistry_Test.cs +++ b/Robust.UnitTesting/Shared/Input/Binding/CommandBindRegistry_Test.cs @@ -4,9 +4,6 @@ using System.Linq; using NUnit.Framework; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Players; namespace Robust.UnitTesting.Shared.Input.Binding @@ -27,7 +24,7 @@ namespace Robust.UnitTesting.Shared.Input.Binding public TestInputCmdHandler(Type? forType = null, string name = "") { - this.ForType = forType; + ForType = forType; this.name = name; } diff --git a/Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs b/Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs index 7716022d2..414d30a46 100644 --- a/Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs +++ b/Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using Moq; +using System.IO; using NUnit.Framework; -using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Prototypes; -using Is = Robust.UnitTesting.Is; // ReSharper disable InconsistentNaming // ReSharper disable AccessToStaticMemberViaDerivedType diff --git a/Robust.UnitTesting/Shared/Map/MapChunk_Tests.cs b/Robust.UnitTesting/Shared/Map/MapChunk_Tests.cs index be208717c..1bae27ca8 100644 --- a/Robust.UnitTesting/Shared/Map/MapChunk_Tests.cs +++ b/Robust.UnitTesting/Shared/Map/MapChunk_Tests.cs @@ -1,10 +1,9 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using Moq; using NUnit.Framework; -using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs b/Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs index 73f7b5b2a..7a7a1d0f1 100644 --- a/Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs +++ b/Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs @@ -1,12 +1,7 @@ using System.Linq; -using Moq; using NUnit.Framework; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.Timing; -using Robust.Server.Timing; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.UnitTesting/Shared/Map/MapManager_Tests.cs b/Robust.UnitTesting/Shared/Map/MapManager_Tests.cs index b6f8ee1ac..5a48dfd9c 100644 --- a/Robust.UnitTesting/Shared/Map/MapManager_Tests.cs +++ b/Robust.UnitTesting/Shared/Map/MapManager_Tests.cs @@ -1,8 +1,5 @@ using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Robust.UnitTesting/Shared/Physics/B2DynamicTree_Test.cs b/Robust.UnitTesting/Shared/Physics/B2DynamicTree_Test.cs index e3bbecdba..5c95f1e00 100644 --- a/Robust.UnitTesting/Shared/Physics/B2DynamicTree_Test.cs +++ b/Robust.UnitTesting/Shared/Physics/B2DynamicTree_Test.cs @@ -1,6 +1,4 @@ -using System; using System.Collections.Generic; -using System.Linq; using NUnit.Framework; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Robust.UnitTesting/Shared/Physics/CollisionManager_Test.cs b/Robust.UnitTesting/Shared/Physics/CollisionManager_Test.cs index dc7e31e81..f147c0dc1 100644 --- a/Robust.UnitTesting/Shared/Physics/CollisionManager_Test.cs +++ b/Robust.UnitTesting/Shared/Physics/CollisionManager_Test.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Collections.Immutable; +using System.Collections.Immutable; using System.Linq; using Moq; using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Robust.UnitTesting/Shared/Physics/CollisionSolverTests.cs b/Robust.UnitTesting/Shared/Physics/CollisionSolverTests.cs index 7d1a967be..3cb9475be 100644 --- a/Robust.UnitTesting/Shared/Physics/CollisionSolverTests.cs +++ b/Robust.UnitTesting/Shared/Physics/CollisionSolverTests.cs @@ -2,7 +2,6 @@ using NUnit.Framework; using Robust.Shared.Maths; using Robust.Shared.Physics; -using Is = Robust.UnitTesting.Is; namespace Robust.UnitTesting.Shared.Physics { diff --git a/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs b/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs index 7274079da..d9d9e3fef 100644 --- a/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs +++ b/Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs @@ -1,7 +1,6 @@ using System.IO; using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Robust.UnitTesting/Shared/Reflection/ReflectionManager_Test.cs b/Robust.UnitTesting/Shared/Reflection/ReflectionManager_Test.cs index c409828d2..af9e52cd7 100644 --- a/Robust.UnitTesting/Shared/Reflection/ReflectionManager_Test.cs +++ b/Robust.UnitTesting/Shared/Reflection/ReflectionManager_Test.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Reflection; using System.Collections.Generic; diff --git a/Robust.UnitTesting/Shared/Resources/WritableDirProviderTest.cs b/Robust.UnitTesting/Shared/Resources/WritableDirProviderTest.cs index 02171be68..124b02aad 100644 --- a/Robust.UnitTesting/Shared/Resources/WritableDirProviderTest.cs +++ b/Robust.UnitTesting/Shared/Resources/WritableDirProviderTest.cs @@ -2,7 +2,6 @@ using System.IO; using NUnit.Framework; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.Utility; namespace Robust.UnitTesting.Shared.Resources diff --git a/Robust.UnitTesting/Shared/Serialization/NetSerializableAttribute_Test.cs b/Robust.UnitTesting/Shared/Serialization/NetSerializableAttribute_Test.cs index aff0a00d5..ac93e4dea 100644 --- a/Robust.UnitTesting/Shared/Serialization/NetSerializableAttribute_Test.cs +++ b/Robust.UnitTesting/Shared/Serialization/NetSerializableAttribute_Test.cs @@ -1,7 +1,7 @@ using System; using NUnit.Framework; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; namespace Robust.UnitTesting.Shared.Serialization diff --git a/Robust.UnitTesting/Shared/Serialization/YamlConstantSerializer_Test.cs b/Robust.UnitTesting/Shared/Serialization/YamlConstantSerializer_Test.cs index 5b1b55a09..7edea20f1 100644 --- a/Robust.UnitTesting/Shared/Serialization/YamlConstantSerializer_Test.cs +++ b/Robust.UnitTesting/Shared/Serialization/YamlConstantSerializer_Test.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using NUnit.Framework; -using Robust.Shared.Maths; +using NUnit.Framework; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Robust.UnitTesting.Shared.Serialization diff --git a/Robust.UnitTesting/Shared/Serialization/YamlFlagSerializer_Test.cs b/Robust.UnitTesting/Shared/Serialization/YamlFlagSerializer_Test.cs index ecf5f62da..068ff0561 100644 --- a/Robust.UnitTesting/Shared/Serialization/YamlFlagSerializer_Test.cs +++ b/Robust.UnitTesting/Shared/Serialization/YamlFlagSerializer_Test.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.IO; using NUnit.Framework; -using Robust.Shared.Maths; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Robust.UnitTesting.Shared.Serialization diff --git a/Robust.UnitTesting/Shared/Serialization/YamlObjectSerializer_Test.cs b/Robust.UnitTesting/Shared/Serialization/YamlObjectSerializer_Test.cs index a2c821fc3..48daffb09 100644 --- a/Robust.UnitTesting/Shared/Serialization/YamlObjectSerializer_Test.cs +++ b/Robust.UnitTesting/Shared/Serialization/YamlObjectSerializer_Test.cs @@ -4,7 +4,6 @@ using System.Globalization; using System.IO; using System.Linq; using NUnit.Framework; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Robust.UnitTesting/Shared/Timers/TimerTest.cs b/Robust.UnitTesting/Shared/Timers/TimerTest.cs index 99b957af4..efe07bca8 100644 --- a/Robust.UnitTesting/Shared/Timers/TimerTest.cs +++ b/Robust.UnitTesting/Shared/Timers/TimerTest.cs @@ -1,12 +1,10 @@ using System; -using System.Linq; using System.Threading; using NUnit.Framework; using Robust.Shared.Asynchronous; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Timers; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Timers; using Robust.Shared.Timing; using Timer = Robust.Shared.Timers.Timer; diff --git a/Robust.UnitTesting/Shared/Timing/GameLoop_Test.cs b/Robust.UnitTesting/Shared/Timing/GameLoop_Test.cs index dc79237e3..b87a53363 100644 --- a/Robust.UnitTesting/Shared/Timing/GameLoop_Test.cs +++ b/Robust.UnitTesting/Shared/Timing/GameLoop_Test.cs @@ -2,7 +2,6 @@ using System.Reflection; using Moq; using NUnit.Framework; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Timing; namespace Robust.UnitTesting.Shared.Timing diff --git a/Robust.UnitTesting/Shared/Timing/GameTiming_Test.cs b/Robust.UnitTesting/Shared/Timing/GameTiming_Test.cs index 02b6aa8ac..8336dd6a4 100644 --- a/Robust.UnitTesting/Shared/Timing/GameTiming_Test.cs +++ b/Robust.UnitTesting/Shared/Timing/GameTiming_Test.cs @@ -2,7 +2,6 @@ using System.Reflection; using Moq; using NUnit.Framework; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Timing; namespace Robust.UnitTesting.Shared.Timing diff --git a/Robust.UnitTesting/Shared/Utility/NullableHelper_Test.cs b/Robust.UnitTesting/Shared/Utility/NullableHelper_Test.cs index 562b2698e..3473f46be 100644 --- a/Robust.UnitTesting/Shared/Utility/NullableHelper_Test.cs +++ b/Robust.UnitTesting/Shared/Utility/NullableHelper_Test.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using Robust.Shared.Interfaces.Log; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Robust.UnitTesting/Shared/Utility/PrettyPrint_Test.cs b/Robust.UnitTesting/Shared/Utility/PrettyPrint_Test.cs index 02e8d9948..d92574305 100644 --- a/Robust.UnitTesting/Shared/Utility/PrettyPrint_Test.cs +++ b/Robust.UnitTesting/Shared/Utility/PrettyPrint_Test.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using NUnit.Framework; using Robust.Shared.Utility; diff --git a/Robust.UnitTesting/TestLogHandler.cs b/Robust.UnitTesting/TestLogHandler.cs index fcae6698d..a49eefd8b 100644 --- a/Robust.UnitTesting/TestLogHandler.cs +++ b/Robust.UnitTesting/TestLogHandler.cs @@ -1,12 +1,8 @@ -using Robust.Shared.Interfaces.Log; -using System; -using System.Collections.Generic; +using System; using System.Diagnostics; using System.IO; -using System.Text; using NUnit.Framework; using Robust.Shared.Log; -using Robust.Shared.Utility; using Serilog.Events; namespace Robust.UnitTesting