Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

4
Content.Client/Mech/Ui/Equipment/MechGrabberUi.cs
View File

@@ -20,9 +20,11 @@ public sealed partial class MechGrabberUi : UIFragment
return;
_fragment = new MechGrabberUiFragment();
_fragment.OnEjectAction += e =>
{
userInterface.SendMessage(new MechGrabberEjectMessage(fragmentOwner.Value, e));
var entManager = IoCManager.Resolve<IEntityManager>();
userInterface.SendMessage(new MechGrabberEjectMessage(entManager.GetNetEntity(fragmentOwner.Value), entManager.GetNetEntity(e)));
};
}

2
Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs
View File

@@ -23,7 +23,7 @@ public sealed partial class MechGrabberUiFragment : BoxContainer
SpaceLabel.Text = $"{state.Contents.Count}/{state.MaxContents}";
for (var i = 0; i < state.Contents.Count; i++)
{
var ent = state.Contents[i];
var ent = _entity.GetEntity(state.Contents[i]);
if (!_entity.TryGetComponent<MetaDataComponent>(ent, out var meta))
continue;

3
Content.Client/Mech/Ui/Equipment/MechSoundboardUi.cs
View File

@@ -22,7 +22,8 @@ public sealed partial class MechSoundboardUi : UIFragment
_fragment = new MechSoundboardUiFragment();
_fragment.OnPlayAction += sound =>
{
userInterface.SendMessage(new MechSoundboardPlayMessage(fragmentOwner.Value, sound));
// TODO: IDK dog
userInterface.SendMessage(new MechSoundboardPlayMessage(IoCManager.Resolve<IEntityManager>().GetNetEntity(fragmentOwner.Value), sound));
};
}

4
Content.Client/Mech/Ui/MechBoundUserInterface.cs
View File

@@ -27,7 +27,7 @@ public sealed class MechBoundUserInterface : BoundUserInterface
_menu.OnRemoveButtonPressed += uid =>
{
SendMessage(new MechEquipmentRemoveMessage(uid));
SendMessage(new MechEquipmentRemoveMessage(EntMan.GetNetEntity(uid)));
};
}
@@ -54,7 +54,7 @@ public sealed class MechBoundUserInterface : BoundUserInterface
continue;
foreach (var (attached, estate) in state.EquipmentStates)
{
if (ent == attached)
if (ent == EntMan.GetEntity(attached))
ui.UpdateState(estate);
}
}