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

Remove usages of obsolete SpriteView.Sprite.set() (#19500)

Browse Source
This commit is contained in:
Visne
2023-08-25 03:16:46 +02:00
committed by GitHub
parent 3c667b6f7e
commit 11a57be230
20 changed files with 72 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
View File

@@ -24,7 +24,7 @@ public sealed partial class AnomalyGeneratorWindow : FancyWindow
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
EntityView.Sprite = _entityManager.GetComponent<SpriteComponent>(gen);
EntityView.SetEntity(gen);
EntityView.SpriteOffset = false;
GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke();

5
Content.Client/CharacterInfo/CharacterInfoSystem.cs
View File

@@ -42,17 +42,16 @@ public sealed class CharacterInfoSystem : EntitySystem
private void OnCharacterInfoEvent(CharacterInfoEvent msg, EntitySessionEventArgs args)
{
var sprite = CompOrNull<SpriteComponent>(msg.EntityUid);
var data = new CharacterData(msg.JobTitle, msg.Objectives, msg.Briefing, sprite, Name(msg.EntityUid));
var data = new CharacterData(msg.EntityUid, msg.JobTitle, msg.Objectives, msg.Briefing, Name(msg.EntityUid));
OnCharacterUpdate?.Invoke(data);
}
public readonly record struct CharacterData(
EntityUid Entity,
string Job,
Dictionary<string, List<ConditionInfo>> Objectives,
string Briefing,
SpriteComponent? Sprite,
string EntityName
);
}

4
Content.Client/ContextMenu/UI/EntityMenuElement.cs
View File

@@ -107,12 +107,12 @@ namespace Content.Client.ContextMenu.UI
// _entityManager.Deleted() implicitly checks all of these.
if (_entityManager.Deleted(entity))
{
Icon.Sprite = null;
Icon.SetEntity(null);
Text = string.Empty;
}
else
{
Icon.Sprite = _entityManager.GetComponentOrNull<SpriteComponent>(entity);
Icon.SetEntity(entity);
Text = GetEntityDescription(entity.Value);
}
}

10
Content.Client/Examine/ExamineSystem.cs
View File

@@ -222,14 +222,16 @@ namespace Content.Client.Examine
vBox.AddChild(hBox);
if (EntityManager.TryGetComponent(target, out SpriteComponent? sprite))
if (EntityManager.HasComponent<SpriteComponent>(target))
{
hBox.AddChild(new SpriteView
var spriteView = new SpriteView
{
Sprite = sprite, OverrideDirection = Direction.South,
OverrideDirection = Direction.South,
SetSize = new Vector2(32, 32),
Margin = new Thickness(2, 0, 2, 0),
});
};
spriteView.SetEntity(target);
hBox.AddChild(spriteView);
}
if (knowTarget)

10
Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs
View File

