diff --git a/ServCreator/.vs/ServCreator/v16/.suo b/ServCreator/.vs/ServCreator/v16/.suo index 9d2203a..3634173 100644 Binary files a/ServCreator/.vs/ServCreator/v16/.suo and b/ServCreator/.vs/ServCreator/v16/.suo differ diff --git a/ServCreator/ServCreator/AddServerForm.Designer.cs b/ServCreator/ServCreator/AddServerForm.Designer.cs index b625a01..a429c41 100644 --- a/ServCreator/ServCreator/AddServerForm.Designer.cs +++ b/ServCreator/ServCreator/AddServerForm.Designer.cs @@ -58,25 +58,25 @@ namespace ServCreator // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 105); + this.label1.Location = new System.Drawing.Point(12, 93); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(87, 17); + this.label1.Size = new System.Drawing.Size(98, 15); this.label1.TabIndex = 0; - this.label1.Text = "Server Name:"; + this.label1.Text = "Server Name*:"; // // serverNameBox // - this.serverNameBox.Location = new System.Drawing.Point(15, 125); + this.serverNameBox.Location = new System.Drawing.Point(15, 110); this.serverNameBox.Name = "serverNameBox"; - this.serverNameBox.Size = new System.Drawing.Size(359, 25); + this.serverNameBox.Size = new System.Drawing.Size(359, 23); this.serverNameBox.TabIndex = 1; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 57); + this.label2.Location = new System.Drawing.Point(12, 50); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(96, 17); + this.label2.Size = new System.Drawing.Size(112, 15); this.label2.TabIndex = 4; this.label2.Text = "Server Engine*:"; // @@ -84,17 +84,17 @@ namespace ServCreator // this.serverEngineCB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.serverEngineCB.FormattingEnabled = true; - this.serverEngineCB.Location = new System.Drawing.Point(15, 77); + this.serverEngineCB.Location = new System.Drawing.Point(15, 68); this.serverEngineCB.Name = "serverEngineCB"; - this.serverEngineCB.Size = new System.Drawing.Size(142, 25); + this.serverEngineCB.Size = new System.Drawing.Size(142, 23); this.serverEngineCB.TabIndex = 5; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(160, 57); + this.label3.Location = new System.Drawing.Point(160, 50); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(59, 17); + this.label3.Size = new System.Drawing.Size(70, 15); this.label3.TabIndex = 6; this.label3.Text = "Version*:"; // @@ -104,19 +104,19 @@ namespace ServCreator this.serverVersionCB.FormattingEnabled = true; this.serverVersionCB.Items.AddRange(new object[] { ""}); - this.serverVersionCB.Location = new System.Drawing.Point(163, 77); + this.serverVersionCB.Location = new System.Drawing.Point(163, 68); this.serverVersionCB.Name = "serverVersionCB"; - this.serverVersionCB.Size = new System.Drawing.Size(211, 25); + this.serverVersionCB.Size = new System.Drawing.Size(211, 23); this.serverVersionCB.TabIndex = 7; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(15, 157); + this.label5.Location = new System.Drawing.Point(15, 139); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(347, 34); + this.label5.Size = new System.Drawing.Size(385, 30); this.label5.TabIndex = 11; - this.label5.Text = "ServManager requires \"start.bat\" file with arguments, that \r\nyou\'re running serve" + + this.label5.Text = "ServManager requires \"start.bat\" file with arguments, \r\nthat you\'re running serve" + "r your local server."; // // groupBox1 @@ -128,22 +128,22 @@ namespace ServCreator this.groupBox1.Controls.Add(this.argumentsTB); this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.checkBox1); - this.groupBox1.Location = new System.Drawing.Point(12, 194); + this.groupBox1.Location = new System.Drawing.Point(12, 171); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(370, 124); + this.groupBox1.Size = new System.Drawing.Size(370, 109); this.groupBox1.TabIndex = 12; this.groupBox1.TabStop = false; // // maxRAM // - this.maxRAM.Location = new System.Drawing.Point(191, 41); + this.maxRAM.Location = new System.Drawing.Point(191, 36); this.maxRAM.Maximum = new decimal(new int[] { 102400, 0, 0, 0}); this.maxRAM.Name = "maxRAM"; - this.maxRAM.Size = new System.Drawing.Size(171, 25); + this.maxRAM.Size = new System.Drawing.Size(171, 23); this.maxRAM.TabIndex = 20; this.maxRAM.Value = new decimal(new int[] { 2048, @@ -154,22 +154,22 @@ namespace ServCreator // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(188, 21); + this.label7.Location = new System.Drawing.Point(188, 19); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(150, 17); + this.label7.Size = new System.Drawing.Size(154, 15); this.label7.TabIndex = 19; this.label7.Text = "Maximum RAM (in MB)*:"; // // minRAM // - this.minRAM.Location = new System.Drawing.Point(6, 41); + this.minRAM.Location = new System.Drawing.Point(6, 36); this.minRAM.Maximum = new decimal(new int[] { 102400, 0, 0, 0}); this.minRAM.Name = "minRAM"; - this.minRAM.Size = new System.Drawing.Size(177, 25); + this.minRAM.Size = new System.Drawing.Size(177, 23); this.minRAM.TabIndex = 18; this.minRAM.Value = new decimal(new int[] { 2048, @@ -180,25 +180,25 @@ namespace ServCreator // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 21); + this.label6.Location = new System.Drawing.Point(6, 19); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(147, 17); + this.label6.Size = new System.Drawing.Size(154, 15); this.label6.TabIndex = 17; this.label6.Text = "Minimum RAM (in MB)*:"; // // argumentsTB // - this.argumentsTB.Location = new System.Drawing.Point(6, 89); + this.argumentsTB.Location = new System.Drawing.Point(6, 79); this.argumentsTB.Name = "argumentsTB"; - this.argumentsTB.Size = new System.Drawing.Size(356, 25); + this.argumentsTB.Size = new System.Drawing.Size(356, 23); this.argumentsTB.TabIndex = 15; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(6, 69); + this.label8.Location = new System.Drawing.Point(6, 61); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(136, 17); + this.label8.Size = new System.Drawing.Size(154, 15); this.label8.TabIndex = 16; this.label8.Text = "Additional arguments:"; // @@ -207,7 +207,7 @@ namespace ServCreator this.checkBox1.AutoSize = true; this.checkBox1.Location = new System.Drawing.Point(9, 0); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(127, 21); + this.checkBox1.Size = new System.Drawing.Size(152, 19); this.checkBox1.TabIndex = 0; this.checkBox1.Text = "Create \"start.bat\""; this.checkBox1.UseVisualStyleBackColor = true; @@ -215,9 +215,9 @@ namespace ServCreator // addBtn // this.addBtn.ForeColor = System.Drawing.Color.Black; - this.addBtn.Location = new System.Drawing.Point(307, 324); + this.addBtn.Location = new System.Drawing.Point(307, 286); this.addBtn.Name = "addBtn"; - this.addBtn.Size = new System.Drawing.Size(75, 25); + this.addBtn.Size = new System.Drawing.Size(75, 22); this.addBtn.TabIndex = 13; this.addBtn.Text = "Add"; this.addBtn.UseVisualStyleBackColor = true; @@ -226,9 +226,9 @@ namespace ServCreator // pathSelectBtn // this.pathSelectBtn.ForeColor = System.Drawing.Color.Black; - this.pathSelectBtn.Location = new System.Drawing.Point(299, 29); + this.pathSelectBtn.Location = new System.Drawing.Point(299, 26); this.pathSelectBtn.Name = "pathSelectBtn"; - this.pathSelectBtn.Size = new System.Drawing.Size(75, 25); + this.pathSelectBtn.Size = new System.Drawing.Size(75, 22); this.pathSelectBtn.TabIndex = 16; this.pathSelectBtn.Text = "Select"; this.pathSelectBtn.UseVisualStyleBackColor = true; @@ -236,17 +236,17 @@ namespace ServCreator // // serverPathBox // - this.serverPathBox.Location = new System.Drawing.Point(15, 29); + this.serverPathBox.Location = new System.Drawing.Point(15, 26); this.serverPathBox.Name = "serverPathBox"; - this.serverPathBox.Size = new System.Drawing.Size(278, 25); + this.serverPathBox.Size = new System.Drawing.Size(278, 23); this.serverPathBox.TabIndex = 15; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 9); + this.label4.Location = new System.Drawing.Point(12, 8); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(41, 17); + this.label4.Size = new System.Drawing.Size(49, 15); this.label4.TabIndex = 14; this.label4.Text = "Path*:"; // @@ -257,10 +257,10 @@ namespace ServCreator // // AddServerForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); - this.ClientSize = new System.Drawing.Size(394, 360); + this.ClientSize = new System.Drawing.Size(394, 318); this.Controls.Add(this.pathSelectBtn); this.Controls.Add(this.serverPathBox); this.Controls.Add(this.label4); @@ -273,10 +273,13 @@ namespace ServCreator this.Controls.Add(this.serverVersionCB); this.Controls.Add(this.serverNameBox); this.Controls.Add(this.label1); - this.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.ForeColor = System.Drawing.Color.White; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.MaximumSize = new System.Drawing.Size(410, 357); + this.MinimumSize = new System.Drawing.Size(410, 357); this.Name = "AddServerForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Add Server - ServManager for Minecraft"; diff --git a/ServCreator/ServCreator/AddServerForm.cs b/ServCreator/ServCreator/AddServerForm.cs index 711cb63..6882a0c 100644 --- a/ServCreator/ServCreator/AddServerForm.cs +++ b/ServCreator/ServCreator/AddServerForm.cs @@ -44,7 +44,7 @@ namespace ServCreator StreamWriter configWriter = new StreamWriter(serverPathBox.Text + "\\servmanager.srv"); configWriter.Write(JsonConvert.SerializeObject(server)); configWriter.Close(); - MessageBox.Show("Server " + serverNameBox.Text + " has been added. You'll be moved to Control Panel"); + MessageBox.Show("Server " + serverNameBox.Text + " has been added. You'll be moved to Control Panel", "Server added", MessageBoxButtons.OK, MessageBoxIcon.Information); ControlPanelForm controlPanel = new ControlPanelForm(serverPathBox.Text + "\\servmanager.srv"); controlPanel.Show(); diff --git a/ServCreator/ServCreator/ControlPanelForm.Designer.cs b/ServCreator/ServCreator/ControlPanelForm.Designer.cs index 1d9cabc..aa40014 100644 --- a/ServCreator/ServCreator/ControlPanelForm.Designer.cs +++ b/ServCreator/ServCreator/ControlPanelForm.Designer.cs @@ -38,7 +38,7 @@ namespace ServCreator this.killBtn = new System.Windows.Forms.Button(); this.servMgmtBox = new System.Windows.Forms.GroupBox(); this.pluginsBtn = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); + this.changeServerEngineBtn = new System.Windows.Forms.Button(); this.easyManagementBtn = new System.Windows.Forms.Button(); this.stopBtn = new System.Windows.Forms.Button(); this.serverLabel = new System.Windows.Forms.Label(); @@ -125,7 +125,7 @@ namespace ServCreator // this.servMgmtBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.servMgmtBox.Controls.Add(this.pluginsBtn); - this.servMgmtBox.Controls.Add(this.button1); + this.servMgmtBox.Controls.Add(this.changeServerEngineBtn); this.servMgmtBox.Controls.Add(this.easyManagementBtn); this.servMgmtBox.Controls.Add(this.stopBtn); this.servMgmtBox.Controls.Add(this.startBtn); @@ -152,17 +152,17 @@ namespace ServCreator this.pluginsBtn.Visible = false; this.pluginsBtn.Click += new System.EventHandler(this.pluginsBtn_Click); // - // button1 + // changeServerEngineBtn // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.button1.ForeColor = System.Drawing.Color.Black; - this.button1.Location = new System.Drawing.Point(6, 166); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(145, 23); - this.button1.TabIndex = 8; - this.button1.Text = "Change Server Engine"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click_1); + this.changeServerEngineBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.changeServerEngineBtn.ForeColor = System.Drawing.Color.Black; + this.changeServerEngineBtn.Location = new System.Drawing.Point(6, 166); + this.changeServerEngineBtn.Name = "changeServerEngineBtn"; + this.changeServerEngineBtn.Size = new System.Drawing.Size(145, 23); + this.changeServerEngineBtn.TabIndex = 8; + this.changeServerEngineBtn.Text = "Change Server Engine"; + this.changeServerEngineBtn.UseVisualStyleBackColor = true; + this.changeServerEngineBtn.Click += new System.EventHandler(this.button1_Click_1); // // easyManagementBtn // @@ -296,7 +296,7 @@ namespace ServCreator private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button changeServerEngineBtn; private System.Windows.Forms.Panel panel6; private System.Windows.Forms.Button pluginsBtn; } diff --git a/ServCreator/ServCreator/ControlPanelForm.cs b/ServCreator/ServCreator/ControlPanelForm.cs index c97520e..a3ac488 100644 --- a/ServCreator/ServCreator/ControlPanelForm.cs +++ b/ServCreator/ServCreator/ControlPanelForm.cs @@ -141,7 +141,7 @@ namespace ServCreator thread.Start(); } - private void ControlPanelForm_FormClosing(object sender, FormClosingEventArgs e) { Application.Exit(); } + private void ControlPanelForm_FormClosing(object sender, FormClosingEventArgs e) { Form1 form1 = new Form1(); form1.Visible = true; } private void submit_Click(object sender, EventArgs e) { process.StandardInput.WriteLine(commandInput.Text); commandInput.Text = ""; commandInput.Focus(); } private void easyManagement(object sender, EventArgs e) { @@ -166,6 +166,7 @@ namespace ServCreator killBtn.Enabled = value; startBtn.Enabled = !value; easyManagementBtn.Enabled = value; + changeServerEngineBtn.Enabled = !value; } private void stopBtn_Click(object sender, EventArgs e) diff --git a/ServCreator/ServCreator/CreateForm.Designer.cs b/ServCreator/ServCreator/CreateForm.Designer.cs index a90c810..c829a47 100644 --- a/ServCreator/ServCreator/CreateForm.Designer.cs +++ b/ServCreator/ServCreator/CreateForm.Designer.cs @@ -167,11 +167,11 @@ namespace ServCreator // selectBtn // this.selectBtn.ForeColor = System.Drawing.Color.Black; - this.selectBtn.Location = new System.Drawing.Point(268, 76); + this.selectBtn.Location = new System.Drawing.Point(255, 76); this.selectBtn.Name = "selectBtn"; - this.selectBtn.Size = new System.Drawing.Size(100, 25); + this.selectBtn.Size = new System.Drawing.Size(113, 25); this.selectBtn.TabIndex = 6; - this.selectBtn.Text = "Select a path..."; + this.selectBtn.Text = "Select a path"; this.selectBtn.UseVisualStyleBackColor = true; this.selectBtn.Click += new System.EventHandler(this.selectPath); // @@ -291,7 +291,7 @@ namespace ServCreator // this.serverPathTB.Location = new System.Drawing.Point(6, 79); this.serverPathTB.Name = "serverPathTB"; - this.serverPathTB.Size = new System.Drawing.Size(256, 23); + this.serverPathTB.Size = new System.Drawing.Size(243, 23); this.serverPathTB.TabIndex = 17; // // progressBar1 @@ -359,6 +359,8 @@ namespace ServCreator // onlineMode // this.onlineMode.AutoSize = true; + this.onlineMode.Checked = true; + this.onlineMode.CheckState = System.Windows.Forms.CheckState.Checked; this.onlineMode.Location = new System.Drawing.Point(94, 141); this.onlineMode.Name = "onlineMode"; this.onlineMode.Size = new System.Drawing.Size(103, 19); diff --git a/ServCreator/ServCreator/CreateForm.cs b/ServCreator/ServCreator/CreateForm.cs index 3312489..2ec5e37 100644 --- a/ServCreator/ServCreator/CreateForm.cs +++ b/ServCreator/ServCreator/CreateForm.cs @@ -112,7 +112,7 @@ namespace ServCreator downloader.DownloadFileCompleted += (s, v) => { progressBar1.Visible = false; - MessageBox.Show("Server " + serverNameTB.Text + " has been created in: " + serverPathTB.Text + ". After pressing the OK button you'll be taken to the control panel."); + MessageBox.Show("Server " + serverNameTB.Text + " has been created in: " + serverPathTB.Text + ". After pressing the OK button you'll be taken to the control panel.", "Server Created", MessageBoxButtons.OK, MessageBoxIcon.Information); ControlPanelForm controlPanel = new ControlPanelForm(serverPathTB.Text + "\\servmanager.srv"); controlPanel.Show(); diff --git a/ServCreator/ServCreator/Form1.Designer.cs b/ServCreator/ServCreator/Form1.Designer.cs index a19a4ad..c1241c6 100644 --- a/ServCreator/ServCreator/Form1.Designer.cs +++ b/ServCreator/ServCreator/Form1.Designer.cs @@ -40,18 +40,18 @@ namespace ServCreator // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(14, 30); + this.label1.Location = new System.Drawing.Point(12, 26); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(249, 17); + this.label1.Size = new System.Drawing.Size(294, 15); this.label1.TabIndex = 0; this.label1.Text = "Load existing server or create a new one:"; // // createBtn // this.createBtn.ForeColor = System.Drawing.Color.Black; - this.createBtn.Location = new System.Drawing.Point(176, 50); + this.createBtn.Location = new System.Drawing.Point(197, 44); this.createBtn.Name = "createBtn"; - this.createBtn.Size = new System.Drawing.Size(64, 25); + this.createBtn.Size = new System.Drawing.Size(64, 22); this.createBtn.TabIndex = 2; this.createBtn.Text = "Create"; this.createBtn.UseVisualStyleBackColor = true; @@ -60,9 +60,9 @@ namespace ServCreator // loadBtn // this.loadBtn.ForeColor = System.Drawing.Color.Black; - this.loadBtn.Location = new System.Drawing.Point(106, 50); + this.loadBtn.Location = new System.Drawing.Point(127, 44); this.loadBtn.Name = "loadBtn"; - this.loadBtn.Size = new System.Drawing.Size(64, 25); + this.loadBtn.Size = new System.Drawing.Size(64, 22); this.loadBtn.TabIndex = 4; this.loadBtn.Text = "Load"; this.loadBtn.UseVisualStyleBackColor = true; @@ -77,9 +77,9 @@ namespace ServCreator // button1 // this.button1.ForeColor = System.Drawing.Color.Black; - this.button1.Location = new System.Drawing.Point(36, 50); + this.button1.Location = new System.Drawing.Point(57, 44); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(64, 25); + this.button1.Size = new System.Drawing.Size(64, 22); this.button1.TabIndex = 5; this.button1.Text = "Add"; this.button1.UseVisualStyleBackColor = true; @@ -87,22 +87,23 @@ namespace ServCreator // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); - this.ClientSize = new System.Drawing.Size(276, 104); + this.ClientSize = new System.Drawing.Size(319, 92); this.Controls.Add(this.button1); this.Controls.Add(this.loadBtn); this.Controls.Add(this.createBtn); this.Controls.Add(this.label1); - this.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.ForeColor = System.Drawing.Color.White; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(292, 143); + this.MaximumSize = new System.Drawing.Size(335, 131); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(292, 143); + this.MinimumSize = new System.Drawing.Size(335, 131); this.Name = "Form1"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "ServManager for Minecraft"; diff --git a/ServCreator/ServCreator/ServerManagementForm.Designer.cs b/ServCreator/ServCreator/ServerManagementForm.Designer.cs index 4d1eb2a..8316f70 100644 --- a/ServCreator/ServCreator/ServerManagementForm.Designer.cs +++ b/ServCreator/ServCreator/ServerManagementForm.Designer.cs @@ -38,6 +38,21 @@ namespace ServCreator this.label3 = new System.Windows.Forms.Label(); this.reasonIpTxt = new System.Windows.Forms.RichTextBox(); this.playerMgmtBox = new System.Windows.Forms.GroupBox(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.giveItemBox = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.giveBtn = new System.Windows.Forms.Button(); + this.giveAmountBox = new System.Windows.Forms.NumericUpDown(); + this.label6 = new System.Windows.Forms.Label(); + this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.addXpBtn = new System.Windows.Forms.Button(); + this.setXpBtn = new System.Windows.Forms.Button(); + this.xpBox = new System.Windows.Forms.NumericUpDown(); + this.label5 = new System.Windows.Forms.Label(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.teleportBtn = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.teleportBox = new System.Windows.Forms.TextBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.nicknameTb = new System.Windows.Forms.TextBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); @@ -47,7 +62,6 @@ namespace ServCreator this.gmBtn = new System.Windows.Forms.Button(); this.gmBox = new System.Windows.Forms.ComboBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.whiteListBox = new System.Windows.Forms.CheckBox(); this.wlDelBtn = new System.Windows.Forms.Button(); this.wlAddBtn = new System.Windows.Forms.Button(); this.groupBox3 = new System.Windows.Forms.GroupBox(); @@ -56,55 +70,41 @@ namespace ServCreator this.banPlayerBtn = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); this.reasonPlayerTxt = new System.Windows.Forms.RichTextBox(); - this.groupBox6 = new System.Windows.Forms.GroupBox(); - this.teleportBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.teleportBtn = new System.Windows.Forms.Button(); - this.groupBox7 = new System.Windows.Forms.GroupBox(); - this.label5 = new System.Windows.Forms.Label(); - this.xpBox = new System.Windows.Forms.NumericUpDown(); - this.setXpBtn = new System.Windows.Forms.Button(); - this.addXpBtn = new System.Windows.Forms.Button(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.giveBtn = new System.Windows.Forms.Button(); - this.giveAmountBox = new System.Windows.Forms.NumericUpDown(); - this.label6 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.giveItemBox = new System.Windows.Forms.TextBox(); + this.whiteListBox = new System.Windows.Forms.CheckBox(); this.groupBox9 = new System.Windows.Forms.GroupBox(); - this.groupBox10 = new System.Windows.Forms.GroupBox(); - this.timeBox = new System.Windows.Forms.NumericUpDown(); - this.timeSetBtn = new System.Windows.Forms.Button(); - this.timeAddBtn = new System.Windows.Forms.Button(); - this.groupBox11 = new System.Windows.Forms.GroupBox(); - this.midnightBtn = new System.Windows.Forms.Button(); - this.dayBtn = new System.Windows.Forms.Button(); - this.nightBtn = new System.Windows.Forms.Button(); - this.noonBtn = new System.Windows.Forms.Button(); - this.groupBox12 = new System.Windows.Forms.GroupBox(); - this.weatherBtn = new System.Windows.Forms.Button(); - this.weatherBox = new System.Windows.Forms.ComboBox(); this.groupBox13 = new System.Windows.Forms.GroupBox(); this.printListBtn = new System.Windows.Forms.Button(); this.reloadBtn = new System.Windows.Forms.Button(); + this.groupBox12 = new System.Windows.Forms.GroupBox(); + this.weatherBtn = new System.Windows.Forms.Button(); + this.weatherBox = new System.Windows.Forms.ComboBox(); + this.groupBox10 = new System.Windows.Forms.GroupBox(); + this.groupBox11 = new System.Windows.Forms.GroupBox(); + this.noonBtn = new System.Windows.Forms.Button(); + this.nightBtn = new System.Windows.Forms.Button(); + this.dayBtn = new System.Windows.Forms.Button(); + this.midnightBtn = new System.Windows.Forms.Button(); + this.timeAddBtn = new System.Windows.Forms.Button(); + this.timeSetBtn = new System.Windows.Forms.Button(); + this.timeBox = new System.Windows.Forms.NumericUpDown(); this.ipBanBox.SuspendLayout(); this.playerMgmtBox.SuspendLayout(); + this.groupBox8.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.giveAmountBox)).BeginInit(); + this.groupBox7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.xpBox)).BeginInit(); + this.groupBox6.SuspendLayout(); this.groupBox5.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); - this.groupBox6.SuspendLayout(); - this.groupBox7.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.xpBox)).BeginInit(); - this.groupBox8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.giveAmountBox)).BeginInit(); this.groupBox9.SuspendLayout(); - this.groupBox10.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.timeBox)).BeginInit(); - this.groupBox11.SuspendLayout(); - this.groupBox12.SuspendLayout(); this.groupBox13.SuspendLayout(); + this.groupBox12.SuspendLayout(); + this.groupBox10.SuspendLayout(); + this.groupBox11.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.timeBox)).BeginInit(); this.SuspendLayout(); // // ipBanBox @@ -199,6 +199,176 @@ namespace ServCreator this.playerMgmtBox.TabStop = false; this.playerMgmtBox.Text = "Player Management"; // + // groupBox8 + // + this.groupBox8.Controls.Add(this.giveItemBox); + this.groupBox8.Controls.Add(this.label7); + this.groupBox8.Controls.Add(this.giveBtn); + this.groupBox8.Controls.Add(this.giveAmountBox); + this.groupBox8.Controls.Add(this.label6); + this.groupBox8.ForeColor = System.Drawing.Color.White; + this.groupBox8.Location = new System.Drawing.Point(320, 207); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.Size = new System.Drawing.Size(162, 124); + this.groupBox8.TabIndex = 13; + this.groupBox8.TabStop = false; + this.groupBox8.Text = "Give"; + // + // giveItemBox + // + this.giveItemBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.giveItemBox.Location = new System.Drawing.Point(6, 31); + this.giveItemBox.Name = "giveItemBox"; + this.giveItemBox.Size = new System.Drawing.Size(150, 20); + this.giveItemBox.TabIndex = 8; + this.giveItemBox.Text = "minecraft:diamond"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(6, 15); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(37, 13); + this.label7.TabIndex = 7; + this.label7.Text = "Item:"; + // + // giveBtn + // + this.giveBtn.ForeColor = System.Drawing.Color.Black; + this.giveBtn.Location = new System.Drawing.Point(110, 96); + this.giveBtn.Name = "giveBtn"; + this.giveBtn.Size = new System.Drawing.Size(46, 23); + this.giveBtn.TabIndex = 6; + this.giveBtn.Text = "Give"; + this.giveBtn.UseVisualStyleBackColor = true; + this.giveBtn.Click += new System.EventHandler(this.giveBtn_Click); + // + // giveAmountBox + // + this.giveAmountBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.giveAmountBox.Location = new System.Drawing.Point(6, 70); + this.giveAmountBox.Maximum = new decimal(new int[] { + 64, + 0, + 0, + 0}); + this.giveAmountBox.Name = "giveAmountBox"; + this.giveAmountBox.Size = new System.Drawing.Size(150, 20); + this.giveAmountBox.TabIndex = 3; + this.giveAmountBox.Value = new decimal(new int[] { + 64, + 0, + 0, + 0}); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(6, 54); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(49, 13); + this.label6.TabIndex = 1; + this.label6.Text = "Amount:"; + // + // groupBox7 + // + this.groupBox7.Controls.Add(this.addXpBtn); + this.groupBox7.Controls.Add(this.setXpBtn); + this.groupBox7.Controls.Add(this.xpBox); + this.groupBox7.Controls.Add(this.label5); + this.groupBox7.ForeColor = System.Drawing.Color.White; + this.groupBox7.Location = new System.Drawing.Point(320, 114); + this.groupBox7.Name = "groupBox7"; + this.groupBox7.Size = new System.Drawing.Size(162, 87); + this.groupBox7.TabIndex = 12; + this.groupBox7.TabStop = false; + this.groupBox7.Text = "Experience"; + // + // addXpBtn + // + this.addXpBtn.ForeColor = System.Drawing.Color.Black; + this.addXpBtn.Location = new System.Drawing.Point(110, 58); + this.addXpBtn.Name = "addXpBtn"; + this.addXpBtn.Size = new System.Drawing.Size(46, 23); + this.addXpBtn.TabIndex = 5; + this.addXpBtn.Text = "Add"; + this.addXpBtn.UseVisualStyleBackColor = true; + this.addXpBtn.Click += new System.EventHandler(this.addXpBtn_Click); + // + // setXpBtn + // + this.setXpBtn.ForeColor = System.Drawing.Color.Black; + this.setXpBtn.Location = new System.Drawing.Point(58, 58); + this.setXpBtn.Name = "setXpBtn"; + this.setXpBtn.Size = new System.Drawing.Size(46, 23); + this.setXpBtn.TabIndex = 4; + this.setXpBtn.Text = "Set"; + this.setXpBtn.UseVisualStyleBackColor = true; + this.setXpBtn.Click += new System.EventHandler(this.setXpBtn_Click); + // + // xpBox + // + this.xpBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.xpBox.Location = new System.Drawing.Point(6, 32); + this.xpBox.Maximum = new decimal(new int[] { + 100000000, + 0, + 0, + 0}); + this.xpBox.Name = "xpBox"; + this.xpBox.Size = new System.Drawing.Size(150, 20); + this.xpBox.TabIndex = 3; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(6, 16); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(49, 13); + this.label5.TabIndex = 1; + this.label5.Text = "Amount:"; + // + // groupBox6 + // + this.groupBox6.Controls.Add(this.teleportBtn); + this.groupBox6.Controls.Add(this.label1); + this.groupBox6.Controls.Add(this.teleportBox); + this.groupBox6.ForeColor = System.Drawing.Color.White; + this.groupBox6.Location = new System.Drawing.Point(320, 19); + this.groupBox6.Name = "groupBox6"; + this.groupBox6.Size = new System.Drawing.Size(162, 89); + this.groupBox6.TabIndex = 11; + this.groupBox6.TabStop = false; + this.groupBox6.Text = "Teleport"; + // + // teleportBtn + // + this.teleportBtn.ForeColor = System.Drawing.Color.Black; + this.teleportBtn.Location = new System.Drawing.Point(81, 58); + this.teleportBtn.Name = "teleportBtn"; + this.teleportBtn.Size = new System.Drawing.Size(75, 23); + this.teleportBtn.TabIndex = 2; + this.teleportBtn.Text = "Teleport"; + this.teleportBtn.UseVisualStyleBackColor = true; + this.teleportBtn.Click += new System.EventHandler(this.teleportBtn_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 16); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(79, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Teleport to:"; + // + // teleportBox + // + this.teleportBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.teleportBox.Location = new System.Drawing.Point(6, 32); + this.teleportBox.Name = "teleportBox"; + this.teleportBox.Size = new System.Drawing.Size(150, 20); + this.teleportBox.TabIndex = 0; + // // groupBox5 // this.groupBox5.Controls.Add(this.nicknameTb); @@ -301,17 +471,6 @@ namespace ServCreator this.groupBox1.TabStop = false; this.groupBox1.Text = "White-list"; // - // whiteListBox - // - this.whiteListBox.AutoSize = true; - this.whiteListBox.Location = new System.Drawing.Point(20, 48); - this.whiteListBox.Name = "whiteListBox"; - this.whiteListBox.Size = new System.Drawing.Size(128, 17); - this.whiteListBox.TabIndex = 4; - this.whiteListBox.Text = "Enable White-list"; - this.whiteListBox.UseVisualStyleBackColor = true; - this.whiteListBox.CheckedChanged += new System.EventHandler(this.whiteListBox_CheckedChanged); - // // wlDelBtn // this.wlDelBtn.ForeColor = System.Drawing.Color.Black; @@ -400,175 +559,16 @@ namespace ServCreator this.reasonPlayerTxt.TabIndex = 0; this.reasonPlayerTxt.Text = ""; // - // groupBox6 + // whiteListBox // - this.groupBox6.Controls.Add(this.teleportBtn); - this.groupBox6.Controls.Add(this.label1); - this.groupBox6.Controls.Add(this.teleportBox); - this.groupBox6.ForeColor = System.Drawing.Color.White; - this.groupBox6.Location = new System.Drawing.Point(320, 19); - this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(162, 89); - this.groupBox6.TabIndex = 11; - this.groupBox6.TabStop = false; - this.groupBox6.Text = "Teleport"; - // - // teleportBox - // - this.teleportBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.teleportBox.Location = new System.Drawing.Point(6, 32); - this.teleportBox.Name = "teleportBox"; - this.teleportBox.Size = new System.Drawing.Size(150, 20); - this.teleportBox.TabIndex = 0; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 16); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(79, 13); - this.label1.TabIndex = 1; - this.label1.Text = "Teleport to:"; - // - // teleportBtn - // - this.teleportBtn.ForeColor = System.Drawing.Color.Black; - this.teleportBtn.Location = new System.Drawing.Point(81, 58); - this.teleportBtn.Name = "teleportBtn"; - this.teleportBtn.Size = new System.Drawing.Size(75, 23); - this.teleportBtn.TabIndex = 2; - this.teleportBtn.Text = "Teleport"; - this.teleportBtn.UseVisualStyleBackColor = true; - this.teleportBtn.Click += new System.EventHandler(this.teleportBtn_Click); - // - // groupBox7 - // - this.groupBox7.Controls.Add(this.addXpBtn); - this.groupBox7.Controls.Add(this.setXpBtn); - this.groupBox7.Controls.Add(this.xpBox); - this.groupBox7.Controls.Add(this.label5); - this.groupBox7.ForeColor = System.Drawing.Color.White; - this.groupBox7.Location = new System.Drawing.Point(320, 114); - this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(162, 87); - this.groupBox7.TabIndex = 12; - this.groupBox7.TabStop = false; - this.groupBox7.Text = "Experience"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(6, 16); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(49, 13); - this.label5.TabIndex = 1; - this.label5.Text = "Amount:"; - // - // xpBox - // - this.xpBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.xpBox.Location = new System.Drawing.Point(6, 32); - this.xpBox.Maximum = new decimal(new int[] { - 100000000, - 0, - 0, - 0}); - this.xpBox.Name = "xpBox"; - this.xpBox.Size = new System.Drawing.Size(150, 20); - this.xpBox.TabIndex = 3; - // - // setXpBtn - // - this.setXpBtn.ForeColor = System.Drawing.Color.Black; - this.setXpBtn.Location = new System.Drawing.Point(58, 58); - this.setXpBtn.Name = "setXpBtn"; - this.setXpBtn.Size = new System.Drawing.Size(46, 23); - this.setXpBtn.TabIndex = 4; - this.setXpBtn.Text = "Set"; - this.setXpBtn.UseVisualStyleBackColor = true; - this.setXpBtn.Click += new System.EventHandler(this.setXpBtn_Click); - // - // addXpBtn - // - this.addXpBtn.ForeColor = System.Drawing.Color.Black; - this.addXpBtn.Location = new System.Drawing.Point(110, 58); - this.addXpBtn.Name = "addXpBtn"; - this.addXpBtn.Size = new System.Drawing.Size(46, 23); - this.addXpBtn.TabIndex = 5; - this.addXpBtn.Text = "Add"; - this.addXpBtn.UseVisualStyleBackColor = true; - this.addXpBtn.Click += new System.EventHandler(this.addXpBtn_Click); - // - // groupBox8 - // - this.groupBox8.Controls.Add(this.giveItemBox); - this.groupBox8.Controls.Add(this.label7); - this.groupBox8.Controls.Add(this.giveBtn); - this.groupBox8.Controls.Add(this.giveAmountBox); - this.groupBox8.Controls.Add(this.label6); - this.groupBox8.ForeColor = System.Drawing.Color.White; - this.groupBox8.Location = new System.Drawing.Point(320, 207); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(162, 124); - this.groupBox8.TabIndex = 13; - this.groupBox8.TabStop = false; - this.groupBox8.Text = "Give"; - // - // giveBtn - // - this.giveBtn.ForeColor = System.Drawing.Color.Black; - this.giveBtn.Location = new System.Drawing.Point(110, 96); - this.giveBtn.Name = "giveBtn"; - this.giveBtn.Size = new System.Drawing.Size(46, 23); - this.giveBtn.TabIndex = 6; - this.giveBtn.Text = "Give"; - this.giveBtn.UseVisualStyleBackColor = true; - this.giveBtn.Click += new System.EventHandler(this.giveBtn_Click); - // - // giveAmountBox - // - this.giveAmountBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.giveAmountBox.Location = new System.Drawing.Point(6, 70); - this.giveAmountBox.Maximum = new decimal(new int[] { - 64, - 0, - 0, - 0}); - this.giveAmountBox.Name = "giveAmountBox"; - this.giveAmountBox.Size = new System.Drawing.Size(150, 20); - this.giveAmountBox.TabIndex = 3; - this.giveAmountBox.Value = new decimal(new int[] { - 64, - 0, - 0, - 0}); - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 54); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(49, 13); - this.label6.TabIndex = 1; - this.label6.Text = "Amount:"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 15); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(37, 13); - this.label7.TabIndex = 7; - this.label7.Text = "Item:"; - // - // giveItemBox - // - this.giveItemBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.giveItemBox.Location = new System.Drawing.Point(6, 31); - this.giveItemBox.Name = "giveItemBox"; - this.giveItemBox.Size = new System.Drawing.Size(150, 20); - this.giveItemBox.TabIndex = 8; - this.giveItemBox.Text = "minecraft:diamond"; + this.whiteListBox.AutoSize = true; + this.whiteListBox.Location = new System.Drawing.Point(20, 48); + this.whiteListBox.Name = "whiteListBox"; + this.whiteListBox.Size = new System.Drawing.Size(128, 17); + this.whiteListBox.TabIndex = 4; + this.whiteListBox.Text = "Enable White-list"; + this.whiteListBox.UseVisualStyleBackColor = true; + this.whiteListBox.CheckedChanged += new System.EventHandler(this.whiteListBox_CheckedChanged); // // groupBox9 // @@ -583,110 +583,40 @@ namespace ServCreator this.groupBox9.TabStop = false; this.groupBox9.Text = "Server Management"; // - // groupBox10 + // groupBox13 // - this.groupBox10.Controls.Add(this.groupBox11); - this.groupBox10.Controls.Add(this.timeAddBtn); - this.groupBox10.Controls.Add(this.timeSetBtn); - this.groupBox10.Controls.Add(this.timeBox); - this.groupBox10.ForeColor = System.Drawing.Color.White; - this.groupBox10.Location = new System.Drawing.Point(6, 19); - this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(168, 157); - this.groupBox10.TabIndex = 12; - this.groupBox10.TabStop = false; - this.groupBox10.Text = "Time"; + this.groupBox13.Controls.Add(this.whiteListBox); + this.groupBox13.Controls.Add(this.printListBtn); + this.groupBox13.Controls.Add(this.reloadBtn); + this.groupBox13.ForeColor = System.Drawing.Color.White; + this.groupBox13.Location = new System.Drawing.Point(6, 264); + this.groupBox13.Name = "groupBox13"; + this.groupBox13.Size = new System.Drawing.Size(168, 67); + this.groupBox13.TabIndex = 11; + this.groupBox13.TabStop = false; + this.groupBox13.Text = "White-list"; // - // timeBox + // printListBtn // - this.timeBox.Location = new System.Drawing.Point(6, 19); - this.timeBox.Maximum = new decimal(new int[] { - 24000, - 0, - 0, - 0}); - this.timeBox.Name = "timeBox"; - this.timeBox.Size = new System.Drawing.Size(156, 20); - this.timeBox.TabIndex = 3; + this.printListBtn.ForeColor = System.Drawing.Color.Black; + this.printListBtn.Location = new System.Drawing.Point(66, 19); + this.printListBtn.Name = "printListBtn"; + this.printListBtn.Size = new System.Drawing.Size(96, 23); + this.printListBtn.TabIndex = 3; + this.printListBtn.Text = "Print List"; + this.printListBtn.UseVisualStyleBackColor = true; + this.printListBtn.Click += new System.EventHandler(this.printListBtn_Click); // - // timeSetBtn + // reloadBtn // - this.timeSetBtn.ForeColor = System.Drawing.Color.Black; - this.timeSetBtn.Location = new System.Drawing.Point(64, 45); - this.timeSetBtn.Name = "timeSetBtn"; - this.timeSetBtn.Size = new System.Drawing.Size(46, 23); - this.timeSetBtn.TabIndex = 7; - this.timeSetBtn.Text = "Set"; - this.timeSetBtn.UseVisualStyleBackColor = true; - this.timeSetBtn.Click += new System.EventHandler(this.timeSetBtn_Click); - // - // timeAddBtn - // - this.timeAddBtn.ForeColor = System.Drawing.Color.Black; - this.timeAddBtn.Location = new System.Drawing.Point(116, 45); - this.timeAddBtn.Name = "timeAddBtn"; - this.timeAddBtn.Size = new System.Drawing.Size(46, 23); - this.timeAddBtn.TabIndex = 8; - this.timeAddBtn.Text = "Add"; - this.timeAddBtn.UseVisualStyleBackColor = true; - this.timeAddBtn.Click += new System.EventHandler(this.timeAddBtn_Click); - // - // groupBox11 - // - this.groupBox11.Controls.Add(this.noonBtn); - this.groupBox11.Controls.Add(this.nightBtn); - this.groupBox11.Controls.Add(this.dayBtn); - this.groupBox11.Controls.Add(this.midnightBtn); - this.groupBox11.ForeColor = System.Drawing.Color.White; - this.groupBox11.Location = new System.Drawing.Point(6, 74); - this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(156, 76); - this.groupBox11.TabIndex = 13; - this.groupBox11.TabStop = false; - // - // midnightBtn - // - this.midnightBtn.ForeColor = System.Drawing.Color.Black; - this.midnightBtn.Location = new System.Drawing.Point(80, 43); - this.midnightBtn.Name = "midnightBtn"; - this.midnightBtn.Size = new System.Drawing.Size(68, 23); - this.midnightBtn.TabIndex = 0; - this.midnightBtn.Text = "Midnight"; - this.midnightBtn.UseVisualStyleBackColor = true; - this.midnightBtn.Click += new System.EventHandler(this.midnightBtn_Click); - // - // dayBtn - // - this.dayBtn.ForeColor = System.Drawing.Color.Black; - this.dayBtn.Location = new System.Drawing.Point(6, 14); - this.dayBtn.Name = "dayBtn"; - this.dayBtn.Size = new System.Drawing.Size(68, 23); - this.dayBtn.TabIndex = 1; - this.dayBtn.Text = "Day"; - this.dayBtn.UseVisualStyleBackColor = true; - this.dayBtn.Click += new System.EventHandler(this.dayBtn_Click); - // - // nightBtn - // - this.nightBtn.ForeColor = System.Drawing.Color.Black; - this.nightBtn.Location = new System.Drawing.Point(80, 14); - this.nightBtn.Name = "nightBtn"; - this.nightBtn.Size = new System.Drawing.Size(68, 23); - this.nightBtn.TabIndex = 2; - this.nightBtn.Text = "Night"; - this.nightBtn.UseVisualStyleBackColor = true; - this.nightBtn.Click += new System.EventHandler(this.nightBtn_Click); - // - // noonBtn - // - this.noonBtn.ForeColor = System.Drawing.Color.Black; - this.noonBtn.Location = new System.Drawing.Point(6, 43); - this.noonBtn.Name = "noonBtn"; - this.noonBtn.Size = new System.Drawing.Size(68, 23); - this.noonBtn.TabIndex = 3; - this.noonBtn.Text = "Noon"; - this.noonBtn.UseVisualStyleBackColor = true; - this.noonBtn.Click += new System.EventHandler(this.noonBtn_Click); + this.reloadBtn.ForeColor = System.Drawing.Color.Black; + this.reloadBtn.Location = new System.Drawing.Point(6, 19); + this.reloadBtn.Name = "reloadBtn"; + this.reloadBtn.Size = new System.Drawing.Size(54, 23); + this.reloadBtn.TabIndex = 2; + this.reloadBtn.Text = "Reload"; + this.reloadBtn.UseVisualStyleBackColor = true; + this.reloadBtn.Click += new System.EventHandler(this.reloadBtn_Click); // // groupBox12 // @@ -724,40 +654,110 @@ namespace ServCreator this.weatherBox.Size = new System.Drawing.Size(156, 21); this.weatherBox.TabIndex = 0; // - // groupBox13 + // groupBox10 // - this.groupBox13.Controls.Add(this.whiteListBox); - this.groupBox13.Controls.Add(this.printListBtn); - this.groupBox13.Controls.Add(this.reloadBtn); - this.groupBox13.ForeColor = System.Drawing.Color.White; - this.groupBox13.Location = new System.Drawing.Point(6, 264); - this.groupBox13.Name = "groupBox13"; - this.groupBox13.Size = new System.Drawing.Size(168, 67); - this.groupBox13.TabIndex = 11; - this.groupBox13.TabStop = false; - this.groupBox13.Text = "White-list"; + this.groupBox10.Controls.Add(this.groupBox11); + this.groupBox10.Controls.Add(this.timeAddBtn); + this.groupBox10.Controls.Add(this.timeSetBtn); + this.groupBox10.Controls.Add(this.timeBox); + this.groupBox10.ForeColor = System.Drawing.Color.White; + this.groupBox10.Location = new System.Drawing.Point(6, 19); + this.groupBox10.Name = "groupBox10"; + this.groupBox10.Size = new System.Drawing.Size(168, 157); + this.groupBox10.TabIndex = 12; + this.groupBox10.TabStop = false; + this.groupBox10.Text = "Time"; // - // printListBtn + // groupBox11 // - this.printListBtn.ForeColor = System.Drawing.Color.Black; - this.printListBtn.Location = new System.Drawing.Point(66, 19); - this.printListBtn.Name = "printListBtn"; - this.printListBtn.Size = new System.Drawing.Size(96, 23); - this.printListBtn.TabIndex = 3; - this.printListBtn.Text = "Print List"; - this.printListBtn.UseVisualStyleBackColor = true; - this.printListBtn.Click += new System.EventHandler(this.printListBtn_Click); + this.groupBox11.Controls.Add(this.noonBtn); + this.groupBox11.Controls.Add(this.nightBtn); + this.groupBox11.Controls.Add(this.dayBtn); + this.groupBox11.Controls.Add(this.midnightBtn); + this.groupBox11.ForeColor = System.Drawing.Color.White; + this.groupBox11.Location = new System.Drawing.Point(6, 74); + this.groupBox11.Name = "groupBox11"; + this.groupBox11.Size = new System.Drawing.Size(156, 76); + this.groupBox11.TabIndex = 13; + this.groupBox11.TabStop = false; // - // reloadBtn + // noonBtn // - this.reloadBtn.ForeColor = System.Drawing.Color.Black; - this.reloadBtn.Location = new System.Drawing.Point(6, 19); - this.reloadBtn.Name = "reloadBtn"; - this.reloadBtn.Size = new System.Drawing.Size(54, 23); - this.reloadBtn.TabIndex = 2; - this.reloadBtn.Text = "Reload"; - this.reloadBtn.UseVisualStyleBackColor = true; - this.reloadBtn.Click += new System.EventHandler(this.reloadBtn_Click); + this.noonBtn.ForeColor = System.Drawing.Color.Black; + this.noonBtn.Location = new System.Drawing.Point(6, 43); + this.noonBtn.Name = "noonBtn"; + this.noonBtn.Size = new System.Drawing.Size(68, 23); + this.noonBtn.TabIndex = 3; + this.noonBtn.Text = "Noon"; + this.noonBtn.UseVisualStyleBackColor = true; + this.noonBtn.Click += new System.EventHandler(this.noonBtn_Click); + // + // nightBtn + // + this.nightBtn.ForeColor = System.Drawing.Color.Black; + this.nightBtn.Location = new System.Drawing.Point(80, 14); + this.nightBtn.Name = "nightBtn"; + this.nightBtn.Size = new System.Drawing.Size(68, 23); + this.nightBtn.TabIndex = 2; + this.nightBtn.Text = "Night"; + this.nightBtn.UseVisualStyleBackColor = true; + this.nightBtn.Click += new System.EventHandler(this.nightBtn_Click); + // + // dayBtn + // + this.dayBtn.ForeColor = System.Drawing.Color.Black; + this.dayBtn.Location = new System.Drawing.Point(6, 14); + this.dayBtn.Name = "dayBtn"; + this.dayBtn.Size = new System.Drawing.Size(68, 23); + this.dayBtn.TabIndex = 1; + this.dayBtn.Text = "Day"; + this.dayBtn.UseVisualStyleBackColor = true; + this.dayBtn.Click += new System.EventHandler(this.dayBtn_Click); + // + // midnightBtn + // + this.midnightBtn.ForeColor = System.Drawing.Color.Black; + this.midnightBtn.Location = new System.Drawing.Point(80, 43); + this.midnightBtn.Name = "midnightBtn"; + this.midnightBtn.Size = new System.Drawing.Size(68, 23); + this.midnightBtn.TabIndex = 0; + this.midnightBtn.Text = "Midnight"; + this.midnightBtn.UseVisualStyleBackColor = true; + this.midnightBtn.Click += new System.EventHandler(this.midnightBtn_Click); + // + // timeAddBtn + // + this.timeAddBtn.ForeColor = System.Drawing.Color.Black; + this.timeAddBtn.Location = new System.Drawing.Point(116, 45); + this.timeAddBtn.Name = "timeAddBtn"; + this.timeAddBtn.Size = new System.Drawing.Size(46, 23); + this.timeAddBtn.TabIndex = 8; + this.timeAddBtn.Text = "Add"; + this.timeAddBtn.UseVisualStyleBackColor = true; + this.timeAddBtn.Click += new System.EventHandler(this.timeAddBtn_Click); + // + // timeSetBtn + // + this.timeSetBtn.ForeColor = System.Drawing.Color.Black; + this.timeSetBtn.Location = new System.Drawing.Point(64, 45); + this.timeSetBtn.Name = "timeSetBtn"; + this.timeSetBtn.Size = new System.Drawing.Size(46, 23); + this.timeSetBtn.TabIndex = 7; + this.timeSetBtn.Text = "Set"; + this.timeSetBtn.UseVisualStyleBackColor = true; + this.timeSetBtn.Click += new System.EventHandler(this.timeSetBtn_Click); + // + // timeBox + // + this.timeBox.Location = new System.Drawing.Point(6, 19); + this.timeBox.Maximum = new decimal(new int[] { + 24000, + 0, + 0, + 0}); + this.timeBox.Name = "timeBox"; + this.timeBox.Size = new System.Drawing.Size(156, 20); + this.timeBox.TabIndex = 3; // // ServerManagementForm // @@ -771,7 +771,9 @@ namespace ServCreator this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(713, 400); this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(713, 400); this.Name = "ServerManagementForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Manage with Server - ServManager for Minecraft"; @@ -779,6 +781,14 @@ namespace ServCreator this.ipBanBox.ResumeLayout(false); this.ipBanBox.PerformLayout(); this.playerMgmtBox.ResumeLayout(false); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.giveAmountBox)).EndInit(); + this.groupBox7.ResumeLayout(false); + this.groupBox7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.xpBox)).EndInit(); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); this.groupBox5.ResumeLayout(false); this.groupBox5.PerformLayout(); this.groupBox4.ResumeLayout(false); @@ -786,21 +796,13 @@ namespace ServCreator this.groupBox1.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); - this.groupBox6.ResumeLayout(false); - this.groupBox6.PerformLayout(); - this.groupBox7.ResumeLayout(false); - this.groupBox7.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.xpBox)).EndInit(); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.giveAmountBox)).EndInit(); this.groupBox9.ResumeLayout(false); - this.groupBox10.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.timeBox)).EndInit(); - this.groupBox11.ResumeLayout(false); - this.groupBox12.ResumeLayout(false); this.groupBox13.ResumeLayout(false); this.groupBox13.PerformLayout(); + this.groupBox12.ResumeLayout(false); + this.groupBox10.ResumeLayout(false); + this.groupBox11.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.timeBox)).EndInit(); this.ResumeLayout(false); } diff --git a/ServCreator/ServCreator/UpgradeServerEngineForm.Designer.cs b/ServCreator/ServCreator/UpgradeServerEngineForm.Designer.cs index aa81f5a..c8517b1 100644 --- a/ServCreator/ServCreator/UpgradeServerEngineForm.Designer.cs +++ b/ServCreator/ServCreator/UpgradeServerEngineForm.Designer.cs @@ -131,9 +131,11 @@ namespace ServCreator this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(371, 180); this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(371, 180); this.Name = "UpgradeServerEngineForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Change Server Engine - ServManager for Minecraft"; diff --git a/ServCreator/ServCreator/UpgradeServerEngineForm.cs b/ServCreator/ServCreator/UpgradeServerEngineForm.cs index 3ee0ad8..77e9355 100644 --- a/ServCreator/ServCreator/UpgradeServerEngineForm.cs +++ b/ServCreator/ServCreator/UpgradeServerEngineForm.cs @@ -45,7 +45,7 @@ namespace ServCreator server = JsonConvert.DeserializeObject(reader.ReadToEnd()); reader.Close(); - label1.Text = "Currently installed on " + server.Name; + label1.Text = "Currently installed: "; currentEngineLabel.Text = server.Engine.ToUpper() + ", " + server.Version; } @@ -77,7 +77,7 @@ namespace ServCreator downloader.DownloadFileCompleted += (s, v) => { progressBar1.Visible = false; - MessageBox.Show("Server engine on " + server.Name + " has been changed to: " + serverEngineCB.Text + ", " + serverVersionCB.Text + ". After pressing the OK button you'll be taken back to the control panel."); + MessageBox.Show("Server engine on " + server.Name + " has been changed to: " + serverEngineCB.Text + ", " + serverVersionCB.Text + ". After pressing the OK button you'll be taken back to the control panel.", "Server Engine changed.", MessageBoxButtons.OK, MessageBoxIcon.Information); this.Close(); }; diff --git a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.application b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.application index 603c7e2..ba91df5 100644 --- a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.application +++ b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.application @@ -14,7 +14,7 @@ - qz9Q/16SfUiJ4HyH03gMCNGzzRBOye4Kxg/T8b9QBvw= + ThC8cpE1kAh6sRaKAIHdJ0XaIdwYHlaT/H2hPbkFnas= diff --git a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe index fc37147..c1540da 100644 Binary files a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe and b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe differ diff --git a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe.manifest b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe.manifest index 8e5b702..181021b 100644 --- a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe.manifest +++ b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.exe.manifest @@ -62,7 +62,7 @@ - AI1xE+S1px8T7Zw2ZHD4x/3JtMDYvY2V+Vb2LU8k4mY= + hVi9xlWelgfSOjyKRfefRB/12daI7rlIYBgK6mVvvQU= diff --git a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.pdb b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.pdb index 352b78f..fe0f082 100644 Binary files a/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.pdb and b/ServCreator/ServCreator/bin/Release/ServManager for Minecraft.pdb differ diff --git a/ServCreator/ServCreator/bin/Release/app.publish/ServManager for Minecraft.exe b/ServCreator/ServCreator/bin/Release/app.publish/ServManager for Minecraft.exe index be632f1..2fc45f1 100644 Binary files a/ServCreator/ServCreator/bin/Release/app.publish/ServManager for Minecraft.exe and b/ServCreator/ServCreator/bin/Release/app.publish/ServManager for Minecraft.exe differ diff --git a/ServCreator/ServCreator/obj/Release/DesignTimeResolveAssemblyReferences.cache b/ServCreator/ServCreator/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..b0e1681 Binary files /dev/null and b/ServCreator/ServCreator/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/ServCreator/ServCreator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/ServCreator/ServCreator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..9bfb7f1 Binary files /dev/null and b/ServCreator/ServCreator/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ServCreator/ServCreator/obj/Release/ServCreator.csproj.GenerateResource.cache b/ServCreator/ServCreator/obj/Release/ServCreator.csproj.GenerateResource.cache index 6d47986..b556bcc 100644 Binary files a/ServCreator/ServCreator/obj/Release/ServCreator.csproj.GenerateResource.cache and b/ServCreator/ServCreator/obj/Release/ServCreator.csproj.GenerateResource.cache differ diff --git a/ServCreator/ServCreator/obj/Release/ServCreator.csprojAssemblyReference.cache b/ServCreator/ServCreator/obj/Release/ServCreator.csprojAssemblyReference.cache index fcb839c..01ff37a 100644 Binary files a/ServCreator/ServCreator/obj/Release/ServCreator.csprojAssemblyReference.cache and b/ServCreator/ServCreator/obj/Release/ServCreator.csprojAssemblyReference.cache differ diff --git a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.application b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.application index 603c7e2..ba91df5 100644 --- a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.application +++ b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.application @@ -14,7 +14,7 @@ - qz9Q/16SfUiJ4HyH03gMCNGzzRBOye4Kxg/T8b9QBvw= + ThC8cpE1kAh6sRaKAIHdJ0XaIdwYHlaT/H2hPbkFnas= diff --git a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe index fc37147..c1540da 100644 Binary files a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe and b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe differ diff --git a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe.manifest b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe.manifest index 8e5b702..181021b 100644 --- a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe.manifest +++ b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.exe.manifest @@ -62,7 +62,7 @@ - AI1xE+S1px8T7Zw2ZHD4x/3JtMDYvY2V+Vb2LU8k4mY= + hVi9xlWelgfSOjyKRfefRB/12daI7rlIYBgK6mVvvQU= diff --git a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.pdb b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.pdb index 352b78f..fe0f082 100644 Binary files a/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.pdb and b/ServCreator/ServCreator/obj/Release/ServManager for Minecraft.pdb differ