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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Instruments/UI/BandMenu.xaml.cs
View File

@@ -32,12 +32,13 @@ public sealed partial class BandMenu : DefaultWindow
Timer.Spawn(0, Close);
}
public void Populate((EntityUid, string)[] nearby)
public void Populate((NetEntity, string)[] nearby, IEntityManager entManager)
{
BandList.Clear();
foreach (var (uid, name) in nearby)
foreach (var (nent, name) in nearby)
{
var uid = entManager.GetEntity(nent);
var item = BandList.AddItem(name, null, true, uid);
item.Selected = _owner.Instrument?.Master == uid;
}

10
Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
View File

@@ -10,15 +10,15 @@ namespace Content.Client.Instruments.UI
{
public sealed class InstrumentBoundUserInterface : BoundUserInterface
{
[Dependency] public readonly IEntityManager Entities = default!;
public IEntityManager Entities => EntMan;
[Dependency] public readonly IMidiManager MidiManager = default!;
[Dependency] public readonly IFileDialogManager FileDialogManager = default!;
[Dependency] public readonly IPlayerManager PlayerManager = default!;
[Dependency] public readonly ILocalizationManager Loc = default!;
public readonly InstrumentSystem Instruments = default!;
public readonly ActionBlockerSystem ActionBlocker = default!;
public readonly SharedInteractionSystem Interactions = default!;
public readonly InstrumentSystem Instruments;
public readonly ActionBlockerSystem ActionBlocker;
public readonly SharedInteractionSystem Interactions;
[ViewVariables] private InstrumentMenu? _instrumentMenu;
[ViewVariables] private BandMenu? _bandMenu;
@@ -40,7 +40,7 @@ namespace Content.Client.Instruments.UI
switch (message)
{
case InstrumentBandResponseBuiMessage bandRx:
_bandMenu?.Populate(bandRx.Nearby);
_bandMenu?.Populate(bandRx.Nearby, EntMan);
break;
default:
break;