diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
index 021289db69..6157a96f42 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
@@ -9,7 +9,7 @@
-
+
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
index 3b71918049..10829a504c 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
@@ -2,13 +2,10 @@ using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
-using Robust.Shared.ContentPack;
using Robust.Shared.Map;
-using Robust.Shared.Utility;
namespace Content.Client.Administration.UI.Tabs.AdminbusTab
{
@@ -16,8 +13,6 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
[UsedImplicitly]
public sealed partial class LoadBlueprintsWindow : DefaultWindow
{
- private Dictionary _pathIndices = new();
-
public LoadBlueprintsWindow()
{
RobustXamlLoader.Load(this);
@@ -26,30 +21,15 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
protected override void EnteredTree()
{
var mapManager = IoCManager.Resolve();
- var provider = IoCManager.Resolve();
foreach (var mapId in mapManager.GetAllMapIds())
{
MapOptions.AddItem(mapId.ToString(), (int) mapId);
}
- var pathIndex = 0;
-
- foreach (var path in provider.ContentFindFiles(new ResourcePath("/Maps/")))
- {
- var strPath = path.ToString();
-
- if (strPath.StartsWith("/Maps/Salvage/") || strPath.StartsWith("/Maps/Test/")) continue;
-
- MapPath.AddItem(strPath[6..], pathIndex);
- _pathIndices[pathIndex] = strPath;
- pathIndex++;
- }
-
Reset();
MapOptions.OnItemSelected += OnOptionSelect;
- MapPath.OnItemSelected += OnPathSelect;
RotationSpin.ValueChanged += OnRotate;
SubmitButton.OnPressed += OnSubmitButtonPressed;
TeleportButton.OnPressed += OnTeleportButtonPressed;
@@ -114,11 +94,6 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
return newValue;
}
- private void OnPathSelect(OptionButton.ItemSelectedEventArgs obj)
- {
- MapPath.SelectId(obj.Id);
- }
-
private void OnOptionSelect(OptionButton.ItemSelectedEventArgs obj)
{
MapOptions.SelectId(obj.Id);
@@ -132,8 +107,10 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs obj)
{
+ if (MapPath.Text.Length == 0) return;
+
IoCManager.Resolve().ExecuteCommand(
- $"loadbp {MapOptions.SelectedId} \"{_pathIndices[MapPath.SelectedId]}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
+ $"loadbp {MapOptions.SelectedId} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
}
}
}