tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Solution from Shared -> Server (#5078)

Browse Source 
* Move entity solution entity systems to shared

* Move SolutionComponents to Server

* Fix namespaces

* Remove Networked Component.

* Fixes

* Add components to ignore list
This commit is contained in:
Ygg01
2021-10-29 13:40:15 +01:00
committed by GitHub
parent 68123fd35f
commit b2aca94586
66 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Shared/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs
View File

@@ -1,23 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
/// <summary>
/// Denotes the solution that can be easily removed through any reagent container.
/// Think pouring this or draining from a water tank.
/// </summary>
[RegisterComponent]
public class DrainableSolutionComponent : Component
{
public override string Name => "DrainableSolution";
/// <summary>
/// Solution name that can be drained.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")]
public string Solution { get; set; } = "default";
}
}

22
Content.Shared/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs
View File

@@ -1,22 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
/// <summary>
/// Denotes the solution that can removed be with syringes.
/// </summary>
[RegisterComponent]
public class DrawableSolutionComponent : Component
{
public override string Name => "DrawableSolution";
/// <summary>
/// Solution name that can be removed with syringes.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")]
public string Solution { get; set; } = "default";
}
}

16
Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
View File

@@ -1,16 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
[RegisterComponent]
public class ExaminableSolutionComponent: Component
{
public override string Name => "ExaminableSolution";
[ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")]
public string Solution { get; set; } = "default";
}
}

24
Content.Shared/Chemistry/Components/SolutionManager/FitsInDispenserComponent.cs
View File

@@ -1,24 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
/// Allows the entity with this component to be placed in a <c>SharedReagentDispenserComponent</c>.
/// <para>Otherwise it's considered to be too large or the improper shape to fit.</para>
/// <para>Allows us to have obscenely large containers that are harder to abuse in chem dispensers
/// since they can't be placed directly in them.</para>
/// <see cref="Content.Shared.Chemistry.Dispenser.SharedReagentDispenserComponent"/>
[RegisterComponent]
public class FitsInDispenserComponent : Component
{
public override string Name => "FitsInDispenser";
/// <summary>
/// Solution name that will interact with ReagentDispenserComponent.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")]
public string Solution { get; set; } = "default";
}
}

22
Content.Shared/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs
View File

@@ -1,22 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
/// <summary>
/// Denotes a solution which can be added with syringes.
/// </summary>
[RegisterComponent]
public class InjectableSolutionComponent : Component
{
public override string Name => "InjectableSolution";
/// <summary>
/// Solution name which can be added with syringes.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")]
public string Solution { get; set; } = "default";
}
}

25
Content.Shared/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs
View File

@@ -1,25 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
/// <summary>
/// Reagents that can be added easily. For example like
/// pouring something into another beaker, glass, or into the gas
/// tank of a car.
/// </summary>
[RegisterComponent]
public class RefillableSolutionComponent : Component
{
public override string Name => "RefillableSolution";
/// <summary>
/// Solution name that can added to easily.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")]
public string Solution { get; set; } = "default";
}
}

23
Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs
View File

@@ -1,23 +0,0 @@
using System.Collections.Generic;
using Content.Shared.Chemistry.EntitySystems;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Chemistry.Components.SolutionManager
{
[NetworkedComponent()]
[RegisterComponent]
[DataDefinition]
[Friend(typeof(SolutionContainerSystem))]
public class SolutionContainerManagerComponent : Component
{
public override string Name => "SolutionContainerManager";
[ViewVariables]
[DataField("solutions")]
public readonly Dictionary<string, Solution> Solutions = new();
}
}