SharedItemComponent (#3513)

* StorableComponent refactor

* ItemComponent refactor

* conflict fixes

* removes redundant null check

* removes redundant item throwing code

* fix conflicts

* ExplosionLaunchedComponent

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
collinlunn
2021-04-02 04:01:03 -06:00
committed by GitHub
parent d9781c6f1c
commit f7aba5f701
21 changed files with 284 additions and 361 deletions

View File

@@ -1,102 +1,26 @@
using Content.Client.GameObjects.Components.Disposal;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Items;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
#nullable enable
using Content.Shared.GameObjects.Components.Storage;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components.Items
{
[RegisterComponent]
[ComponentReference(typeof(IItemComponent))]
public class ItemComponent : Component, IItemComponent, IDraggable
[ComponentReference(typeof(SharedItemComponent))]
public class ItemComponent : SharedItemComponent
{
[Dependency] private readonly IResourceCache _resourceCache = default!;
public override string Name => "Item";
public override uint? NetID => ContentNetIDs.ITEM;
[ViewVariables]
[DataField("sprite")]
protected ResourcePath? RsiPath;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("color")]
protected Color Color = Color.White;
[DataField("HeldPrefix")]
private string? _equippedPrefix;
[ViewVariables(VVAccess.ReadWrite)]
public string? EquippedPrefix
public override bool TryPutInHand(IEntity user)
{
get => _equippedPrefix;
set
{
_equippedPrefix = value;
if (!Owner.TryGetContainer(out var container))
return;
if (container.Owner.TryGetComponent(out HandsComponent? hands))
hands.RefreshInHands();
}
return false;
}
public (RSI rsi, RSI.StateId stateId, Color color)? GetInHandStateInfo(HandLocation hand)
protected override void OnEquippedPrefixChange()
{
var rsi = GetRSI();
if (rsi == null)
{
return null;
}
var handName = hand.ToString().ToLowerInvariant();
var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-inhand-{handName}" : $"inhand-{handName}";
if (rsi.TryGetState(stateId, out _))
{
return (rsi, stateId, Color);
}
return null;
}
protected RSI? GetRSI()
{
if (RsiPath == null)
{
return null;
}
return _resourceCache.GetResource<RSIResource>(SharedSpriteComponent.TextureRoot / RsiPath).RSI;
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
if (curState is not ItemComponentState state)
if (!Owner.TryGetContainer(out var container))
return;
EquippedPrefix = state.EquippedPrefix;
}
bool IDraggable.CanDrop(CanDropEventArgs args)
{
return args.Target.HasComponent<DisposalUnitComponent>();
}
bool IDraggable.Drop(DragDropEventArgs args)
{
// TODO: Shared item class
return false;
if (container.Owner.TryGetComponent(out HandsComponent? hands))
hands.RefreshInHands();
}
}
}