Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

add item editing, change console text font

This commit is contained in:
Bitl 2021-09-05 11:58:57 -07:00
parent 0813846513
commit 0f275fa1e9
8 changed files with 77 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
View File

@ -1595,7 +1595,7 @@ public class GlobalFuncs
break;
}
box.AppendText(Environment.NewLine);
box.AppendText(Environment.NewLine, Color.White);
}
#elif CMD
public static void ConsolePrint(string text, int type, bool notime = false)

30
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs generated
View File

@ -405,9 +405,10 @@ namespace NovetusLauncher
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(176, 132);
this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label17.Location = new System.Drawing.Point(189, 132);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(117, 26);
this.label17.Size = new System.Drawing.Size(104, 24);
this.label17.TabIndex = 82;
this.label17.Text = "Master Server Address \r\n(Port Optional)\r\n";
//
@ -439,7 +440,7 @@ namespace NovetusLauncher
// checkBox9
//
this.checkBox9.AutoSize = true;
this.checkBox9.Location = new System.Drawing.Point(267, 193);
this.checkBox9.Location = new System.Drawing.Point(288, 193);
this.checkBox9.Name = "checkBox9";
this.checkBox9.Size = new System.Drawing.Size(84, 17);
this.checkBox9.TabIndex = 63;
@ -473,7 +474,7 @@ namespace NovetusLauncher
// checkBox4
//
this.checkBox4.AutoSize = true;
this.checkBox4.Location = new System.Drawing.Point(204, 193);
this.checkBox4.Location = new System.Drawing.Point(228, 193);
this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(54, 17);
this.checkBox4.TabIndex = 57;
@ -484,9 +485,9 @@ namespace NovetusLauncher
//
// button22
//
this.button22.Location = new System.Drawing.Point(52, 189);
this.button22.Location = new System.Drawing.Point(21, 189);
this.button22.Name = "button22";
this.button22.Size = new System.Drawing.Size(86, 22);
this.button22.Size = new System.Drawing.Size(137, 22);
this.button22.TabIndex = 50;
this.button22.Text = "RESET PORT";
this.button22.UseVisualStyleBackColor = true;
@ -494,7 +495,7 @@ namespace NovetusLauncher
//
// numericUpDown3
//
this.numericUpDown3.Location = new System.Drawing.Point(267, 163);
this.numericUpDown3.Location = new System.Drawing.Point(265, 163);
this.numericUpDown3.Maximum = new decimal(new int[] {
256,
0,
@ -517,7 +518,7 @@ namespace NovetusLauncher
//
// numericUpDown2
//
this.numericUpDown2.Location = new System.Drawing.Point(95, 163);
this.numericUpDown2.Location = new System.Drawing.Point(123, 163);
this.numericUpDown2.Maximum = new decimal(new int[] {
65535,
0,
@ -540,7 +541,7 @@ namespace NovetusLauncher
//
// label29
//
this.label29.Location = new System.Drawing.Point(201, 165);
this.label29.Location = new System.Drawing.Point(199, 165);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(60, 16);
this.label29.TabIndex = 46;
@ -548,7 +549,7 @@ namespace NovetusLauncher
//
// label35
//
this.label35.Location = new System.Drawing.Point(18, 165);
this.label35.Location = new System.Drawing.Point(52, 165);
this.label35.Name = "label35";
this.label35.Size = new System.Drawing.Size(65, 16);
this.label35.TabIndex = 44;
@ -567,9 +568,9 @@ namespace NovetusLauncher
//
// button2
//
this.button2.Location = new System.Drawing.Point(6, 218);
this.button2.Location = new System.Drawing.Point(6, 216);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(188, 34);
this.button2.Size = new System.Drawing.Size(188, 36);
this.button2.TabIndex = 2;
this.button2.Text = "START SERVER";
this.button2.UseVisualStyleBackColor = true;
@ -603,6 +604,7 @@ namespace NovetusLauncher
//
// label30
//
this.label30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label30.ForeColor = System.Drawing.Color.Red;
this.label30.Location = new System.Drawing.Point(6, 105);
@ -610,7 +612,6 @@ namespace NovetusLauncher
this.label30.Size = new System.Drawing.Size(393, 71);
this.label30.TabIndex = 3;
this.label30.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label30.Visible = false;
//
// listBox2
//
@ -881,12 +882,13 @@ namespace NovetusLauncher
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.BackColor = System.Drawing.SystemColors.ControlText;
this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.richTextBox1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.richTextBox1.ForeColor = System.Drawing.Color.White;
this.richTextBox1.Location = new System.Drawing.Point(3, 3);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(399, 255);
this.richTextBox1.TabIndex = 2;
this.richTextBox1.Text = "";
this.richTextBox1.Text = "TEST";
this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown);
//
// tabPage8

2
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx
View File

@ -136,7 +136,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
CQAAAk1TRnQBSQFMAgEBAgEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

11
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs generated
View File

@ -825,9 +825,9 @@ namespace NovetusLauncher
//
// button18
//
this.button18.Location = new System.Drawing.Point(326, 213);
this.button18.Location = new System.Drawing.Point(311, 213);
this.button18.Name = "button18";
this.button18.Size = new System.Drawing.Size(293, 36);
this.button18.Size = new System.Drawing.Size(299, 36);
this.button18.TabIndex = 20;
this.button18.Text = "START SERVER WITH NO GRAPHICS";
this.button18.UseVisualStyleBackColor = true;
@ -837,7 +837,7 @@ namespace NovetusLauncher
//
this.button2.Location = new System.Drawing.Point(6, 213);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(293, 36);
this.button2.Size = new System.Drawing.Size(299, 36);
this.button2.TabIndex = 2;
this.button2.Text = "START SERVER";
this.button2.UseVisualStyleBackColor = true;
@ -865,12 +865,13 @@ namespace NovetusLauncher
this.textBox6.Name = "textBox6";
this.textBox6.ReadOnly = true;
this.textBox6.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.textBox6.Size = new System.Drawing.Size(612, 73);
this.textBox6.Size = new System.Drawing.Size(612, 80);
this.textBox6.TabIndex = 4;
this.textBox6.Text = "textBox6";
//
// label30
//
this.label30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label30.ForeColor = System.Drawing.Color.Red;
this.label30.Location = new System.Drawing.Point(6, 118);
@ -878,7 +879,6 @@ namespace NovetusLauncher
this.label30.Size = new System.Drawing.Size(612, 58);
this.label30.TabIndex = 3;
this.label30.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label30.Visible = false;
//
// listBox2
//
@ -1150,6 +1150,7 @@ namespace NovetusLauncher
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.BackColor = System.Drawing.SystemColors.ControlText;
this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.richTextBox1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.richTextBox1.ForeColor = System.Drawing.Color.White;
this.richTextBox1.Location = new System.Drawing.Point(3, 3);
this.richTextBox1.Name = "richTextBox1";

2
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx
View File

@ -136,7 +136,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
CQAAAk1TRnQBSQFMAgEBAgEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

11
Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
View File

@ -607,8 +607,12 @@ namespace NovetusLauncher
GlobalFuncs.ConsolePrint("ADMIN MODE ENABLED.", 4, ConsoleBox);
GlobalFuncs.ConsolePrint("YOU ARE GOD.", 2, ConsoleBox);
break;
case string adminRegen when string.Compare(adminRegen, "regen", true, CultureInfo.InvariantCulture) == 0:
SetupImportantData();
GlobalFuncs.ConsolePrint("Command is either not registered or valid", 2, ConsoleBox);
break;
default:
GlobalFuncs.ConsolePrint("ERROR 3 - Command is either not registered or valid", 2, ConsoleBox);
GlobalFuncs.ConsolePrint("Command is either not registered or valid", 2, ConsoleBox);
break;
}
}
@ -639,7 +643,7 @@ namespace NovetusLauncher
GlobalFuncs.ConsolePrint("= dlldelete off | Turn off the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox);
GlobalFuncs.ConsolePrint("= dlldelete on | Turn on the deletion of opengl32.dll when ReShade is off.", 4, ConsoleBox);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox);
GlobalFuncs.ConsolePrint(LocalVars.important2, 1, ConsoleBox);
GlobalFuncs.ConsolePrint(LocalVars.important2, 2, ConsoleBox);
GlobalFuncs.ConsolePrint("---------", 1, ConsoleBox);
}
@ -779,11 +783,10 @@ namespace NovetusLauncher
if (!string.IsNullOrWhiteSpace(GlobalVars.SelectedClientInfo.Warning))
{
ClientWarningLabel.Text = GlobalVars.SelectedClientInfo.Warning;
ClientWarningLabel.Visible = true;
}
else
{
ClientWarningLabel.Visible = false;
ClientWarningLabel.Text = "";
}
ClientDescriptionBox.Text = GlobalVars.SelectedClientInfo.Description;