@@ -37,11 +37,7 @@ public sealed partial class GuideEntityEmbed : BoxContainer, IDocumentTag
public bool Interactive;
public SpriteComponent? Sprite
{
get => View.Sprite;
set => View.Sprite = value;
}
public SpriteComponent? Sprite => View.Sprite;
public Vector2 Scale
{
@@ -64,7 +60,7 @@ public sealed partial class GuideEntityEmbed : BoxContainer, IDocumentTag
Interactive = interactive;
var ent = _entityManager.SpawnEntity(proto, MapCoordinates.Nullspace);
Sprite = _entityManager.GetComponent<SpriteComponent>(ent);
View.SetEntity(ent);
if (caption)
Caption.Text = _entityManager.GetComponent<MetaDataComponent>(ent).EntityName;
@@ -146,7 +142,7 @@ public sealed partial class GuideEntityEmbed : BoxContainer, IDocumentTag
var ent = _entityManager.SpawnEntity(proto, MapCoordinates.Nullspace);
_tagSystem.AddTag(ent, GuidebookSystem.GuideEmbedTag);
Sprite = _entityManager.GetComponent<SpriteComponent>(ent);
View.SetEntity(ent);
if (!args.TryGetValue("Caption", out var caption))
caption = _entityManager.GetComponent<MetaDataComponent>(ent).EntityName;

7
Content.Client/Inventory/ClientInventorySystem.cs
View File

@@ -91,7 +91,7 @@ namespace Content.Client.Inventory
UpdateSlot(args.Equipee, component, args.Slot);
if (args.Equipee != _playerManager.LocalPlayer?.ControlledEntity)
return;
var update = new SlotSpriteUpdate(args.SlotGroup, args.Slot, null, false);
var update = new SlotSpriteUpdate(null, args.SlotGroup, args.Slot, false);
OnSpriteUpdate?.Invoke(update);
}
@@ -100,8 +100,7 @@ namespace Content.Client.Inventory
UpdateSlot(args.Equipee, component, args.Slot);
if (args.Equipee != _playerManager.LocalPlayer?.ControlledEntity)
return;
var sprite = EntityManager.GetComponentOrNull<SpriteComponent>(args.Equipment);
var update = new SlotSpriteUpdate(args.SlotGroup, args.Slot, sprite,
var update = new SlotSpriteUpdate(args.Equipment, args.SlotGroup, args.Slot,
HasComp<ClientStorageComponent>(args.Equipment));
OnSpriteUpdate?.Invoke(update);
}
@@ -340,9 +339,9 @@ namespace Content.Client.Inventory
}
public readonly record struct SlotSpriteUpdate(
EntityUid? Entity,
string Group,
string Name,
SpriteComponent? Sprite,
bool ShowStorage
);
}

8
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
View File

@@ -94,12 +94,14 @@ namespace Content.Client.Lobby.UI
private SpriteView MakeSpriteView(EntityUid entity, Direction direction)
{
return new()
var spriteView = new SpriteView
{
Sprite = _entityManager.GetComponent<SpriteComponent>(entity),
OverrideDirection = direction,
Scale = new Vector2(2, 2)
Scale = new Vector2(2, 2),
};
spriteView.SetEntity(entity);
return spriteView;
}
public void UpdateUI()

4
Content.Client/Mech/Ui/MechEquipmentControl.xaml.cs
View File

