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

Removes the ConstructorComponents and moves the construction blueprint feature into a new ECS system. (#1114)

Browse Source
This commit is contained in:
Acruid
2020-06-15 12:30:11 -07:00
committed by GitHub
parent 548b91df61
commit 189ed9309f
11 changed files with 302 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Content.Client/Construction/ConstructionMenu.cs
View File

@@ -1,8 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Client.GameObjects.Components.Construction;
using Content.Client.Interfaces.GameObjects;
using Content.Client.GameObjects.EntitySystems;
using Content.Shared.Construction;
using Content.Shared.GameObjects.Components.Interactable;
using Robust.Client.Graphics;
@@ -14,7 +13,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Utility;
using Robust.Shared.Enums;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
@@ -24,11 +23,11 @@ namespace Content.Client.Construction
public class ConstructionMenu : SS14Window
{
#pragma warning disable CS0649
[Dependency] readonly IPrototypeManager PrototypeManager;
[Dependency] readonly IResourceCache ResourceCache;
[Dependency] private readonly IPrototypeManager _prototypeManager;
[Dependency] private readonly IResourceCache _resourceCache;
[Dependency] private readonly IEntitySystemManager _systemManager;
#pragma warning restore
public ConstructorComponent Owner { get; set; }
private readonly Button BuildButton;
private readonly Button EraseButton;
private readonly LineEdit SearchBar;
@@ -118,6 +117,7 @@ namespace Content.Client.Construction
PopulateTree();
}
/// <inheritdoc />
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
@@ -128,7 +128,7 @@ namespace Content.Client.Construction
}
}
void OnItemSelected()
private void OnItemSelected()
{
var prototype = (ConstructionPrototype) RecipeList.Selected.Metadata;
@@ -162,17 +162,17 @@ namespace Content.Client.Construction
switch (mat.Material)
{
case ConstructionStepMaterial.MaterialType.Metal:
icon = ResourceCache.GetResource<TextureResource>(
icon = _resourceCache.GetResource<TextureResource>(
"/Textures/Objects/Materials/sheet_metal.png");
text = $"Metal x{mat.Amount}";
break;
case ConstructionStepMaterial.MaterialType.Glass:
icon = ResourceCache.GetResource<TextureResource>(
icon = _resourceCache.GetResource<TextureResource>(
"/Textures/Objects/Materials/sheet_glass.png");
text = $"Glass x{mat.Amount}";
break;
case ConstructionStepMaterial.MaterialType.Cable:
icon = ResourceCache.GetResource<TextureResource>(
icon = _resourceCache.GetResource<TextureResource>(
"/Textures/Objects/Tools/cable_coil.png");
text = $"Cable Coil x{mat.Amount}";
break;
@@ -185,25 +185,25 @@ namespace Content.Client.Construction
switch (tool.ToolQuality)
{
case ToolQuality.Anchoring:
icon = ResourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/wrench.png");
icon = _resourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/wrench.png");
text = "Wrench";
break;
case ToolQuality.Prying:
icon = ResourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/crowbar.png");
icon = _resourceCache.GetResource<TextureResource>("/Textures/Objects/Tools/crowbar.png");
text = "Crowbar";
break;
case ToolQuality.Screwing:
icon = ResourceCache.GetResource<TextureResource>(
icon = _resourceCache.GetResource<TextureResource>(
"/Textures/Objects/Tools/screwdriver.png");
text = "Screwdriver";
break;
case ToolQuality.Welding:
icon = ResourceCache.GetResource<RSIResource>("/Textures/Objects/tools.rsi")
icon = _resourceCache.GetResource<RSIResource>("/Textures/Objects/tools.rsi")
.RSI["welder"].Frame0;
text = $"Welding tool ({tool.Amount} fuel)";
break;
case ToolQuality.Cutting:
icon = ResourceCache.GetResource<TextureResource>(
icon = _resourceCache.GetResource<TextureResource>(
"/Textures/Objects/Tools/wirecutter.png");
text = "Wirecutters";
break;
@@ -221,13 +221,13 @@ namespace Content.Client.Construction
}
}
void OnTextEntered(LineEdit.LineEditEventArgs args)
private void OnTextEntered(LineEdit.LineEditEventArgs args)
{
var str = args.Text;
PopulateTree(string.IsNullOrWhiteSpace(str) ? null : str.ToLowerInvariant());
}
void OnBuildToggled(BaseButton.ButtonToggledEventArgs args)
private void OnBuildToggled(BaseButton.ButtonToggledEventArgs args)
{
if (args.Pressed)
{
@@ -239,7 +239,8 @@ namespace Content.Client.Construction
if (prototype.Type == ConstructionType.Item)
{
Owner.TryStartItemConstruction(prototype.ID);
var constructSystem = _systemManager.GetEntitySystem<ConstructionSystem>();
constructSystem.TryStartItemConstruction(prototype.ID);
BuildButton.Pressed = false;
return;
}
@@ -250,7 +251,7 @@ namespace Content.Client.Construction
IsTile = false,
PlacementOption = prototype.PlacementMode
},
new ConstructionPlacementHijack(prototype, Owner));
new ConstructionPlacementHijack(_systemManager.GetEntitySystem<ConstructionSystem>(), prototype));
}
else
{
@@ -262,7 +263,7 @@ namespace Content.Client.Construction
private void OnEraseToggled(BaseButton.ButtonToggledEventArgs args)
{
if (args.Pressed) Placement.Clear();
Placement.ToggleEraserHijacked(new ConstructionPlacementHijack(null, Owner));
Placement.ToggleEraserHijacked(new ConstructionPlacementHijack(_systemManager.GetEntitySystem<ConstructionSystem>(), null));
EraseButton.Pressed = args.Pressed;
}
@@ -272,12 +273,12 @@ namespace Content.Client.Construction
EraseButton.Pressed = false;
}
void PopulatePrototypeList()
private void PopulatePrototypeList()
{
RootCategory = new CategoryNode("", null);
int count = 1;
var count = 1;
foreach (var prototype in PrototypeManager.EnumeratePrototypes<ConstructionPrototype>())
foreach (var prototype in _prototypeManager.EnumeratePrototypes<ConstructionPrototype>())
{
var currentNode = RootCategory;
@@ -316,7 +317,7 @@ namespace Content.Client.Construction
Recurse(RootCategory);
}
void PopulateTree(string searchTerm = null)
private void PopulateTree(string searchTerm = null)
{
RecipeList.Clear();
@@ -378,18 +379,18 @@ namespace Content.Client.Construction
private static int ComparePrototype(ConstructionPrototype x, ConstructionPrototype y)
{
return String.Compare(x.Name, y.Name, StringComparison.Ordinal);
return string.Compare(x.Name, y.Name, StringComparison.Ordinal);
}
class CategoryNode
private class CategoryNode
{
public readonly string Name;
public readonly CategoryNode Parent;
public SortedDictionary<string, CategoryNode>
public readonly SortedDictionary<string, CategoryNode>
ChildCategories = new SortedDictionary<string, CategoryNode>();
public List<ConstructionPrototype> Prototypes = new List<ConstructionPrototype>();
public readonly List<ConstructionPrototype> Prototypes = new List<ConstructionPrototype>();
public int FlattenedIndex = -1;
public CategoryNode(string name, CategoryNode parent)

26
Content.Client/Construction/ConstructionPlacementHijack.cs
View File

@@ -1,49 +1,51 @@
using Content.Client.GameObjects.Components.Construction;
using Content.Client.GameObjects.Components.Construction;
using Content.Client.GameObjects.EntitySystems;
using Content.Shared.Construction;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Placement;
using Robust.Client.Utility;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
namespace Content.Client.Construction
{
public class ConstructionPlacementHijack : PlacementHijack
{
private readonly ConstructionPrototype Prototype;
private readonly ConstructorComponent Owner;
private readonly ConstructionSystem _constructionSystem;
private readonly ConstructionPrototype _prototype;
public ConstructionPlacementHijack(ConstructionPrototype prototype, ConstructorComponent owner)
public ConstructionPlacementHijack(ConstructionSystem constructionSystem, ConstructionPrototype prototype)
{
Prototype = prototype;
Owner = owner;
_constructionSystem = constructionSystem;
_prototype = prototype;
}
/// <inheritdoc />
public override bool HijackPlacementRequest(GridCoordinates coords)
{
if (Prototype != null)
if (_prototype != null)
{
var dir = Manager.Direction;
Owner.SpawnGhost(Prototype, coords, dir);
_constructionSystem.SpawnGhost(_prototype, coords, dir);
}
return true;
}
/// <inheritdoc />
public override bool HijackDeletion(IEntity entity)
{
if (entity.TryGetComponent(out ConstructionGhostComponent ghost))
{
Owner.ClearGhost(ghost.GhostID);
_constructionSystem.ClearGhost(ghost.GhostID);
}
return true;
}
/// <inheritdoc />
public override void StartHijack(PlacementManager manager)
{
base.StartHijack(manager);
manager.CurrentBaseSprite = Prototype.Icon.DirFrame0();
manager.CurrentBaseSprite = _prototype.Icon.DirFrame0();
}
}
}