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

Fix misc commands (#20004)

Browse Source
This commit is contained in:
Leon Friedrich
2023-09-11 17:21:52 +12:00
committed by GitHub
parent 0689e864e7
commit a225fe99b6
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Client.Administration.UI.SetOutfit
public override void HandleState(EuiStateBase state) public override void HandleState(EuiStateBase state)
{ {
var outfitState = (SetOutfitEuiState) state; var outfitState = (SetOutfitEuiState) state;
_window.TargetEntityId = _entManager.GetEntity(outfitState.TargetNetEntity); _window.TargetEntityId = outfitState.TargetNetEntity;
} }
} }

2
Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Administration.UI.SetOutfit
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!; [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
public EntityUid? TargetEntityId { get; set; } public NetEntity? TargetEntityId { get; set; }
private StartingGearPrototype? _selectedOutfit; private StartingGearPrototype? _selectedOutfit;
public SetOutfitMenu() public SetOutfitMenu()

4
Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
View File

@@ -104,7 +104,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
private void OnTeleportButtonPressed(BaseButton.ButtonEventArgs obj) private void OnTeleportButtonPressed(BaseButton.ButtonEventArgs obj)
{ {
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand( IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
$"tp {XCoordinate.Value} {YCoordinate.Value} {new NetEntity(MapOptions.SelectedId)}"); $"tp {XCoordinate.Value} {YCoordinate.Value} {new MapId(MapOptions.SelectedId)}");
} }
private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs obj) private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs obj)
@@ -112,7 +112,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
if (MapPath.Text.Length == 0) return; if (MapPath.Text.Length == 0) return;
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand( IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
$"loadbp {new NetEntity(MapOptions.SelectedId)} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}"); $"loadbp {new MapId(MapOptions.SelectedId)} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
} }
} }
} }

6
Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
[UsedImplicitly] [UsedImplicitly]
public sealed partial class AddGasWindow : DefaultWindow public sealed partial class AddGasWindow : DefaultWindow
{ {
private List<EntityUid>? _gridData; private List<NetEntity>? _gridData;
private IEnumerable<GasPrototype>? _gasData; private IEnumerable<GasPrototype>? _gasData;
protected override void EnteredTree() protected override void EnteredTree()
@@ -25,11 +25,12 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var playerManager = IoCManager.Resolve<IPlayerManager>(); var playerManager = IoCManager.Resolve<IPlayerManager>();
var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>(); var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
_gridData ??= new List<EntityUid>(); _gridData ??= new List<NetEntity>();
_gridData.Clear(); _gridData.Clear();
while (gridQuery.MoveNext(out var uid, out _)) while (gridQuery.MoveNext(out var uid, out _))
{ {
_gridData.Add(entManager.GetNetEntity(uid));
var player = playerManager.LocalPlayer?.ControlledEntity; var player = playerManager.LocalPlayer?.ControlledEntity;
var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid; var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}"); GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
@@ -60,7 +61,6 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var gasList = _gasData.ToList(); var gasList = _gasData.ToList();
var gasId = gasList[GasOptions.SelectedId].ID; var gasId = gasList[GasOptions.SelectedId].ID;
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand( IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
$"addgas {TileXSpin.Value} {TileYSpin.Value} {gridIndex} {gasId} {AmountSpin.Value}"); $"addgas {TileXSpin.Value} {TileYSpin.Value} {gridIndex} {gasId} {AmountSpin.Value}");
} }

6
Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
[UsedImplicitly] [UsedImplicitly]
public sealed partial class FillGasWindow : DefaultWindow public sealed partial class FillGasWindow : DefaultWindow
{ {
private List<EntityUid>? _gridData; private List<NetEntity>? _gridData;
private IEnumerable<GasPrototype>? _gasData; private IEnumerable<GasPrototype>? _gasData;
protected override void EnteredTree() protected override void EnteredTree()
@@ -29,7 +29,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var playerManager = IoCManager.Resolve<IPlayerManager>(); var playerManager = IoCManager.Resolve<IPlayerManager>();
var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>(); var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
_gridData ??= new List<EntityUid>(); _gridData ??= new List<NetEntity>();
_gridData.Clear(); _gridData.Clear();
while (gridQuery.MoveNext(out var uid, out _)) while (gridQuery.MoveNext(out var uid, out _))
@@ -37,7 +37,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var player = playerManager.LocalPlayer?.ControlledEntity; var player = playerManager.LocalPlayer?.ControlledEntity;
var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid; var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}"); GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
_gridData.Add(uid); _gridData.Add(entManager.GetNetEntity(uid));
} }
GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id); GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

8
Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
[UsedImplicitly] [UsedImplicitly]
public sealed partial class SetTemperatureWindow : DefaultWindow public sealed partial class SetTemperatureWindow : DefaultWindow
{ {
private List<EntityUid>? _data; private List<NetEntity>? _data;
protected override void EnteredTree() protected override void EnteredTree()
{ {
@@ -25,7 +25,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var playerManager = IoCManager.Resolve<IPlayerManager>(); var playerManager = IoCManager.Resolve<IPlayerManager>();
var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>(); var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
_data ??= new List<EntityUid>(); _data ??= new List<NetEntity>();
_data.Clear(); _data.Clear();
while (gridQuery.MoveNext(out var uid, out _)) while (gridQuery.MoveNext(out var uid, out _))
@@ -33,7 +33,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var player = playerManager.LocalPlayer?.ControlledEntity; var player = playerManager.LocalPlayer?.ControlledEntity;
var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid; var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}"); GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
_data.Add(uid); _data.Add(entManager.GetNetEntity(uid));
} }
GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id); GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);
@@ -47,7 +47,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
var selectedGrid = _data[GridOptions.SelectedId]; var selectedGrid = _data[GridOptions.SelectedId];
IoCManager.Resolve<IClientConsoleHost>() IoCManager.Resolve<IClientConsoleHost>()
.ExecuteCommand($"settemp {TileXSpin.Value} {TileYSpin.Value} {IoCManager.Resolve<IEntityManager>().GetNetEntity(selectedGrid)} {TemperatureSpin.Value}"); .ExecuteCommand($"settemp {TileXSpin.Value} {TileYSpin.Value} {selectedGrid} {TemperatureSpin.Value}");
} }
} }
} }