@@ -10,11 +10,11 @@ public sealed partial class MechEquipmentControl : Control
{
public event Action? OnRemoveButtonPressed;
public MechEquipmentControl(string itemName, SpriteComponent? sprite, Control? fragment)
public MechEquipmentControl(EntityUid entity, string itemName, Control? fragment)
{
RobustXamlLoader.Load(this);
EquipmentName.SetMessage(itemName);
EquipmentView.Sprite = sprite;
EquipmentView.SetEntity(entity);
RemoveButton.TexturePath = "/Textures/Interface/Nano/cross.svg.png";
if (fragment != null)

10
Content.Client/Mech/Ui/MechMenu.xaml.cs
View File

@@ -23,10 +23,7 @@ public sealed partial class MechMenu : FancyWindow
_mech = mech;
if (!_ent.TryGetComponent<SpriteComponent>(mech, out var sprite))
return;
MechView.Sprite = sprite;
MechView.SetEntity(mech);
}
public void UpdateMechStats()
@@ -54,14 +51,13 @@ public sealed partial class MechMenu : FancyWindow
EquipmentControlContainer.Children.Clear();
foreach (var ent in mechComp.EquipmentContainer.ContainedEntities)
{
if (!_ent.TryGetComponent<SpriteComponent>(ent, out var sprite) ||
!_ent.TryGetComponent<MetaDataComponent>(ent, out var metaData))
if (!_ent.TryGetComponent<MetaDataComponent>(ent, out var metaData))
continue;
var uicomp = _ent.GetComponentOrNull<UIFragmentComponent>(ent);
var ui = uicomp?.Ui?.GetUIFragmentRoot();
var control = new MechEquipmentControl(metaData.EntityName, sprite, ui);
var control = new MechEquipmentControl(ent, metaData.EntityName, ui);
control.OnRemoveButtonPressed += () => OnRemoveButtonPressed?.Invoke(ent);

2
Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
View File

@@ -186,10 +186,10 @@ namespace Content.Client.Preferences.UI
var view = new SpriteView
{
Sprite = entityManager.GetComponent<SpriteComponent>(_previewDummy),
Scale = new Vector2(2, 2),
OverrideDirection = Direction.South
};
view.SetEntity(_previewDummy);
var description = profile.Name;

15
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -485,26 +485,25 @@ namespace Content.Client.Preferences.UI
_previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
_lastSpecies = species;
var sprite = _entMan.GetComponent<SpriteComponent>(_previewDummy!.Value);
_previewSprite = new SpriteView
{
Sprite = sprite,
Scale = new Vector2(6, 6),
OverrideDirection = Direction.South,
VerticalAlignment = VAlignment.Center,
SizeFlagsStretchRatio = 1
};
_previewSprite.SetEntity(_previewDummy.Value);
_previewSpriteControl.AddChild(_previewSprite);
_previewSpriteSide = new SpriteView
{
Sprite = sprite,
Scale = new Vector2(6, 6),
OverrideDirection = Direction.East,
VerticalAlignment = VAlignment.Center,
SizeFlagsStretchRatio = 1
};
_previewSpriteSide.SetEntity(_previewDummy.Value);
_previewSpriteSideControl.AddChild(_previewSpriteSide);
#endregion Dummy
@@ -726,14 +725,12 @@ namespace Content.Client.Preferences.UI
_previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
_lastSpecies = species;
var sprite = _entMan.GetComponent<SpriteComponent>(_previewDummy!.Value);
if (_previewSprite == null)
{
// Front
_previewSprite = new SpriteView
{
Sprite = sprite,
Scale = new Vector2(6, 6),
OverrideDirection = Direction.South,
VerticalAlignment = VAlignment.Center,
@@ -741,16 +738,12 @@ namespace Content.Client.Preferences.UI
};
_previewSpriteControl.AddChild(_previewSprite);
}
else
{
_previewSprite.SetEntity(_previewDummy.Value);
}
if (_previewSpriteSide == null)
{
_previewSpriteSide = new SpriteView
{
Sprite = sprite,
Scale = new Vector2(6, 6),
OverrideDirection = Direction.East,
VerticalAlignment = VAlignment.Center,
@@ -758,10 +751,8 @@ namespace Content.Client.Preferences.UI
};
_previewSpriteSideControl.AddChild(_previewSpriteSide);
}
else
{
_previewSpriteSide.SetEntity(_previewDummy.Value);
}
_needUpdatePreview = true;
}

9
Content.Client/RoundEnd/RoundEndSummaryWindow.cs
View File

@@ -125,16 +125,17 @@ namespace Content.Client.RoundEnd
VerticalExpand = true,
};
if (_entityManager.TryGetComponent(playerInfo.PlayerEntityUid, out SpriteComponent? sprite))
if (_entityManager.HasComponent<SpriteComponent>(playerInfo.PlayerEntityUid))
{
hBox.AddChild(new SpriteView
var spriteView = new SpriteView
{
Sprite = sprite,
OverrideDirection = Direction.South,
VerticalAlignment = VAlignment.Center,
SetSize = new Vector2(32, 32),
VerticalExpand = true,
});
};
spriteView.SetEntity(playerInfo.PlayerEntityUid);
hBox.AddChild(spriteView);
}
if (playerInfo.PlayerICName != null)

18
Content.Client/Storage/UI/StorageWindow.cs
View File