27
Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.Designer.cs generated
View File

@ -79,6 +79,7 @@ partial class ItemCreationSDK
this.ItemNameLabel = new System.Windows.Forms.Label();
this.ItemNameBox = new System.Windows.Forms.TextBox();
this.Warning = new System.Windows.Forms.Label();
this.EditItem = new System.Windows.Forms.CheckBox();
this.ItemSettingsGroup.SuspendLayout();
this.CoordGroup2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ZBox2)).BeginInit();
@ -712,7 +713,7 @@ partial class ItemCreationSDK
//
this.CreateItemButton.Location = new System.Drawing.Point(11, 560);
this.CreateItemButton.Name = "CreateItemButton";
this.CreateItemButton.Size = new System.Drawing.Size(288, 23);
this.CreateItemButton.Size = new System.Drawing.Size(197, 23);
this.CreateItemButton.TabIndex = 6;
this.CreateItemButton.Text = "Create Item";
this.CreateItemButton.UseVisualStyleBackColor = true;
@ -731,7 +732,7 @@ partial class ItemCreationSDK
// ItemDescLabel
//
this.ItemDescLabel.AutoSize = true;
this.ItemDescLabel.Location = new System.Drawing.Point(87, 118);
this.ItemDescLabel.Location = new System.Drawing.Point(87, 139);
this.ItemDescLabel.Name = "ItemDescLabel";
this.ItemDescLabel.Size = new System.Drawing.Size(131, 13);
this.ItemDescLabel.TabIndex = 7;
@ -739,10 +740,10 @@ partial class ItemCreationSDK
//
// DescBox
//
this.DescBox.Location = new System.Drawing.Point(11, 134);
this.DescBox.Location = new System.Drawing.Point(11, 155);
this.DescBox.Multiline = true;
this.DescBox.Name = "DescBox";
this.DescBox.Size = new System.Drawing.Size(288, 420);
this.DescBox.Size = new System.Drawing.Size(288, 399);
this.DescBox.TabIndex = 8;
//
// ItemNameLabel
@ -764,20 +765,33 @@ partial class ItemCreationSDK
//
// Warning
//
this.Warning.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Warning.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Warning.ForeColor = System.Drawing.Color.Red;
this.Warning.Location = new System.Drawing.Point(11, 88);
this.Warning.Name = "Warning";
this.Warning.Size = new System.Drawing.Size(289, 30);
this.Warning.Size = new System.Drawing.Size(288, 47);
this.Warning.TabIndex = 11;
this.Warning.Text = "\r\n";
this.Warning.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// EditItem
//
this.EditItem.Location = new System.Drawing.Point(214, 559);
this.EditItem.Name = "EditItem";
this.EditItem.Size = new System.Drawing.Size(85, 24);
this.EditItem.TabIndex = 12;
this.EditItem.Text = "Item Editing";
this.EditItem.UseVisualStyleBackColor = true;
this.EditItem.CheckedChanged += new System.EventHandler(this.EditItem_CheckedChanged);
//
// ItemCreationSDK
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.ClientSize = new System.Drawing.Size(585, 595);
this.Controls.Add(this.EditItem);
this.Controls.Add(this.Warning);
this.Controls.Add(this.ItemNameBox);
this.Controls.Add(this.ItemNameLabel);
@ -796,8 +810,8 @@ partial class ItemCreationSDK
this.Name = "ItemCreationSDK";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Novetus Item Creation SDK";
this.Load += new System.EventHandler(this.ItemCreationSDK_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ItemCreationSDK_Close);
this.Load += new System.EventHandler(this.ItemCreationSDK_Load);
this.ItemSettingsGroup.ResumeLayout(false);
this.ItemSettingsGroup.PerformLayout();
this.CoordGroup2.ResumeLayout(false);
@ -876,4 +890,5 @@ partial class ItemCreationSDK
private System.Windows.Forms.Label UsesHatTexLabel;
private System.Windows.Forms.ComboBox UsesHatTexBox;
private System.Windows.Forms.Label Warning;
private System.Windows.Forms.CheckBox EditItem;
}

