diff --git a/MinecraftBdsManager/Configuration/Settings.cs b/MinecraftBdsManager/Configuration/Settings.cs index 3dd4496..20f9ccc 100644 --- a/MinecraftBdsManager/Configuration/Settings.cs +++ b/MinecraftBdsManager/Configuration/Settings.cs @@ -58,7 +58,11 @@ public static Settings CurrentSettings return _instance; } } - + /// + /// The settings file that was loaded with this instance + /// + public static String SettingsLocation { get; } = _settingsFilePath; + /// /// Settings that govern if and how logs will be written to the file system. /// diff --git a/MinecraftBdsManager/Managers/BdsManager.cs b/MinecraftBdsManager/Managers/BdsManager.cs index 5be136f..8d6fb8c 100644 --- a/MinecraftBdsManager/Managers/BdsManager.cs +++ b/MinecraftBdsManager/Managers/BdsManager.cs @@ -84,9 +84,9 @@ private set public static DateTime? UserLastLoggedOffAt { get; private set; } /// - /// Path to the world directory. This is null if the server has not been started. + /// Path to the world directory. This is an empty path if the server has never been started to avoid Path.combine errors on startup. (race condition) /// - public static string? WorldDirectoryPath { get; private set; } + public static string? WorldDirectoryPath { get; private set; } = ""; /// /// Determines if users have active on the server in the last time interval specified diff --git a/MinecraftBdsManager/Managers/ProcessManager.cs b/MinecraftBdsManager/Managers/ProcessManager.cs index cd1f82b..9e17340 100644 --- a/MinecraftBdsManager/Managers/ProcessManager.cs +++ b/MinecraftBdsManager/Managers/ProcessManager.cs @@ -60,7 +60,7 @@ public static bool StartProcess(ProcessName processName, string executablePath, return StartFireAndForgetProcess(executablePath, arguments); } - Trace.TraceInformation($"Starting process {processName}."); + Trace.TraceInformation($"Starting process: {processName}, using {arguments}."); // Check to see if we are already tracking this process... if (TrackedProcesses.ContainsKey(processName) && processName != ProcessName.FireAndForget) diff --git a/MinecraftBdsManager/frmMain.Designer.cs b/MinecraftBdsManager/frmMain.Designer.cs index 70c1c4f..7bf1d19 100644 --- a/MinecraftBdsManager/frmMain.Designer.cs +++ b/MinecraftBdsManager/frmMain.Designer.cs @@ -49,6 +49,8 @@ private void InitializeComponent() // // toolBarMain // + this.toolBarMain.AutoSize = false; + this.toolBarMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolBarMain.ImageScalingSize = new System.Drawing.Size(24, 24); this.toolBarMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolBtnSettings, @@ -59,10 +61,11 @@ private void InitializeComponent() this.toolBtnOpenSavesFolder, this.toolBtnBackupNow, this.toolBtnMapNow}); + this.toolBarMain.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.toolBarMain.Location = new System.Drawing.Point(0, 0); this.toolBarMain.Name = "toolBarMain"; - this.toolBarMain.Padding = new System.Windows.Forms.Padding(0, 7, 3, 0); - this.toolBarMain.Size = new System.Drawing.Size(1373, 40); + this.toolBarMain.Padding = new System.Windows.Forms.Padding(12, 0, 0, 0); + this.toolBarMain.Size = new System.Drawing.Size(690, 35); this.toolBarMain.TabIndex = 6; // // toolBtnSettings @@ -71,9 +74,10 @@ private void InitializeComponent() this.toolBtnSettings.Image = global::MinecraftBdsManager.Properties.Resources.gears; this.toolBtnSettings.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnSettings.Name = "toolBtnSettings"; - this.toolBtnSettings.Size = new System.Drawing.Size(34, 28); + this.toolBtnSettings.Size = new System.Drawing.Size(28, 32); this.toolBtnSettings.Text = "toolStripButton1"; this.toolBtnSettings.ToolTipText = "Minecraft BDS Manager Settings"; + this.toolBtnSettings.Click += new System.EventHandler(this.toolBtnSettings_Click); // // toolBtnStart // @@ -81,7 +85,7 @@ private void InitializeComponent() this.toolBtnStart.Image = global::MinecraftBdsManager.Properties.Resources.media_play_green; this.toolBtnStart.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnStart.Name = "toolBtnStart"; - this.toolBtnStart.Size = new System.Drawing.Size(34, 28); + this.toolBtnStart.Size = new System.Drawing.Size(28, 32); this.toolBtnStart.Text = "toolStripButton1"; this.toolBtnStart.ToolTipText = "Start Bedrock Dedicated Server"; this.toolBtnStart.Click += new System.EventHandler(this.toolBtnStart_Click); @@ -93,7 +97,7 @@ private void InitializeComponent() this.toolBtnStop.Image = global::MinecraftBdsManager.Properties.Resources.media_stop_red; this.toolBtnStop.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnStop.Name = "toolBtnStop"; - this.toolBtnStop.Size = new System.Drawing.Size(34, 28); + this.toolBtnStop.Size = new System.Drawing.Size(28, 32); this.toolBtnStop.Text = "toolStripButton1"; this.toolBtnStop.ToolTipText = "Stop Bedrock Dedicated Server"; this.toolBtnStop.Click += new System.EventHandler(this.toolBtnStop_Click); @@ -104,7 +108,7 @@ private void InitializeComponent() this.toolBtnViewLog.Image = global::MinecraftBdsManager.Properties.Resources.notebook; this.toolBtnViewLog.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnViewLog.Name = "toolBtnViewLog"; - this.toolBtnViewLog.Size = new System.Drawing.Size(34, 28); + this.toolBtnViewLog.Size = new System.Drawing.Size(28, 32); this.toolBtnViewLog.Text = "toolStripButton2"; this.toolBtnViewLog.ToolTipText = "Show current log file"; this.toolBtnViewLog.Click += new System.EventHandler(this.toolBtnViewLog_Click); @@ -115,7 +119,7 @@ private void InitializeComponent() this.toolBtnOpenLogsFolder.Image = global::MinecraftBdsManager.Properties.Resources.folder_document; this.toolBtnOpenLogsFolder.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnOpenLogsFolder.Name = "toolBtnOpenLogsFolder"; - this.toolBtnOpenLogsFolder.Size = new System.Drawing.Size(34, 28); + this.toolBtnOpenLogsFolder.Size = new System.Drawing.Size(28, 32); this.toolBtnOpenLogsFolder.Text = "toolStripButton3"; this.toolBtnOpenLogsFolder.ToolTipText = "Open Logs folder"; this.toolBtnOpenLogsFolder.Click += new System.EventHandler(this.toolBtnOpenLogsFolder_Click); @@ -126,7 +130,7 @@ private void InitializeComponent() this.toolBtnOpenSavesFolder.Image = global::MinecraftBdsManager.Properties.Resources.folder_cubes; this.toolBtnOpenSavesFolder.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnOpenSavesFolder.Name = "toolBtnOpenSavesFolder"; - this.toolBtnOpenSavesFolder.Size = new System.Drawing.Size(34, 28); + this.toolBtnOpenSavesFolder.Size = new System.Drawing.Size(28, 32); this.toolBtnOpenSavesFolder.Text = "toolStripButton4"; this.toolBtnOpenSavesFolder.ToolTipText = "Open backups folder"; this.toolBtnOpenSavesFolder.Click += new System.EventHandler(this.toolBtnOpenSavesFolder_Click); @@ -137,7 +141,7 @@ private void InitializeComponent() this.toolBtnBackupNow.Image = global::MinecraftBdsManager.Properties.Resources.data_disk; this.toolBtnBackupNow.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnBackupNow.Name = "toolBtnBackupNow"; - this.toolBtnBackupNow.Size = new System.Drawing.Size(34, 28); + this.toolBtnBackupNow.Size = new System.Drawing.Size(28, 32); this.toolBtnBackupNow.Text = "toolStripButton1"; this.toolBtnBackupNow.ToolTipText = "Create a backup now"; this.toolBtnBackupNow.Click += new System.EventHandler(this.toolBtnBackupNow_Click); @@ -148,43 +152,51 @@ private void InitializeComponent() this.toolBtnMapNow.Image = global::MinecraftBdsManager.Properties.Resources.photo_scenery; this.toolBtnMapNow.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolBtnMapNow.Name = "toolBtnMapNow"; - this.toolBtnMapNow.Size = new System.Drawing.Size(34, 28); + this.toolBtnMapNow.Size = new System.Drawing.Size(28, 32); this.toolBtnMapNow.Text = "toolStripButton2"; this.toolBtnMapNow.ToolTipText = "Create a new map"; this.toolBtnMapNow.Click += new System.EventHandler(this.toolBtnMapNow_Click); // // txtCustomCommand // - this.txtCustomCommand.Location = new System.Drawing.Point(12, 690); + this.txtCustomCommand.AcceptsReturn = true; + this.txtCustomCommand.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtCustomCommand.Location = new System.Drawing.Point(123, 61); + this.txtCustomCommand.Margin = new System.Windows.Forms.Padding(2); this.txtCustomCommand.Name = "txtCustomCommand"; - this.txtCustomCommand.Size = new System.Drawing.Size(1168, 31); + this.txtCustomCommand.Size = new System.Drawing.Size(556, 23); this.txtCustomCommand.TabIndex = 2; // // btnIssueCommand // - this.btnIssueCommand.Location = new System.Drawing.Point(1202, 688); + this.btnIssueCommand.Enabled = false; + this.btnIssueCommand.Location = new System.Drawing.Point(9, 61); + this.btnIssueCommand.Margin = new System.Windows.Forms.Padding(2); this.btnIssueCommand.Name = "btnIssueCommand"; - this.btnIssueCommand.Size = new System.Drawing.Size(159, 34); + this.btnIssueCommand.Size = new System.Drawing.Size(111, 23); this.btnIssueCommand.TabIndex = 3; - this.btnIssueCommand.Text = "Send Command"; + this.btnIssueCommand.Text = "&Send Command:"; this.btnIssueCommand.UseVisualStyleBackColor = true; this.btnIssueCommand.Click += new System.EventHandler(this.btnIssueCommand_Click); // // lblStatusBox // this.lblStatusBox.AutoSize = true; - this.lblStatusBox.Location = new System.Drawing.Point(12, 43); + this.lblStatusBox.Location = new System.Drawing.Point(9, 104); + this.lblStatusBox.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblStatusBox.Name = "lblStatusBox"; - this.lblStatusBox.Size = new System.Drawing.Size(187, 25); + this.lblStatusBox.Size = new System.Drawing.Size(121, 15); this.lblStatusBox.TabIndex = 4; this.lblStatusBox.Text = "Server status and logs"; // // lblCustomCommand // this.lblCustomCommand.AutoSize = true; - this.lblCustomCommand.Location = new System.Drawing.Point(12, 662); + this.lblCustomCommand.Location = new System.Drawing.Point(9, 44); + this.lblCustomCommand.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblCustomCommand.Name = "lblCustomCommand"; - this.lblCustomCommand.Size = new System.Drawing.Size(212, 25); + this.lblCustomCommand.Size = new System.Drawing.Size(139, 15); this.lblCustomCommand.TabIndex = 5; this.lblCustomCommand.Text = "Issue command to server"; // @@ -204,19 +216,20 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.rtbStatus.BackColor = System.Drawing.SystemColors.ControlLight; this.rtbStatus.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.rtbStatus.Location = new System.Drawing.Point(12, 71); + this.rtbStatus.Location = new System.Drawing.Point(9, 121); + this.rtbStatus.Margin = new System.Windows.Forms.Padding(2); this.rtbStatus.Name = "rtbStatus"; this.rtbStatus.ReadOnly = true; - this.rtbStatus.Size = new System.Drawing.Size(1331, 569); + this.rtbStatus.Size = new System.Drawing.Size(670, 335); this.rtbStatus.TabIndex = 7; this.rtbStatus.Text = ""; this.rtbStatus.TextChanged += new System.EventHandler(this.rtbStatus_TextChanged); // // frmMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1373, 753); + this.ClientSize = new System.Drawing.Size(690, 467); this.Controls.Add(this.rtbStatus); this.Controls.Add(this.lblCustomCommand); this.Controls.Add(this.lblStatusBox); @@ -224,6 +237,7 @@ private void InitializeComponent() this.Controls.Add(this.txtCustomCommand); this.Controls.Add(this.toolBarMain); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "frmMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Minecraft BDS Manager"; diff --git a/MinecraftBdsManager/frmMain.cs b/MinecraftBdsManager/frmMain.cs index d7fcfb4..21f9391 100644 --- a/MinecraftBdsManager/frmMain.cs +++ b/MinecraftBdsManager/frmMain.cs @@ -19,9 +19,11 @@ private async void btnIssueCommand_Click(object sender, EventArgs e) { return; } - - await BdsManager.SendCommandAsync(txtCustomCommand.Text, userSentCommand: true); - txtCustomCommand.Text = String.Empty; + if (BdsManager.ServerIsRunning) + { + await BdsManager.SendCommandAsync(txtCustomCommand.Text, userSentCommand: true); + txtCustomCommand.Text = String.Empty; + } } private void frmMain_FormClosing(object sender, FormClosingEventArgs e) @@ -142,5 +144,16 @@ private void toolBtnViewLog_Click(object sender, EventArgs e) ProcessManager.StartProcess(ProcessName.FireAndForget, "explorer.exe", LogManager.CurrentLogFilePath); } + + private void toolBtnSettings_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(Settings.SettingsLocation)) + { + LogManager.LogWarning($"An invalid Settings location has been specified {Settings.SettingsLocation}"); + return; + } + + ProcessManager.StartProcess(ProcessName.FireAndForget, "explorer.exe", Settings.SettingsLocation); + } } }