@@ -113,26 +113,26 @@ namespace Content.Client.Storage.UI
|| !_entityManager.EntityExists(entity))
return;
_entityManager.TryGetComponent(entity, out SpriteComponent? sprite);
_entityManager.TryGetComponent(entity, out ItemComponent? item);
_entityManager.TryGetComponent(entity, out StackComponent? stack);
var count = stack?.Count ?? 1;
var size = item?.Size;
var spriteView = new SpriteView
{
HorizontalAlignment = HAlignment.Left,
VerticalAlignment = VAlignment.Center,
SetSize = new Vector2(32.0f, 32.0f),
OverrideDirection = Direction.South,
};
spriteView.SetEntity(entity);
button.AddChild(new BoxContainer
{
Orientation = LayoutOrientation.Horizontal,
SeparationOverride = 2,
Children =
{
new SpriteView
{
HorizontalAlignment = HAlignment.Left,
VerticalAlignment = VAlignment.Center,
SetSize = new Vector2(32.0f, 32.0f),
OverrideDirection = Direction.South,
Sprite = sprite
},
spriteView,
new Label
{
HorizontalExpand = true,

2
Content.Client/UserInterface/Controls/SlotControl.cs
View File

@@ -195,7 +195,7 @@ namespace Content.Client.UserInterface.Controls
IoCManager.Resolve<IEntityManager>().DeleteEntity(tempQualifier.Owner);
}
HoverSpriteView.Sprite = null;
HoverSpriteView.SetEntity(null);
}
private void OnButtonPressed(GUIBoundKeyEventArgs args)

22
Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
View File

@@ -203,13 +203,12 @@ public sealed class ActionButton : Control
return;
}
if (Action?.EntityIcon == null ||
!entityManager.TryGetComponent(Action.EntityIcon.Value, out SpriteComponent? sprite))
if (Action?.EntityIcon is not { } entity || !entityManager.HasComponent<SpriteComponent>(entity))
{
_bigItemSpriteView.Visible = false;
_bigItemSpriteView.Sprite = null;
_bigItemSpriteView.SetEntity(null);
_smallItemSpriteView.Visible = false;
_smallItemSpriteView.Sprite = null;
_smallItemSpriteView.SetEntity(null);
}
else
{
@@ -217,24 +216,21 @@ public sealed class ActionButton : Control
{
case ItemActionIconStyle.BigItem:
_bigItemSpriteView.Visible = true;
_bigItemSpriteView.Sprite = sprite;
_bigItemSpriteView.SetEntity(entity);
_smallItemSpriteView.Visible = false;
_smallItemSpriteView.Sprite = null;
_smallItemSpriteView.SetEntity(null);
break;
case ItemActionIconStyle.BigAction:
_bigItemSpriteView.Visible = false;
_bigItemSpriteView.Sprite = null;
_bigItemSpriteView.SetEntity(null);
_smallItemSpriteView.Visible = true;
_smallItemSpriteView.Sprite = sprite;
_smallItemSpriteView.SetEntity(entity);
break;
case ItemActionIconStyle.NoItem:
_bigItemSpriteView.Visible = false;
_bigItemSpriteView.Sprite = null;
_bigItemSpriteView.SetEntity(null);
_smallItemSpriteView.Visible = false;
_smallItemSpriteView.Sprite = null;
_smallItemSpriteView.SetEntity(null);
break;
}
}

4
Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
View File

@@ -101,7 +101,7 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
return;
}
var (job, objectives, briefing, sprite, entityName) = data;
var (entity, job, objectives, briefing, entityName) = data;
_window.SubText.Text = job;
_window.Objectives.RemoveAllChildren();
@@ -143,7 +143,7 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
_window.Objectives.AddChild(objectiveControl);
}
_window.SpriteView.Sprite = sprite;
_window.SpriteView.SetEntity(entity);
_window.NameLabel.Text = entityName;
}

10
Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
View File