33
Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs
View File

@ -19,6 +19,7 @@ public partial class ItemCreationSDK : Form
private static bool Option1Required = false;
private static bool Option2Required = false;
private static bool RequiresIconForTexture = false;
private static bool ItemEditing = false;
private OpenFileDialog openFileDialog1;
private static string FileDialogFilter1 = "";
private static string FileDialogName1 = "";
@ -336,6 +337,12 @@ public partial class ItemCreationSDK : Form
Option2TextBox.Text = "";
}
}
private void EditItem_CheckedChanged(object sender, EventArgs e)
{
ItemEditing = EditItem.Checked;
UpdateWarnings();
}
#endregion
#region Functions
@ -811,7 +818,7 @@ public partial class ItemCreationSDK : Form
passed = false;
}
if (File.Exists(GetOptionPathsForType(type)[0] + "\\" + Option1TextBox.Text))
if (File.Exists(GetOptionPathsForType(type)[0] + "\\" + Option1TextBox.Text) && !ItemEditing)
{
msgboxtext += "\n - The file assigned as a " + Option1Label.Text + " already exists. Please find an alternate file.";
passed = false;
@ -837,7 +844,7 @@ public partial class ItemCreationSDK : Form
passed = false;
}
if (File.Exists(GetOptionPathsForType(type)[1] + "\\" + Option2TextBox.Text))
if (File.Exists(GetOptionPathsForType(type)[1] + "\\" + Option2TextBox.Text) && !ItemEditing)
{
msgboxtext += "\n - The file assigned as a " + Option2Label.Text + " already exists. Please find an alternate file.";
passed = false;
@ -860,13 +867,6 @@ public partial class ItemCreationSDK : Form
{
string iconpath = GetPathForType(type) + "\\" + ItemNameBox.Text.Replace(" ", "") + ".png";
string warningtext = "";
if (File.Exists(GetPathForType(type) + "\\" + ItemNameBox.Text.Replace(" ", "") + ".rbxm"))
{
warningtext = "Warning: This item already exists. Your item will not be created with this name.";
}
if (File.Exists(iconpath))
{
Image icon1 = GlobalFuncs.LoadImage(iconpath);
@ -877,6 +877,21 @@ public partial class ItemCreationSDK : Form
ItemIcon.Image = null;
}
string warningtext = "";
if (File.Exists(GetPathForType(type) + "\\" + ItemNameBox.Text.Replace(" ", "") + ".rbxm"))
{
warningtext += "Warning: This item already exists.";
if (ItemEditing)
{
warningtext += " The item's settings will be overridden since Item Editing is enabled.";
}
else
{
warningtext += " Your item will not be created with this name unless Item Editing is enabled.";
}
}
Warning.Text = warningtext;
}