@@ -120,12 +120,12 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
if (_entities.TryGetComponent(hand.HeldEntity, out HandVirtualItemComponent? virt))
{
handButton.SpriteView.Sprite = _entities.GetComponentOrNull<SpriteComponent>(virt.BlockingEntity);
handButton.SpriteView.SetEntity(virt.BlockingEntity);
handButton.Blocked = true;
}
else
{
handButton.SpriteView.Sprite = _entities.GetComponentOrNull<SpriteComponent>(hand.HeldEntity);
handButton.SpriteView.SetEntity(hand.HeldEntity);
handButton.Blocked = false;
}
}
@@ -171,12 +171,12 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
if (_entities.TryGetComponent(entity, out HandVirtualItemComponent? virt))
{
hand.SpriteView.Sprite = _entities.GetComponentOrNull<SpriteComponent>(virt.BlockingEntity);
hand.SpriteView.SetEntity(virt.BlockingEntity);
hand.Blocked = true;
}
else
{
hand.SpriteView.Sprite = _entities.GetComponentOrNull<SpriteComponent>(entity);
hand.SpriteView.SetEntity(entity);
hand.Blocked = false;
}
@@ -190,7 +190,7 @@ public sealed class HandsUIController : UIController, IOnStateEntered<GameplaySt
if (hand == null)
return;
hand.SpriteView.Sprite = null;
hand.SpriteView.SetEntity(null);
if (_playerHandsComponent?.ActiveHand?.Name == name)
HandsGui?.UpdatePanelEntity(null);
}

14
Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
View File

@@ -125,9 +125,8 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
container.AddButton(button);
}
var sprite = _entities.GetComponentOrNull<SpriteComponent>(data.HeldEntity);
var showStorage = _entities.HasComponent<ClientStorageComponent>(data.HeldEntity);
var update = new SlotSpriteUpdate(data.SlotGroup, data.SlotName, sprite, showStorage);
var update = new SlotSpriteUpdate(data.HeldEntity, data.SlotGroup, data.SlotName, showStorage);
SpriteUpdated(update);
}
}
@@ -151,9 +150,8 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
_strippingWindow!.InventoryButtons.AddButton(button, data.ButtonOffset);
}
var sprite = _entities.GetComponentOrNull<SpriteComponent>(data.HeldEntity);
var showStorage = _entities.HasComponent<ClientStorageComponent>(data.HeldEntity);
var update = new SlotSpriteUpdate(data.SlotGroup, data.SlotName, sprite, showStorage);
var update = new SlotSpriteUpdate(data.HeldEntity, data.SlotGroup, data.SlotName, showStorage);
SpriteUpdated(update);
}
}
@@ -288,7 +286,7 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
hoverSprite.CopyFrom(sprite);
hoverSprite.Color = fits ? new Color(0, 255, 0, 127) : new Color(255, 0, 0, 127);
control.HoverSpriteView.Sprite = hoverSprite;
control.HoverSpriteView.SetEntity(hoverEntity);
}
private void AddSlot(SlotData data)
@@ -338,18 +336,18 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
private void SpriteUpdated(SlotSpriteUpdate update)
{
var (group, name, sprite, showStorage) = update;
var (entity, group, name, showStorage) = update;
if (_strippingWindow?.InventoryButtons.GetButton(update.Name) is { } inventoryButton)
{
inventoryButton.SpriteView.Sprite = sprite;
inventoryButton.SpriteView.SetEntity(entity);
inventoryButton.StorageButton.Visible = showStorage;
}
if (_slotGroups.GetValueOrDefault(group)?.GetButton(name) is not { } button)
return;
button.SpriteView.Sprite = sprite;
button.SpriteView.SetEntity(entity);
button.StorageButton.Visible = showStorage;
}

2
Content.Client/Verbs/UI/VerbMenuElement.cs
View File

@@ -50,8 +50,8 @@ namespace Content.Client.Verbs.UI
{
OverrideDirection = Direction.South,
SetSize = new Vector2(ElementHeight, ElementHeight),
Sprite = entManager.GetComponentOrNull<SpriteComponent>(verb.IconEntity.Value)
};
spriteView.SetEntity(verb.IconEntity.Value);
Icon.AddChild(spriteView);
return;

5
Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs
View File

@@ -56,10 +56,7 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow
}
ArtifactDisplay.Visible = true;
if (!_ent.TryGetComponent<SpriteComponent>(uid, out var sprite))
return;
ArtifactDisplay.Sprite = sprite;
ArtifactDisplay.SetEntity(uid);
}
public void UpdateInformationDisplay(AnalysisConsoleScanUpdateState state)